socket-function 1.2.10 → 1.2.12

package/.claude/settings.local.json

@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(mkdir -p C:/Users/quent/AppData/Local/Temp/claude/D--repos-socket-function/117d10bd-31c6-4c68-938d-1fff47788fa6/scratchpad/tm-recover)",
+      "Bash(cp -r 'C:/Users/quent/AppData/Local/BraveSoftware/Brave-Browser/User Data/Default/Local Extension Settings/dhdgffkkebhmkfjojejmpbldmpobfkfo' C:/Users/quent/AppData/Local/Temp/claude/D--repos-socket-function/117d10bd-31c6-4c68-938d-1fff47788fa6/scratchpad/tm-recover/LocalExtSettings)"
+    ]
+  }
+}

package/SocketFunction.d.ts

@@ -10,11 +10,12 @@ type ExtractShape<ClassType, Shape> = {
 export declare class SocketFunction {
     static logMessages: boolean;
     static trackMessageSizes: {
-        upload: ((size: number) => void)[];
-        download: ((size: number) => void)[];
+        upload: ((size: number, nodeId: string) => void)[];
+        download: ((size: number, nodeId: string) => void)[];
         callTimes: ((obj: {
             start: number;
             end: number;
+            nodeId: string;
         }) => void)[];
     };
     static MAX_MESSAGE_SIZE: number;

package/SocketFunction.ts

@@ -58,9 +58,9 @@ type ExtractShape<ClassType, Shape> = {
 export class SocketFunction {
     public static logMessages = false;
     public static trackMessageSizes = {
-        upload: [] as ((size: number) => void)[],
-        download: [] as ((size: number) => void)[],
-        callTimes: [] as ((obj: { start: number; end: number; }) => void)[],
+        upload: [] as ((size: number, nodeId: string) => void)[],
+        download: [] as ((size: number, nodeId: string) => void)[],
+        callTimes: [] as ((obj: { start: number; end: number; nodeId: string; }) => void)[],
     };
 
     public static MAX_MESSAGE_SIZE = 1024 * 1024 * 32;

package/index.d.ts

@@ -19,11 +19,12 @@ declare module "socket-function/SocketFunction" {
     export declare class SocketFunction {
         static logMessages: boolean;
         static trackMessageSizes: {
-            upload: ((size: number) => void)[];
-            download: ((size: number) => void)[];
+            upload: ((size: number, nodeId: string) => void)[];
+            download: ((size: number, nodeId: string) => void)[];
             callTimes: ((obj: {
                 start: number;
                 end: number;
+                nodeId: string;
             }) => void)[];
         };
         static MAX_MESSAGE_SIZE: number;
@@ -956,7 +957,12 @@ declare module "socket-function/src/forwardPort" {
     }): Promise<void>;
     /** Our machine's LAN IP, as the router sees it — used to tell whether an existing port
      *      mapping points at us or at a different machine on the network. */
-    export declare function getLocalInternalIP(): string | undefined;
+    export declare function getLocalInternalIP(): Promise<string | undefined>;
+    /** True when our outbound address is private/CGNAT — i.e. a NAT sits between us and the
+     *      internet, so forwarding a port is worthwhile. A public outbound address means we're
+     *      directly reachable and forwarding is unnecessary. This is the cross-platform gate that
+     *      replaced the old "skip forwarding on linux" check, so Linux hosts behind NAT forward. */
+    export declare function isBehindNAT(): Promise<boolean>;
 
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "socket-function",
-	"version": "1.2.10",
+	"version": "1.2.12",
 	"main": "index.js",
 	"license": "MIT",
 	"dependencies": {

package/src/CallFactory.ts

@@ -277,7 +277,7 @@ export async function createCallFactory(
             {
                 let resultSize = data.map(x => x.length).reduce((a, b) => a + b, 0);
                 for (let callback of SocketFunction.trackMessageSizes.upload) {
-                    callback(resultSize);
+                    callback(resultSize, nodeId);
                 }
                 if (SocketFunction.logMessages) {
                     let fncHack = "";
@@ -568,7 +568,7 @@ export async function createCallFactory(
         }
         let parseTime = Date.now() - time;
         for (let callback of SocketFunction.trackMessageSizes.download) {
-            callback(resultSize);
+            callback(resultSize, nodeId);
         }
 
         let receiveStats: CompressionStats = {
@@ -659,7 +659,7 @@ export async function createCallFactory(
                 let start = time;
                 let end = Date.now();
                 for (let fnc of SocketFunction.trackMessageSizes.callTimes) {
-                    fnc({ start, end });
+                    fnc({ start, end, nodeId });
                 }
             }
 

package/src/forwardPort.d.ts

@@ -22,4 +22,9 @@ export declare function forwardPort(config: {
 }): Promise<void>;
 /** Our machine's LAN IP, as the router sees it — used to tell whether an existing port
  *      mapping points at us or at a different machine on the network. */
-export declare function getLocalInternalIP(): string | undefined;
+export declare function getLocalInternalIP(): Promise<string | undefined>;
+/** True when our outbound address is private/CGNAT — i.e. a NAT sits between us and the
+ *      internet, so forwarding a port is worthwhile. A public outbound address means we're
+ *      directly reachable and forwarding is unnecessary. This is the cross-platform gate that
+ *      replaced the old "skip forwarding on linux" check, so Linux hosts behind NAT forward. */
+export declare function isBehindNAT(): Promise<boolean>;

package/src/forwardPort.ts

@@ -15,14 +15,18 @@ async function resolveGateway(): Promise<{
     controlPort: number;
     controlURLs: string[];
 }> {
-    const localObj = getLocalInterfaceAddress();
-    if (!localObj) throw new Error("Could not find the local address / gateway");
+    let internalIP = await getOutboundIP();
+    if (!internalIP) throw new Error("Could not determine our local network address");
 
-    const { internalIP, gatewayIP } = localObj;
-    console.log(`Local IP: ${internalIP}, Gateway IP: ${gatewayIP}`);
+    // The gateway that answers SSDP discovery is the router we forward through; take its IP
+    //  and control port straight from the discovered device URL rather than parsing routes.
     let gateway = await discoverGateway(internalIP);
+    let gatewayURL = new URL(gateway);
+    let gatewayIP = gatewayURL.hostname;
+    let controlPort = Number(gatewayURL.port);
     let controlURLs = await getControlPaths(gateway);
-    let controlPort = Number(new URL(gateway).port);
+
+    console.log(`Local IP: ${internalIP}, Gateway IP: ${gatewayIP}`);
 
     return { internalIP, gatewayIP, controlPort, controlURLs };
 }
@@ -45,8 +49,6 @@ export interface PortMapping {
  *      GetGenericPortMappingEntry from index 0 until the gateway reports the index
  *      is out of range (SOAP error 713 / a non-200 response). */
 export async function listPortMappings(): Promise<PortMapping[]> {
-    if (os.platform() === "linux") return [];
-
     const { internalIP, gatewayIP, controlPort, controlURLs } = await resolveGateway();
 
     let lastError: unknown;
@@ -77,9 +79,6 @@ export async function forwardPort(config: {
     internalPort: number;
     duration?: number;
 }) {
-    // On linux, just return, the server probably doesn't require forwarding, and if it does,
-    //  it probably this code probably won't work anyways.
-    if (os.platform() === "linux") return;
     try {
         const { externalPort, internalPort } = config;
         let duration = config.duration ?? timeInHour;
@@ -110,72 +109,71 @@ export async function forwardPort(config: {
 
 /** Our machine's LAN IP, as the router sees it — used to tell whether an existing port
  *      mapping points at us or at a different machine on the network. */
-export function getLocalInternalIP(): string | undefined {
-    return getLocalInterfaceAddress()?.internalIP;
+export async function getLocalInternalIP(): Promise<string | undefined> {
+    return getOutboundIP();
 }
 
-function getLocalInterfaceAddress(): { internalIP: string; gatewayIP: string; } | undefined {
-    let looksLikeRouter = (ip: string) => ip.startsWith("10.0.0") || ip.startsWith("10.0.1") || ip.startsWith("192.168.0");
-
-    // On windows, run `ipconfig` and parse the output
-    // Otherwise, ifconfig
-    if (os.platform() === "win32") {
-        let output = require("child_process").execSync("ipconfig").toString();
-        let sections = output.split("\r\n\r\n");
-
-        for (let section of sections) {
-            if (section.includes("IPv4 Address")) {
-                let ipv4Match = section.match(/IPv4 Address[.\s]*: ([\d.]+)/);
-                let gatewayMatch = section.match(/Default Gateway[.\s]*: ([\d.]+)/);
-
-                if (ipv4Match && gatewayMatch && looksLikeRouter(gatewayMatch[1])) {
-                    return {
-                        internalIP: ipv4Match[1],
-                        gatewayIP: gatewayMatch[1]
-                    };
-                }
-            }
-        }
-    } else {
-        let gatewayMatch: RegExpMatchArray | undefined;
-        try {
-            // Attempt to get the gateway using "ip route" command (more universal)
-            const routeOutput = require("child_process").execSync("ip route show default").toString();
-            gatewayMatch = routeOutput.match(/default via (\d+\.\d+\.\d+\.\d+)/);
-        } catch (err) {
-            console.error("Failed to execute 'ip route show default', trying fallback", err);
-        }
+/** True when our outbound address is private/CGNAT — i.e. a NAT sits between us and the
+ *      internet, so forwarding a port is worthwhile. A public outbound address means we're
+ *      directly reachable and forwarding is unnecessary. This is the cross-platform gate that
+ *      replaced the old "skip forwarding on linux" check, so Linux hosts behind NAT forward. */
+export async function isBehindNAT(): Promise<boolean> {
+    let ip = await getOutboundIP();
+    if (!ip) {
+        return false;
+    }
+    return isPrivateIPv4(ip);
+}
 
-        if (!gatewayMatch) {
+// RFC-1918 private ranges, plus 100.64/10 (carrier-grade NAT) and 169.254/16 (link-local).
+//  Any of these as our outbound address means there's a NAT between us and the internet.
+function isPrivateIPv4(ip: string): boolean {
+    let parts = ip.split(".").map(Number);
+    if (parts.length !== 4 || parts.some(n => !Number.isInteger(n))) {
+        return false;
+    }
+    let [a, b] = parts;
+    return (
+        a === 10 ||
+        (a === 172 && b >= 16 && b <= 31) ||
+        (a === 192 && b === 168) ||
+        (a === 100 && b >= 64 && b <= 127) ||
+        (a === 169 && b === 254)
+    );
+}
+
+// The source IPv4 the kernel would use to reach the internet. Connecting a UDP socket runs a
+//  route lookup that assigns the local address without sending any packets, so it picks the
+//  correct interface even when several exist (VPN, docker, ...). Falls back to scanning the
+//  interface list when the route probe can't run.
+async function getOutboundIP(): Promise<string | undefined> {
+    let viaRoute = await new Promise<string | undefined>(resolve => {
+        const socket = dgram.createSocket("udp4");
+        let finish = (ip: string | undefined) => {
             try {
-                // Fallback to "netstat -rn" for older systems
-                const netstatOutput = require("child_process").execSync("netstat -rn").toString();
-                gatewayMatch = netstatOutput.match(/default\s+(\d+\.\d+\.\d+\.\d+)/);
-            } catch (err) {
-                console.error("Failed to execute 'netstat -rn', unable to find gateway", err);
+                socket.close();
+            } catch {
             }
+            resolve(ip);
+        };
+        socket.on("error", () => finish(undefined));
+        try {
+            socket.connect(53, "8.8.8.8", () => finish(socket.address().address));
+        } catch {
+            finish(undefined);
         }
+    });
+    if (viaRoute) {
+        return viaRoute;
+    }
 
-        if (gatewayMatch) {
-            try {
-                // Use "ip addr" to get internal IP (more universal)
-                const ipOutput = require("child_process").execSync("ip addr").toString();
-                const ipMatch = ipOutput.match(/inet (?!127\.0\.0\.1)(\d+\.\d+\.\d+\.\d+)\//);
-
-                if (ipMatch) {
-                    return {
-                        internalIP: ipMatch[1],
-                        gatewayIP: gatewayMatch[1]
-                    };
-                } else {
-                    console.error("Failed to match internal IP");
-                }
-            } catch (err) {
-                console.error("Failed to execute 'ip addr'", err);
+    for (let addrs of Object.values(os.networkInterfaces())) {
+        for (let addr of addrs ?? []) {
+            if (addr.family === "IPv4" && !addr.internal) {
+                return addr.address;
             }
         }
     }
-
     return undefined;
 }
 

package/src/webSocketServer.ts

@@ -18,8 +18,7 @@ import { yellow } from "./formatting/logColors";
 import { green } from "./formatting/logColors";
 import { formatTime } from "./formatting/format";
 import { getExternalIP, testTCPIsListening } from "./networking";
-import { forwardPort, listPortMappings, getLocalInternalIP, PortMapping } from "./forwardPort";
-import os from "os";
+import { forwardPort, listPortMappings, getLocalInternalIP, isBehindNAT, PortMapping } from "./forwardPort";
 
 // When a requested port is taken and useAvailablePortIfPortInUse is set, we scan
 //  upwards from this base instead of binding a random OS-assigned port, so restarts
@@ -362,15 +361,15 @@ export async function startSocketServer(
     }
 
     // Forwarding maps the external port to an equal internal port, so a candidate is only
-    //  usable if we can also own its external mapping on the router. Skipped on linux,
-    //  where forwardPort is a no-op anyway.
-    const doForward = !!(config.autoForwardPort && config.public && os.platform() !== "linux");
+    //  usable if we can also own its external mapping on the router. Only worthwhile when a
+    //  NAT sits between us and the internet; a directly-reachable public host needs no forward.
+    const doForward = !!(config.autoForwardPort && config.public) && await isBehindNAT();
 
     // Ensures the router's external mapping for `externalPort` belongs to us. Returns true
     //  if it's ours to keep (existing-and-ours → refresh the lease; free → create and
     //  confirm we won it), false if another machine owns it and we should try a new port.
     async function claimPortForward(externalPort: number): Promise<boolean> {
-        const ourIP = getLocalInternalIP();
+        const ourIP = await getLocalInternalIP();
         const matches = (m: PortMapping) => m.externalPort === externalPort && m.protocol.toUpperCase() === "TCP";
 
         const existing = (await listPortMappings()).find(matches);

package/test.ts

@@ -1,17 +1,21 @@
-import * as fs from "fs";
-import * as path from "path";
-import { listPortMappings } from "./src/forwardPort";
+import { listPortMappings, getLocalInternalIP, isBehindNAT } from "./src/forwardPort";
 
 
 async function main() {
+    let ourIP = await getLocalInternalIP();
+    let behindNAT = await isBehindNAT();
+    console.log(`Outbound / local IP: ${ourIP ?? "(could not determine)"}`);
+    console.log(`Behind NAT (forwarding ${behindNAT ? "WILL" : "will NOT"} be attempted): ${behindNAT}`);
+
     let mappings = await listPortMappings();
     console.log(`Found ${mappings.length} port mapping(s):`);
     for (let mapping of mappings) {
         let host = mapping.remoteHost || "*";
         let lease = mapping.leaseDuration === 0 ? "permanent" : `${mapping.leaseDuration}s left`;
-        console.log(`  ${mapping.protocol} ${host}:${mapping.externalPort} -> ${mapping.internalClient}:${mapping.internalPort} (${mapping.enabled ? "enabled" : "disabled"}, ${lease})${mapping.description ? ` "${mapping.description}"` : ""}`);
+        let ours = ourIP && mapping.internalClient === ourIP ? " <-- OURS" : "";
+        console.log(`  ${mapping.protocol} ${host}:${mapping.externalPort} -> ${mapping.internalClient}:${mapping.internalPort} (${mapping.enabled ? "enabled" : "disabled"}, ${lease})${mapping.description ? ` "${mapping.description}"` : ""}${ours}`);
     }
     console.table(mappings);
 }
 
-main().catch(e => console.error(e)).finally(() => process.exit(0));
+main().catch(e => console.error(e.stack ?? e)).finally(() => process.exit(0));