viho-llm 1.0.8 → 1.0.9

package/index.js

@@ -538,29 +538,38 @@ const callLLM = async (options) => {
  * @returns
  */
 const extractJSON = (text) => {
-  const cleaned = text.replace(/\{\{/g, '{').replace(/\}\}/g, '}');
+  if (typeof text === 'object' && text !== null) return text;
+  const str = String(text).trim();
+
+  // 1. 尝试直接解析
   try {
-    return JSON.parse(cleaned);
-  } catch (e) {
-    // try next
+    return JSON.parse(str);
+  } catch (_) {
+    /* ignore */
   }
-  const codeBlock = cleaned.match(/```(?:json)?\s*([\s\S]*?)```/);
-  if (codeBlock) {
+
+  // 2. 尝试从 markdown 代码块提取
+  const codeBlockMatch = str.match(/```(?:json)?\s*\n?([\s\S]*?)\n?```/);
+  if (codeBlockMatch) {
     try {
-      return JSON.parse(codeBlock[1].trim());
-    } catch (e) {
-      // try next
+      return JSON.parse(codeBlockMatch[1].trim());
+    } catch (_) {
+      /* ignore */
     }
   }
-  const match = cleaned.match(/(\{[\s\S]*\}|\[[\s\S]*\])/);
-  if (match) {
+
+  // 3. 尝试提取第一个 {...} 块
+  const firstBrace = str.indexOf('{');
+  const lastBrace = str.lastIndexOf('}');
+  if (firstBrace !== -1 && lastBrace > firstBrace) {
     try {
-      return JSON.parse(match[1]);
-    } catch (e) {
-      // try next
+      return JSON.parse(str.slice(firstBrace, lastBrace + 1));
+    } catch (_) {
+      /* ignore */
     }
   }
-  throw new Error(`Cannot extract JSON from: ${text.slice(0, 200)}`);
+
+  throw new Error(`Cannot parse JSON from LLM response: ${str.slice(0, 200)}`);
 };
 
 // util

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "viho-llm",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Utility library for working with multiple LLM providers (Google Gemini and OpenAI), providing common tools and helpers for AI interactions",
   "keywords": [
     "llm",
@@ -68,5 +68,5 @@
       }
     }
   },
-  "gitHead": "46a9940278370dfe84caa47adcb4ebcd1f5c1393"
+  "gitHead": "24672073850eae9daef6781b1eec972b899381ad"
 }

package/src/agents/agent-util.js

@@ -22,27 +22,36 @@ export const callLLM = async (options) => {
  * @returns
  */
 export const extractJSON = (text) => {
-  const cleaned = text.replace(/\{\{/g, '{').replace(/\}\}/g, '}');
+  if (typeof text === 'object' && text !== null) return text;
+  const str = String(text).trim();
+
+  // 1. 尝试直接解析
   try {
-    return JSON.parse(cleaned);
-  } catch (e) {
-    // try next
+    return JSON.parse(str);
+  } catch (_) {
+    /* ignore */
   }
-  const codeBlock = cleaned.match(/```(?:json)?\s*([\s\S]*?)```/);
-  if (codeBlock) {
+
+  // 2. 尝试从 markdown 代码块提取
+  const codeBlockMatch = str.match(/```(?:json)?\s*\n?([\s\S]*?)\n?```/);
+  if (codeBlockMatch) {
     try {
-      return JSON.parse(codeBlock[1].trim());
-    } catch (e) {
-      // try next
+      return JSON.parse(codeBlockMatch[1].trim());
+    } catch (_) {
+      /* ignore */
     }
   }
-  const match = cleaned.match(/(\{[\s\S]*\}|\[[\s\S]*\])/);
-  if (match) {
+
+  // 3. 尝试提取第一个 {...} 块
+  const firstBrace = str.indexOf('{');
+  const lastBrace = str.lastIndexOf('}');
+  if (firstBrace !== -1 && lastBrace > firstBrace) {
     try {
-      return JSON.parse(match[1]);
-    } catch (e) {
-      // try next
+      return JSON.parse(str.slice(firstBrace, lastBrace + 1));
+    } catch (_) {
+      /* ignore */
     }
   }
-  throw new Error(`Cannot extract JSON from: ${text.slice(0, 200)}`);
+
+  throw new Error(`Cannot parse JSON from LLM response: ${str.slice(0, 200)}`);
 };