@eleven-am/pondsocket 0.1.168 → 0.1.170

package/managers/managerFactory.js

@@ -0,0 +1,31 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManagerFactory = void 0;
+const distributedManager_1 = require("./distributedManager");
+const localManager_1 = require("./localManager");
+class ManagerFactory {
+    static create(channelId, clientFactory, onClose) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let manager;
+            if (clientFactory) {
+                const client = clientFactory(channelId);
+                manager = new distributedManager_1.DistributedManager(client);
+            }
+            else {
+                manager = new localManager_1.LocalManager(channelId);
+            }
+            yield manager.initialize(onClose);
+            return manager;
+        });
+    }
+}
+exports.ManagerFactory = ManagerFactory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eleven-am/pondsocket",
-  "version": "0.1.168",
+  "version": "0.1.170",
   "description": "PondSocket is a fast simple socket server",
   "keywords": [
     "socket",
@@ -20,8 +20,8 @@
     "build": "rimraf dist && tsc && npm run remove",
     "lint": "eslint --ext .ts src",
     "lint:fix": "eslint --fix --ext .ts src",
-    "remove": "rm dist/types.js dist/distIndex.js",
-    "copy": "cp src/types.ts dist/types.d.ts && cp src/distIndex.ts dist/index.d.ts && cp package.json dist && cp README.md dist && cp LICENSE dist",
+    "remove": "rm -r dist/tests && rm dist/distIndex.js",
+    "copy": "cp src/types.d.ts dist/types.d.ts && cp src/distIndex.ts dist/index.d.ts && cp package.json dist && cp README.md dist && cp LICENSE dist",
     "push": "npm version patch && npm run copy && cd dist && npm publish && cd ..",
     "pipeline": "npm run lint && npm run test && npm run build && npm run push"
   },
@@ -34,23 +34,33 @@
     "url": "git+https://github.com/Eleven-am/pondSocket.git"
   },
   "dependencies": {
-    "@eleven-am/pondsocket-common": "^0.0.23",
+    "@eleven-am/pondsocket-common": "^0.0.24",
+    "ioredis": "^5.4.1",
     "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.12",
-    "@types/node": "^20.14.11",
-    "@types/websocket": "^1.0.10",
-    "@types/ws": "^8.5.11",
-    "@typescript-eslint/eslint-plugin": "^7.16.1",
+    "@stylistic/eslint-plugin-ts": "^2.8.0",
+    "@types/jest": "^29.5.13",
+    "@types/node": "^22.7.4",
+    "@types/ws": "^8.5.12",
+    "@typescript-eslint/eslint-plugin": "^8.8.0",
+    "@typescript-eslint/parser": "^8.8.0",
     "eslint": "^8.57.0",
-    "eslint-plugin-file-progress": "^1.4.0",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-import-resolver-node": "^0.3.9",
+    "eslint-plugin-file-progress": "^1.5.0",
+    "eslint-plugin-import": "^2.30.0",
+    "eslint-plugin-prettier": "^5.2.1",
     "jest": "^29.7.0",
-    "superwstest": "^2.0.4",
-    "ts-jest": "^29.2.3",
+    "nodemon": "^3.1.7",
+    "prettier": "^3.3.3",
+    "source-map-support": "^0.5.21",
+    "supertest": "^7.0.0",
+    "ts-jest": "^29.2.5",
+    "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.5.3"
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "^5.6.2"
   },
   "jest": {
     "moduleFileExtensions": [

package/requests/eventRequest.js

@@ -0,0 +1,51 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _EventRequest_event, _EventRequest_engine, _EventRequest_params;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EventRequest = void 0;
+const channel_1 = require("../wrappers/channel");
+class EventRequest {
+    constructor(event, params, engine) {
+        _EventRequest_event.set(this, void 0);
+        _EventRequest_engine.set(this, void 0);
+        _EventRequest_params.set(this, void 0);
+        __classPrivateFieldSet(this, _EventRequest_event, event, "f");
+        __classPrivateFieldSet(this, _EventRequest_params, params, "f");
+        __classPrivateFieldSet(this, _EventRequest_engine, engine, "f");
+    }
+    get event() {
+        return {
+            event: __classPrivateFieldGet(this, _EventRequest_event, "f").event,
+            query: __classPrivateFieldGet(this, _EventRequest_params, "f").query,
+            params: __classPrivateFieldGet(this, _EventRequest_params, "f").params,
+            payload: __classPrivateFieldGet(this, _EventRequest_event, "f").payload,
+        };
+    }
+    get channelName() {
+        return __classPrivateFieldGet(this, _EventRequest_engine, "f").name;
+    }
+    get channel() {
+        return new channel_1.Channel(__classPrivateFieldGet(this, _EventRequest_engine, "f"));
+    }
+    get presences() {
+        return __classPrivateFieldGet(this, _EventRequest_engine, "f").getPresence();
+    }
+    get assigns() {
+        return __classPrivateFieldGet(this, _EventRequest_engine, "f").getAssigns();
+    }
+    get user() {
+        return __classPrivateFieldGet(this, _EventRequest_engine, "f").getUser(__classPrivateFieldGet(this, _EventRequest_event, "f").sender);
+    }
+}
+exports.EventRequest = EventRequest;
+_EventRequest_event = new WeakMap(), _EventRequest_engine = new WeakMap(), _EventRequest_params = new WeakMap();

package/requests/joinRequest.js

@@ -0,0 +1,56 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _JoinRequest_options, _JoinRequest_engine;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JoinRequest = void 0;
+const channel_1 = require("../wrappers/channel");
+class JoinRequest {
+    constructor(options, channel) {
+        _JoinRequest_options.set(this, void 0);
+        _JoinRequest_engine.set(this, void 0);
+        __classPrivateFieldSet(this, _JoinRequest_options, options, "f");
+        __classPrivateFieldSet(this, _JoinRequest_engine, channel, "f");
+    }
+    get event() {
+        return {
+            event: __classPrivateFieldGet(this, _JoinRequest_engine, "f").name,
+            query: __classPrivateFieldGet(this, _JoinRequest_options, "f").params.query,
+            params: __classPrivateFieldGet(this, _JoinRequest_options, "f").params.params,
+            payload: __classPrivateFieldGet(this, _JoinRequest_options, "f").joinParams,
+        };
+    }
+    get channelName() {
+        return __classPrivateFieldGet(this, _JoinRequest_engine, "f").name;
+    }
+    get channel() {
+        return new channel_1.Channel(__classPrivateFieldGet(this, _JoinRequest_engine, "f"));
+    }
+    get presences() {
+        return __classPrivateFieldGet(this, _JoinRequest_engine, "f").getPresence();
+    }
+    get assigns() {
+        return __classPrivateFieldGet(this, _JoinRequest_engine, "f").getAssigns();
+    }
+    get user() {
+        return {
+            id: __classPrivateFieldGet(this, _JoinRequest_options, "f").clientId,
+            assigns: __classPrivateFieldGet(this, _JoinRequest_options, "f").assigns,
+            presence: {},
+        };
+    }
+    get joinParams() {
+        return __classPrivateFieldGet(this, _JoinRequest_options, "f").joinParams;
+    }
+}
+exports.JoinRequest = JoinRequest;
+_JoinRequest_options = new WeakMap(), _JoinRequest_engine = new WeakMap();

package/responses/connectionResponse.js

@@ -0,0 +1,89 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _ConnectionResponse_instances, _ConnectionResponse_executed, _ConnectionResponse_assigns, _ConnectionResponse_clientId, _ConnectionResponse_engine, _ConnectionResponse_params, _ConnectionResponse_webSocketServer, _ConnectionResponse_performChecks;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConnectionResponse = void 0;
+const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
+const httpError_1 = require("../errors/httpError");
+class ConnectionResponse {
+    constructor(clientId, { engine, params, webSocketServer }) {
+        _ConnectionResponse_instances.add(this);
+        _ConnectionResponse_executed.set(this, void 0);
+        _ConnectionResponse_assigns.set(this, void 0);
+        _ConnectionResponse_clientId.set(this, void 0);
+        _ConnectionResponse_engine.set(this, void 0);
+        _ConnectionResponse_params.set(this, void 0);
+        _ConnectionResponse_webSocketServer.set(this, void 0);
+        __classPrivateFieldSet(this, _ConnectionResponse_webSocketServer, webSocketServer, "f");
+        __classPrivateFieldSet(this, _ConnectionResponse_clientId, clientId, "f");
+        __classPrivateFieldSet(this, _ConnectionResponse_executed, false, "f");
+        __classPrivateFieldSet(this, _ConnectionResponse_engine, engine, "f");
+        __classPrivateFieldSet(this, _ConnectionResponse_params, params, "f");
+        __classPrivateFieldSet(this, _ConnectionResponse_assigns, {}, "f");
+    }
+    assign(assigns) {
+        if (!__classPrivateFieldGet(this, _ConnectionResponse_executed, "f")) {
+            __classPrivateFieldSet(this, _ConnectionResponse_assigns, Object.assign(Object.assign({}, __classPrivateFieldGet(this, _ConnectionResponse_assigns, "f")), assigns), "f");
+        }
+        else {
+            const user = __classPrivateFieldGet(this, _ConnectionResponse_engine, "f").getUser(__classPrivateFieldGet(this, _ConnectionResponse_clientId, "f"));
+            user.assigns = Object.assign(Object.assign({}, user.assigns), assigns);
+        }
+        return this;
+    }
+    accept() {
+        __classPrivateFieldGet(this, _ConnectionResponse_instances, "m", _ConnectionResponse_performChecks).call(this);
+        __classPrivateFieldGet(this, _ConnectionResponse_webSocketServer, "f").handleUpgrade(__classPrivateFieldGet(this, _ConnectionResponse_params, "f").request, __classPrivateFieldGet(this, _ConnectionResponse_params, "f").socket, __classPrivateFieldGet(this, _ConnectionResponse_params, "f").head, (ws) => {
+            const cache = {
+                clientId: __classPrivateFieldGet(this, _ConnectionResponse_clientId, "f"),
+                subscriptions: new Set(),
+                assigns: __classPrivateFieldGet(this, _ConnectionResponse_assigns, "f"),
+                socket: ws,
+            };
+            __classPrivateFieldGet(this, _ConnectionResponse_webSocketServer, "f").emit('connection', ws);
+            __classPrivateFieldGet(this, _ConnectionResponse_engine, "f").manageSocket(cache);
+        });
+        return this;
+    }
+    decline(message, errorCode) {
+        __classPrivateFieldGet(this, _ConnectionResponse_instances, "m", _ConnectionResponse_performChecks).call(this);
+        const code = errorCode || 400;
+        const { socket } = __classPrivateFieldGet(this, _ConnectionResponse_params, "f");
+        const newMessage = message || 'Unauthorized connection';
+        socket.write(`HTTP/1.1 ${code} ${newMessage}\r\n\r\n`);
+        socket.destroy();
+        return this;
+    }
+    reply(event, payload) {
+        if (!__classPrivateFieldGet(this, _ConnectionResponse_executed, "f")) {
+            throw new httpError_1.HttpError(400, 'Connection has not been accepted');
+        }
+        const { socket } = __classPrivateFieldGet(this, _ConnectionResponse_engine, "f").getUser(__classPrivateFieldGet(this, _ConnectionResponse_clientId, "f"));
+        const message = {
+            event,
+            payload,
+            action: pondsocket_common_1.ServerActions.BROADCAST,
+            requestId: __classPrivateFieldGet(this, _ConnectionResponse_params, "f").requestId,
+            channelName: pondsocket_common_1.SystemSender.ENDPOINT,
+        };
+        __classPrivateFieldGet(this, _ConnectionResponse_engine, "f").sendMessage(socket, message);
+        return this;
+    }
+}
+exports.ConnectionResponse = ConnectionResponse;
+_ConnectionResponse_executed = new WeakMap(), _ConnectionResponse_assigns = new WeakMap(), _ConnectionResponse_clientId = new WeakMap(), _ConnectionResponse_engine = new WeakMap(), _ConnectionResponse_params = new WeakMap(), _ConnectionResponse_webSocketServer = new WeakMap(), _ConnectionResponse_instances = new WeakSet(), _ConnectionResponse_performChecks = function _ConnectionResponse_performChecks() {
+    if (__classPrivateFieldGet(this, _ConnectionResponse_executed, "f")) {
+        throw new httpError_1.HttpError(400, 'Response has already been executed');
+    }
+    __classPrivateFieldSet(this, _ConnectionResponse_executed, true, "f");
+};

package/{channel → responses}/eventResponse.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 _EventResponse_instances, _EventResponse_event, _EventResponse_engine, _EventResponse_requestId, _EventResponse_manageAssigns, _EventResponse_sendMessage;
+var _EventResponse_instances, _EventResponse_event, _EventResponse_engine, _EventResponse_requestId, _EventResponse_sendMessage;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventResponse = void 0;
 const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
@@ -24,116 +24,45 @@ class EventResponse {
         __classPrivateFieldSet(this, _EventResponse_engine, engine, "f");
         __classPrivateFieldSet(this, _EventResponse_requestId, event.requestId, "f");
     }
-    /**
-     * @desc Assigns data to the client
-     * @param assigns - the data to assign to the client
-     */
     assign(assigns) {
-        __classPrivateFieldGet(this, _EventResponse_instances, "m", _EventResponse_manageAssigns).call(this, assigns);
+        __classPrivateFieldGet(this, _EventResponse_engine, "f").updateAssigns(__classPrivateFieldGet(this, _EventResponse_event, "f").sender, assigns);
         return this;
     }
-    /**
-     * @desc Emits a direct message to the client
-     * @param event - the event name
-     * @param payload - the payload to send
-     */
     reply(event, payload) {
         __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(pondsocket_common_1.SystemSender.CHANNEL, [__classPrivateFieldGet(this, _EventResponse_event, "f").sender], pondsocket_common_1.ServerActions.SYSTEM, event, payload, __classPrivateFieldGet(this, _EventResponse_requestId, "f"));
         return this;
     }
-    /**
-     * @desc Sends a message to all clients in the channel
-     * @param event - the event to send
-     * @param payload - the payload to send
-     */
     broadcast(event, payload) {
         __classPrivateFieldGet(this, _EventResponse_instances, "m", _EventResponse_sendMessage).call(this, pondsocket_common_1.ChannelReceiver.ALL_USERS, event, payload);
         return this;
     }
-    /**
-     * @desc Sends a message to all clients in the channel except the client making the request
-     * @param event - the event to send
-     * @param payload - the payload to send
-     */
     broadcastFrom(event, payload) {
         __classPrivateFieldGet(this, _EventResponse_instances, "m", _EventResponse_sendMessage).call(this, pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER, event, payload);
         return this;
     }
-    /**
-     * @desc Sends a message to a set of clients in the channel
-     * @param event - the event to send
-     * @param payload - the payload to send
-     * @param userIds - the ids of the clients to send the message to
-     */
     broadcastTo(event, payload, userIds) {
         const ids = Array.isArray(userIds) ? userIds : [userIds];
         __classPrivateFieldGet(this, _EventResponse_instances, "m", _EventResponse_sendMessage).call(this, ids, event, payload);
         return this;
     }
-    /**
-     * @desc Tracks a user's presence in the channel
-     * @param presence - the initial presence data
-     * @param userId - the id of the user to track
-     */
     trackPresence(presence, userId = __classPrivateFieldGet(this, _EventResponse_event, "f").sender) {
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").presenceEngine.trackPresence(userId, presence);
+        __classPrivateFieldGet(this, _EventResponse_engine, "f").trackPresence(userId, presence);
         return this;
     }
-    /**
-     * @desc Updates a user's presence in the channel
-     * @param presence - the updated presence data
-     * @param userId - the id of the user to update
-     */
     updatePresence(presence, userId = __classPrivateFieldGet(this, _EventResponse_event, "f").sender) {
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").presenceEngine.updatePresence(userId, presence);
-        return this;
-    }
-    /**
-     * @desc Removes a user's presence from the channel
-     * @param userId - the id of the user to remove
-     */
-    removePresence(userId = __classPrivateFieldGet(this, _EventResponse_event, "f").sender) {
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").presenceEngine.removePresence(userId);
-        return this;
-    }
-    /**
-     * @desc Subscribes the client to a channel
-     * @param channel - the channel to subscribe to
-     */
-    subscribeTo(channel) {
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").subscribeTo(__classPrivateFieldGet(this, _EventResponse_event, "f").sender, channel);
+        __classPrivateFieldGet(this, _EventResponse_engine, "f").updatePresence(userId, presence);
         return this;
     }
-    /**
-     * @desc Unsubscribes the client from a channel
-     * @param channel - the channel to unsubscribe from
-     */
-    unsubscribeFrom(channel) {
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").unsubscribeFrom(__classPrivateFieldGet(this, _EventResponse_event, "f").sender, channel);
-        return this;
-    }
-    /**
-     * @desc Evicts a user from the channel
-     * @param reason - the reason for the eviction
-     * @param userId - the id of the user to evict,
-     */
     evictUser(reason, userId = __classPrivateFieldGet(this, _EventResponse_event, "f").sender) {
         __classPrivateFieldGet(this, _EventResponse_engine, "f").kickUser(userId, reason);
         return this;
     }
-    /**
-     * @desc Closes the channel from the server side for all clients
-     * @param reason - the reason for closing the channel
-     */
-    closeChannel(reason) {
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").destroy(reason);
+    removePresence(userId = __classPrivateFieldGet(this, _EventResponse_event, "f").sender) {
+        __classPrivateFieldGet(this, _EventResponse_engine, "f").removePresence(userId);
+        return this;
     }
 }
 exports.EventResponse = EventResponse;
-_EventResponse_event = new WeakMap(), _EventResponse_engine = new WeakMap(), _EventResponse_requestId = new WeakMap(), _EventResponse_instances = new WeakSet(), _EventResponse_manageAssigns = function _EventResponse_manageAssigns(assigns) {
-    if (assigns) {
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").updateAssigns(__classPrivateFieldGet(this, _EventResponse_event, "f").sender, assigns);
-    }
-}, _EventResponse_sendMessage = function _EventResponse_sendMessage(recipient, event, payload) {
+_EventResponse_event = new WeakMap(), _EventResponse_engine = new WeakMap(), _EventResponse_requestId = new WeakMap(), _EventResponse_instances = new WeakSet(), _EventResponse_sendMessage = function _EventResponse_sendMessage(recipient, event, payload) {
     __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(__classPrivateFieldGet(this, _EventResponse_event, "f").sender, recipient, pondsocket_common_1.ServerActions.BROADCAST, event, payload, __classPrivateFieldGet(this, _EventResponse_requestId, "f"));
 };

package/{lobby → responses}/joinResponse.js

@@ -10,11 +10,11 @@ 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 _JoinResponse_instances, _JoinResponse_user, _JoinResponse_engine, _JoinResponse_newAssigns, _JoinResponse_executed, _JoinResponse_accepted, _JoinResponse_performChecks, _JoinResponse_sendMessage, _JoinResponse_directMessage;
+var _JoinResponse_instances, _JoinResponse_user, _JoinResponse_engine, _JoinResponse_newAssigns, _JoinResponse_executed, _JoinResponse_accepted, _JoinResponse_sendMessage, _JoinResponse_directMessage, _JoinResponse_performChecks;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JoinResponse = void 0;
 const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
-const pondError_1 = require("../errors/pondError");
+const httpError_1 = require("../errors/httpError");
 class JoinResponse {
     constructor(user, engine) {
         _JoinResponse_instances.add(this);
@@ -29,41 +29,14 @@ class JoinResponse {
         __classPrivateFieldSet(this, _JoinResponse_accepted, false, "f");
         __classPrivateFieldSet(this, _JoinResponse_newAssigns, Object.assign({}, user.assigns), "f");
     }
-    /**
-     * @desc Whether the server has responded to the request
-     */
-    get hasResponded() {
-        return __classPrivateFieldGet(this, _JoinResponse_executed, "f");
-    }
-    /**
-     * @desc Assigns data to the client
-     * @param assigns - the data to assign
-     */
-    assign(assigns) {
-        if (__classPrivateFieldGet(this, _JoinResponse_accepted, "f")) {
-            __classPrivateFieldGet(this, _JoinResponse_engine, "f").updateAssigns(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, assigns);
-        }
-        else {
-            __classPrivateFieldSet(this, _JoinResponse_newAssigns, Object.assign(Object.assign({}, __classPrivateFieldGet(this, _JoinResponse_newAssigns, "f")), assigns), "f");
-        }
-        return this;
-    }
-    /**
-     * @desc Accepts the join request to the channel
-     */
     accept() {
         __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_performChecks).call(this);
         const onMessage = __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_directMessage).bind(this);
-        const unsubscribe = __classPrivateFieldGet(this, _JoinResponse_engine, "f").addUser(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, __classPrivateFieldGet(this, _JoinResponse_newAssigns, "f"), onMessage);
-        __classPrivateFieldGet(this, _JoinResponse_user, "f").subscriptions.set(__classPrivateFieldGet(this, _JoinResponse_engine, "f").name, unsubscribe);
+        const subscription = __classPrivateFieldGet(this, _JoinResponse_engine, "f").addUser(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, __classPrivateFieldGet(this, _JoinResponse_newAssigns, "f"), onMessage);
+        __classPrivateFieldGet(this, _JoinResponse_user, "f").subscriptions.add(subscription);
         __classPrivateFieldSet(this, _JoinResponse_accepted, true, "f");
         return this;
     }
-    /**
-     * @desc Rejects the request and optionally assigns data to the client
-     * @param message - the error message
-     * @param errorCode - the error code
-     */
     decline(message, errorCode) {
         __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_performChecks).call(this);
         const errorMessage = {
@@ -79,11 +52,15 @@ class JoinResponse {
         __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_directMessage).call(this, errorMessage);
         return this;
     }
-    /**
-     * @desc Emits a direct message to the client
-     * @param event - the event name
-     * @param payload - the payload to send
-     */
+    assign(assigns) {
+        if (__classPrivateFieldGet(this, _JoinResponse_accepted, "f")) {
+            void __classPrivateFieldGet(this, _JoinResponse_engine, "f").updateAssigns(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, assigns);
+        }
+        else {
+            __classPrivateFieldSet(this, _JoinResponse_newAssigns, Object.assign(Object.assign({}, __classPrivateFieldGet(this, _JoinResponse_newAssigns, "f")), assigns), "f");
+        }
+        return this;
+    }
     reply(event, payload) {
         const message = {
             action: pondsocket_common_1.ServerActions.SYSTEM,
@@ -95,70 +72,34 @@ class JoinResponse {
         __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_directMessage).call(this, message);
         return this;
     }
-    /**
-     * @desc Sends a message to all clients in the channel
-     * @param event - the event to send
-     * @param payload - the payload to send
-     */
-    broadcast(event, payload) {
-        __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_sendMessage).call(this, pondsocket_common_1.ChannelReceiver.ALL_USERS, event, payload);
-        return this;
-    }
-    /**
-     * @desc Sends a message to all clients in the channel except the client making the request
-     * @param event - the event to send
-     * @param payload - the payload to send
-     */
-    broadcastFrom(event, payload) {
-        __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_sendMessage).call(this, pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER, event, payload);
-        return this;
-    }
-    /**
-     * @desc Sends a message to a set of clients in the channel
-     * @param event - the event to send
-     * @param payload - the payload to send
-     * @param userIds - the ids of the clients to send the message to
-     */
     broadcastTo(event, payload, userIds) {
         const ids = Array.isArray(userIds) ? userIds : [userIds];
         __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_sendMessage).call(this, ids, event, payload);
         return this;
     }
-    /**
-     * @desc Tracks a user's presence in the channel
-     * @param presence - the initial presence data
-     */
-    trackPresence(presence) {
-        __classPrivateFieldGet(this, _JoinResponse_engine, "f").presenceEngine.trackPresence(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, presence);
+    broadcast(event, payload) {
+        __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_sendMessage).call(this, pondsocket_common_1.ChannelReceiver.ALL_USERS, event, payload);
         return this;
     }
-    /**
-     * @desc Subscribes the client to a channel
-     * @param channel - the channel to subscribe to
-     */
-    subscribeTo(channel) {
-        __classPrivateFieldGet(this, _JoinResponse_engine, "f").subscribeTo(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, channel);
+    broadcastFrom(event, payload) {
+        __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_sendMessage).call(this, pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER, event, payload);
         return this;
     }
-    /**
-     * @desc Unsubscribes the client from a channel
-     * @param channel - the channel to unsubscribe from
-     */
-    unsubscribeFrom(channel) {
-        __classPrivateFieldGet(this, _JoinResponse_engine, "f").unsubscribeFrom(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, channel);
+    trackPresence(presence) {
+        __classPrivateFieldGet(this, _JoinResponse_engine, "f").trackPresence(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, presence);
         return this;
     }
 }
 exports.JoinResponse = JoinResponse;
-_JoinResponse_user = new WeakMap(), _JoinResponse_engine = new WeakMap(), _JoinResponse_newAssigns = new WeakMap(), _JoinResponse_executed = new WeakMap(), _JoinResponse_accepted = new WeakMap(), _JoinResponse_instances = new WeakSet(), _JoinResponse_performChecks = function _JoinResponse_performChecks() {
+_JoinResponse_user = new WeakMap(), _JoinResponse_engine = new WeakMap(), _JoinResponse_newAssigns = new WeakMap(), _JoinResponse_executed = new WeakMap(), _JoinResponse_accepted = new WeakMap(), _JoinResponse_instances = new WeakSet(), _JoinResponse_sendMessage = function _JoinResponse_sendMessage(recipient, event, payload) {
+    __classPrivateFieldGet(this, _JoinResponse_engine, "f").sendMessage(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, recipient, pondsocket_common_1.ServerActions.BROADCAST, event, payload, __classPrivateFieldGet(this, _JoinResponse_user, "f").requestId);
+}, _JoinResponse_directMessage = function _JoinResponse_directMessage(event) {
+    __classPrivateFieldGet(this, _JoinResponse_engine, "f").parent.parent.sendMessage(__classPrivateFieldGet(this, _JoinResponse_user, "f").socket, event);
+}, _JoinResponse_performChecks = function _JoinResponse_performChecks() {
     if (__classPrivateFieldGet(this, _JoinResponse_executed, "f")) {
         const message = `Request to join channel ${__classPrivateFieldGet(this, _JoinResponse_engine, "f").name} rejected: Request already executed`;
         const code = 403;
-        throw new pondError_1.ChannelError(message, code, __classPrivateFieldGet(this, _JoinResponse_engine, "f").name);
+        throw new httpError_1.HttpError(code, message);
     }
     __classPrivateFieldSet(this, _JoinResponse_executed, true, "f");
-}, _JoinResponse_sendMessage = function _JoinResponse_sendMessage(recipient, event, payload) {
-    __classPrivateFieldGet(this, _JoinResponse_engine, "f").sendMessage(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, recipient, pondsocket_common_1.ServerActions.BROADCAST, event, payload, __classPrivateFieldGet(this, _JoinResponse_user, "f").requestId);
-}, _JoinResponse_directMessage = function _JoinResponse_directMessage(event) {
-    __classPrivateFieldGet(this, _JoinResponse_engine, "f").parent.parent.sendMessage(__classPrivateFieldGet(this, _JoinResponse_user, "f").socket, event);
 };