@eleven-am/pondsocket 0.1.70 → 0.1.72

package/README.md

@@ -259,7 +259,7 @@ profanityChannel.onEvent('message', (req, res) => {
         res.accept();
     }
 
-    // for more complete access to the channel, you can use the client object
+    // for more complete access to the channel, you can use the channel instance
     // const channel = req.channel;
 });
 
@@ -350,7 +350,7 @@ The `JoinRequest` class represents the request object when a client joins a chan
 
 - `user: UserData`: The user data associated with the client.
 
-- `client: Client`: The Client instance associated with the request.
+- `channel: Channel`: The Channel instance associated with the request.
 
 ### JoinResponse
 
@@ -400,7 +400,7 @@ The `EventRequest` class represents the request object when an event is received
 
 - `user: UserData`: The user data associated with the client.
 
-- `client: Client`: The Client instance associated with the request.
+- `channel: Channel`: The Channel instance associated with the request.
 
 ### EventResponse
 
@@ -472,7 +472,7 @@ The `PondClient` class represents a client that connects to the PondSocket serve
 
 - `disconnect(): void`: Disconnects the socket.
 
-- `createChannel(name: string, params?: JoinParams): Channel`: Creates a channel with the given name and optional join parameters.
+- `createChannel(name: string, params?: JoinParams): ClientChannel`: Creates a channel with the given name and optional join parameters.
 
 - `onConnectionChange(callback: (state: boolean) => void): Unsubscribe`: Subscribes to the connection state changes and calls the provided callback when the state changes.
 

package/channel/channel.js

@@ -91,7 +91,8 @@ class ChannelEngine {
      */
     kickUser(userId, reason) {
         this.sendMessage(enums_1.SystemSender.CHANNEL, [userId], enums_1.ServerActions.SYSTEM, 'kicked_out', {
-            message: reason !== null && reason !== void 0 ? reason : 'You have been kicked out of the channel',
+            message: reason,
+            code: 403,
         });
         this.removeUser(userId);
         this.sendMessage(enums_1.SystemSender.CHANNEL, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.SYSTEM, 'kicked', {
@@ -197,24 +198,14 @@ class ChannelEngine {
             });
         });
     }
-    /**
-     * @desc Begins tracking a user's presence
-     * @param userId - The id of the user to track
-     * @param presence - The initial presence of the user
-     */
-    trackPresence(userId, presence) {
-        var _a;
-        if (!__classPrivateFieldGet(this, _ChannelEngine_users, "f").has(userId)) {
-            throw new pondError_1.ChannelError(`ChannelEngine: User with id ${userId} does not exist in channel ${this.name}`, 404, this.name);
-        }
-        __classPrivateFieldSet(this, _ChannelEngine_presenceEngine, (_a = __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) !== null && _a !== void 0 ? _a : new presence_1.PresenceEngine(this), "f");
-        __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").trackPresence(userId, presence);
-    }
     /**
      * @desc Gets the presence engine for the channel
      */
     get presenceEngine() {
-        return __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f");
+        var _a;
+        const presenceEngine = (_a = __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) !== null && _a !== void 0 ? _a : new presence_1.PresenceEngine(this);
+        __classPrivateFieldSet(this, _ChannelEngine_presenceEngine, presenceEngine, "f");
+        return presenceEngine;
     }
     /**
      * @desc Gets the number of users in the channel
@@ -283,15 +274,13 @@ class Channel {
         __classPrivateFieldGet(this, _Channel_engine, "f").kickUser(userId, reason !== null && reason !== void 0 ? reason : 'You have been banned from the channel');
     }
     trackPresence(userId, presence) {
-        __classPrivateFieldGet(this, _Channel_engine, "f").trackPresence(userId, presence);
+        __classPrivateFieldGet(this, _Channel_engine, "f").presenceEngine.trackPresence(userId, presence);
     }
     removePresence(userId) {
-        var _a;
-        (_a = __classPrivateFieldGet(this, _Channel_engine, "f").presenceEngine) === null || _a === void 0 ? void 0 : _a.removePresence(userId);
+        __classPrivateFieldGet(this, _Channel_engine, "f").presenceEngine.removePresence(userId);
     }
     updatePresence(userId, presence) {
-        var _a;
-        (_a = __classPrivateFieldGet(this, _Channel_engine, "f").presenceEngine) === null || _a === void 0 ? void 0 : _a.updatePresence(userId, presence);
+        __classPrivateFieldGet(this, _Channel_engine, "f").presenceEngine.updatePresence(userId, presence);
     }
 }
 exports.Channel = Channel;

package/channel/eventResponse.js

@@ -27,6 +27,12 @@ class EventResponse extends abstractResponse_1.PondResponse {
         __classPrivateFieldSet(this, _EventResponse_engine, engine, "f");
         __classPrivateFieldSet(this, _EventResponse_executed, false, "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
@@ -94,8 +100,8 @@ class EventResponse extends abstractResponse_1.PondResponse {
      * @param presence - the initial presence data
      * @param userId - the id of the user to track
      */
-    trackPresence(presence, userId) {
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").trackPresence(userId || __classPrivateFieldGet(this, _EventResponse_event, "f").sender, presence);
+    trackPresence(presence, userId = __classPrivateFieldGet(this, _EventResponse_event, "f").sender) {
+        __classPrivateFieldGet(this, _EventResponse_engine, "f").presenceEngine.trackPresence(userId, presence);
         return this;
     }
     /**
@@ -103,19 +109,16 @@ class EventResponse extends abstractResponse_1.PondResponse {
      * @param presence - the updated presence data
      * @param userId - the id of the user to update
      */
-    updatePresence(presence, userId) {
-        var _a;
-        (_a = __classPrivateFieldGet(this, _EventResponse_engine, "f").presenceEngine) === null || _a === void 0 ? void 0 : _a.updatePresence(userId || __classPrivateFieldGet(this, _EventResponse_event, "f").sender, presence);
+    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
      */
-    unTrackPresence(userId) {
-        var _a;
-        userId = userId || __classPrivateFieldGet(this, _EventResponse_event, "f").sender;
-        (_a = __classPrivateFieldGet(this, _EventResponse_engine, "f").presenceEngine) === null || _a === void 0 ? void 0 : _a.removePresence(userId);
+    unTrackPresence(userId = __classPrivateFieldGet(this, _EventResponse_event, "f").sender) {
+        __classPrivateFieldGet(this, _EventResponse_engine, "f").presenceEngine.removePresence(userId);
         return this;
     }
     /**
@@ -123,8 +126,8 @@ class EventResponse extends abstractResponse_1.PondResponse {
      * @param reason - the reason for the eviction
      * @param userId - the id of the user to evict,
      */
-    evictUser(reason, userId) {
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").kickUser(userId || __classPrivateFieldGet(this, _EventResponse_event, "f").sender, reason);
+    evictUser(reason, userId = __classPrivateFieldGet(this, _EventResponse_event, "f").sender) {
+        __classPrivateFieldGet(this, _EventResponse_engine, "f").kickUser(userId, reason);
     }
     /**
      * @desc Closes the channel from the server side for all clients

package/endpoint/response.js

@@ -29,6 +29,12 @@ class ConnectionResponse extends abstractResponse_1.PondResponse {
         __classPrivateFieldSet(this, _ConnectionResponse_clientId, clientId, "f");
         __classPrivateFieldSet(this, _ConnectionResponse_executed, false, "f");
     }
+    /**
+     * @desc Whether the server has responded to the request
+     */
+    get hasResponded() {
+        return __classPrivateFieldGet(this, _ConnectionResponse_executed, "f");
+    }
     /**
      * @desc Accepts the request and optionally assigns data to the client
      * @param assigns - the data to assign to the client

package/lobby/joinResponse.js

@@ -27,6 +27,12 @@ class JoinResponse extends abstractResponse_1.PondResponse {
         __classPrivateFieldSet(this, _JoinResponse_engine, engine, "f");
         __classPrivateFieldSet(this, _JoinResponse_executed, false, "f");
     }
+    /**
+     * @desc Whether the server has responded to the request
+     */
+    get hasResponded() {
+        return __classPrivateFieldGet(this, _JoinResponse_executed, "f");
+    }
     /**
      * @desc Accepts the request and optionally assigns data to the client
      * @param assigns - the data to assign to the client
@@ -110,7 +116,7 @@ class JoinResponse extends abstractResponse_1.PondResponse {
      * @param presence - the presence data to track
      */
     trackPresence(presence) {
-        __classPrivateFieldGet(this, _JoinResponse_engine, "f").trackPresence(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, presence);
+        __classPrivateFieldGet(this, _JoinResponse_engine, "f").presenceEngine.trackPresence(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, presence);
         return this;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eleven-am/pondsocket",
-  "version": "0.1.70",
+  "version": "0.1.72",
   "description": "PondSocket is a fast simple socket server",
   "keywords": [
     "socket",
@@ -30,22 +30,22 @@
   },
   "dependencies": {
     "websocket": "^1.0.34",
-    "ws": "^8.13.0"
+    "ws": "^8.15.0"
   },
   "devDependencies": {
-    "@types/express": "^4.17.17",
-    "@types/jest": "^29.5.3",
-    "@types/node": "^20.4.4",
-    "@types/websocket": "^1.0.5",
-    "@types/ws": "^8.5.5",
-    "@typescript-eslint/eslint-plugin": "^6.1.0",
-    "eslint": "^8.45.0",
+    "@types/express": "^4.17.21",
+    "@types/jest": "^29.5.11",
+    "@types/node": "^20.10.4",
+    "@types/websocket": "^1.0.10",
+    "@types/ws": "^8.5.10",
+    "@typescript-eslint/eslint-plugin": "^6.13.2",
+    "eslint": "^8.55.0",
     "eslint-plugin-file-progress": "^1.3.0",
-    "eslint-plugin-import": "^2.27.5",
-    "jest": "^29.6.1",
+    "eslint-plugin-import": "^2.29.0",
+    "jest": "^29.7.0",
     "superwstest": "^2.0.3",
     "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.1.6"
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3"
   }
 }

package/types.d.ts

@@ -85,6 +85,11 @@ declare class AbstractRequest<Path extends string> {
 }
 
 declare abstract class PondResponse {
+    /**
+     * @desc Whether the server has responded to the request
+     */
+    public abstract hasResponded: boolean;
+
     /**
      * @desc Rejects the request with the given error message
      * @param message - the error message
@@ -115,6 +120,11 @@ declare class EventRequest<Path extends string> extends AbstractRequest<Path> {
 }
 
 declare class EventResponse extends PondResponse {
+    /**
+     * @desc Whether the server has responded to the request
+     */
+    hasResponded: boolean;
+
     /**
      * @desc Accepts the request and optionally assigns data to the client
      * @param assigns - the data to assign to the client
@@ -396,6 +406,11 @@ declare class JoinRequest<Path extends string> extends AbstractRequest<Path> {
 }
 
 declare class JoinResponse extends PondResponse {
+    /**
+     * @desc Whether the server has responded to the request
+     */
+    hasResponded: boolean;
+
     /**
      * @desc Accepts the request and optionally assigns data to the client
      * @param assigns - the data to assign to the client
@@ -447,6 +462,11 @@ declare class JoinResponse extends PondResponse {
 }
 
 declare class ConnectionResponse extends PondResponse {
+    /**
+     * @desc Whether the server has responded to the request
+     */
+    hasResponded: boolean;
+
     /**
      * @desc Accepts the request and optionally assigns data to the client
      * @param assigns - the data to assign to the client