koishi-plugin-best-cave 2.7.33 → 2.7.34

package/lib/index.js

@@ -1366,18 +1366,31 @@ ${candidatesText}`;
       const response = await this.http.post(fullUrl, payload, { headers, timeout: 6e5 });
       const content = response?.choices?.[0]?.message?.content;
       if (!content?.trim()) throw new Error();
-      try {
-        const jsonBlockMatch = content.match(/```json\s*([\s\S]*?)\s*```/i);
-        const jsonString = jsonBlockMatch ? jsonBlockMatch[1] : content;
-        this.failureCount = 0;
-        return JSON.parse(jsonString);
-      } catch (e) {
-        this.logger.error("原始响应:", JSON.stringify(response, null, 2));
-        throw new Error();
+      const potentialStrings = /* @__PURE__ */ new Set();
+      const jsonBlockMatch = content.match(/```json\s*([\s\S]*?)\s*```/i);
+      if (jsonBlockMatch?.[1]) potentialStrings.add(jsonBlockMatch[1]);
+      const firstBrace = content.indexOf("{");
+      const lastBrace = content.lastIndexOf("}");
+      const firstBracket = content.indexOf("[");
+      const lastBracket = content.lastIndexOf("]");
+      if (firstBrace !== -1 && (firstBracket === -1 || firstBrace < firstBracket)) {
+        if (lastBrace > firstBrace) potentialStrings.add(content.substring(firstBrace, lastBrace + 1));
+      } else if (firstBracket !== -1) {
+        if (lastBracket > firstBracket) potentialStrings.add(content.substring(firstBracket, lastBracket + 1));
+      }
+      potentialStrings.add(content);
+      for (const jsonString of potentialStrings) {
+        try {
+          const result = JSON.parse(jsonString);
+          this.failureCount = 0;
+          return result;
+        } catch (e) {
+        }
       }
+      this.logger.error("原始响应:", JSON.stringify(response, null, 2));
+      throw new Error();
     } catch (error) {
       this.failureCount++;
-      this.logger.warn(`请求失败: ${error.message}`);
       if (this.failureCount >= 3) this.retryTime = Date.now() + 6e4;
       throw error;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-best-cave",
   "description": "功能强大、高度可定制的回声洞插件。支持丰富的媒体类型、内容查重、AI分析、人工审核、用户昵称、数据迁移以及本地/S3 双重文件存储后端。",
-  "version": "2.7.33",
+  "version": "2.7.34",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],