fix: subscribe() signature to accept timetoken in subscribe() method

pubnub · Jun 17, 2024 · 3ca11b3 · 3ca11b3
1 parent 07a19e8
commit 3ca11b3
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/dist/web/pubnub.js b/dist/web/pubnub.js
@@ -8963,9 +8963,9 @@
 	}
 
 	class SubscribeCapable {
-	    subscribe() {
-	        var _a, _b;
-	        this.pubnub.subscribe(Object.assign({ channels: this.channelNames, channelGroups: this.groupNames }, (((_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.cursor) === null || _b === void 0 ? void 0 : _b.timetoken) && { timetoken: this.options.cursor.timetoken })));
+	    subscribe(subscribeParameters) {
+	        let timetoken = subscribeParameters === null || subscribeParameters === void 0 ? void 0 : subscribeParameters.timetoken;
+	        this.pubnub.subscribe(Object.assign({ channels: this.channelNames, channelGroups: this.groupNames }, ((timetoken !== null && timetoken !== '') && { timetoken: timetoken })));
 	    }
 	    unsubscribe() {
 	        this.pubnub.unsubscribe({

diff --git a/dist/web/pubnub.min.js b/dist/web/pubnub.min.js
diff --git a/lib/entities/SubscribeCapable.js b/lib/entities/SubscribeCapable.js
@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SubscribeCapable = void 0;
 class SubscribeCapable {
-    subscribe() {
-        var _a, _b;
-        this.pubnub.subscribe(Object.assign({ channels: this.channelNames, channelGroups: this.groupNames }, (((_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.cursor) === null || _b === void 0 ? void 0 : _b.timetoken) && { timetoken: this.options.cursor.timetoken })));
+    subscribe(subscribeParameters) {
+        let timetoken = subscribeParameters === null || subscribeParameters === void 0 ? void 0 : subscribeParameters.timetoken;
+        this.pubnub.subscribe(Object.assign({ channels: this.channelNames, channelGroups: this.groupNames }, ((timetoken !== null && timetoken !== '') && { timetoken: timetoken })));
     }
     unsubscribe() {
         this.pubnub.unsubscribe({

diff --git a/lib/types/entities/SubscribeCapable.d.ts b/lib/types/entities/SubscribeCapable.d.ts
@@ -10,7 +10,9 @@ export declare abstract class SubscribeCapable {
     protected abstract eventEmitter: EventEmitter;
     protected abstract pubnub: PubNub<unknown, unknown>;
     protected abstract options?: SubscriptionOptions;
-    subscribe(): void;
+    subscribe(subscribeParameters?: {
+        timetoken?: string;
+    }): void;
     unsubscribe(): void;
     set onMessage(onMessageListener: (messageEvent: Subscription.Message) => void);
     set onPresence(onPresenceListener: (presenceEvent: Subscription.Presence) => void);

diff --git a/lib/types/entities/commonTypes.d.ts b/lib/types/entities/commonTypes.d.ts
@@ -1,7 +1,3 @@
 export type SubscriptionOptions = {
-    cursor?: {
-        timetoken?: string;
-        region?: number;
-    };
     receivePresenceEvents?: boolean;
 };
diff --git a/src/entities/SubscribeCapable.ts b/src/entities/SubscribeCapable.ts
@@ -12,11 +12,12 @@ export abstract class SubscribeCapable {
   protected abstract pubnub: PubNub<unknown, unknown>;
   protected abstract options?: SubscriptionOptions;
 
-  subscribe() {
+  subscribe(subscribeParameters?:{timetoken?: string}) {
+    let timetoken = subscribeParameters?.timetoken;
     this.pubnub.subscribe({
       channels: this.channelNames,
       channelGroups: this.groupNames,
-      ...(this.options?.cursor?.timetoken && { timetoken: this.options.cursor.timetoken }),
+      ...((timetoken !== null && timetoken !== '') && { timetoken: timetoken }),
     });
   }
   unsubscribe() {

diff --git a/src/entities/commonTypes.ts b/src/entities/commonTypes.ts
@@ -1,4 +1,3 @@
-export type SubscriptionOptions = {
-  cursor?: { timetoken?: string; region?: number };
+export type SubscriptionOptions = {  
   receivePresenceEvents?: boolean;
 };