freertc 0.1.15 → 0.1.17

package/README.md

@@ -216,7 +216,7 @@ Quick checks:
 Expected `/health` response includes JSON like:
 
 ```json
-{"ok":true,"version":"0.1.15","protocol_version":"1.0","peers":0}
+{"ok":true,"version":"0.1.17","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);
@@ -310,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.15",
+  "version": "0.1.17",
   "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.15';
+const WORKER_VERSION = '0.1.17';
 const DEFAULT_TTL_MS = 30_000;
 const MAX_TTL_MS = 120_000;
 const MAX_MESSAGE_SIZE = 64 * 1024;

package/scripts/postinstall-message.mjs

@@ -1,7 +1,92 @@
 #!/usr/bin/env node
 
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { spawnSync } from 'node:child_process';
+
+const __filename = fileURLToPath(import.meta.url);
+const PACKAGE_ROOT = path.resolve(path.dirname(__filename), '..');
+const PACKAGE_JSON = JSON.parse(fs.readFileSync(path.join(PACKAGE_ROOT, 'package.json'), 'utf8'));
+const CLI_VERSION = PACKAGE_JSON.version;
+
 const isGlobalInstall = process.env.npm_config_global === 'true';
 
+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);
+  const length = Math.max(leftParts.length, rightParts.length);
+
+  for (let index = 0; index < length; index += 1) {
+    const leftValue = leftParts[index] ?? 0;
+    const rightValue = rightParts[index] ?? 0;
+    if (leftValue > rightValue) return 1;
+    if (leftValue < rightValue) return -1;
+  }
+
+  return 0;
+}
+
+async function fetchLatestCliVersion() {
+  const response = await fetch('https://registry.npmjs.org/freertc/latest', {
+    headers: { Accept: 'application/json' }
+  });
+  if (!response.ok) {
+    throw new Error(`npm registry responded with ${response.status}`);
+  }
+
+  const payload = await response.json();
+  const version = payload?.version;
+  if (typeof version !== 'string' || !version.trim()) {
+    throw new Error('npm registry response did not include a version');
+  }
+
+  return version;
+}
+
+async function maybeSelfHealInstall() {
+  if (isGlobalInstall) return;
+  if (process.env.FREERTC_POSTINSTALL_SELF_HEAL === '0') return;
+  if (process.env.FREERTC_POSTINSTALL_RUNNING === '1') return;
+
+  const projectRoot = process.env.INIT_CWD ? path.resolve(process.env.INIT_CWD) : null;
+  if (!projectRoot) return;
+  if (projectRoot === PACKAGE_ROOT) return;
+  if (!fs.existsSync(path.join(projectRoot, 'package.json'))) return;
+
+  let latestVersion;
+  try {
+    latestVersion = await fetchLatestCliVersion();
+  } catch {
+    return;
+  }
+
+  if (compareVersions(CLI_VERSION, latestVersion) >= 0) {
+    return;
+  }
+
+  console.log(`freertc postinstall detected stale version ${CLI_VERSION}; upgrading host project to ${latestVersion}...`);
+
+  const installResult = spawnSync(
+    'npm',
+    ['install', `freertc@${latestVersion}`],
+    {
+      cwd: projectRoot,
+      stdio: 'inherit',
+      env: {
+        ...process.env,
+        FREERTC_POSTINSTALL_RUNNING: '1'
+      }
+    }
+  );
+
+  if (installResult.status !== 0) {
+    console.warn('freertc postinstall self-heal failed; continuing with current install.');
+  }
+}
+
+await maybeSelfHealInstall();
+
 const lines = [
   '',
   'freertc installed.',

package/src/index.js

@@ -1,5 +1,5 @@
 const PSP_VERSION = "1.0";
-const WORKER_VERSION = "0.1.15";
+const WORKER_VERSION = "0.1.17";
 
 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"]);