feat: new listener interface

.github/workflows/run-tests.yml

@@ -53,4 +53,4 @@ jobs:
     needs: [tests]
     steps:
       - name: Tests summary
-        run: echo -e "\033[38;2;95;215;0m\033[1mAll tests successfully passed"
+        run: echo -e "\033[38;2;95;215;0m\033[1mAll tests successfully passed"

lib/core/components/eventEmitter.js

@@ -28,6 +28,8 @@ var EventEmitter = /** @class */ (function () {
         this.modules = modules;
         this.listenerManager = listenerManager;
         this.getFileUrl = getFileUrl;
+        this._channelListenerMap = new Map();
+        this._groupListenerMap = new Map();
         if (modules.cryptoModule)
             this._decoder = new TextDecoder();
     }
@@ -62,7 +64,12 @@ var EventEmitter = /** @class */ (function () {
             if (e.payload.timeout) {
                 announce.timeout = e.payload.timeout;
             }
+            // deprecated -->
+            announce.actualChannel = subscriptionMatch != null ? channel : null;
+            announce.subscribedChannel = subscriptionMatch != null ? subscriptionMatch : channel;
+            // <-- deprecated
             this.listenerManager.announcePresence(announce);
+            this._announce('presence', announce, announce.channel, announce.subscription);
         }
         else if (e.messageType === 1) {
             var announce = {};
@@ -77,6 +84,7 @@ var EventEmitter = /** @class */ (function () {
             }
             announce.message = e.payload;
             this.listenerManager.announceSignal(announce);
+            this._announce('signal', announce, announce.channel, announce.subscription);
         }
         else if (e.messageType === 2) {
             var announce = {};
@@ -95,20 +103,27 @@ var EventEmitter = /** @class */ (function () {
                 data: e.payload.data,
             };
             this.listenerManager.announceObjects(announce);
+            this._announce('objects', announce, announce.channel, announce.subscription);
             if (e.payload.type === 'uuid') {
                 var eventData = this._renameChannelField(announce);
-                this.listenerManager.announceUser(__assign(__assign({}, eventData), { message: __assign(__assign({}, eventData.message), { event: this._renameEvent(eventData.message.event), type: 'user' }) }));
+                var userEvent = __assign(__assign({}, eventData), { message: __assign(__assign({}, eventData.message), { event: this._renameEvent(eventData.message.event), type: 'user' }) });
+                this.listenerManager.announceUser(userEvent);
+                this._announce('user', userEvent, announce.channel, announce.subscription);
             }
             else if (message.payload.type === 'channel') {
                 var eventData = this._renameChannelField(announce);
-                this.listenerManager.announceSpace(__assign(__assign({}, eventData), { message: __assign(__assign({}, eventData.message), { event: this._renameEvent(eventData.message.event), type: 'space' }) }));
+                var spaceEvent = __assign(__assign({}, eventData), { message: __assign(__assign({}, eventData.message), { event: this._renameEvent(eventData.message.event), type: 'space' }) });
+                this.listenerManager.announceSpace(spaceEvent);
+                this._announce('space', spaceEvent, announce.channel, announce.subscription);
             }
             else if (message.payload.type === 'membership') {
                 var eventData = this._renameChannelField(announce);
                 var _a = eventData.message.data, user = _a.uuid, space = _a.channel, membershipData = __rest(_a, ["uuid", "channel"]);
                 membershipData.user = user;
                 membershipData.space = space;
-                this.listenerManager.announceMembership(__assign(__assign({}, eventData), { message: __assign(__assign({}, eventData.message), { event: this._renameEvent(eventData.message.event), data: membershipData }) }));
+                var membershipEvent = __assign(__assign({}, eventData), { message: __assign(__assign({}, eventData.message), { event: this._renameEvent(eventData.message.event), data: membershipData }) });
+                this.listenerManager.announceMembership(membershipEvent);
+                this._announce('membership', membershipEvent, announce.channel, announce.subscription);
             }
         }
         else if (e.messageType === 3) {
@@ -126,6 +141,7 @@ var EventEmitter = /** @class */ (function () {
             };
             announce.event = e.payload.event;
             this.listenerManager.announceMessageAction(announce);
+            this._announce('messageAction', announce, announce.channel, announce.subscription);
         }
         else if (e.messageType === 4) {
             var announce = {};
@@ -163,6 +179,7 @@ var EventEmitter = /** @class */ (function () {
                 }),
             };
             this.listenerManager.announceFile(announce);
+            this._announce('file', announce, announce.channel, announce.subscription);
         }
         else {
             var announce = {};
@@ -196,9 +213,59 @@ var EventEmitter = /** @class */ (function () {
             else {
                 announce.message = e.payload;
             }
+            // deprecated -->
+            announce.actualChannel = subscriptionMatch != null ? channel : null;
+            announce.subscribedChannel = subscriptionMatch != null ? subscriptionMatch : channel;
+            // <-- deprecated
             this.listenerManager.announceMessage(announce);
+            this._announce('message', announce, announce.channel, announce.subscription);
         }
     };
+    EventEmitter.prototype.addListener = function (l, channels, groups) {
+        var _this = this;
+        if (!(channels && groups)) {
+            this.listenerManager.addListener(l);
+        }
+        else {
+            channels === null || channels === void 0 ? void 0 : channels.forEach(function (c) {
+                if (_this._channelListenerMap[c]) {
+                    if (!_this._channelListenerMap[c].includes(l))
+                        _this._channelListenerMap[c].push(l);
+                }
+                else {
+                    _this._channelListenerMap[c] = [l];
+                }
+            });
+            groups === null || groups === void 0 ? void 0 : groups.forEach(function (g) {
+                if (_this._groupListenerMap[g]) {
+                    if (!_this._groupListenerMap[g].includes(l))
+                        _this._groupListenerMap[g].push(l);
+                }
+                else {
+                    _this._groupListenerMap[g] = [l];
+                }
+            });
+        }
+    };
+    EventEmitter.prototype.removeListener = function (listener, channels, groups) {
+        var _this = this;
+        if (!(channels && groups)) {
+            this.listenerManager.removeListener(listener);
+        }
+        else {
+            channels === null || channels === void 0 ? void 0 : channels.forEach(function (c) {
+                var _a;
+                _this._channelListenerMap[c] = (_a = _this._channelListenerMap[c]) === null || _a === void 0 ? void 0 : _a.filter(function (l) { return l !== listener; });
+            });
+            groups === null || groups === void 0 ? void 0 : groups.forEach(function (g) {
+                var _a;
+                _this._groupListenerMap[g] = (_a = _this._groupListenerMap[g]) === null || _a === void 0 ? void 0 : _a.filter(function (l) { return l !== listener; });
+            });
+        }
+    };
+    EventEmitter.prototype.removeAllListeners = function () {
+        this.listenerManager.removeAllListeners();
+    };
     EventEmitter.prototype._renameEvent = function (e) {
         return e === 'set' ? 'updated' : 'removed';
     };
@@ -207,6 +274,11 @@ var EventEmitter = /** @class */ (function () {
         eventData.spaceId = channel;
         return eventData;
     };
+    EventEmitter.prototype._announce = function (type, event, channel, group) {
+        var _a, _b;
+        (_a = this._channelListenerMap[channel]) === null || _a === void 0 ? void 0 : _a.forEach(function (l) { return l[type] && l[type](event); });
+        (_b = this._groupListenerMap[group]) === null || _b === void 0 ? void 0 : _b.forEach(function (l) { return l[type] && l[type](event); });
+    };
     return EventEmitter;
 }());
 exports.default = EventEmitter;