koishi-plugin-node-async-bot-all 2.26.3 → 2.26.5

package/lib/index.d.ts

@@ -7,6 +7,9 @@ declare module 'koishi' {
     interface Events {
         "node-async/news"(): void;
     }
+    interface Context {
+        cron: (expression: string, callback: () => void) => void;
+    }
 }
 interface botDataTables {
     id: string;
@@ -30,6 +33,7 @@ interface CenterServerConfig {
 export interface Config {
     cxV3: Array<ConfigCxV3>;
     rwAPI: string;
+    htmlTimeout: number;
     timeout: number;
     baAPI: string[];
     slTest: CenterServerConfig[];

package/lib/index.js

@@ -783,7 +783,7 @@ async function getQQInfo(ctx, session, qq) {
         height: 650,
         deviceScaleFactor: 2
       });
-      await page.setContent(fullHtml, { waitUntil: "networkidle0" });
+      await page.setContent(fullHtml, { timeout: ctx.config.htmlTimeout, waitUntil: "networkidle0" });
       const { width, height } = await page.evaluate(() => ({
         width: document.body.scrollWidth,
         height: document.body.scrollHeight
@@ -847,7 +847,7 @@ async function getMsg(ctx, session, inversion) {
       height: 1,
       deviceScaleFactor: 2
     });
-    await page.setContent(html, { waitUntil: "networkidle0" });
+    await page.setContent(html, { timeout: ctx.config.htmlTimeout, waitUntil: "networkidle0" });
     const { width, height } = await page.evaluate(() => ({
       width: document.body.scrollWidth + 50,
       height: document.body.scrollHeight
@@ -904,7 +904,7 @@ async function getNewsMsg(ctx, type) {
         height: 800,
         deviceScaleFactor: 2
       });
-      await page.setContent(html[0], { waitUntil: "networkidle0" });
+      await page.setContent(html[0], { timeout: ctx.config.htmlTimeout, waitUntil: "networkidle0" });
       const { width, height } = await page.evaluate(() => ({
         width: document.body.scrollWidth,
         height: document.body.scrollHeight
@@ -934,13 +934,13 @@ __name(getNewsMsg, "getNewsMsg");
 async function getUse(ctx, session, qq, desc) {
   const log = ctx.logger("getUse");
   log.debug(`Got: {"form":"${session.platform}:${session.event.guild?.id}","user":"${session.event.user?.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message?.id}"}`);
-  await session.send(session.text(".msg", { "at": import_koishi2.h.at(session.event.user?.id), "at2": import_koishi2.h.at(qq), "desc": import_koishi2.h.text(desc?.replace('<at type="all"/>', "")) ?? "使用" }));
+  await session.send(session.text(".msg", { "at": import_koishi2.h.at(session.event.user?.id), "at2": import_koishi2.h.at(qq), "desc": desc ?? "使用" }));
   return 0;
 }
 __name(getUse, "getUse");
 
 // package.json
-var version = "2.26.3";
+var version = "2.26.5";
 
 // src/index.ts
 var inject = ["database", "installer", "puppeteer", "cron"];
@@ -948,7 +948,8 @@ var name = "node-async-bot-all";
 var usage = "这是一个私有插件。";
 var Config = import_koishi3.Schema.intersect([
   import_koishi3.Schema.object({
-    timeout: import_koishi3.Schema.number().default(8e3).description("超时时间（毫秒）")
+    timeout: import_koishi3.Schema.number().default(8e3).description("超时时间（毫秒）"),
+    htmlTimeout: import_koishi3.Schema.number().default(3e4).description("HTML 超时时间（毫秒）")
   }).description("基础"),
   import_koishi3.Schema.object({
     cxV3: import_koishi3.Schema.array(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-node-async-bot-all",
   "description": "NodeAsync Bot插件（自用）",
-  "version": "2.26.3",
+  "version": "2.26.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [
@@ -34,7 +34,6 @@
     "@koishijs/plugin-help": "^2.4.5",
     "@koishijs/plugin-market": "^2.11.8",
     "koishi": "^4.18.7",
-    "koishi-plugin-cron": "^3.1.0",
     "koishi-plugin-puppeteer": "^3.9.0"
   },
   "dependencies": {