@eleven-am/pondsocket 0.1.213 → 0.1.215

package/server/server.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _PondSocket_instances, _PondSocket_server, _PondSocket_exclusiveServer, _PondSocket_socketServer, _PondSocket_backend, _PondSocket_middleware, _PondSocket_handleUpgrade, _PondSocket_manageHeartbeat, _PondSocket_init, _PondSocket_getCookies;
+var _PondSocket_instances, _PondSocket_server, _PondSocket_exclusiveServer, _PondSocket_socketServer, _PondSocket_backend, _PondSocket_middleware, _PondSocket_maxMessageSize, _PondSocket_heartbeatMs, _PondSocket_heartbeatTimer, _PondSocket_handleUpgrade, _PondSocket_manageHeartbeat, _PondSocket_init, _PondSocket_getCookies;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PondSocket = void 0;
 const http_1 = require("http");
@@ -22,17 +22,22 @@ const endpointEngine_1 = require("../engines/endpointEngine");
 const matcher_1 = require("../matcher/matcher");
 const endpoint_1 = require("../wrappers/endpoint");
 class PondSocket {
-    constructor({ server, socketServer, exclusiveServer = true, distributedBackend, } = {}) {
+    constructor({ server, socketServer, exclusiveServer = true, distributedBackend, maxMessageSize = 1024 * 1024, heartbeatInterval = 30000, } = {}) {
         _PondSocket_instances.add(this);
         _PondSocket_server.set(this, void 0);
         _PondSocket_exclusiveServer.set(this, void 0);
         _PondSocket_socketServer.set(this, void 0);
         _PondSocket_backend.set(this, void 0);
         _PondSocket_middleware.set(this, void 0);
+        _PondSocket_maxMessageSize.set(this, void 0);
+        _PondSocket_heartbeatMs.set(this, void 0);
+        _PondSocket_heartbeatTimer.set(this, null);
         __classPrivateFieldSet(this, _PondSocket_middleware, new middleware_1.Middleware(), "f");
         __classPrivateFieldSet(this, _PondSocket_exclusiveServer, exclusiveServer, "f");
         __classPrivateFieldSet(this, _PondSocket_server, server !== null && server !== void 0 ? server : new http_1.Server(), "f");
         __classPrivateFieldSet(this, _PondSocket_backend, distributedBackend !== null && distributedBackend !== void 0 ? distributedBackend : null, "f");
+        __classPrivateFieldSet(this, _PondSocket_maxMessageSize, maxMessageSize, "f");
+        __classPrivateFieldSet(this, _PondSocket_heartbeatMs, heartbeatInterval, "f");
         __classPrivateFieldSet(this, _PondSocket_socketServer, socketServer !== null && socketServer !== void 0 ? socketServer : new ws_1.WebSocketServer({ noServer: true }), "f");
         __classPrivateFieldGet(this, _PondSocket_instances, "m", _PondSocket_init).call(this);
     }
@@ -45,14 +50,34 @@ class PondSocket {
     /**
      * Close the server
      */
-    close(callback) {
+    close(callback, timeout = 5000) {
+        if (__classPrivateFieldGet(this, _PondSocket_heartbeatTimer, "f")) {
+            clearInterval(__classPrivateFieldGet(this, _PondSocket_heartbeatTimer, "f"));
+            __classPrivateFieldSet(this, _PondSocket_heartbeatTimer, null, "f");
+        }
+        __classPrivateFieldGet(this, _PondSocket_socketServer, "f").clients.forEach((socket) => {
+            if (socket.readyState === ws_1.WebSocket.OPEN) {
+                socket.close(1001, 'Server shutting down');
+            }
+        });
+        const forceClose = setTimeout(() => {
+            __classPrivateFieldGet(this, _PondSocket_socketServer, "f").clients.forEach((socket) => {
+                if (socket.readyState !== ws_1.WebSocket.CLOSED) {
+                    socket.terminate();
+                }
+            });
+            __classPrivateFieldGet(this, _PondSocket_socketServer, "f").close();
+        }, timeout);
+        __classPrivateFieldGet(this, _PondSocket_socketServer, "f").close(() => {
+            clearTimeout(forceClose);
+        });
         return __classPrivateFieldGet(this, _PondSocket_server, "f").close(callback);
     }
     /**
      * Create a new endpoint
      */
     createEndpoint(path, handler) {
-        const endpoint = new endpointEngine_1.EndpointEngine(String(path), __classPrivateFieldGet(this, _PondSocket_backend, "f"));
+        const endpoint = new endpointEngine_1.EndpointEngine(String(path), __classPrivateFieldGet(this, _PondSocket_backend, "f"), __classPrivateFieldGet(this, _PondSocket_maxMessageSize, "f"));
         __classPrivateFieldGet(this, _PondSocket_middleware, "f").use((req, params, next) => {
             const event = (0, matcher_1.parseAddress)(path, req.address);
             if (!event) {
@@ -71,8 +96,8 @@ class PondSocket {
     }
 }
 exports.PondSocket = PondSocket;
-_PondSocket_server = new WeakMap(), _PondSocket_exclusiveServer = new WeakMap(), _PondSocket_socketServer = new WeakMap(), _PondSocket_backend = new WeakMap(), _PondSocket_middleware = new WeakMap(), _PondSocket_instances = new WeakSet(), _PondSocket_handleUpgrade = function _PondSocket_handleUpgrade(req, socket, head) {
-    const clientId = req.headers['sec-websocket-key'];
+_PondSocket_server = new WeakMap(), _PondSocket_exclusiveServer = new WeakMap(), _PondSocket_socketServer = new WeakMap(), _PondSocket_backend = new WeakMap(), _PondSocket_middleware = new WeakMap(), _PondSocket_maxMessageSize = new WeakMap(), _PondSocket_heartbeatMs = new WeakMap(), _PondSocket_heartbeatTimer = new WeakMap(), _PondSocket_instances = new WeakSet(), _PondSocket_handleUpgrade = function _PondSocket_handleUpgrade(req, socket, head) {
+    const clientId = (0, pondsocket_common_1.uuid)();
     const request = {
         id: clientId,
         headers: req.headers,
@@ -110,15 +135,21 @@ _PondSocket_server = new WeakMap(), _PondSocket_exclusiveServer = new WeakMap(),
             socket.isAlive = false;
             socket.ping();
         });
-    }, 30000);
+    }, __classPrivateFieldGet(this, _PondSocket_heartbeatMs, "f"));
 }, _PondSocket_init = function _PondSocket_init() {
-    const timeout = __classPrivateFieldGet(this, _PondSocket_instances, "m", _PondSocket_manageHeartbeat).call(this);
+    __classPrivateFieldSet(this, _PondSocket_heartbeatTimer, __classPrivateFieldGet(this, _PondSocket_instances, "m", _PondSocket_manageHeartbeat).call(this), "f");
     __classPrivateFieldGet(this, _PondSocket_server, "f").on('error', (error) => {
-        clearInterval(timeout);
+        if (__classPrivateFieldGet(this, _PondSocket_heartbeatTimer, "f")) {
+            clearInterval(__classPrivateFieldGet(this, _PondSocket_heartbeatTimer, "f"));
+            __classPrivateFieldSet(this, _PondSocket_heartbeatTimer, null, "f");
+        }
         throw new Error(error.message);
     });
     __classPrivateFieldGet(this, _PondSocket_server, "f").on('close', () => {
-        clearInterval(timeout);
+        if (__classPrivateFieldGet(this, _PondSocket_heartbeatTimer, "f")) {
+            clearInterval(__classPrivateFieldGet(this, _PondSocket_heartbeatTimer, "f"));
+            __classPrivateFieldSet(this, _PondSocket_heartbeatTimer, null, "f");
+        }
     });
     __classPrivateFieldGet(this, _PondSocket_server, "f").on('upgrade', __classPrivateFieldGet(this, _PondSocket_instances, "m", _PondSocket_handleUpgrade).bind(this));
 }, _PondSocket_getCookies = function _PondSocket_getCookies(headers) {
@@ -128,8 +159,13 @@ _PondSocket_server = new WeakMap(), _PondSocket_exclusiveServer = new WeakMap(),
     }
     return cookieHeader.split(';')
         .reduce((cookies, cookie) => {
-        const [name, value] = cookie.trim()
-            .split('=');
+        const trimmed = cookie.trim();
+        const eqIndex = trimmed.indexOf('=');
+        if (eqIndex === -1) {
+            return cookies;
+        }
+        const name = trimmed.slice(0, eqIndex);
+        const value = trimmed.slice(eqIndex + 1);
         cookies[name] = decodeURIComponent(value);
         return cookies;
     }, {});