koishi-plugin-oni-sync-bot 0.3.0 → 0.3.3

package/lib/index.js

@@ -101,15 +101,12 @@ async function login(siteConfig) {
       assert: "user"
     }
   });
-  const customRequestOptions = {
-    headers: {
-      "User-Agent": siteConfig.userAgent
-    }
-  };
-  if (siteConfig.uakey) {
-    customRequestOptions.headers["X-authkey"] = siteConfig.uakey;
+  if (siteConfig.name === "bwiki") {
+    const cookieString = "SESSDATA=666; Domain=wiki.biligame.com; Path=/oni; HttpOnly; Secure";
+    bot.cookieJar.setCookie(cookieString, bot.options.apiUrl, (err) => {
+      if (err) console.error("Cookie 注入失败：", err);
+    });
   }
-  bot.setRequestOptions(customRequestOptions);
   await bot.login();
   logger.info(`✅ 成功登录 ${siteConfig.name}`);
   return bot;
@@ -127,13 +124,12 @@ function getSitesConfig(config) {
       password: config.ggPassword,
       userAgent
     },
-    huiji: {
-      name: "灰机wiki",
-      api: "https://oni.huijiwiki.com/api.php",
-      username: config.huijiUsername,
-      password: config.huijiPassword,
-      userAgent,
-      uakey: config.huijiUAKey
+    bwiki: {
+      name: "bwiki",
+      api: "https://wiki.biligame.com/oni/api.php",
+      username: config.bwikiusername,
+      password: config.bwikipassword,
+      userAgent
     }
   };
 }
@@ -226,8 +222,8 @@ async function syncSingleImage(sourceBot, targetBot, fileName, config) {
       url: targetBot.options.apiUrl,
       data: form,
       headers: {
-        ...form.getHeaders(),
-        "X-authkey": `${getSitesConfig(config).huiji.uakey}`
+        ...form.getHeaders()
+        // "X-authkey": `${getSitesConfig(config).huiji.uakey}`,
       }
     });
     const responseData = rawResponse.data;
@@ -759,15 +755,13 @@ var name = "oni-sync-bot";
 var inject = ["console", "database", "server", "cron"];
 var logBuffer = [];
 var Config = import_koishi5.Schema.object({
-  ggUsername: import_koishi5.Schema.string().description("WIKIGG 用户名").default("${{ env.ggUsername }}"),
-  ggPassword: import_koishi5.Schema.string().description("WIKIGG 密码").default("${{ env.ggPassword }}"),
-  huijiUsername: import_koishi5.Schema.string().description("灰机wiki 用户名").default("${{ env.huijiUsername }}"),
-  huijiPassword: import_koishi5.Schema.string().description("灰机wiki 密码").default("${{ env.huijiPassword }}"),
-  huijiUAKey: import_koishi5.Schema.string().description("灰机wiki UAKey").default("${{ env.huijiUAKey }}"),
+  ggUsername: import_koishi5.Schema.string().description("WIKIGG 用户名").default("1"),
+  ggPassword: import_koishi5.Schema.string().description("WIKIGG 密码").default("1"),
+  bwikiusername: import_koishi5.Schema.string().description("bwiki用户名").default("1"),
+  bwikipassword: import_koishi5.Schema.string().description("bwiki密码").default("1"),
   domain: import_koishi5.Schema.string().description("你的短链域名（必填，如：klei.vip）").default("klei.vip"),
   main_site: import_koishi5.Schema.string().description("主站域名（必填，如：oxygennotincluded.wiki.gg）").default("oxygennotincluded.wiki.gg/zh"),
   bwiki_site: import_koishi5.Schema.string().description("镜像站域名（必填，如：wiki.biligame.com）").default("wiki.biligame.com/oni"),
-  huiji_site: import_koishi5.Schema.string().description("灰机wiki域名（必填，如：oni.huijiwiki.com）").default("oni.huijiwiki.com/wiki/"),
   logsUrl: import_koishi5.Schema.string().description("日志查看地址").default("https://klei.vip/onilogs")
 });
 var PublicLogProvider = class extends import_plugin_console.DataService {
@@ -784,7 +778,7 @@ var PublicLogProvider = class extends import_plugin_console.DataService {
 function apply(ctx, config) {
   const log = ctx.logger("oni-sync");
   let ggbot;
-  let huijibot;
+  let bwikibot;
   ctx.inject(["console"], (ctx2) => {
     ctx2.console.addEntry({
       dev: (0, import_path.resolve)(__dirname, "../client/index.ts"),
@@ -838,41 +832,30 @@ function apply(ctx, config) {
     )}`;
     router.redirect(targetUrl);
   });
-  ctx.server.get("/hj/:id", async (router) => {
-    const pageId = Number(router.params.id);
-    if (isNaN(pageId)) return router.body = "❌ 无效的页面ID，必须为数字！";
-    const [page] = await ctx.database.get("wikipages", { id: pageId });
-    if (!page)
-      return router.body = `❌ 未找到ID为【${pageId}】的页面，请联系管理员更新缓存！`;
-    const targetUrl = `https://${config.huiji_site}/${encodeURIComponent(
-      page.title
-    )}`;
-    router.redirect(targetUrl);
-  });
   ctx.on("ready", async () => {
     logger.info("初始化中...");
     const sitesConfig = getSitesConfig(config);
     ggbot = await login(sitesConfig.gg);
-    huijibot = await login(sitesConfig.huiji);
-    if (ggbot.login && huijibot.login) {
+    bwikibot = await login(sitesConfig.bwiki);
+    if (ggbot.login && bwikibot.login) {
       logger.info("登录成功，插件已准备就绪");
     } else {
       logger.error("登录失败，请检查配置");
     }
     ctx.cron("15 * * * *", async () => {
-      await incrementalUpdate(ggbot, huijibot, config);
+      await incrementalUpdate(ggbot, bwikibot, config);
     });
     ctx.cron("30 8 * * 4", async () => {
-      await syncPages(ggbot, huijibot).then(() => {
-        logger.info("自动任务：尝试同步所有页面，从 WIKIGG 到 灰机wiki");
+      await syncPages(ggbot, bwikibot).then(() => {
+        logger.info("自动任务：尝试同步所有页面，从 WIKIGG 到 bwiki");
       }).catch((err) => {
         logger.error(`同步所有页面失败`);
         log.error(`，错误信息：${err}`);
       });
     });
     ctx.cron("30 8 * * 3", async () => {
-      await syncAllImages(ggbot, huijibot, config).then(() => {
-        logger.info("自动任务：尝试同步所有图片，从 WIKIGG 到 灰机wiki");
+      await syncAllImages(ggbot, bwikibot, config).then(() => {
+        logger.info("自动任务：尝试同步所有图片，从 WIKIGG 到 bwiki");
       }).catch((err) => {
         logger.error(`同步所有图片失败`);
         log.error(`，错误信息：${err}`);
@@ -880,7 +863,7 @@ function apply(ctx, config) {
     });
   });
   ctx.command("sync <pageTitle:string>", "同步指定页面", { authority: 2 }).action(async ({ session }, pageTitle) => {
-    await syncSinglePage(ggbot, huijibot, pageTitle, "sync-bot").then(() => {
+    await syncSinglePage(ggbot, bwikibot, pageTitle, "sync-bot").then(() => {
       session.send(
         `✅ 已尝试同步页面：${pageTitle}，请前往控制台查看：${config.logsUrl}`
       );
@@ -895,7 +878,7 @@ function apply(ctx, config) {
     session.send(
       `🚀 获取3h内的编辑并尝试更新，任务耗时可能较长，请前往控制台查看日志:${config.logsUrl}`
     );
-    await incrementalUpdate(ggbot, huijibot, config).then(() => {
+    await incrementalUpdate(ggbot, bwikibot, config).then(() => {
       session.send(
         `✅ 已尝试获取三小时前的编辑并同步，请前往控制台查看：${config.logsUrl}`
       );
@@ -910,7 +893,7 @@ function apply(ctx, config) {
     session.send(
       `🚀 开始同步所有页面，任务耗时较长，请前往控制台查看日志:${config.logsUrl}`
     );
-    await syncPages(ggbot, huijibot).then(() => {
+    await syncPages(ggbot, bwikibot).then(() => {
       session.send(
         `✅ 已尝试同步所有页面，请前往控制台查看：${config.logsUrl}`
       );
@@ -925,7 +908,7 @@ function apply(ctx, config) {
     authority: 2
   }).action(async ({ session }, moduleTitle) => {
     await session.send(`✅ 同步中，请前往控制台查看：${config.logsUrl}`);
-    await syncSingleModule(ggbot, huijibot, moduleTitle, "sync-bot").then(() => {
+    await syncSingleModule(ggbot, bwikibot, moduleTitle, "sync-bot").then(() => {
       session.send(
         `✅ 已尝试同步模块：${moduleTitle}，请前往控制台查看：${config.logsUrl}`
       );
@@ -938,7 +921,7 @@ function apply(ctx, config) {
     await session.send(
       `🚀 开始同步所有模块，任务耗时较长，请前往控制台查看：${config.logsUrl}`
     );
-    await syncModules(ggbot, huijibot).then(() => {
+    await syncModules(ggbot, bwikibot).then(() => {
       session.send(
         `✅ 已尝试同步所有模块，请前往控制台查看：${config.logsUrl}`
       );
@@ -955,7 +938,7 @@ function apply(ctx, config) {
     );
     await syncSingleImage(
       ggbot,
-      huijibot,
+      bwikibot,
       `${imgTitle.startsWith("File:") ? "" : "File:"}${imgTitle}`,
       config
     ).then(() => {
@@ -969,7 +952,7 @@ function apply(ctx, config) {
     session.send(
       `🚀 开始同步所有图片，任务耗时较长，请前往控制台查看：${config.logsUrl}`
     );
-    await syncAllImages(ggbot, huijibot, config).then(() => {
+    await syncAllImages(ggbot, bwikibot, config).then(() => {
       session.send(
         `✅ 已尝试同步所有图片，请前往控制台查看：${config.logsUrl}`
       );
@@ -999,11 +982,7 @@ bwiki: https://${config.domain}/hj/88888888`;
       return `✅ 精准匹配成功
 原站点: https://${config.domain}/gg/${id2}
 
-bwiki: https://${config.domain}/bw/${id2}
-
-灰机：https://${config.domain}/hj/${id2}
-
-注：bwiki将在不久后停止技术支持，镜像站点将迁移至灰机！并继续维护`;
+bwiki: https://${config.domain}/bw/${id2}`;
     }
     const preciseFullPinyinRes = await ctx.database.get("wikipages", {
       pinyin_full: queryKey
@@ -1013,11 +992,7 @@ bwiki: https://${config.domain}/bw/${id2}
       return `✅ 拼音精准匹配成功（${queryKey} → ${title}）
 原站点: https://${config.domain}/gg/${id2}
 
-bwiki: https://${config.domain}/bw/${id2}
-
-灰机：https://${config.domain}/hj/${id2}
-
-注：bwiki将在不久后停止技术支持，镜像站点将迁移至灰机！并继续维护`;
+bwiki: https://${config.domain}/bw/${id2}`;
     }
     const preciseFirstPinyinRes = await ctx.database.get("wikipages", {
       pinyin_first: queryKey
@@ -1027,11 +1002,7 @@ bwiki: https://${config.domain}/bw/${id2}
       return `✅ 首字母精准匹配成功（${queryKey} → ${title}）
 原站点: https://${config.domain}/gg/${id2}
 
-bwiki: https://${config.domain}/bw/${id2}
-
-灰机：https://${config.domain}/hj/${id2}
-
-注：bwiki将在不久后停止技术支持，镜像站点将迁移至灰机！并继续维护 `;
+bwiki: https://${config.domain}/bw/${id2} `;
     }
     const allPages = await ctx.database.get("wikipages", {});
     if (allPages.length === 0) {
@@ -1086,11 +1057,7 @@ bwiki: https://${config.domain}/bw/${id2}
     return `✅ 选择成功
 原站点: https://${config.domain}/gg/${id}
 
-bwiki: https://${config.domain}/bw/${id}
-
-灰机：https://${config.domain}/hj/${id}
-
-注：bwiki将在不久后停止技术支持，镜像站点将迁移至灰机！并继续维护`;
+bwiki: https://${config.domain}/bw/${id}`;
   });
   ctx.command("update", "更新本地页面缓存（主站）", { authority: 2 }).action(async ({ session }) => {
     await session.execute("update.status");

package/package.json

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

package/lib/config/index.d.ts

@@ -1,14 +0,0 @@
-import { Config } from "../index";
-export interface ISiteConfig {
-    name: string;
-    api: string;
-    username: string;
-    password: string;
-    userAgent: string;
-}
-interface ISitesConfig {
-    gg: ISiteConfig;
-    bwiki: ISiteConfig;
-}
-export declare function getSitesConfig(config: Config): ISitesConfig;
-export {};

package/lib/index.d.ts

@@ -1,33 +0,0 @@
-import { Context, Logger, Schema } from "koishi";
-export declare const name = "oni-sync-bot";
-export declare const inject: string[];
-declare module "@koishijs/console" {
-    namespace Console {
-        interface Services {
-            onilogs: DataService<Logger.Record[]>;
-        }
-    }
-}
-declare module "koishi" {
-    interface Tables {
-        wikipages: WikiPages;
-    }
-}
-export interface WikiPages {
-    id: number;
-    title: string;
-    pinyin_full: string;
-    pinyin_first: string;
-}
-export interface Config {
-    ggUsername: string;
-    ggPassword: string;
-    bwikiusername: string;
-    bwikipassword: string;
-    domain: string;
-    main_site: string;
-    bwiki_site: string;
-    logsUrl: string;
-}
-export declare const Config: Schema<Config>;
-export declare function apply(ctx: Context, config: Config): void;