socket-function 0.52.0 → 0.54.0

package/package.json

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

package/src/callManager.ts

@@ -167,7 +167,12 @@ export const runServerHooks = measureWrap(async function runServerHooks(
 ): Promise<HookContext> {
     let hookContext: HookContext = { call: callType, onResult: [] };
     for (let hook of globalHooks.concat(hooks.hooks || [])) {
+        let time = Date.now();
         await _setSocketContext(caller, () => hook(hookContext));
+        time = Date.now() - time;
+        if (time > 100) {
+            console.warn(`Slow (${formatTime(time)}) server hook: ${JSON.stringify(hook.name || hook.toString().slice(0, 100))} for ${callType.classGuid}.${callType.functionName}(...)`);
+        }
         // NOTE: See HookContext.overrideResult for why we don't break here
     }
     return hookContext;

package/src/webSocketServer.ts

@@ -75,6 +75,7 @@ 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);
@@ -99,17 +100,18 @@ export async function startSocketServer(
         });
 
         httpsServer.on("connection", socket => {
+            let debug = (socket as any).remoteAddress + ":" + (socket as any).remotePort;
             if (!SocketFunction.silent) {
-                console.log("Client connection established");
+                console.log(`HTTP server connection established ${debug}`);
             }
             socket.on("error", e => {
                 if (!SocketFunction.silent) {
-                    console.log(`Client socket error ${e.message}`);
+                    console.log(`HTTP server socket error for ${debug}, ${e.message}`);
                 }
             });
             socket.on("close", () => {
                 if (!SocketFunction.silent) {
-                    console.log("Client socket closed");
+                    console.log(`HTTP server socket closed for ${debug}`);
                 }
             });
         });
@@ -127,12 +129,6 @@ export async function startSocketServer(
         httpsServer.on("request", httpCallHandler);
 
         httpsServer.on("upgrade", (request, socket, upgradeHead) => {
-            socket.on("error", e => {
-                if (!SocketFunction.silent) {
-                    console.log(`Client socket error ${e.message}`);
-                }
-            });
-
             let originHeader = request.headers["origin"];
             if (originHeader) {
                 try {
@@ -192,6 +188,9 @@ export async function startSocketServer(
         //console.log("Received TCP connection from " + socket.remoteAddress);
         const remoteAddress = socket.remoteAddress;
         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`);
+            }
             // All HTTPS requests start with 22, and no HTTP requests start with 22,
             //  so we just need to read the first byte.
             let server: https.Server | http.Server;