socket-function 0.53.0 → 0.55.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "socket-function",
-	"version": "0.53.0",
+	"version": "0.55.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

@@ -100,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}`);
                 }
             });
         });
@@ -128,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 {
@@ -191,10 +186,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.
@@ -211,7 +206,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;
@@ -236,7 +231,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}`);
         });
     });