freertc 0.1.20 → 0.1.22

package/README.md

@@ -216,7 +216,7 @@ Quick checks:
 Expected `/health` response includes JSON like:
 
 ```json
-{"ok":true,"version":"0.1.20","protocol_version":"1.0","peers":0}
+{"ok":true,"version":"0.1.22","protocol_version":"1.0","peers":0}
 ```
 
 ## Auto WebRTC two-tab test

package/bin/freertc.mjs

@@ -107,6 +107,11 @@ function extractCurrentWorkerName(configText) {
   return match?.[1] || null;
 }
 
+function extractDeployHost(configPath) {
+  const text = fs.readFileSync(configPath, 'utf8');
+  return extractRouteHost(text) || extractRelayUrlHost(text) || extractDatabaseDomainHost(text);
+}
+
 function extractRelayUrlHost(configText) {
   const relayUrlMatch = configText.match(/"RELAY_URL"\s*:\s*"([^"]*)"/);
   if (!relayUrlMatch) return null;
@@ -350,25 +355,41 @@ function runDeployWithAutoRouteRecovery(wrangler, configPath, extraArgs = []) {
     if (result.stderr) process.stderr.write(result.stderr);
 
     if (typeof result.status === 'number' && result.status === 0) {
-      process.exit(0);
+      return { ok: true, status: 0 };
     }
 
     const combinedOutput = `${result.stdout || ''}\n${result.stderr || ''}`;
     const conflictOwner = extractRouteConflictOwner(combinedOutput);
     if (!conflictOwner || attemptedOwners.has(conflictOwner)) {
-      process.exit(typeof result.status === 'number' ? result.status : 1);
+      return { ok: false, status: typeof result.status === 'number' ? result.status : 1 };
     }
 
     attemptedOwners.add(conflictOwner);
     const patched = patchWranglerScriptName(configPath, conflictOwner);
     if (!patched) {
-      process.exit(typeof result.status === 'number' ? result.status : 1);
+      return { ok: false, status: typeof result.status === 'number' ? result.status : 1 };
     }
 
     console.log(`Detected route owned by worker "${conflictOwner}". Retrying deploy with that worker name automatically.`);
   }
 
-  process.exit(1);
+  return { ok: false, status: 1 };
+}
+
+async function fetchLiveHealthVersion(host) {
+  const normalizedHost = normalizeHost(host);
+  if (!normalizedHost) return null;
+  try {
+    const response = await fetch(`https://${normalizedHost}/health`, {
+      headers: { Accept: 'application/json' }
+    });
+    if (!response.ok) return null;
+    const payload = await response.json();
+    const version = payload?.version;
+    return typeof version === 'string' && version.trim() ? version.trim() : null;
+  } catch {
+    return null;
+  }
 }
 
 function compareVersions(left, right) {
@@ -411,14 +432,12 @@ async function assertLatestCliForDeploy() {
   try {
     const latestVersion = await fetchLatestCliVersion();
     if (compareVersions(CLI_VERSION, latestVersion) < 0) {
-      console.error(`freertc ${CLI_VERSION} is older than npm latest ${latestVersion}.`);
-      console.error('Use "npx freertc@latest deploy" or update the local freertc dependency before deploying.');
-      process.exit(1);
+      console.warn(`freertc ${CLI_VERSION} is older than npm latest ${latestVersion}.`);
+      console.warn('Continuing deploy with current CLI and enforcing live /health verification.');
     }
   } catch (error) {
-    console.error(`Unable to verify freertc version before deploy: ${error?.message || String(error)}`);
-    console.error('Set FREERTC_SKIP_LATEST_CHECK=1 to bypass this check if you need an offline deploy.');
-    process.exit(1);
+    console.warn(`Unable to verify freertc version before deploy: ${error?.message || String(error)}`);
+    console.warn('Continuing deploy anyway and relying on live /health verification.');
   }
 }
 
@@ -496,7 +515,46 @@ async function main() {
     await maybeAlignWorkerNameToRouteOwner(configPath);
     validateWranglerConfigForDeploy(configPath);
     const wrangler = resolveWranglerCommand(PROJECT_ROOT);
-    runDeployWithAutoRouteRecovery(wrangler, configPath, rest);
+    const firstDeploy = runDeployWithAutoRouteRecovery(wrangler, configPath, rest);
+    if (!firstDeploy.ok) {
+      process.exit(firstDeploy.status);
+    }
+
+    const deployHost = extractDeployHost(configPath);
+    if (!deployHost) {
+      process.exit(0);
+    }
+
+    let liveVersion = await fetchLiveHealthVersion(deployHost);
+    if (liveVersion && compareVersions(liveVersion, CLI_VERSION) >= 0) {
+      process.exit(0);
+    }
+
+    // If live version is still stale, force-resolve route owner and redeploy once.
+    const routeOwner = await findRouteOwnerForHost(deployHost);
+    if (routeOwner) {
+      const currentText = fs.readFileSync(configPath, 'utf8');
+      const currentName = extractCurrentWorkerName(currentText);
+      if (currentName !== routeOwner) {
+        patchWranglerScriptName(configPath, routeOwner);
+        console.log(`Live health still stale on ${deployHost}. Retrying deploy against route-owner worker "${routeOwner}".`);
+      } else {
+        console.log(`Live health still stale on ${deployHost}. Retrying deploy once for route-owner worker "${routeOwner}".`);
+      }
+
+      const secondDeploy = runDeployWithAutoRouteRecovery(wrangler, configPath, rest);
+      if (!secondDeploy.ok) {
+        process.exit(secondDeploy.status);
+      }
+      liveVersion = await fetchLiveHealthVersion(deployHost);
+      if (liveVersion && compareVersions(liveVersion, CLI_VERSION) >= 0) {
+        process.exit(0);
+      }
+    }
+
+    console.error(`Deploy completed but live health on https://${deployHost}/health is still stale (version=${liveVersion || 'unknown'}, expected>=${CLI_VERSION}).`);
+    console.error('Refusing silent success. Please rerun deploy after Cloudflare route cache settles.');
+    process.exit(1);
   }
 
   if (subcommand === 'dev') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freertc",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "description": "Cloudflare Worker signaling relay for WebRTC peers with D1 storage.",
   "keywords": [
     "webrtc",

package/scripts/non-cloudflare-server.mjs

@@ -7,7 +7,7 @@ import { fileURLToPath } from 'node:url';
 import { WebSocketServer } from 'ws';
 
 const PSP_VERSION = '1.0';
-const WORKER_VERSION = '0.1.20';
+const WORKER_VERSION = '0.1.22';
 const DEFAULT_TTL_MS = 30_000;
 const MAX_TTL_MS = 120_000;
 const MAX_MESSAGE_SIZE = 64 * 1024;

package/src/index.js

@@ -1,5 +1,5 @@
 const PSP_VERSION = "1.0";
-const WORKER_VERSION = "0.1.20";
+const WORKER_VERSION = "0.1.22";
 
 const DISCOVERY_TYPES = new Set(["announce", "withdraw", "discover", "peer_list", "redirect"]);
 const NEGOTIATION_TYPES = new Set(["connect_request", "connect_accept", "connect_reject", "offer", "answer", "ice_candidate", "ice_end", "renegotiate"]);