Fix missing presence events on subscription

dist/web/pubnub.js

@@ -6403,6 +6403,7 @@
 	     * @param event - Received real-time event.
 	     */
 	    emitEvent(event) {
+	        var _a;
 	        if (event.type === PubNubEventType.Message) {
 	            this.listenerManager.announceMessage(event.data);
 	            this.announce('message', event.data, event.data.channel, event.data.subscription);
@@ -6413,7 +6414,7 @@
 	        }
 	        else if (event.type === PubNubEventType.Presence) {
 	            this.listenerManager.announcePresence(event.data);
-	            this.announce('presence', event.data, event.data.channel, event.data.subscription);
+	            this.announce('presence', event.data, (_a = event.data.subscription) !== null && _a !== void 0 ? _a : event.data.channel, event.data.subscription);
 	        }
 	        else if (event.type === PubNubEventType.AppContext) {
 	            const { data: objectEvent } = event;
@@ -9963,7 +9964,7 @@
 	     * types of events.
 	     */
 	    addListener(listener) {
-	        this.eventEmitter.addListener(listener, this.channelNames.filter((c) => !c.endsWith('-pnpres')), this.groupNames.filter((cg) => !cg.endsWith('-pnpres')));
+	        this.eventEmitter.addListener(listener, this.channelNames, this.groupNames);
 	    }
 	    /**
 	     * Remove events handler.
@@ -10065,7 +10066,7 @@
 	            this.subscriptionList.push(subscription);
 	        });
 	        this.listener = {};
-	        eventEmitter.addListener(this.listener, this.channelNames.filter((c) => !c.endsWith('-pnpres')), this.groupNames.filter((cg) => !cg.endsWith('-pnpres')));
+	        eventEmitter.addListener(this.listener, this.channelNames, this.groupNames);
 	    }
 	    /**
 	     * Add additional entity's subscription to the subscription set.
@@ -10187,7 +10188,7 @@
 	        this.pubnub = pubnub;
 	        this.eventEmitter = eventEmitter;
 	        this.listener = {};
-	        eventEmitter.addListener(this.listener, this.channelNames.filter((c) => !c.endsWith('-pnpres')), this.groupNames.filter((cg) => !cg.endsWith('-pnpres')));
+	        eventEmitter.addListener(this.listener, this.channelNames, this.groupNames);
 	    }
 	    /**
 	     * Merge entities' subscription objects into subscription set.
@@ -10283,9 +10284,12 @@
 	     */
 	    subscription(subscriptionOptions) {
 	        {
+	            const channelGroups = [this.name];
+	            if ((subscriptionOptions === null || subscriptionOptions === void 0 ? void 0 : subscriptionOptions.receivePresenceEvents) && !this.name.endsWith('-pnpres'))
+	                channelGroups.push(`${this.name}-pnpres`);
 	            return new Subscription({
 	                channels: [],
-	                channelGroups: (subscriptionOptions === null || subscriptionOptions === void 0 ? void 0 : subscriptionOptions.receivePresenceEvents) ? [this.name, `${this.name}-pnpres`] : [this.name],
+	                channelGroups,
 	                subscriptionOptions: subscriptionOptions,
 	                eventEmitter: this.eventEmitter,
 	                pubnub: this.pubnub,
@@ -10370,8 +10374,11 @@
 	     */
 	    subscription(subscriptionOptions) {
 	        {
+	            const channels = [this.name];
+	            if ((subscriptionOptions === null || subscriptionOptions === void 0 ? void 0 : subscriptionOptions.receivePresenceEvents) && !this.name.endsWith('-pnpres'))
+	                channels.push(`${this.name}-pnpres`);
 	            return new Subscription({
-	                channels: (subscriptionOptions === null || subscriptionOptions === void 0 ? void 0 : subscriptionOptions.receivePresenceEvents) ? [this.name, `${this.name}-pnpres`] : [this.name],
+	                channels,
 	                channelGroups: [],
 	                subscriptionOptions: subscriptionOptions,
 	                eventEmitter: this.eventEmitter,

lib/core/components/eventEmitter.js

@@ -45,6 +45,7 @@ class EventEmitter {
      * @param event - Received real-time event.
      */
     emitEvent(event) {
+        var _a;
         if (event.type === subscribe_1.PubNubEventType.Message) {
             this.listenerManager.announceMessage(event.data);
             this.announce('message', event.data, event.data.channel, event.data.subscription);
@@ -55,7 +56,7 @@ class EventEmitter {
         }
         else if (event.type === subscribe_1.PubNubEventType.Presence) {
             this.listenerManager.announcePresence(event.data);
-            this.announce('presence', event.data, event.data.channel, event.data.subscription);
+            this.announce('presence', event.data, (_a = event.data.subscription) !== null && _a !== void 0 ? _a : event.data.channel, event.data.subscription);
         }
         else if (event.type === subscribe_1.PubNubEventType.AppContext) {
             const { data: objectEvent } = event;

lib/entities/Channel.js

@@ -34,8 +34,11 @@ class Channel {
      */
     subscription(subscriptionOptions) {
         if (process.env.SUBSCRIBE_EVENT_ENGINE_MODULE !== 'disabled') {
+            const channels = [this.name];
+            if ((subscriptionOptions === null || subscriptionOptions === void 0 ? void 0 : subscriptionOptions.receivePresenceEvents) && !this.name.endsWith('-pnpres'))
+                channels.push(`${this.name}-pnpres`);
             return new Subscription_1.Subscription({
-                channels: (subscriptionOptions === null || subscriptionOptions === void 0 ? void 0 : subscriptionOptions.receivePresenceEvents) ? [this.name, `${this.name}-pnpres`] : [this.name],
+                channels,
                 channelGroups: [],
                 subscriptionOptions: subscriptionOptions,
                 eventEmitter: this.eventEmitter,

lib/entities/ChannelGroup.js

@@ -35,9 +35,12 @@ class ChannelGroup {
      */
     subscription(subscriptionOptions) {
         if (process.env.SUBSCRIBE_EVENT_ENGINE_MODULE !== 'disabled') {
+            const channelGroups = [this.name];
+            if ((subscriptionOptions === null || subscriptionOptions === void 0 ? void 0 : subscriptionOptions.receivePresenceEvents) && !this.name.endsWith('-pnpres'))
+                channelGroups.push(`${this.name}-pnpres`);
             return new Subscription_1.Subscription({
                 channels: [],
-                channelGroups: (subscriptionOptions === null || subscriptionOptions === void 0 ? void 0 : subscriptionOptions.receivePresenceEvents) ? [this.name, `${this.name}-pnpres`] : [this.name],
+                channelGroups,
                 subscriptionOptions: subscriptionOptions,
                 eventEmitter: this.eventEmitter,
                 pubnub: this.pubnub,

lib/entities/SubscribeCapable.js

@@ -82,7 +82,7 @@ class SubscribeCapable {
      * types of events.
      */
     addListener(listener) {
-        this.eventEmitter.addListener(listener, this.channelNames.filter((c) => !c.endsWith('-pnpres')), this.groupNames.filter((cg) => !cg.endsWith('-pnpres')));
+        this.eventEmitter.addListener(listener, this.channelNames, this.groupNames);
     }
     /**
      * Remove events handler.

lib/entities/Subscription.js

@@ -53,7 +53,7 @@ class Subscription extends SubscribeCapable_1.SubscribeCapable {
         this.pubnub = pubnub;
         this.eventEmitter = eventEmitter;
         this.listener = {};
-        eventEmitter.addListener(this.listener, this.channelNames.filter((c) => !c.endsWith('-pnpres')), this.groupNames.filter((cg) => !cg.endsWith('-pnpres')));
+        eventEmitter.addListener(this.listener, this.channelNames, this.groupNames);
     }
     /**
      * Merge entities' subscription objects into subscription set.

lib/entities/SubscriptionSet.js

@@ -74,7 +74,7 @@ class SubscriptionSet extends SubscribeCapable_1.SubscribeCapable {
             this.subscriptionList.push(subscription);
         });
         this.listener = {};
-        eventEmitter.addListener(this.listener, this.channelNames.filter((c) => !c.endsWith('-pnpres')), this.groupNames.filter((cg) => !cg.endsWith('-pnpres')));
+        eventEmitter.addListener(this.listener, this.channelNames, this.groupNames);
     }
     /**
      * Add additional entity's subscription to the subscription set.

src/core/components/eventEmitter.ts

@@ -45,7 +45,7 @@ export default class EventEmitter {
       this.announce('signal', event.data, event.data.channel, event.data.subscription);
     } else if (event.type === PubNubEventType.Presence) {
       this.listenerManager.announcePresence(event.data);
-      this.announce('presence', event.data, event.data.channel, event.data.subscription);
+      this.announce('presence', event.data, event.data.subscription ?? event.data.channel, event.data.subscription);
     } else if (event.type === PubNubEventType.AppContext) {
       const { data: objectEvent } = event;
       const { message: object } = objectEvent;

src/entities/Channel.ts

@@ -57,8 +57,12 @@ export class Channel {
    */
   subscription(subscriptionOptions?: SubscriptionOptions) {
     if (process.env.SUBSCRIBE_EVENT_ENGINE_MODULE !== 'disabled') {
+      const channels = [this.name];
+      if (subscriptionOptions?.receivePresenceEvents && !this.name.endsWith('-pnpres'))
+        channels.push(`${this.name}-pnpres`);
+
       return new Subscription({
-        channels: subscriptionOptions?.receivePresenceEvents ? [this.name, `${this.name}-pnpres`] : [this.name],
+        channels,
         channelGroups: [],
         subscriptionOptions: subscriptionOptions,
         eventEmitter: this.eventEmitter,

src/entities/ChannelGroup.ts

@@ -59,9 +59,13 @@ export class ChannelGroup {
    */
   subscription(subscriptionOptions?: SubscriptionOptions) {
     if (process.env.SUBSCRIBE_EVENT_ENGINE_MODULE !== 'disabled') {
+      const channelGroups = [this.name];
+      if (subscriptionOptions?.receivePresenceEvents && !this.name.endsWith('-pnpres'))
+        channelGroups.push(`${this.name}-pnpres`);
+
       return new Subscription({
         channels: [],
-        channelGroups: subscriptionOptions?.receivePresenceEvents ? [this.name, `${this.name}-pnpres`] : [this.name],
+        channelGroups,
         subscriptionOptions: subscriptionOptions,
         eventEmitter: this.eventEmitter,
         pubnub: this.pubnub,

src/entities/SubscribeCapable.ts

@@ -141,11 +141,7 @@ export abstract class SubscribeCapable {
    * types of events.
    */
   addListener(listener: Listener) {
-    this.eventEmitter.addListener(
-      listener,
-      this.channelNames.filter((c) => !c.endsWith('-pnpres')),
-      this.groupNames.filter((cg) => !cg.endsWith('-pnpres')),
-    );
+    this.eventEmitter.addListener(listener, this.channelNames, this.groupNames);
   }
 
   /**

src/entities/Subscription.ts

@@ -99,11 +99,7 @@ export class Subscription extends SubscribeCapable {
     this.pubnub = pubnub;
     this.eventEmitter = eventEmitter;
     this.listener = {};
-    eventEmitter.addListener(
-      this.listener,
-      this.channelNames.filter((c) => !c.endsWith('-pnpres')),
-      this.groupNames.filter((cg) => !cg.endsWith('-pnpres')),
-    );
+    eventEmitter.addListener(this.listener, this.channelNames, this.groupNames);
   }
 
   /**

src/entities/SubscriptionSet.ts

@@ -123,11 +123,7 @@ export class SubscriptionSet extends SubscribeCapable {
       this.subscriptionList.push(subscription);
     });
     this.listener = {};
-    eventEmitter.addListener(
-      this.listener,
-      this.channelNames.filter((c) => !c.endsWith('-pnpres')),
-      this.groupNames.filter((cg) => !cg.endsWith('-pnpres')),
-    );
+    eventEmitter.addListener(this.listener, this.channelNames, this.groupNames);
   }
 
   /**

test/integration/endpoints/fetch_messages.test.ts

@@ -355,14 +355,16 @@ describe('fetch messages endpoints', () => {
     assert(errorCatched);
   });
 
-  it.only('supports custom message type', (done) => {
+  it('supports custom message type', (done) => {
     const channel = PubNub.generateUUID();
     const expectedMessagesCount = 2;
 
     publishMessagesToChannel(pubnub, expectedMessagesCount, channel, 'test-message-type', (messages) => {
       const messageTimetokens = messages.map((message) => message.timetoken);
 
       pubnub.fetchMessages({ channels: [channel], includeCustomMessageType: true }, (status, response) => {
+        assert.equal(status.error, false, `Fetch messages error: ${JSON.stringify(status.errorData)}`);
+
         try {
           assert.equal(status.error, false);
           assert(response !== null);

test/integration/endpoints/publish.test.ts

@@ -210,7 +210,7 @@ describe('publish endpoints', () => {
     });
   });
 
-  it('supports customMessageType', (done) => {
+  it.only('supports customMessageType', (done) => {
     const scope = utils
       .createNock()
       .get('/publish/myPublishKey/mySubKey/0/ch1/0/%7B%22such%22%3A%22object%22%7D')
@@ -219,22 +219,24 @@ describe('publish endpoints', () => {
         uuid: 'myUUID',
         auth: 'myAuthKey',
         store: '0',
+        custom_message_type: 'test-message-type',
       })
       .reply(200, '[1,"Sent","14647523059145592"]', { 'content-type': 'text/javascript' });
 
-    pubnub.setCipherKey('myCipherKey');
-
-    pubnub.publish({ message: { such: 'object' }, channel: 'ch1', storeInHistory: false }, (status, response) => {
-      try {
-        assert.equal(status.error, false);
-        assert(response !== null);
-        assert.deepEqual(response.timetoken, '14647523059145592');
-        assert.equal(scope.isDone(), true);
-        done();
-      } catch (error) {
-        done(error);
-      }
-    });
+    pubnub.publish(
+      { message: { such: 'object' }, channel: 'ch1', storeInHistory: false, customMessageType: 'test-message-type' },
+      (status, response) => {
+        try {
+          assert.equal(status.error, false, `Message publish error: ${JSON.stringify(status.errorData)}`);
+          assert(response !== null);
+          assert.deepEqual(response.timetoken, '14647523059145592');
+          assert.equal(scope.isDone(), true);
+          done();
+        } catch (error) {
+          done(error);
+        }
+      },
+    );
   });
 
   it('publishes a complex object via POST', (done) => {