freertc 0.1.6 → 0.1.8

package/README.md

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

package/bin/freertc.mjs

@@ -9,6 +9,8 @@ import { ensureProjectFiles, resolveProjectRoot, resolveWranglerCommand } from '
 const __filename = fileURLToPath(import.meta.url);
 const PACKAGE_ROOT = path.resolve(path.dirname(__filename), '..');
 const PROJECT_ROOT = resolveProjectRoot(process.cwd());
+const PACKAGE_JSON = JSON.parse(fs.readFileSync(path.join(PACKAGE_ROOT, 'package.json'), 'utf8'));
+const CLI_VERSION = PACKAGE_JSON.version;
 
 function printHelp() {
   console.log(`freertc CLI
@@ -56,51 +58,146 @@ function runInProject(command, args, { bootstrap = false } = {}) {
 function requireWranglerConfig() {
   const configPath = path.join(PROJECT_ROOT, 'wrangler.jsonc');
   if (fs.existsSync(configPath)) {
-    return;
+    return configPath;
   }
 
   console.error(`Missing ${configPath}. Run "npx freertc" or "npx freertc wizard" from this project directory first.`);
   process.exit(1);
 }
 
-const [, , subcommand, ...rest] = process.argv;
+function validateWranglerConfigForDeploy(configPath) {
+  const configText = fs.readFileSync(configPath, 'utf8');
+  const failures = [];
+
+  const placeholderChecks = [
+    { test: /YOUR_D1_DATABASE_ID/, message: 'Replace YOUR_D1_DATABASE_ID in wrangler.jsonc.' },
+    { test: /Your App Relay/, message: 'Set vars.RELAY_NAME to your actual relay name.' },
+    { test: /wss:\/\/your-domain\.example\/ws/i, message: 'Set vars.RELAY_URL to your real deployed relay WebSocket URL.' },
+    { test: /"main"\s*:\s*"build\/worker\/shim\.mjs"/, message: 'Switch wrangler.jsonc main to src/index.js unless you intentionally use the Rust/WASM worker path.' },
+    { test: /"command"\s*:\s*"worker-build --release"/, message: 'Remove the worker-build step unless you intentionally deploy the Rust/WASM worker path.' }
+  ];
+
+  for (const check of placeholderChecks) {
+    if (check.test.test(configText)) {
+      failures.push(check.message);
+    }
+  }
 
-if (!subcommand) {
-  runInProject(process.execPath, [path.join(PACKAGE_ROOT, 'scripts', 'wrangler-install-wizard.mjs'), '--mode', 'both'], { bootstrap: true });
-}
+  const relayUrlMatch = configText.match(/"RELAY_URL"\s*:\s*"([^"]*)"/);
+  if (!relayUrlMatch || !/^wss:\/\/[^\s"/]+\/ws$/i.test(relayUrlMatch[1])) {
+    failures.push('Set vars.RELAY_URL to a valid wss://<host>/ws URL.');
+  }
 
-if (subcommand === '--help' || subcommand === '-h' || subcommand === 'help') {
-  printHelp();
-  process.exit(0);
-}
+  const relayNameMatch = configText.match(/"RELAY_NAME"\s*:\s*"([^"]*)"/);
+  if (!relayNameMatch || !relayNameMatch[1].trim()) {
+    failures.push('Set vars.RELAY_NAME to a non-empty relay name.');
+  }
 
-if (subcommand === 'wizard') {
-  runInProject(process.execPath, [path.join(PACKAGE_ROOT, 'scripts', 'wrangler-install-wizard.mjs'), ...rest], { bootstrap: true });
+  if (failures.length > 0) {
+    console.error(`Refusing to deploy with placeholder or invalid wrangler config: ${configPath}`);
+    for (const failure of failures) {
+      console.error(`- ${failure}`);
+    }
+    console.error('Run "npx freertc wizard" in the domain repo to patch wrangler.jsonc before deploying.');
+    process.exit(1);
+  }
 }
 
-if (subcommand === 'setup') {
-  runInProject(process.execPath, [path.join(PACKAGE_ROOT, 'scripts', 'wrangler-install-wizard.mjs'), '--mode', 'both', ...rest], { bootstrap: 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);
 
-if (subcommand === 'init' || subcommand === 'install') {
-  runInProject(process.execPath, [path.join(PACKAGE_ROOT, 'scripts', 'wrangler-install-wizard.mjs'), '--mode', 'both', ...rest], { bootstrap: true });
+  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;
 }
 
-if (subcommand === 'deploy') {
-  ensureProjectFiles(PROJECT_ROOT);
-  requireWranglerConfig();
-  const wrangler = resolveWranglerCommand(PROJECT_ROOT);
-  runInProject(wrangler.command, [...wrangler.baseArgs, 'deploy', '--env', 'production', ...rest]);
+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;
 }
 
-if (subcommand === 'dev') {
-  runInProject(process.execPath, [path.join(PACKAGE_ROOT, 'scripts', 'non-cloudflare-server.mjs'), ...rest], { bootstrap: true });
+async function assertLatestCliForDeploy() {
+  if (process.env.FREERTC_SKIP_LATEST_CHECK === '1') {
+    return;
+  }
+
+  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);
+    }
+  } 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);
+  }
 }
 
-if (subcommand === 'dev:cf' || subcommand === 'dev-cf') {
-  runInProject(process.execPath, [path.join(PACKAGE_ROOT, 'scripts', 'dev-server.mjs'), ...rest], { bootstrap: true });
+async function main() {
+  const [, , subcommand, ...rest] = process.argv;
+
+  if (!subcommand) {
+    runInProject(process.execPath, [path.join(PACKAGE_ROOT, 'scripts', 'wrangler-install-wizard.mjs'), '--mode', 'both'], { bootstrap: true });
+  }
+
+  if (subcommand === '--help' || subcommand === '-h' || subcommand === 'help') {
+    printHelp();
+    process.exit(0);
+  }
+
+  if (subcommand === 'wizard') {
+    runInProject(process.execPath, [path.join(PACKAGE_ROOT, 'scripts', 'wrangler-install-wizard.mjs'), ...rest], { bootstrap: true });
+  }
+
+  if (subcommand === 'setup') {
+    runInProject(process.execPath, [path.join(PACKAGE_ROOT, 'scripts', 'wrangler-install-wizard.mjs'), '--mode', 'both', ...rest], { bootstrap: true });
+  }
+
+  if (subcommand === 'init' || subcommand === 'install') {
+    runInProject(process.execPath, [path.join(PACKAGE_ROOT, 'scripts', 'wrangler-install-wizard.mjs'), '--mode', 'both', ...rest], { bootstrap: true });
+  }
+
+  if (subcommand === 'deploy') {
+    await assertLatestCliForDeploy();
+    ensureProjectFiles(PROJECT_ROOT);
+    const configPath = requireWranglerConfig();
+    validateWranglerConfigForDeploy(configPath);
+    const wrangler = resolveWranglerCommand(PROJECT_ROOT);
+    runInProject(wrangler.command, [...wrangler.baseArgs, 'deploy', '--env', 'production', ...rest]);
+  }
+
+  if (subcommand === 'dev') {
+    runInProject(process.execPath, [path.join(PACKAGE_ROOT, 'scripts', 'non-cloudflare-server.mjs'), ...rest], { bootstrap: true });
+  }
+
+  if (subcommand === 'dev:cf' || subcommand === 'dev-cf') {
+    runInProject(process.execPath, [path.join(PACKAGE_ROOT, 'scripts', 'dev-server.mjs'), ...rest], { bootstrap: true });
+  }
+
+  console.error(`Unknown command: ${subcommand}\n`);
+  printHelp();
+  process.exit(1);
 }
 
-console.error(`Unknown command: ${subcommand}\n`);
-printHelp();
-process.exit(1);
+await main();

package/package.json

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