@eleven-am/pondsocket-nest 0.0.11 → 0.0.13

package/context/context.js

@@ -43,7 +43,7 @@ class Context {
         return (_d = (_b = (_a = this.joinRequest) === null || _a === void 0 ? void 0 : _a.presence) !== null && _b !== void 0 ? _b : (_c = this.eventRequest) === null || _c === void 0 ? void 0 : _c.presence) !== null && _d !== void 0 ? _d : null;
     }
     get user() {
-        var _a, _b, _c, _d;
+        var _a, _b;
         if (this.connection) {
             const user = {
                 id: this.connection.id,
@@ -54,13 +54,13 @@ class Context {
         }
         else if (this.leaveEvent) {
             const user = {
-                id: this.leaveEvent.userId,
+                id: this.leaveEvent.id,
                 assigns: this.leaveEvent.assigns,
                 presence: {},
             };
             return user;
         }
-        return (_d = (_b = (_a = this.joinRequest) === null || _a === void 0 ? void 0 : _a.user) !== null && _b !== void 0 ? _b : (_c = this.eventRequest) === null || _c === void 0 ? void 0 : _c.user) !== null && _d !== void 0 ? _d : null;
+        return (_b = (_a = this.joinRequest) === null || _a === void 0 ? void 0 : _a.user) !== null && _b !== void 0 ? _b : this.eventRequest.user;
     }
     get channel() {
         var _a, _b, _c, _d, _e, _f;

package/index.d.ts

@@ -35,7 +35,6 @@ type NestFuncType<Event extends string, Payload extends PondMessage, Presence ex
     broadcast?: Event;
     assigns?: Assigns;
     presence?: Presence;
-    updatePresence?: Presence;
 } & Payload;
 
 type NestReturnType<EventType extends PondEvenType, Event extends keyof EventType, Presence extends PondPresence = PondPresence, Assigns extends PondAssigns = PondAssigns> =
@@ -45,16 +44,16 @@ type NestReturnType<EventType extends PondEvenType, Event extends keyof EventTyp
                 never :
         never;
 
-declare class Context<Path extends string = string, Event extends PondEvenType = PondEvenType> {
+declare class Context<Path extends string = string, Event extends PondEvenType = PondEvenType, Presence extends PondPresence = PondPresence, Assigns extends PondAssigns = PondAssigns> {
     /**
      * @desc The request object, available in onJoin handlers
      */
-    get joinRequest (): JoinRequest<Path> | null;
+    get joinRequest (): JoinRequest<Path, Presence, Assigns> | null;
 
     /**
      * @desc The request object, available in onEvent handlers
      */
-    get eventRequest (): EventRequest<Path> | null;
+    get eventRequest (): EventRequest<Path, Presence, Assigns> | null;
 
     /**
      * @desc The request object, available in onConnection handlers
@@ -69,12 +68,12 @@ declare class Context<Path extends string = string, Event extends PondEvenType =
     /**
      * @desc The response object, available in onJoin handlers
      */
-    get joinResponse (): JoinResponse<Event> | null;
+    get joinResponse (): JoinResponse<Event, Presence, Assigns> | null;
 
     /**
      * @desc The response object, available in onEvent handlers
      */
-    get eventResponse (): EventResponse<Event> | null;
+    get eventResponse (): EventResponse<Event, Presence, Assigns> | null;
 
     /**
      * @desc The response object, available in onConnection handlers
@@ -84,17 +83,17 @@ declare class Context<Path extends string = string, Event extends PondEvenType =
     /**
      * @desc The presence object, available on the channel
      */
-    get presence<Presence extends PondPresence = PondPresence> (): Record<string, Presence> | null;
+    get presence (): Record<string, Presence> | null;
 
     /**
      * @desc The user object, assigned to the current user
      */
-    get user<Presence extends PondPresence = PondPresence, Assigns extends PondAssigns = PondAssigns> (): UserData<Presence, Assigns> | null;
+    get user (): UserData<Presence, Assigns> | null;
 
     /**
      * @desc The channel object handling the request
      */
-    get channel<EventType extends PondEvenType = PondEvenType, Presence extends PondPresence = PondPresence, Assigns extends PondAssigns = PondAssigns> (): PondChannel<EventType, Presence, Assigns> | null;
+    get channel (): PondChannel<Event, Presence, Assigns> | null;
 
     /**
      * @desc The event object of the current the request

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eleven-am/pondsocket-nest",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "PondSocket is a fast simple socket server",
   "keywords": [
     "socket",
@@ -28,7 +28,7 @@
     "pipeline": "npm run lint && npm run build && npm run push"
   },
   "dependencies": {
-    "@eleven-am/pondsocket": "^0.1.131"
+    "@eleven-am/pondsocket": "^0.1.133"
   },
   "devDependencies": {
     "@nestjs/common": "^10.3.0",

package/performers/action.js

@@ -49,10 +49,11 @@ function performAction(instance, moduleRef, originalMethod, propertyKey, leaveEv
         }
         const context = new context_1.Context(req, res, instance, propertyKey);
         const channel = context.channel;
+        const socketId = context.user.id;
         const canProceed = yield (0, guards_1.performGuards)(moduleRef, context);
         if (canProceed) {
             const data = yield originalMethod.apply(instance, retrieveParameters(context));
-            (0, response_1.performResponse)(data, channel, response);
+            (0, response_1.performResponse)(data, socketId, channel, response);
         }
         else if (response) {
             response.reject('Unauthorized', 401);

package/performers/response.js

@@ -18,11 +18,11 @@ function isNotEmpty(value) {
         value !== '' &&
         Object.keys(value).length !== 0;
 }
-function performResponse(data, channel, response) {
+function performResponse(data, socketId, channel, response) {
     if (response && response.hasResponded || !isNotEmpty(data)) {
         return;
     }
-    const { event, presence, updatePresence, assigns, broadcast } = data, rest = __rest(data, ["event", "presence", "updatePresence", "assigns", "broadcast"]);
+    const { event, presence, assigns, broadcast } = data, rest = __rest(data, ["event", "presence", "assigns", "broadcast"]);
     if (response) {
         if (event && typeof event === 'string' && isNotEmpty(rest)) {
             if ('sendOnly' in response) {
@@ -38,15 +38,18 @@ function performResponse(data, channel, response) {
         if (broadcast && typeof broadcast === 'string' && isNotEmpty(rest) && 'broadcast' in response) {
             response.broadcast(broadcast, rest);
         }
-        if ('trackPresence' in response && presence) {
-            response.trackPresence(presence);
-        }
-        else if ('updatePresence' in response && updatePresence) {
-            response.updatePresence(updatePresence);
-        }
     }
     else if (channel && broadcast && typeof broadcast === 'string' && isNotEmpty(rest)) {
         channel.broadcastMessage(broadcast, rest);
     }
+    if (presence && isNotEmpty(presence) && channel) {
+        const existingPresence = channel.getPresence()[socketId];
+        if (existingPresence) {
+            channel.updatePresence(socketId, presence);
+        }
+        else if (response) {
+            channel.trackPresence(socketId, presence);
+        }
+    }
 }
 exports.performResponse = performResponse;