koishi-plugin-sy-bot 0.0.7 → 0.0.9

package/lib/index.js

@@ -162,28 +162,28 @@ ${hljsCss}
 </body>
 </html>
 `;
+  const page = await ctx.puppeteer.page();
   try {
-    console.log("开始创建页面...");
-    const page = await ctx.puppeteer.page();
-    console.log("页面创建成功!");
-    console.log("开始设置视口...");
+    const logger = ctx.logger("sy-bot");
+    logger.info("开始创建页面...");
+    logger.info("页面创建成功!");
+    logger.info("开始设置视口...");
     await page.setViewport({
       width: 1e3,
       height: 800,
       deviceScaleFactor: 2
     });
-    console.log("视口设置成功");
-    console.log("开始加载内容...");
+    logger.info("视口设置成功");
+    logger.info("开始加载内容...");
     await page.setContent(html, {
-      waitUntil: "domcontentloaded",
-      timeout: 3e4
+      waitUntil: "networkidle0"
     });
-    console.log("内容加载成功");
-    console.log("开始设置body...");
+    logger.info("内容加载成功");
+    logger.info("开始设置body...");
     const body = await page.$("body");
-    console.log("设置box...");
+    logger.info("设置box...");
     const box = await body.boundingBox();
-    console.log("获取page截图缓冲区...");
+    logger.info("获取page截图缓冲区...");
     const buffer = await page.screenshot({
       type: "png",
       clip: {
@@ -193,13 +193,15 @@ ${hljsCss}
         height: Math.ceil(box.height)
       }
     });
-    console.log("正在关闭页面...");
-    await page.close();
-    console.log("成功关闭页面...");
+    logger.info("正在关闭页面...");
+    logger.info("成功关闭页面...");
     return buffer;
   } catch (err) {
-    console.log(err);
+    const logger = ctx.logger("sy-bot");
+    logger.error(err);
     throw "pptr 建立报错：" + (err instanceof Error ? err.message : String(err));
+  } finally {
+    await page.close();
   }
 }
 __name(markdownToImage, "markdownToImage");
@@ -233,8 +235,9 @@ async function sendGroupMessageReaction(session, face_id, ifSet = true) {
   );
 }
 __name(sendGroupMessageReaction, "sendGroupMessageReaction");
-async function getAiChatResult({ config, user_query }) {
+async function getAiChatResult({ config, user_query, ctx }) {
   try {
+    const logger = ctx.logger("sy-bot");
     const { model: MODEL, api: API_KEY, prompt: system_prompt } = config;
     const { data } = await import_axios.default.post(
       `https://api.qingyuntop.top/v1beta/models/${MODEL}?key=${API_KEY}`,
@@ -266,12 +269,15 @@ async function getAiChatResult({ config, user_query }) {
         }
       }
     );
-    console.log("Gemini调用结果：", data);
+    console.log("Gemini调用结果：\n", data);
     const { content } = data.candidates[0];
-    const result = content.parts[1].text;
+    logger.info("提取AI请求结果content：\n", content);
+    logger.info("过滤后的parts回复列表：\n", data.candidates[0].content.parts.filter((part) => part.text));
+    const result = content.parts.filter((part) => part.text).map((part) => part.text).join("");
+    logger.info("AI回复的文字：", result);
     return result;
   } catch (error) {
-    console.error("<getAiChatResult()<function> 调用报错！\n", error);
+    console.error("getAiChatResult() 调用报错！\n", error);
   }
 }
 __name(getAiChatResult, "getAiChatResult");
@@ -289,6 +295,7 @@ async function getAiImgUnderstandMultiple({
   url_list,
   query
 }) {
+  const logger = ctx.logger("sy-bot");
   try {
     const { model: MODEL, api: API_KEY } = config;
     let base64_list = [];
@@ -319,10 +326,13 @@ async function getAiImgUnderstandMultiple({
       `https://api.qingyuntop.top/v1beta/models/${MODEL}?key=${API_KEY}`,
       BODY
     );
-    const { text } = data.candidates[0].content.parts[1];
+    logger.info("axios 接口返回的数据 data: \n", data);
+    logger.info("过滤后的parts回复列表：\n", data.candidates[0].content.parts.filter((part) => part.text));
+    const text = data.candidates[0].content.parts.filter((part) => part.text).map((p) => p.text).join("");
+    logger.info("解析出的text：", text);
     return text;
   } catch (error) {
-    console.error("<getAiChatResult()<function> 调用报错！\n", error);
+    logger.error("getAiChatResult() 调用报错！\n", error);
   }
 }
 __name(getAiImgUnderstandMultiple, "getAiImgUnderstandMultiple");
@@ -344,16 +354,19 @@ __name(getElementsImages, "getElementsImages");
 async function sendOnlyText({ session, ctx, config, query }) {
   const quote = session?.event?.message?.quote?.content;
   const question = quote ? query + quote : query;
+  const logger = ctx.logger("sy-bot");
   const raw_answer = await getAiChatResult({
     config,
-    user_query: question
+    user_query: question,
+    ctx
   });
-  console.log("AI的回复：", raw_answer);
   if (!raw_answer) {
     return "AI没有回复";
   }
   try {
+    logger.info("开始渲染markdown...");
     const h_ans_img = await textToImage(ctx, raw_answer);
+    logger.info("markdown渲染完毕！");
     session.send(
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("quote", { id: session.event.message.id }) + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("at", { id: session.event.user.id }) + h_ans_img + "\n"
     );
@@ -377,14 +390,18 @@ async function sendNotOnlyText({
   url_list,
   query
 }) {
+  const logger = ctx.logger("sy-bot");
+  logger.info("开始执行 getAiImgUnderstandMultiple()");
   const raw_answer = await getAiImgUnderstandMultiple({
     ctx,
     config,
     url_list,
     query
   });
-  console.log("AI的回答：", raw_answer);
+  logger.info("getAiImgUnderstandMultiple执行完毕，得到AI的回答：", raw_answer);
+  logger.info("开始渲染markdown，执行textToImage");
   const h_ans_img = await textToImage(ctx, raw_answer);
+  logger.info("渲染完毕，返回图片结果！");
   session.send(
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("quote", { id: session.event.message.id }) + /* @__PURE__ */ (0, import_jsx_runtime.jsx)("at", { id: session.event.user.id }) + h_ans_img + "\n"
   );
@@ -395,6 +412,7 @@ __name(sendNotOnlyText, "sendNotOnlyText");
 function registerAsk(ctx, config) {
   ctx.command("ask", "哈基米？哈基米~").action(async ({ session }) => {
     try {
+      const logger = ctx.logger("sy-bot");
       const messageElements = session.event.message.elements;
       const quoteElements = session.event.message.quote?.elements;
       const quoteRealText = getElementsText(quoteElements);
@@ -403,28 +421,33 @@ function registerAsk(ctx, config) {
       const messageImages = getElementsImages(messageElements);
       const finalText = quoteRealText + messageRealText;
       const finalImages = [...quoteImages, ...messageImages];
-      console.log("用户输入的图像：", finalImages);
-      console.log("用户输入的文字：", finalText);
+      logger.info("用户输入的图像：", finalImages);
+      logger.info("用户输入的文字：", finalText);
       await startEmoji(session);
-      try {
-        if (finalImages.length > 0) {
-          await sendNotOnlyText({
-            ctx,
-            session,
-            config,
-            url_list: finalImages,
-            query: finalText
-          });
-        } else {
-          await sendOnlyText({ session, ctx, config, query: finalText });
-        }
-      } finally {
-        await finishEmoji(session);
+      logger.info("发送表情响应");
+      if (finalImages.length > 0) {
+        logger.info("用户发送了图片，调用图片理解api...");
+        logger.info("开始执行sendNotOnlyText...");
+        await sendNotOnlyText({
+          ctx,
+          session,
+          config,
+          url_list: finalImages,
+          query: finalText
+        });
+        logger.info("sendNotOnlyText执行结束");
+      } else {
+        logger.info("用户发送了纯文本，调用文字对话api...");
+        logger.info("开始执行sendOnlyText...");
+        await sendOnlyText({ session, ctx, config, query: finalText });
+        logger.info("sendOnlyText执行结束");
       }
     } catch (err) {
-      console.error("ask 命令执行错误:", err);
+      const logger = ctx.logger("sy-bot");
+      logger.error("ask 命令执行错误:", err);
+      return "oops!出了点叉子！";
+    } finally {
       await finishEmoji(session);
-      return "调用ask发生错误：" + (err instanceof Error ? err.message : String(err));
     }
   });
 }

package/lib/utils/utils.d.ts

@@ -7,17 +7,12 @@ import { Context, h, Session } from "koishi";
 export declare function getKaoyanCountdownText(targetTime: any): string;
 export declare function getPrompt(): void;
 export declare function sendGroupMessageReaction(session: any, face_id: any, ifSet?: boolean): Promise<void>;
-export declare function getAiChatResult({ config, user_query }: {
+export declare function getAiChatResult({ config, user_query, ctx }: {
     config: any;
     user_query: any;
-}): Promise<any>;
-export declare function imageUrlToBase64(ctx: Context, url: string): Promise<string>;
-export declare function getAiImgUnderstand({ ctx, config, url, query }: {
     ctx: any;
-    config: any;
-    url: any;
-    query: any;
 }): Promise<any>;
+export declare function imageUrlToBase64(ctx: Context, url: string): Promise<string>;
 export declare function getAiImgUnderstandMultiple({ ctx, config, url_list, query, }: {
     ctx: any;
     config: any;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-sy-bot",
   "description": "考研群答疑Bot，接入Gemini。",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -12,7 +12,7 @@
   "scripts": {
     "dev": "cd ../.. && npm run dev",
     "build": "cd ../.. && npm run build",
-    "bump": "cd ../.. && npm run bump",
+    "v": "cd ../.. && npm run build && npm run bump",
     "pub": "cd ../.. && npm run pub"
   },
   "keywords": [