koishi-plugin-oni-sync-bot 0.7.0 → 0.7.1

package/lib/index.js

@@ -36,6 +36,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi11 = require("koishi");
+var import_path = require("path");
 
 // src/services/wikiBotService.ts
 var import_koishi2 = require("koishi");
@@ -275,23 +276,76 @@ var WikiBotService = class _WikiBotService extends import_koishi2.Service {
     }
     return { gg: ggSuccess, bwiki: bwikiSuccess };
   }
+  async reloginSite(site) {
+    const sitesConfig = this.getSitesConfig();
+    const siteConfig = site === "gg" ? sitesConfig.gg : sitesConfig.bwiki;
+    try {
+      const bot = await this.loginWithRetry(siteConfig);
+      if (site === "gg") {
+        this.ggbot = bot;
+      } else {
+        this.bwikibot = bot;
+      }
+      logger.info(`✅ ${siteConfig.name} 自动重新登录成功`);
+    } catch (error) {
+      const errorMsg = getErrorMessage(error);
+      if (site === "gg") {
+        this.ggbot = null;
+      } else {
+        this.bwikibot = null;
+      }
+      logger.error(`❌ ${siteConfig.name} 自动重新登录失败`, errorMsg);
+      throw error;
+    }
+  }
   isGGBotReady() {
     return this.ggbot !== null;
   }
   isBWikiBotReady() {
     return this.bwikibot !== null;
   }
+  createBotProxy(bot, site) {
+    const self = this;
+    return new Proxy(bot, {
+      get(target, prop) {
+        const originalMethod = target[prop];
+        if (typeof originalMethod !== "function") {
+          return originalMethod;
+        }
+        return async function(...args) {
+          try {
+            return await originalMethod.apply(target, args);
+          } catch (error) {
+            if (error.code === "assertuserfailed") {
+              logger.warn(
+                `检测到 ${site === "gg" ? "WIKIGG" : "bwiki"} 登录过期，正在自动重新登录...`
+              );
+              await self.reloginSite(site);
+              const newBot = site === "gg" ? self.ggbot : self.bwikibot;
+              if (!newBot) {
+                throw new Error(
+                  `${site === "gg" ? "WIKIGG" : "bwiki"} 自动重新登录失败`
+                );
+              }
+              return await newBot[prop].apply(newBot, args);
+            }
+            throw error;
+          }
+        };
+      }
+    });
+  }
   getGGBot() {
     if (!this.ggbot) {
       throw new Error("WIKIGG bot 尚未就绪，请检查登录配置或查看日志");
     }
-    return this.ggbot;
+    return this.createBotProxy(this.ggbot, "gg");
   }
   getBWikiBot() {
     if (!this.bwikibot) {
       throw new Error("bwiki bot 尚未就绪，请检查登录配置或查看日志");
     }
-    return this.bwikibot;
+    return this.createBotProxy(this.bwikibot, "bwiki");
   }
 };
 ((WikiBotService2) => {
@@ -306,7 +360,6 @@ var WikiBotService = class _WikiBotService extends import_koishi2.Service {
 // src/plugins/consoleLogProvider.ts
 var import_koishi3 = require("koishi");
 var import_plugin_console = require("@koishijs/plugin-console");
-var import_path = require("path");
 var logBuffer = [];
 var PublicLogProvider = class extends import_plugin_console.DataService {
   static {
@@ -325,10 +378,6 @@ var ConsoleLogProvider = class {
   }
   static inject = ["console"];
   constructor(ctx) {
-    ctx.console.addEntry({
-      dev: (0, import_path.resolve)(__dirname, "../../client/index.ts"),
-      prod: (0, import_path.resolve)(__dirname, "../../dist")
-    });
     ctx.plugin(PublicLogProvider);
     const target = {
       colors: 0,
@@ -1591,6 +1640,12 @@ function apply(ctx, config) {
   ctx.plugin(SyncCommands, config);
   ctx.plugin(QueryCommands, config);
   ctx.plugin(UpdateCommands, config);
+  ctx.inject(["console"], (ctx2) => {
+    ctx2.console.addEntry({
+      dev: (0, import_path.resolve)(__dirname, "../client/index.ts"),
+      prod: (0, import_path.resolve)(__dirname, "../dist")
+    });
+  });
 }
 __name(apply, "apply");
 // Annotate the CommonJS export names for ESM import in node:

package/lib/services/wikiBotService.d.ts

@@ -32,8 +32,10 @@ export declare class WikiBotService extends Service {
         gg: boolean;
         bwiki: boolean;
     }>;
+    private reloginSite;
     isGGBotReady(): boolean;
     isBWikiBotReady(): boolean;
+    private createBotProxy;
     getGGBot(): Mwn;
     getBWikiBot(): Mwn;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-oni-sync-bot",
   "description": "缺氧Wiki站镜像点同步-测试",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [