@simonyea/holysheep-cli 1.7.17 → 1.7.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.17",
+  "version": "1.7.19",
   "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

@@ -256,13 +256,13 @@ function convertToolChoice(toolChoice) {
   return { type: 'auto' }
 }
 
-function buildAnthropicPayload(requestBody) {
+function buildAnthropicPayload(requestBody, stream = false) {
   const converted = convertOpenAIToAnthropicMessages(requestBody.messages)
   const payload = {
     model: requestBody.model,
     max_tokens: requestBody.max_tokens || requestBody.max_completion_tokens || requestBody.max_output_tokens || 4096,
     messages: converted.messages,
-    stream: false,
+    stream: Boolean(stream),
   }
 
   if (converted.system) payload.system = converted.system
@@ -540,7 +540,156 @@ async function relayOpenAIRequest(requestBody, config, res) {
   res.end(text)
 }
 
+// 兼容 native fetch (ReadableStream) 和 node-fetch v2 (Node.js stream) 的流读取
+async function pipeStream(body, onChunk) {
+  if (body == null) return
+  if (typeof body.getReader === 'function') {
+    const reader = body.getReader()
+    const decoder = new TextDecoder()
+    try {
+      while (true) {
+        const { done, value } = await reader.read()
+        if (done) break
+        onChunk(decoder.decode(value, { stream: true }))
+      }
+      onChunk(decoder.decode())
+    } finally {
+      reader.releaseLock()
+    }
+  } else {
+    for await (const chunk of body) {
+      onChunk(typeof chunk === 'string' ? chunk : chunk.toString())
+    }
+  }
+}
+
+// Anthropic SSE → OpenAI SSE 实时透传（避免整包缓冲导致 OpenClaw timeout）
+async function relayAnthropicStream(requestBody, config, route, res) {
+  const payload = buildAnthropicPayload(requestBody, true)
+  const baseUrl = route === 'minimax'
+    ? `${config.baseUrlAnthropic.replace(/\/+$/, '')}/minimax/v1/messages`
+    : `${config.baseUrlAnthropic.replace(/\/+$/, '')}/v1/messages`
+
+  let upstream
+  try {
+    upstream = await fetch(baseUrl, {
+      method: 'POST',
+      headers: {
+        'content-type': 'application/json',
+        'x-api-key': config.apiKey,
+        'anthropic-version': '2023-06-01',
+        'user-agent': 'holysheep-openclaw-bridge/1.0',
+      },
+      body: JSON.stringify(payload),
+    })
+  } catch (err) {
+    return sendJson(res, 500, { error: { message: err.message || 'Bridge upstream error' } })
+  }
+
+  if (!upstream.ok) {
+    let errBody
+    try { errBody = JSON.parse(await upstream.text()) } catch { errBody = { error: { message: 'Upstream error' } } }
+    return sendJson(res, upstream.status, errBody)
+  }
+
+  res.writeHead(200, {
+    'content-type': 'text/event-stream; charset=utf-8',
+    'cache-control': 'no-cache, no-transform',
+    connection: 'keep-alive',
+  })
+
+  const msgId = `chatcmpl_${Date.now()}`
+  const created = Math.floor(Date.now() / 1000)
+  const model = requestBody.model
+  let headerSent = false
+  let inputTokens = 0
+  // tool_use 流式：按 content block index 收集
+  const toolBlocks = {}  // index → {id, name, argsBuf}
+
+  function writeChunk(delta, finishReason, usage) {
+    const chunk = {
+      id: msgId,
+      object: 'chat.completion.chunk',
+      created,
+      model,
+      choices: [{ index: 0, delta, finish_reason: finishReason || null }],
+    }
+    if (usage) chunk.usage = usage
+    res.write(`data: ${JSON.stringify(chunk)}\n\n`)
+  }
+
+  function handleEvent(event, data) {
+    if (data === '[DONE]') return
+    let obj
+    try { obj = JSON.parse(data) } catch { return }
+
+    if (event === 'message_start') {
+      inputTokens = obj.message?.usage?.input_tokens || 0
+      if (!headerSent) {
+        writeChunk({ role: 'assistant', content: '' }, null, null)
+        headerSent = true
+      }
+    } else if (event === 'content_block_start') {
+      if (!headerSent) { writeChunk({ role: 'assistant', content: '' }, null, null); headerSent = true }
+      const block = obj.content_block || {}
+      if (block.type === 'tool_use') {
+        toolBlocks[obj.index] = { id: block.id, name: block.name, argsBuf: '' }
+        writeChunk({
+          tool_calls: [{ index: obj.index, id: block.id, type: 'function', function: { name: block.name, arguments: '' } }],
+        }, null, null)
+      }
+    } else if (event === 'content_block_delta') {
+      if (!headerSent) { writeChunk({ role: 'assistant', content: '' }, null, null); headerSent = true }
+      const delta = obj.delta || {}
+      if (delta.type === 'text_delta' && typeof delta.text === 'string') {
+        writeChunk({ content: delta.text }, null, null)
+      } else if (delta.type === 'input_json_delta' && typeof delta.partial_json === 'string') {
+        if (toolBlocks[obj.index]) toolBlocks[obj.index].argsBuf += delta.partial_json
+        writeChunk({ tool_calls: [{ index: obj.index, function: { arguments: delta.partial_json } }] }, null, null)
+      }
+    } else if (event === 'message_delta') {
+      const stopReason = obj.delta?.stop_reason
+      const finishReason = mapFinishReason(stopReason)
+      const outputTokens = obj.usage?.output_tokens || 0
+      const usage = {
+        prompt_tokens: inputTokens,
+        completion_tokens: outputTokens,
+        total_tokens: inputTokens + outputTokens,
+      }
+      if (!headerSent) { writeChunk({ role: 'assistant', content: '' }, null, null); headerSent = true }
+      writeChunk({}, finishReason, usage)
+    }
+  }
+
+  let buf = ''
+  let curEvent = ''
+
+  function processBuffer(text) {
+    buf += text
+    const lines = buf.split('\n')
+    buf = lines.pop() ?? ''
+    for (const line of lines) {
+      const trimmed = line.trimEnd()
+      if (trimmed.startsWith('event:')) {
+        curEvent = trimmed.slice(6).trim()
+      } else if (trimmed.startsWith('data:')) {
+        handleEvent(curEvent, trimmed.slice(5).trim())
+        curEvent = ''
+      }
+    }
+  }
+
+  try {
+    await pipeStream(upstream.body, processBuffer)
+  } catch {}
+
+  if (!res.writableEnded) res.end('data: [DONE]\n\n')
+}
+
 async function relayAnthropicRequest(requestBody, config, route, res) {
+  if (requestBody.stream === true) {
+    return relayAnthropicStream(requestBody, config, route, res)
+  }
   const payload = buildAnthropicPayload(requestBody)
   const baseUrl = route === 'minimax'
     ? `${config.baseUrlAnthropic.replace(/\/+$/, '')}/minimax/v1/messages`
@@ -613,9 +762,8 @@ async function checkGatewayHealth(config) {
 
   try {
     const response = await fetch(`http://${host}:${gatewayPort}/`, { method: 'GET', timeout })
-    return response.ok
-      ? { ok: true, reason: 'gateway_http_ok' }
-      : { ok: false, reason: `gateway_http_${response.status}` }
+    // 任何 HTTP 响应都说明 Gateway 进程存活（4xx 可能是正常的路由/auth 行为）
+    return { ok: true, reason: `gateway_http_${response.status}` }
   } catch {
     return { ok: false, reason: 'gateway_http_unreachable' }
   }