koishi-plugin-oni-wiki-qq 0.1.1 → 0.2.1

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 import { Context, Schema } from "koishi";
 export declare const name = "oni-wiki-qq";
 export declare const inject: string[];
-export declare const usage = "\n  - 0.1.0 \u6DFB\u52A0\u767B\u5F55\u548C\u70B9\u51FBcookies\u6309\u94AE,\u5220\u9664\u6CA1\u6CD5\u5224\u65AD\u7B54\u6848\u7684\u4EE3\u7801\n  - 0.0.9 \u5C1D\u8BD5\u79FB\u9664\u5BFC\u822A\u6846,\u66F4\u65B0koishi\u4F9D\u8D56\n  - 0.0.8 \u5BF9\u9009\u62E9\u7684\u5176\u4ED6\u9879\u8FDB\u884C\u5F31\u667A\u4E00\u6837\u7684\u5904\u7406,\u514D\u5F97 errlog \u90FD\u5FEB 13M \u4E86\n  - 0.0.7 \u5BF9\u7F51\u5740\u8FDB\u884C\u7F16\u7801\u4EE5\u786E\u4FDD\u4E0D\u4F1A\u51FA\u73B0\u5947\u5947\u602A\u602A\u7684\u95EE\u9898\n  - 0.0.6 \u7A7A\u7F51\u5740\u9519\u8BEF\u5904\u7406\n  - 0.0.5 \u592A\u4E45\u6CA1\u5199\u5FD8\u8BB0build\u4E86...\n  - 0.0.4 \u715E\u7B14\u817E\u8BAF\u4E0D\u7ED9\u53D1md\u4E86\u8279\n  - 0.0.3 \u5C06\u94FE\u63A5\u6539\u4E3Amd\u53D1\u9001\u4EE5\u7ED5\u8FC7\u6C9F\u817E\u8BAF\u7684\u94FE\u63A5\u62E6\u622A\n  - 0.0.2 \u57FA\u672C\u529F\u80FD\u5B8C\u6210\n  - 0.0.1 \u521D\u59CB\u5316\uFF0C\u660E\u5929\u518D\u6162\u6162\u5199\u4E86\uFF08\n";
+export declare const usage = "\n  - 0.2.1 \u4EA4\u6362\u56FE\u7247\u548C\u6D88\u606F\u4F4D\u7F6E\u4EE5\u4F7Fqq\u53D1\u9001\u65F6\u5728\u540C\u4E00\u6D88\u606F\u907F\u514D\u5237\u5C4F\n  - 0.2.0 \u5C1D\u8BD5\u6DFB\u52A0 MWN \u5E93\n  - 0.1.0 \u6DFB\u52A0\u767B\u5F55\u548C\u70B9\u51FBcookies\u6309\u94AE,\u5220\u9664\u6CA1\u6CD5\u5224\u65AD\u7B54\u6848\u7684\u4EE3\u7801\n";
 export interface Config {
     api: string;
     imgPath: string;

package/lib/index.js

@@ -38,21 +38,57 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
-var import_fs = __toESM(require("fs"));
+var import_fs2 = __toESM(require("fs"));
 var import_node_os = __toESM(require("node:os"));
+
+// src/lib.ts
+var import_fs = __toESM(require("fs"));
+var import_mwn = require("mwn");
+function checkFileExists(filePath) {
+  try {
+    import_fs.default.accessSync(filePath, import_fs.default.constants.F_OK);
+    return true;
+  } catch (err) {
+    return false;
+  }
+}
+__name(checkFileExists, "checkFileExists");
+async function getWiki(itemName, config) {
+  const { api, userName, password } = config;
+  const bot = await import_mwn.Mwn.init({
+    apiUrl: api,
+    username: userName,
+    password,
+    userAgent: "queryBot 0.0.3 ([[user:Charles-lf]])",
+    defaultParams: {
+      assert: "user"
+    }
+  });
+  return await bot.request({
+    action: "opensearch",
+    search: itemName,
+    namespace: "*",
+    limit: 3,
+    redirects: "return",
+    format: "json"
+  }).then(async (res) => {
+    console.log(res);
+    if (res[1][0] == itemName) {
+      return res[3][0];
+    } else {
+      return "";
+    }
+  }).catch(async (err) => console.log(err));
+}
+__name(getWiki, "getWiki");
+
+// src/index.ts
 var name = "oni-wiki-qq";
 var inject = ["puppeteer"];
 var usage = `
+  - 0.2.1 交换图片和消息位置以使qq发送时在同一消息避免刷屏
+  - 0.2.0 尝试添加 MWN 库
   - 0.1.0 添加登录和点击cookies按钮,删除没法判断答案的代码
-  - 0.0.9 尝试移除导航框,更新koishi依赖
-  - 0.0.8 对选择的其他项进行弱智一样的处理,免得 errlog 都快 13M 了
-  - 0.0.7 对网址进行编码以确保不会出现奇奇怪怪的问题
-  - 0.0.6 空网址错误处理
-  - 0.0.5 太久没写忘记build了...
-  - 0.0.4 煞笔腾讯不给发md了艹
-  - 0.0.3 将链接改为md发送以绕过沟腾讯的链接拦截
-  - 0.0.2 基本功能完成
-  - 0.0.1 初始化，明天再慢慢写了（
 `;
 var Config = import_koishi.Schema.object({
   api: import_koishi.Schema.string().default("https://oxygennotincluded.wiki.gg/zh/api.php").description("api地址"),
@@ -73,62 +109,39 @@ var Config = import_koishi.Schema.object({
 });
 function apply(ctx, config) {
   const logger = ctx.logger;
-  ctx.command("x <itemName>", "查询缺氧中文wiki").alias("/查wiki").option("delete", "-d 删除本地缓存", { authority: 2 }).action(async ({ session, options }, itemName = "电解器") => {
+  ctx.command("x <itemName>", "查询缺氧中文wiki").alias("/查wiki").option("delete", "-d 删除本地缓存", { authority: 1 }).action(async ({ session, options }, itemName = "电解器") => {
     const filePath = config.imgPath + itemName.replace(/\//g, "-").replace(/:/g, "-").replace(/'/g, "-") + ".jpeg";
     const urlPath = config.urlPath + itemName.replace(/\//g, "-").replace(/:/g, "-").replace(/'/g, "-") + ".jpeg";
     if (options.delete) {
       if (checkFileExists(filePath)) {
-        import_fs.default.unlinkSync(filePath);
+        import_fs2.default.unlinkSync(filePath);
         return `已尝试删除${itemName}的缓存...`;
       } else {
         return `文件不存在.请检查....`;
       }
     }
     if (checkFileExists(filePath)) {
-      console.log(urlPath);
-      return (0, import_koishi.h)("img", { src: `${encodeURI(urlPath)}` });
+      return (0, import_koishi.h)(
+        "p",
+        (0, import_koishi.h)("img", { src: `${encodeURI(urlPath)}` }),
+        `图片已保存至：${encodeURI(urlPath)}`
+      );
     }
     session.send(`您查询的「${itemName}」进行中,请稍等...`);
-    await (0, import_koishi.sleep)(500);
-    const res = await getWiki(config.api);
-    if (res.length == 0) {
+    const res = await getWiki(itemName, config);
+    if (!res) {
       return `在Wiki里没找到或API查询超时,如有需要,请按照游戏内名称重新发起查询....`;
     }
-    const title = [...res[0]];
-    let itemUrl = [...res[1]];
-    logger.info(`API返回的数据为: ${title}`);
-    if (title[0] === itemName) {
-      let res2 = await screenShot(itemUrl[0]);
-      if (res2) {
-        return (0, import_koishi.h)("img", { src: `${encodeURI(urlPath)}` });
-      } else {
-        return `截图发生错误.请稍后重试..`;
-      }
+    let screenShotRes = await screenShot(res);
+    if (screenShotRes) {
+      return (0, import_koishi.h)(
+        "p",
+        (0, import_koishi.h)("img", { src: `${encodeURI(urlPath)}` }),
+        `图片已保存至：${encodeURI(urlPath)}`
+      );
     } else {
-      return `没有在wiki内找到${itemName},如有需要,请按照游戏内名称重新发起查询`;
+      return `截图发生错误.请稍后重试..`;
     }
-    async function getWiki(api) {
-      return await ctx.http.get(api, {
-        headers: {
-          "Content-Type": "application/json",
-          "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
-        },
-        params: {
-          action: `opensearch`,
-          search: itemName,
-          limit: 3,
-          redirects: "return",
-          format: "json"
-        }
-      }).then(async (res2) => {
-        logger.info(res2);
-        return [res2[1], res2[3]];
-      }).catch((err) => {
-        logger.error(err);
-        return [];
-      });
-    }
-    __name(getWiki, "getWiki");
     async function screenShot(url) {
       const page = await ctx.puppeteer.page();
       await page.goto(url, {
@@ -136,28 +149,29 @@ function apply(ctx, config) {
       });
       await (0, import_koishi.sleep)(2e3);
       await page.addStyleTag({
-        content: "#mw-content-text{padding: 40px}"
+        content: `${config.contentSelector}{padding: 40px}`
       });
       try {
         await page.$eval(config.navSelector, (el) => el.remove());
       } catch (error) {
-        logger.error(error);
       }
       const selector = await page.$(config.contentSelector);
       return await selector.screenshot({
         type: "jpeg",
-        quality: 50,
+        quality: 60,
         path: filePath
       }).then(() => {
         return true;
-      }).catch(async (err) => {
+      }).catch((err) => {
         logger.error(err);
         return false;
       }).finally(async () => await page.close());
     }
     __name(screenShot, "screenShot");
   });
-  ctx.command("loginwiki", "使用账户登录", { authority: 4 }).action(async ({ session }) => {
+  ctx.command("loginwiki [BotuserName] <BotPassword>", "使用机器人账户登录", {
+    authority: 4
+  }).action(async ({ session }, BotuserName = "", BotPassword) => {
     const page = await ctx.puppeteer.page();
     logger.info(`正在前往登录页:${config.loginUrl}`);
     await page.goto(config.loginUrl, {
@@ -165,10 +179,10 @@ function apply(ctx, config) {
     });
     await (0, import_koishi.sleep)(4e3);
     logger.info(`输入用户名`);
-    await page.type(config.userNameSelector, config.userName);
+    await page.type(config.userNameSelector, BotuserName);
     await (0, import_koishi.sleep)(1e3);
     logger.info(`输入密码`);
-    await page.type(config.passwordSelector, config.password);
+    await page.type(config.passwordSelector, BotPassword);
     await (0, import_koishi.sleep)(1e3);
     logger.info("点击保持登录复选框");
     await page.click(config.checkBoxSelector);
@@ -180,7 +194,7 @@ function apply(ctx, config) {
     await page.close().then(() => logger.info(`页面已经成功关闭`));
     return `登录已完成.`;
   });
-  ctx.command("clickBtn").action(async ({ session }) => {
+  ctx.command("clickBtn", { authority: 4 }).action(async ({ session }) => {
     const page = await ctx.puppeteer.page();
     await page.goto(config.mainPage, { timeout: 0 });
     const selector = await page.$(config.btnSelector);
@@ -191,7 +205,7 @@ function apply(ctx, config) {
     await (0, import_koishi.sleep)(5e3);
     session.send(
       import_koishi.h.image(
-        await page.screenshot({ type: "jpeg", quality: 80 }),
+        await page.screenshot({ type: "jpeg", quality: 75 }),
         "jpeg/image"
       )
     );
@@ -199,15 +213,6 @@ function apply(ctx, config) {
   });
 }
 __name(apply, "apply");
-function checkFileExists(filePath) {
-  try {
-    import_fs.default.accessSync(filePath, import_fs.default.constants.F_OK);
-    return true;
-  } catch (err) {
-    return false;
-  }
-}
-__name(checkFileExists, "checkFileExists");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Config,

package/lib/lib.d.ts

@@ -0,0 +1,3 @@
+import { Config } from ".";
+export declare function checkFileExists(filePath: string): boolean;
+export declare function getWiki(itemName: string, config: Config): Promise<string>;

package/package.json

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