redweb 0.7.6 → 0.8.0

package/src/ws/SocketServer.js

@@ -7,13 +7,10 @@ const { BaseSocketServer } = require('./BaseSocketServer');
  * @return {Object} WebSocket server instance.
  */
 class SocketServer extends BaseSocketServer {
-    constructor(options = {}) {
+    constructor(options) {
         const ownsServer = !options?.server;
         const server = options?.server || http.createServer();
-        super(server, options);
-        if ((ownsServer && this.listen !== false) || (!ownsServer && options.listen === true)) {
-            server.listen(this.port, () => console.log(`RedWeb SocketServer listening on port ${this.port}`));
-        }
+        super(server, options, ownsServer, 'SocketServer');
         return this;
     }
 }

package/src/ws/shutdown.js

@@ -0,0 +1,33 @@
+function closeWebSocketServer(server, clients, timeoutMs) {
+    return new Promise((resolve, reject) => {
+        let settled = false;
+        const finish = (error) => {
+            if (settled) return;
+            settled = true;
+            clearTimeout(timer);
+            if (error) reject(error);
+            else resolve();
+        };
+
+        const timer = setTimeout(() => {
+            const errors = [];
+            clients.forEach(socket => {
+                try {
+                    socket.terminate?.();
+                } catch (error) {
+                    errors.push(error);
+                }
+            });
+            finish(errors[0]);
+        }, timeoutMs);
+        timer.unref();
+
+        try {
+            server.close(finish);
+        } catch (error) {
+            finish(error);
+        }
+    });
+}
+
+module.exports = { closeWebSocketServer };

package/src/ws/util.js

@@ -1,9 +1,30 @@
-function sendJson(socket, data) {
-    socket.send(JSON.stringify(data));
-}
-
-function broadcast(sockets, data) {
-    sockets.forEach(socket => sendJson(socket, data));
-}
-
-module.exports = { sendJson, broadcast }
+function canSend(socket) {
+    return Boolean(
+        socket &&
+        typeof socket.send === 'function' &&
+        (socket.readyState === undefined || socket.readyState === 1 || socket.readyState === socket.OPEN)
+    );
+}
+
+function sendJson(socket, data) {
+    if (!canSend(socket)) return false;
+    socket.send(JSON.stringify(data));
+    return true;
+}
+
+function broadcast(sockets, data) {
+    const payload = JSON.stringify(data);
+    let sent = 0;
+    sockets.forEach((socket) => {
+        if (!canSend(socket)) return;
+        try {
+            socket.send(payload);
+            sent += 1;
+        } catch {
+            // A socket can close between the ready-state check and send.
+        }
+    });
+    return sent;
+}
+
+module.exports = { sendJson, broadcast, canSend };