react-native-spike-sdk 2.4.2 → 2.4.4

package/expo-module.config.json

@@ -0,0 +1,6 @@
+{
+  "platforms": ["ios"],
+  "ios": {
+    "appDelegateSubscribers": ["SpikeExpoModuleAppDelegateSubscriber"]
+  }
+}

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/ios-expo-module/SpikeExpoModule.podspec

@@ -0,0 +1,45 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+
+Pod::Spec.new do |s|
+  s.name         = "SpikeExpoModule"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+
+  s.description  = <<-DESC
+  Connect your app to users’ real-time data via a single API and enable new (data-driven) functionality and personalisation
+                   DESC
+
+  s.homepage     = "https://gitlab.com/spike_api/spike-react-native-sdk.git"
+  s.license      = { :type => 'MIT', :file => 'LICENSE' }
+  s.author       = { "SpikeAPI" => "vytenis@spikeapi.com" }
+
+
+  s.source       = { :git => "https://gitlab.com/spike_api/spike-react-native-sdk.git", :tag => "#{s.version}" }
+
+  s.source_files = "**/*.{h,m,mm,swift}"
+
+  s.platform     = :ios, "13.0"
+  s.swift_version = "5"
+
+  s.dependency "React-Core"
+  s.dependency 'ExpoModulesCore'
+  s.dependency "SpikeSDK", "~> #{package["iosVersion"]}"
+
+  # Don't install the dependencies when we run `pod install` in the old architecture.
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+    s.pod_target_xcconfig    = {
+        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+    }
+    s.dependency "React-Codegen"
+    s.dependency "RCT-Folly"
+    s.dependency "RCTRequired"
+    s.dependency "RCTTypeSafety"
+    s.dependency "ReactCommon/turbomodule/core"
+  end
+end

package/ios-expo-module/SpikeExpoModuleAppDelegateSubscriber.swift

@@ -0,0 +1,10 @@
+import ExpoModulesCore
+import SpikeSDK
+
+public class SpikeExpoModuleAppDelegateSubscriber: ExpoAppDelegateSubscriber {
+
+  public func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
+    Spike.configure()
+    return true
+  }
+}

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "react-native-spike-sdk",
-  "version": "2.4.2",
+  "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",
   "module": "lib/module/index",
@@ -12,8 +13,10 @@
     "lib",
     "android",
     "ios",
+    "ios-expo-module",
     "cpp",
     "app.plugin.js",
+    "expo-module.config.json",
     "*.podspec",
     "!lib/typescript/example",
     "!ios/build",
@@ -83,7 +86,7 @@
   "engines": {
     "node": ">= 16.0.0"
   },
-  "packageManager": "^yarn@1.22.15",
+  "packageManager": "yarn@1.22.15",
   "jest": {
     "preset": "react-native",
     "modulePathIgnorePatterns": [

package/react-native-spike-sdk.podspec

@@ -5,8 +5,8 @@ folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1
 
 Pod::Spec.new do |s|
   s.name         = "react-native-spike-sdk"
-  s.version      = "2.4.2"
-  s.summary      = "Spike API for health and productivity data from wearables and IoT devices"
+  s.version      = package["version"]
+  s.summary      = package["description"]
 
   s.description  = <<-DESC
   Connect your app to users’ real-time data via a single API and enable new (data-driven) functionality and personalisation
@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
   s.swift_version = "5"
 
   s.dependency "React-Core"
-  s.dependency "SpikeSDK", "~> 2.3.2"
+  s.dependency "SpikeSDK", "~> #{package["iosVersion"]}"
 
   # Don't install the dependencies when we run `pod install` in the old architecture.
   if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then