freertc 0.1.14 → 0.1.16

package/README.md

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

package/bin/freertc.mjs

@@ -186,6 +186,61 @@ function validateWranglerConfigForDeploy(configPath) {
   }
 }
 
+function extractRouteConflictOwner(outputText) {
+  if (!outputText) return null;
+  const match = outputText.match(/used by Worker:\s*([A-Za-z0-9._-]+)/i);
+  return match?.[1] || null;
+}
+
+function patchWranglerScriptName(configPath, workerName) {
+  if (!workerName) return false;
+  const text = fs.readFileSync(configPath, 'utf8');
+  const updated = text.replace(/^(\s*"name"\s*:\s*)"[^"]*"/gm, `$1"${workerName}"`);
+  if (updated === text) return false;
+  fs.writeFileSync(configPath, updated, 'utf8');
+  return true;
+}
+
+function runDeployWithAutoRouteRecovery(wrangler, configPath, extraArgs = []) {
+  const attemptedOwners = new Set();
+
+  for (let attempt = 0; attempt < 2; attempt += 1) {
+    const args = [...wrangler.baseArgs, 'deploy', '--config', configPath, '--env', 'production', ...extraArgs];
+    const result = spawnSync(wrangler.command, args, {
+      cwd: PROJECT_ROOT,
+      stdio: 'pipe',
+      encoding: 'utf8',
+      env: {
+        ...process.env,
+        FREERTC_PACKAGE_ROOT: PACKAGE_ROOT
+      }
+    });
+
+    if (result.stdout) process.stdout.write(result.stdout);
+    if (result.stderr) process.stderr.write(result.stderr);
+
+    if (typeof result.status === 'number' && result.status === 0) {
+      process.exit(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);
+    }
+
+    attemptedOwners.add(conflictOwner);
+    const patched = patchWranglerScriptName(configPath, conflictOwner);
+    if (!patched) {
+      process.exit(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);
+}
+
 function compareVersions(left, right) {
   const leftParts = String(left).split('.').map((value) => Number.parseInt(value, 10) || 0);
   const rightParts = String(right).split('.').map((value) => Number.parseInt(value, 10) || 0);
@@ -237,8 +292,50 @@ async function assertLatestCliForDeploy() {
   }
 }
 
+async function maybeHandoffToLatestCli(rawArgs = []) {
+  if (process.env.FREERTC_NO_AUTO_HANDOFF === '1') {
+    return;
+  }
+
+  // Avoid network checks for explicit help output.
+  const firstArg = rawArgs[0];
+  if (firstArg === '--help' || firstArg === '-h' || firstArg === 'help') {
+    return;
+  }
+
+  try {
+    const latestVersion = await fetchLatestCliVersion();
+    if (compareVersions(CLI_VERSION, latestVersion) >= 0) {
+      return;
+    }
+
+    console.log(`Detected newer freertc version ${latestVersion} (current ${CLI_VERSION}).`);
+    console.log('Running command with latest CLI automatically...');
+
+    const args = ['-y', `freertc@${latestVersion}`, ...rawArgs];
+    const result = spawnSync('npx', args, {
+      cwd: PROJECT_ROOT,
+      stdio: 'inherit',
+      env: {
+        ...process.env,
+        FREERTC_NO_AUTO_HANDOFF: '1'
+      }
+    });
+
+    if (typeof result.status === 'number') {
+      process.exit(result.status);
+    }
+    process.exit(1);
+  } catch {
+    // Offline or registry hiccup: continue with local CLI.
+  }
+}
+
 async function main() {
   const [, , subcommand, ...rest] = process.argv;
+  const rawArgs = process.argv.slice(2);
+
+  await maybeHandoffToLatestCli(rawArgs);
 
   if (!subcommand) {
     runInProject(process.execPath, [path.join(PACKAGE_ROOT, 'scripts', 'wrangler-install-wizard.mjs'), '--mode', 'both'], { bootstrap: true });
@@ -268,7 +365,7 @@ async function main() {
     autoPatchWranglerConfig(configPath);
     validateWranglerConfigForDeploy(configPath);
     const wrangler = resolveWranglerCommand(PROJECT_ROOT);
-    runInProject(wrangler.command, [...wrangler.baseArgs, 'deploy', '--config', configPath, '--env', 'production', ...rest]);
+    runDeployWithAutoRouteRecovery(wrangler, configPath, rest);
   }
 
   if (subcommand === 'dev') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freertc",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "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.14';
+const WORKER_VERSION = '0.1.16';
 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.14";
+const WORKER_VERSION = "0.1.16";
 
 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"]);