@simonyea/holysheep-cli 1.7.20 → 1.7.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.20",
+  "version": "1.7.22",
   "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',
@@ -584,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',
@@ -707,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

@@ -205,10 +205,10 @@ function startBridge(port) {
   const scriptPath = path.join(__dirname, '..', 'index.js')
   // Windows: use shell+node command to avoid ERROR_FILE_NOT_FOUND with process.execPath
   // (Windows Store / nvm paths can be unresolvable when spawning detached)
+  // Windows: use 'node' (resolved via PATH by CreateProcess) without shell:true.
+  // shell:true spawns cmd.exe /c which exits after the command, breaking detach.
   const spawnCmd = isWin ? 'node' : process.execPath
-  const spawnOpts = isWin
-    ? { shell: true, detached: true, stdio: 'ignore', windowsHide: true }
-    : { detached: true, stdio: 'ignore' }
+  const spawnOpts = { detached: true, stdio: 'ignore', windowsHide: true }
   const child = spawn(spawnCmd, [scriptPath, 'openclaw-bridge', '--port', String(port)], spawnOpts)
   child.unref()
   return waitForBridge(port)
@@ -416,7 +416,7 @@ function normalizeRequestedModels(selectedModels) {
   return Array.from(new Set(requestedModels))
 }
 
-function buildManagedPlan(baseUrlBridge, primaryModel, selectedModels) {
+function buildManagedPlan(baseUrlBridge, apiKey, primaryModel, selectedModels) {
   const requestedModels = normalizeRequestedModels(selectedModels)
   const managedModelRefs = requestedModels.map((model) => `${OPENCLAW_PROVIDER_NAME}/${model}`)
   const fallbackPrimaryModel = pickPrimaryModel(primaryModel, requestedModels)
@@ -428,6 +428,7 @@ function buildManagedPlan(baseUrlBridge, primaryModel, selectedModels) {
     providers: {
       [OPENCLAW_PROVIDER_NAME]: {
         baseUrl: baseUrlBridge,
+        apiKey,
         api: 'openai-completions',
         models: requestedModels.map(buildModelEntry),
       },
@@ -445,10 +446,10 @@ function isHolySheepProvider(provider) {
   )
 }
 
-function writeManagedConfig(baseConfig, bridgeBaseUrl, primaryModel, selectedModels, gatewayPort) {
+function writeManagedConfig(baseConfig, bridgeBaseUrl, apiKey, primaryModel, selectedModels, gatewayPort) {
   fs.mkdirSync(OPENCLAW_DIR, { recursive: true })
 
-  const plan = buildManagedPlan(bridgeBaseUrl, primaryModel, selectedModels)
+  const plan = buildManagedPlan(bridgeBaseUrl, apiKey, primaryModel, selectedModels)
   const existingProviders = baseConfig?.models?.providers || {}
   const managedProviderIds = Object.entries(existingProviders)
     .filter(([providerId, provider]) => providerId === OPENCLAW_PROVIDER_NAME || isHolySheepProvider(provider))
@@ -692,6 +693,7 @@ module.exports = {
     const plan = writeManagedConfig(
       result.status === 0 ? readConfig() : {},
       bridgeBaseUrl,
+      apiKey,
       resolvedPrimaryModel,
       selectedModels,
       gatewayPort,