@yoooclaw/phone-notifications 1.9.0 → 1.9.1-beta.1

package/dist/index.js

@@ -6261,6 +6261,7 @@ var RelayClient = class {
 
 // src/tunnel/proxy.ts
 import { randomUUID as randomUUID2 } from "crypto";
+import { approveDevicePairing } from "openclaw/plugin-sdk";
 
 // src/tunnel/utils.ts
 function previewText2(text, max = 200) {
@@ -6757,10 +6758,12 @@ var WsProxy = class {
 };
 
 // src/tunnel/proxy.ts
+var MAX_AUTO_PAIRING_APPROVALS = 3;
 var TunnelProxy = class {
   constructor(opts) {
     this.opts = opts;
     this.stateDir = resolveClientStateDir(opts.stateDir);
+    this.hostStateDir = opts.hostStateDir ?? resolveStateDir();
     this.deviceIdentity = loadOrCreateDeviceIdentity(this.stateDir);
     opts.logger.info(
       `TunnelProxy: loaded device identity (deviceId=${this.deviceIdentity.deviceId})`
@@ -6776,11 +6779,16 @@ var TunnelProxy = class {
   gatewayWsConnecting = false;
   /** 握手是否已完成（收到 hello-ok） */
   gatewayWsReady = false;
+  /** 收到本地自动配对成功后，在 close 回调里触发重连 */
+  gatewayWsReconnectRequested = false;
+  /** 防止配对失败时无限重连 */
+  gatewayWsAutoPairingApprovals = 0;
   /** 等待 Gateway WS 握手完成后发送的帧队列 */
   gatewayWsPending = [];
   /** 设备身份，用于 Gateway connect 握手 */
   deviceIdentity;
   stateDir;
+  hostStateDir;
   wsProxy;
   // ─── Frame dispatcher ───
   /** 处理从 Relay 收到的入站帧 */
@@ -6825,6 +6833,10 @@ var TunnelProxy = class {
       }
       this.gatewayWs = null;
     }
+    this.gatewayWsReady = false;
+    this.gatewayWsConnecting = false;
+    this.gatewayWsReconnectRequested = false;
+    this.gatewayWsAutoPairingApprovals = 0;
     this.gatewayWsPending = [];
   }
   // ─── Gateway RPC WebSocket ───
@@ -6913,6 +6925,53 @@ var TunnelProxy = class {
       `TunnelProxy: cleared stale stored device token after gateway mismatch (deviceId=${this.deviceIdentity.deviceId})`
     );
   }
+  async maybeAutoApproveGatewayPairing(frame) {
+    const errorCode = typeof frame?.error?.code === "string" ? frame.error.code : void 0;
+    const detailsCode = typeof frame?.error?.details?.code === "string" ? frame.error.details.code : void 0;
+    if (errorCode !== "NOT_PAIRED" && detailsCode !== "PAIRING_REQUIRED") {
+      return false;
+    }
+    const requestId = typeof frame?.error?.details?.requestId === "string" ? frame.error.details.requestId.trim() : "";
+    const reason = typeof frame?.error?.details?.reason === "string" ? frame.error.details.reason.trim() : "";
+    if (!requestId) {
+      this.opts.logger.warn(
+        "TunnelProxy: gateway pairing required but requestId missing; unable to auto-approve"
+      );
+      return false;
+    }
+    if (reason && reason !== "not-paired" && reason !== "scope-upgrade") {
+      this.opts.logger.warn(
+        `TunnelProxy: gateway pairing required with unsupported reason=${reason}; skipping auto-approve`
+      );
+      return false;
+    }
+    if (this.gatewayWsAutoPairingApprovals >= MAX_AUTO_PAIRING_APPROVALS) {
+      this.opts.logger.warn(
+        `TunnelProxy: reached auto-pairing retry limit (${MAX_AUTO_PAIRING_APPROVALS}); requestId=${requestId}`
+      );
+      return false;
+    }
+    try {
+      const approved = await approveDevicePairing(requestId, this.hostStateDir);
+      if (!approved) {
+        this.opts.logger.warn(
+          `TunnelProxy: gateway pairing request ${requestId} not found in host state ${this.hostStateDir}`
+        );
+        return false;
+      }
+      this.gatewayWsAutoPairingApprovals += 1;
+      this.gatewayWsReconnectRequested = true;
+      this.opts.logger.info(
+        `TunnelProxy: auto-approved local gateway pairing request ${requestId} (reason=${reason || "not-paired"}, hostStateDir=${this.hostStateDir}, approval=${this.gatewayWsAutoPairingApprovals}/${MAX_AUTO_PAIRING_APPROVALS})`
+      );
+      return true;
+    } catch (err) {
+      this.opts.logger.warn(
+        `TunnelProxy: failed to auto-approve gateway pairing request ${requestId}: ${err?.message ?? String(err)}`
+      );
+      return false;
+    }
+  }
   // ─── Gateway RPC WebSocket lifecycle ───
   /** 确保到本地 Gateway 的 RPC WebSocket 已连接且握手完成 */
   ensureGatewayWs() {
@@ -6932,7 +6991,7 @@ var TunnelProxy = class {
         `TunnelProxy: RPC WS tcp connected, waiting for connect.challenge (pending=${this.gatewayWsPending.length})`
       );
     });
-    ws.on("message", (data) => {
+    ws.on("message", async (data) => {
       let text;
       if (typeof data === "string") {
         text = data;
@@ -6964,6 +7023,8 @@ var TunnelProxy = class {
           fallbackScopes: ["operator.admin"],
           authInfo: frame.payload?.auth
         });
+        this.gatewayWsAutoPairingApprovals = 0;
+        this.gatewayWsReconnectRequested = false;
         this.gatewayWsReady = true;
         this.gatewayWsConnecting = false;
         this.opts.logger.info(
@@ -6976,6 +7037,20 @@ var TunnelProxy = class {
         return;
       }
       if (frame.type === "res" && frame.ok === false && !this.gatewayWsReady) {
+        const autoApproved = await this.maybeAutoApproveGatewayPairing(frame);
+        if (autoApproved) {
+          const wsAlreadyClosed = ws.readyState === wrapper_default.CLOSING || ws.readyState === wrapper_default.CLOSED || this.gatewayWs !== ws;
+          this.opts.logger.info(
+            `TunnelProxy: RPC WS handshake requested local pairing approval, reconnecting${wsAlreadyClosed ? " immediately" : " after close"} (pending=${this.gatewayWsPending.length})`
+          );
+          if (wsAlreadyClosed) {
+            this.gatewayWsReconnectRequested = false;
+            queueMicrotask(() => this.ensureGatewayWs());
+            return;
+          }
+          ws.close(1e3, "pairing approved, reconnecting");
+          return;
+        }
         this.opts.logger.error(
           `TunnelProxy: RPC WS handshake failed (pending=${this.gatewayWsPending.length}): ${previewText2(JSON.stringify(frame.error), 500)}`
         );
@@ -6988,6 +7063,7 @@ var TunnelProxy = class {
       const wasReady = this.gatewayWsReady;
       const pendingCount = this.gatewayWsPending.length;
       const reasonText = reason.toString();
+      const shouldReconnect = this.gatewayWsReconnectRequested && pendingCount > 0;
       this.opts.logger.info(
         `TunnelProxy: RPC WS closed by gateway (code=${code}, reason=${reasonText}, ready=${wasReady}, pending=${pendingCount}, activeWs=${this.wsProxy.activeCount})`
       );
@@ -6997,6 +7073,13 @@ var TunnelProxy = class {
       }
       this.gatewayWsConnecting = false;
       this.maybeClearStoredDeviceTokenOnMismatch(code, reasonText);
+      if (shouldReconnect) {
+        this.gatewayWsReconnectRequested = false;
+        this.opts.logger.info(
+          `TunnelProxy: retrying RPC WS after local pairing approval (pending=${this.gatewayWsPending.length})`
+        );
+        queueMicrotask(() => this.ensureGatewayWs());
+      }
     });
     ws.on("error", (err) => {
       this.opts.logger.warn(
@@ -7193,6 +7276,7 @@ function createTunnelService(opts) {
         });
         proxy = new TunnelProxy({
           stateDir: baseStateDir,
+          hostStateDir: ctx.stateDir,
           gatewayBaseUrl: opts.gatewayBaseUrl,
           gatewayAuthMode: opts.gatewayAuthMode,
           gatewayToken: opts.gatewayToken,