cli-wechat-bridge 1.1.3 → 1.1.5

package/dist/wechat/wechat-transport.js

@@ -3,6 +3,7 @@ import { createCipheriv, createDecipheriv } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import { CONTEXT_CACHE_FILE, CREDENTIALS_FILE, ensureChannelDataDir, INBOUND_ATTACHMENTS_DIR, INBOUND_MESSAGE_CLAIMS_DIR, migrateLegacyChannelFiles, SYNC_BUF_FILE, } from "./channel-config.js";
+import { writeJsonFileAtomic } from "../utils/atomic-file.js";
 export const DEFAULT_LONG_POLL_TIMEOUT_MS = 35_000;
 const CDN_BASE_URL = "https://novac2c.cdn.weixin.qq.com/c2c";
 const CHANNEL_VERSION = "0.3.0";
@@ -10,6 +11,7 @@ const RECENT_MESSAGE_CACHE_SIZE = 500;
 const BYTES_PER_MB = 1024 * 1024;
 const SEND_TIMEOUT_MS = 15_000;
 const INBOUND_DOWNLOAD_TIMEOUT_MS = 30_000;
+const CDN_UPLOAD_TIMEOUT_MS = 60_000;
 const CDN_MAX_RETRIES = 3;
 const ERROR_CAUSE_DEPTH_LIMIT = 4;
 const INBOUND_MESSAGE_CLAIM_TTL_MS = 10 * 60 * 1000;
@@ -305,13 +307,7 @@ export function classifyWechatTransportError(error) {
     return { kind: "unknown", retryable: false };
 }
 function writeJsonFile(filePath, value) {
-    ensureChannelDataDir();
-    const data = JSON.stringify(value, null, 2);
-    // Atomic write via temp file + rename, so a crash mid-write cannot leave a
-    // truncated/half-written JSON that would break readers on the next launch.
-    const tempPath = `${filePath}.${process.pid}.tmp`;
-    fs.writeFileSync(tempPath, data, "utf-8");
-    fs.renameSync(tempPath, filePath);
+    writeJsonFileAtomic(filePath, value);
 }
 function randomWechatUin() {
     const uint32 = crypto.randomBytes(4).readUInt32BE(0);
@@ -343,8 +339,11 @@ async function apiFetch(params) {
             body: params.body,
             signal: controller.signal,
         });
-        clearTimeout(timer);
+        // Keep the abort timer armed until the body has been fully read: a server
+        // that sends headers and then stalls would otherwise leave res.text()
+        // pending forever, freezing the long-poll loop with no timeout at all.
         const text = await res.text();
+        clearTimeout(timer);
         if (!res.ok) {
             throw new Error(`HTTP ${res.status}: ${text}`);
         }
@@ -495,12 +494,18 @@ async function uploadBufferToCdn(params) {
     let downloadParam;
     let lastError;
     for (let attempt = 1; attempt <= CDN_MAX_RETRIES; attempt += 1) {
+        // Abort guard mirrors the download path: without it a stalled CDN upload
+        // hangs the send queue forever (no timeout, no signal).
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), CDN_UPLOAD_TIMEOUT_MS);
         try {
             const res = await fetch(cdnUrl, {
                 method: "POST",
                 headers: { "Content-Type": "application/octet-stream" },
                 body: new Uint8Array(ciphertext),
+                signal: controller.signal,
             });
+            clearTimeout(timer);
             if (res.status >= 400 && res.status < 500) {
                 const errMsg = res.headers.get("x-error-message") ?? (await res.text());
                 throw new Error(`CDN client error ${res.status}: ${errMsg}`);
@@ -516,6 +521,7 @@ async function uploadBufferToCdn(params) {
             break;
         }
         catch (err) {
+            clearTimeout(timer);
             lastError = err;
             if (err instanceof Error && err.message.includes("client error")) {
                 throw err;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cli-wechat-bridge",
-  "version": "1.1.3",
-  "description": "CLI WeChat Bridge for Codex, Claude Code, OpenCode, Pi, and PowerShell over WeChat",
+  "version": "1.1.5",
+  "description": "CLI WeChat Bridge for Codex, Claude Code, OpenCode, and Pi over WeChat",
   "type": "module",
   "files": [
     "bin/",
@@ -34,20 +34,10 @@
     "access": "public"
   },
   "bin": {
-    "wechat-bridge": "bin/wechat-bridge.mjs",
-    "wechat-bridge-codex": "bin/wechat-bridge-codex.mjs",
     "wechat-codex": "bin/wechat-codex.mjs",
-    "wechat-codex-start": "bin/wechat-codex-start.mjs",
     "wechat-claude": "bin/wechat-claude.mjs",
-    "wechat-claude-start": "bin/wechat-claude-start.mjs",
-    "wechat-bridge-claude": "bin/wechat-bridge-claude.mjs",
-    "wechat-bridge-shell": "bin/wechat-bridge-shell.mjs",
-    "wechat-bridge-opencode": "bin/wechat-bridge-opencode.mjs",
     "wechat-opencode": "bin/wechat-opencode.mjs",
-    "wechat-opencode-start": "bin/wechat-opencode-start.mjs",
-    "wechat-bridge-pi": "bin/wechat-bridge-pi.mjs",
     "wechat-pi": "bin/wechat-pi.mjs",
-    "wechat-pi-start": "bin/wechat-pi-start.mjs",
     "wechat-daemon": "bin/wechat-daemon.mjs",
     "wechat-setup": "bin/wechat-setup.mjs",
     "wechat-check-update": "bin/wechat-check-update.mjs"
@@ -74,7 +64,6 @@
     "claude:start": "node --no-warnings --experimental-strip-types src/companion/local-companion-start.ts --adapter claude",
     "claude:companion": "node --no-warnings --experimental-strip-types src/companion/local-companion.ts --adapter claude",
     "bridge:claude": "node --no-warnings --experimental-strip-types src/bridge/wechat-bridge.ts --adapter claude",
-    "bridge:shell": "node --no-warnings --experimental-strip-types src/bridge/wechat-bridge.ts --adapter shell",
     "bridge:opencode": "node --no-warnings --experimental-strip-types src/bridge/wechat-bridge.ts --adapter opencode",
     "opencode:panel": "node --no-warnings --experimental-strip-types src/companion/local-companion.ts --adapter opencode",
     "opencode:start": "node --no-warnings --experimental-strip-types src/companion/local-companion-start.ts --adapter opencode",

package/bin/wechat-bridge-claude.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runJsEntry } from "./_run-entry.mjs";
-
-runJsEntry("dist/bridge/wechat-bridge.js", ["--adapter", "claude"]);

package/bin/wechat-bridge-codex.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runJsEntry } from "./_run-entry.mjs";
-
-runJsEntry("dist/bridge/wechat-bridge.js", ["--adapter", "codex"]);

package/bin/wechat-bridge-opencode.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runJsEntry } from "./_run-entry.mjs";
-
-runJsEntry("dist/bridge/wechat-bridge.js", ["--adapter", "opencode"]);

package/bin/wechat-bridge-pi.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runJsEntry } from "./_run-entry.mjs";
-
-runJsEntry("dist/bridge/wechat-bridge.js", ["--adapter", "pi"]);

package/bin/wechat-bridge-shell.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runJsEntry } from "./_run-entry.mjs";
-
-runJsEntry("dist/bridge/wechat-bridge.js", ["--adapter", "shell"]);

package/bin/wechat-bridge.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runJsEntry } from "./_run-entry.mjs";
-
-runJsEntry("dist/bridge/wechat-bridge.js");

package/bin/wechat-claude-start.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runJsEntry } from "./_run-entry.mjs";
-
-runJsEntry("dist/companion/local-companion-start.js", ["--adapter", "claude"]);

package/bin/wechat-codex-start.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runJsEntry } from "./_run-entry.mjs";
-
-runJsEntry("dist/companion/local-companion-start.js");

package/bin/wechat-opencode-start.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runJsEntry } from "./_run-entry.mjs";
-
-runJsEntry("dist/companion/local-companion-start.js", ["--adapter", "opencode"]);

package/bin/wechat-pi-start.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runJsEntry } from "./_run-entry.mjs";
-
-runJsEntry("dist/companion/local-companion-start.js", ["--adapter", "pi"]);

package/dist/bridge/bridge-adapters.shell.js

@@ -1,363 +0,0 @@
-import { getInteractiveShellCommandRejectionMessage, isHighRiskShellCommand, normalizeOutput, nowIso, truncatePreview, } from "./bridge-utils.js";
-import { AbstractPtyAdapter } from "./bridge-adapters.core.js";
-import * as shared from "./bridge-adapters.shared.js";
-const { buildShellInputPayload, buildShellProfileCommand, resolveShellRuntime, } = shared;
-export class ShellCommandRejectedError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = "ShellCommandRejectedError";
-    }
-}
-export class ShellAdapter extends AbstractPtyAdapter {
-    static COMPLETION_MARKER_PREFIX = "__WECHAT_BRIDGE_DONE__";
-    static POWERSHELL_LEADING_NOISE_PATTERNS = [
-        /^PS>>\s*/u,
-        /^PS [^>\n]*>\s*/u,
-        /^PS>\s*/u,
-        /^>>\s*/u,
-        /^>\s*/u,
-        /^function global:prompt \{ "" \}/u,
-        /^\$__wechatBridgePreviousErrorActionPreference = \$ErrorActionPreference/u,
-        /^\$ErrorActionPreference = 'Continue'/u,
-        /^\$global:LASTEXITCODE = 0/u,
-        /^try \{/u,
-        /^\$decoded = \[System\.Text\.Encoding\]::UTF8\.GetString\(\[System\.Convert\]::FromBase64String\(".*"\)\)/u,
-        /^\$scriptBlock = \[scriptblock\]::Create\(\$decoded\)/u,
-        /^& \$scriptBlock/u,
-        /^\} catch \{/u,
-        /^Write-Error \$_/u,
-        /^\$global:LASTEXITCODE = 1/u,
-        /^\} finally \{/u,
-        /^if \(-not \(\$global:LASTEXITCODE -is \[int\]\)\) \{ \$global:LASTEXITCODE = 0 \}/u,
-        /^Write-Output "__WECHAT_BRIDGE_DONE__:[^"]*"/u,
-        /^\$ErrorActionPreference = \$__wechatBridgePreviousErrorActionPreference/u,
-        /^\}/u,
-    ];
-    pendingShellCommand = null;
-    interruptTimer = null;
-    outputBuffer = "";
-    currentCompletionMarker = null;
-    expectedEchoLines = [];
-    commandSequence = 0;
-    buildSpawnArgs() {
-        return this.getShellRuntime().launchArgs;
-    }
-    buildEnv() {
-        const env = super.buildEnv();
-        if (this.getShellRuntime().family === "posix") {
-            env.PS1 = "";
-            env.PROMPT = "";
-            env.RPROMPT = "";
-        }
-        return env;
-    }
-    afterStart() {
-        if (this.options.profile) {
-            this.writeToPty(`${buildShellProfileCommand(this.options.profile, this.getShellRuntime().family)}\r`);
-        }
-        if (this.getShellRuntime().family === "powershell") {
-            this.writeToPty('function global:prompt { "" }\r');
-        }
-    }
-    async sendInput(text) {
-        if (!this.pty) {
-            throw new Error("shell adapter is not running.");
-        }
-        if (this.state.status === "busy") {
-            throw new Error("shell is still working. Wait for the current reply or use /stop.");
-        }
-        if (this.pendingApproval || this.state.status === "awaiting_approval") {
-            throw new Error("A shell approval request is pending. Reply with /confirm or /deny.");
-        }
-        const rejectionMessage = getInteractiveShellCommandRejectionMessage(text);
-        if (rejectionMessage) {
-            throw new ShellCommandRejectedError(rejectionMessage);
-        }
-        if (isHighRiskShellCommand(text)) {
-            this.pendingShellCommand = text;
-            const request = {
-                source: "shell",
-                summary: "High-risk shell command detected. Confirmation is required.",
-                commandPreview: truncatePreview(text, 180),
-            };
-            this.pendingApproval = request;
-            this.state.pendingApproval = request;
-            this.state.pendingApprovalOrigin = "wechat";
-            this.setStatus("awaiting_approval", "Waiting for shell command approval.");
-            this.emit({
-                type: "approval_required",
-                request,
-                timestamp: nowIso(),
-            });
-            return;
-        }
-        this.startShellCommand(text);
-    }
-    async interrupt() {
-        if (!this.pty) {
-            return false;
-        }
-        this.writeToPty("\u0003");
-        this.clearInterruptTimer();
-        this.interruptTimer = setTimeout(() => {
-            this.interruptTimer = null;
-            if (this.state.status === "busy" || this.state.status === "awaiting_approval") {
-                this.finishShellCommand({
-                    summary: "Interrupted",
-                    statusMessage: "Shell command interrupted.",
-                });
-            }
-        }, 1_500);
-        return true;
-    }
-    async applyApproval(action, _pendingApproval) {
-        if (!this.pendingApproval) {
-            return false;
-        }
-        if (action === "deny") {
-            this.pendingShellCommand = null;
-            this.finishShellCommand({
-                summary: "Denied",
-                statusMessage: "Shell command denied.",
-            });
-            return true;
-        }
-        const command = this.pendingShellCommand;
-        if (!command) {
-            return false;
-        }
-        this.pendingShellCommand = null;
-        this.startShellCommand(command);
-        return true;
-    }
-    handleData(rawText) {
-        const text = normalizeOutput(rawText);
-        if (!text) {
-            return;
-        }
-        this.state.lastOutputAt = nowIso();
-        if (!this.hasAcceptedInput) {
-            return;
-        }
-        this.outputBuffer = `${this.outputBuffer}${text}`;
-        this.flushShellOutputBuffer();
-    }
-    handleExit(exitCode) {
-        if (this.hasAcceptedInput) {
-            this.flushShellOutputBuffer(true);
-        }
-        this.resetShellCommandState();
-        super.handleExit(exitCode);
-    }
-    getShellRuntime() {
-        return resolveShellRuntime(this.options.command);
-    }
-    startShellCommand(text) {
-        if (!this.pty) {
-            throw new Error(`${this.options.kind} adapter is not running.`);
-        }
-        this.clearInterruptTimer();
-        this.resetShellCommandState({
-            preserveStatus: true,
-            preservePreview: true,
-        });
-        const completionMarker = this.createCompletionMarker();
-        const payload = buildShellInputPayload(text, this.getShellRuntime().family, completionMarker);
-        this.hasAcceptedInput = true;
-        this.currentPreview = truncatePreview(text);
-        this.state.lastInputAt = nowIso();
-        this.state.activeTurnOrigin = "wechat";
-        this.pendingApproval = null;
-        this.state.pendingApproval = null;
-        this.state.pendingApprovalOrigin = undefined;
-        this.currentCompletionMarker = completionMarker;
-        this.expectedEchoLines = normalizeOutput(payload)
-            .split("\n")
-            .map((line) => line.trim())
-            .filter(Boolean);
-        this.writeToPty(payload);
-        this.setStatus("busy");
-    }
-    flushShellOutputBuffer(force = false) {
-        const lastNewlineIndex = this.outputBuffer.lastIndexOf("\n");
-        if (!force && lastNewlineIndex < 0) {
-            return;
-        }
-        const sliceEnd = force
-            ? this.outputBuffer.length
-            : Math.max(0, lastNewlineIndex + 1);
-        if (sliceEnd === 0) {
-            return;
-        }
-        const chunk = this.outputBuffer.slice(0, sliceEnd);
-        this.outputBuffer = this.outputBuffer.slice(sliceEnd);
-        const visibleLines = [];
-        let completedExitCode = null;
-        for (const rawLine of chunk.split("\n")) {
-            if (!rawLine && !force) {
-                continue;
-            }
-            const completionExitCode = this.parseCompletionExitCode(rawLine);
-            if (completionExitCode !== null) {
-                completedExitCode = completionExitCode;
-                continue;
-            }
-            const filtered = this.filterShellOutputLine(rawLine);
-            if (filtered) {
-                visibleLines.push(filtered);
-            }
-        }
-        const visibleText = visibleLines.join("\n").trim();
-        if (visibleText) {
-            this.emit({
-                type: "stdout",
-                text: visibleText,
-                timestamp: nowIso(),
-            });
-        }
-        if (completedExitCode !== null) {
-            this.finishShellCommand({ exitCode: completedExitCode });
-        }
-    }
-    filterShellOutputLine(line) {
-        const cleanedLine = this.getShellRuntime().family === "powershell"
-            ? this.stripLeadingPowerShellNoise(line)
-            : line;
-        const trimmed = cleanedLine.trim();
-        if (!trimmed) {
-            return null;
-        }
-        if (this.consumeExpectedEchoLine(trimmed)) {
-            return null;
-        }
-        if (this.isShellPromptLine(trimmed)) {
-            return null;
-        }
-        if (this.getShellRuntime().family === "posix") {
-            if (trimmed === "__wechat_bridge_status=$?" ||
-                trimmed.startsWith("printf '%s:%s\\n'") ||
-                trimmed.startsWith("printf '__WECHAT_BRIDGE_DONE__:%s")) {
-                return null;
-            }
-        }
-        return cleanedLine;
-    }
-    consumeExpectedEchoLine(line) {
-        if (!this.expectedEchoLines.length) {
-            return false;
-        }
-        const normalizedLine = this.normalizeEchoLine(line);
-        if (normalizedLine !== this.expectedEchoLines[0]) {
-            return false;
-        }
-        this.expectedEchoLines.shift();
-        return true;
-    }
-    normalizeEchoLine(line) {
-        const trimmed = line.trim();
-        if (this.getShellRuntime().family === "powershell") {
-            return trimmed.replace(/^(?:PS [^>]*>\s*|PS>\s*|>>\s*|>\s*)+/u, "").trim();
-        }
-        return trimmed.replace(/^(?:[$#>]\s*)+/u, "").trim();
-    }
-    isShellPromptLine(line) {
-        if (this.getShellRuntime().family === "powershell") {
-            return /^(?:PS [^>]*>\s*|PS>\s*|>>\s*|>\s*)+$/u.test(line);
-        }
-        return /^(?:[$#>]\s*)+$/u.test(line);
-    }
-    parseCompletionExitCode(line) {
-        const marker = this.currentCompletionMarker;
-        if (!marker) {
-            return null;
-        }
-        const trimmed = this.stripLeadingShellPromptTokens(line).trim();
-        const prefix = `${marker}:`;
-        if (!trimmed.startsWith(prefix)) {
-            return null;
-        }
-        const exitCodeText = trimmed.slice(prefix.length).trim();
-        if (!/^-?\d+$/u.test(exitCodeText)) {
-            return null;
-        }
-        return Number(exitCodeText);
-    }
-    finishShellCommand(options) {
-        const summary = options.summary ?? this.currentPreview;
-        this.resetShellCommandState();
-        this.setStatus("idle", options.statusMessage);
-        this.emit({
-            type: "task_complete",
-            exitCode: options.exitCode,
-            summary,
-            timestamp: nowIso(),
-        });
-    }
-    resetShellCommandState(options = {}) {
-        this.clearInterruptTimer();
-        this.clearCompletionTimer();
-        this.pendingApproval = null;
-        this.pendingShellCommand = null;
-        this.state.pendingApproval = null;
-        this.state.pendingApprovalOrigin = undefined;
-        this.state.activeTurnOrigin = undefined;
-        this.hasAcceptedInput = false;
-        this.outputBuffer = "";
-        this.currentCompletionMarker = null;
-        this.expectedEchoLines = [];
-        if (!options.preservePreview) {
-            this.currentPreview = "(idle)";
-        }
-        if (!options.preserveStatus && this.state.status !== "stopped") {
-            this.state.status = "idle";
-        }
-    }
-    clearInterruptTimer() {
-        if (!this.interruptTimer) {
-            return;
-        }
-        clearTimeout(this.interruptTimer);
-        this.interruptTimer = null;
-    }
-    createCompletionMarker() {
-        this.commandSequence += 1;
-        return `${ShellAdapter.COMPLETION_MARKER_PREFIX}:${this.commandSequence.toString(36)}`;
-    }
-    stripLeadingPowerShellNoise(line) {
-        let text = line.trimStart();
-        while (text) {
-            let stripped = false;
-            for (const pattern of ShellAdapter.POWERSHELL_LEADING_NOISE_PATTERNS) {
-                const next = text.replace(pattern, "");
-                if (next !== text) {
-                    text = next.trimStart();
-                    stripped = true;
-                    break;
-                }
-            }
-            if (!stripped) {
-                break;
-            }
-        }
-        return text;
-    }
-    stripLeadingShellPromptTokens(line) {
-        let text = line.trimStart();
-        if (this.getShellRuntime().family === "powershell") {
-            while (true) {
-                const next = text
-                    .replace(/^PS>>\s*/u, "")
-                    .replace(/^PS [^>\n]*>\s*/u, "")
-                    .replace(/^PS>\s*/u, "")
-                    .replace(/^>>\s*/u, "")
-                    .replace(/^>\s*/u, "");
-                if (next === text) {
-                    break;
-                }
-                text = next.trimStart();
-            }
-            return text;
-        }
-        return text.replace(/^(?:[$#>]\s*)+/u, "").trimStart();
-    }
-}