xiaozhou-chat 1.0.15 → 1.0.16

package/lib/chat.js

@@ -3,6 +3,7 @@ import { Spinner, StreamPrinter } from "./ui.js";
 import { sleep } from "./utils.js";
 import { updateConfig, setProfileValue } from "./config.js";
 import { builtInTools } from "./tools.js";
+import { Agent, fetch as undiciFetch } from "undici";
 
 // 尝试加载 Markdown 渲染库
 let marked;
@@ -14,9 +15,21 @@ try {
 
 export async function requestWithRetry(url, options, maxRetries = 3) {
     let lastError;
+    let useNoProxy = false;
+
     for (let i = 0; i <= maxRetries; i++) {
         try {
-            const res = await fetch(url, options);
+            let res;
+            if (useNoProxy) {
+                 const dispatcher = new Agent({
+                    connect: { timeout: 30000 }
+                });
+                // @ts-ignore
+                res = await undiciFetch(url, { ...options, dispatcher });
+            } else {
+                res = await fetch(url, options);
+            }
+
             if (!res.ok) {
                 const text = await res.text();
                 // 4xx errors: do not retry
@@ -30,6 +43,20 @@ export async function requestWithRetry(url, options, maxRetries = 3) {
         } catch (e) {
             lastError = e;
             if (e.name === 'AbortError') throw e;
+
+            // 智能代理 fallback: 如果失败且环境中有代理配置，尝试直连
+            const isNetworkError = e.message.includes("fetch failed") || e.cause?.code === 'ECONNREFUSED' || e.cause?.code === 'ETIMEDOUT';
+            const hasProxyEnv = process.env.HTTP_PROXY || process.env.HTTPS_PROXY || process.env.ALL_PROXY;
+
+            if (isNetworkError && hasProxyEnv && !useNoProxy) {
+                console.log(`\n⚠️  检测到网络错误，且存在代理环境变量 (${process.env.HTTPS_PROXY || process.env.HTTP_PROXY})`);
+                console.log("🔄 自动尝试忽略代理进行直连...");
+                useNoProxy = true;
+                // 不计入重试次数，立即重试
+                i--; 
+                continue;
+            }
+
             if (i === maxRetries) break;
             
             const delay = 1000 * Math.pow(2, i);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaozhou-chat",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "CLI chatbot based on NewAPI",
   "bin": {
     "xiaozhou-chat": "bin/cli.js"
@@ -22,7 +22,8 @@
     "marked": "^15.0.12",
     "marked-terminal": "^7.3.0",
     "minimist": "^1.2.8",
-    "moment": "^2.30.1"
+    "moment": "^2.30.1",
+    "undici": "^7.19.0"
   },
   "pkg": {
     "assets": []