@eleven-am/pondsocket 0.1.115 → 0.1.118

package/channel/channel.js

@@ -21,15 +21,53 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var _ChannelEngine_instances, _ChannelEngine_receiver, _ChannelEngine_presenceEngine, _ChannelEngine_users, _ChannelEngine_parentEngine, _ChannelEngine_subscribe, _ChannelEngine_getUsersFromRecipients, _Channel_engine;
+var _Channel_engine, _ChannelEngine_instances, _ChannelEngine_receiver, _ChannelEngine_presenceEngine, _ChannelEngine_users, _ChannelEngine_parentEngine, _ChannelEngine_subscribe, _ChannelEngine_getUsersFromRecipients;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Channel = exports.ChannelEngine = void 0;
+exports.ChannelEngine = exports.Channel = void 0;
 const eventRequest_1 = require("./eventRequest");
 const eventResponse_1 = require("./eventResponse");
 const enums_1 = require("../enums");
 const pondError_1 = require("../errors/pondError");
 const presence_1 = require("../presence/presence");
 const subject_1 = require("../subjects/subject");
+class Channel {
+    constructor(engine) {
+        _Channel_engine.set(this, void 0);
+        __classPrivateFieldSet(this, _Channel_engine, engine, "f");
+    }
+    get name() {
+        return __classPrivateFieldGet(this, _Channel_engine, "f").name;
+    }
+    getAssigns() {
+        return __classPrivateFieldGet(this, _Channel_engine, "f").getAssigns();
+    }
+    getUserData(userId) {
+        return __classPrivateFieldGet(this, _Channel_engine, "f").getUserData(userId);
+    }
+    broadcastMessage(event, payload) {
+        __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage(enums_1.SystemSender.CHANNEL, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.BROADCAST, event, payload);
+    }
+    sendToUser(userId, event, payload) {
+        __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage(enums_1.SystemSender.CHANNEL, [userId], enums_1.ServerActions.BROADCAST, event, payload);
+    }
+    sendToUsers(userIds, event, payload) {
+        __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage(enums_1.SystemSender.CHANNEL, userIds, enums_1.ServerActions.BROADCAST, event, payload);
+    }
+    evictUser(userId, reason) {
+        __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").presenceEngine.trackPresence(userId, presence);
+    }
+    removePresence(userId) {
+        __classPrivateFieldGet(this, _Channel_engine, "f").presenceEngine.removePresence(userId);
+    }
+    updatePresence(userId, presence) {
+        __classPrivateFieldGet(this, _Channel_engine, "f").presenceEngine.updatePresence(userId, presence);
+    }
+}
+exports.Channel = Channel;
+_Channel_engine = new WeakMap();
 class ChannelEngine {
     constructor(name, parent) {
         _ChannelEngine_instances.add(this);
@@ -74,6 +112,7 @@ class ChannelEngine {
                 __classPrivateFieldGet(this, _ChannelEngine_parentEngine, "f").leaveCallback({
                     userId,
                     assigns: user,
+                    channel: new Channel(this),
                 });
             }
             if (__classPrivateFieldGet(this, _ChannelEngine_users, "f").size === 0) {
@@ -247,41 +286,3 @@ _ChannelEngine_receiver = new WeakMap(), _ChannelEngine_presenceEngine = new Wea
     }
     return users;
 };
-class Channel {
-    constructor(engine) {
-        _Channel_engine.set(this, void 0);
-        __classPrivateFieldSet(this, _Channel_engine, engine, "f");
-    }
-    get name() {
-        return __classPrivateFieldGet(this, _Channel_engine, "f").name;
-    }
-    getAssigns() {
-        return __classPrivateFieldGet(this, _Channel_engine, "f").getAssigns();
-    }
-    getUserData(userId) {
-        return __classPrivateFieldGet(this, _Channel_engine, "f").getUserData(userId);
-    }
-    broadcastMessage(event, payload) {
-        __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage(enums_1.SystemSender.CHANNEL, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.BROADCAST, event, payload);
-    }
-    sendToUser(userId, event, payload) {
-        __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage(enums_1.SystemSender.CHANNEL, [userId], enums_1.ServerActions.BROADCAST, event, payload);
-    }
-    sendToUsers(userIds, event, payload) {
-        __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage(enums_1.SystemSender.CHANNEL, userIds, enums_1.ServerActions.BROADCAST, event, payload);
-    }
-    evictUser(userId, reason) {
-        __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").presenceEngine.trackPresence(userId, presence);
-    }
-    removePresence(userId) {
-        __classPrivateFieldGet(this, _Channel_engine, "f").presenceEngine.removePresence(userId);
-    }
-    updatePresence(userId, presence) {
-        __classPrivateFieldGet(this, _Channel_engine, "f").presenceEngine.updatePresence(userId, presence);
-    }
-}
-exports.Channel = Channel;
-_Channel_engine = new WeakMap();

package/nest.js

@@ -263,25 +263,35 @@ class Context {
         return (_a = this.data[key]) !== null && _a !== void 0 ? _a : null;
     }
 }
-function manageResponse(data, response) {
-    if (response.hasResponded || !isNotEmpty(data)) {
+function manageResponse(data, channel, clientId, response) {
+    if (response && response.hasResponded || !isNotEmpty(data)) {
         return;
     }
     const { event, presence, updatePresence, assigns, broadcast } = data, rest = __rest(data, ["event", "presence", "updatePresence", "assigns", "broadcast"]);
-    if (event && typeof event === 'string' && isNotEmpty(rest)) {
-        response.send(event, rest, assigns);
-    }
-    else if (isNotEmpty(assigns)) {
-        response.accept(assigns);
-    }
-    if (broadcast && typeof broadcast === 'string' && isNotEmpty(rest) && 'broadcast' in response) {
-        response.broadcast(broadcast, rest);
-    }
-    if ('trackPresence' in response && presence) {
-        response.trackPresence(presence);
+    if (response) {
+        if (event && typeof event === 'string' && isNotEmpty(rest)) {
+            if (clientId && response instanceof eventResponse_1.EventResponse && !isNotEmpty(assigns)) {
+                response.sendToUsers(event, rest, [clientId]);
+            }
+            else {
+                response.send(event, rest, assigns);
+            }
+        }
+        else if (isNotEmpty(assigns)) {
+            response.accept(assigns);
+        }
+        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 ('updatePresence' in response && updatePresence) {
-        response.updatePresence(updatePresence);
+    else if (channel && broadcast && typeof broadcast === 'string' && isNotEmpty(rest)) {
+        channel.broadcastMessage(broadcast, rest);
     }
 }
 function manageError(error, response) {
@@ -527,29 +537,43 @@ function GetChannel() {
     })(null);
 }
 exports.GetChannel = GetChannel;
-function manageAction(instance, moduleRef, originalMethod, propertyKey, request, response) {
+function manageAction(instance, moduleRef, originalMethod, propertyKey, leaveEvent, request, response) {
     return __awaiter(this, void 0, void 0, function* () {
         const req = {};
         const res = {};
-        if (request instanceof joinRequest_1.JoinRequest && response instanceof joinResponse_1.JoinResponse) {
-            req.joinRequest = request;
-            res.joinResponse = response;
-        }
-        else if (request instanceof eventRequest_1.EventRequest && response instanceof eventResponse_1.EventResponse) {
-            req.eventRequest = request;
-            res.eventResponse = response;
+        let channel = null;
+        let clientId = null;
+        if (request && response) {
+            if (request instanceof joinRequest_1.JoinRequest && response instanceof joinResponse_1.JoinResponse) {
+                channel = request.channel;
+                clientId = request.user.id;
+                req.joinRequest = request;
+                res.joinResponse = response;
+            }
+            else if (request instanceof eventRequest_1.EventRequest && response instanceof eventResponse_1.EventResponse) {
+                channel = request.channel;
+                clientId = request.user.id;
+                req.eventRequest = request;
+                res.eventResponse = response;
+            }
+            else if ('headers' in request && response instanceof response_1.ConnectionResponse) {
+                clientId = request.id;
+                req.connection = request;
+                res.connection = response;
+            }
         }
-        else if ('headers' in request && response instanceof response_1.ConnectionResponse) {
-            req.connection = request;
-            res.connection = response;
+        else if (leaveEvent) {
+            clientId = leaveEvent.userId;
+            channel = leaveEvent.channel;
+            req.leveeEvent = leaveEvent;
         }
         const context = new Context(req, res, instance, propertyKey);
         const canProceed = yield resolveGuards(moduleRef, context);
         if (canProceed) {
             const data = yield originalMethod.apply(instance, resolveParameters(context));
-            manageResponse(data, response);
+            manageResponse(data, channel, clientId, response);
         }
-        else {
+        else if (response) {
             response.reject('Unauthorized', 401);
         }
     });
@@ -560,7 +584,7 @@ function OnConnectionRequest() {
         const { set } = manageConnectionHandlers(target);
         set('', (instance, moduleRef, request, response) => __awaiter(this, void 0, void 0, function* () {
             try {
-                yield manageAction(instance, moduleRef, originalMethod, propertyKey, request, response);
+                yield manageAction(instance, moduleRef, originalMethod, propertyKey, null, request, response);
             }
             catch (error) {
                 manageError(error, response);
@@ -575,7 +599,7 @@ function OnJoinRequest() {
         const { set } = manageJoinHandlers(target);
         set('', (instance, moduleRef, request, response) => __awaiter(this, void 0, void 0, function* () {
             try {
-                yield manageAction(instance, moduleRef, originalMethod, propertyKey, request, response);
+                yield manageAction(instance, moduleRef, originalMethod, propertyKey, null, request, response);
             }
             catch (error) {
                 manageError(error, response);
@@ -590,7 +614,7 @@ function OnEvent(event = '*') {
         const { set } = manageEventHandlers(target);
         set(event, (instance, moduleRef, request, response) => __awaiter(this, void 0, void 0, function* () {
             try {
-                yield manageAction(instance, moduleRef, originalMethod, propertyKey, request, response);
+                yield manageAction(instance, moduleRef, originalMethod, propertyKey, null, request, response);
             }
             catch (error) {
                 manageError(error, response);
@@ -603,11 +627,8 @@ function OnLeaveEvent() {
     return (target, propertyKey, descriptor) => {
         const originalMethod = descriptor.value;
         const { set } = manageOnLeaveHandlers(target);
-        set('', (instance, _, event) => __awaiter(this, void 0, void 0, function* () {
-            const context = new Context({
-                leveeEvent: event,
-            }, {}, instance, propertyKey);
-            yield originalMethod.apply(instance, resolveParameters(context));
+        set('', (instance, moduleRef, event) => __awaiter(this, void 0, void 0, function* () {
+            yield manageAction(instance, moduleRef, originalMethod, propertyKey, event);
         }));
     };
 }

package/package.json

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

package/types.d.ts

@@ -84,6 +84,7 @@ type IncomingConnection<Path> = EventParams<Path> & {
 interface LeaveEvent {
     userId: string;
     assigns: PondAssigns;
+    channel: Channel;
 }
 
 type LeaveCallback = (event: LeaveEvent) => void;