koishi-plugin-cocoyyy-console 1.1.0-beta.6 → 1.1.0-beta.8

package/lib/index.js

@@ -2105,6 +2105,7 @@ async function startSituationPuzzle(config) {
     chatHistory2 = [];
     gameTimeout = null;
   }, GAME_TIMEOUT_MINUTES * 60 * 1e3);
+  logger.info("[startSituationPuzzle Info]: ai api send message success");
   return resp;
 }
 __name(startSituationPuzzle, "startSituationPuzzle");
@@ -2123,6 +2124,7 @@ async function questSituationPuzzle(content, config) {
     logger.error("[questSituationPuzzle Error]: " + err);
     return null;
   }
+  logger.info("[questSituationPuzzle Info]: ai api send message success");
   if (resp.includes("猜中了")) {
     is_gaming = false;
     chatPrompt = [];
@@ -2141,6 +2143,7 @@ async function endSituationPuzzle(config) {
     logger.error("[endSituationPuzzle Error]: " + err);
     return null;
   }
+  logger.info("[endSituationPuzzle Info]: ai api send message success");
   return resp;
 }
 __name(endSituationPuzzle, "endSituationPuzzle");
@@ -2158,6 +2161,7 @@ async function rerollSituationPuzzle(config) {
   chatPrompt.push({ role: "system", content: [{ type: "text", text: prompt_start }] });
   chatPrompt.push({ role: "assistant", content: [{ type: "text", text: resp }] });
   is_gaming = true;
+  logger.info("[rerollSituationPuzzle Info]: ai api send message success");
   return resp;
 }
 __name(rerollSituationPuzzle, "rerollSituationPuzzle");
@@ -2175,8 +2179,7 @@ var gameList = [
 var commandList = [
   "endgame",
   "gamelist",
-  "startgame",
-  "reroll"
+  "startgame"
 ];
 function registerGameCommands(ctx, game_config, ai_config) {
   if (game_config?.config_path) {
@@ -2199,17 +2202,22 @@ function registerGameCommands(ctx, game_config, ai_config) {
     if (!dev_mode) {
       if (!is_at_bot(session)) return;
     }
-    if (is_gaming)
-      return "游戏正在进行中，请先结束游戏";
+    if (is_gaming) return "游戏正在进行中，请先结束游戏";
+    if (is_thinking) return "正在思考，请耐心等待...";
     const game = args?.[0];
     if (!game) return "请提供正确格式，如：@bot startgame [游戏]";
-    switch (game) {
-      case gameList[0].command:
-        await session.send("正在开始游戏...后续问答请参照格式：@bot [问题]");
-        const resp = await startSituationPuzzle(ai_config);
-        return checkResp(resp);
-      default:
-        return `游戏不存在，请输入gamelist查看所有游戏`;
+    try {
+      is_thinking = true;
+      switch (game) {
+        case gameList[0].command:
+          await session.send("正在开始游戏...后续问答请参照格式：@bot [问题]\n需要刷新谜题时发送：@bot reroll");
+          const resp = await startSituationPuzzle(ai_config);
+          return checkResp(resp);
+        default:
+          return `游戏不存在，请输入gamelist查看所有游戏`;
+      }
+    } finally {
+      is_thinking = false;
     }
   });
   ctx.command("endgame", "结束游戏").action(async ({ session }) => {
@@ -2252,8 +2260,17 @@ function registerGameMiddleware(ctx, ai_config) {
     commandList.forEach((element) => {
       if (text.includes(element)) return next();
     });
-    const resp = await questSituationPuzzle(text, ai_config);
-    return (0, import_koishi12.h)("at", { id: userId }) + " " + checkResp(resp);
+    try {
+      is_thinking = true;
+      if (text.includes("reroll")) {
+        const resp2 = await rerollSituationPuzzle(ai_config);
+        return checkResp(resp2);
+      }
+      const resp = await questSituationPuzzle(text, ai_config);
+      return (0, import_koishi12.h)("at", { id: userId }) + " " + checkResp(resp);
+    } finally {
+      is_thinking = false;
+    }
   });
 }
 __name(registerGameMiddleware, "registerGameMiddleware");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-cocoyyy-console",
   "description": "自用koishi插件，功能包含复读，记录黑历史，*人等",
-  "version": "1.1.0-beta.6",
+  "version": "1.1.0-beta.8",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [