freertc 0.1.28 → 0.1.32

package/README.md

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

package/bin/freertc.mjs

@@ -149,7 +149,7 @@ function extractCurrentWorkerName(configText) {
 
 function extractDeployHost(configPath) {
   const text = fs.readFileSync(configPath, 'utf8');
-  return extractGlobalRelayUrlHost(text) || extractRouteHost(text) || extractDatabaseDomainHost(text) || extractRelayUrlHost(text);
+  return extractRouteHost(text) || extractDatabaseDomainHost(text) || extractRelayUrlHost(text) || extractGlobalRelayUrlHost(text);
 }
 
 function extractGlobalRelayUrlHost(configText) {
@@ -183,19 +183,24 @@ function extractDatabaseDomainHost(configText) {
 function autoPatchWranglerConfig(configPath) {
   let text = fs.readFileSync(configPath, 'utf8');
 
-  const publicHost = extractGlobalRelayUrlHost(text) || extractDatabaseDomainHost(text) || extractRouteHost(text);
+  const dbDomainHost = extractDatabaseDomainHost(text);
   const routeHost = extractRouteHost(text);
+  const relayUrlHost = extractRelayUrlHost(text);
+  const globalRelayHost = extractGlobalRelayUrlHost(text);
+  const publicHost = dbDomainHost || routeHost || relayUrlHost || globalRelayHost;
   const envDomainCandidate = normalizeHost(process.env.CF_DOMAIN || process.env.CLOUD_FLARE_DOMAIN || '');
   const envDomainHost = envDomainCandidate && !isPlaceholderHost(envDomainCandidate) ? envDomainCandidate : null;
-  const relayHost = routeHost || envDomainHost || extractRelayUrlHost(text) || extractDatabaseDomainHost(text);
+  const baseRelayDomain = dbDomainHost || routeHost || envDomainHost || relayUrlHost || globalRelayHost;
 
-  if (!relayHost) {
+  if (!baseRelayDomain) {
     return;
   }
 
+  const relayHost = baseRelayDomain;
+
   const relayWsUrl = `wss://${relayHost}/ws`;
   const relayName = relayHost;
-  const dbName = `freertc-signal-${sanitizeDomain(relayHost)}`;
+  const dbName = `freertc-signal-${sanitizeDomain(dbDomainHost || baseRelayDomain)}`;
 
   const before = text;
   text = patchJsoncVar(text, 'RELAY_URL', relayWsUrl);
@@ -250,8 +255,11 @@ 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;
+  const usedByMatch = outputText.match(/used by Worker:\s*([A-Za-z0-9._-]+)/i);
+  if (usedByMatch?.[1]) return usedByMatch[1];
+
+  const assignedMatch = outputText.match(/"([A-Za-z0-9._-]+)"\s+is already assigned to routes:/i);
+  return assignedMatch?.[1] || null;
 }
 
 function patchWranglerScriptName(configPath, workerName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freertc",
-  "version": "0.1.28",
+  "version": "0.1.32",
   "description": "Cloudflare Worker signaling relay for WebRTC peers with D1 storage.",
   "keywords": [
     "webrtc",

package/public/app.js

@@ -120,6 +120,14 @@ function deriveNetworkFromSession(sessionIdValue) {
   return `room:${session}`;
 }
 
+function deriveSessionFromNetwork(networkValue) {
+  const network = normalizeText(networkValue);
+  if (!network || !isSpecToken(network)) {
+    return "room:test";
+  }
+  return network;
+}
+
 createApp({
   setup() {
     const host = window.location.host;
@@ -152,6 +160,7 @@ createApp({
     const appliedFromPeer = ref(fromPeer.value);
     const toPeer = ref("");
     const sessionId = ref("");
+    let sessionIdExplicit = false;
     const instanceId = ref("");
 
     const activeView = ref("webrtc");
@@ -701,12 +710,12 @@ createApp({
         pushLog("network:error", "Ignoring invalid URL network");
       }
 
-      sessionId.value = hasValidUrlSession ? sessionParam : `sess-${Math.random().toString(36).slice(2, 10)}`;
+      sessionIdExplicit = hasValidUrlSession;
       instanceId.value = hasValidUrlInstance ? instanceParam : `inst-${Math.random().toString(36).slice(2, 10)}`;
 
       // Cross-domain links should land in the same room even when each origin has
       // different sessionStorage UI state. URL network wins; otherwise derive from session_id.
-      const derivedNetwork = deriveNetworkFromSession(sessionId.value);
+      const derivedNetwork = hasValidUrlSession ? deriveNetworkFromSession(sessionParam) : "";
       const nextNetwork = hasValidUrlNetwork ? networkParam : (derivedNetwork || normalizedNetworkValue());
       if (nextNetwork && nextNetwork !== network.value) {
         network.value = nextNetwork;
@@ -715,6 +724,8 @@ createApp({
         appliedNetwork.value = nextNetwork;
       }
 
+      sessionId.value = hasValidUrlSession ? sessionParam : deriveSessionFromNetwork(nextNetwork || normalizedNetworkValue());
+
       persistSharedIds();
     }
 
@@ -806,12 +817,18 @@ createApp({
     }
 
     function regenerateSharedIds() {
+      sessionIdExplicit = true;
       sessionId.value = `sess-${Math.random().toString(36).slice(2, 10)}`;
       instanceId.value = `inst-${Math.random().toString(36).slice(2, 10)}`;
       persistSharedIds();
       pushLog("ids", "Generated new shared session_id and instance_id");
     }
 
+    function applySessionIdChange() {
+      sessionIdExplicit = true;
+      persistSharedIds();
+    }
+
     function regeneratePeerId() {
       fromPeer.value = randomHex();
       appliedFromPeer.value = fromPeer.value;
@@ -835,6 +852,11 @@ createApp({
       }
       appliedNetwork.value = next;
 
+      if (!sessionIdExplicit) {
+        sessionId.value = deriveSessionFromNetwork(next);
+        persistSharedIds();
+      }
+
       reconnectLockedByBye = false;
       byeCooldowns.clear();
       failedPeerCooldowns.clear();
@@ -2683,7 +2705,7 @@ createApp({
           <div class="field-grid">
             <label>
               Session ID
-              <input v-model="sessionId" @change="persistSharedIds">
+              <input v-model="sessionId" @change="applySessionIdChange">
             </label>
             <label>
               Instance ID

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.28';
+const WORKER_VERSION = '0.1.32';
 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.28";
+const WORKER_VERSION = "0.1.32";
 
 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"]);