koishi-plugin-oni-wiki-qq 0.0.8 → 0.1.0

package/lib/index.d.ts

@@ -1,11 +1,21 @@
 import { Context, Schema } from "koishi";
 export declare const name = "oni-wiki-qq";
 export declare const inject: string[];
-export declare const usage = "\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.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 interface Config {
     api: string;
     imgPath: string;
     urlPath: string;
+    navSelector: string;
+    contentSelector: string;
+    loginUrl: string;
+    userNameSelector: string;
+    passwordSelector: string;
+    checkBoxSelector: string;
+    userName: string;
+    password: string;
+    mainPage: string;
+    btnSelector: string;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -43,6 +43,8 @@ var import_node_os = __toESM(require("node:os"));
 var name = "oni-wiki-qq";
 var inject = ["puppeteer"];
 var usage = `
+  - 0.1.0 添加登录和点击cookies按钮,删除没法判断答案的代码
+  - 0.0.9 尝试移除导航框,更新koishi依赖
   - 0.0.8 对选择的其他项进行弱智一样的处理,免得 errlog 都快 13M 了
   - 0.0.7 对网址进行编码以确保不会出现奇奇怪怪的问题
   - 0.0.6 空网址错误处理
@@ -55,7 +57,19 @@ var usage = `
 var Config = import_koishi.Schema.object({
   api: import_koishi.Schema.string().default("https://oxygennotincluded.wiki.gg/zh/api.php").description("api地址"),
   imgPath: import_koishi.Schema.string().default(import_node_os.default.homedir() + "/wikiImg/").description("图片保存路径"),
-  urlPath: import_koishi.Schema.string().description("图片公网访问路径")
+  urlPath: import_koishi.Schema.string().description("图片公网访问路径"),
+  navSelector: import_koishi.Schema.string().description("导航框类名").default(".navbox"),
+  contentSelector: import_koishi.Schema.string().description("内容区选择器").default("#mw-content-text"),
+  loginUrl: import_koishi.Schema.string().description("登录页面地址").default(
+    "https://oxygennotincluded.wiki.gg/zh/index.php?title=Special:%E7%94%A8%E6%88%B7%E7%99%BB%E5%BD%95&returnto=%E9%A6%96%E9%A1%B5"
+  ),
+  userNameSelector: import_koishi.Schema.string().description("用户名输入区选择器").default("input[name='wpName']"),
+  passwordSelector: import_koishi.Schema.string().description("密码输入区选择器").default("input[name='wpPassword']"),
+  checkBoxSelector: import_koishi.Schema.string().description("总是保持登录复选框").default("inpt[name='wpRemeber']"),
+  userName: import_koishi.Schema.string().description("用户名"),
+  password: import_koishi.Schema.string().description("密码"),
+  mainPage: import_koishi.Schema.string().default("https://oxygennotincluded.wiki.gg/zh/").description("主页地址"),
+  btnSelector: import_koishi.Schema.string().default(".NN0_TB_DIsNmMHgJWgT7U").description("需要点击的按钮选择器")
 });
 function apply(ctx, config) {
   const logger = ctx.logger;
@@ -101,26 +115,11 @@ function apply(ctx, config) {
       const awlist = [1, 2, 3];
       const awser = +(await session.prompt(50 * 1e3))?.replace(/\s+/g, "")?.slice(-1) || NaN;
       if (awlist.includes(awser)) {
-        switch (awlist.includes(awser)) {
-          case (one == "萌新的骨头汤" && awser == 1):
-            return (0, import_koishi.h)("img", {
-              src: `${encodeURI(config.urlPath + one)}.jpeg`
-            });
-          case (two == "" && awser == 2):
-            return (0, import_koishi.h)("img", {
-              src: `${encodeURI(config.urlPath + two)}.jpeg`
-            });
-          case (three == "" && awser == 3):
-            return (0, import_koishi.h)("img", {
-              src: `${encodeURI(config.urlPath + three)}.jpeg`
-            });
-          default:
-            let res2 = await screenShot(itemUrl[awser - 1]);
-            if (res2) {
-              return (0, import_koishi.h)("img", { src: `${encodeURI(urlPath)}` });
-            } else {
-              return `截图发生错误.请稍后重试..`;
-            }
+        let res2 = await screenShot(itemUrl[awser - 1]);
+        if (res2) {
+          return (0, import_koishi.h)("img", { src: `${encodeURI(urlPath)}` });
+        } else {
+          return `截图发生错误.请稍后重试..`;
         }
       } else if (Number.isNaN(awser)) {
         return `您输入的选项有误，已完结本轮查询，如有需要，请重新发起查询.`;
@@ -157,7 +156,12 @@ function apply(ctx, config) {
       await page.addStyleTag({
         content: "#mw-content-text{padding: 40px}"
       });
-      const selector = await page.$("#mw-content-text");
+      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,
@@ -171,6 +175,46 @@ function apply(ctx, config) {
     }
     __name(screenShot, "screenShot");
   });
+  ctx.command("loginwiki", "使用账户登录", { authority: 4 }).action(async ({ session }) => {
+    const page = await ctx.puppeteer.page();
+    logger.info(`正在前往登录页:${config.loginUrl}`);
+    await page.goto(config.loginUrl, {
+      timeout: 0
+    });
+    await (0, import_koishi.sleep)(4e3);
+    logger.info(`输入用户名`);
+    await page.type(config.userNameSelector, config.userName);
+    await (0, import_koishi.sleep)(1e3);
+    logger.info(`输入密码`);
+    await page.type(config.passwordSelector, config.password);
+    await (0, import_koishi.sleep)(1e3);
+    logger.info("点击保持登录复选框");
+    await page.click(config.checkBoxSelector);
+    await (0, import_koishi.sleep)(1e3);
+    await page.click(`button[type="submit"]`);
+    await (0, import_koishi.sleep)(6e3);
+    const img = await page.screenshot({ type: "jpeg", quality: 50 });
+    session.send(import_koishi.h.image(img, "jpeg/image"));
+    await page.close().then(() => logger.info(`页面已经成功关闭`));
+    return `登录已完成.`;
+  });
+  ctx.command("clickBtn").action(async ({ session }) => {
+    const page = await ctx.puppeteer.page();
+    await page.goto(config.mainPage, { timeout: 0 });
+    const selector = await page.$(config.btnSelector);
+    await (0, import_koishi.sleep)(8e3);
+    await selector.click().then(() => logger.info(`成功点击了按钮`)).catch((err) => logger.info(`出错啦,${err}`));
+    await (0, import_koishi.sleep)(8e3);
+    await page.click(`button[type="submit"]`).then(() => logger.info(`点击了按钮`)).catch((err) => logger.error(`出错了,${err}`));
+    await (0, import_koishi.sleep)(5e3);
+    session.send(
+      import_koishi.h.image(
+        await page.screenshot({ type: "jpeg", quality: 80 }),
+        "jpeg/image"
+      )
+    );
+    page.close;
+  });
 }
 __name(apply, "apply");
 function checkFileExists(filePath) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-oni-wiki-qq",
   "description": "缺氧wiki查询",
-  "version": "0.0.8",
+  "version": "0.1.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -15,6 +15,6 @@
     "plugin"
   ],
   "peerDependencies": {
-    "koishi": "^4.17.9"
+    "koishi": "^4.17.10"
   }
 }