socket-function 1.2.21 → 1.2.22

package/package.json

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

package/src/protocolNegotiation.ts

@@ -35,6 +35,17 @@ function encodeFlagBit(b: boolean): string { return b ? "1" : "0"; }
 // connecting through a Let's Encrypt cert on a public domain.
 const WILDCARD_TARGET = "";
 
+// The target match is on the host portion only, not the exact listening port. A
+// server can restart (or rebind) on a new port while keeping the same host identity,
+// and a client still holding the old nodeId (host:oldPort) should be accepted rather
+// than rejected as a stale thread. Strip only the trailing :port (last colon segment),
+// so hosts that themselves contain colons survive.
+function stripPort(nodeId: string): string {
+    let idx = nodeId.lastIndexOf(":");
+    if (idx < 0) return nodeId;
+    return nodeId.slice(0, idx);
+}
+
 function encodeOne(target: string, flags: ConnectionFlags): string {
     let plain = `${PROTOCOL_VERSION}|${target}|clz4=${encodeFlagBit(flags.clientLZ4)}|slz4=${encodeFlagBit(flags.serverLZ4)}`;
     return hexEncode(plain);
@@ -105,7 +116,8 @@ export function chooseProtocol(
     for (let hex of proposed) {
         let decoded = decodeProtocol(hex);
         if (!decoded) continue;
-        if (decoded.target !== WILDCARD_TARGET && decoded.target !== serverNodeId) continue;
+        // NOTE: We allow the pork to be different. This doesn't degrade security as we're still using TLS, so proxies don't reduce our security, However, it does make it a lot easier for a server to listen on multiple ports and redirect them all to the single-mounted port (As socket function doesn't support mounting on multiple ports because it makes it complicated for code that wants to say where we mounted to if we could be mounted to multiple ports at once).
+        if (decoded.target !== WILDCARD_TARGET && stripPort(decoded.target) !== stripPort(serverNodeId)) continue;
         // Server capability check: if the proposal asks the server to receive
         // LZ4 (slz4=1) but the server doesn't support it, skip.
         if (decoded.flags.serverLZ4 && !serverCapabilities.lz4) continue;