Merge pull request #255 from olha-danylova/master

7.0.1

Author: danylovaolha

BackendlessSwift.podspec

@@ -1,8 +1,8 @@
 Pod::Spec.new do |s|
   s.name         = 'BackendlessSwift'
   s.module_name  = 'Backendless'
-  s.version      = '7.0.0'
-  s.source = { :git => 'https://github.com/Backendless/Swift-SDK.git', :tag => '7.0.0' }
+  s.version      = '7.0.1'
+  s.source = { :git => 'https://github.com/Backendless/Swift-SDK.git', :tag => '7.0.1' }
   s.license      = { :type => 'MIT', :text => 'Copyright (c) 2013-2023 by Backendless Corp' }
   s.homepage     = 'http://backendless.com'
   s.authors      = { 'Mark Piller' => '[email protected]', 'Olha Danylova' => '[email protected]' }
@@ -13,9 +13,9 @@ Pod::Spec.new do |s|
       'SWIFT_VERSION' => '5.0'
   }
 
-  s.ios.deployment_target = '11.0'
+  s.ios.deployment_target = '12.0'
   s.osx.deployment_target = '10.13'
-  s.tvos.deployment_target = '11.0'
+  s.tvos.deployment_target = '12.0'
   s.watchos.deployment_target = '5.0'
   s.requires_arc = true
   s.source_files = 'Sources/SwiftSDK/**/*.swift', 'Sources/SwiftSDK/*.swift', 'Tests/SwiftSDKTests/TestObjects/*.swift'

CHANGELOG.md

@@ -1,5 +1,10 @@
 # RELEASE HISTORY
 
+### 7.0.1 / September 21, 2023
+* fixed RT issue when user was able to subscribe only for one messaging channel
+* some deprecated code was updated under the hood
+* minimal iOS and tvOS versions changed to 12.0
+
 ### 7.0.0 / July 25, 2023
 * added implementation for BackendlessExpression
 

Package.resolved

@@ -9,7 +9,7 @@ let package = Package(
         .library(name: "Backendless", targets: ["SwiftSDK"]),
     ],
     dependencies: [
-        .package(name: "SocketIO", url: "https://github.com/socketio/socket.io-client-swift", from: "16.0.1")
+        .package(name: "SocketIO", url: "https://github.com/socketio/socket.io-client-swift", from: "16.1.0")
     ],
     targets: [
         .target(name: "SwiftSDK", dependencies: ["SocketIO"]),

Package.swift

@@ -1,4 +1,4 @@
-platform :ios, '11.0'
+platform :ios, '12.0'
 
 target 'SwiftSDK' do
   use_frameworks!
@@ -8,15 +8,14 @@ target 'SwiftSDK' do
     inherit! :search_paths
     pod 'Socket.IO-Client-Swift', '~> 16.0'
   end
-
 end
 
 post_install do |installer|
-    installer.generated_projects.each do |project|
-          project.targets.each do |target|
-              target.build_configurations.each do |config|
-                  config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
-               end
-          end
-   end
+  installer.generated_projects.each do |project|
+    project.targets.each do |target|
+      target.build_configurations.each do |config|
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
+      end
+    end
+  end
 end

Podfile

@@ -40,7 +40,7 @@ import Foundation
         }
         if !self.isJoined {
             self.rt?.connect(responseHandler: {
-                self.isJoined = true
+                self.isJoined = true                
                 self.rt?.processConnectSubscriptions()
                 self.rt?.subscribeForWaiting()
             }, errorHandler: { fault in

Sources/.DS_Store

@@ -35,7 +35,7 @@ class RTMessaging: RTListener {
     func connect(responseHandler: (() -> Void)!, errorHandler: ((Fault) -> Void)!) {
         let options = ["channel": channelName] as [String : Any]
         let subscription = createSubscription(type: RtTypes.pubSubConnect, options: options, connectionHandler: responseHandler, responseHandler: nil, errorHandler: errorHandler)
-        self.subscriptionId = subscription.subscriptionId
+        self.subscriptionId = subscription.subscriptionId        
         subscription.subscribe()
     }
 
@@ -253,7 +253,7 @@ class RTMessaging: RTListener {
     }
 
     func processConnectSubscriptions() {
-        if var connectSubscriptions = RTClient.shared.getSimpleListeners(type: RtTypes.pubSubConnect) {
+        if var connectSubscriptions = RTClient.shared.getSimpleListeners(type: RtTypes.pubSubConnect) {            
             connectSubscriptions = connectSubscriptions.filter({ $0.options?.contains(where: { $0.value as? String == self.channelName }) ?? false })
             for subscription in connectSubscriptions {
                 subscription.onResult!(nil)

Sources/SwiftSDK/Messaging/RT/Channel.swift

@@ -32,6 +32,7 @@ class RTClient {
     private var socket: SocketIOClient?
     private var socketManager: SocketManager?
     private var subscriptions: [String : RTSubscription]
+    private var subscribedOnConnect = [String]()
     private var eventSubscriptions: [String : [RTSubscription]]
     private var methods: [String : RTMethodRequest]
     var socketCreated = false
@@ -41,7 +42,6 @@ class RTClient {
     private var onResultReady = false
     private var onMethodResultReady = false
     private var onDisconnectCalledOnce = false
-    private var _lock: NSLock
     private var reconnectAttempt: Int = 1
     private var timeInterval: Double = 0.2 // seconds
     var onSocketConnectCallback: (() -> Void)?
@@ -51,9 +51,9 @@ class RTClient {
     private init() {
         self.waitingSubscriptions = [RTSubscription]()
         self.subscriptions = [String : RTSubscription]()
+        self.subscribedOnConnect = [String]()
         self.eventSubscriptions = [String : [RTSubscription]]()
         self.methods = [String : RTMethodRequest]()
-        _lock = NSLock()
     }
 
     func connectSocket(connected: (() -> Void)!) {
@@ -68,11 +68,11 @@ class RTClient {
                     let path = "/" + Backendless.shared.getApplicationId()
 
                     var clientId = ""
-                    #if os(iOS) || os(tvOS)
+#if os(iOS) || os(tvOS)
                     clientId = DeviceHelper.shared.deviceId
-                    #elseif os(OSX)
+#elseif os(OSX)
                     clientId = DeviceHelper.shared.deviceId
-                    #endif
+#endif
 
                     var connectParams = ["apiKey": Backendless.shared.getApiKey(), "clientId": clientId]
                     if let userToken = UserDefaultsHelper.shared.getUserToken() {
@@ -88,7 +88,7 @@ class RTClient {
                     let _ = Backendless.shared.rt.addConnectErrorEventListener(responseHandler: { _ in
                         self.tryToReconnectSocket()
                     })
-    
+                    
                     if self.socket != nil {
                         self.socketOnceCreated = true
                         self.socketCreated = true
@@ -119,23 +119,22 @@ class RTClient {
     }
 
     func subscribe(data: [String : Any], subscription: RTSubscription) {
-        if self.socketConnected {
-            self.socket?.emit("SUB_ON", data)
-        }
-        else {
-            self.connectSocket(connected: {
-                self.socket?.emit("SUB_ON", data)
-            })
-        }
         if !self.needResubscribe {
             self.subscriptions[subscription.subscriptionId!] = subscription
         }
+        if !self.socketConnected {
+            self.connectSocket(connected: { })
+        }
+        else if !self.subscribedOnConnect.contains(subscription.subscriptionId!) {
+            self.socket?.emit("SUB_ON", data)
+        }
     }
 
     func unsubscribe(subscriptionId: String) {
         if self.subscriptions.keys.contains(subscriptionId) {
             self.socket?.emit("SUB_OFF", ["id": subscriptionId])
             self.subscriptions.removeValue(forKey: subscriptionId)
+            self.subscribedOnConnect.removeAll { $0 == subscriptionId }
         }
         else {
             for type in self.eventSubscriptions.keys {
@@ -180,15 +179,24 @@ class RTClient {
                            let type = subscription.type,
                            let options = subscription.options {
                             let data = ["id": subscriptionId, "name": type, "options": options] as [String : Any]
-                            self.subscribe(data: data, subscription: subscription)
+                            self.socket?.emit("SUB_ON", data)
                         }
                     }
                     self.needResubscribe = false
                 }
                 else if !self.needResubscribe {
                     connected()
+                    for subscriptionId in self.subscriptions.keys {
+                        if let subscription = self.subscriptions[subscriptionId],
+                           let type = subscription.type,
+                           let options = subscription.options {
+                            let data = ["id": subscriptionId, "name": type, "options": options] as [String : Any]
+                            self.socket?.emit("SUB_ON", data)
+                            self.subscribedOnConnect.append(subscriptionId)
+                        }
+                    }
                 }
-        
+                
                 self.onResult()
                 self.onMethodResult()
 
@@ -201,7 +209,7 @@ class RTClient {
                 self.subscribeForObjectChangesWaiting()
             })
 
-            self.socket?.on("connect_error", callback: { data, ack in                
+            self.socket?.on("connect_error", callback: { data, ack in
                 if let reason = data.first as? String {
                     self.onConnectErrorOrDisconnect(reason: reason, type: ConnectEvents.connectError)
                 }
@@ -245,7 +253,7 @@ class RTClient {
             for subscription in reconnectAttemptSubscriptions {
                 let attempt = NSNumber(value: self.reconnectAttempt)
                 let timeout = NSNumber(value: maxTimeInterval * 1000)
-                let reconnectAttemptObject = ReconnectAttemptObject(attempt: attempt, timeout: timeout)                
+                let reconnectAttemptObject = ReconnectAttemptObject(attempt: attempt, timeout: timeout)
                 subscription.onResult!(reconnectAttemptObject)
             }
         }
@@ -274,12 +282,12 @@ class RTClient {
     func onResult() {
         if !self.onResultReady {
             self.socket?.on("SUB_RES", callback: { data, ack in
-                self.onResultReady = true                
+                self.onResultReady = true
                 if let resultData = data.first as? [String : Any],
                    let subscriptionId = resultData["id"] as? String,
                    let subscription = self.subscriptions[subscriptionId] {
 
-                    if let result = resultData["data"] {                        
+                    if let result = resultData["data"] {
                         subscription.ready = true
                         if let result = result as? String, result == "connected", subscription.onConnect != nil {
                             subscription.onConnect!()
@@ -331,7 +339,7 @@ class RTClient {
                             self.methods.removeValue(forKey: methodId)
                         }
                     }
-                    else if resultData["id"] != nil, method.onResult != nil {                 
+                    else if resultData["id"] != nil, method.onResult != nil {
                         if let result = resultData["result"] {
                             method.onResult!(result)
                         }
@@ -361,7 +369,7 @@ class RTClient {
             subscriptions = [RTSubscription]()
         }
         subscriptions?.append(subscription)
-        eventSubscriptions[type] = subscriptions     
+        eventSubscriptions[type] = subscriptions
     }
 
     func getSimpleListeners(type: String) -> [RTSubscription]? {
@@ -391,7 +399,7 @@ class RTClient {
 
         subscriptions?.append(subscription)
         eventSubscriptions[type] = subscriptions
-        return subscription       
+        return subscription
     }
 
     func removeEventListeners(type: String) {
@@ -427,8 +435,8 @@ class RTClient {
         var indexesToRemove = [Int]() // waiting subscriptions will be removed after subscription is done
         for waitingSubscription in waitingSubscriptions {
             if let data = waitingSubscription.data,
-                let name = data["name"] as? String,
-                    (name == RtTypes.objectsChanges || name == RtTypes.relationsChanges) {
+               let name = data["name"] as? String,
+               (name == RtTypes.objectsChanges || name == RtTypes.relationsChanges) {
                 waitingSubscription.subscribe()
                 indexesToRemove.append(waitingSubscriptions.firstIndex(of: waitingSubscription)!)
             }

Sources/SwiftSDK/Messaging/RT/RTMessaging.swift

@@ -36,7 +36,8 @@ import Foundation
 
     func createSubscription(type: String, options: [String : Any], connectionHandler: (() -> Void)?, responseHandler: ((Any) -> Void)?, errorHandler: ((Fault) -> Void)!) -> RTSubscription {
         let subscriptionId = UUID().uuidString
-        let data = ["id": subscriptionId, "name": type, "options": options] as [String : Any]        
+        let data = ["id": subscriptionId, "name": type, "options": options] as [String : Any]
+        
         onStop = { subscription in
             var subscriptionStack = [RTSubscription]()
             if self.subscriptions[type] != nil {
@@ -76,7 +77,7 @@ import Foundation
             subscriptionStack = [RTSubscription]()
         }
         subscriptionStack?.append(subscription)
-        self.subscriptions[typeName] = subscriptionStack
+        self.subscriptions[typeName] = subscriptionStack        
         return subscription
     }