@livedesk/client 0.1.219 → 0.1.221

package/bin/livedesk-client.js

@@ -2791,6 +2791,8 @@ export async function resolveManagerFromPin(supabase, pin, options = {}) {
                 endpointCandidates,
                 directReachable: target.directReachable,
                 connectionTransport: target.connectionTransport,
+                directProbeSkipped: target.directProbeSkipped === true,
+                directProbeSkipReason: String(target.directProbeSkipReason || ''),
                 discoverySource: 'supabase'
             };
         }
@@ -3511,6 +3513,63 @@ function parseManagerEndpoint(value) {
     return { host, port };
 }
 
+function ipv4ToUnsignedInteger(address) {
+    const octets = String(address || '').split('.').map(Number);
+    if (octets.length !== 4
+        || octets.some(octet => !Number.isInteger(octet) || octet < 0 || octet > 255)) {
+        return null;
+    }
+    return (((octets[0] << 24) >>> 0)
+        + (octets[1] << 16)
+        + (octets[2] << 8)
+        + octets[3]) >>> 0;
+}
+
+function isAutomaticPrivateIpv4(address) {
+    const value = ipv4ToUnsignedInteger(address);
+    if (value === null) return false;
+    const first = value >>> 24;
+    const second = (value >>> 16) & 0xff;
+    return first === 10
+        || first === 127
+        || (first === 100 && second >= 64 && second <= 127)
+        || (first === 169 && second === 254)
+        || (first === 172 && second >= 16 && second <= 31)
+        || (first === 192 && second === 168);
+}
+
+export function isEndpointOnLocalNetwork(endpoint, networkInterfaces = os.networkInterfaces()) {
+    const parsedEndpoint = parseManagerEndpoint(endpoint);
+    if (!parsedEndpoint || !net.isIPv4(parsedEndpoint.host)) return false;
+    const target = ipv4ToUnsignedInteger(parsedEndpoint.host);
+    if (target === null) return false;
+    if ((target >>> 24) === 127) return true;
+    for (const entries of Object.values(networkInterfaces || {})) {
+        for (const entry of Array.isArray(entries) ? entries : []) {
+            if (!entry || entry.internal || (entry.family !== 'IPv4' && entry.family !== 4)) continue;
+            const address = ipv4ToUnsignedInteger(entry.address);
+            const netmask = ipv4ToUnsignedInteger(entry.netmask);
+            if (address === null || netmask === null) continue;
+            if (address === target || ((address & netmask) >>> 0) === ((target & netmask) >>> 0)) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+export function shouldSkipAutomaticDirectProbe(endpoint, options = {}) {
+    if (options.forcePrivateDirectProbe === true
+        || /^(1|true|yes|on)$/i.test(String(process.env.LIVEDESK_FORCE_PRIVATE_DIRECT_PROBE || '').trim())) {
+        return false;
+    }
+    const parsedEndpoint = parseManagerEndpoint(endpoint);
+    return !!parsedEndpoint
+        && net.isIPv4(parsedEndpoint.host)
+        && isAutomaticPrivateIpv4(parsedEndpoint.host)
+        && !isEndpointOnLocalNetwork(endpoint, options.networkInterfaces);
+}
+
 function requestHubSlotAssignment({ manager, pairToken, deviceId, slotNumber, timeoutMs = 5000 }) {
     const endpoint = parseManagerEndpoint(manager);
     const normalizedPairToken = String(pairToken || '').trim();
@@ -3639,10 +3698,21 @@ export async function chooseManagerConnectionTarget(candidates, options = {}) {
         .filter(Boolean))];
     if (endpoints.length === 0) return null;
 
-    const manager = await chooseReachableEndpoint(endpoints, {
-        requireReachable: true,
-        probeEndpoint: options.probeEndpoint
-    });
+    // A signed 192.168/10/172.16 endpoint from another site cannot normally be
+    // reached from this Client. Skip that full TCP timeout only in automatic
+    // relay-capable discovery. Direct-only mode and an explicit override still
+    // probe it for routed VPN and port-forwarding deployments.
+    const skippedPrivateEndpoints = options.allowRelayFallback === true
+        ? endpoints.filter(endpoint => shouldSkipAutomaticDirectProbe(endpoint, options))
+        : [];
+    const skippedPrivateSet = new Set(skippedPrivateEndpoints);
+    const directCandidates = endpoints.filter(endpoint => !skippedPrivateSet.has(endpoint));
+    const manager = directCandidates.length > 0
+        ? await chooseReachableEndpoint(directCandidates, {
+            requireReachable: true,
+            probeEndpoint: options.probeEndpoint
+        })
+        : '';
     if (manager) {
         return {
             manager,
@@ -3655,12 +3725,16 @@ export async function chooseManagerConnectionTarget(candidates, options = {}) {
     }
     return {
         // The account/PIN response is the authority for this retry candidate.
-        // RemoteFast gives it one bounded direct attempt, then uses the
-        // pair-token-authenticated encrypted relay rather than keeping the
-        // launcher in an indefinite TCP reachability loop.
+        // RemoteFast uses relay control to negotiate encrypted UDP P2P video.
         manager: endpoints[0],
         directReachable: false,
-        connectionTransport: 'relay-fallback'
+        connectionTransport: 'relay-fallback',
+        ...(skippedPrivateEndpoints.length > 0
+            ? {
+                directProbeSkipped: true,
+                directProbeSkipReason: 'private-endpoint-outside-local-subnet'
+            }
+            : {})
     };
 }
 
@@ -3929,7 +4003,9 @@ export async function resolveManagerFromSupabase(supabase, options = {}) {
         hubDeviceId: String(data.node_id || '').trim(),
         endpointCandidates,
         directReachable: target.directReachable,
-        connectionTransport: target.connectionTransport
+        connectionTransport: target.connectionTransport,
+        directProbeSkipped: target.directProbeSkipped === true,
+        directProbeSkipReason: String(target.directProbeSkipReason || '')
     };
 }
 
@@ -4050,6 +4126,7 @@ async function prepareLoginConnection(parsed, existingConnectionPage = null, get
     let discoverySource = '';
     let connectionTransport = '';
     let directReachable = false;
+    let directProbeSkipReason = '';
     const allowRelayFallback = transportAllowsRelay(parsed.transport);
 
     if (shouldLogin) {
@@ -4123,12 +4200,15 @@ async function prepareLoginConnection(parsed, existingConnectionPage = null, get
             discoverySource = choice.discoverySource || 'supabase';
             connectionTransport = choice.connectionTransport || 'direct-tcp';
             directReachable = choice.directReachable !== false;
+            directProbeSkipReason = String(choice.directProbeSkipReason || '');
             connectionPage?.update({
                 endpointCandidates: choice.endpointCandidates || [],
                 manager,
                 assignedHubId: choice.hubDeviceId || '',
                 message: connectionTransport === 'relay-fallback'
-                    ? `LiveDesk Hub found at ${manager}; starting encrypted relay fallback.`
+                    ? directProbeSkipReason
+                        ? `LiveDesk Hub found at ${manager}; the private endpoint is outside this local subnet, so encrypted relay/P2P negotiation starts immediately.`
+                        : `LiveDesk Hub found at ${manager}; starting encrypted relay fallback.`
                     : `Connected to LiveDesk Hub at ${manager}.`
             });
             console.log(connectionTransport === 'relay-fallback'
@@ -4210,17 +4290,22 @@ async function prepareLoginConnection(parsed, existingConnectionPage = null, get
             pair = resolved.pair;
             connectionTransport = resolved.connectionTransport || 'direct-tcp';
             directReachable = resolved.directReachable !== false;
+            directProbeSkipReason = String(resolved.directProbeSkipReason || '');
             connectionPage?.update({
                 endpointCandidates: resolved.endpointCandidates || [],
                 manager,
                 assignedHubId: resolved.hubDeviceId || '',
                 message: connectionTransport === 'relay-fallback'
-                    ? `LiveDesk Hub found at ${manager}; starting encrypted relay fallback.`
+                    ? directProbeSkipReason
+                        ? `LiveDesk Hub found at ${manager}; the private endpoint is outside this local subnet, so encrypted relay/P2P negotiation starts immediately.`
+                        : `LiveDesk Hub found at ${manager}; starting encrypted relay fallback.`
                     : `Connected to LiveDesk Hub at ${manager}.`
             });
         }
         console.log(connectionTransport === 'relay-fallback'
-            ? `Found LiveDesk Hub record at ${manager}; direct TCP did not answer, so RemoteFast will use the encrypted rendezvous relay.`
+            ? directProbeSkipReason
+                ? `Found LiveDesk Hub record at ${manager}; private endpoint is outside this local subnet, so Direct TCP was skipped and encrypted relay control will negotiate UDP P2P video.`
+                : `Found LiveDesk Hub record at ${manager}; direct TCP did not answer, so RemoteFast will use encrypted relay control and prefer UDP P2P video.`
             : `Found LiveDesk Hub at ${manager}.`);
     }
     // Exact-package updates preserve the already paired Hub endpoint and pass
@@ -4285,6 +4370,7 @@ async function prepareLoginConnection(parsed, existingConnectionPage = null, get
         forwarded,
         connectionTransport: connectionTransport || 'direct-tcp',
         directReachable: connectionTransport === 'relay-fallback' ? false : (directReachable || !shouldLogin),
+        directProbeSkipReason,
         discoverySource,
         rediscoverOnDisconnect: shouldLogin,
         rediscoverOnInvalidPair: shouldLogin

package/package.json

@@ -1,52 +1,52 @@
-{
-  "name": "@livedesk/client",
-  "version": "0.1.219",
-  "description": "LiveDesk local remote client",
-  "type": "module",
-  "bin": {
-    "client": "bin/livedesk-client.js",
-    "livedesk-client": "bin/livedesk-client.js",
-    "livedesk-client-node": "bin/livedesk-client-node.js",
-    "livedesk-client-fast": "bin/livedesk-client-fast.js"
-  },
-  "files": [
-    "bin/",
-    "src/",
-    "tests/",
-    "README.md",
-    "THIRD_PARTY_NOTICES.md"
-  ],
-  "scripts": {
-    "check": "node --check bin/client-version.js && node --check bin/livedesk-client.js && node --check bin/livedesk-client-node.js && node --check bin/livedesk-client-update-bootstrap.cjs && node --check bin/livedesk-client-fast.js",
-    "test:version": "node --test tests/client-version.test.mjs",
-    "pack:dry": "npm pack --dry-run"
-  },
-  "keywords": [
-    "livedesk",
-    "remote",
-    "agent",
-    "local",
-    "desktop"
-  ],
-  "license": "MIT",
-  "engines": {
-    "node": ">=20"
-  },
-  "dependencies": {
-    "@ffmpeg-installer/ffmpeg": "^1.1.0",
-    "ffmpeg-static": "^5.3.0",
-    "@livedesk/runtime-core": "0.1.1",
-    "@supabase/supabase-js": "^2.110.0",
-    "node-screenshots": "^0.2.8",
-    "ws": "^8.18.3"
-  },
-  "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.424",
-    "@livedesk/fast-osx-arm64": "0.1.424",
-    "@livedesk/fast-osx-x64": "0.1.424",
-    "@livedesk/fast-win-x64": "0.1.424"
-  },
-  "publishConfig": {
-    "access": "public"
-  }
-}
+{
+  "name": "@livedesk/client",
+  "version": "0.1.221",
+  "description": "LiveDesk local remote client",
+  "type": "module",
+  "bin": {
+    "client": "bin/livedesk-client.js",
+    "livedesk-client": "bin/livedesk-client.js",
+    "livedesk-client-node": "bin/livedesk-client-node.js",
+    "livedesk-client-fast": "bin/livedesk-client-fast.js"
+  },
+  "files": [
+    "bin/",
+    "src/",
+    "tests/",
+    "README.md",
+    "THIRD_PARTY_NOTICES.md"
+  ],
+  "scripts": {
+    "check": "node --check bin/client-version.js && node --check bin/livedesk-client.js && node --check bin/livedesk-client-node.js && node --check bin/livedesk-client-update-bootstrap.cjs && node --check bin/livedesk-client-fast.js",
+    "test:version": "node --test tests/client-version.test.mjs",
+    "pack:dry": "npm pack --dry-run"
+  },
+  "keywords": [
+    "livedesk",
+    "remote",
+    "agent",
+    "local",
+    "desktop"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">=20"
+  },
+  "dependencies": {
+    "@ffmpeg-installer/ffmpeg": "^1.1.0",
+    "ffmpeg-static": "^5.3.0",
+    "@livedesk/runtime-core": "0.1.1",
+    "@supabase/supabase-js": "^2.110.0",
+    "node-screenshots": "^0.2.8",
+    "ws": "^8.18.3"
+  },
+  "optionalDependencies": {
+    "@livedesk/fast-linux-x64": "0.1.426",
+    "@livedesk/fast-osx-arm64": "0.1.426",
+    "@livedesk/fast-osx-x64": "0.1.426",
+    "@livedesk/fast-win-x64": "0.1.426"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}