koishi-plugin-cocoyyy-console 1.1.3-alpha.0 → 1.1.3-alpha.3

package/lib/index.js

@@ -1701,9 +1701,11 @@ async function randomHImg(keywords, ...args) {
     params.append("excludeAI", "true");
     params.append("size", "regular");
     const random = new import_koishi12.Random(() => Math.random());
-    if (r18.toLowerCase() === "r18") {
-      params.append("r18", "1");
-      tags = keywords?.slice(1);
+    if (r18) {
+      if (r18.toLowerCase() === "r18") {
+        params.append("r18", "1");
+        tags = keywords?.slice(1);
+      }
     }
     if (args[0]) {
       params.append("num", args[0].toString());
@@ -1718,7 +1720,8 @@ async function randomHImg(keywords, ...args) {
       for (let item of res.data?.data) {
         let author = item.author;
         let url = item.urls.regular;
-        result_content += "作者: " + author + "\n" + import_koishi12.h.image(url) + "\n";
+        let tags2 = item.tags;
+        result_content += "作者: " + author + "\n标签: \n[" + tags2.join(",") + "]\n" + import_koishi12.h.image(url) + "\n";
       }
       return {
         result: result_content,
@@ -1745,6 +1748,7 @@ function registerHImgCommands(ctx) {
     if (!dev_mode) {
       if (!is_at_bot(session)) return;
     }
+    await session.send("已收到，正在随机...");
     const tag = args;
     if (!tag) return "请提供正确格式，如：@bot setu [是否r-18] [标签1] [标签2]";
     let exec = await randomHImg(tag);
@@ -1756,6 +1760,7 @@ function registerHImgCommands(ctx) {
     if (!dev_mode) {
       if (!is_at_bot(session)) return;
     }
+    await session.send("已收到，正在随机...");
     if (!args) return "请提供正确格式，如：@bot setus [数量(1-10)] [是否r-18] [标签1] [标签2]";
     try {
       const num = parseInt(args[0]);
@@ -2184,11 +2189,33 @@ __name(registerKuroCommands, "registerKuroCommands");
 var import_koishi13 = require("koishi");
 
 // src/services/game_func/game_service.ts
+var gameTimeout = null;
+var GAME_TIMEOUT_MINUTES = -1;
+function setGameTimeoutMinutes(minutes) {
+  GAME_TIMEOUT_MINUTES = minutes;
+}
+__name(setGameTimeoutMinutes, "setGameTimeoutMinutes");
+function setGameTimeout(func, timeoutMs) {
+  if (func === null) {
+    clearGameTimeout();
+    return;
+  }
+  const timeout = timeoutMs !== void 0 ? timeoutMs : GAME_TIMEOUT_MINUTES * 60 * 1e3;
+  gameTimeout = setTimeout(func, timeout);
+}
+__name(setGameTimeout, "setGameTimeout");
+function clearGameTimeout() {
+  if (gameTimeout) {
+    clearTimeout(gameTimeout);
+    gameTimeout = null;
+  }
+}
+__name(clearGameTimeout, "clearGameTimeout");
+
+// src/services/game_func/games/game_turtlesoup_service.ts
 var is_gaming = false;
 var chatPrompt = [];
 var chatHistory2 = [];
-var gameTimeout = null;
-var GAME_TIMEOUT_MINUTES = -1;
 async function startSituationPuzzle(config) {
   chatPrompt = [];
   chatHistory2 = [];
@@ -2202,28 +2229,18 @@ async function startSituationPuzzle(config) {
   }
   chatPrompt.push({ role: "assistant", content: [{ type: "text", text: resp }] });
   is_gaming = true;
-  if (GAME_TIMEOUT_MINUTES <= 0) {
-    GAME_TIMEOUT_MINUTES = local_config2?.game?.timeout_minutes || 10;
-  }
   clearGameTimeout();
-  gameTimeout = setTimeout(async () => {
+  setGameTimeout(async () => {
     logger.info(`[SituationPuzzle Timeout]: 游戏已超时（${GAME_TIMEOUT_MINUTES}分钟），自动结束游戏`);
     is_gaming = false;
     chatPrompt = [];
     chatHistory2 = [];
-    gameTimeout = null;
+    setGameTimeout(null);
   }, GAME_TIMEOUT_MINUTES * 60 * 1e3);
   logger.info("[startSituationPuzzle Info]: ai api send message success");
   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 }] });
@@ -2237,7 +2254,16 @@ async function questSituationPuzzle(content, config) {
     is_gaming = false;
     chatPrompt = [];
     chatHistory2 = [];
-    gameTimeout = null;
+    clearGameTimeout();
+  } else {
+    clearGameTimeout();
+    setGameTimeout(async () => {
+      logger.info(`[SituationPuzzle Timeout]: 游戏已超时（${GAME_TIMEOUT_MINUTES}分钟），自动结束游戏`);
+      is_gaming = false;
+      chatPrompt = [];
+      chatHistory2 = [];
+      setGameTimeout(null);
+    }, GAME_TIMEOUT_MINUTES * 60 * 1e3);
   }
   return resp;
 }
@@ -2251,6 +2277,7 @@ async function endSituationPuzzle(config) {
     logger.error("[endSituationPuzzle Error]: " + err);
     return null;
   }
+  clearGameTimeout();
   logger.info("[endSituationPuzzle Info]: ai api send message success");
   return resp;
 }
@@ -2269,11 +2296,120 @@ 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;
+  clearGameTimeout();
+  setGameTimeout(async () => {
+    logger.info(`[SituationPuzzle Timeout]: 游戏已超时（${GAME_TIMEOUT_MINUTES}分钟），自动结束游戏`);
+    is_gaming = false;
+    chatPrompt = [];
+    chatHistory2 = [];
+    setGameTimeout(null);
+  }, GAME_TIMEOUT_MINUTES * 60 * 1e3);
   logger.info("[rerollSituationPuzzle Info]: ai api send message success");
   return resp;
 }
 __name(rerollSituationPuzzle, "rerollSituationPuzzle");
 
+// src/services/game_func/games/game_24_service.ts
+var EPSILON = 1e-6;
+function solve24(nodes) {
+  if (nodes.length === 1) {
+    return Math.abs(nodes[0].value - 24) < EPSILON ? nodes[0].expr : null;
+  }
+  for (let i = 0; i < nodes.length; i++) {
+    for (let j = 0; j < nodes.length; j++) {
+      if (i === j) continue;
+      const rest = [];
+      for (let k = 0; k < nodes.length; k++) {
+        if (k !== i && k !== j) rest.push(nodes[k]);
+      }
+      const a = nodes[i];
+      const b = nodes[j];
+      const candidates = [
+        { value: a.value + b.value, expr: `(${a.expr} + ${b.expr})` },
+        { value: a.value - b.value, expr: `(${a.expr} - ${b.expr})` },
+        { value: a.value * b.value, expr: `(${a.expr} * ${b.expr})` }
+      ];
+      if (Math.abs(b.value) > EPSILON) {
+        candidates.push({
+          value: a.value / b.value,
+          expr: `(${a.expr} / ${b.expr})`
+        });
+      }
+      for (const c of candidates) {
+        rest.push(c);
+        const res = solve24(rest);
+        if (res) return res;
+        rest.pop();
+      }
+    }
+  }
+  return null;
+}
+__name(solve24, "solve24");
+function calcDifficulty(expr) {
+  let score = 0;
+  if (expr.includes("/")) score += 2;
+  if (expr.includes("-")) score += 1;
+  let depth = 0;
+  let maxDepth = 0;
+  for (const ch of expr) {
+    if (ch === "(") {
+      depth++;
+      maxDepth = Math.max(maxDepth, depth);
+    } else if (ch === ")") {
+      depth--;
+    }
+  }
+  score += maxDepth;
+  if (expr.match(/\/\s*[1-9]/)) score += 1;
+  return score;
+}
+__name(calcDifficulty, "calcDifficulty");
+function generate24Puzzle(minScore = 6) {
+  while (true) {
+    const numbers = Array.from(
+      { length: 4 },
+      () => Math.floor(Math.random() * 13) + 1
+    );
+    if (numbers.includes(1) && numbers.includes(2) && numbers.includes(3)) {
+      continue;
+    }
+    const nodes = numbers.map((n) => ({
+      value: n,
+      expr: n.toString()
+    }));
+    const solution = solve24(nodes);
+    if (!solution) continue;
+    const score = calcDifficulty(solution);
+    if (score >= minScore) {
+      return {
+        numbers,
+        solution: `${solution} = 24`
+      };
+    }
+  }
+}
+__name(generate24Puzzle, "generate24Puzzle");
+var currentPuzzle = null;
+function newPuzzle() {
+  currentPuzzle = generate24Puzzle();
+  clearGameTimeout();
+  setGameTimeout(async () => {
+    logger.info(`[Puzzle24 Timeout]: 24点游戏已超时（${GAME_TIMEOUT_MINUTES}分钟），自动结束游戏`);
+    currentPuzzle = null;
+    setGameTimeout(null);
+  }, GAME_TIMEOUT_MINUTES * 60 * 1e3);
+  return currentPuzzle.numbers;
+}
+__name(newPuzzle, "newPuzzle");
+function getSolution() {
+  if (!currentPuzzle) {
+    throw new Error("尚未生成题目");
+  }
+  return currentPuzzle.solution;
+}
+__name(getSolution, "getSolution");
+
 // src/services/game_func/game_command.ts
 var local_config2 = null;
 var is_thinking = false;
@@ -2283,6 +2419,11 @@ var gameList = [
     name: "AI海龟汤",
     description: "AI海龟汤游戏，通过AI回答问题，猜测答案",
     command: "puzzle"
+  },
+  {
+    name: "24点题目生成",
+    description: "24点游戏，生成24点题目，无回复功能",
+    command: "24"
   }
 ];
 var commandList = [
@@ -2300,6 +2441,9 @@ function registerGameCommands(ctx, game_config, ai_config) {
   } else {
     logger.error("[loadYamlConfig Error]: 未配置 Game 配置文件路径");
   }
+  if (GAME_TIMEOUT_MINUTES <= 0) {
+    setGameTimeoutMinutes(local_config2?.game?.timeout_minutes || 10);
+  }
   ctx.command("gamelist", "查看所有游戏").action(async ({}) => {
     return `[所有命令都需要@bot]
 游戏列表:
@@ -2316,12 +2460,20 @@ function registerGameCommands(ctx, game_config, ai_config) {
     if (!game) return "请提供正确格式，如：@bot startgame [游戏]";
     try {
       is_thinking = true;
+      let resp_text = "";
       switch (game) {
+        // 海龟汤
         case gameList[0].command:
           await session.send("正在开始游戏...后续问答请参照格式：@bot [问题]\n需要刷新谜题时发送：@bot reroll");
-          const resp = await startSituationPuzzle(ai_config);
+          resp_text = await startSituationPuzzle(ai_config);
           now_game = game;
-          return checkResp(resp);
+          return checkResp(resp_text);
+        // 24点生成
+        case gameList[1].command:
+          const numbers = await newPuzzle();
+          resp_text = `题目: ${numbers.join(" ")}`;
+          now_game = game;
+          return checkResp(resp_text);
         default:
           return `游戏不存在，请输入gamelist查看所有游戏`;
       }
@@ -2329,6 +2481,36 @@ function registerGameCommands(ctx, game_config, ai_config) {
       is_thinking = false;
     }
   });
+  ctx.command("endgame", "结束游戏").action(async ({ session }) => {
+    if (!dev_mode) {
+      if (!is_at_bot(session)) return;
+    }
+    if (!now_game) return "未开始游戏";
+    if (now_game == gameList[0].command) return;
+    if (is_thinking) return "正在思考，请耐心等待...";
+    try {
+      is_thinking = true;
+      await session.send("正在结束游戏...");
+      let resp_text = "";
+      switch (now_game) {
+        case gameList[0].command:
+          await session.send("正在结束游戏...");
+          resp_text = await endSituationPuzzle(ai_config);
+          now_game = null;
+          return checkResp(resp_text);
+        case gameList[1].command:
+          resp_text = await getSolution();
+          resp_text = `答案: ${getSolution()}`;
+          now_game = null;
+          clearGameTimeout();
+          return checkResp(resp_text);
+        default:
+          return;
+      }
+    } finally {
+      is_thinking = false;
+    }
+  });
 }
 __name(registerGameCommands, "registerGameCommands");
 function registerGameMiddleware(ctx, ai_config) {

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

@@ -0,0 +1,3 @@
+declare const EPSILON = 0.000001;
+declare function canMake24(nums: number[]): boolean;
+declare function compute(a: number, b: number): number[];

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

@@ -1,7 +1,6 @@
-import { AiAPIConfig } from "../../utils/config";
-declare let is_gaming: boolean;
-declare function startSituationPuzzle(config: AiAPIConfig): Promise<string>;
-declare function questSituationPuzzle(content: string, config: AiAPIConfig): Promise<string>;
-declare function endSituationPuzzle(config: AiAPIConfig): Promise<string>;
-declare function rerollSituationPuzzle(config: AiAPIConfig): Promise<string>;
-export { is_gaming, startSituationPuzzle, questSituationPuzzle, endSituationPuzzle, rerollSituationPuzzle };
+declare let gameTimeout: NodeJS.Timeout | null;
+declare var GAME_TIMEOUT_MINUTES: number;
+declare function setGameTimeoutMinutes(minutes: number): void;
+declare function setGameTimeout(func: (() => void) | null, timeoutMs?: number): void;
+declare function clearGameTimeout(): void;
+export { gameTimeout, GAME_TIMEOUT_MINUTES, setGameTimeoutMinutes, setGameTimeout, clearGameTimeout };

package/lib/services/game_func/games/game_24_service.d.ts

@@ -0,0 +1,3 @@
+declare function newPuzzle(): number[];
+declare function getSolution(): string;
+export { newPuzzle, getSolution };

package/lib/services/game_func/games/game_turtlesoup_service.d.ts

@@ -0,0 +1,7 @@
+import { AiAPIConfig } from "../../../utils/config";
+declare let is_gaming: boolean;
+declare function startSituationPuzzle(config: AiAPIConfig): Promise<string>;
+declare function questSituationPuzzle(content: string, config: AiAPIConfig): Promise<string>;
+declare function endSituationPuzzle(config: AiAPIConfig): Promise<string>;
+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.3-alpha.0",
+  "version": "1.1.3-alpha.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [