koishi-plugin-cocoyyy-console 1.1.0-beta.3 → 1.1.0-beta.5

package/lib/index.js

@@ -1530,7 +1530,6 @@ async function callOpenRouter(api_url, api_key, api_model = "gpt-4o-mini", messa
     } else {
       err = "OpenRouter 返回了未知格式，请检查日志";
     }
-    logger.error("[callOpenRouter Info]: " + responseText + ", err: " + err);
     return { err, resp: responseText };
   } catch (error) {
     const err = error;
@@ -2078,21 +2077,18 @@ __name(registerKuroCommands, "registerKuroCommands");
 
 // src/services/game_func/game_service.ts
 var is_gaming = false;
+var is_thinking = false;
 var chatHistory2 = [];
 async function startSituationPuzzle(config) {
   if (is_gaming)
     return "海龟汤正在进行中，请先结束游戏";
   chatHistory2 = [];
-  const prompt_start = `你是一个海龟汤游戏主持人，现在开始游戏。
-    请生成一个海龟汤谜题，要求如下：
-    1. 谜题是中文问句且内容简洁，包含一个看似矛盾或难以理解的情境
-    2. 谜题长度不超过100字
-    3. 谜题答案需要符合逻辑但出人意料
-    `;
+  const prompt_start = local_config2?.game?.situation_puzzle;
   chatHistory2.push({ role: "system", content: [{ type: "text", text: prompt_start }] });
   const { err, resp } = await callOpenRouter(config.api_url, config.api_key, config.api_model, chatHistory2);
   if (err != null) {
     logger.error("[startSituationPuzzle Error]: " + err);
+    chatHistory2.pop();
     return null;
   }
   chatHistory2.push({ role: "assistant", content: [{ type: "text", text: resp }] });
@@ -2102,12 +2098,16 @@ async function startSituationPuzzle(config) {
 __name(startSituationPuzzle, "startSituationPuzzle");
 async function questSituationPuzzle(content, config) {
   chatHistory2.push({ role: "user", content: [{ type: "text", text: content }] });
+  is_thinking = true;
   const { err, resp } = await callOpenRouter(config.api_url, config.api_key, config.api_model, chatHistory2);
-  if (err != null || err != "") {
+  is_thinking = false;
+  if (err != null) {
     logger.error("[questSituationPuzzle Error]: " + err);
+    chatHistory2.pop();
     return null;
   }
   chatHistory2.push({ role: "assistant", content: [{ type: "text", text: resp }] });
+  return resp;
 }
 __name(questSituationPuzzle, "questSituationPuzzle");
 async function endSituationPuzzle(config) {
@@ -2116,6 +2116,7 @@ async function endSituationPuzzle(config) {
   const { err, resp } = await callOpenRouter(config.api_url, config.api_key, config.api_model, chatHistory2);
   if (err != null) {
     logger.error("[endSituationPuzzle Error]: " + err);
+    chatHistory2.pop();
     return null;
   }
   return resp;
@@ -2135,12 +2136,12 @@ function registerGameCommands(ctx, game_config, ai_config) {
   if (game_config?.config_path) {
     local_config2 = loadYamlConfig(game_config.config_path);
     if (local_config2) {
-      logger.info("[loadYamlConfig Info]: SON 成功加载配置文件");
+      logger.info("[loadYamlConfig Info]: Game 成功加载配置文件");
     } else {
-      logger.error("[loadYamlConfig Error]: SON 配置文件加载失败，将使用默认配置");
+      logger.error("[loadYamlConfig Error]: Game 配置文件加载失败，将使用默认配置");
     }
   } else {
-    logger.error("[loadYamlConfig Error]: 未配置 SON 配置文件路径");
+    logger.error("[loadYamlConfig Error]: 未配置 Game 配置文件路径");
   }
   ctx.command("gamelist", "查看所有游戏").action(async ({ session }) => {
     return `[所有命令都需要@bot]
@@ -2178,9 +2179,9 @@ function registerGameMiddleware(ctx, ai_config) {
     const { content, uid, userId } = session;
     if (ctx.bots[uid]) return next();
     if (!is_at_bot(session)) return next();
+    if (is_thinking) return "正在思考，请耐心等待...";
     const withoutTags = content.replace(/<[^>]+>/g, " ");
     const text = withoutTags.replace(/\s+/g, " ").trim();
-    logger.info("[game middleware Info]: " + text);
     const resp = await questSituationPuzzle(text, ai_config);
     return checkResp(resp);
   });

package/lib/services/game_func/game_command.d.ts

@@ -1,6 +1,7 @@
 import { Context } from 'koishi';
 import { GameConfig } from '../../utils/configs/game_config';
 import { AiAPIConfig } from '../../utils/config';
+declare let local_config: any;
 declare function registerGameCommands(ctx: Context, game_config: GameConfig, ai_config: AiAPIConfig): void;
 declare function registerGameMiddleware(ctx: Context, ai_config: AiAPIConfig): void;
-export { registerGameCommands, registerGameMiddleware, };
+export { local_config, registerGameCommands, registerGameMiddleware, };

package/lib/services/game_func/game_service.d.ts

@@ -1,6 +1,7 @@
 import { AiAPIConfig } from "../../utils/config";
 declare let is_gaming: boolean;
+declare let is_thinking: boolean;
 declare function startSituationPuzzle(config: AiAPIConfig): Promise<string>;
-declare function questSituationPuzzle(content: string, config: AiAPIConfig): Promise<any>;
+declare function questSituationPuzzle(content: string, config: AiAPIConfig): Promise<string>;
 declare function endSituationPuzzle(config: AiAPIConfig): Promise<string>;
-export { is_gaming, startSituationPuzzle, questSituationPuzzle, endSituationPuzzle };
+export { is_gaming, is_thinking, startSituationPuzzle, questSituationPuzzle, endSituationPuzzle };

package/package.json

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