@eleven-am/pondsocket 0.1.147 → 0.1.148

package/channel/channel.js

@@ -76,7 +76,9 @@ class ChannelEngine {
             throw new pondError_1.ChannelError(message, code, this.name);
         }
         __classPrivateFieldGet(this, _ChannelEngine_users, "f").set(userId, assigns);
-        return __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_subscribe).call(this, userId, onMessage);
+        const subscription = __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_subscribe).call(this, userId, onMessage);
+        this.sendMessage(pondsocket_common_1.SystemSender.CHANNEL, [userId], pondsocket_common_1.ServerActions.SYSTEM, pondsocket_common_1.Events.ACKNOWLEDGE, {});
+        return subscription;
     }
     /**
      * @desc Kicks a user from the channel

package/channel/channel.test.js

@@ -159,7 +159,7 @@ describe('ChannelEngine', () => {
             test: { test: 2 },
             test2: { test: 3 },
         });
-        expect(onMessage).toHaveBeenCalledTimes(3);
+        expect(onMessage).toHaveBeenCalledTimes(5);
     });
     it('should update a users presence', () => {
         var _a;
@@ -259,6 +259,7 @@ describe('ChannelEngine', () => {
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
         channelEngine.addUser('test1', { test: 1 }, onMessage);
         const unsub = channelEngine.addUser('test2', { test: 1 }, onMessage);
+        onMessage.mockClear();
         socket.subscriptions.set('test', unsub);
         channelEngine.kickUser('test1', 'test reason');
         expect(channelEngine.size).toEqual(1);
@@ -298,6 +299,7 @@ describe('ChannelEngine', () => {
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
         channelEngine.addUser('test', { test: 1 }, onMessage);
         channelEngine.addUser('test2', { test: 1 }, onMessage);
+        onMessage.mockClear();
         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,
@@ -326,6 +328,7 @@ describe('ChannelEngine', () => {
         const channelEngine = new channel_1.ChannelEngine('test', parentEngine);
         channelEngine.addUser('test', { test: 1 }, onMessage);
         channelEngine.addUser('test2', { test: 1 }, onMessage);
+        onMessage.mockClear();
         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,
@@ -355,6 +358,7 @@ describe('ChannelEngine', () => {
         channelEngine.addUser('test', { test: 1 }, onMessage);
         channelEngine.addUser('test2', { test: 1 }, onMessage);
         channelEngine.addUser('test3', { test: 1 }, onMessage);
+        onMessage.mockClear();
         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,
@@ -398,6 +402,7 @@ describe('ChannelEngine', () => {
             requestId: (0, pondsocket_common_1.uuid)(),
         })).toThrow('ChannelEngine: User with id test2 does not exist in channel test');
         channelEngine.addUser('test2', { test: 1 }, onMessage);
+        onMessage.mockClear();
         channelEngine.broadcastMessage('test2', {
             action: pondsocket_common_1.ClientActions.BROADCAST,
             channelName: 'test',

package/lobby/JoinResponse.test.js

@@ -52,6 +52,8 @@ describe('JoinResponse', () => {
         const { response, channelEngine, socket } = createPondResponse();
         // spy on the channelEngine to see if the user was added
         jest.spyOn(channelEngine, 'addUser');
+        const endpoint = channelEngine.parent.parent;
+        jest.spyOn(endpoint, 'sendMessage');
         response
             .accept()
             .reply('POND_MESSAGE', { message: 'message' })
@@ -68,11 +70,17 @@ describe('JoinResponse', () => {
         // also check if the socket was sent a message
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-expect-error - we are mocking the socket
-        const first = socket.socket.send.mock.calls[0][0];
+        const first = endpoint.sendMessage.mock.calls[0][1];
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-expect-error - we are mocking the socket
-        const params = socket.socket.send.mock.calls[1][0];
-        expect(JSON.parse(params)).toEqual(expect.objectContaining({
+        const params = endpoint.sendMessage.mock.calls[1][1];
+        expect(first).toEqual(expect.objectContaining({
+            channelName: 'test',
+            action: pondsocket_common_1.ServerActions.SYSTEM,
+            payload: {},
+            event: pondsocket_common_1.Events.ACKNOWLEDGE,
+        }));
+        expect(params).toEqual(expect.objectContaining({
             channelName: 'test',
             action: pondsocket_common_1.ServerActions.SYSTEM,
             payload: {
@@ -80,12 +88,6 @@ describe('JoinResponse', () => {
             },
             event: 'POND_MESSAGE',
         }));
-        expect(JSON.parse(first)).toEqual(expect.objectContaining({
-            channelName: 'test',
-            action: pondsocket_common_1.ServerActions.SYSTEM,
-            payload: {},
-            event: pondsocket_common_1.Events.ACKNOWLEDGE,
-        }));
     });
     // auxiliary functions
     it('should send messages to different users', () => {

package/lobby/joinResponse.js

@@ -53,14 +53,6 @@ class JoinResponse {
      */
     accept() {
         __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_performChecks).call(this);
-        const acknowledgement = {
-            action: pondsocket_common_1.ServerActions.SYSTEM,
-            channelName: __classPrivateFieldGet(this, _JoinResponse_engine, "f").name,
-            event: pondsocket_common_1.Events.ACKNOWLEDGE,
-            requestId: __classPrivateFieldGet(this, _JoinResponse_user, "f").requestId,
-            payload: {},
-        };
-        __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_directMessage).call(this, acknowledgement);
         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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eleven-am/pondsocket",
-  "version": "0.1.147",
+  "version": "0.1.148",
   "description": "PondSocket is a fast simple socket server",
   "keywords": [
     "socket",
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.11.20",
+    "@types/node": "^20.11.24",
     "@types/websocket": "^1.0.10",
     "@types/ws": "^8.5.10",
     "@typescript-eslint/eslint-plugin": "^7.1.0",

package/presence/presenceEngine.test.js

@@ -84,6 +84,7 @@ describe('PresenceEngine', () => {
             channel.addUser('presenceKey2', { assign: 'assign' }, () => {
                 // do nothing
             });
+            listener.mockClear();
             presenceEngine.trackPresence(presenceKey, presence);
             presenceEngine.trackPresence('presenceKey2', Object.assign(Object.assign({}, presence), { key: 'presence2' }));
             expect(listener).toHaveBeenCalledTimes(2);