@simonyea/holysheep-cli 1.7.19 → 1.7.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.19",
+  "version": "1.7.21",
   "description": "Claude Code/Cursor/Cline API relay for China — ¥1=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
   "keywords": [
     "openai-china",

package/src/tools/openclaw-bridge.js

@@ -6,6 +6,19 @@ const http = require('http')
 const path = require('path')
 const os = require('os')
 const fetch = global.fetch || require('node-fetch')
+const _nodeFetch = require('node-fetch')
+
+// Windows 上 api.holysheep.ai 有 IPv6 DNS 记录，但 Windows Server 普遍未启用 IPv6。
+// Node.js 默认 IPv6 优先，会导致每次请求先卡在 IPv6 连接超时再降级 IPv4，
+// 超过 OpenClaw embedded agent 的 timeout 阈值，触发 "LLM request timed out"。
+// 解决方案：Windows 下强制用 node-fetch + https.Agent({family:4}) 只走 IPv4。
+function upstreamFetch(url, options) {
+  if (process.platform === 'win32' && String(url).startsWith('https://')) {
+    const https = require('https')
+    return _nodeFetch(url, { ...options, agent: new https.Agent({ family: 4 }) })
+  }
+  return fetch(url, options)
+}
 
 const OPENCLAW_DIR = path.join(os.homedir(), '.openclaw')
 const BRIDGE_CONFIG_FILE = path.join(OPENCLAW_DIR, 'holysheep-bridge.json')
@@ -516,7 +529,7 @@ async function relayOpenAIRequest(requestBody, config, res) {
     ...requestBody,
     stream: requestBody.stream === true,
   }
-  const upstream = await fetch(`${config.baseUrlOpenAI.replace(/\/+$/, '')}/chat/completions`, {
+  const upstream = await upstreamFetch(`${config.baseUrlOpenAI.replace(/\/+$/, '')}/chat/completions`, {
     method: 'POST',
     headers: {
       'content-type': 'application/json',
@@ -526,6 +539,18 @@ async function relayOpenAIRequest(requestBody, config, res) {
     body: JSON.stringify(upstreamBody),
   })
 
+  // 流式请求：直接字节透传（已是 OpenAI SSE 格式，无需转换）
+  if (requestBody.stream === true && upstream.ok) {
+    res.writeHead(200, {
+      'content-type': 'text/event-stream; charset=utf-8',
+      'cache-control': 'no-cache, no-transform',
+      connection: 'keep-alive',
+    })
+    try { await pipeStream(upstream.body, (chunk) => res.write(chunk)) } catch {}
+    if (!res.writableEnded) res.end()
+    return
+  }
+
   const text = await upstream.text()
   const parsed = parseOpenAIStreamText(text, requestBody.model)
   if (upstream.ok && parsed) {
@@ -572,7 +597,7 @@ async function relayAnthropicStream(requestBody, config, route, res) {
 
   let upstream
   try {
-    upstream = await fetch(baseUrl, {
+    upstream = await upstreamFetch(baseUrl, {
       method: 'POST',
       headers: {
         'content-type': 'application/json',
@@ -695,7 +720,7 @@ async function relayAnthropicRequest(requestBody, config, route, res) {
     ? `${config.baseUrlAnthropic.replace(/\/+$/, '')}/minimax/v1/messages`
     : `${config.baseUrlAnthropic.replace(/\/+$/, '')}/v1/messages`
 
-  const upstream = await fetch(baseUrl, {
+  const upstream = await upstreamFetch(baseUrl, {
     method: 'POST',
     headers: {
       'content-type': 'application/json',

package/src/tools/openclaw.js

@@ -203,10 +203,13 @@ function startBridge(port) {
   if (waitForBridge(port)) return true
 
   const scriptPath = path.join(__dirname, '..', 'index.js')
-  const child = spawn(process.execPath, [scriptPath, 'openclaw-bridge', '--port', String(port)], {
-    detached: true,
-    stdio: 'ignore',
-  })
+  // Windows: use shell+node command to avoid ERROR_FILE_NOT_FOUND with process.execPath
+  // (Windows Store / nvm paths can be unresolvable when spawning detached)
+  const spawnCmd = isWin ? 'node' : process.execPath
+  const spawnOpts = isWin
+    ? { shell: true, detached: true, stdio: 'ignore', windowsHide: true }
+    : { detached: true, stdio: 'ignore' }
+  const child = spawn(spawnCmd, [scriptPath, 'openclaw-bridge', '--port', String(port)], spawnOpts)
   child.unref()
   return waitForBridge(port)
 }