socket-function 0.54.0 → 0.56.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "socket-function",
-	"version": "0.54.0",
+	"version": "0.56.0",
 	"main": "index.js",
 	"license": "MIT",
 	"note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/webSocketServer.ts

@@ -75,7 +75,6 @@ export async function startSocketServer(
                 ca: getTrustedCertificates(),
                 // Attempt to disable sessions, because they make SNI significantly harder to parse.
                 secureOptions: require("node:constants").SSL_OP_NO_TICKET,
-                keepAlive: false,
             };
             if (!httpsServerLast) {
                 httpsServerLast = https.createServer(lastOptions);
@@ -158,6 +157,10 @@ export async function startSocketServer(
     //  so it is easy to read, and consistent.
     let options: https.ServerOptions = {
         ...config,
+        // Keep alive causes problems with our HTTP requests. AND... almost all of our data uses
+        //  our websockets, so... we really don't need to keep alive our HTTP requests
+        //  (and our images go through cloudflare, so we don't even need keep alive for that)
+        keepAlive: false,
     };
     if (!config.cert) {
         throw new Error("No cert specified");
@@ -186,10 +189,10 @@ export async function startSocketServer(
 
     let realServer = net.createServer(socket => {
         //console.log("Received TCP connection from " + socket.remoteAddress);
-        const remoteAddress = socket.remoteAddress;
+        const debug = socket.remoteAddress + ":" + socket.remotePort;
         function handleTLSHello(buffer: Buffer, packetCount: number): void | "more" {
             if (!SocketFunction.silent) {
-                console.log(`Received TCP header packet from ${remoteAddress}, have ${buffer.length} bytes so far, ${packetCount} packets`);
+                console.log(`Received TCP header packet from ${debug}, have ${buffer.length} bytes so far, ${packetCount} packets`);
             }
             // All HTTPS requests start with 22, and no HTTP requests start with 22,
             //  so we just need to read the first byte.
@@ -206,7 +209,7 @@ export async function startSocketServer(
                     console.log(`Received TCP connection with SNI ${JSON.stringify(sni)}`);
                 }
                 if (!sni) {
-                    console.warn(`No SNI found in TLS hello from ${remoteAddress}, using main server. Packets ${packetCount}`);
+                    console.warn(`No SNI found in TLS hello from ${debug}, using main server. Packets ${packetCount}`);
                     console.log(buffer.toString("base64"));
                 }
                 server = sniServers.get(sni) || mainHTTPSServer;
@@ -231,7 +234,7 @@ export async function startSocketServer(
         }
         getNextData();
         socket.on("error", (e) => {
-            console.error(`Socket error for ${remoteAddress}, ${e.stack}`);
+            console.error(`Socket error for ${debug}, ${e.stack}`);
         });
     });