koishi-plugin-oni-wiki-qq 0.6.0 → 0.7.0

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 import { Context, Schema } from "koishi";
 export declare const name = "oni-wiki-qq";
-export declare const usage = "\n  - 0.6.1 \u2705 \u6A21\u7CCA\u5339\u914D\u8FD4\u56DE\u6700\u591A5\u6761\u7ED3\u679C+\u5E8F\u53F7\u7B49\u5F85\u4EA4\u4E92\uFF0C\u8D85\u65F6\u65E0\u8F93\u5165\u5219\u9759\u9ED8\u7ED3\u675F\n  - 0.6.0 \u96C6\u6210pinyin-pro\u62FC\u97F3\u6A21\u7CCA\u5339\u914D\uFF0C\u7CBE\u51C6\u5339\u914D\u4F18\u5148\n  - 0.5.0 \u79FB\u9664\u91CD\u5B9A\u5411\u529F\u80FD GG\u7AD9\u70B9\u5DF2\u4FEE\u590D\uFF0C\u4FDD\u7559bwiki\u66F4\u65B0\u529F\u80FD\n  - 0.4.9 \u6DFB\u52A0\u91CD\u5B9A\u5411\u529F\u80FD\n  - 0.4.8 \u91CD\u542Fbwiki\u66F4\u65B0\n  - 0.4.6 \u79FB\u9664\u6CA1\u5FC5\u8981\u7684\u529F\u80FD\n  - 0.4.5 \u68C0\u6D4B\u6559\u7A0B\u9875\u9762\n";
+export declare const usage = "\n  - 0.7.0 \u5B9E\u73B0\u77ED\u94FE\u8DEF\u7531\u8F6C\u53D1\uFF0C\u94FE\u63A5\u6539\u4E3Aklei.vip/ggwiki\u6216\u8005bwiki+\u9875\u9762ID\n  - 0.6.1 \u6A21\u7CCA\u5339\u914D\u8FD4\u56DE\u6700\u591A5\u6761\u7ED3\u679C+\u5E8F\u53F7\u7B49\u5F85\u4EA4\u4E92\uFF0C\u8D85\u65F6\u65E0\u8F93\u5165\u5219\u9759\u9ED8\u7ED3\u675F\n  - 0.6.0 \u96C6\u6210pinyin-pro\u62FC\u97F3\u6A21\u7CCA\u5339\u914D\uFF0C\u7CBE\u51C6\u5339\u914D\u4F18\u5148\n  - 0.5.0 \u79FB\u9664\u91CD\u5B9A\u5411\u529F\u80FD GG\u7AD9\u70B9\u5DF2\u4FEE\u590D\uFF0C\u4FDD\u7559bwiki\u66F4\u65B0\u529F\u80FD\n  - 0.4.9 \u6DFB\u52A0\u91CD\u5B9A\u5411\u529F\u80FD\n  - 0.4.8 \u91CD\u542Fbwiki\u66F4\u65B0\n  - 0.4.6 \u79FB\u9664\u6CA1\u5FC5\u8981\u7684\u529F\u80FD\n  - 0.4.5 \u68C0\u6D4B\u6559\u7A0B\u9875\u9762\n";
 export declare const inject: string[];
 declare module "koishi" {
     interface Tables {
@@ -10,12 +10,12 @@ declare module "koishi" {
 export interface WikiPages {
     id: number;
     title: string;
-    redirect: string;
 }
 export interface Config {
     bot_username: string;
     bot_password: string;
     bwiki_session: string;
+    domain: string;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -32,7 +32,8 @@ var import_mwn = require("mwn");
 var import_pinyin_pro = require("pinyin-pro");
 var name = "oni-wiki-qq";
 var usage = `
-  - 0.6.1 ✅ 模糊匹配返回最多5条结果+序号等待交互，超时无输入则静默结束
+  - 0.7.0 实现短链路由转发，链接改为klei.vip/ggwiki或者bwiki+页面ID
+  - 0.6.1 模糊匹配返回最多5条结果+序号等待交互，超时无输入则静默结束
   - 0.6.0 集成pinyin-pro拼音模糊匹配，精准匹配优先
   - 0.5.0 移除重定向功能 GG站点已修复，保留bwiki更新功能
   - 0.4.9 添加重定向功能
@@ -40,19 +41,43 @@ var usage = `
   - 0.4.6 移除没必要的功能
   - 0.4.5 检测教程页面
 `;
-var inject = ["database"];
+var inject = ["database", "server"];
 var Config = import_koishi.Schema.object({
   bot_username: import_koishi.Schema.string().description("机器人用户名"),
   bot_password: import_koishi.Schema.string().description("机器人密码"),
-  bwiki_session: import_koishi.Schema.string().description("bwiki的session，无法连接到gg时使用")
+  bwiki_session: import_koishi.Schema.string().description(
+    "bwiki的session，无法连接到gg时使用"
+  ),
+  domain: import_koishi.Schema.string().description("你的短链域名（必填，如：klei.vip）").default("klei.vip")
 });
 function apply(ctx, config) {
   const logger = ctx.logger(name);
   let wikibot;
   ctx.model.extend("wikipages", {
     id: "integer",
-    title: "string",
-    redirect: "string"
+    title: "string"
+  });
+  ctx.server.get("/ggwiki/:id", async (ctx2) => {
+    const pageId = Number(ctx2.params.id);
+    if (isNaN(pageId)) return ctx2.body = "❌ 无效的页面ID，必须为数字！";
+    const [page] = await ctx2.database.get("wikipages", { id: pageId });
+    if (!page)
+      return ctx2.body = `❌ 未找到ID为【${pageId}】的页面，请联系管理员更新缓存！`;
+    const targetUrl = `https://oni.wiki/${encodeURIComponent(
+      page.title
+    )}?variant=zh`;
+    ctx2.redirect(targetUrl);
+  });
+  ctx.server.get("/bwiki/:id", async (ctx2) => {
+    const pageId = Number(ctx2.params.id);
+    if (isNaN(pageId)) return ctx2.body = "❌ 无效的页面ID，必须为数字！";
+    const [page] = await ctx2.database.get("wikipages", { id: pageId });
+    if (!page)
+      return ctx2.body = `❌ 未找到ID为【${pageId}】的页面，请联系管理员更新缓存！`;
+    const targetUrl = `https://wiki.biligame.com/oni/${encodeURIComponent(
+      page.title
+    )}`;
+    ctx2.redirect(targetUrl);
   });
   ctx.on("ready", async () => {
     wikibot = new import_mwn.Mwn({
@@ -65,44 +90,58 @@ function apply(ctx, config) {
     wikibot.login().then(() => logger.info("Wiki机器人登录成功")).catch((err) => logger.error("Wiki机器人登录失败", err));
   });
   ctx.command("x <itemName>", "查询缺氧中文wiki，精准匹配+拼音模糊匹配+序号选择").alias("/查wiki").action(async ({ session }, itemName = "电解器") => {
-    if (/教程/.test(itemName)) {
-      return `请点击链接前往站点查看:
-原站点:  http://oni.wiki/${encodeURI(`教程`)}?variant=zh
-镜像站:  http://klei.vip/oni/usiz6d/${encodeURI(`教程`)}`;
-    }
     const queryKey = itemName.trim();
     const preciseRes = await ctx.database.get("wikipages", {
-      $or: [{ title: queryKey }, { redirect: queryKey }]
+      title: queryKey
     });
     if (preciseRes.length > 0) {
-      const pageName = preciseRes[0].title;
+      const { id: id2 } = preciseRes[0];
       return `✅ 精准匹配成功
-原站点:  http://oni.wiki/${encodeURI(pageName)}?variant=zh
-镜像站:  http://klei.vip/oni/usiz6d/${encodeURI(pageName)}`;
+原站点:  http://${config.domain}/ggwiki/${id2}
+镜像站:  http://${config.domain}/bwiki/${id2}`;
     }
     const allPages = await ctx.database.get("wikipages", {});
     if (allPages.length === 0) {
       return `❌ 本地缓存为空，请联系管理员执行【update】指令更新缓存！`;
     }
-    const userPinyin = (0, import_pinyin_pro.pinyin)(queryKey, { toneType: "none", type: "string", separator: "" });
-    const userFirstLetter = (0, import_pinyin_pro.pinyin)(queryKey, { type: "string", separator: "" }).toLowerCase();
+    const userPinyin = (0, import_pinyin_pro.pinyin)(queryKey, {
+      toneType: "none",
+      type: "string",
+      separator: ""
+    });
+    const userFirstLetter = (0, import_pinyin_pro.pinyin)(queryKey, {
+      type: "string",
+      separator: ""
+    }).toLowerCase();
     const matchResult = [];
     allPages.forEach((page) => {
       const targetTitle = page.title || "";
       if (!targetTitle) return;
-      const titlePinyin = (0, import_pinyin_pro.pinyin)(targetTitle, { toneType: "none", type: "string", separator: "" });
-      const titleFirstLetter = (0, import_pinyin_pro.pinyin)(targetTitle, { type: "string", separator: "" }).toLowerCase();
+      const titlePinyin = (0, import_pinyin_pro.pinyin)(targetTitle, {
+        toneType: "none",
+        type: "string",
+        separator: ""
+      });
+      const titleFirstLetter = (0, import_pinyin_pro.pinyin)(targetTitle, {
+        type: "string",
+        separator: ""
+      }).toLowerCase();
       let score = 0;
-      if (titlePinyin.includes(userPinyin) || userPinyin.includes(titlePinyin)) score += 5;
+      if (titlePinyin.includes(userPinyin) || userPinyin.includes(titlePinyin))
+        score += 5;
       if (targetTitle.includes(queryKey)) score += 4;
-      if (titleFirstLetter.includes(userFirstLetter) || userFirstLetter.includes(titleFirstLetter)) score += 3;
-      if (score > 0) matchResult.push({ title: targetTitle, score });
+      if (titleFirstLetter.includes(userFirstLetter) || userFirstLetter.includes(titleFirstLetter))
+        score += 3;
+      if (score > 0)
+        matchResult.push({ id: page.id, title: targetTitle, score });
     });
     if (matchResult.length === 0) {
       return `❌ 未找到【${queryKey}】相关内容，请按游戏内标准名称重新查询！`;
     }
     const sortedResult = matchResult.sort((a, b) => b.score - a.score);
-    const uniqueResult = Array.from(new Map(sortedResult.map((item) => [item.title, item])).values()).slice(0, 5);
+    const uniqueResult = Array.from(
+      new Map(sortedResult.map((item) => [item.title, item])).values()
+    ).slice(0, 5);
     const resultCount = uniqueResult.length;
     let replyMsg = `🔍 未找到精准匹配，为你找到【${resultCount}】个相似结果，请输入序号选择（10秒内有效）：
 `;
@@ -111,7 +150,7 @@ function apply(ctx, config) {
 `;
     });
     replyMsg += `
-❗️ 提示：超时将静默结束，无任何回应，没有有待选结果请艾特机器人任意内容结束本轮查询或等待超时后重新发起查询`;
+❗️ 提示：超时将静默结束，无任何回应，没有待选结果请艾特机器人任意内容结束本轮查询`;
     await session.send(replyMsg);
     const userInput = await session.prompt(1e4);
     if (!userInput) return;
@@ -119,17 +158,24 @@ function apply(ctx, config) {
     if (isNaN(selectNum) || selectNum < 1 || selectNum > resultCount) {
       return `❌ 输入无效！请输入 1-${resultCount} 之间的数字序号`;
     }
-    const targetPage = uniqueResult[selectNum - 1].title;
+    const { id } = uniqueResult[selectNum - 1];
     return `✅ 选择成功
-原站点:  http://oni.wiki/${encodeURI(targetPage)}?variant=zh
-镜像站:  http://klei.vip/oni/usiz6d/${encodeURI(targetPage)}`;
+原站点:  http://${config.domain}/ggwiki/${id}
+镜像站:  http://${config.domain}/bwiki/${id}`;
   });
   ctx.command("update", "更新本地页面缓存", { authority: 2 }).action(async ({ session }) => {
-    wikibot.request({ action: "query", list: "allpages", format: "json", aplimit: "max" }).then((res) => {
+    wikibot.request({
+      action: "query",
+      list: "allpages",
+      format: "json",
+      aplimit: "max"
+    }).then((res) => {
       logger.info("查询成功");
       const pages = res.query.allpages;
       pages.forEach((page) => {
-        ctx.database.upsert("wikipages", () => [{ id: page.pageid, title: page.title }]);
+        ctx.database.upsert("wikipages", () => [
+          { id: page.pageid, title: page.title }
+        ]);
       });
       session.send(`检索到 ${pages.length} 个页面，已尝试更新至数据库`);
       logger.info(`检索到 ${pages.length} 个页面，已尝试更新至数据库`);
@@ -149,10 +195,16 @@ function apply(ctx, config) {
     const url = `https://wiki.biligame.com/oni/api.php?action=query&list=allpages&apnamespace=0&aplimit=5000&format=json`;
     ctx.http.get(url, { headers }).then((res) => {
       res["query"]["allpages"].forEach((page) => {
-        ctx.database.upsert("wikipages", () => [{ id: page.pageid, title: page.title }]);
+        ctx.database.upsert("wikipages", () => [
+          { id: page.pageid, title: page.title }
+        ]);
       });
-      session.send(`检索到 ${res["query"]["allpages"].length} 个页面，已尝试更新至数据库`);
-      logger.info(`检索到 ${res["query"]["allpages"].length} 个页面，已尝试更新至数据库`);
+      session.send(
+        `检索到 ${res["query"]["allpages"].length} 个页面，已尝试更新至数据库`
+      );
+      logger.info(
+        `检索到 ${res["query"]["allpages"].length} 个页面，已尝试更新至数据库`
+      );
     }).catch((err) => {
       session.send("更新失败,请联系管理员检查日志");
       logger.error("更新失败", err);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-oni-wiki-qq",
   "description": "缺氧wiki查询，自用",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [