@yoooclaw/phone-notifications 1.7.0 → 1.7.2

package/dist/index.js

@@ -3648,7 +3648,7 @@ var require_websocket_server = __commonJS({
 
 // src/index.ts
 import { readFileSync as readFileSync14 } from "fs";
-import { basename as basename2, dirname as dirname5 } from "path";
+import { basename as basename2, dirname as dirname6 } from "path";
 
 // src/light/protocol.ts
 var MAX_LIGHT_SEGMENTS = 12;
@@ -3794,11 +3794,11 @@ import { randomUUID } from "crypto";
 
 // src/env.ts
 import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
-import { dirname } from "path";
+import { dirname as dirname2 } from "path";
 
 // src/host.ts
 import { existsSync, readFileSync } from "fs";
-import { join } from "path";
+import { dirname, join } from "path";
 function trimToUndefined(value) {
   if (typeof value !== "string") {
     return void 0;
@@ -3809,6 +3809,18 @@ function trimToUndefined(value) {
 function homeDir() {
   return process.env.HOME || process.env.USERPROFILE || "/tmp";
 }
+function expandUserPath(value) {
+  if (!value) {
+    return void 0;
+  }
+  if (value === "~") {
+    return homeDir();
+  }
+  if (value.startsWith("~/")) {
+    return join(homeDir(), value.slice(2));
+  }
+  return value;
+}
 function candidateMetaPaths() {
   const home = homeDir();
   return [
@@ -3824,8 +3836,8 @@ function loadQClawMeta() {
     try {
       const parsed = JSON.parse(readFileSync(metaPath, "utf-8"));
       return {
-        stateDir: trimToUndefined(parsed?.stateDir),
-        configPath: trimToUndefined(parsed?.configPath)
+        stateDir: expandUserPath(trimToUndefined(parsed?.stateDir)),
+        configPath: expandUserPath(trimToUndefined(parsed?.configPath))
       };
     } catch {
     }
@@ -3833,21 +3845,42 @@ function loadQClawMeta() {
   return void 0;
 }
 function resolveStateDirFromEnv() {
-  return trimToUndefined(process.env.OPENCLAW_STATE_DIR) ?? trimToUndefined(process.env.QCLAW_STATE_DIR) ?? trimToUndefined(process.env.OPENCLAW_ROOT) ?? trimToUndefined(process.env.OPENCLAW_HOME) ?? trimToUndefined(process.env.QCLAW_HOME);
+  return expandUserPath(
+    trimToUndefined(process.env.OPENCLAW_STATE_DIR) ?? trimToUndefined(process.env.QCLAW_STATE_DIR) ?? trimToUndefined(process.env.OPENCLAW_ROOT) ?? trimToUndefined(process.env.OPENCLAW_HOME) ?? trimToUndefined(process.env.QCLAW_HOME)
+  );
+}
+function resolveConfigPathFromEnv() {
+  return expandUserPath(
+    trimToUndefined(process.env.OPENCLAW_CONFIG_PATH) ?? trimToUndefined(process.env.QCLAW_CONFIG_PATH)
+  );
+}
+function hasOpenClawMarkers() {
+  const baseDir = join(homeDir(), ".openclaw");
+  return [
+    join(baseDir, "openclaw.json"),
+    join(baseDir, "credentials.json"),
+    join(baseDir, "extensions")
+  ].some((candidate) => existsSync(candidate));
 }
 function resolveStateDir() {
   const envDir = resolveStateDirFromEnv();
   if (envDir) {
     return envDir;
   }
+  if (hasOpenClawMarkers()) {
+    return join(homeDir(), ".openclaw");
+  }
   const meta = loadQClawMeta();
   if (meta?.stateDir) {
     return meta.stateDir;
   }
+  if (meta?.configPath) {
+    return dirname(meta.configPath);
+  }
   return join(homeDir(), ".openclaw");
 }
 function resolveConfigPath(stateDir = resolveStateDir()) {
-  const envConfigPath = trimToUndefined(process.env.OPENCLAW_CONFIG_PATH) ?? trimToUndefined(process.env.QCLAW_CONFIG_PATH);
+  const envConfigPath = resolveConfigPathFromEnv();
   if (envConfigPath) {
     return envConfigPath;
   }
@@ -3893,7 +3926,7 @@ function saveEnvName(env) {
     throw new Error(`\u65E0\u6548\u7684\u73AF\u5883\u540D\u79F0: ${env}\uFF0C\u53EF\u9009\u503C: ${[...VALID_ENVS].join(", ")}`);
   }
   const filePath = envFilePath();
-  mkdirSync(dirname(filePath), { recursive: true, mode: 448 });
+  mkdirSync(dirname2(filePath), { recursive: true, mode: 448 });
   writeFileSync(filePath, JSON.stringify({ env }, null, 2), {
     encoding: "utf-8",
     mode: 384
@@ -3964,7 +3997,7 @@ import {
   writeFileSync as writeFileSync2,
   watch
 } from "fs";
-import { dirname as dirname2, basename } from "path";
+import { dirname as dirname3, basename } from "path";
 function credentialsPath() {
   return resolveStateFile("credentials.json");
 }
@@ -3979,7 +4012,7 @@ function readCredentials() {
 }
 function writeCredentials(creds) {
   const path2 = credentialsPath();
-  mkdirSync2(dirname2(path2), { recursive: true, mode: 448 });
+  mkdirSync2(dirname3(path2), { recursive: true, mode: 448 });
   writeFileSync2(path2, JSON.stringify(creds, null, 2), {
     encoding: "utf-8",
     mode: 384
@@ -4000,7 +4033,7 @@ function requireApiKey() {
 }
 function watchCredentials(onChange) {
   const path2 = credentialsPath();
-  const dir = dirname2(path2);
+  const dir = dirname3(path2);
   const filename = basename(path2);
   let debounceTimer = null;
   const delayMs = 200;
@@ -5447,11 +5480,11 @@ import {
   unlinkSync,
   writeFileSync as writeFileSync9
 } from "fs";
-import { dirname as dirname4, join as join10 } from "path";
+import { dirname as dirname5, join as join10 } from "path";
 
 // src/tunnel/relay-client.ts
 import { writeFileSync as writeFileSync8, mkdirSync as mkdirSync6 } from "fs";
-import { dirname as dirname3 } from "path";
+import { dirname as dirname4 } from "path";
 
 // node_modules/.pnpm/ws@8.19.0/node_modules/ws/wrapper.mjs
 var import_stream = __toESM(require_stream(), 1);
@@ -5462,6 +5495,16 @@ var import_websocket_server = __toESM(require_websocket_server(), 1);
 var wrapper_default = import_websocket.default;
 
 // src/tunnel/relay-client.ts
+function previewText(text, max = 500) {
+  return text.length <= max ? text : `${text.substring(0, max)}\u2026`;
+}
+function maskSecret(value) {
+  if (!value) return "empty";
+  if (value.length <= 8) {
+    return `${value.slice(0, 2)}\u2026${value.slice(-2)}`;
+  }
+  return `${value.slice(0, 4)}\u2026${value.slice(-4)}`;
+}
 var RelayClient = class {
   constructor(opts) {
     this.opts = opts;
@@ -5483,7 +5526,7 @@ var RelayClient = class {
       lastDisconnectReason
     };
     try {
-      mkdirSync6(dirname3(this.opts.statusFilePath), { recursive: true });
+      mkdirSync6(dirname4(this.opts.statusFilePath), { recursive: true });
       writeFileSync8(this.opts.statusFilePath, JSON.stringify(info, null, 2));
     } catch {
     }
@@ -5542,8 +5585,9 @@ var RelayClient = class {
   async connect() {
     if (this.aborted) return;
     this.cleanup(true);
+    const rawApiKey = this.opts.apiKey.startsWith("Bearer ") ? this.opts.apiKey.slice("Bearer ".length) : this.opts.apiKey;
     this.opts.logger.info(
-      `Relay tunnel: connecting to ${this.opts.tunnelUrl} (attempt=${this.reconnectAttempt}, heartbeat=${this.opts.heartbeatSec}s)`
+      `Relay tunnel: connecting to ${this.opts.tunnelUrl} (attempt=${this.reconnectAttempt}, heartbeat=${this.opts.heartbeatSec}s, apiKey=${maskSecret(rawApiKey)})`
     );
     this.writeStatus("connecting");
     return new Promise((resolve) => {
@@ -5554,7 +5598,6 @@ var RelayClient = class {
           resolve();
         }
       };
-      const rawApiKey = this.opts.apiKey.startsWith("Bearer ") ? this.opts.apiKey.slice("Bearer ".length) : this.opts.apiKey;
       const wsUrl = new URL(this.opts.tunnelUrl);
       if (!wsUrl.searchParams.get("apiKey")) {
         wsUrl.searchParams.set("apiKey", rawApiKey);
@@ -5598,8 +5641,9 @@ var RelayClient = class {
       });
       ws.on("close", (code, reason) => {
         const reasonStr = reason.toString();
+        const lastInboundAgoMs = this.lastInboundAt ? Date.now() - this.lastInboundAt : null;
         this.opts.logger.warn(
-          `Relay tunnel: disconnected (code=${code}, reason=${reasonStr})`
+          `Relay tunnel: disconnected (code=${code}, reason=${previewText(reasonStr, 200)}, lastInboundAgoMs=${lastInboundAgoMs ?? "N/A"}, reconnectAttempt=${this.reconnectAttempt})`
         );
         if (this.ws === ws) {
           this.stopHeartbeat();
@@ -5610,7 +5654,9 @@ var RelayClient = class {
         settle();
       });
       ws.on("error", (err) => {
-        this.opts.logger.error(`Relay tunnel: WebSocket error: ${err.message}`);
+        this.opts.logger.error(
+          `Relay tunnel: WebSocket error: ${err.message} (readyState=${ws.readyState}, reconnectAttempt=${this.reconnectAttempt}, url=${wsUrl.toString()})`
+        );
         settle();
       });
     });
@@ -5621,13 +5667,16 @@ var RelayClient = class {
     if (text === "pong") {
       return;
     }
-    const preview = text.length <= 500 ? text : text.substring(0, 500) + "\u2026";
-    this.opts.logger.info(`Relay tunnel: \u2605 received message (${text.length} chars): ${preview}`);
+    this.opts.logger.info(
+      `Relay tunnel: \u2605 received message (${text.length} chars): ${previewText(text)}`
+    );
     let frame;
     try {
       frame = JSON.parse(text);
     } catch {
-      this.opts.logger.warn("Relay tunnel: received invalid frame, ignoring");
+      this.opts.logger.warn(
+        `Relay tunnel: received invalid frame, ignoring (preview=${previewText(text, 200)})`
+      );
       return;
     }
     this.opts.logger.info(`Relay tunnel: parsed frame type=${frame.type}, id=${"id" in frame ? frame.id : "N/A"}`);
@@ -5742,6 +5791,32 @@ import { randomUUID as randomUUID2 } from "crypto";
 import crypto from "crypto";
 import fs from "fs";
 import path from "path";
+function previewText2(text, max = 200) {
+  if (!text) return "";
+  return text.length <= max ? text : `${text.substring(0, max)}\u2026`;
+}
+function findHeaderValue(headers, key) {
+  if (!headers) return void 0;
+  const lowerKey = key.toLowerCase();
+  for (const [headerKey, headerValue] of Object.entries(headers)) {
+    if (headerKey.toLowerCase() === lowerKey) {
+      return headerValue;
+    }
+  }
+  return void 0;
+}
+function summarizeRequestHeaders(headers) {
+  const contentType = findHeaderValue(headers, "content-type");
+  const requestId = findHeaderValue(headers, "x-request-id");
+  const parts = [];
+  if (contentType) {
+    parts.push(`contentType=${contentType}`);
+  }
+  if (requestId) {
+    parts.push(`xRequestId=${previewText2(requestId, 120)}`);
+  }
+  return parts.length ? `, ${parts.join(", ")}` : "";
+}
 var ED25519_SPKI_PREFIX = Buffer.from("302a300506032b6570032100", "hex");
 function base64UrlEncode(buf) {
   return buf.toString("base64").replaceAll("+", "-").replaceAll("/", "_").replace(/=+$/g, "");
@@ -5840,6 +5915,12 @@ var TunnelProxy = class _TunnelProxy {
   gatewayWsPending = [];
   /** 设备身份，用于 Gateway connect 握手 */
   deviceIdentity;
+  pushGatewayPending(payload, reason) {
+    this.gatewayWsPending.push(payload);
+    this.opts.logger.info(
+      `TunnelProxy: gateway WS pending queue size=${this.gatewayWsPending.length} (${reason})`
+    );
+  }
   resolveGatewayConnectAuth() {
     const token = this.opts.gatewayToken?.trim() || void 0;
     const password = this.opts.gatewayPassword?.trim() || void 0;
@@ -5888,19 +5969,21 @@ var TunnelProxy = class _TunnelProxy {
     }
     return attempts;
   }
-  async sendHttpResponse(frameId, res) {
+  async sendHttpResponse(params) {
+    const { frameId, method, path: path2, authLabel, startedAtMs, res } = params;
     const contentType = res.headers.get("content-type") ?? "";
     const isStreaming = contentType.includes("text/event-stream");
+    const elapsedMs = Date.now() - startedAtMs;
     this.opts.logger.info(
-      `TunnelProxy: response status=${res.status}, content-type=${contentType}, streaming=${isStreaming}`
+      `TunnelProxy: HTTP id=${frameId} ${method} ${path2} <= ${res.status} (${elapsedMs}ms, auth=${authLabel}, content-type=${contentType}, streaming=${isStreaming})`
     );
     if (isStreaming && res.body) {
-      await this.streamResponse(frameId, res);
+      await this.streamResponse(frameId, res, startedAtMs);
       return;
     }
     const body = await res.text();
     this.opts.logger.info(
-      `TunnelProxy: response status=${res.status}, body=${body.substring(0, 200)}`
+      `TunnelProxy: HTTP id=${frameId} response body=${previewText2(body)}`
     );
     const headers = {};
     res.headers.forEach((value, key) => {
@@ -5949,7 +6032,7 @@ var TunnelProxy = class _TunnelProxy {
     if (this.gatewayWsReady && this.gatewayWs?.readyState === wrapper_default.OPEN) {
       this.gatewayWs.send(payload);
     } else {
-      this.gatewayWsPending.push(payload);
+      this.pushGatewayPending(payload, "raw frame queued before gateway WS ready");
     }
   }
   /** 清理所有代理的 WebSocket 连接 */
@@ -5983,12 +6066,14 @@ var TunnelProxy = class _TunnelProxy {
     this.gatewayWsConnecting = true;
     this.gatewayWsReady = false;
     const wsUrl = this.opts.gatewayBaseUrl.replace(/^http/, "ws");
-    this.opts.logger.info(`TunnelProxy: RPC WS connecting to gateway ${wsUrl}`);
+    this.opts.logger.info(
+      `TunnelProxy: RPC WS connecting to gateway ${wsUrl} (pending=${this.gatewayWsPending.length})`
+    );
     const ws = new wrapper_default(wsUrl);
     ws.on("open", () => {
       this.gatewayWs = ws;
       this.opts.logger.info(
-        "TunnelProxy: RPC WS tcp connected, waiting for connect.challenge"
+        `TunnelProxy: RPC WS tcp connected, waiting for connect.challenge (pending=${this.gatewayWsPending.length})`
       );
     });
     ws.on("message", (data) => {
@@ -6015,15 +6100,16 @@ var TunnelProxy = class _TunnelProxy {
       }
       if (frame.type === "event" && frame.event === "connect.challenge") {
         const challengeNonce = frame.payload?.nonce ?? "";
+        const connectRequestId = `tunnel-connect-${randomUUID2()}`;
+        const gatewayAuth = this.resolveGatewayConnectAuth();
         this.opts.logger.info(
-          `TunnelProxy: received connect.challenge (nonce=${challengeNonce}), sending connect request with device identity`
+          `TunnelProxy: received connect.challenge (nonce=${challengeNonce}, connectReqId=${connectRequestId}, hasToken=${!!gatewayAuth?.token}, hasPassword=${!!gatewayAuth?.password}), sending connect request with device identity`
         );
         const role = "operator";
         const scopes = ["operator.admin"];
         const signedAtMs = Date.now();
         const clientId = "gateway-client";
         const clientMode = "backend";
-        const gatewayAuth = this.resolveGatewayConnectAuth();
         const authPayload = buildDeviceAuthPayload({
           deviceId: this.deviceIdentity.deviceId,
           clientId,
@@ -6040,7 +6126,7 @@ var TunnelProxy = class _TunnelProxy {
         );
         const connectReq = {
           type: "req",
-          id: `tunnel-connect-${randomUUID2()}`,
+          id: connectRequestId,
           method: "connect",
           params: {
             minProtocol: 3,
@@ -6082,7 +6168,7 @@ var TunnelProxy = class _TunnelProxy {
       }
       if (frame.type === "res" && frame.ok === false && !this.gatewayWsReady) {
         this.opts.logger.error(
-          `TunnelProxy: RPC WS handshake failed: ${JSON.stringify(frame.error)}`
+          `TunnelProxy: RPC WS handshake failed (pending=${this.gatewayWsPending.length}): ${previewText2(JSON.stringify(frame.error), 500)}`
         );
         ws.close();
         return;
@@ -6090,8 +6176,10 @@ var TunnelProxy = class _TunnelProxy {
       this.opts.client.sendRaw(text);
     });
     ws.on("close", (code, reason) => {
+      const wasReady = this.gatewayWsReady;
+      const pendingCount = this.gatewayWsPending.length;
       this.opts.logger.info(
-        `TunnelProxy: RPC WS closed by gateway (code=${code}, reason=${reason.toString()})`
+        `TunnelProxy: RPC WS closed by gateway (code=${code}, reason=${reason.toString()}, ready=${wasReady}, pending=${pendingCount}, activeWs=${this.wsConnections.size})`
       );
       if (this.gatewayWs === ws) {
         this.gatewayWs = null;
@@ -6100,7 +6188,9 @@ var TunnelProxy = class _TunnelProxy {
       this.gatewayWsConnecting = false;
     });
     ws.on("error", (err) => {
-      this.opts.logger.warn(`TunnelProxy: RPC WS error: ${err.message}`);
+      this.opts.logger.warn(
+        `TunnelProxy: RPC WS error: ${err.message} (ready=${this.gatewayWsReady}, pending=${this.gatewayWsPending.length}, activeWs=${this.wsConnections.size})`
+      );
       this.gatewayWsConnecting = false;
       if (this.gatewayWs === ws) {
         this.gatewayWs = null;
@@ -6121,7 +6211,10 @@ var TunnelProxy = class _TunnelProxy {
       this.opts.logger.info(
         `TunnelProxy: req id=${frame.id} queued, gateway WS not ready yet`
       );
-      this.gatewayWsPending.push(payload);
+      this.pushGatewayPending(
+        payload,
+        `req id=${frame.id} queued before gateway WS handshake`
+      );
     }
   }
   // ─── 路径映射 ───
@@ -6133,7 +6226,9 @@ var TunnelProxy = class _TunnelProxy {
   }
   // ─── HTTP 请求代理 ───
   async handleHttpRequest(frame) {
-    const url = new URL(this.mapPath(frame.path), this.opts.gatewayBaseUrl);
+    const mappedPath = this.mapPath(frame.path);
+    const url = new URL(mappedPath, this.opts.gatewayBaseUrl);
+    const startedAtMs = Date.now();
     const localHeaders = {};
     for (const [k, v] of Object.entries(frame.headers ?? {})) {
       const lower = k.toLowerCase();
@@ -6143,11 +6238,14 @@ var TunnelProxy = class _TunnelProxy {
     }
     const authAttempts = this.buildLocalGatewayAuthAttempts(localHeaders);
     this.opts.logger.info(
-      `TunnelProxy: HTTP ${frame.method} ${frame.path} \u2192 ${url.toString()}, body=${frame.body?.substring(0, 200)}`
+      `TunnelProxy: HTTP id=${frame.id} ${frame.method} ${frame.path} \u2192 ${url.toString()}${summarizeRequestHeaders(frame.headers)}, authAttempts=${authAttempts.map((attempt) => attempt.label).join(" -> ")}, body=${previewText2(frame.body)}`
     );
     try {
       for (let attemptIndex = 0; attemptIndex < authAttempts.length; attemptIndex++) {
         const attempt = authAttempts[attemptIndex];
+        this.opts.logger.info(
+          `TunnelProxy: HTTP id=${frame.id} attempt ${attemptIndex + 1}/${authAttempts.length} auth=${attempt.label}`
+        );
         const res = await fetch(url.toString(), {
           method: frame.method,
           headers: attempt.headers,
@@ -6157,23 +6255,34 @@ var TunnelProxy = class _TunnelProxy {
         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)}` : ""}`
+            `TunnelProxy: HTTP id=${frame.id} local gateway auth via ${attempt.label} returned 401 after ${Date.now() - startedAtMs}ms, retrying next credential${body ? `, body=${previewText2(body)}` : ""}`
           );
           continue;
         }
-        await this.sendHttpResponse(frame.id, res);
+        await this.sendHttpResponse({
+          frameId: frame.id,
+          method: frame.method,
+          path: mappedPath,
+          authLabel: attempt.label,
+          startedAtMs,
+          res
+        });
         return;
       }
     } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      this.opts.logger.error(
+        `TunnelProxy: HTTP id=${frame.id} ${frame.method} ${mappedPath} failed after ${Date.now() - startedAtMs}ms: ${message}`
+      );
       this.opts.client.send({
         type: "proxy_error",
         id: frame.id,
         status: 502,
-        message: `gateway unreachable: ${err instanceof Error ? err.message : String(err)}`
+        message: `gateway unreachable: ${message}`
       });
     }
   }
-  async streamResponse(requestId, res) {
+  async streamResponse(requestId, res, startedAtMs) {
     const reader = res.body.getReader();
     const decoder = new TextDecoder();
     let chunkCount = 0;
@@ -6195,7 +6304,7 @@ var TunnelProxy = class _TunnelProxy {
         });
       }
       this.opts.logger.info(
-        `TunnelProxy: stream end id=${requestId}, total chunks=${chunkCount}`
+        `TunnelProxy: stream end id=${requestId}, total chunks=${chunkCount}, totalElapsedMs=${Date.now() - startedAtMs}`
       );
       this.opts.client.send({
         type: "stream",
@@ -6205,7 +6314,7 @@ var TunnelProxy = class _TunnelProxy {
       });
     } catch (err) {
       this.opts.logger.error(
-        `TunnelProxy: stream error id=${requestId} after ${chunkCount} chunks: ${err instanceof Error ? err.message : String(err)}`
+        `TunnelProxy: stream error id=${requestId} after ${chunkCount} chunks and ${Date.now() - startedAtMs}ms: ${err instanceof Error ? err.message : String(err)}`
       );
       this.opts.client.send({
         type: "proxy_error",
@@ -6360,7 +6469,7 @@ function createTunnelService(opts) {
     }
   }
   function acquireLock(filePath) {
-    mkdirSync7(dirname4(filePath), { recursive: true });
+    mkdirSync7(dirname5(filePath), { recursive: true });
     for (let attempt = 0; attempt < 2; attempt++) {
       try {
         const fd = openSync(filePath, "wx", 384);
@@ -6826,7 +6935,7 @@ var index_default = {
       if (openclawDir) return openclawDir;
       if (!workspaceDir) return void 0;
       if (basename2(workspaceDir) !== "workspace") return void 0;
-      return dirname5(workspaceDir);
+      return dirname6(workspaceDir);
     };
     api.registerCli(
       (ctx) => {