socket-function 0.101.0 → 0.103.0

package/package.json

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

package/src/CallFactory.ts

@@ -486,7 +486,7 @@ export async function createCallFactory(
             }
             if (SocketFunction.logMessages) {
                 let call = callbackObj.call;
-                console.log(`SIZE\t${(formatNumberSuffixed(resultSize) + "B").padEnd(4, " ")}\tRETURN\t${call.classGuid}.${call.functionName} at ${Date.now()}`);
+                console.log(`SIZE\t${(formatNumberSuffixed(resultSize) + "B").padEnd(4, " ")}\tRETURN\t${call.classGuid}.${call.functionName} at ${Date.now()}, (${nodeId} / ${localNodeId})`);
             }
             if (call.isResultCompressed) {
                 call.result = await decompressObj(call.result as Buffer);
@@ -565,11 +565,15 @@ export async function createCallFactory(
                     - The upgrade request finishes, at least once: Received websocket upgrade
                         - AND, we are receiving some calls, so... that appears to work.
                         - Maybe the time calls never finish?
+                            - We added logging for when calls finish as well, so we can tell if all the TimeController calls timed out
+                            - ALSO, added more logging to see if the calls were from the same client (which WOULD be a bug, because
+                                the client shouldn't be calling us so often), or, different clients.
+                        - We DO receive more connections than http connections closed. But not that many more...
                 */
                 console.log(red(`Call to ${call.classGuid}.${call.functionName} at ${Date.now()}`));
             }
             if (SocketFunction.logMessages) {
-                console.log(`SIZE\t${(formatNumberSuffixed(resultSize) + "B").padEnd(4, " ")}\tEVALUATE\t${call.classGuid}.${call.functionName} at ${Date.now()}`);
+                console.log(`SIZE\t${(formatNumberSuffixed(resultSize) + "B").padEnd(4, " ")}\tEVALUATE\t${call.classGuid}.${call.functionName} at ${Date.now()}, (${nodeId} / ${localNodeId})`);
             }
             if (time > SocketFunction.WIRE_WARN_TIME) {
                 console.log(red(`Slow parse, took ${time}ms to parse ${resultSize} bytes, for call to ${call.classGuid}.${call.functionName}`));
@@ -586,7 +590,7 @@ export async function createCallFactory(
                 };
                 if (SocketFunction.logMessages) {
                     time = Date.now() - time;
-                    console.log(`DUR\t${(formatTime(time)).padEnd(6, " ")}\tFINISH\t${call.classGuid}.${call.functionName} at ${Date.now()}`);
+                    console.log(`DUR\t${(formatTime(time)).padEnd(6, " ")}\tFINISH\t${call.classGuid}.${call.functionName} at ${Date.now()}, (${nodeId} / ${localNodeId})`);
                 }
                 if (shouldCompressCall(call)) {
                     response.result = await compressObj(response.result) as any;

package/src/webSocketServer.ts

@@ -80,7 +80,8 @@ export async function startSocketServer(
             };
             if (!httpsServerLast) {
                 httpsServerLast = https.createServer(lastOptions);
-                // We REALLY don't want keep alive, at all, as keep alives break so many things.
+                // NOTE: This MIGHT be different than the keep alive option? Probably not, but also...
+                //  something weird is happening with connections...
                 httpsServerLast.keepAliveTimeout = 0;
             } else {
                 httpsServerLast.setSecureContext(lastOptions);
@@ -167,6 +168,8 @@ export async function startSocketServer(
         //  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,
+        keepAliveInitialDelay: 0,
+        noDelay: true,
     };
     if (!config.cert) {
         throw new Error("No cert specified");
@@ -181,7 +184,7 @@ export async function startSocketServer(
         sniServers.set(domain, await setupHTTPSServer(obj));
     }
 
-    let httpServer = http.createServer({}, async function (req, res) {
+    let httpServer = http.createServer({ keepAlive: false, }, async function (req, res) {
         let url = new URL("http://" + req.headers.host + req.url);
         url.protocol = "https:";
         //url.hostname = opts.hostname;
@@ -189,6 +192,7 @@ export async function startSocketServer(
         res.writeHead(301, { Location: url + "" });
         res.end();
     });
+    httpServer.keepAliveTimeout = 0;
     httpServer.on("error", e => {
         console.error(`HTTP error ${e.stack}`);
     });
@@ -257,6 +261,11 @@ export async function startSocketServer(
         socket.on("error", (e) => {
             console.error(`TCP socket error for ${debug}, ${e.stack}`);
         });
+        socket.on("close", () => {
+            if (!SocketFunction.silent) {
+                console.log(`TCP socket closed for ${debug}`);
+            }
+        });
     });