@p697/clawket 0.4.4 → 0.4.6

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 gatewayUrl=${redactGatewayWsUrl(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() {
@@ -2610,7 +2612,7 @@ function redactAuthorizationHeader(value) {
   return /^Bearer\s+/i.test(trimmed) ? "Bearer <redacted>" : "<redacted>";
 }
 function sanitizeRuntimeLogLine(line) {
-  return line.replace(/\b(gatewayId|instanceId|clientId|sourceClientId|targetClientId|deviceId|requestId|reqId|traceId)=([^\s]+)/g, "$1=<redacted>").replace(/\b(gw_[a-z0-9]+|grs_[A-Za-z0-9_-]+|gct_[A-Za-z0-9_-]+)\b/g, "<redacted>");
+  return line.replace(/\b(instanceId|clientId|sourceClientId|targetClientId|deviceId|requestId|reqId|traceId)=([^\s]+)/g, "$1=<redacted>").replace(/\b(relay|client)=([^\s]+)/g, "$1=<redacted>").replace(/\b(grs_[A-Za-z0-9_-]+|gct_[A-Za-z0-9_-]+)\b/g, "<redacted>");
 }
 function redactGatewayWsUrl(rawUrl) {
   const parsed = new URL(rawUrl);
@@ -3107,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({
@@ -3289,18 +3291,18 @@ async function main() {
       config,
       gatewayUrl,
       onLog: (line) => {
-        emitRuntimeLine(sanitizeRuntimeLogLine(`[clawket] ${line}`));
+        emitRuntimeLine(`[clawket] ${line}`);
       },
       onStatus: (snapshot) => {
         if (snapshot.lastError) {
-          emitRuntimeLine(sanitizeRuntimeLogLine(
+          emitRuntimeLine(
             `[status] relay=${snapshot.relayConnected ? "up" : "down"} gateway=${snapshot.gatewayConnected ? "up" : "down"} clients=${snapshot.clientCount} error=${snapshot.lastError}`
-          ));
+          );
           return;
         }
-        emitRuntimeLine(sanitizeRuntimeLogLine(
+        emitRuntimeLine(
           `[status] relay=${snapshot.relayConnected ? "up" : "down"} gateway=${snapshot.gatewayConnected ? "up" : "down"} clients=${snapshot.clientCount}`
-        ));
+        );
       },
       onPendingPairRequest: () => {
         emitRuntimeLine("[pair-request] pending");
@@ -3414,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.4",
+  "version": "0.4.6",
   "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",