Fix subscribe request aggregation in SharedWorker.

dist/web/pubnub.js

@@ -5868,7 +5868,13 @@
 	            if (!serviceResponse) {
 	                throw new PubNubError('Service response error, check status for details', createValidationError('Unable to deserialize service response'));
 	            }
-	            const events = serviceResponse.m.map((envelope) => {
+	            const events = serviceResponse.m
+	                .filter((envelope) => {
+	                const subscribable = envelope.b === undefined ? envelope.c : envelope.b;
+	                return ((this.parameters.channels && this.parameters.channels.includes(subscribable)) ||
+	                    (this.parameters.channelGroups && this.parameters.channelGroups.includes(subscribable)));
+	            })
+	                .map((envelope) => {
 	                let { e: eventType } = envelope;
 	                // Resolve missing event type.
 	                eventType !== null && eventType !== void 0 ? eventType : (eventType = envelope.c.endsWith('-pnpres') ? PubNubEventType.Presence : PubNubEventType.Message);

lib/core/endpoints/subscribe.js

@@ -112,7 +112,13 @@ class BaseSubscribeRequest extends request_1.AbstractRequest {
             if (!serviceResponse) {
                 throw new pubnub_error_1.PubNubError('Service response error, check status for details', (0, pubnub_error_1.createValidationError)('Unable to deserialize service response'));
             }
-            const events = serviceResponse.m.map((envelope) => {
+            const events = serviceResponse.m
+                .filter((envelope) => {
+                const subscribable = envelope.b === undefined ? envelope.c : envelope.b;
+                return ((this.parameters.channels && this.parameters.channels.includes(subscribable)) ||
+                    (this.parameters.channelGroups && this.parameters.channelGroups.includes(subscribable)));
+            })
+                .map((envelope) => {
                 let { e: eventType } = envelope;
                 // Resolve missing event type.
                 eventType !== null && eventType !== void 0 ? eventType : (eventType = envelope.c.endsWith('-pnpres') ? PubNubEventType.Presence : PubNubEventType.Message);

package.json

@@ -32,6 +32,7 @@
     "contract:test-access-beta": "cucumber-js --require dist/cucumber dist/contract/contract/features --tags '@featureSet=access and not @na=js and @beta'"
   },
   "main": "./lib/node/index.js",
+  "types": "./lib/types/node/index.d.ts",
   "react-native": "./lib/react_native/index.js",
   "metro": "./lib/react_native/index.js",
   "nativescript": "./lib/nativescript/index.js",
@@ -40,7 +41,6 @@
     "type": "git",
     "url": "git://github.com/pubnub/javascript.git"
   },
-
   "keywords": [
     "cloud",
     "publish",

src/core/endpoints/subscribe.ts

@@ -629,57 +629,65 @@ export class BaseSubscribeRequest extends AbstractRequest<Subscription.Subscript
       );
     }
 
-    const events: Subscription.SubscriptionResponse['messages'] = serviceResponse.m.map((envelope) => {
-      let { e: eventType } = envelope;
+    const events: Subscription.SubscriptionResponse['messages'] = serviceResponse.m
+      .filter((envelope) => {
+        const subscribable = envelope.b === undefined ? envelope.c : envelope.b;
+        return (
+          (this.parameters.channels && this.parameters.channels.includes(subscribable)) ||
+          (this.parameters.channelGroups && this.parameters.channelGroups.includes(subscribable))
+        );
+      })
+      .map((envelope) => {
+        let { e: eventType } = envelope;
+
+        // Resolve missing event type.
+        eventType ??= envelope.c.endsWith('-pnpres') ? PubNubEventType.Presence : PubNubEventType.Message;
+
+        // Check whether payload is string (potentially encrypted data).
+        if (eventType != PubNubEventType.Signal && typeof envelope.d === 'string') {
+          if (eventType == PubNubEventType.Message) {
+            return {
+              type: PubNubEventType.Message,
+              data: this.messageFromEnvelope(envelope),
+            };
+          }
 
-      // Resolve missing event type.
-      eventType ??= envelope.c.endsWith('-pnpres') ? PubNubEventType.Presence : PubNubEventType.Message;
-
-      // Check whether payload is string (potentially encrypted data).
-      if (eventType != PubNubEventType.Signal && typeof envelope.d === 'string') {
-        if (eventType == PubNubEventType.Message) {
+          return {
+            type: PubNubEventType.Files,
+            data: this.fileFromEnvelope(envelope),
+          };
+        } else if (eventType == PubNubEventType.Message) {
           return {
             type: PubNubEventType.Message,
             data: this.messageFromEnvelope(envelope),
           };
+        } else if (eventType === PubNubEventType.Presence) {
+          return {
+            type: PubNubEventType.Presence,
+            data: this.presenceEventFromEnvelope(envelope),
+          };
+        } else if (eventType == PubNubEventType.Signal) {
+          return {
+            type: PubNubEventType.Signal,
+            data: this.signalFromEnvelope(envelope),
+          };
+        } else if (eventType === PubNubEventType.AppContext) {
+          return {
+            type: PubNubEventType.AppContext,
+            data: this.appContextFromEnvelope(envelope),
+          };
+        } else if (eventType === PubNubEventType.MessageAction) {
+          return {
+            type: PubNubEventType.MessageAction,
+            data: this.messageActionFromEnvelope(envelope),
+          };
         }
 
         return {
           type: PubNubEventType.Files,
           data: this.fileFromEnvelope(envelope),
         };
-      } else if (eventType == PubNubEventType.Message) {
-        return {
-          type: PubNubEventType.Message,
-          data: this.messageFromEnvelope(envelope),
-        };
-      } else if (eventType === PubNubEventType.Presence) {
-        return {
-          type: PubNubEventType.Presence,
-          data: this.presenceEventFromEnvelope(envelope),
-        };
-      } else if (eventType == PubNubEventType.Signal) {
-        return {
-          type: PubNubEventType.Signal,
-          data: this.signalFromEnvelope(envelope),
-        };
-      } else if (eventType === PubNubEventType.AppContext) {
-        return {
-          type: PubNubEventType.AppContext,
-          data: this.appContextFromEnvelope(envelope),
-        };
-      } else if (eventType === PubNubEventType.MessageAction) {
-        return {
-          type: PubNubEventType.MessageAction,
-          data: this.messageActionFromEnvelope(envelope),
-        };
-      }
-
-      return {
-        type: PubNubEventType.Files,
-        data: this.fileFromEnvelope(envelope),
-      };
-    });
+      });
 
     return {
       cursor: { timetoken: serviceResponse.t.t, region: serviceResponse.t.r },