koishi-plugin-sy-bot 0.0.1 → 0.0.5

package/lib/index.js

@@ -65,7 +65,9 @@ async function markdownToImage(ctx, markdown) {
           language: lang
         }).value}</code></pre>`;
       }
-      return `<pre class="hljs"><code>${md.utils.escapeHtml(code)}</code></pre>`;
+      return `<pre class="hljs"><code>${md.utils.escapeHtml(
+        code
+      )}</code></pre>`;
     }
   });
   md.use(import_markdown_it_katex.default);
@@ -160,28 +162,45 @@ ${hljsCss}
 </body>
 </html>
 `;
-  const page = await ctx.puppeteer.page();
-  await page.setViewport({
-    width: 1e3,
-    height: 10,
-    deviceScaleFactor: 2
-  });
-  await page.setContent(html, {
-    waitUntil: "networkidle0"
-  });
-  const body = await page.$("body");
-  const box = await body.boundingBox();
-  const buffer = await page.screenshot({
-    type: "png",
-    clip: {
-      x: 0,
-      y: 0,
-      width: Math.ceil(box.width),
-      height: Math.ceil(box.height)
-    }
-  });
-  await page.close();
-  return buffer;
+  try {
+    console.log("开始创建页面...");
+    const page = await ctx.puppeteer.page();
+    console.log("页面创建成功!");
+    console.log("开始设置视口...");
+    await page.setViewport({
+      width: 1e3,
+      height: 800,
+      deviceScaleFactor: 2
+    });
+    console.log("视口设置成功");
+    console.log("开始加载内容...");
+    await page.setContent(html, {
+      waitUntil: "domcontentloaded",
+      timeout: 3e4
+    });
+    console.log("内容加载成功");
+    console.log("开始设置body...");
+    const body = await page.$("body");
+    console.log("设置box...");
+    const box = await body.boundingBox();
+    console.log("获取page截图缓冲区...");
+    const buffer = await page.screenshot({
+      type: "png",
+      clip: {
+        x: 0,
+        y: 0,
+        width: Math.ceil(box.width),
+        height: Math.ceil(box.height)
+      }
+    });
+    console.log("正在关闭页面...");
+    await page.close();
+    console.log("成功关闭页面...");
+    return buffer;
+  } catch (err) {
+    console.log(err);
+    throw "pptr 建立报错：" + (err instanceof Error ? err.message : String(err));
+  }
 }
 __name(markdownToImage, "markdownToImage");
 
@@ -247,6 +266,7 @@ async function getAiChatResult({ config, user_query }) {
         }
       }
     );
+    console.log("Gemini调用结果：", data);
     const { content } = data.candidates[0];
     const result = content.parts[1].text;
     return result;
@@ -329,10 +349,17 @@ async function sendOnlyText({ session, ctx, config, query }) {
     user_query: question
   });
   console.log("AI的回复：", raw_answer);
-  const h_ans_img = await textToImage(ctx, raw_answer);
-  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"
-  );
+  if (!raw_answer) {
+    return "AI没有回复";
+  }
+  try {
+    const h_ans_img = await textToImage(ctx, raw_answer);
+    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"
+    );
+  } catch (err) {
+    return "调用 textToImage 报错：" + (err instanceof Error ? err.message : String(err));
+  }
 }
 __name(sendOnlyText, "sendOnlyText");
 async function startEmoji(session) {
@@ -379,20 +406,24 @@ function registerAsk(ctx, config) {
       console.log("用户输入的图像：", finalImages);
       console.log("用户输入的文字：", finalText);
       await startEmoji(session);
-      if (finalImages.length > 0) {
-        await sendNotOnlyText({
-          ctx,
-          session,
-          config,
-          url_list: finalImages,
-          query: finalText
-        });
-      } else {
-        await sendOnlyText({ session, ctx, config, query: finalText });
+      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);
       }
-      await finishEmoji(session);
     } catch (err) {
-      console.error(err);
+      console.error("ask 命令执行错误:", err);
+      await finishEmoji(session);
       return "调用ask发生错误：" + (err instanceof Error ? err.message : String(err));
     }
   });
@@ -527,7 +558,7 @@ var inject = {
 var Config = import_koishi3.Schema.object({
   api: import_koishi3.Schema.string().required(),
   model: import_koishi3.Schema.string().required(),
-  prompt: import_koishi3.Schema.string().required()
+  prompt: import_koishi3.Schema.string()
 });
 function apply(ctx, config) {
   registerCommand(ctx, config);

package/lib/utils/utils.d.ts

@@ -32,7 +32,7 @@ export declare function sendOnlyText({ session, ctx, config, query }: {
     ctx: any;
     config: any;
     query: any;
-}): Promise<void>;
+}): Promise<string>;
 export declare function sendEmpty(query: any): boolean;
 export declare function startEmoji(session: Session): Promise<void>;
 export declare function finishEmoji(session: Session): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-sy-bot",
-  "description": "个人qq群Bot - 风纪委员",
-  "version": "0.0.1",
+  "description": "考研群答疑Bot，接入Gemini。",
+  "version": "0.0.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -9,14 +9,19 @@
     "dist"
   ],
   "license": "MIT",
-  "scripts": {},
+  "scripts": {
+    "dev": "cd ../.. && npm run dev",
+    "build": "cd ../.. && npm run build",
+    "bump": "cd ../.. && npm run bump",
+    "pub": "cd ../.. && npm run pub"
+  },
   "keywords": [
     "chatbot",
     "koishi",
     "plugin"
   ],
   "peerDependencies": {
-    "koishi": "^4.18.7"
+    "koishi": "^4.18.10"
   },
   "dependencies": {
     "@satorijs/element": "^3.1.8",

package/readme.md

@@ -2,4 +2,8 @@
 
 [![npm](https://img.shields.io/npm/v/koishi-plugin-sy-bot?style=flat-square)](https://www.npmjs.com/package/koishi-plugin-sy-bot)
 
-test
+## 考研群答疑机器人
+
+
+Gemini API取自：[https://api.qingyuntop.top/](https://api.qingyuntop.top/)
+