@yoooclaw/phone-notifications 1.5.1 → 1.5.2

package/dist/index.js

@@ -5209,30 +5209,9 @@ var RelayClient = class {
   startHeartbeat() {
     this.stopHeartbeat();
     const intervalMs = this.opts.heartbeatSec * 1e3;
+    this.sendHeartbeat();
     this.heartbeatTimer = setInterval(() => {
-      if (this.ws?.readyState === wrapper_default.OPEN) {
-        const idleMs = Date.now() - this.lastInboundAt;
-        const timeoutMs = this.getHeartbeatTimeoutMs();
-        if (idleMs >= timeoutMs) {
-          this.opts.logger.warn(
-            `Relay tunnel: heartbeat timeout, no inbound activity for ${idleMs}ms (threshold=${timeoutMs}ms)`
-          );
-          try {
-            this.ws.terminate();
-          } catch {
-          }
-          return;
-        }
-        this.opts.logger.info('Relay tunnel: \u2192 heartbeat "ping"');
-        try {
-          this.ws.send("ping");
-        } catch {
-        }
-        try {
-          this.ws.ping();
-        } catch {
-        }
-      }
+      this.sendHeartbeat();
     }, intervalMs);
   }
   stopHeartbeat() {
@@ -5244,6 +5223,32 @@ var RelayClient = class {
   getHeartbeatTimeoutMs() {
     return this.opts.heartbeatSec * 3 * 1e3;
   }
+  sendHeartbeat() {
+    if (this.ws?.readyState !== wrapper_default.OPEN) {
+      return;
+    }
+    const idleMs = Date.now() - this.lastInboundAt;
+    const timeoutMs = this.getHeartbeatTimeoutMs();
+    if (idleMs >= timeoutMs) {
+      this.opts.logger.warn(
+        `Relay tunnel: heartbeat timeout, no inbound activity for ${idleMs}ms (threshold=${timeoutMs}ms)`
+      );
+      try {
+        this.ws.terminate();
+      } catch {
+      }
+      return;
+    }
+    this.opts.logger.info('Relay tunnel: \u2192 heartbeat "ping"');
+    try {
+      this.ws.send("ping");
+    } catch {
+    }
+    try {
+      this.ws.ping();
+    } catch {
+    }
+  }
   markInboundActivity() {
     this.lastInboundAt = Date.now();
   }
@@ -5408,17 +5413,68 @@ var TunnelProxy = class _TunnelProxy {
       password
     };
   }
-  applyLocalGatewayAuthHeaders(headers) {
+  buildLocalGatewayAuthAttempts(baseHeaders) {
     const auth = this.resolveGatewayConnectAuth();
-    if (auth?.token) {
-      headers.authorization = `Bearer ${auth.token}`;
-      delete headers["x-openclaw-password"];
-      return;
+    const attempts = [];
+    const seen = /* @__PURE__ */ new Set();
+    const authMode = this.opts.gatewayAuthMode;
+    const addAttempt = (kind, secret) => {
+      if (!secret) return;
+      const dedupeKey = `${kind}:${secret}`;
+      if (seen.has(dedupeKey)) return;
+      seen.add(dedupeKey);
+      const headers = { ...baseHeaders };
+      headers.authorization = `Bearer ${secret}`;
+      if (kind === "password") {
+        headers["x-openclaw-password"] = secret;
+      } else {
+        delete headers["x-openclaw-password"];
+      }
+      attempts.push({
+        label: kind === "token" ? "gateway-token" : "gateway-password",
+        headers
+      });
+    };
+    if (authMode === "password") {
+      addAttempt("password", auth?.password);
+      addAttempt("token", auth?.token);
+    } else {
+      addAttempt("token", auth?.token);
+      addAttempt("password", auth?.password);
     }
-    if (auth?.password) {
-      headers.authorization = `Bearer ${auth.password}`;
-      headers["x-openclaw-password"] = auth.password;
+    if (attempts.length === 0) {
+      attempts.push({
+        label: "no-auth",
+        headers: { ...baseHeaders }
+      });
     }
+    return attempts;
+  }
+  async sendHttpResponse(frameId, res) {
+    const contentType = res.headers.get("content-type") ?? "";
+    const isStreaming = contentType.includes("text/event-stream");
+    this.opts.logger.info(
+      `TunnelProxy: response status=${res.status}, content-type=${contentType}, streaming=${isStreaming}`
+    );
+    if (isStreaming && res.body) {
+      await this.streamResponse(frameId, res);
+      return;
+    }
+    const body = await res.text();
+    this.opts.logger.info(
+      `TunnelProxy: response status=${res.status}, body=${body.substring(0, 200)}`
+    );
+    const headers = {};
+    res.headers.forEach((value, key) => {
+      headers[key] = value;
+    });
+    this.opts.client.send({
+      type: "proxy_response",
+      id: frameId,
+      status: res.status,
+      headers,
+      body
+    });
   }
   /** 处理从 Relay 收到的入站帧 */
   async handleFrame(frame) {
@@ -5647,39 +5703,28 @@ var TunnelProxy = class _TunnelProxy {
         localHeaders[k] = v;
       }
     }
-    this.applyLocalGatewayAuthHeaders(localHeaders);
+    const authAttempts = this.buildLocalGatewayAuthAttempts(localHeaders);
     this.opts.logger.info(
       `TunnelProxy: HTTP ${frame.method} ${frame.path} \u2192 ${url.toString()}, body=${frame.body?.substring(0, 200)}`
     );
     try {
-      const res = await fetch(url.toString(), {
-        method: frame.method,
-        headers: localHeaders,
-        body: frame.method !== "GET" && frame.method !== "HEAD" ? frame.body : void 0
-      });
-      const contentType = res.headers.get("content-type") ?? "";
-      const isStreaming = contentType.includes("text/event-stream");
-      this.opts.logger.info(
-        `TunnelProxy: response status=${res.status}, content-type=${contentType}, streaming=${isStreaming}`
-      );
-      if (isStreaming && res.body) {
-        await this.streamResponse(frame.id, res);
-      } else {
-        const body = await res.text();
-        this.opts.logger.info(
-          `TunnelProxy: response status=${res.status}, body=${body.substring(0, 200)}`
-        );
-        const headers = {};
-        res.headers.forEach((value, key) => {
-          headers[key] = value;
-        });
-        this.opts.client.send({
-          type: "proxy_response",
-          id: frame.id,
-          status: res.status,
-          headers,
-          body
+      for (let attemptIndex = 0; attemptIndex < authAttempts.length; attemptIndex++) {
+        const attempt = authAttempts[attemptIndex];
+        const res = await fetch(url.toString(), {
+          method: frame.method,
+          headers: attempt.headers,
+          body: frame.method !== "GET" && frame.method !== "HEAD" ? frame.body : void 0
         });
+        const hasFallback = attemptIndex < authAttempts.length - 1;
+        if (res.status === 401 && hasFallback) {
+          const body = await res.text();
+          this.opts.logger.warn(
+            `TunnelProxy: local gateway auth via ${attempt.label} returned 401, retrying next credential${body ? `, body=${body.substring(0, 200)}` : ""}`
+          );
+          continue;
+        }
+        await this.sendHttpResponse(frame.id, res);
+        return;
       }
     } catch (err) {
       this.opts.client.send({
@@ -5832,6 +5877,8 @@ var TunnelProxy = class _TunnelProxy {
 };
 
 // src/tunnel/service.ts
+var DEFAULT_HEARTBEAT_SEC = 10;
+var DEFAULT_RECONNECT_BACKOFF_MS = 2e3;
 function createTunnelService(opts) {
   let client = null;
   let proxy = null;
@@ -5938,7 +5985,7 @@ function createTunnelService(opts) {
       const { logger } = opts;
       const baseStateDir = join9(ctx.stateDir, "plugins", "phone-notifications");
       logger.info(
-        `Relay tunnel: starting (pid=${process.pid}, url=${opts.tunnelUrl}, heartbeat=${opts.heartbeatSec ?? 30}s, backoff=${opts.reconnectBackoffMs ?? 2e3}ms, gateway=${opts.gatewayBaseUrl}, hasGatewayToken=${!!opts.gatewayToken}, hasGatewayPwd=${!!opts.gatewayPassword})`
+        `Relay tunnel: starting (pid=${process.pid}, url=${opts.tunnelUrl}, heartbeat=${opts.heartbeatSec ?? DEFAULT_HEARTBEAT_SEC}s, backoff=${opts.reconnectBackoffMs ?? DEFAULT_RECONNECT_BACKOFF_MS}ms, gateway=${opts.gatewayBaseUrl}, hasGatewayToken=${!!opts.gatewayToken}, hasGatewayPwd=${!!opts.gatewayPassword})`
       );
       const statusFilePath = join9(baseStateDir, "tunnel-status.json");
       const lockPath = join9(baseStateDir, "relay-tunnel.lock");
@@ -5949,13 +5996,14 @@ function createTunnelService(opts) {
         client = new RelayClient({
           tunnelUrl: opts.tunnelUrl,
           token,
-          heartbeatSec: opts.heartbeatSec ?? 30,
-          reconnectBackoffMs: opts.reconnectBackoffMs ?? 2e3,
+          heartbeatSec: opts.heartbeatSec ?? DEFAULT_HEARTBEAT_SEC,
+          reconnectBackoffMs: opts.reconnectBackoffMs ?? DEFAULT_RECONNECT_BACKOFF_MS,
           statusFilePath,
           logger
         });
         proxy = new TunnelProxy({
           gatewayBaseUrl: opts.gatewayBaseUrl,
+          gatewayAuthMode: opts.gatewayAuthMode,
           gatewayToken: opts.gatewayToken,
           gatewayPassword: opts.gatewayPassword,
           client,
@@ -6047,12 +6095,17 @@ function trimToUndefined(value) {
 function resolveLocalGatewayAuth(params) {
   const envGatewayToken = trimToUndefined(process.env.OPENCLAW_GATEWAY_TOKEN) ?? trimToUndefined(process.env.CLAWDBOT_GATEWAY_TOKEN);
   const envGatewayPassword = trimToUndefined(process.env.OPENCLAW_GATEWAY_PASSWORD) ?? trimToUndefined(process.env.CLAWDBOT_GATEWAY_PASSWORD);
+  let configGatewayAuthMode;
   let configGatewayToken;
   let configGatewayPassword;
   const configPath = params.stateDir ? `${params.stateDir}/openclaw.json` : void 0;
   if (configPath) {
     try {
       const configData = JSON.parse(readFileSync11(configPath, "utf-8"));
+      const rawGatewayAuthMode = trimToUndefined(configData?.gateway?.auth?.mode);
+      if (rawGatewayAuthMode === "token" || rawGatewayAuthMode === "password") {
+        configGatewayAuthMode = rawGatewayAuthMode;
+      }
       configGatewayToken = trimToUndefined(configData?.gateway?.auth?.token);
       configGatewayPassword = trimToUndefined(configData?.gateway?.auth?.password);
     } catch (err) {
@@ -6064,6 +6117,7 @@ function resolveLocalGatewayAuth(params) {
     }
   }
   return {
+    gatewayAuthMode: configGatewayAuthMode,
     gatewayToken: envGatewayToken ?? configGatewayToken,
     gatewayPassword: envGatewayPassword ?? configGatewayPassword
   };
@@ -6097,7 +6151,7 @@ var index_default = {
     const tunnelUrl = "wss://openclaw-service-dev.yoootek.com/message/messages/ws/plugin";
     if (tunnelUrl) {
       const gatewayPort = process.env.OPENCLAW_GATEWAY_PORT || "18789";
-      const { gatewayToken, gatewayPassword } = resolveLocalGatewayAuth({
+      const { gatewayAuthMode, gatewayToken, gatewayPassword } = resolveLocalGatewayAuth({
         stateDir: openclawDir,
         logger
       });
@@ -6106,6 +6160,7 @@ var index_default = {
         heartbeatSec: config.relay?.heartbeatSec,
         reconnectBackoffMs: config.relay?.reconnectBackoffMs,
         gatewayBaseUrl: `http://localhost:${gatewayPort}`,
+        gatewayAuthMode,
         gatewayToken,
         gatewayPassword,
         logger