freertc 0.1.7 → 0.1.9

package/README.md

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

package/bin/freertc.mjs

@@ -58,13 +58,122 @@ 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);
 }
 
+function normalizeHost(value) {
+  if (!value || typeof value !== 'string') return null;
+  let host = value.trim().toLowerCase();
+  if (!host) return null;
+  host = host.replace(/^https?:\/\//, '');
+  host = host.replace(/^wss?:\/\//, '');
+  host = host.replace(/\/.*$/, '');
+  host = host.replace(/:\d+$/, '');
+  return host || null;
+}
+
+function sanitizeDomain(domain) {
+  if (!domain || typeof domain !== 'string') return null;
+  return domain
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9-]/g, '-')
+    .replace(/-+/g, '-')
+    .replace(/^-|-$/g, '') || null;
+}
+
+function patchJsoncVar(text, varName, value) {
+  const escaped = varName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  const re = new RegExp(`("${escaped}"\\s*:\\s*)"[^"]*"`, 'g');
+  if (re.test(text)) {
+    return text.replace(re, `$1"${value}"`);
+  }
+  return text;
+}
+
+function extractRouteHost(configText) {
+  const routeMatch = configText.match(/"pattern"\s*:\s*"([^"]+)"/);
+  if (!routeMatch) return null;
+  const pattern = routeMatch[1];
+  return normalizeHost(pattern.split('/')[0]);
+}
+
+function extractRelayUrlHost(configText) {
+  const relayUrlMatch = configText.match(/"RELAY_URL"\s*:\s*"([^"]*)"/);
+  if (!relayUrlMatch) return null;
+  const raw = relayUrlMatch[1];
+  if (/your-domain\.example/i.test(raw)) return null;
+  return normalizeHost(raw);
+}
+
+function autoPatchWranglerConfig(configPath) {
+  let text = fs.readFileSync(configPath, 'utf8');
+
+  const routeHost = extractRouteHost(text);
+  const envDomainHost = normalizeHost(process.env.CF_DOMAIN || process.env.CLOUD_FLARE_DOMAIN || '');
+  const relayHost = routeHost || envDomainHost || extractRelayUrlHost(text);
+
+  if (!relayHost) {
+    return;
+  }
+
+  const relayWsUrl = `wss://${relayHost}/ws`;
+  const relayName = relayHost;
+  const dbName = `freertc-signal-${sanitizeDomain(relayHost)}`;
+
+  const before = text;
+  text = patchJsoncVar(text, 'RELAY_URL', relayWsUrl);
+  text = patchJsoncVar(text, 'RELAY_NAME', relayName);
+  text = text.replace(/("database_name"\s*:\s*)"freertc-signal(?:-your-domain)?"/g, `$1"${dbName}"`);
+
+  if (text !== before) {
+    fs.writeFileSync(configPath, text, 'utf8');
+    console.log(`Auto-patched wrangler.jsonc for deploy: RELAY_URL=${relayWsUrl}, RELAY_NAME=${relayName}`);
+  }
+}
+
+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);
+    }
+  }
+
+  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.');
+  }
+
+  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 (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);
+  }
+}
+
 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);
@@ -143,7 +252,9 @@ async function main() {
   if (subcommand === 'deploy') {
     await assertLatestCliForDeploy();
     ensureProjectFiles(PROJECT_ROOT);
-    requireWranglerConfig();
+    const configPath = requireWranglerConfig();
+    autoPatchWranglerConfig(configPath);
+    validateWranglerConfigForDeploy(configPath);
     const wrangler = resolveWranglerCommand(PROJECT_ROOT);
     runInProject(wrangler.command, [...wrangler.baseArgs, 'deploy', '--env', 'production', ...rest]);
   }

package/package.json

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