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

package/lib/index.js

@@ -38,7 +38,7 @@ __export(src_exports, {
   savePath: () => savePath
 });
 module.exports = __toCommonJS(src_exports);
-var import_koishi12 = require("koishi");
+var import_koishi13 = require("koishi");
 
 // src/utils/configs/function_config.ts
 var import_koishi = require("koishi");
@@ -2075,56 +2075,96 @@ function registerKuroCommands(ctx, connected) {
 }
 __name(registerKuroCommands, "registerKuroCommands");
 
+// src/services/game_func/game_command.ts
+var import_koishi12 = require("koishi");
+
 // src/services/game_func/game_service.ts
 var is_gaming = false;
-var is_thinking = false;
+var chatPrompt = [];
 var chatHistory2 = [];
+var gameTimeout = null;
+var GAME_TIMEOUT_MINUTES = local_config2?.game?.timeout_minutes || 10;
 async function startSituationPuzzle(config) {
-  if (is_gaming)
-    return "海龟汤正在进行中，请先结束游戏";
+  chatPrompt = [];
   chatHistory2 = [];
   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);
+  chatPrompt.push({ role: "system", content: [{ type: "text", text: prompt_start }] });
+  const { err, resp } = await callOpenRouter(config.api_url, config.api_key, config.api_model, chatPrompt);
   if (err != null) {
     logger.error("[startSituationPuzzle Error]: " + err);
-    chatHistory2.pop();
+    chatPrompt.pop();
     return null;
   }
-  chatHistory2.push({ role: "assistant", content: [{ type: "text", text: resp }] });
+  chatPrompt.push({ role: "assistant", content: [{ type: "text", text: resp }] });
   is_gaming = true;
+  clearGameTimeout();
+  gameTimeout = setTimeout(async () => {
+    logger.info(`[SituationPuzzle Timeout]: 游戏已超时（${GAME_TIMEOUT_MINUTES}分钟），自动结束游戏`);
+    is_gaming = false;
+    chatPrompt = [];
+    chatHistory2 = [];
+    gameTimeout = null;
+  }, GAME_TIMEOUT_MINUTES * 60 * 1e3);
   return resp;
 }
 __name(startSituationPuzzle, "startSituationPuzzle");
+function clearGameTimeout() {
+  if (gameTimeout) {
+    clearTimeout(gameTimeout);
+    gameTimeout = null;
+  }
+}
+__name(clearGameTimeout, "clearGameTimeout");
 async function questSituationPuzzle(content, config) {
+  chatHistory2 = [...chatPrompt];
   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);
-  is_thinking = false;
   if (err != null) {
     logger.error("[questSituationPuzzle Error]: " + err);
-    chatHistory2.pop();
     return null;
   }
-  chatHistory2.push({ role: "assistant", content: [{ type: "text", text: resp }] });
+  if (resp.includes("猜中了")) {
+    is_gaming = false;
+    chatPrompt = [];
+    chatHistory2 = [];
+    gameTimeout = null;
+  }
   return resp;
 }
 __name(questSituationPuzzle, "questSituationPuzzle");
 async function endSituationPuzzle(config) {
   is_gaming = false;
+  chatHistory2 = [...chatPrompt];
   chatHistory2.push({ role: "user", content: [{ type: "text", text: "结束游戏，请给出答案" }] });
   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;
 }
 __name(endSituationPuzzle, "endSituationPuzzle");
+async function rerollSituationPuzzle(config) {
+  chatHistory2 = [...chatPrompt];
+  chatHistory2.push({ role: "user", content: [{ type: "text", text: "重新生成新谜题" }] });
+  const { err, resp } = await callOpenRouter(config.api_url, config.api_key, config.api_model, chatHistory2);
+  if (err != null) {
+    logger.error("[rerollSituationPuzzle Error]: " + err);
+    chatPrompt.pop();
+    return null;
+  }
+  chatPrompt = [];
+  const prompt_start = local_config2?.game?.situation_puzzle;
+  chatPrompt.push({ role: "system", content: [{ type: "text", text: prompt_start }] });
+  chatPrompt.push({ role: "assistant", content: [{ type: "text", text: resp }] });
+  is_gaming = true;
+  return resp;
+}
+__name(rerollSituationPuzzle, "rerollSituationPuzzle");
 
 // src/services/game_func/game_command.ts
 var local_config2 = null;
+var is_thinking = false;
 var gameList = [
   {
     name: "AI海龟汤",
@@ -2132,6 +2172,12 @@ var gameList = [
     command: "puzzle"
   }
 ];
+var commandList = [
+  "endgame",
+  "gamelist",
+  "startgame",
+  "reroll"
+];
 function registerGameCommands(ctx, game_config, ai_config) {
   if (game_config?.config_path) {
     local_config2 = loadYamlConfig(game_config.config_path);
@@ -2153,6 +2199,8 @@ function registerGameCommands(ctx, game_config, ai_config) {
     if (!dev_mode) {
       if (!is_at_bot(session)) return;
     }
+    if (is_gaming)
+      return "游戏正在进行中，请先结束游戏";
     const game = args?.[0];
     if (!game) return "请提供正确格式，如：@bot startgame [游戏]";
     switch (game) {
@@ -2164,12 +2212,31 @@ function registerGameCommands(ctx, game_config, ai_config) {
         return `游戏不存在，请输入gamelist查看所有游戏`;
     }
   });
-  ctx.command("endgame", "结束游戏").action(async ({ session }, ...args) => {
+  ctx.command("endgame", "结束游戏").action(async ({ session }) => {
+    if (!dev_mode) {
+      if (!is_at_bot(session)) return;
+    }
+    if (is_thinking) return "正在思考，请耐心等待...";
+    try {
+      is_thinking = true;
+      const resp = await endSituationPuzzle(ai_config);
+      return checkResp(resp);
+    } finally {
+      is_thinking = false;
+    }
+  });
+  ctx.command("reroll", "重新生成新谜题").action(async ({ session }) => {
     if (!dev_mode) {
       if (!is_at_bot(session)) return;
     }
-    const resp = await endSituationPuzzle(ai_config);
-    return checkResp(resp);
+    if (is_thinking) return "正在思考，请耐心等待...";
+    try {
+      is_thinking = true;
+      const resp = await rerollSituationPuzzle(ai_config);
+      return checkResp(resp);
+    } finally {
+      is_thinking = false;
+    }
   });
 }
 __name(registerGameCommands, "registerGameCommands");
@@ -2182,8 +2249,11 @@ function registerGameMiddleware(ctx, ai_config) {
     if (is_thinking) return "正在思考，请耐心等待...";
     const withoutTags = content.replace(/<[^>]+>/g, " ");
     const text = withoutTags.replace(/\s+/g, " ").trim();
+    commandList.forEach((element) => {
+      if (text.includes(element)) return next();
+    });
     const resp = await questSituationPuzzle(text, ai_config);
-    return checkResp(resp);
+    return (0, import_koishi12.h)("at", { id: userId }) + " " + checkResp(resp);
   });
 }
 __name(registerGameMiddleware, "registerGameMiddleware");
@@ -2198,7 +2268,7 @@ __name(checkResp, "checkResp");
 // src/index.ts
 var name = "cocoyyy-console";
 var dev_mode;
-var Config = import_koishi12.Schema.object({
+var Config = import_koishi13.Schema.object({
   function_config: FunctionConfigSchema.description("功能开关配置"),
   ai_config: AiAPIConfigSchema.description("AI API配置"),
   mysql_config: MysqlConfigSchema.description("MySQL 数据库配置"),
@@ -2206,9 +2276,9 @@ var Config = import_koishi12.Schema.object({
   repeat_config: RepeatConfigSchema.description("复读配置"),
   son_config: ShitOrNotConfigSchema.description("SON配置"),
   game_config: GameConfigSchema.description("游戏配置"),
-  test: import_koishi12.Schema.string().description("测试")
+  test: import_koishi13.Schema.string().description("测试")
 });
-var logger = new import_koishi12.Logger(name);
+var logger = new import_koishi13.Logger(name);
 var savePath = null;
 async function apply(ctx, config) {
   ctx = ctx.guild();

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

@@ -1,7 +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<string>;
 declare function endSituationPuzzle(config: AiAPIConfig): Promise<string>;
-export { is_gaming, is_thinking, startSituationPuzzle, questSituationPuzzle, endSituationPuzzle };
+declare function rerollSituationPuzzle(config: AiAPIConfig): Promise<string>;
+export { is_gaming, startSituationPuzzle, questSituationPuzzle, endSituationPuzzle, rerollSituationPuzzle };

package/package.json

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