Skip to content

Use JS string templates in library_sockfs.js. NFC #22983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 21, 2024
Merged

Use JS string templates in library_sockfs.js. NFC #22983

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions src/library_sockfs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ addToLibrary({

#if SOCKET_DEBUG
// If debug is enabled register simple default logging callbacks for each Event.
SOCKFS.on('error', (error) => dbg('websocket: error ' + error));
SOCKFS.on('open', (fd) => dbg('websocket: open fd = ' + fd));
SOCKFS.on('listen', (fd) => dbg('websocket: listen fd = ' + fd));
SOCKFS.on('connection', (fd) => dbg('websocket: connection fd = ' + fd));
SOCKFS.on('message', (fd) => dbg('websocket: message fd = ' + fd));
SOCKFS.on('close', (fd) => dbg('websocket: close fd = ' + fd));
SOCKFS.on('error', (error) => dbg(`websocket: error ${error}`));
SOCKFS.on('open', (fd) => dbg(`websocket: open fd = ${fd}`));
SOCKFS.on('listen', (fd) => dbg(`websocket: listen fd = ${fd}`));
SOCKFS.on('connection', (fd) => dbg(`websocket: connection fd = ${fd}`));
SOCKFS.on('message', (fd) => dbg(`websocket: message fd = ${fd}`));
SOCKFS.on('close', (fd) => dbg(`websocket: close fd = ${fd}`));
#endif

return FS.createNode(null, '/', {{{ cDefs.S_IFDIR }}} | 511 /* 0777 */, 0);
Expand Down Expand Up @@ -127,7 +127,7 @@ addToLibrary({
if (!SOCKFS.nextname.current) {
SOCKFS.nextname.current = 0;
}
return 'socket[' + (SOCKFS.nextname.current++) + ']';
return `socket[${SOCKFS.nextname.current++}]`;
},
// backend-specific stream ops
websocket_sock_ops: {
Expand Down Expand Up @@ -202,7 +202,7 @@ addToLibrary({
}

#if SOCKET_DEBUG
dbg('websocket: connect: ' + url + ', ' + subProtocols.toString());
dbg(`websocket: connect: ${url}, ${subProtocols.toString()}`);
#endif
// If node we use the ws library.
var WebSocketConstructor;
Expand All @@ -222,7 +222,7 @@ addToLibrary({
}

#if SOCKET_DEBUG
dbg('websocket: adding peer: ' + addr + ':' + port);
dbg(`websocket: adding peer: ${addr}:${port}`);
#endif

var peer = {
Expand All @@ -240,7 +240,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.msg_send_queue.push(new Uint8Array([
255, 255, 255, 255,
Expand Down Expand Up @@ -275,7 +275,7 @@ addToLibrary({
var queued = peer.msg_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): ${new Uint8Array(queued)}`);
#endif
peer.socket.send(queued);
queued = peer.msg_send_queue.shift();
Expand Down Expand Up @@ -303,7 +303,7 @@ addToLibrary({
}

#if SOCKET_DEBUG
dbg('websocket: handle message (' + data.byteLength + ' bytes): ' + [Array.prototype.slice.call(data)]);
dbg(`websocket: handle message (${data.byteLength} bytes): ${data}`);
#endif

// if this is the port message, override the peer's port with it
Expand Down Expand Up @@ -506,7 +506,7 @@ addToLibrary({
var WebSocketServer = require('ws').Server;
var host = sock.saddr;
#if SOCKET_DEBUG
dbg('websocket: listen: ' + host + ':' + sock.sport);
dbg(`websocket: listen: ${host}:${sock.sport}`);
#endif
sock.server = new WebSocketServer({
host,
Expand All @@ -517,7 +517,7 @@ addToLibrary({

sock.server.on('connection', function(ws) {
#if SOCKET_DEBUG
dbg('websocket: 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);
Expand Down Expand Up @@ -643,15 +643,15 @@ addToLibrary({
}
}
#if SOCKET_DEBUG
dbg('websocket: queuing (' + length + ' bytes): ' + [Array.prototype.slice.call(new Uint8Array(data))]);
dbg(`websocket: queuing (${length} bytes): ${new Uint8Array(data)}`);
#endif
dest.msg_send_queue.push(data);
return length;
}

try {
#if SOCKET_DEBUG
dbg('websocket: send (' + length + ' bytes): ' + [Array.prototype.slice.call(new Uint8Array(data))]);
dbg(`websocket: send (${length} bytes): ${new Uint8Array(data)}`);
#endif
// send the actual data
dest.socket.send(data);
Expand Down Expand Up @@ -699,14 +699,14 @@ addToLibrary({
};

#if SOCKET_DEBUG
dbg('websocket: read (' + bytesRead + ' bytes): ' + [Array.prototype.slice.call(res.buffer)]);
dbg(`websocket: read (${bytesRead} bytes): ${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);
Expand Down
Loading