Fix subscribe request timeout (#460)

fix(subscribe): fix subscribe request timeout Fix issue because of which wrong request timeout has been used. * fix(subscribe): fix user timetoken parse Fix issue with `PNSubscribeCursorData` which should have an optional `region` to handle user timetoken in received real-time messages.
pubnub · Jul 8, 2024 · 31fdf33 · 31fdf33
1 parent 538e65c
commit 31fdf33
Show file tree

Hide file tree

Showing 23 changed files with 466 additions and 76 deletions.
diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,9 +1,16 @@
 ---
 name: objective-c
 scm: github.com/pubnub/objective-c
-version: "5.6.0"
+version: "5.6.1"
 schema: 1
 changelog:
+  - date: 2024-07-08
+    version: v5.6.1
+    changes:
+      - type: bug
+        text: "Fix issue because of which wrong request timeout has been used."
+      - type: bug
+        text: "Fix issue with `PNSubscribeCursorData` which should have an optional `region` to handle user timetoken in received real-time messages."
   - date: 2024-06-27
     version: v5.6.0
     changes:
@@ -1358,7 +1365,7 @@ sdks:
           - distribution-type: source
             distribution-repository: GitHub release
             package-name: PubNub.framework
-            location: https://github.com/pubnub/objective-c/archive/refs/tags/v5.6.0.zip
+            location: https://github.com/pubnub/objective-c/archive/refs/tags/v5.6.1.zip
             supported-platforms:
               supported-operating-systems:
                 macOS:
@@ -1419,7 +1426,7 @@ sdks:
           - distribution-type: library
             distribution-repository: GitHub release
             package-name: PubNub.ios.xcframework.tar.gz
-            location: https://github.com/pubnub/objective-c/releases/download/v5.6.0/PubNub.ios.xcframework.tar.gz
+            location: https://github.com/pubnub/objective-c/releases/download/v5.6.1/PubNub.ios.xcframework.tar.gz
             supported-platforms:
               supported-operating-systems:
                 iOS:
@@ -1438,7 +1445,7 @@ sdks:
           - distribution-type: library
             distribution-repository: GitHub release
             package-name: PubNub.macos.framework.tar.gz
-            location: https://github.com/pubnub/objective-c/releases/download/v5.6.0/PubNub.macos.framework.tar.gz
+            location: https://github.com/pubnub/objective-c/releases/download/v5.6.1/PubNub.macos.framework.tar.gz
             supported-platforms:
               supported-operating-systems:
                 macOS:
@@ -1454,7 +1461,7 @@ sdks:
           - distribution-type: library
             distribution-repository: GitHub release
             package-name: PubNub.tvos.xcframework.tar.gz
-            location: https://github.com/pubnub/objective-c/releases/download/v5.6.0/PubNub.tvos.xcframework.tar.gz
+            location: https://github.com/pubnub/objective-c/releases/download/v5.6.1/PubNub.tvos.xcframework.tar.gz
             supported-platforms:
               supported-operating-systems:
                 tvOS:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## v5.6.1
+July 08 2024
+
+#### Fixed
+- Fix issue because of which wrong request timeout has been used.
+- Fix issue with `PNSubscribeCursorData` which should have an optional `region` to handle user timetoken in received real-time messages.
+
 ## v5.6.0
 June 27 2024
 

diff --git a/Example/PubNub/PNAppDelegate.m b/Example/PubNub/PNAppDelegate.m
@@ -595,10 +595,8 @@ - (void)handleErrorStatus:(PNErrorStatus *)status {
         NSLog(@"Decryption error. Be sure the data is encrypted and/or encrypted with the correct cipher key.");
         NSLog(@"You can find the raw data returned from the server in the status.data attribute: %@", status.associatedObject);
         if (status.operation == PNSubscribeOperation) {
-
-            NSLog(@"Decryption failed for message from channel: %@\nmessage: %@",
-                  ((PNMessageData *)status.associatedObject).channel, 
-                  ((PNMessageData *)status.associatedObject).message);
+            PNSubscribeMessageEventData *data = status.associatedObject;
+            NSLog(@"Decryption failed for message from channel: %@\nmessage: %@", data.channel, data.message);
         }
     }
     else if (status.category == PNMalformedFilterExpressionCategory) {

diff --git a/Framework/PubNub/Info.plist b/Framework/PubNub/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>PubNub</string>
 	<key>CFBundleGetInfoString</key>
-	<string>5.6.0</string>
+	<string>5.6.1</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.pubnub.pubnub-objc</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.6.0</string>
+	<string>5.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.6.0</string>
+	<string>5.6.1</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>© 2010 - 2020 PubNub, Inc.</string>
 	<key>NSPrincipalClass</key>

diff --git a/Framework/PubNub/PubNub-iOS-Info.plist b/Framework/PubNub/PubNub-iOS-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>PubNub</string>
 	<key>CFBundleGetInfoString</key>
-	<string>5.6.0</string>
+	<string>5.6.1</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.pubnub.pubnub-objc</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.6.0</string>
+	<string>5.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.6.0</string>
+	<string>5.6.1</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>© 2010 - 2020 PubNub, Inc.</string>
 	<key>NSPrincipalClass</key>

diff --git a/Framework/PubNub/PubNub-tvOS-Info.plist b/Framework/PubNub/PubNub-tvOS-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>PubNub</string>
 	<key>CFBundleGetInfoString</key>
-	<string>5.6.0</string>
+	<string>5.6.1</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.pubnub.pubnub-objc</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.6.0</string>
+	<string>5.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.6.0</string>
+	<string>5.6.1</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>© 2010 - 2020 PubNub, Inc.</string>
 	<key>NSPrincipalClass</key>

diff --git a/Framework/PubNub/PubNub-watchOS-Info.plist b/Framework/PubNub/PubNub-watchOS-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>PubNub</string>
 	<key>CFBundleGetInfoString</key>
-	<string>5.6.0</string>
+	<string>5.6.1</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.pubnub.pubnub-objc</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.6.0</string>
+	<string>5.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.6.0</string>
+	<string>5.6.1</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>© 2010 - 2020 PubNub, Inc.</string>
 	<key>NSPrincipalClass</key>

diff --git a/PubNub.podspec b/PubNub.podspec
@@ -9,7 +9,7 @@
 
 Pod::Spec.new do |spec|
     spec.name     = 'PubNub'
-    spec.version  = '5.6.0'
+    spec.version  = '5.6.1'
     spec.summary  = 'The PubNub Real-Time Network. Build real-time apps quickly and scale them globally.'
     spec.homepage = 'https://github.com/pubnub/objective-c'
 

diff --git a/PubNub/Data/Managers/PNSubscriber.m b/PubNub/Data/Managers/PNSubscriber.m
@@ -1336,7 +1336,7 @@ - (void)handleNewMessage:(PNMessageResult *)message {
 
     PNErrorStatus *status = nil;
 
-    PNLogResult(self.client.logger, @"<PubNub> %@", [message stringifiedRepresentationWithSerializer:nil]);
+    PNLogResult(self.client.logger, @"<PubNub> %@", [message stringifiedRepresentationWithSerializer:self.client.coder]);
 
     if (message.data.decryptionError) {
         status = [PNErrorStatus objectWithOperation:PNSubscribeOperation
@@ -1352,23 +1352,23 @@ - (void)handleNewMessage:(PNMessageResult *)message {
 - (void)handleNewSignal:(PNSignalResult *)signal {
     if (!signal) return;
 
-    PNLogResult(self.client.logger, @"<PubNub> %@", [signal stringifiedRepresentationWithSerializer:nil]);
+    PNLogResult(self.client.logger, @"<PubNub> %@", [signal stringifiedRepresentationWithSerializer:self.client.coder]);
 
     [self.client.listenersManager notifySignal:signal];
 }
 
 - (void)handleNewMessageAction:(PNMessageActionResult *)action {
     if (!action) return;
 
-    PNLogResult(self.client.logger, @"<PubNub> %@", [action stringifiedRepresentationWithSerializer:nil]);
+    PNLogResult(self.client.logger, @"<PubNub> %@", [action stringifiedRepresentationWithSerializer:self.client.coder]);
 
     [self.client.listenersManager notifyMessageAction:action];
 }
 
 - (void)handleNewObjectsEvent:(PNObjectEventResult *)object {
     if (!object) return;
 
-    PNLogResult(self.client.logger, @"<PubNub> %@", [object stringifiedRepresentationWithSerializer:nil]);
+    PNLogResult(self.client.logger, @"<PubNub> %@", [object stringifiedRepresentationWithSerializer:self.client.coder]);
 
     [self.client.listenersManager notifyObjectEvent:object];
 }
@@ -1377,8 +1377,8 @@ - (void)handleNewFileEvent:(PNFileEventResult *)file {
     PNErrorStatus *status = nil;
 
     if (file) {
-        PNLogResult(self.client.logger, @"<PubNub> %@", [file stringifiedRepresentationWithSerializer:nil]);
-       
+        PNLogResult(self.client.logger, @"<PubNub> %@", [file stringifiedRepresentationWithSerializer:self.client.coder]);
+
         if (file.data.decryptionError) {
             status = [PNErrorStatus objectWithOperation:PNSubscribeOperation
                                                category:PNDecryptionErrorCategory
@@ -1398,7 +1398,7 @@ - (void)handleNewFileEvent:(PNFileEventResult *)file {
 
 - (void)handleNewPresenceEvent:(PNPresenceEventResult *)presence {
     if (presence) {
-        PNLogResult(self.client.logger, @"<PubNub> %@", [presence stringifiedRepresentationWithSerializer:nil]);
+        PNLogResult(self.client.logger, @"<PubNub> %@", [presence stringifiedRepresentationWithSerializer:self.client.coder]);
     }
 
     [self.client.listenersManager notifyPresenceEvent:presence];

diff --git a/PubNub/Data/Service Objects/PNOperationResult.m b/PubNub/Data/Service Objects/PNOperationResult.m
@@ -118,7 +118,7 @@ - (id)copyWithZone:(NSZone *)zone {
 - (NSDictionary *)dictionaryRepresentationWithSerializer:(id<PNObjectSerializer>)serializer {
     id processedData = self.responseData;
 
-    if (serializer) {
+    if (serializer && processedData) {
         NSError *err;
         NSData *serializedData = [serializer dataOfClass:[NSDictionary class] fromObject:processedData withError:&err];
         NSDictionary *serializedDictionary = [serializer.jsonSerializer JSONObjectWithData:serializedData error:&err];
@@ -128,7 +128,7 @@ - (NSDictionary *)dictionaryRepresentationWithSerializer:(id<PNObjectSerializer>
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
     NSMutableDictionary *response = [@{
         @"Status code": @(self.statusCode),
-        @"Processed data": processedData
+        @"Processed data": processedData ?: @"no data"
     } mutableCopy];
 
     return @{@"Operation": PNOperationTypeStrings[self.operation],

diff --git a/PubNub/Misc/PNConstants.h b/PubNub/Misc/PNConstants.h
@@ -15,7 +15,7 @@
 #pragma mark General information constants
 
 // Stores client library version number
-static NSString * const kPNLibraryVersion = @"5.6.0";
+static NSString * const kPNLibraryVersion = @"5.6.1";
 
 // Stores information about SDK codebase
 static NSString * const kPNCommit = @"fd5c7ed678527fce07eaf7eb162935caf1bfd303";