koishi-plugin-cocoyyy-console 1.1.3 → 1.1.5

package/lib/index.js

@@ -1894,6 +1894,50 @@ var tools = [
     }
   }
 ];
+function safeParseJSON(jsonString) {
+  if (!jsonString || typeof jsonString !== "string") {
+    throw new Error("输入不是有效的字符串");
+  }
+  let cleaned = jsonString.trim();
+  cleaned = cleaned.replace(/^```(?:json)?\s*\n?/i, "");
+  cleaned = cleaned.replace(/\n?```\s*$/i, "");
+  cleaned = cleaned.trim();
+  try {
+    return JSON.parse(cleaned);
+  } catch (error) {
+    logger.error(`[safeParseJSON Error]: 无法解析 JSON，原始内容: ${jsonString.substring(0, 200)}...`);
+    throw error;
+  }
+}
+__name(safeParseJSON, "safeParseJSON");
+function findNestedValue(obj, key) {
+  if (obj === null || obj === void 0) {
+    return void 0;
+  }
+  if (typeof obj === "object" && !Array.isArray(obj)) {
+    if (key in obj) {
+      return obj[key];
+    }
+    for (const prop in obj) {
+      if (obj.hasOwnProperty(prop)) {
+        const result = findNestedValue(obj[prop], key);
+        if (result !== void 0) {
+          return result;
+        }
+      }
+    }
+  }
+  if (Array.isArray(obj)) {
+    for (const item of obj) {
+      const result = findNestedValue(item, key);
+      if (result !== void 0) {
+        return result;
+      }
+    }
+  }
+  return void 0;
+}
+__name(findNestedValue, "findNestedValue");
 async function checkAudit(local_config4, wish_content, config, wish_config) {
   let prompt_msg = "";
   if (!local_config4) return { result: false, reason: "未加载配置文件，请查看日志" };
@@ -1920,7 +1964,7 @@ async function checkAudit(local_config4, wish_content, config, wish_config) {
       logger.error("[checkAudit Error]: API返回为空");
       return { result: false, reason: "API返回为空" };
     }
-    const json = JSON.parse(resp);
+    const json = safeParseJSON(resp);
     if (json.category == "block") {
       logger.info("[checkAudit Info]: 愿望被拒绝，原因: " + json.reason);
       return { result: false, reason: json.reason };
@@ -1958,10 +2002,14 @@ async function gernerationSoluation(local_config4, wish_content, config, wish_co
       logger.error("[gernerationSoluation Error]: " + err);
       return null;
     }
-    const json = JSON.parse(resp);
-    const scenario = json.scenario;
+    if (!resp) {
+      logger.error("[gernerationSoluation Error]: API返回为空");
+      return null;
+    }
+    const json = safeParseJSON(resp);
+    const scenario = json.scenario || findNestedValue(json, "scenario");
     if (!scenario) {
-      logger.info("[gernerationSoluation Info]: API返回有误: " + resp);
+      logger.info("[gernerationSoluation Info]: API返回有误，未找到scenario字段: " + resp);
       return null;
     }
     return scenario;

package/package.json

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