rdsh-gateway 0.11.2 → 0.11.3

package/dist/direct.js

@@ -29,6 +29,9 @@ export async function startDirect(opts) {
         actualPort,
         candidates: () => lanCandidates(actualPort),
         stop: async () => {
+            // 先强制断开所有连接（含 keep-alive）：否则有活跃连接时 server.close() 的回调
+            // 永不触发，面板「断开」的 RPC 会一直挂住、按钮卡在 loading。
+            gateway.server.closeAllConnections();
             await new Promise((resolve) => gateway.server.close(() => resolve()));
             gateway.dispose();
         },

package/dist/index.d.ts

@@ -23,13 +23,14 @@ export { loginPageHtml } from "./login-page.ts";
 export { installService, uninstallService, serviceStatus, startService, stopService, restartService, systemdUnit, launchdPlist, SERVICE_NAME, JOIN_SERVICE_NAME, HOST_SERVICE_NAME, HUB_SERVICE_NAME } from "./service.ts";
 export type { ServiceSpec } from "./service.ts";
 export declare const NAME = "rdsh-gateway";
-export { join, startJoin, registerJoin, detectInsecure, selfRevoke, patchLoopbackJs } from "./join.ts";
+export { join, startJoin, registerJoin, detectInsecure, selfRevoke, patchLoopbackJs, hubRequest } from "./join.ts";
 export type { JoinOptions, RegisterOutcome, JoinState, JoinHooks, StartJoinOptions, JoinHandle } from "./join.ts";
 export { startDirect, lanCandidates, isPrivateIpv4 } from "./direct.ts";
 export type { DirectOptions, DirectHandle } from "./direct.ts";
 export { createDirectTicketManager } from "./direct-ticket.ts";
 export type { DirectTicketManager } from "./direct-ticket.ts";
 export { loadOrCreateDirectSecret, directSecretPath } from "./direct-secret.ts";
-export { readPersistedToken, clearPersistedToken } from "./token-store.ts";
+export { readPersistedToken, persistToken, clearPersistedToken } from "./token-store.ts";
 export { acquireJoinLock, releaseJoinLock, readJoinLock, JOIN_LOCK_PATH } from "./lock.ts";
 export type { JoinLock, JoinLockRole } from "./lock.ts";
+export { loadOrCreateE2eeKeyPair, e2eeKeyFilePath } from "./e2ee-key-store.ts";

package/dist/index.js

@@ -15,10 +15,11 @@ export { loadTls } from "./tls.js";
 export { loginPageHtml } from "./login-page.js";
 export { installService, uninstallService, serviceStatus, startService, stopService, restartService, systemdUnit, launchdPlist, SERVICE_NAME, JOIN_SERVICE_NAME, HOST_SERVICE_NAME, HUB_SERVICE_NAME } from "./service.js";
 export const NAME = "rdsh-gateway";
-export { join, startJoin, registerJoin, detectInsecure, selfRevoke, patchLoopbackJs } from "./join.js";
+export { join, startJoin, registerJoin, detectInsecure, selfRevoke, patchLoopbackJs, hubRequest } from "./join.js";
 export { startDirect, lanCandidates, isPrivateIpv4 } from "./direct.js";
 export { createDirectTicketManager } from "./direct-ticket.js";
 export { loadOrCreateDirectSecret, directSecretPath } from "./direct-secret.js";
-export { readPersistedToken, clearPersistedToken } from "./token-store.js";
+export { readPersistedToken, persistToken, clearPersistedToken } from "./token-store.js";
 export { acquireJoinLock, releaseJoinLock, readJoinLock, JOIN_LOCK_PATH } from "./lock.js";
+export { loadOrCreateE2eeKeyPair, e2eeKeyFilePath } from "./e2ee-key-store.js";
 //# sourceMappingURL=index.js.map

package/dist/join.d.ts

@@ -111,6 +111,16 @@ export interface JoinHandle {
 }
 /** 探测 hub 是否需 insecure：以严格校验握手一次；证书错误 → true（需 insecure）。 */
 export declare function detectInsecure(hubUrl: string): Promise<boolean>;
+/** hub HTTP 调用（node:https 支持自签跳过校验 —— undici fetch 不受 NODE_TLS_REJECT_UNAUTHORIZED 影响）。 */
+export declare function hubRequest(baseUrl: string, path: string, opts: {
+    method: string;
+    insecure: boolean;
+    body?: unknown;
+}): Promise<{
+    ok: boolean;
+    status: number;
+    body: Record<string, unknown>;
+}>;
 /** 调用 hub self-revoke 注销本机（host 持自己的 host token）。`rdsh host leave` 使用。 */
 export declare function selfRevoke(hubUrl: string, token: string, insecure: boolean): Promise<void>;
 /** 解析 host token（--token 注册 > 持久化复用）+ 自动检测证书；供 CLI 配置命令与 join() 复用。 */

package/dist/join.js

@@ -64,7 +64,7 @@ const PONG_TIMEOUT_MS = 10_000;
 const RECONNECT_BASE_MS = 1_000;
 const RECONNECT_MAX_MS = 60_000;
 /** hub HTTP 调用（node:https 支持自签跳过校验 —— undici fetch 不受 NODE_TLS_REJECT_UNAUTHORIZED 影响）。 */
-function hubRequest(baseUrl, path, opts) {
+export function hubRequest(baseUrl, path, opts) {
     const url = new URL(baseUrl + path);
     const lib = url.protocol === "https:" ? httpsRequest : httpRequest;
     return new Promise((resolve, reject) => {
@@ -954,8 +954,15 @@ export function startJoin(opts) {
                 client.terminate();
                 return;
             }
-            for (const frame of frames)
-                handleFrame(frame);
+            for (const frame of frames) {
+                // 单帧处理异常不能崩宿主进程：对端（含旧版客户端）可能发来不完整/不兼容的帧。
+                try {
+                    handleFrame(frame);
+                }
+                catch (err) {
+                    log("error", `frame handling failed: ${err instanceof Error ? err.message : String(err)}`);
+                }
+            }
         });
         client.on("close", () => {
             cleanupStreams();
@@ -974,7 +981,15 @@ export function startJoin(opts) {
             }
             setState("reconnecting", { delayMs: reconnectDelay });
             log("info", `tunnel lost — reconnecting in ${Math.round(reconnectDelay / 1000)}s...`);
-            setTimeout(connect, reconnectDelay + Math.random() * 500);
+            // 定时器里的异常不会被上层捕获 —— 必须自己兜住，否则一次重连失败就崩掉宿主进程。
+            setTimeout(() => {
+                try {
+                    connect();
+                }
+                catch (err) {
+                    log("error", `reconnect failed: ${err instanceof Error ? err.message : String(err)}`);
+                }
+            }, reconnectDelay + Math.random() * 500);
             reconnectDelay = Math.min(reconnectDelay * 2, RECONNECT_MAX_MS);
         });
         client.on("error", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rdsh-gateway",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "description": "rdsh host-side component: LAN auth gateway + outbound tunnel endpoint (spawns dsh web)",
   "license": "MIT",
   "type": "module",