@eleven-am/pondsocket 0.1.141 → 0.1.142

package/channel/channel.test.js

@@ -5,18 +5,43 @@ const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
 const channel_1 = require("./channel");
 const eventRequest_1 = require("./eventRequest");
 const eventResponse_1 = require("./eventResponse");
+const endpoint_test_1 = require("../endpoint/endpoint.test");
 const createParentEngine = () => {
-    const parentEngine = {
-        destroyChannel: jest.fn(),
+    const socket = {
+        clientId: 'test2',
+        assigns: { assign: 'assign' },
+        channelName: 'channel',
+        requestId: 'requestId',
+        subscriptions: new Map(),
+        pendingSubscriptions: new Set(),
+        socket: {
+            send: jest.fn(),
+        },
+    };
+    const lobbyEngineMock = {
+        onEvent: jest.fn(),
+        onLeave: jest.fn(),
+        broadcast: jest.fn(),
         execute: jest.fn(),
+        getChannel: jest.fn(),
+        destroyChannel: jest.fn(),
+        listChannels: jest.fn(),
+        createChannel: jest.fn(),
+        parent: (0, endpoint_test_1.createEndpointEngine)(socket),
+        middleware: {
+            run: jest.fn(),
+        },
+    };
+    return {
+        parentEngine: lobbyEngineMock,
+        socket,
     };
-    return parentEngine;
 };
 exports.createParentEngine = createParentEngine;
 describe('ChannelEngine', () => {
     it('should add user to channel', () => {
         const onMessage = jest.fn();
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
         expect(channelEngine.size).toEqual(0);
         expect(channelEngine.getUserData('test')).not.toBeDefined();
@@ -30,7 +55,7 @@ describe('ChannelEngine', () => {
     });
     it('should throw error if user is already in channel', () => {
         const onMessage = jest.fn();
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('testChannel', parentEngine);
         channelEngine.addUser('test', { test: 1 }, onMessage);
         expect(() => {
@@ -38,22 +63,22 @@ describe('ChannelEngine', () => {
         }).toThrow('ChannelEngine: User with id test already exists in channel testChannel');
     });
     it('should throw error if user is not in channel: updateAssigns', () => {
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('testChannel', parentEngine);
         expect(() => {
             channelEngine.updateAssigns('test', { test: 2 });
         }).toThrow('ChannelEngine: User with id test does not exist in channel testChannel');
     });
     it('should throw error if user is not in channel: removeUser', () => {
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('testChannel', parentEngine);
         expect(() => {
-            channelEngine.removeUser('test', false);
-        }).toThrow('ChannelEngine: User with id test does not exist in channel testChannel');
+            channelEngine.kickUser('test', 'test reason');
+        }).toThrow('ChannelEngine: Invalid recipients test some users do not exist in channel testChannel');
     });
     it('should update a users assigns', () => {
         const onMessage = jest.fn();
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine, socket } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
         channelEngine.addUser('test', { test: 1 }, onMessage);
         expect(channelEngine.getUserData('test')).toEqual({
@@ -70,7 +95,7 @@ describe('ChannelEngine', () => {
     });
     it('should be able to get users assigns in the channel', () => {
         const onMessage = jest.fn();
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
         expect(channelEngine.getAssigns()).toEqual({});
         channelEngine.addUser('test', { test: 1 }, onMessage);
@@ -85,7 +110,7 @@ describe('ChannelEngine', () => {
     });
     it('should be able to track presence', () => {
         const onMessage = jest.fn();
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
         channelEngine.addUser('test', { test: 1 }, onMessage);
         expect(channelEngine.getUserData('test')).toEqual({
@@ -103,7 +128,7 @@ describe('ChannelEngine', () => {
     });
     it('should throw error if channel is already tracking the users presence', () => {
         const onMessage = jest.fn();
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
         channelEngine.addUser('test', { test: 1 }, onMessage);
         channelEngine.presenceEngine.trackPresence('test', { test: 2 });
@@ -114,7 +139,7 @@ describe('ChannelEngine', () => {
     it('should be able to list presence', () => {
         var _a;
         const onMessage = jest.fn();
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
         channelEngine.addUser('test', { test: 1 }, onMessage);
         channelEngine.addUser('test2', { test: 2 }, onMessage);
@@ -140,7 +165,7 @@ describe('ChannelEngine', () => {
     it('should update a users presence', () => {
         var _a;
         const onMessage = jest.fn();
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
         channelEngine.addUser('test', { test: 1 }, onMessage);
         channelEngine.presenceEngine.trackPresence('test', { test: 2 });
@@ -158,31 +183,33 @@ describe('ChannelEngine', () => {
     });
     it('should remove user from channel', () => {
         const onMessage = jest.fn();
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine, socket } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
-        channelEngine.addUser('test', { test: 1 }, onMessage);
+        const unsub = channelEngine.addUser('test1', { test: 1 }, onMessage);
+        socket.subscriptions.set('test', unsub);
         expect(channelEngine.size).toEqual(1);
-        expect(channelEngine.getUserData('test')).toBeDefined();
-        channelEngine.removeUser('test', true);
+        expect(channelEngine.getUserData('test1')).toBeDefined();
+        channelEngine.kickUser('test1', 'test reason');
         expect(channelEngine.size).toEqual(0);
         expect(channelEngine.getUserData('test')).not.toBeDefined();
     });
     it('should untrack presence when user is removed', () => {
-        var _a, _b;
+        var _a;
         const onMessage = jest.fn();
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine, socket } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
-        channelEngine.addUser('test', { test: 1 }, onMessage);
-        channelEngine.presenceEngine.trackPresence('test', { test: 2 });
+        const unsub = channelEngine.addUser('test1', { test: 1 }, onMessage);
+        socket.subscriptions.set('test', unsub);
+        channelEngine.presenceEngine.trackPresence('test1', { test: 2 });
         channelEngine.addUser('test2', { test: 1 }, onMessage);
         channelEngine.presenceEngine.trackPresence('test2', { test: 2 });
-        expect((_a = channelEngine.presenceEngine) === null || _a === void 0 ? void 0 : _a.getPresence()).toEqual({
-            test: { test: 2 },
+        expect(channelEngine.presenceEngine.getPresence()).toEqual({
+            test1: { test: 2 },
             test2: { test: 2 },
         });
         onMessage.mockClear();
-        channelEngine.removeUser('test', true);
-        expect((_b = channelEngine.presenceEngine) === null || _b === void 0 ? void 0 : _b.getPresence()).toEqual({
+        channelEngine.kickUser('test1', 'test reason');
+        expect((_a = channelEngine.presenceEngine) === null || _a === void 0 ? void 0 : _a.getPresence()).toEqual({
             test2: { test: 2 },
         });
         expect(onMessage).toHaveBeenCalledWith(expect.objectContaining({
@@ -198,7 +225,7 @@ describe('ChannelEngine', () => {
         }));
     });
     it('should throw error if user is not in channel and isPond is false', () => {
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('testChannel', parentEngine);
         // add a user to the channel
         channelEngine.addUser('test', { test: 1 }, jest.fn());
@@ -213,7 +240,7 @@ describe('ChannelEngine', () => {
         }).toThrow('PresenceEngine: Presence with key test1 does not exist');
     });
     it('should not throw error if user is not in channel and isPond is true', () => {
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('testChannel', parentEngine);
         // add a user to the channel
         channelEngine.addUser('test', { test: 1 }, jest.fn());
@@ -229,11 +256,12 @@ describe('ChannelEngine', () => {
     });
     it('should be able to kick a user from the channel', () => {
         const onMessage = jest.fn();
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine, socket } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
-        channelEngine.addUser('test', { test: 1 }, onMessage);
-        channelEngine.addUser('test2', { test: 1 }, onMessage);
-        channelEngine.kickUser('test2', 'test reason');
+        channelEngine.addUser('test1', { test: 1 }, onMessage);
+        const unsub = channelEngine.addUser('test2', { test: 1 }, onMessage);
+        socket.subscriptions.set('test', unsub);
+        channelEngine.kickUser('test1', 'test reason');
         expect(channelEngine.size).toEqual(1);
         expect(channelEngine.getUserData('test2')).not.toBeDefined();
         expect(onMessage.mock.calls[0][0]).toStrictEqual(expect.objectContaining({
@@ -251,27 +279,27 @@ describe('ChannelEngine', () => {
             event: 'kicked',
             payload: {
                 reason: 'test reason',
-                userId: 'test2',
+                userId: 'test1',
             },
         }));
         expect(onMessage).toHaveBeenCalledTimes(2);
     });
     it('should call destroy on parent engine', () => {
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
         channelEngine.destroy('test');
         expect(parentEngine.destroyChannel).toHaveBeenCalled();
     });
     it('should broadcast a message to all users', () => {
         const onMessage = jest.fn();
-        const parentEngine = (0, exports.createParentEngine)();
-        parentEngine.execute = (_, res) => {
-            res.accept();
+        const { parentEngine } = (0, exports.createParentEngine)();
+        parentEngine.middleware.run = (_, res) => {
+            // res.accept();
         };
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
         channelEngine.addUser('test', { test: 1 }, onMessage);
         channelEngine.addUser('test2', { test: 1 }, onMessage);
-        channelEngine.sendMessage((0, pondsocket_common_1.uuid)(), pondsocket_common_1.SystemSender.CHANNEL, pondsocket_common_1.ChannelReceiver.ALL_USERS, pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 2 });
+        channelEngine.sendMessage(pondsocket_common_1.SystemSender.CHANNEL, pondsocket_common_1.ChannelReceiver.ALL_USERS, pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 2 });
         expect(onMessage.mock.calls[0][0]).toStrictEqual(expect.objectContaining({
             action: pondsocket_common_1.ServerActions.BROADCAST,
             channelName: 'test',
@@ -282,24 +310,24 @@ describe('ChannelEngine', () => {
         }));
         expect(onMessage).toHaveBeenCalledTimes(2);
         onMessage.mockClear();
-        channelEngine.sendMessage((0, pondsocket_common_1.uuid)(), 'test2', pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER, pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 3 });
+        channelEngine.sendMessage('test2', pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER, pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 3 });
         expect(onMessage).toHaveBeenCalledTimes(1);
         onMessage.mockClear();
         // when user is not in channel it throws an error
         expect(() => {
-            channelEngine.sendMessage((0, pondsocket_common_1.uuid)(), 'test3', pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER, pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 3 });
+            channelEngine.sendMessage('test3', pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER, pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 3 });
         }).toThrow('ChannelEngine: User with id test3 does not exist in channel test');
     });
     it('should broadcast a message to all users except sender', () => {
         const onMessage = jest.fn();
-        const parentEngine = (0, exports.createParentEngine)();
-        parentEngine.execute = (_, res) => {
-            res.accept();
+        const { parentEngine } = (0, exports.createParentEngine)();
+        parentEngine.middleware.run = (_, res) => {
+            // res.accept();
         };
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
         channelEngine.addUser('test', { test: 1 }, onMessage);
         channelEngine.addUser('test2', { test: 1 }, onMessage);
-        channelEngine.sendMessage((0, pondsocket_common_1.uuid)(), 'test2', pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER, pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 2 });
+        channelEngine.sendMessage('test2', pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER, pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 2 });
         expect(onMessage.mock.calls[0][0]).toStrictEqual(expect.objectContaining({
             action: pondsocket_common_1.ServerActions.BROADCAST,
             channelName: 'test',
@@ -311,24 +339,24 @@ describe('ChannelEngine', () => {
         expect(onMessage).toHaveBeenCalledTimes(1);
         // when user is not in channel it throws an error
         expect(() => {
-            channelEngine.sendMessage((0, pondsocket_common_1.uuid)(), 'test3', pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER, pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 3 });
+            channelEngine.sendMessage('test3', pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER, pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 3 });
         }).toThrow('ChannelEngine: User with id test3 does not exist in channel test');
         // when sender is channel itself it throws an error
         expect(() => {
-            channelEngine.sendMessage((0, pondsocket_common_1.uuid)(), pondsocket_common_1.SystemSender.CHANNEL, pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER, pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 3 });
+            channelEngine.sendMessage(pondsocket_common_1.SystemSender.CHANNEL, pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER, pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 3 });
         }).toThrow(`ChannelEngine: Cannot use ${pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER} with ${pondsocket_common_1.SystemSender.CHANNEL}`);
     });
     it('should broadcast a message to  specific users', () => {
         const onMessage = jest.fn();
-        const parentEngine = (0, exports.createParentEngine)();
-        parentEngine.execute = (_, res) => {
-            res.accept();
+        const { parentEngine } = (0, exports.createParentEngine)();
+        parentEngine.middleware.run = (_, res) => {
+            // res.accept();
         };
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
         channelEngine.addUser('test', { test: 1 }, onMessage);
         channelEngine.addUser('test2', { test: 1 }, onMessage);
         channelEngine.addUser('test3', { test: 1 }, onMessage);
-        channelEngine.sendMessage((0, pondsocket_common_1.uuid)(), 'test2', ['test', 'test3'], pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 2 });
+        channelEngine.sendMessage('test2', ['test', 'test3'], pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 2 });
         expect(onMessage.mock.calls[0][0]).toStrictEqual(expect.objectContaining({
             action: pondsocket_common_1.ServerActions.BROADCAST,
             channelName: 'test',
@@ -348,21 +376,20 @@ describe('ChannelEngine', () => {
         expect(onMessage).toHaveBeenCalledTimes(2);
         // when recipient is not in channel it throws an error
         expect(() => {
-            channelEngine.sendMessage((0, pondsocket_common_1.uuid)(), 'test3', ['test', 'test3', 'test4'], pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 3 });
+            channelEngine.sendMessage('test3', ['test', 'test3', 'test4'], pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 3 });
         }).toThrow('ChannelEngine: Invalid recipients test,test3,test4 some users do not exist in channel test');
         // when sender is not in channel it throws an error
         expect(() => {
-            channelEngine.sendMessage((0, pondsocket_common_1.uuid)(), 'test4', ['test', 'test3'], pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 3 });
+            channelEngine.sendMessage('test4', ['test', 'test3'], pondsocket_common_1.ServerActions.BROADCAST, 'test', { test: 3 });
         }).toThrow('ChannelEngine: User with id test4 does not exist in channel test');
     });
     it('should broadcast messages while also triggering the onMessage callback', () => {
         const onMessage = jest.fn();
-        const parentEngine = (0, exports.createParentEngine)();
+        const { parentEngine } = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
-        parentEngine.execute = (req, res) => {
+        parentEngine.middleware.run = (req, res) => {
             expect(req).toBeInstanceOf(eventRequest_1.EventRequest);
             expect(res).toBeInstanceOf(eventResponse_1.EventResponse);
-            res.accept();
         };
         expect(() => channelEngine.broadcastMessage('test2', {
             action: pondsocket_common_1.ClientActions.BROADCAST,
@@ -370,7 +397,6 @@ describe('ChannelEngine', () => {
             event: 'test',
             payload: { test: 1 },
             requestId: (0, pondsocket_common_1.uuid)(),
-            addresses: pondsocket_common_1.ChannelReceiver.ALL_USERS,
         })).toThrow('ChannelEngine: User with id test2 does not exist in channel test');
         channelEngine.addUser('test2', { test: 1 }, onMessage);
         channelEngine.broadcastMessage('test2', {
@@ -379,12 +405,12 @@ describe('ChannelEngine', () => {
             event: 'test',
             payload: { test: 1 },
             requestId: (0, pondsocket_common_1.uuid)(),
-            addresses: pondsocket_common_1.ChannelReceiver.ALL_USERS,
         });
-        expect(onMessage).toHaveBeenCalledTimes(1);
+        // This is because the message didn't perform any sort of broadcast
+        expect(onMessage).toHaveBeenCalledTimes(0);
         let count = 0;
         onMessage.mockClear();
-        parentEngine.execute = (req, res, next) => {
+        parentEngine.middleware.run = (req, res, next) => {
             expect(req).toBeInstanceOf(eventRequest_1.EventRequest);
             expect(res).toBeInstanceOf(eventResponse_1.EventResponse);
             count++;
@@ -396,7 +422,6 @@ describe('ChannelEngine', () => {
             event: 'test',
             payload: { test: 1 },
             requestId: (0, pondsocket_common_1.uuid)(),
-            addresses: pondsocket_common_1.ChannelReceiver.ALL_USERS,
         });
         // proves that the message was received by the parent engine
         expect(count).toBe(1);

package/channel/eventRequest.test.js

@@ -4,20 +4,20 @@ const eventRequest_1 = require("./eventRequest");
 const eventResponse_test_1 = require("./eventResponse.test");
 describe('ChannelRequest', () => {
     it('should create a new ChannelRequest', () => {
-        const channelEngine = (0, eventResponse_test_1.createChannelEngine)();
+        const { channelEngine } = (0, eventResponse_test_1.createChannelEngine)();
         const event = (0, eventResponse_test_1.createChannelEvent)(channelEngine.name);
         const channelRequest = new eventRequest_1.EventRequest(event, channelEngine);
         expect(channelRequest).toBeDefined();
     });
     it('should return the payload', () => {
-        const channelEngine = (0, eventResponse_test_1.createChannelEngine)();
+        const { channelEngine } = (0, eventResponse_test_1.createChannelEngine)();
         const event = (0, eventResponse_test_1.createChannelEvent)(channelEngine.name);
         const channelRequest = new eventRequest_1.EventRequest(event, channelEngine);
         channelRequest._parseQueries('event');
         expect(channelRequest.event.payload).toEqual(event.payload);
     });
     it('should return the user', () => {
-        const channelEngine = (0, eventResponse_test_1.createChannelEngine)();
+        const { channelEngine } = (0, eventResponse_test_1.createChannelEngine)();
         const event = (0, eventResponse_test_1.createChannelEvent)(channelEngine.name);
         const channelRequest = new eventRequest_1.EventRequest(event, channelEngine);
         // because the user in the event does not exist in the channel, this should throw an error

package/channel/eventResponse.js

@@ -10,72 +10,36 @@ 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_executed, _EventResponse_manageAssigns, _EventResponse_performChecks;
+var _EventResponse_instances, _EventResponse_event, _EventResponse_engine, _EventResponse_requestId, _EventResponse_manageAssigns, _EventResponse_sendMessage;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventResponse = void 0;
 const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
-const abstractResponse_1 = require("../abstracts/abstractResponse");
-const pondError_1 = require("../errors/pondError");
-class EventResponse extends abstractResponse_1.PondResponse {
+class EventResponse {
     constructor(event, engine) {
-        super(event.requestId);
         _EventResponse_instances.add(this);
         _EventResponse_event.set(this, void 0);
         _EventResponse_engine.set(this, void 0);
-        _EventResponse_executed.set(this, void 0);
+        _EventResponse_requestId.set(this, void 0);
         __classPrivateFieldSet(this, _EventResponse_event, event, "f");
         __classPrivateFieldSet(this, _EventResponse_engine, engine, "f");
-        __classPrivateFieldSet(this, _EventResponse_executed, false, "f");
+        __classPrivateFieldSet(this, _EventResponse_requestId, event.requestId, "f");
     }
     /**
-     * @desc Whether the server has responded to the request
-     */
-    get hasResponded() {
-        return __classPrivateFieldGet(this, _EventResponse_executed, "f");
-    }
-    /**
-     * @desc Accepts the request and optionally assigns data to the client
-     * @param assigns - the data to assign to the client
-     */
-    accept(assigns) {
-        __classPrivateFieldGet(this, _EventResponse_instances, "m", _EventResponse_manageAssigns).call(this, assigns);
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(this.requestId, __classPrivateFieldGet(this, _EventResponse_event, "f").sender, __classPrivateFieldGet(this, _EventResponse_event, "f").recipients, __classPrivateFieldGet(this, _EventResponse_event, "f").action, __classPrivateFieldGet(this, _EventResponse_event, "f").event, __classPrivateFieldGet(this, _EventResponse_event, "f").payload);
-        return this;
-    }
-    /**
-     * @desc Rejects the request and optionally assigns data to the client
-     * @param message - the error message
-     * @param errorCode - the error code
+     * @desc Assigns data to the client
      * @param assigns - the data to assign to the client
      */
-    reject(message, errorCode, assigns) {
+    assign(assigns) {
         __classPrivateFieldGet(this, _EventResponse_instances, "m", _EventResponse_manageAssigns).call(this, assigns);
-        const text = message || 'Unauthorized request';
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(this.requestId, pondsocket_common_1.SystemSender.CHANNEL, [__classPrivateFieldGet(this, _EventResponse_event, "f").sender], pondsocket_common_1.ServerActions.ERROR, pondsocket_common_1.ErrorTypes.UNAUTHORIZED_BROADCAST, {
-            message: text,
-            code: errorCode || 403,
-        });
         return this;
     }
     /**
-     * @desc Emits a direct message to the client, accepting the request
+     * @desc Emits a direct message to the client
      * @param event - the event name
      * @param payload - the payload to send
-     * @param assigns - the data to assign to the client
      */
-    send(event, payload, assigns) {
-        this.accept(assigns);
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(this.requestId, pondsocket_common_1.SystemSender.CHANNEL, [__classPrivateFieldGet(this, _EventResponse_event, "f").sender], pondsocket_common_1.ServerActions.SYSTEM, event, payload);
-    }
-    /**
-     * @desc Emits a direct message to the client without accepting the request
-     * @param event - the event name
-     * @param payload - the payload to send
-     * @param assigns - the data to assign to the client
-     */
-    sendOnly(event, payload, assigns) {
-        __classPrivateFieldGet(this, _EventResponse_instances, "m", _EventResponse_manageAssigns).call(this, assigns);
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(this.requestId, pondsocket_common_1.SystemSender.CHANNEL, [__classPrivateFieldGet(this, _EventResponse_event, "f").sender], pondsocket_common_1.ServerActions.SYSTEM, event, payload);
+    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
@@ -83,7 +47,7 @@ class EventResponse extends abstractResponse_1.PondResponse {
      * @param payload - the payload to send
      */
     broadcast(event, payload) {
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(this.requestId, __classPrivateFieldGet(this, _EventResponse_event, "f").sender, pondsocket_common_1.ChannelReceiver.ALL_USERS, pondsocket_common_1.ServerActions.BROADCAST, event, payload);
+        __classPrivateFieldGet(this, _EventResponse_instances, "m", _EventResponse_sendMessage).call(this, pondsocket_common_1.ChannelReceiver.ALL_USERS, event, payload);
         return this;
     }
     /**
@@ -91,8 +55,8 @@ class EventResponse extends abstractResponse_1.PondResponse {
      * @param event - the event to send
      * @param payload - the payload to send
      */
-    broadcastFromUser(event, payload) {
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(this.requestId, __classPrivateFieldGet(this, _EventResponse_event, "f").sender, pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER, pondsocket_common_1.ServerActions.BROADCAST, event, payload);
+    broadcastFrom(event, payload) {
+        __classPrivateFieldGet(this, _EventResponse_instances, "m", _EventResponse_sendMessage).call(this, pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER, event, payload);
         return this;
     }
     /**
@@ -101,8 +65,9 @@ class EventResponse extends abstractResponse_1.PondResponse {
      * @param payload - the payload to send
      * @param userIds - the ids of the clients to send the message to
      */
-    sendToUsers(event, payload, userIds) {
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(this.requestId, __classPrivateFieldGet(this, _EventResponse_event, "f").sender, userIds, pondsocket_common_1.ServerActions.BROADCAST, event, payload);
+    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;
     }
     /**
@@ -127,10 +92,26 @@ class EventResponse extends abstractResponse_1.PondResponse {
      * @desc Removes a user's presence from the channel
      * @param userId - the id of the user to remove
      */
-    unTrackPresence(userId = __classPrivateFieldGet(this, _EventResponse_event, "f").sender) {
+    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);
+        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
@@ -148,16 +129,10 @@ class EventResponse extends abstractResponse_1.PondResponse {
     }
 }
 exports.EventResponse = EventResponse;
-_EventResponse_event = new WeakMap(), _EventResponse_engine = new WeakMap(), _EventResponse_executed = new WeakMap(), _EventResponse_instances = new WeakSet(), _EventResponse_manageAssigns = function _EventResponse_manageAssigns(assigns) {
-    __classPrivateFieldGet(this, _EventResponse_instances, "m", _EventResponse_performChecks).call(this);
+_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_performChecks = function _EventResponse_performChecks() {
-    if (__classPrivateFieldGet(this, _EventResponse_executed, "f")) {
-        const message = 'Event response has already been executed';
-        const code = 403;
-        throw new pondError_1.ChannelError(message, code, __classPrivateFieldGet(this, _EventResponse_engine, "f").name);
-    }
-    __classPrivateFieldSet(this, _EventResponse_executed, true, "f");
+}, _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"));
 };