freertc 0.1.10 → 0.1.12

package/README.md

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

package/bin/freertc.mjs

@@ -106,16 +106,27 @@ 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;
+  if (/your-domain\.example|your[-_]?domain/i.test(raw)) return null;
   return normalizeHost(raw);
 }
 
+function extractDatabaseDomainHost(configText) {
+  const dbMatch = configText.match(/"database_name"\s*:\s*"([^"]+)"/);
+  if (!dbMatch) return null;
+  const dbName = dbMatch[1];
+  const slugMatch = dbName.match(/^freertc-signal-(.+)$/i);
+  if (!slugMatch) return null;
+  const slug = (slugMatch[1] || '').trim();
+  if (!slug || /your[-_]?domain/i.test(slug)) return null;
+  return normalizeHost(slug.replace(/-/g, '.'));
+}
+
 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);
+  const relayHost = routeHost || envDomainHost || extractRelayUrlHost(text) || extractDatabaseDomainHost(text);
 
   if (!relayHost) {
     return;
@@ -128,7 +139,7 @@ function autoPatchWranglerConfig(configPath) {
   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}"`);
+  text = text.replace(/("database_name"\s*:\s*)"freertc-signal(?:-your[-_]?domain)?"/gi, `$1"${dbName}"`);
 
   if (text !== before) {
     fs.writeFileSync(configPath, text, 'utf8');
@@ -143,7 +154,8 @@ function validateWranglerConfigForDeploy(configPath) {
   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: /wss:\/\/(?:your-domain\.example|your[-_]?domain)\/ws/i, message: 'Set vars.RELAY_URL to your real deployed relay WebSocket URL.' },
+    { test: /"database_name"\s*:\s*"freertc-signal(?:-your[-_]?domain)?"/i, message: 'Set d1_databases.database_name to a real database name (freertc-signal-<your-domain-slug>).' },
     { 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.' }
   ];
@@ -155,7 +167,7 @@ function validateWranglerConfigForDeploy(configPath) {
   }
 
   const relayUrlMatch = configText.match(/"RELAY_URL"\s*:\s*"([^"]*)"/);
-  if (!relayUrlMatch || !/^wss:\/\/[^\s"/]+\/ws$/i.test(relayUrlMatch[1])) {
+  if (!relayUrlMatch || !/^wss:\/\/[a-z0-9.-]+\/ws$/i.test(relayUrlMatch[1])) {
     failures.push('Set vars.RELAY_URL to a valid wss://<host>/ws URL.');
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freertc",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "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.10';
+const WORKER_VERSION = '0.1.12';
 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.10";
+const WORKER_VERSION = "0.1.12";
 
 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"]);
@@ -173,11 +173,19 @@ async function queryRelayForPeers(relayUrl, network, selfRelayId, db, selfKnownR
     return await new Promise((resolve) => {
       const timer = setTimeout(() => { try { ws.close(); } catch {} resolve([]); }, 4000);
       let gotPeerList = false;
+      const relayPeerId = selfRelayId || "relay-bridge";
 
       ws.addEventListener("message", async (ev) => {
         try {
           const msg = JSON.parse(ev.data);
-          if (msg.type === "peer_list" && msg.network === network && !gotPeerList) {
+          // Ignore broadcast peer_list updates triggered by announce heartbeats.
+          // We only want the direct discover response addressed to this bridge peer.
+          if (
+            msg.type === "peer_list" &&
+            msg.network === network &&
+            msg.to === relayPeerId &&
+            !gotPeerList
+          ) {
             gotPeerList = true;
             clearTimeout(timer);
             ws.close();
@@ -196,7 +204,6 @@ async function queryRelayForPeers(relayUrl, network, selfRelayId, db, selfKnownR
       ws.addEventListener("error", () => { clearTimeout(timer); resolve([]); });
       ws.addEventListener("close", () => { if (!gotPeerList) { clearTimeout(timer); resolve([]); } });
 
-      const relayPeerId = selfRelayId || "relay-bridge";
       // Announce as relay bridge
       ws.send(JSON.stringify({
         psp_version: PSP_VERSION, type: "announce", network,