freertc 0.1.18 → 0.1.19

package/README.md

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

package/package.json

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

package/public/app.js

@@ -1283,6 +1283,12 @@ createApp({
 
     function selectPeer(peerId, options = {}) {
       const { manual = false, allowUnannounced = false } = options;
+
+      if (peerId === fromPeer.value) {
+        pushLog("discovery:error", "Ignoring self peer selection");
+        toPeer.value = "";
+        return;
+      }
       
       // Only allow selecting announced peers to prevent phantom links.
       const isAnnounced = discoveredPeers.value.some((p) => p?.peer_id === peerId);
@@ -1889,6 +1895,10 @@ createApp({
         return;
       }
 
+      if (message.from && message.from === fromPeer.value) {
+        return;
+      }
+
       if (message.type === "error") {
         pushLog("server:error", message.body || {});
         return;
@@ -2087,6 +2097,9 @@ createApp({
       }
 
       const peerId = message.from;
+      if (peerId === fromPeer.value) {
+        return;
+      }
       const link = getMeshLink(peerId);
 
       if (!hasMeshCapacityForPeer(peerId)) {
@@ -2144,6 +2157,9 @@ createApp({
         return;
       }
       const peerId = message.from;
+      if (peerId === fromPeer.value) {
+        return;
+      }
       const link = getMeshLink(peerId);
 
       if (link.dc && link.dc.readyState === "open") {
@@ -2176,6 +2192,9 @@ createApp({
         return;
       }
       const peerId = message.from;
+      if (peerId === fromPeer.value) {
+        return;
+      }
       const rejectCode = message.body?.code || "connect_reject";
       const link = getMeshLink(peerId);
       link.connectRequested = false;
@@ -2205,6 +2224,9 @@ createApp({
         return;
       }
       const peerId = message.from;
+      if (peerId === fromPeer.value) {
+        return;
+      }
 
       if (!hasMeshCapacityForPeer(peerId)) {
         sendRelayEnvelope(
@@ -2288,6 +2310,9 @@ createApp({
         return;
       }
       const peerId = message.from;
+      if (peerId === fromPeer.value) {
+        return;
+      }
       const link = getMeshLink(peerId, false);
       if (!link?.pc || link.phase === "connected") {
         return;
@@ -2331,6 +2356,10 @@ createApp({
         return;
       }
 
+      if (message.from === fromPeer.value) {
+        return;
+      }
+
       const link = getMeshLink(message.from);
       if (!Array.isArray(link.pendingCandidates)) {
         link.pendingCandidates = [];

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.18';
+const WORKER_VERSION = '0.1.19';
 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.18";
+const WORKER_VERSION = "0.1.19";
 
 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"]);
@@ -554,6 +554,11 @@ async function handleClientMessage(socket, rawData, env, ctx, prevPeerKey = null
     const db = env.DB;
     const peerKey = `${network}:${peerId}`;
 
+    // Never relay or process peer-to-peer negotiation from a peer to itself.
+    if (message.to && message.to === peerId && RELAY_TYPES.has(type)) {
+      return { peerKey, network, peerId };
+    }
+
     // Subscribe to network on first message and whenever network changes on the same socket.
     if (!prevPeerKey || prevNetwork !== network) {
       if (prevNetwork && prevNetwork !== network) {
@@ -660,6 +665,7 @@ async function handleClientMessage(socket, rawData, env, ctx, prevPeerKey = null
     } else if (RELAY_TYPES.has(type)) {
       // RTC negotiation messages - relay immediately if online, queue if offline
       if (!message.to) return { peerKey, network, peerId };
+      if (message.to === peerId) return { peerKey, network, peerId };
 
       // Try immediate delivery to live peer
       const liveKey = `${network}:${message.to}`;