npm - @simonyea/holysheep-cli - Versions diffs - 2.1.56 → 2.1.58 - Mend

@simonyea/holysheep-cli 2.1.56 → 2.1.58

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/configure-worker.js +37 -32
package/dist/index.js +131 -42
package/package.json +1 -1

package/dist/configure-worker.js CHANGED Viewed

@@ -114,6 +114,7 @@ var require_claude_process_proxy = __commonJS({
     var MAX_PROXY_RETRIES = 3;
     var ENABLE_TIMING_LOG = process.env.HS_CLAUDE_TIMING_LOG === "1";
     var SLOW_PATH_LOG_MS = Number(process.env.HS_CLAUDE_SLOW_PATH_LOG_MS) || 5e3;
+    var ENABLE_LEASE_LOG = process.env.HS_CLAUDE_LEASE_LOG === "1";
     function sanitizeUrl(value) {
       if (!value) return "";
       try {
@@ -545,7 +546,7 @@ var require_claude_process_proxy = __commonJS({
       });
     }
     __name(createConnectTunnel, "createConnectTunnel");
-    var RESPONSE_TIMEOUT_MS = Number(process.env.HS_CLAUDE_RESPONSE_TIMEOUT_MS) || 3e4;
+    var RESPONSE_TIMEOUT_MS = Number(process.env.HS_CLAUDE_RESPONSE_TIMEOUT_MS) || 9e4;
     var STALL_TIMEOUT_MS = Number(process.env.HS_CLAUDE_STALL_TIMEOUT_MS) || 12e4;
     function pipeWithCleanup(a, b) {
       for (const sock of [a, b]) {
@@ -738,20 +739,22 @@ var require_claude_process_proxy = __commonJS({
               })();
               const forceReassign = shouldRefreshLeaseAfterError(lastError);
               const retryReason = String((lastError == null ? void 0 : lastError.body) || (lastError == null ? void 0 : lastError.message) || "").slice(0, 120);
-              if (forceReassign) {
-                console.error(`[hs-claude-proxy] lease.force-reassign ${JSON.stringify({
-                  sessionId,
-                  nodeId: (prevLease == null ? void 0 : prevLease.nodeId) || "",
-                  attempt,
-                  reason: retryReason
-                })}`);
-              } else {
-                console.error(`[hs-claude-proxy] lease.sticky-hit ${JSON.stringify({
-                  sessionId,
-                  nodeId: (prevLease == null ? void 0 : prevLease.nodeId) || "",
-                  attempt,
-                  retryReason
-                })}`);
+              if (ENABLE_LEASE_LOG) {
+                if (forceReassign) {
+                  console.error(`[hs-claude-proxy] lease.force-reassign ${JSON.stringify({
+                    sessionId,
+                    nodeId: (prevLease == null ? void 0 : prevLease.nodeId) || "",
+                    attempt,
+                    reason: retryReason
+                  })}`);
+                } else {
+                  console.error(`[hs-claude-proxy] lease.sticky-hit ${JSON.stringify({
+                    sessionId,
+                    nodeId: (prevLease == null ? void 0 : prevLease.nodeId) || "",
+                    attempt,
+                    retryReason
+                  })}`);
+                }
               }
               leaseCache.delete(sessionId);
               if (forceReassign) {
@@ -870,22 +873,24 @@ var require_claude_process_proxy = __commonJS({
               })();
               const forceReassign = shouldRefreshLeaseAfterError(lastError);
               const retryReason = String((lastError == null ? void 0 : lastError.body) || (lastError == null ? void 0 : lastError.message) || "").slice(0, 120);
-              if (forceReassign) {
-                console.error(`[hs-claude-proxy] lease.force-reassign ${JSON.stringify({
-                  sessionId,
-                  nodeId: (prevLease == null ? void 0 : prevLease.nodeId) || "",
-                  attempt,
-                  reason: retryReason,
-                  path: "CONNECT"
-                })}`);
-              } else {
-                console.error(`[hs-claude-proxy] lease.sticky-hit ${JSON.stringify({
-                  sessionId,
-                  nodeId: (prevLease == null ? void 0 : prevLease.nodeId) || "",
-                  attempt,
-                  retryReason,
-                  path: "CONNECT"
-                })}`);
+              if (ENABLE_LEASE_LOG) {
+                if (forceReassign) {
+                  console.error(`[hs-claude-proxy] lease.force-reassign ${JSON.stringify({
+                    sessionId,
+                    nodeId: (prevLease == null ? void 0 : prevLease.nodeId) || "",
+                    attempt,
+                    reason: retryReason,
+                    path: "CONNECT"
+                  })}`);
+                } else {
+                  console.error(`[hs-claude-proxy] lease.sticky-hit ${JSON.stringify({
+                    sessionId,
+                    nodeId: (prevLease == null ? void 0 : prevLease.nodeId) || "",
+                    attempt,
+                    retryReason,
+                    path: "CONNECT"
+                  })}`);
+                }
               }
               leaseCache.delete(sessionId);
               if (forceReassign) {
@@ -4081,7 +4086,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@simonyea/holysheep-cli",
-      version: "2.1.56",
+      version: "2.1.58",
       description: "Claude Code/Cursor/Cline API relay for China \u2014 \xA51=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
       scripts: {
         build: "node scripts/build.mjs",

package/dist/index.js CHANGED Viewed

@@ -12,7 +12,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@simonyea/holysheep-cli",
-      version: "2.1.56",
+      version: "2.1.58",
       description: "Claude Code/Cursor/Cline API relay for China \u2014 \xA51=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
       scripts: {
         build: "node scripts/build.mjs",
@@ -791,6 +791,7 @@ var require_claude_process_proxy = __commonJS({
     var MAX_PROXY_RETRIES = 3;
     var ENABLE_TIMING_LOG = process.env.HS_CLAUDE_TIMING_LOG === "1";
     var SLOW_PATH_LOG_MS = Number(process.env.HS_CLAUDE_SLOW_PATH_LOG_MS) || 5e3;
+    var ENABLE_LEASE_LOG = process.env.HS_CLAUDE_LEASE_LOG === "1";
     function sanitizeUrl(value) {
       if (!value) return "";
       try {
@@ -1222,7 +1223,7 @@ var require_claude_process_proxy = __commonJS({
       });
     }
     __name(createConnectTunnel, "createConnectTunnel");
-    var RESPONSE_TIMEOUT_MS = Number(process.env.HS_CLAUDE_RESPONSE_TIMEOUT_MS) || 3e4;
+    var RESPONSE_TIMEOUT_MS = Number(process.env.HS_CLAUDE_RESPONSE_TIMEOUT_MS) || 9e4;
     var STALL_TIMEOUT_MS = Number(process.env.HS_CLAUDE_STALL_TIMEOUT_MS) || 12e4;
     function pipeWithCleanup(a, b) {
       for (const sock of [a, b]) {
@@ -1415,20 +1416,22 @@ var require_claude_process_proxy = __commonJS({
               })();
               const forceReassign = shouldRefreshLeaseAfterError(lastError);
               const retryReason = String((lastError == null ? void 0 : lastError.body) || (lastError == null ? void 0 : lastError.message) || "").slice(0, 120);
-              if (forceReassign) {
-                console.error(`[hs-claude-proxy] lease.force-reassign ${JSON.stringify({
-                  sessionId,
-                  nodeId: (prevLease == null ? void 0 : prevLease.nodeId) || "",
-                  attempt,
-                  reason: retryReason
-                })}`);
-              } else {
-                console.error(`[hs-claude-proxy] lease.sticky-hit ${JSON.stringify({
-                  sessionId,
-                  nodeId: (prevLease == null ? void 0 : prevLease.nodeId) || "",
-                  attempt,
-                  retryReason
-                })}`);
+              if (ENABLE_LEASE_LOG) {
+                if (forceReassign) {
+                  console.error(`[hs-claude-proxy] lease.force-reassign ${JSON.stringify({
+                    sessionId,
+                    nodeId: (prevLease == null ? void 0 : prevLease.nodeId) || "",
+                    attempt,
+                    reason: retryReason
+                  })}`);
+                } else {
+                  console.error(`[hs-claude-proxy] lease.sticky-hit ${JSON.stringify({
+                    sessionId,
+                    nodeId: (prevLease == null ? void 0 : prevLease.nodeId) || "",
+                    attempt,
+                    retryReason
+                  })}`);
+                }
               }
               leaseCache.delete(sessionId);
               if (forceReassign) {
@@ -1547,22 +1550,24 @@ var require_claude_process_proxy = __commonJS({
               })();
               const forceReassign = shouldRefreshLeaseAfterError(lastError);
               const retryReason = String((lastError == null ? void 0 : lastError.body) || (lastError == null ? void 0 : lastError.message) || "").slice(0, 120);
-              if (forceReassign) {
-                console.error(`[hs-claude-proxy] lease.force-reassign ${JSON.stringify({
-                  sessionId,
-                  nodeId: (prevLease == null ? void 0 : prevLease.nodeId) || "",
-                  attempt,
-                  reason: retryReason,
-                  path: "CONNECT"
-                })}`);
-              } else {
-                console.error(`[hs-claude-proxy] lease.sticky-hit ${JSON.stringify({
-                  sessionId,
-                  nodeId: (prevLease == null ? void 0 : prevLease.nodeId) || "",
-                  attempt,
-                  retryReason,
-                  path: "CONNECT"
-                })}`);
+              if (ENABLE_LEASE_LOG) {
+                if (forceReassign) {
+                  console.error(`[hs-claude-proxy] lease.force-reassign ${JSON.stringify({
+                    sessionId,
+                    nodeId: (prevLease == null ? void 0 : prevLease.nodeId) || "",
+                    attempt,
+                    reason: retryReason,
+                    path: "CONNECT"
+                  })}`);
+                } else {
+                  console.error(`[hs-claude-proxy] lease.sticky-hit ${JSON.stringify({
+                    sessionId,
+                    nodeId: (prevLease == null ? void 0 : prevLease.nodeId) || "",
+                    attempt,
+                    retryReason,
+                    path: "CONNECT"
+                  })}`);
+                }
               }
               leaseCache.delete(sessionId);
               if (forceReassign) {
@@ -7573,15 +7578,19 @@ var require_server = __commonJS({
       "claude-code": {
         cmd: process.platform === "win32" ? 'powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "irm https://claude.ai/install.ps1 | iex"' : "curl -fsSL https://claude.ai/install.sh | bash"
       },
-      "codex": { cmd: "npm install -g @openai/codex" },
+      // [v2.1.58] @openai/codex v0.111+ ships a Rust binary via postinstall.
+      // --foreground-scripts forces npm to stream postinstall stdout (otherwise
+      // npm hides it in non-TTY → Windows users see "正在安装" forever while the
+      // binary download silently blocks). --no-fund/audit cuts noise.
+      "codex": { cmd: "npm install -g @openai/codex --foreground-scripts --no-fund --no-audit" },
       "droid": {
         // 2.1.14 fix: Windows/Linux now have official installers; previously
         // the WebUI piped the macOS-only brew command on every platform.
         cmd: process.platform === "win32" ? "winget install --id Factory.Droid -e --accept-source-agreements --accept-package-agreements" : process.platform === "darwin" ? "brew install --cask droid" : "curl -fsSL https://app.factory.ai/install.sh | bash"
       },
-      "gemini-cli": { cmd: "npm install -g @google/gemini-cli" },
-      "opencode": { cmd: "npm install -g opencode-ai" },
-      "openclaw": { cmd: "npm install -g openclaw@latest" },
+      "gemini-cli": { cmd: "npm install -g @google/gemini-cli --foreground-scripts --no-fund --no-audit" },
+      "opencode": { cmd: "npm install -g opencode-ai --foreground-scripts --no-fund --no-audit" },
+      "openclaw": { cmd: "npm install -g openclaw@latest --foreground-scripts --no-fund --no-audit" },
       "aider": { cmd: "pip install aider-chat" },
       // Hermes Agent (Nous Research). Python-based, installed via uv. Windows
       // requires WSL2 (the installer explicitly rejects native Windows). On
@@ -7994,14 +8003,67 @@ var require_server = __commonJS({
       }
       sseStart(res);
       sseEmit(res, { type: "progress", message: `\u6B63\u5728\u5B89\u88C5 ${toolId}...` });
+      const installCmd = AUTO_INSTALL[toolId].cmd;
+      const isNpmInstall = /^\s*npm\s+install\b/.test(installCmd);
+      if (isNpmInstall) {
+        let npmOk = false;
+        try {
+          const { commandExists: commandExists2 } = require_which();
+          npmOk = commandExists2("npm") && commandExists2("node");
+        } catch {
+        }
+        if (!npmOk) {
+          sseEmit(res, {
+            type: "output",
+            text: `\u274C \u68C0\u6D4B\u4E0D\u5230 npm / node \u2014 \u8BF7\u5148\u5B89\u88C5 Node.js (https://nodejs.org)\uFF0C\u518D\u91CD\u542F hs web\u3002
+   \u4E0B\u8F7D\u5B89\u88C5\u540E\uFF0C\u65B0\u5F00\u7EC8\u7AEF\u8FD0\u884C \`node --version\` \u5E94\u770B\u5230\u7248\u672C\u53F7\u3002
+`
+          });
+          sseEmit(res, { type: "done", success: false, message: "node-not-found" });
+          return res.end();
+        }
+      }
+      sseEmit(res, { type: "output", text: `> ${installCmd}
+` });
       const INSTALL_TIMEOUT_MS = 10 * 60 * 1e3;
+      const isWin = process.platform === "win32";
       const ok = await new Promise((resolve) => {
         var _a, _b;
-        const child = spawn(AUTO_INSTALL[toolId].cmd, [], { shell: true });
+        const env = {
+          ...process.env,
+          FORCE_COLOR: "0",
+          NPM_CONFIG_FUND: "false",
+          NPM_CONFIG_AUDIT: "false",
+          NPM_CONFIG_PROGRESS: "false",
+          NPM_CONFIG_LOGLEVEL: "http"
+          // not too quiet, not too noisy
+        };
+        const spawnOpts = isWin ? { shell: process.env.ComSpec || "cmd.exe", windowsHide: true, env, stdio: ["ignore", "pipe", "pipe"] } : { shell: true, env, stdio: ["ignore", "pipe", "pipe"] };
+        const cmdToRun = isWin && isNpmInstall ? `chcp 65001 >NUL & ${installCmd}` : installCmd;
+        let child;
+        try {
+          child = spawn(cmdToRun, [], spawnOpts);
+        } catch (e) {
+          sseEmit(res, { type: "output", text: `
+\u274C spawn \u5931\u8D25: ${e.message}
+` });
+          return resolve(false);
+        }
+        sseEmit(res, { type: "output", text: `[hs] \u5B50\u8FDB\u7A0B\u5DF2\u542F\u52A8 pid=${child.pid || "?"}\uFF0C\u7B49\u5F85\u8F93\u51FA\u2026
+` });
+        let lastChunkAt = Date.now();
+        const heartbeat = setInterval(() => {
+          const idleSec = Math.round((Date.now() - lastChunkAt) / 1e3);
+          if (idleSec >= 8) {
+            sseEmit(res, { type: "output", text: `[hs] \u2026\u4ECD\u5728\u8FD0\u884C\uFF0C\u6700\u8FD1 ${idleSec}s \u65E0\u8F93\u51FA\uFF08postinstall \u4E0B\u8F7D\u4E8C\u8FDB\u5236\u4E2D\uFF1F\uFF09
+` });
+          }
+        }, 1e4);
         const timer = setTimeout(() => {
+          clearInterval(heartbeat);
           sseEmit(res, { type: "output", text: `
 \u26A0\uFE0F \u5B89\u88C5\u8D85\u65F6\uFF0810\u5206\u949F\uFF09\uFF0C\u8BF7\u624B\u52A8\u8FD0\u884C:
-${AUTO_INSTALL[toolId].cmd}
+${installCmd}
 ` });
           try {
             child.kill("SIGKILL");
@@ -8009,14 +8071,41 @@ ${AUTO_INSTALL[toolId].cmd}
           }
           resolve(false);
         }, INSTALL_TIMEOUT_MS);
-        (_a = child.stdout) == null ? void 0 : _a.on("data", (chunk) => sseEmit(res, { type: "output", text: chunk.toString() }));
-        (_b = child.stderr) == null ? void 0 : _b.on("data", (chunk) => sseEmit(res, { type: "output", text: chunk.toString() }));
-        child.on("close", (code) => {
+        (_a = child.stdout) == null ? void 0 : _a.on("data", (chunk) => {
+          lastChunkAt = Date.now();
+          sseEmit(res, { type: "output", text: chunk.toString("utf8") });
+        });
+        (_b = child.stderr) == null ? void 0 : _b.on("data", (chunk) => {
+          lastChunkAt = Date.now();
+          sseEmit(res, { type: "output", text: chunk.toString("utf8") });
+        });
+        child.on("close", (code, signal) => {
           clearTimeout(timer);
+          clearInterval(heartbeat);
+          if (code !== 0) {
+            sseEmit(res, { type: "output", text: `
+\u274C \u8FDB\u7A0B\u9000\u51FA code=${code} signal=${signal || "none"}
+` });
+            if (isWin && isNpmInstall) {
+              sseEmit(res, {
+                type: "output",
+                text: `\u5E38\u89C1\u539F\u56E0 (Windows):
+  \u2022 postinstall \u4E0B\u8F7D\u4E8C\u8FDB\u5236\u88AB\u9632\u706B\u5899/\u6740\u6BD2\u62E6\u622A \u2192 \u5173\u95ED\u6740\u6BD2\u91CD\u8BD5\uFF0C\u6216\u5728\u7BA1\u7406\u5458 PowerShell \u8FD0\u884C\uFF1A
+      ${installCmd}
+  \u2022 \u672C\u5730 HTTP \u4EE3\u7406 (Clash/Surge) \u5E72\u6270 \u2192 \u4E34\u65F6\u5173\u95ED\u4EE3\u7406\u6216\u8BBE HTTP_PROXY="" \u91CD\u8BD5
+  \u2022 \u56FD\u5185\u7F51\u7EDC\u62C9 npm \u6162 \u2192 \u5207\u6362\u955C\u50CF\uFF1Anpm config set registry https://registry.npmmirror.com
+`
+              });
+            }
+          }
           resolve(code === 0);
         });
-        child.on("error", () => {
+        child.on("error", (err) => {
           clearTimeout(timer);
+          clearInterval(heartbeat);
+          sseEmit(res, { type: "output", text: `
+\u274C \u5B50\u8FDB\u7A0B\u9519\u8BEF: ${err.message}
+` });
           resolve(false);
         });
       });

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.56",
+  "version": "2.1.58",
   "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.",
   "scripts": {
     "build": "node scripts/build.mjs",