@eleven-am/pondsocket 0.1.138 → 0.1.141

package/channel/channel.js

@@ -104,8 +104,9 @@ class ChannelEngine {
     /**
      * @desc Removes a user from the channel
      * @param userId - The id of the user to remove
+     * @param isGraceful - Whether the user is being removed gracefully
      */
-    removeUser(userId) {
+    removeUser(userId, isGraceful) {
         var _a;
         const user = __classPrivateFieldGet(this, _ChannelEngine_users, "f").get(userId);
         if (user) {
@@ -126,7 +127,7 @@ class ChannelEngine {
                 __classPrivateFieldGet(this, _ChannelEngine_parentEngine, "f").destroyChannel();
             }
         }
-        else {
+        else if (!isGraceful) {
             throw new pondError_1.ChannelError(`ChannelEngine: User with id ${userId} does not exist in channel ${this.name}`, 404, this.name);
         }
     }
@@ -140,7 +141,7 @@ class ChannelEngine {
             message: reason,
             code: 403,
         });
-        this.removeUser(userId);
+        this.removeUser(userId, false);
         this.sendMessage((0, pondsocket_common_1.uuid)(), pondsocket_common_1.SystemSender.CHANNEL, pondsocket_common_1.ChannelReceiver.ALL_USERS, pondsocket_common_1.ServerActions.SYSTEM, 'kicked', {
             userId,
             reason,
@@ -155,7 +156,7 @@ class ChannelEngine {
             message: reason !== null && reason !== void 0 ? reason : 'Channel has been destroyed',
         });
         __classPrivateFieldGet(this, _ChannelEngine_parentEngine, "f").destroyChannel();
-        __classPrivateFieldGet(this, _ChannelEngine_users, "f").forEach((_, userId) => this.removeUser(userId));
+        __classPrivateFieldGet(this, _ChannelEngine_users, "f").forEach((_, userId) => this.removeUser(userId, true));
     }
     /**
      * @desc Updates a user's assigns

package/channel/channel.test.js

@@ -48,7 +48,7 @@ describe('ChannelEngine', () => {
         const parentEngine = (0, exports.createParentEngine)();
         const channelEngine = new channel_1.ChannelEngine('testChannel', parentEngine);
         expect(() => {
-            channelEngine.removeUser('test');
+            channelEngine.removeUser('test', false);
         }).toThrow('ChannelEngine: User with id test does not exist in channel testChannel');
     });
     it('should update a users assigns', () => {
@@ -163,7 +163,7 @@ describe('ChannelEngine', () => {
         channelEngine.addUser('test', { test: 1 }, onMessage);
         expect(channelEngine.size).toEqual(1);
         expect(channelEngine.getUserData('test')).toBeDefined();
-        channelEngine.removeUser('test');
+        channelEngine.removeUser('test', true);
         expect(channelEngine.size).toEqual(0);
         expect(channelEngine.getUserData('test')).not.toBeDefined();
     });
@@ -181,7 +181,7 @@ describe('ChannelEngine', () => {
             test2: { test: 2 },
         });
         onMessage.mockClear();
-        channelEngine.removeUser('test');
+        channelEngine.removeUser('test', true);
         expect((_b = channelEngine.presenceEngine) === null || _b === void 0 ? void 0 : _b.getPresence()).toEqual({
             test2: { test: 2 },
         });

package/endpoint/endpoint.js

@@ -216,7 +216,7 @@ _Endpoint_middleware = new WeakMap(), _Endpoint_channels = new WeakMap(), _Endpo
             break;
         case pondsocket_common_1.ClientActions.LEAVE_CHANNEL:
             __classPrivateFieldGet(this, _Endpoint_instances, "m", _Endpoint_execute).call(this, message.channelName, (channel) => {
-                channel.removeUser(cache.clientId);
+                channel.removeUser(cache.clientId, true);
             });
             break;
         case pondsocket_common_1.ClientActions.BROADCAST:

package/lobby/lobby.js

@@ -82,7 +82,7 @@ class LobbyEngine {
      */
     removeUser(clientId) {
         __classPrivateFieldGet(this, _LobbyEngine_channels, "f").forEach((channel) => {
-            channel.removeUser(clientId);
+            channel.removeUser(clientId, true);
         });
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eleven-am/pondsocket",
-  "version": "0.1.138",
+  "version": "0.1.141",
   "description": "PondSocket is a fast simple socket server",
   "keywords": [
     "socket",

package/types.d.ts

@@ -14,14 +14,14 @@ import { WebSocketServer } from 'ws';
 
 export * from '@eleven-am/pondsocket-common';
 
-interface LeaveEvent<EventTypes extends PondEventMap = PondEventMap, PresenceType extends PondPresence = PondPresence, AssignType extends PondAssigns = PondAssigns> {
+export interface LeaveEvent<EventTypes extends PondEventMap = PondEventMap, PresenceType extends PondPresence = PondPresence, AssignType extends PondAssigns = PondAssigns> {
     user: UserData<PresenceType, AssignType>;
     channel: Channel<EventTypes, PresenceType, AssignType>;
 }
 
-type LeaveCallback<EventTypes extends PondEventMap = PondEventMap, PresenceType extends PondPresence = PondPresence, AssignType extends PondAssigns = PondAssigns> = (event: LeaveEvent<EventTypes, PresenceType, AssignType>) => void;
+export type LeaveCallback<EventTypes extends PondEventMap = PondEventMap, PresenceType extends PondPresence = PondPresence, AssignType extends PondAssigns = PondAssigns> = (event: LeaveEvent<EventTypes, PresenceType, AssignType>) => void;
 
-declare class AbstractRequest<Path extends string, PresenceType extends PondPresence, AssignType extends PondAssigns> {
+export declare class AbstractRequest<Path extends string, PresenceType extends PondPresence, AssignType extends PondAssigns> {
     event: PondEvent<Path>;
 
     channelName: string;
@@ -31,13 +31,13 @@ declare class AbstractRequest<Path extends string, PresenceType extends PondPres
     presence: Record<string, PresenceType>;
 }
 
-declare class EventRequest<Path extends string, PresenceType extends PondPresence = PondPresence, AssignType extends PondAssigns = PondAssigns> extends AbstractRequest<Path, PresenceType, AssignType> {
+export declare class EventRequest<Path extends string, PresenceType extends PondPresence = PondPresence, AssignType extends PondAssigns = PondAssigns> extends AbstractRequest<Path, PresenceType, AssignType> {
     user: UserData<PresenceType, AssignType>;
 
     channel: Channel;
 }
 
-declare class EventResponse<EventType extends PondEventMap = PondEventMap, PresenceType extends PondPresence = PondPresence, AssignType extends PondAssigns = PondAssigns> {
+export declare class EventResponse<EventType extends PondEventMap = PondEventMap, PresenceType extends PondPresence = PondPresence, AssignType extends PondAssigns = PondAssigns> {
     /**
      * @desc Whether the server has responded to the request
      */
@@ -129,7 +129,7 @@ declare class EventResponse<EventType extends PondEventMap = PondEventMap, Prese
     closeChannel (reason: string): void;
 }
 
-declare class Endpoint {
+export declare class Endpoint {
     /**
      * @desc Adds a new PondChannel to this path on this endpoint
      * @param path - The path to add the channel to
@@ -241,7 +241,7 @@ export declare class Channel<EventType extends PondEventMap = PondEventMap, Pres
     updatePresence (userId: string, presence: PresenceType): void;
 }
 
-declare class JoinRequest<Path extends string, PresenceType extends PondPresence = PondPresence, AssignType extends PondAssigns = PondAssigns> extends AbstractRequest<Path, PresenceType, AssignType> {
+export declare class JoinRequest<Path extends string, PresenceType extends PondPresence = PondPresence, AssignType extends PondAssigns = PondAssigns> extends AbstractRequest<Path, PresenceType, AssignType> {
     joinParams: JoinParams;
 
     user: UserData<PresenceType, AssignType>;
@@ -249,7 +249,7 @@ declare class JoinRequest<Path extends string, PresenceType extends PondPresence
     channel: Channel;
 }
 
-declare class JoinResponse<EventType extends PondEventMap = PondEventMap, PresenceType extends PondPresence = PondPresence, AssignType extends PondAssigns = PondAssigns> {
+export declare class JoinResponse<EventType extends PondEventMap = PondEventMap, PresenceType extends PondPresence = PondPresence, AssignType extends PondAssigns = PondAssigns> {
     /**
      * @desc Whether the server has responded to the request
      */
@@ -305,7 +305,7 @@ declare class JoinResponse<EventType extends PondEventMap = PondEventMap, Presen
     trackPresence (presence: PresenceType): JoinResponse;
 }
 
-declare class ConnectionResponse {
+export declare class ConnectionResponse {
     /**
      * @desc Whether the server has responded to the request
      */