react-native-spike-sdk 2.4.3 → 2.4.4

package/ios/SpikeSdk.swift

@@ -9,13 +9,31 @@ class SpikeSdk: RCTEventEmitter {
         return true
     }
     
-    private var connections: [String: SpikeConnection] = [:]
-    
     override init() {
         super.init()
     }
     
-    // MARK: Spike SDK level
+    // MARK: - Connections dictionary
+    
+    /// Do not use this directly, use `addConnection` and `getConnection` instead
+    private var _connections: [String: SpikeConnection] = [:]
+    private let queue = DispatchQueue(label: "com.spike.rn.SpikeSdk.connections")
+    
+    /// Add new connection to the dictionary in a thread-safe manner
+    private func addConnection(_ connection: SpikeConnection, withUUID uuid: String) {
+        queue.sync {
+            _connections[uuid] = connection
+        }
+    }
+    
+    /// Synchronised read for safe multithreaded usage
+    private func getConnection(withUUID uuid: String) -> SpikeConnection? {
+        queue.sync {
+            _connections[uuid]
+        }
+    }
+    
+    // MARK: - Spike SDK level
         
     @objc(createConnection:
             withAppId:
@@ -41,7 +59,7 @@ class SpikeSdk: RCTEventEmitter {
                     customerEndUserId: customerEndUserId,
                     callbackUrl: callbackUrl != nil ? URL(string: callbackUrl!) : nil,
                     logger: logger)
-                connections[uuid] = spikeConnection
+                addConnection(spikeConnection, withUUID: uuid)
                 resolve(Void())
             } catch let error {
                 spikeReject(with: error, reject: reject)
@@ -59,7 +77,7 @@ class SpikeSdk: RCTEventEmitter {
                 var connectionsUUIDs: [String] = []
                 for connection in spikeConnections {
                     let uuid = UUID().uuidString
-                    connections[uuid] = connection
+                    addConnection(connection, withUUID: uuid)
                     connectionsUUIDs.append(uuid)
                 }
                 resolve(connectionsUUIDs)
@@ -104,7 +122,7 @@ class SpikeSdk: RCTEventEmitter {
     func getAppId(connectionUUID: String,
                   resolve: @escaping RCTPromiseResolveBlock,
                   reject: @escaping RCTPromiseRejectBlock) {
-        guard let connection = connections[connectionUUID] else {
+        guard let connection = getConnection(withUUID: connectionUUID) else {
             spikeReject(with: SpikeWrapperException(), reject: reject)
             return
         }
@@ -123,7 +141,7 @@ class SpikeSdk: RCTEventEmitter {
     func getSpikeEndUserId(connectionUUID: String,
                            resolve: @escaping RCTPromiseResolveBlock,
                            reject: @escaping RCTPromiseRejectBlock) {
-        guard let connection = connections[connectionUUID] else {
+        guard let connection = getConnection(withUUID: connectionUUID) else {
             spikeReject(with: SpikeWrapperException(), reject: reject)
             return
         }
@@ -142,7 +160,7 @@ class SpikeSdk: RCTEventEmitter {
     func getCustomerEndUserId(connectionUUID: String,
                               resolve: @escaping RCTPromiseResolveBlock,
                               reject: @escaping RCTPromiseRejectBlock) {
-        guard let connection = connections[connectionUUID] else {
+        guard let connection = getConnection(withUUID: connectionUUID) else {
             spikeReject(with: SpikeWrapperException(), reject: reject)
             return
         }
@@ -161,7 +179,7 @@ class SpikeSdk: RCTEventEmitter {
     func close(connectionUUID: String,
                resolve: @escaping RCTPromiseResolveBlock,
                reject: @escaping RCTPromiseRejectBlock) {
-        guard let connection = connections[connectionUUID] else {
+        guard let connection = getConnection(withUUID: connectionUUID) else {
             spikeReject(with: SpikeWrapperException(), reject: reject)
             return
         }
@@ -182,7 +200,7 @@ class SpikeSdk: RCTEventEmitter {
                      dataType: String,
                      resolve: @escaping RCTPromiseResolveBlock,
                      reject: @escaping RCTPromiseRejectBlock) {
-        guard let connection = connections[connectionUUID] else {
+        guard let connection = getConnection(withUUID: connectionUUID) else {
             spikeReject(with: SpikeWrapperException(), reject: reject)
             return
         }
@@ -214,7 +232,7 @@ class SpikeSdk: RCTEventEmitter {
                             toDateMillis: Double,
                             resolve: @escaping RCTPromiseResolveBlock,
                             reject: @escaping RCTPromiseRejectBlock) {
-        guard let connection = connections[connectionUUID] else {
+        guard let connection = getConnection(withUUID: connectionUUID) else {
             spikeReject(with: SpikeWrapperException(), reject: reject)
             return
         }
@@ -246,7 +264,7 @@ class SpikeSdk: RCTEventEmitter {
     func getCallbackUrl(connectionUUID: String,
                         resolve: @escaping RCTPromiseResolveBlock,
                         reject: @escaping RCTPromiseRejectBlock) {
-        guard let connection = connections[connectionUUID] else {
+        guard let connection = getConnection(withUUID: connectionUUID) else {
             spikeReject(with: SpikeWrapperException(), reject: reject)
             return
         }
@@ -267,7 +285,7 @@ class SpikeSdk: RCTEventEmitter {
                             dataType: String,
                             resolve: @escaping RCTPromiseResolveBlock,
                             reject: @escaping RCTPromiseRejectBlock) {
-        guard let connection = connections[connectionUUID] else {
+        guard let connection = getConnection(withUUID: connectionUUID) else {
             spikeReject(with: SpikeWrapperException(), reject: reject)
             return
         }
@@ -299,7 +317,7 @@ class SpikeSdk: RCTEventEmitter {
                                    toDateMillis: Double,
                                    resolve: @escaping RCTPromiseResolveBlock,
                                    reject: @escaping RCTPromiseRejectBlock) {
-        guard let connection = connections[connectionUUID] else {
+        guard let connection = getConnection(withUUID: connectionUUID) else {
             spikeReject(with: SpikeWrapperException(), reject: reject)
             return
         }
@@ -331,7 +349,7 @@ class SpikeSdk: RCTEventEmitter {
                                   dataTypes: [String],
                                   resolve: @escaping RCTPromiseResolveBlock,
                                   reject: @escaping RCTPromiseRejectBlock) {
-        guard let connection = connections[connectionUUID] else {
+        guard let connection = getConnection(withUUID: connectionUUID) else {
             spikeReject(with: SpikeWrapperException(), reject: reject)
             return
         }
@@ -353,7 +371,7 @@ class SpikeSdk: RCTEventEmitter {
     func getBackgroundDeliveryDataTypes(connectionUUID: String,
                                         resolve: @escaping RCTPromiseResolveBlock,
                                         reject: @escaping RCTPromiseRejectBlock) {
-        guard let connection = connections[connectionUUID] else {
+        guard let connection = getConnection(withUUID: connectionUUID) else {
             spikeReject(with: SpikeWrapperException(), reject: reject)
             return
         }
@@ -375,7 +393,7 @@ class SpikeSdk: RCTEventEmitter {
     func setListener(connectionUUID: String,
                      resolve: @escaping RCTPromiseResolveBlock,
                      reject: @escaping RCTPromiseRejectBlock) {
-        guard let connection = connections[connectionUUID] else {
+        guard let connection = getConnection(withUUID: connectionUUID) else {
             spikeReject(with: SpikeWrapperException(), reject: reject)
             return
         }

package/ios/SpikeSdk.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
 </Workspace>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-spike-sdk",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "iosVersion": "2.3.2",
   "description": "Spike API for health and productivity data from wearables and IoT devices",
   "main": "lib/commonjs/index",
@@ -86,7 +86,7 @@
   "engines": {
     "node": ">= 16.0.0"
   },
-  "packageManager": "^yarn@1.22.15",
+  "packageManager": "yarn@1.22.15",
   "jest": {
     "preset": "react-native",
     "modulePathIgnorePatterns": [