socket-function 0.75.0 → 0.76.0

package/SocketFunction.ts

@@ -419,8 +419,9 @@ export class SocketFunction {
         if (isNode()) {
             throw new Error("Cannot get browser nodeId on server");
         }
-        if (globalThis.BOOTED_EDGE_NODE) {
-            return globalThis.BOOTED_EDGE_NODE.host;
+        let edgeNode = getBootedEdgeNode();
+        if (edgeNode) {
+            return edgeNode.host;
         }
         return SocketFunction.connect({ address: location.hostname, port: +location.port || 443 });
     }
@@ -433,14 +434,9 @@ export class SocketFunction {
     }
 }
 
-
-declare global {
-    var BOOTED_EDGE_NODE: EdgeNodeConfig | undefined;
+function getBootedEdgeNode() {
+    return (globalThis as any).BOOTED_EDGE_NODE as { host: string } | undefined;
 }
-type EdgeNodeConfig = {
-    // EX: 127-0-0-1.example.com:3334
-    host: string;
-};
 
 
 let socketContextSeqNum = 1;

package/package.json

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

package/src/webSocketServer.ts

@@ -46,7 +46,9 @@ export type SocketServerConfig = (
         //  may be, "querysub.com", for example), use ["letx.ca"]
         allowHostnames?: string[];
 
-        /** If the SNI matches this domain, we use a different key/cert. */
+        /** If the SNI matches this domain, we use a different key/cert.
+         *      We remove subdomains until we find a match
+         */
         SNICerts?: {
             [domain: string]: Watchable<https.ServerOptions>;
         };
@@ -214,14 +216,16 @@ export async function startSocketServer(
                     console.warn(`No SNI found in TLS hello from ${debug}, using main server. Packets ${packetCount}`);
                     console.log(buffer.toString("base64"));
                 }
+                let originalSNI = sni;
+                // Remove subdomains until we can find a domain
+                while (!sniServers.has(sni)) {
+                    let parts = sni.split(".");
+                    if (parts.length <= 2) break;
+                    sni = parts.slice(1).join(".");
+                }
 
                 if (!sniServers.has(sni)) {
-                    if (sni) {
-                        sni = sni.split(".").slice(-2).join(".");
-                    }
-                    if (!sniServers.has(sni)) {
-                        console.warn(`No SNI server found for ${sni}, using main server.`);
-                    }
+                    console.warn(`No SNI server found for ${originalSNI}, using main server. SNI candidates ${Array.from(sniServers.keys()).join(", ")}`);
                 }
                 server = sniServers.get(sni) || mainHTTPSServer;
             }