koishi-plugin-node-async-bot-all 2.24.8 → 2.24.9

package/lib/index.js

@@ -372,6 +372,7 @@ async function getServer(ctx, session) {
       if (type == "a2s") {
         const info = await queryA2S(api, log);
         if (info.success) {
+          log.debug(info);
           const temp = {
             "count": count,
             "players": info.players,
@@ -402,6 +403,7 @@ async function getServer(ctx, session) {
         const host = api.split(":");
         const serverInfo = await slpInfo(log, host[0], Number(host[1]), ctx.config.timeout);
         if (serverInfo.success) {
+          log.debug(serverInfo);
           if (serverInfo.data.players.sample == null) {
             const temp = {
               "count": count,
@@ -566,6 +568,7 @@ async function getRandomWord(ctx, session) {
   }
   const response = await request(ctx.config.rwAPI + "?format=json", {}, ctx.config.timeout, log);
   if (response.success) {
+    log.debug(response.data);
     msg = {
       "time": time,
       "data": response.data.data,
@@ -602,7 +605,7 @@ async function getBlueArchive(ctx, session) {
   const vid = await session.send(session.text(".wait", { "quote": import_koishi2.h.quote(session.messageId), "time": time }));
   const ms = random(0, 0, 1500);
   const link = random(2, ctx.config.baAPI) + `?cacheBuster=${random(1, 1, 2147483647)}`;
-  log.info(`Link: ${link}`);
+  log.debug(`Link: ${link}`);
   await (0, import_koishi2.sleep)(ms);
   const status2 = await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": import_koishi2.h.image(link) }));
   if (!status2) await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": import_koishi2.h.image(link) }));
@@ -628,6 +631,7 @@ async function centerServerTest(ctx, session) {
   });
   const response = await request("https://status.scpslgame.com/api/status-page/heartbeat/nw", {}, ctx.config.timeout, log);
   if (response.success) {
+    log.debug(response.data);
     for (const server of ctx.config.slTest) {
       const lastTime = response.data.heartbeatList[server.id].at(-1);
       if (lastTime) {
@@ -725,6 +729,7 @@ async function getCat(ctx, session) {
   const time = getHongKongTime();
   if (ctx.config.catAPI == void 0) {
     await session.send(session.text(".failed", { "quote": import_koishi2.h.quote(session.messageId), "data": "未指定 API", "time": time }));
+    log.warn("未指定 API");
     return 1;
   }
   const vid = await session.send(session.text(".wait", { "quote": import_koishi2.h.quote(session.messageId), "time": time }));
@@ -756,11 +761,13 @@ async function getQQInfo(ctx, session, qq) {
   const time = getHongKongTime();
   if (ctx.config.qqAPI == void 0) {
     await session.send(session.text(".failed", { "quote": import_koishi2.h.quote(session.messageId), "data": "未指定 API", "time": time }));
+    log.warn("未指定 API");
     return 1;
   }
   const response = await request(ctx.config.qqAPI + `?qq=${qq}`, {}, ctx.config.timeout, log);
   if (response.success) {
     const fullHtml = await readUserCardFile(response.data);
+    log.debug(fullHtml);
     const page = await ctx.puppeteer.page();
     try {
       await page.setViewport({
@@ -799,7 +806,7 @@ async function getQQInfo(ctx, session, qq) {
 }
 __name(getQQInfo, "getQQInfo");
 async function getMsg(ctx, session) {
-  const log = ctx.logger("getQQInfo");
+  const log = ctx.logger("getMsg");
   log.debug(`Got: {"form":"${session.platform}:${session.event.guild?.id}","user":"${session.event.user?.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message?.id}"}`);
   const time = getHongKongTime();
   if (!session.quote || !session.quote.user) {
@@ -809,6 +816,7 @@ async function getMsg(ctx, session) {
   }
   if (session.quote.user.id == session.event.selfId) {
     await session.send(session.text(".matroska", { "quote": import_koishi2.h.quote(session.messageId) }));
+    log.debug("套娃");
     return 1;
   }
   const user = await session.bot.getUser(session.quote.user.id, session.channelId);
@@ -820,7 +828,14 @@ async function getMsg(ctx, session) {
     return 1;
   }
   const page = await ctx.puppeteer.page();
-  const html = await readUserMsgFile(user.name, user.avatar, msg.replace(/<at id=\{([^}]+)}\/>/g, "@{$1}"));
+  const html = await readUserMsgFile(user.name, user.avatar, msg.replace(
+    /<at\s+(?:id=["']([^"']*)["']\s+name=["']([^"']*)["']|name=["']([^"']*)["']\s+id=["']([^"']*)["'])\s*\/?>/g,
+    (match, id1, name1, name2, id2) => {
+      const name3 = name1 || name2 || id1 || id2 || match;
+      return `@${name3}`;
+    }
+  ));
+  log.debug(html);
   try {
     await page.setViewport({
       width: 450,
@@ -876,6 +891,7 @@ async function getNewsMsg(ctx, type) {
         { id: response.data.appnews.newsitems[0].gid, data: html[0] }
       ]);
     }
+    log.debug(html);
     const page = await ctx.puppeteer.page();
     try {
       await page.setViewport({
@@ -912,7 +928,7 @@ async function getNewsMsg(ctx, type) {
 __name(getNewsMsg, "getNewsMsg");
 
 // package.json
-var version = "2.24.8";
+var version = "2.24.9";
 
 // src/index.ts
 var inject = ["database", "installer", "puppeteer", "cron"];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-node-async-bot-all",
   "description": "NodeAsync Bot插件（自用）",
-  "version": "2.24.8",
+  "version": "2.24.9",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [