freertc 0.1.17 → 0.1.19

package/README.md

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

package/bin/freertc.mjs

@@ -102,6 +102,11 @@ function extractRouteHost(configText) {
   return normalizeHost(pattern.split('/')[0]);
 }
 
+function extractCurrentWorkerName(configText) {
+  const match = configText.match(/"name"\s*:\s*"([^"]+)"/);
+  return match?.[1] || null;
+}
+
 function extractRelayUrlHost(configText) {
   const relayUrlMatch = configText.match(/"RELAY_URL"\s*:\s*"([^"]*)"/);
   if (!relayUrlMatch) return null;
@@ -201,6 +206,131 @@ function patchWranglerScriptName(configPath, workerName) {
   return true;
 }
 
+function getApiToken() {
+  return process.env.CLOUDFLARE_API_TOKEN || process.env.CF_API_TOKEN || '';
+}
+
+function getAccountId() {
+  return process.env.CLOUDFLARE_ACCOUNT_ID || process.env.CF_ACCOUNT_ID || '';
+}
+
+function guessZoneCandidates(host) {
+  const normalized = normalizeHost(host);
+  if (!normalized) return [];
+  const parts = normalized.split('.');
+  const candidates = [];
+  for (let i = 0; i <= Math.max(0, parts.length - 2); i += 1) {
+    candidates.push(parts.slice(i).join('.'));
+  }
+  return Array.from(new Set(candidates));
+}
+
+function routePatternMatchesHost(pattern, host) {
+  const normalizedHost = normalizeHost(host);
+  if (!pattern || !normalizedHost) return false;
+  const rawHost = normalizeHost(String(pattern).split('/')[0]);
+  if (!rawHost) return false;
+  if (rawHost === normalizedHost) return true;
+  if (rawHost.startsWith('*.')) {
+    const suffix = rawHost.slice(2);
+    return normalizedHost === suffix || normalizedHost.endsWith(`.${suffix}`);
+  }
+  return false;
+}
+
+async function apiGetJson(url, token) {
+  const response = await fetch(url, {
+    headers: {
+      Authorization: `Bearer ${token}`,
+      Accept: 'application/json'
+    }
+  });
+  if (!response.ok) {
+    return null;
+  }
+
+  let payload;
+  try {
+    payload = await response.json();
+  } catch {
+    return null;
+  }
+
+  if (!payload?.success) {
+    return null;
+  }
+
+  return payload.result;
+}
+
+async function resolveZoneIdForHost(host, token) {
+  const candidates = guessZoneCandidates(host);
+  for (const candidate of candidates) {
+    const result = await apiGetJson(`https://api.cloudflare.com/client/v4/zones?name=${encodeURIComponent(candidate)}`, token);
+    if (Array.isArray(result) && result.length > 0 && result[0]?.id) {
+      return result[0].id;
+    }
+  }
+  return null;
+}
+
+async function findRouteOwnerForHost(host) {
+  const token = getApiToken();
+  const accountId = getAccountId();
+  if (!token || !accountId) {
+    return null;
+  }
+
+  const zoneId = await resolveZoneIdForHost(host, token);
+  if (!zoneId) {
+    return null;
+  }
+
+  const routes = await apiGetJson(`https://api.cloudflare.com/client/v4/zones/${zoneId}/workers/routes`, token);
+  if (!Array.isArray(routes)) {
+    return null;
+  }
+
+  // Prefer exact host matches over wildcard matches.
+  const exact = routes.find((route) => {
+    const patternHost = normalizeHost(String(route?.pattern || '').split('/')[0]);
+    const scriptName = route?.script || route?.script_name;
+    return patternHost === normalizeHost(host) && typeof scriptName === 'string' && scriptName.trim();
+  });
+  if (exact?.script || exact?.script_name) {
+    return exact.script || exact.script_name;
+  }
+
+  const wildcard = routes.find((route) => {
+    const scriptName = route?.script || route?.script_name;
+    return routePatternMatchesHost(route?.pattern, host) && typeof scriptName === 'string' && scriptName.trim();
+  });
+  return wildcard ? (wildcard.script || wildcard.script_name) : null;
+}
+
+async function maybeAlignWorkerNameToRouteOwner(configPath) {
+  const text = fs.readFileSync(configPath, 'utf8');
+  const host = extractRouteHost(text) || extractRelayUrlHost(text) || extractDatabaseDomainHost(text);
+  if (!host) {
+    return;
+  }
+
+  const routeOwner = await findRouteOwnerForHost(host);
+  if (!routeOwner) {
+    return;
+  }
+
+  const currentName = extractCurrentWorkerName(text);
+  if (!currentName || currentName === routeOwner) {
+    return;
+  }
+
+  const patched = patchWranglerScriptName(configPath, routeOwner);
+  if (patched) {
+    console.log(`Detected route owner worker "${routeOwner}" for ${host}. Auto-updated wrangler.jsonc name before deploy.`);
+  }
+}
+
 function runDeployWithAutoRouteRecovery(wrangler, configPath, extraArgs = []) {
   const attemptedOwners = new Set();
 
@@ -363,6 +493,7 @@ async function main() {
     ensureProjectFiles(PROJECT_ROOT);
     const configPath = requireWranglerConfig();
     autoPatchWranglerConfig(configPath);
+    await maybeAlignWorkerNameToRouteOwner(configPath);
     validateWranglerConfigForDeploy(configPath);
     const wrangler = resolveWranglerCommand(PROJECT_ROOT);
     runDeployWithAutoRouteRecovery(wrangler, configPath, rest);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freertc",
-  "version": "0.1.17",
+  "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.17';
+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.17";
+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}`;