Use uniform prefix in websocket debugging. NFC (#22662)

Author: sbc100

src/library_sockfs.js

@@ -35,12 +35,12 @@ addToLibrary({
 
       // If debug is enabled register simple default logging callbacks for each Event.
 #if SOCKET_DEBUG
-      Module['websocket']['on']('error', (error) => dbg('Socket error ' + error));
-      Module['websocket']['on']('open', (fd) => dbg('Socket open fd = ' + fd));
-      Module['websocket']['on']('listen', (fd) => dbg('Socket listen fd = ' + fd));
-      Module['websocket']['on']('connection', (fd) => dbg('Socket connection fd = ' + fd));
-      Module['websocket']['on']('message', (fd) => dbg('Socket message fd = ' + fd));
-      Module['websocket']['on']('close', (fd) => dbg('Socket close fd = ' + fd));
+      Module['websocket']['on']('error', (error) => dbg('websocket: error ' + error));
+      Module['websocket']['on']('open', (fd) => dbg('websocket: open fd = ' + fd));
+      Module['websocket']['on']('listen', (fd) => dbg('websocket: listen fd = ' + fd));
+      Module['websocket']['on']('connection', (fd) => dbg('websocket: connection fd = ' + fd));
+      Module['websocket']['on']('message', (fd) => dbg('websocket: message fd = ' + fd));
+      Module['websocket']['on']('close', (fd) => dbg('websocket: close fd = ' + fd));
 #endif
 
       return FS.createNode(null, '/', {{{ cDefs.S_IFDIR }}} | 511 /* 0777 */, 0);
@@ -214,7 +214,7 @@ addToLibrary({
             }
 
 #if SOCKET_DEBUG
-            dbg('connect: ' + url + ', ' + subProtocols.toString());
+            dbg('websocket: connect: ' + url + ', ' + subProtocols.toString());
 #endif
             // If node we use the ws library.
             var WebSocketConstructor;
@@ -234,7 +234,7 @@ addToLibrary({
         }
 
 #if SOCKET_DEBUG
-        dbg('websocket adding peer: ' + addr + ':' + port);
+        dbg('websocket: adding peer: ' + addr + ':' + port);
 #endif
 
         var peer = {
@@ -252,7 +252,7 @@ addToLibrary({
         // remote end.
         if (sock.type === {{{ cDefs.SOCK_DGRAM }}} && typeof sock.sport != 'undefined') {
 #if SOCKET_DEBUG
-          dbg('websocket queuing port message (port ' + sock.sport + ')');
+          dbg('websocket: queuing port message (port ' + sock.sport + ')');
 #endif
           peer.dgram_send_queue.push(new Uint8Array([
               255, 255, 255, 255,
@@ -277,7 +277,7 @@ addToLibrary({
 
         var handleOpen = function () {
 #if SOCKET_DEBUG
-          dbg('websocket handle open');
+          dbg('websocket: handle open');
 #endif
 
           Module['websocket'].emit('open', sock.stream.fd);
@@ -286,7 +286,7 @@ addToLibrary({
             var queued = peer.dgram_send_queue.shift();
             while (queued) {
 #if SOCKET_DEBUG
-              dbg('websocket sending queued data (' + queued.byteLength + ' bytes): ' + [Array.prototype.slice.call(new Uint8Array(queued))]);
+              dbg('websocket: sending queued data (' + queued.byteLength + ' bytes): ' + [Array.prototype.slice.call(new Uint8Array(queued))]);
 #endif
               peer.socket.send(queued);
               queued = peer.dgram_send_queue.shift();
@@ -314,7 +314,7 @@ addToLibrary({
           }
 
 #if SOCKET_DEBUG
-          dbg('websocket handle message (' + data.byteLength + ' bytes): ' + [Array.prototype.slice.call(data)]);
+          dbg('websocket: handle message (' + data.byteLength + ' bytes): ' + [Array.prototype.slice.call(data)]);
 #endif
 
           // if this is the port message, override the peer's port with it
@@ -507,7 +507,7 @@ addToLibrary({
         var WebSocketServer = require('ws').Server;
         var host = sock.saddr;
 #if SOCKET_DEBUG
-        dbg('listen: ' + host + ':' + sock.sport);
+        dbg('websocket: listen: ' + host + ':' + sock.sport);
 #endif
         sock.server = new WebSocketServer({
           host,
@@ -518,7 +518,7 @@ addToLibrary({
 
         sock.server.on('connection', function(ws) {
 #if SOCKET_DEBUG
-          dbg('received connection from: ' + ws._socket.remoteAddress + ':' + ws._socket.remotePort);
+          dbg('websocket: received connection from: ' + ws._socket.remoteAddress + ':' + ws._socket.remotePort);
 #endif
           if (sock.type === {{{ cDefs.SOCK_STREAM }}}) {
             var newsock = SOCKFS.createSocket(sock.family, sock.type, sock.protocol);
@@ -641,7 +641,7 @@ addToLibrary({
               dest = SOCKFS.websocket_sock_ops.createPeer(sock, addr, port);
             }
 #if SOCKET_DEBUG
-            dbg('websocket queuing (' + length + ' bytes): ' + [Array.prototype.slice.call(new Uint8Array(data))]);
+            dbg('websocket: queuing (' + length + ' bytes): ' + [Array.prototype.slice.call(new Uint8Array(data))]);
 #endif
             dest.dgram_send_queue.push(data);
             return length;
@@ -650,7 +650,7 @@ addToLibrary({
 
         try {
 #if SOCKET_DEBUG
-          dbg('websocket send (' + length + ' bytes): ' + [Array.prototype.slice.call(new Uint8Array(data))]);
+          dbg('websocket: send (' + length + ' bytes): ' + [Array.prototype.slice.call(new Uint8Array(data))]);
 #endif
           // send the actual data
           dest.socket.send(data);
@@ -698,14 +698,14 @@ addToLibrary({
         };
 
 #if SOCKET_DEBUG
-        dbg('websocket read (' + bytesRead + ' bytes): ' + [Array.prototype.slice.call(res.buffer)]);
+        dbg('websocket: read (' + bytesRead + ' bytes): ' + [Array.prototype.slice.call(res.buffer)]);
 #endif
 
         // push back any unread data for TCP connections
         if (sock.type === {{{ cDefs.SOCK_STREAM }}} && bytesRead < queuedLength) {
           var bytesRemaining = queuedLength - bytesRead;
 #if SOCKET_DEBUG
-          dbg('websocket read: put back ' + bytesRemaining + ' bytes');
+          dbg('websocket: read: put back ' + bytesRemaining + ' bytes');
 #endif
           queued.data = new Uint8Array(queuedBuffer, queuedOffset + bytesRead, bytesRemaining);
           sock.recv_queue.unshift(queued);