freertc 0.1.31 → 0.1.33

package/README.md

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

package/package.json

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

package/public/app.js

@@ -117,9 +117,20 @@ function deriveNetworkFromSession(sessionIdValue) {
   if (!session || !isSpecToken(session)) {
     return "";
   }
+  if (session.startsWith("sess:")) {
+    return session.slice(5);
+  }
   return `room:${session}`;
 }
 
+function deriveSessionFromNetwork(networkValue) {
+  const network = normalizeText(networkValue);
+  if (!network || !isSpecToken(network)) {
+    return "room:test";
+  }
+  return `sess:${network}`;
+}
+
 createApp({
   setup() {
     const host = window.location.host;
@@ -152,6 +163,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 +713,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 +727,8 @@ createApp({
         appliedNetwork.value = nextNetwork;
       }
 
+      sessionId.value = hasValidUrlSession ? sessionParam : deriveSessionFromNetwork(nextNetwork || normalizedNetworkValue());
+
       persistSharedIds();
     }
 
@@ -806,12 +820,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 +855,11 @@ createApp({
       }
       appliedNetwork.value = next;
 
+      if (!sessionIdExplicit) {
+        sessionId.value = deriveSessionFromNetwork(next);
+        persistSharedIds();
+      }
+
       reconnectLockedByBye = false;
       byeCooldowns.clear();
       failedPeerCooldowns.clear();
@@ -2683,7 +2708,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.31';
+const WORKER_VERSION = '0.1.33';
 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.31";
+const WORKER_VERSION = "0.1.33";
 
 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"]);