refactor: subscriptionSet will get constructed in form of set of subscriptions when channels/groups set is provided

Author: mohitpubnub

lib/entities/SubscriptionSet.js

@@ -37,26 +37,26 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SubscriptionSet = void 0;
-var Subscription_1 = require("./Subscription");
 var SubscriptionSet = /** @class */ (function () {
     function SubscriptionSet(_a) {
         var _b = _a.channels, channels = _b === void 0 ? [] : _b, _c = _a.channelGroups, channelGroups = _c === void 0 ? [] : _c, subscriptionOptions = _a.subscriptionOptions, eventEmitter = _a.eventEmitter, pubnub = _a.pubnub;
+        var _this = this;
         this.channelNames = [];
         this.groupNames = [];
-        this.channelNames = __spreadArray(__spreadArray([], __read(this.channelNames), false), __read(channels), false);
-        this.groupNames = __spreadArray(__spreadArray([], __read(this.groupNames), false), __read(channelGroups), false);
+        this.subscriptionList = [];
         this.options = subscriptionOptions;
         this.eventEmitter = eventEmitter;
         this.pubnub = pubnub;
-        this.subscriptionList = [
-            new Subscription_1.Subscription({
-                channels: this.channelNames,
-                channelGroups: this.groupNames,
-                subscriptionOptions: this.options,
-                eventEmitter: this.eventEmitter,
-                pubnub: this.pubnub,
-            }),
-        ];
+        channels.forEach(function (c) {
+            var subscription = _this.pubnub.channel(c).subscription(_this.options);
+            _this.channelNames = __spreadArray(__spreadArray([], __read(_this.channelNames), false), __read(subscription.channels), false);
+            _this.subscriptionList.push(subscription);
+        });
+        channelGroups.forEach(function (cg) {
+            var subscription = _this.pubnub.channelGroup(cg).subscription(_this.options);
+            _this.groupNames = __spreadArray(__spreadArray([], __read(_this.groupNames), false), __read(subscription.channelGroups), false);
+            _this.subscriptionList.push(subscription);
+        });
     }
     SubscriptionSet.prototype.subscribe = function () {
         var _a, _b;

src/entities/SubscriptionSet.ts

@@ -7,7 +7,7 @@ export class SubscriptionSet implements SubscribeCapable {
   private options: SubscriptionOptions;
   private pubnub: any;
   private eventEmitter: any;
-  private subscriptionList: Subscription[];
+  private subscriptionList: Subscription[] = [];
 
   constructor({
     channels = [],
@@ -22,20 +22,19 @@ export class SubscriptionSet implements SubscribeCapable {
     eventEmitter: any;
     pubnub: any;
   }) {
-    this.channelNames = channels;
-    this.groupNames = channelGroups;
     this.options = subscriptionOptions;
     this.eventEmitter = eventEmitter;
     this.pubnub = pubnub;
-    this.subscriptionList = [
-      new Subscription({
-        channels: this.channelNames,
-        channelGroups: this.groupNames,
-        subscriptionOptions: this.options,
-        eventEmitter: this.eventEmitter,
-        pubnub: this.pubnub,
-      }),
-    ];
+    channels.forEach((c) => {
+      const subscription = this.pubnub.channel(c).subscription(this.options);
+      this.channelNames = [...this.channelNames, ...subscription.channels];
+      this.subscriptionList.push(subscription);
+    });
+    channelGroups.forEach((cg) => {
+      const subscription = this.pubnub.channelGroup(cg).subscription(this.options);
+      this.groupNames = [...this.groupNames, ...subscription.channelGroups];
+      this.subscriptionList.push(subscription);
+    });
   }
   subscribe() {
     this.pubnub.subscribe({