koishi-plugin-oni-wiki-qq 0.4.5 → 0.4.7

package/lib/index.d.ts

@@ -1,24 +1,19 @@
 import { Context, Schema } from "koishi";
 export declare const name = "oni-wiki-qq";
-export declare const usage = "\n  - 0.4.5 \u68C0\u6D4B\u6559\u7A0B\u9875\u9762\n  - 0.4.4 \u52A0\u5165\u7528\u6237\u9875\u9762\n  - 0.4.3 \u6536\u96C6\u641C\u7D22\u7684\u8BCD\u6C47\u9891\u7387\n  - 0.4.2 \u4FEE\u6539/ \u7684\u4F7F\u7528\u65B9\u5F0F,\u6539\u4E3A >\n  - 0.4.1 \u589E\u52A0/\u7684\u5904\u7406\n  - 0.4.0 \u79FB\u9664MWN.\u5C06\u67E5\u8BE2\u5904\u7406\u6539\u81F3\u67E5\u8BE2\u6570\u636E\u5E93\n  - 0.3.0 \u79FB\u9664\u8017\u5185\u5B58\u7684\u622A\u56FE\u90E8\u5206,\u4F7F\u7528\u955C\u50CF\u7AD9\u70B9\u7F51\u9875\n  - 0.2.0 \u5C1D\u8BD5\u6DFB\u52A0 MWN \u5E93\n";
+export declare const usage = "\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 {
         wikipages: WikiPages;
-        searchpages: searchPages;
     }
 }
 export interface WikiPages {
     id: number;
     title: string;
 }
-export interface searchPages {
-    id: number;
-    title: string;
-    time: string;
-}
 export interface Config {
-    SESSDATA: string;
+    bot_username: string;
+    bot_password: string;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -28,55 +28,35 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
+var import_mwn = require("mwn");
 var name = "oni-wiki-qq";
 var usage = `
+  - 0.4.6 移除没必要的功能
   - 0.4.5 检测教程页面
-  - 0.4.4 加入用户页面
-  - 0.4.3 收集搜索的词汇频率
-  - 0.4.2 修改/ 的使用方式,改为 >
-  - 0.4.1 增加/的处理
-  - 0.4.0 移除MWN.将查询处理改至查询数据库
-  - 0.3.0 移除耗内存的截图部分,使用镜像站点网页
-  - 0.2.0 尝试添加 MWN 库
 `;
 var inject = ["database"];
 var Config = import_koishi.Schema.object({
-  SESSDATA: import_koishi.Schema.string().description("SESSDATA")
+  bot_username: import_koishi.Schema.string().description("机器人用户名"),
+  bot_password: import_koishi.Schema.string().description("机器人密码")
 });
 function apply(ctx, config) {
   const logger = ctx.logger;
+  let wikibot;
   ctx.model.extend("wikipages", {
     id: "integer",
     title: "string"
   });
-  ctx.model.extend(
-    "searchpages",
-    {
-      id: "unsigned",
-      title: "string",
-      time: "string"
-    },
-    {
-      primary: "id",
-      autoInc: true
-    }
-  );
   ctx.command("x <itemName>", "查询缺氧中文wiki").alias("/查wiki").action(async ({ session }, itemName = "电解器") => {
     if (/教程/.test(itemName)) {
       return `请点击链接前往站点查看:
 原站点:  http://oni.wiki/${encodeURI(
         `教程`
       )}
-镜像站:  https://klei.vip/oni/usiz6d/${encodeURI(`教程`)}`;
+镜像站:  http://klei.vip/oni/usiz6d/${encodeURI(`教程`)}`;
     }
-    await ctx.database.create("searchpages", {
-      title: itemName,
-      time: import_koishi.Time.template("yyyy-MM-dd hh:mm:ss", /* @__PURE__ */ new Date())
-    });
     const res = await ctx.database.get("wikipages", {
       title: [`${itemName}`]
     });
-    logger.info(res);
     if (res.length == 0) {
       return `在Wiki里没找到,如有需要,请按照游戏内名称重新发起查询....`;
     }
@@ -84,38 +64,48 @@ function apply(ctx, config) {
 原站点:  http://oni.wiki/${encodeURI(
       itemName
     )}
-镜像站:  https://klei.vip/oni/usiz6d/${encodeURI(itemName)}`;
+镜像站:  http://klei.vip/oni/usiz6d/${encodeURI(itemName)}`;
   });
-  ctx.command("update", "更新本地页面缓存", { authority: 2 }).action(async () => {
-    const headers = {
-      "Content-Type": "application/json",
-      "user-agent": "Charles'queryBot",
-      Cookie: `SESSDATA=${config.SESSDATA}`
-    };
-    const url = `https://wiki.biligame.com/oni/api.php?action=query&list=allpages&apnamespace=0&aplimit=5000&format=json`;
-    return await ctx.http.get(url, {
-      headers
+  ctx.on("ready", async () => {
+    wikibot = new import_mwn.Mwn({
+      apiUrl: "https://oxygennotincluded.wiki.gg/zh/api.php",
+      username: config.bot_username,
+      password: config.bot_password,
+      userAgent: "Charles`Bot/2.1",
+      defaultParams: {
+        assert: "user"
+      }
+    });
+    wikibot.login().then(() => {
+      logger.info("Wiki机器人登录成功");
+    }).catch((err) => {
+      logger.error("Wiki机器人登录失败", err);
+    });
+  });
+  ctx.command("update", "更新本地页面缓存", { authority: 2 }).action(async ({ session }) => {
+    wikibot.request({
+      action: "query",
+      list: "allpages",
+      format: "json",
+      aplimit: "max"
     }).then((res) => {
-      console.log(res["query"]["allpages"]);
-      res["query"]["allpages"].forEach(async (element) => {
-        console.log(element.title);
-        await ctx.database.upsert("wikipages", () => [
-          { id: element.pageid, title: element.title }
+      logger.info("查询成功");
+      const pages = res.query.allpages;
+      pages.forEach((page) => {
+        ctx.database.upsert("wikipages", () => [
+          { id: page.pageid, title: page.title }
         ]);
       });
-      return `更新已完成,已尝试写入数据库}`;
+      session.send(`检索到 ${pages.length} 个页面，已尝试更新至数据库`);
+      logger.info(`检索到 ${pages.length} 个页面，已尝试更新至数据库`);
     }).catch((err) => {
-      console.log(err);
-      return `出现了一点点问题`;
+      logger.error("查询失败", err);
     });
   });
-  ctx.command("doc", "大叔的文档链接").alias("/大叔文档").action(async () => {
-    return `大叔的文档链接:
- https://klei.vip/oni/926f8b`;
-  });
-  ctx.command("RocketCalculator", "火箭计算器").alias("火箭计算器").action(async () => {
-    return `火箭计算器链接:
- https://klei.vip/oni/t93o56`;
+  ctx.command("update.delete", " 删除本地页面缓存", { authority: 4 }).action(async ({ session }) => {
+    const count = await ctx.database.remove("wikipages", {});
+    session.send(`已删除 ${count.removed} 条本地缓存`);
+    logger.info(`已删除 ${count.removed} 条本地缓存`);
   });
 }
 __name(apply, "apply");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-oni-wiki-qq",
   "description": "缺氧wiki查询，自用",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -15,6 +15,9 @@
     "plugin"
   ],
   "peerDependencies": {
-    "koishi": "^4.17.12"
+    "koishi": "^4.18.9"
+  },
+  "dependencies": {
+    "mwn": "^3.0.1"
   }
-}
+}