@p697/clawket 0.4.3 → 0.4.5

package/dist/index.js

@@ -208,8 +208,8 @@ function normalizeGatewayQrUrl(url) {
 }
 
 // ../../packages/bridge-core/dist/pairing.js
-var DEFAULT_REGISTRY_BASE = "https://registry.clawket.ai";
-var DEFAULT_REGISTRY_FALLBACK_BASE = "https://clawket-registry.clawket.workers.dev";
+var PACKAGED_DEFAULT_REGISTRY_BASE = "https://registry.clawket.ai"?.trim() ?? "";
+var PACKAGED_DEFAULT_REGISTRY_FALLBACK_BASE = "https://clawket-registry.clawket.workers.dev"?.trim() ?? "";
 async function pairGateway(input) {
   const baseUrl = normalizeHttpBase(input.serverUrl);
   const existing = readPairingConfig();
@@ -358,10 +358,12 @@ function isCloudflareChallengeResponse(response) {
 function resolveCloudflareChallengeFallbackUrl(url, response) {
   if (!isCloudflareChallengeResponse(response))
     return null;
+  if (!PACKAGED_DEFAULT_REGISTRY_BASE || !PACKAGED_DEFAULT_REGISTRY_FALLBACK_BASE)
+    return null;
   const requestUrl = new URL(url);
-  if (requestUrl.origin !== DEFAULT_REGISTRY_BASE)
+  if (requestUrl.origin !== PACKAGED_DEFAULT_REGISTRY_BASE)
     return null;
-  return `${DEFAULT_REGISTRY_FALLBACK_BASE}${requestUrl.pathname}${requestUrl.search}`;
+  return `${PACKAGED_DEFAULT_REGISTRY_FALLBACK_BASE}${requestUrl.pathname}${requestUrl.search}`;
 }
 function summarizeFailedResponse(text) {
   const collapsed = text.replace(/\s+/g, " ").trim();
@@ -1827,7 +1829,7 @@ var BridgeRuntime = class {
       return;
     this.stopped = false;
     this.updateSnapshot({ running: true, gatewayUrl: this.options.gatewayUrl });
-    this.log(`runtime starting gatewayId=${this.options.config.gatewayId} gatewayUrl=${this.options.gatewayUrl}`);
+    this.log(`runtime starting gatewayId=${this.options.config.gatewayId} instanceId=${this.options.config.instanceId} gatewayUrl=${redactGatewayWsUrl(this.options.gatewayUrl)}`);
     void this.connectRelay();
   }
   async stop() {
@@ -2030,7 +2032,7 @@ var BridgeRuntime = class {
     }
     try {
       const issued = await issueOpenClawBootstrapToken(parsed.value);
-      this.log(`relay bootstrap token issued requestId=${requestId} deviceId=${parsed.value.deviceId} targetClientId=${replyTargetClientId || "<none>"} expiresAtMs=${issued.expiresAtMs}`);
+      this.log(`relay bootstrap token issued requestId=${requestId} targetClientId=${replyTargetClientId || "<none>"} expiresAtMs=${issued.expiresAtMs}`);
       this.sendRelayControl({
         event: "bootstrap.issued",
         requestId,
@@ -2087,7 +2089,7 @@ var BridgeRuntime = class {
     if (this.stopped || !this.isRelayOpen() || this.gatewayConnecting || this.isGatewayOpen() || this.gatewayCloseBoundaryPending)
       return;
     this.gatewayConnecting = true;
-    this.log(`gateway connect start url=${this.options.gatewayUrl}`);
+    this.log(`gateway connect start url=${redactGatewayWsUrl(this.options.gatewayUrl)}`);
     const gateway = this.createWebSocket(this.options.gatewayUrl);
     this.gatewaySocket = gateway;
     gateway.once("open", () => {
@@ -2279,13 +2281,13 @@ var BridgeRuntime = class {
       return;
     this.inFlightConnectHandshakes.delete(response.id);
     const detail = response.ok ? "ok=true" : `ok=false errorCode=${response.errorCode ?? "<none>"} errorMessage=${response.errorMessage ?? "<none>"}`;
-    this.log(`gateway connect response reqId=${response.id} method=${pending.method} elapsedMs=${Date.now() - pending.startedAtMs} ${detail}`);
+    this.log(`gateway connect response reqId=<redacted> method=${pending.method} elapsedMs=${Date.now() - pending.startedAtMs} ${detail}`);
   }
   clearInFlightConnectHandshakes(reason) {
     if (this.inFlightConnectHandshakes.size === 0)
       return;
     for (const [requestId, pending] of this.inFlightConnectHandshakes.entries()) {
-      this.log(`gateway connect response missing reqId=${requestId} method=${pending.method} elapsedMs=${Date.now() - pending.startedAtMs} reason=${reason}`);
+      this.log(`gateway connect response missing reqId=<redacted> method=${pending.method} elapsedMs=${Date.now() - pending.startedAtMs} reason=${reason}`);
     }
     this.inFlightConnectHandshakes.clear();
   }
@@ -2343,7 +2345,7 @@ var BridgeRuntime = class {
       if (pending.slowWarningLogged || elapsedMs < warnDelayMs)
         continue;
       pending.slowWarningLogged = true;
-      this.log(`gateway connect still pending reqId=${requestId} method=${pending.method} elapsedMs=${elapsedMs}`);
+      this.log(`gateway connect still pending reqId=<redacted> method=${pending.method} elapsedMs=${elapsedMs}`);
     }
   }
   pushPendingGatewayMessage(message) {
@@ -2401,7 +2403,7 @@ var BridgeRuntime = class {
     this.options.onStatus?.(this.getSnapshot());
   }
   log(line) {
-    this.options.onLog?.(line);
+    this.options.onLog?.(sanitizeRuntimeLogLine(line));
   }
   isRelayOpen() {
     return this.relaySocket?.readyState === WebSocket.OPEN;
@@ -2523,7 +2525,7 @@ function patchConnectRequestGatewayAuth(text, openClawInfo) {
 function formatConnectHandshakeMetaForLog(meta) {
   if (!meta)
     return "";
-  return ` method=${meta.method} reqId=${meta.id ?? "<none>"} noncePresent=${meta.noncePresent} nonceLength=${meta.nonceLength ?? 0} authFields=${meta.authFields.length > 0 ? meta.authFields.join(",") : "<none>"}`;
+  return ` method=${meta.method} reqId=${meta.id ? "<redacted>" : "<none>"} noncePresent=${meta.noncePresent} nonceLength=${meta.nonceLength ?? 0} authFields=${meta.authFields.length > 0 ? meta.authFields.join(",") : "<none>"}`;
 }
 function parseBootstrapRequestPayload(payload) {
   if (!payload) {
@@ -2600,9 +2602,7 @@ function redactRelayWsUrl(rawUrl) {
   if (parsed.password) {
     parsed.password = "<redacted>";
   }
-  if (parsed.searchParams.has("token")) {
-    parsed.searchParams.set("token", "<redacted>");
-  }
+  stripSensitiveSearchParams(parsed);
   return parsed.toString();
 }
 function redactAuthorizationHeader(value) {
@@ -2611,6 +2611,27 @@ function redactAuthorizationHeader(value) {
     return "<none>";
   return /^Bearer\s+/i.test(trimmed) ? "Bearer <redacted>" : "<redacted>";
 }
+function sanitizeRuntimeLogLine(line) {
+  return line;
+}
+function redactGatewayWsUrl(rawUrl) {
+  const parsed = new URL(rawUrl);
+  if (parsed.username) {
+    parsed.username = "<redacted>";
+  }
+  if (parsed.password) {
+    parsed.password = "<redacted>";
+  }
+  parsed.hostname = "<redacted-host>";
+  stripSensitiveSearchParams(parsed);
+  return parsed.toString();
+}
+function stripSensitiveSearchParams(parsed) {
+  const sensitiveKeys = ["token", "password", "gatewayId", "clientId", "requestId", "reqId", "traceId"];
+  for (const key of sensitiveKeys) {
+    parsed.searchParams.delete(key);
+  }
+}
 function normalizeText(data) {
   if (typeof data === "string")
     return data;
@@ -3088,7 +3109,7 @@ async function main() {
     if ("error" in gatewayAuth) {
       throw new Error(gatewayAuth.error);
     }
-    const server = readFlag(args, "--server") ?? readFlag(args, "-s") ?? "https://registry.clawket.ai";
+    const server = resolvePairServer(args);
     const name = readFlag(args, "--name") ?? readFlag(args, "-n") ?? getDefaultBridgeDisplayName();
     const qrFile = readFlag(args, "--qr-file");
     const paired = await pairGateway({
@@ -3261,7 +3282,7 @@ async function main() {
       console.log("Starting bridge runtime. Press Ctrl+C to stop.");
       console.log("");
     } else {
-      emitRuntimeLine(`Starting Clawket service runtime for gateway ${config.gatewayId}`);
+      emitRuntimeLine("Starting Clawket service runtime.");
     }
     if (isServiceMode) {
       writeServiceState();
@@ -3274,13 +3295,17 @@ async function main() {
       },
       onStatus: (snapshot) => {
         if (snapshot.lastError) {
-          emitRuntimeLine(`[status] relay=${snapshot.relayConnected ? "up" : "down"} gateway=${snapshot.gatewayConnected ? "up" : "down"} clients=${snapshot.clientCount} error=${snapshot.lastError}`);
+          emitRuntimeLine(
+            `[status] relay=${snapshot.relayConnected ? "up" : "down"} gateway=${snapshot.gatewayConnected ? "up" : "down"} clients=${snapshot.clientCount} error=${snapshot.lastError}`
+          );
           return;
         }
-        emitRuntimeLine(`[status] relay=${snapshot.relayConnected ? "up" : "down"} gateway=${snapshot.gatewayConnected ? "up" : "down"} clients=${snapshot.clientCount}`);
+        emitRuntimeLine(
+          `[status] relay=${snapshot.relayConnected ? "up" : "down"} gateway=${snapshot.gatewayConnected ? "up" : "down"} clients=${snapshot.clientCount}`
+        );
       },
-      onPendingPairRequest: (request) => {
-        emitRuntimeLine(`[pair-request] requestId=${request.requestId} deviceId=${request.deviceId || "<unknown>"} name=${request.displayName ?? "<unknown>"}`);
+      onPendingPairRequest: () => {
+        emitRuntimeLine("[pair-request] pending");
       }
     });
     runtime.start();
@@ -3391,6 +3416,15 @@ function readFlag(args, name) {
 function hasFlag(args, name) {
   return args.includes(name);
 }
+function resolvePairServer(args) {
+  const explicit = readFlag(args, "--server") ?? readFlag(args, "-s");
+  if (explicit?.trim()) return explicit;
+  const envServer = process.env.CLAWKET_REGISTRY_URL?.trim() || "https://registry.clawket.ai"?.trim();
+  if (envServer) return envServer;
+  throw new Error(
+    "No registry server configured. Pass --server https://registry.example.com or set CLAWKET_REGISTRY_URL."
+  );
+}
 function readPairSubcommand(args) {
   for (const arg of args) {
     if (!arg.startsWith("-")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@p697/clawket",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "private": false,
   "type": "module",
   "description": "Clawket CLI for pairing and running the Relay bridge runtime",
@@ -18,7 +18,7 @@
     "node": ">=20"
   },
   "scripts": {
-    "build:bundle": "npm run --workspace @clawket/bridge-core build && npm run --workspace @clawket/bridge-runtime build && npx tsup src/index.ts --format esm --platform node --target node20 --clean --no-external @clawket/bridge-core --no-external @clawket/bridge-runtime --external ws --external qrcode-terminal",
+    "build:bundle": "npm run --workspace @clawket/bridge-core build && npm run --workspace @clawket/bridge-runtime build && node scripts/build-bundle.mjs",
     "build": "npm run build:bundle",
     "typecheck": "npm run --workspace @clawket/bridge-core build && npm run --workspace @clawket/bridge-runtime build && tsc -p tsconfig.json --noEmit",
     "test": "npm run --workspace @clawket/bridge-core build && npm run --workspace @clawket/bridge-runtime build && vitest run --passWithNoTests",