@skylandnpm/octopus-proxy 0.1.29 → 0.1.30

package/README.md

@@ -15,7 +15,7 @@ octopus-proxy onboard
 
 向导默认使用 `https://octopus.wuyehao.com` 作为 Hub 地址；按需可输入其他地址，或用 `--hub-url` 指定。再次运行向导时会读取现有配置，直接回车即可保留各项设置；机器人 Secret 只提示已配置，不在终端显示原值。macOS 上选择编码工具时，向导优先显示已配置或探测到的命令路径，否则给出该工具的 macOS 路径示例；回车后会检查文件可执行性并运行版本命令，失败时要求重新输入。无交互环境可使用 `octopus-proxy onboard --non-interactive`，未提供 `--hub-url` 时也使用该默认地址；完整选项见 `octopus-proxy help`。安装服务后可运行 `octopus-proxy status` 和 `octopus-proxy doctor` 检查状态。
 
-Proxy 始终使用独立的控制与文件 WebSocket；文件读取和上传不会回退到控制通道。两个通道会同时连接并各自重连，Hub 只会把文件命令发送到同一 Proxy 实例的已就绪文件通道。文件连接同时携带经过 Proxy 凭据认证的通道标识，因此即使反向代理将 `/ws/proxy-files` 重写为上游 `/ws/proxy`，Hub 仍能正确路由文件命令；反向代理仍需转发 WebSocket Upgrade 与 `X-Octopus-Proxy-Channel` 请求头。若旧 Hub 无法识别该标识，Proxy 会保留控制通道以免影响对话，同时在日志中提示升级 Hub 路由。同一套 bot ID 和 Secret 被另一台 Proxy 主机连接后，Hub 会让新实例接管，旧实例会同时关闭两个通道并停止自动重连；若要让旧实例重新接管，必须显式重启其服务。
+Proxy 始终使用独立的控制与文件 WebSocket；文件读取和上传不会回退到控制通道。两个通道会同时连接并各自重连，Hub 只会把文件命令发送到同一 Proxy 实例的已就绪文件通道。控制与文件连接在 `X-Octopus-Proxy-Instance-Id` 中分别使用 `:control`、`:files` 后缀；Hub 去除后缀再配对实例，因此即使反向代理把 `/ws/proxy-files` 重写为上游 `/ws/proxy`，也能正确识别文件通道。反向代理需转发 WebSocket Upgrade、Authorization、`X-Octopus-Bot-Id` 与 `X-Octopus-Proxy-Instance-Id`。同一套 bot ID 和 Secret 被另一台 Proxy 主机连接后，Hub 会让新实例接管，旧实例会同时关闭两个通道并停止自动重连；若要让旧实例重新接管，必须显式重启其服务。
 
 添加授权项目时，填写项目 ID 后会询问是否继续添加；直接回车即可结束添加并继续保存配置。
 

package/dist/{chunk-XHNRMXZT.js → chunk-PYZSSOSD.js}

@@ -16630,29 +16630,6 @@ function createAdapter(runtime, workspace, uploads, emit) {
   return new OpenCodeAdapter(runtime, workspace, uploads, forward);
 }
 
-// src/hub-channel-compatibility.ts
-var HubChannelCompatibility = class {
-  enabled = false;
-  filesAttemptedAt = 0;
-  filesFailures = 0;
-  filesAttempt(now = Date.now()) {
-    this.filesAttemptedAt = now;
-  }
-  filesWelcome() {
-    this.filesFailures = 0;
-  }
-  controlClosed(filesPending, now = Date.now()) {
-    if (this.enabled || !filesPending || now - this.filesAttemptedAt >= 5e3) return false;
-    this.enabled = true;
-    return true;
-  }
-  filesClosedBeforeWelcome(stopping) {
-    if (this.enabled || stopping || ++this.filesFailures < 3) return false;
-    this.enabled = true;
-    return true;
-  }
-};
-
 // src/proxy-binding.ts
 var PROXY_REPLACED_CLOSE_CODE = 4009;
 var ProxyBinding = class {
@@ -16802,7 +16779,6 @@ async function runDaemon(configPath) {
   const workspace = new Workspace(config.projects), runtime = createRuntime(config), uploads = new Uploads(workspace, join10(config.stateDirectory, "uploads")), journal = new Journal(join10(config.stateDirectory, "journal"));
   const epoch = randomUUID12();
   let stopping = false, botId = "";
-  const hubChannels = new HubChannelCompatibility();
   const binding = new ProxyBinding();
   const sockets = /* @__PURE__ */ new Set();
   let controlSocket, filesSocket;
@@ -16871,29 +16847,27 @@ async function runDaemon(configPath) {
     return adapter.dispatch(c);
   }
   function activateChannels() {
-    if (channelsActivated || !controlWelcome || !filesWelcomed && !hubChannels.enabled || controlWelcome.socket.readyState !== WebSocket2.OPEN) return;
+    if (channelsActivated || !controlWelcome || !filesWelcomed || controlWelcome.socket.readyState !== WebSocket2.OPEN) return;
     channelsActivated = true;
     events.bind(controlWelcome.socket, controlWelcome.resume);
     for (const p of config.projects) emit(p.id, "octopus.resync", {});
   }
   function connect(files, attempt = 0) {
-    if (stopping || !binding.active || files && hubChannels.enabled) return;
+    if (stopping || !binding.active) return;
+    const current = files ? filesSocket : controlSocket;
+    if (current && current.readyState !== WebSocket2.CLOSED) return;
     const url = new URL(files ? "/ws/proxy-files" : "/ws/proxy", config.hubUrl);
     url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
     const headers = {
       Authorization: `SecretKey ${config.secretKey}`,
       "X-Octopus-Bot-Id": config.botId,
-      "X-Octopus-Proxy-Instance-Id": epoch,
-      // Preserve the logical channel when a reverse proxy rewrites
-      // /ws/proxy-files to the generic /ws/proxy upstream endpoint.
-      "X-Octopus-Proxy-Channel": files ? "files" : "control"
+      "X-Octopus-Proxy-Instance-Id": `${epoch}:${files ? "files" : "control"}`
     };
     const socket = new WebSocket2(url, { headers, maxPayload: 3 * 1024 * 1024 });
     sockets.add(socket);
     if (files) {
       filesSocket = socket;
       filesWelcomed = false;
-      hubChannels.filesAttempt();
     } else controlSocket = socket;
     let lastPong = Date.now();
     const heartbeat = setInterval(() => {
@@ -16918,10 +16892,8 @@ async function runDaemon(configPath) {
         if (value.type === "welcome") {
           botId = value.botId;
           uploads.limits = value.limits;
-          if (files) {
-            filesWelcomed = true;
-            hubChannels.filesWelcome();
-          } else controlWelcome = { socket, resume: value.resume };
+          if (files) filesWelcomed = true;
+          else controlWelcome = { socket, resume: value.resume };
           activateChannels();
           return;
         }
@@ -16956,17 +16928,10 @@ async function runDaemon(configPath) {
         console.error("This bot was claimed by another Proxy instance; automatic reconnection is disabled until this service is restarted");
         for (const peer of sockets) peer.close();
       }
-      const collision = binding.active && !files && hubChannels.controlClosed(filesSocket !== void 0 && filesSocket.readyState !== WebSocket2.CLOSED);
-      const rejectedFilesChannel = binding.active && files && !filesWelcomed && hubChannels.filesClosedBeforeWelcome(stopping);
-      if (collision || rejectedFilesChannel) {
-        console.warn("Hub does not preserve the Proxy files channel; keeping the control channel online until Hub routing is upgraded");
-        filesSocket?.close();
-        filesSocket = void 0;
-        activateChannels();
-      } else if (!stopping && binding.active && code !== 1e3) {
+      if (!stopping && binding.active && code !== 1e3) {
         console.warn(`Hub ${files ? "files" : "control"} connection closed: ${code}${reason.length ? ` ${reason.toString()}` : ""}`);
       }
-      if (!stopping && binding.active && (!files || !hubChannels.enabled)) setTimeout(() => connect(files, attempt + 1), collision ? 100 : Math.min(3e4, 1e3 * 2 ** Math.min(attempt, 5)) + Math.random() * 500);
+      if (!stopping && binding.active) setTimeout(() => connect(files, attempt + 1), Math.min(3e4, 1e3 * 2 ** Math.min(attempt, 5)) + Math.random() * 500);
     });
   }
   await runtime.init().catch((error) => console.error(`${runtime.kind} startup:`, error.message));

package/dist/cli.js

@@ -22,7 +22,7 @@ import {
   runDaemon,
   supportedPlatform,
   systemdUnitPath
-} from "./chunk-XHNRMXZT.js";
+} from "./chunk-PYZSSOSD.js";
 
 // src/cli.ts
 import { spawn } from "node:child_process";

package/dist/main.js

@@ -2,7 +2,7 @@
 import {
   ConfigError,
   runDaemon
-} from "./chunk-XHNRMXZT.js";
+} from "./chunk-PYZSSOSD.js";
 
 // src/main.ts
 runDaemon(process.env.OCTOPUS_PROXY_CONFIG ?? "proxy.json").catch((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skylandnpm/octopus-proxy",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "type": "module",
   "description": "Octopus host proxy: OpenCode, Codex, ZCode and Pi adapters with service installer CLI",
   "bin": {