all tires failed

Deliay · Apr 25, 2024 · 934fcbc · 934fcbc
1 parent 722afa0
commit 934fcbc
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 23 deletions.
diff --git a/Mikibot.Analyze/MiraiHttp/LagrangeBotBridge.cs b/Mikibot.Analyze/MiraiHttp/LagrangeBotBridge.cs
@@ -51,6 +51,7 @@ private static async ValueTask<BotDeviceInfo> GetDeviceInfo()
             info.DeviceName = "Generic x86 System";
             info.KernelVersion = "6.6.7-arch1-1";
             info.SystemKernel = "Linux";
+
             await using var file = File.OpenWrite(BotDeviceStore);
             await JsonSerializer.SerializeAsync(file, info);
 
@@ -89,9 +90,30 @@ void InvokerOnOnBotOnlineEvent(BotContext context, BotOnlineEvent @event)
     public async ValueTask Run()
     {
         var botKeystore = await GetKeyStore();
+        bot = BotFactory.Create(new BotConfig()
+        {
+            Protocol = Protocols.Linux,
+        }, await GetDeviceInfo(), new BotKeystore());
+        bot.Invoker.OnBotLogEvent += (_, args) => botLogger.Log(args.Level switch
+        {
+            LogLevel.Debug => Microsoft.Extensions.Logging.LogLevel.Trace,
+            LogLevel.Verbose => Microsoft.Extensions.Logging.LogLevel.Information,
+            LogLevel.Information => Microsoft.Extensions.Logging.LogLevel.Information,
+            LogLevel.Warning => Microsoft.Extensions.Logging.LogLevel.Warning,
+            LogLevel.Fatal => Microsoft.Extensions.Logging.LogLevel.Error,
+            _ => Microsoft.Extensions.Logging.LogLevel.Error
+        }, args.ToString());
+        bot.Invoker.OnBotCaptchaEvent += (_, @event) =>
+        {
+            Console.WriteLine(@event.ToString());
+            var captcha = Console.ReadLine();
+            var randStr = Console.ReadLine();
+            if (captcha != null && randStr != null) bot.SubmitCaptcha(captcha, randStr);
+        };
+        bot.Invoker.OnGroupMessageReceived += InvokerOnOnGroupMessageReceived;
+
         if (botKeystore is null)
         {
-            bot = BotFactory.Create(new BotConfig(), await GetDeviceInfo(), new BotKeystore());
 
             var result = await bot.FetchQrCode();
             if (!result.HasValue) throw new InvalidOperationException("Lagrange无法获得二维码");
@@ -102,18 +124,9 @@ public async ValueTask Run()
         }
         else
         {
-            bot = BotFactory.Create(new BotConfig(), await GetDeviceInfo(), botKeystore);
+            await bot.LoginByPassword();
         }
-        bot.Invoker.OnBotLogEvent += (_, args) => botLogger.Log(args.Level switch
-        {
-            LogLevel.Debug => Microsoft.Extensions.Logging.LogLevel.Trace,
-            LogLevel.Verbose => Microsoft.Extensions.Logging.LogLevel.Information,
-            LogLevel.Information => Microsoft.Extensions.Logging.LogLevel.Information,
-            LogLevel.Warning => Microsoft.Extensions.Logging.LogLevel.Warning,
-            LogLevel.Fatal => Microsoft.Extensions.Logging.LogLevel.Error,
-            _ => Microsoft.Extensions.Logging.LogLevel.Error
-        }, args.ToString());
-        bot.Invoker.OnGroupMessageReceived += InvokerOnOnGroupMessageReceived;
+        await bot.LoginByPassword();
 
         logger.LogInformation("等待登录中...");
         await WaitBotOnlineAsync();

diff --git a/Mikibot.Analyze/MiraiHttp/LagrangeSignService.cs b/Mikibot.Analyze/MiraiHttp/LagrangeSignService.cs
@@ -0,0 +1,6 @@
+namespace Mikibot.Analyze.MiraiHttp;
+
+public class LagrangeSignService
+{
+
+}
diff --git a/Mikibot.Analyze/Program.cs b/Mikibot.Analyze/Program.cs
@@ -23,7 +23,8 @@
 #if DEBUG
 appBuilder.RegisterType<ConsoleMiraiService>().As<IMiraiService>().SingleInstance();
 appBuilder.RegisterType<LocalOssService>().As<IOssService>().SingleInstance();
-appBuilder.RegisterType<ConsoleEmailService>().As<IEmailService>().SingleInstance();
+// appBuilder.RegisterType<ConsoleEmailService>().As<IEmailService>().SingleInstance();
+appBuilder.RegisterType<LagrangeBotBridge>().As<IMiraiService>().SingleInstance();
 #else
 appBuilder.RegisterType<LagrangeBotBridge>().As<IMiraiService>().SingleInstance();
 // appBuilder.RegisterType<MiraiService>().As<IMiraiService>().SingleInstance();
@@ -73,11 +74,11 @@
 
     var statusCrawler = app.Resolve<LiveStatusCrawlService>();
     var followerStat = app.Resolve<DailyFollowerStatisticService>();
-    var eventService = app.Resolve<LiveStreamEventService>();
+    // var eventService = app.Resolve<LiveStreamEventService>();
 
-    var danmakuClip = app.Resolve<DanmakuRecordControlService>();
-    var danmakuCrawler = app.Resolve<DanmakuCollectorService>();
-    var danmakuExportGuard = app.Resolve<DanmakuExportGuardList>();
+    // var danmakuClip = app.Resolve<DanmakuRecordControlService>();
+    // var danmakuCrawler = app.Resolve<DanmakuCollectorService>();
+    // var danmakuExportGuard = app.Resolve<DanmakuExportGuardList>();
 
     var aiVoice = app.Resolve<AiVoiceGenerationService>();
     //var aiImage = app.Resolve<AiImageGenerationService>();
@@ -89,19 +90,19 @@
     var optionaSelector = app.Resolve<OptionaSelectorService>();
     var pingti = app.Resolve<PingtiItemReplaceService>();
 
-    eventService.CmdHandler.Register(danmakuCrawler);
-    eventService.CmdHandler.Register(mxmkLiveEventProxy);
+    // eventService.CmdHandler.Register(danmakuCrawler);
+    // eventService.CmdHandler.Register(mxmkLiveEventProxy);
 
-    eventService.CmdHandler.Subscribe<DanmuMsg>(danmakuClip.HandleDanmu);
-    eventService.CmdHandler.Subscribe<DanmuMsg>(danmakuExportGuard.HandleDanmaku);
-    eventService.CmdHandler.Subscribe<DanmuMsg>(mxmkDanmakuProxy.HandleDanmaku);
+    // eventService.CmdHandler.Subscribe<DanmuMsg>(danmakuClip.HandleDanmu);
+    // eventService.CmdHandler.Subscribe<DanmuMsg>(danmakuExportGuard.HandleDanmaku);
+    // eventService.CmdHandler.Subscribe<DanmuMsg>(mxmkDanmakuProxy.HandleDanmaku);
 
     logger.LogInformation("Starting schedule module...");
     await Task.WhenAll(
     [
         statusCrawler.Run(token),
         followerStat.Run(token),
-        eventService.Run(token),
+        // eventService.Run(token),
         bffAnti.Run(token),
         biliParser.Run(token),
         randomImage.Run(token),