Merge pull request #59 from PlayerData/async-wrap-upgrade

Async wrap upgrade

Author: Donald47

example/ios/Podfile.lock

@@ -11,7 +11,7 @@ PODS:
     - ReactCommon/turbomodule/core (= 0.68.1)
   - fmt (6.2.1)
   - glog (0.3.5)
-  - iOSMcuManagerLibrary (1.1.0):
+  - iOSMcuManagerLibrary (1.3.2):
     - SwiftCBOR (= 0.4.4)
   - MultiplatformBleAdapter (0.1.9)
   - RCT-Folly (2021.06.28.00-v2):
@@ -229,7 +229,7 @@ PODS:
   - react-native-get-random-values (1.8.0):
     - React-Core
   - react-native-mcu-manager (0.0.1-development):
-    - iOSMcuManagerLibrary (~> 1.1.0)
+    - iOSMcuManagerLibrary (~> 1.3.2)
     - React-Core
   - React-perflogger (0.68.1)
   - React-RCTActionSheet (0.68.1):
@@ -424,7 +424,7 @@ SPEC CHECKSUMS:
   FBReactNativeSpec: 371350f24afa87b6aba606972ec959dcd4a95c9a
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 476ee3e89abb49e07f822b48323c51c57124b572
-  iOSMcuManagerLibrary: 64853befc4e6ff100809069f308cbf6ba38ec033
+  iOSMcuManagerLibrary: 2dbc3ef6fed190e1c1db2c88d8dacdde8b6dda0d
   MultiplatformBleAdapter: 5a6a897b006764392f9cef785e4360f54fb9477d
   RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8
   RCTRequired: 00581111c53531e39e3c6346ef0d2c0cf52a5a37
@@ -442,7 +442,7 @@ SPEC CHECKSUMS:
   react-native-ble-plx: f10240444452dfb2d2a13a0e4f58d7783e92d76e
   react-native-document-picker: 2b8f18667caee73a96708a82b284a4f40b30a156
   react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a
-  react-native-mcu-manager: 0b8b4258106b8a3c2888a1521a6ae3d5634ba463
+  react-native-mcu-manager: a7166f610e90374fdff1b80c6db17b9bb7f754b5
   React-perflogger: 30ab8d6db10e175626069e742eead3ebe8f24fd5
   React-RCTActionSheet: 4b45da334a175b24dabe75f856b98fed3dfd6201
   React-RCTAnimation: d6237386cb04500889877845b3e9e9291146bc2e
@@ -460,4 +460,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: c253f0de47435bd522e26588156f2650ee8d47f0
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.12.1

ios/DeviceUpgrade.swift

@@ -38,12 +38,12 @@ class DeviceUpgrade {
         self.upgradeResolver = resolve
         self.upgradeRejecter = reject
 
-        guard let bleUuid = UUID(uuidString: bleId) else {
+        guard let bleUuid = UUID(uuidString: self.bleId) else {
             let error = NSError(domain: "", code: 200, userInfo: nil)
             return reject("error", "failed to parse uuid", error);
         }
 
-        guard let fileUrl = URL(string: fileURI) else {
+        guard let fileUrl = URL(string: self.fileURI) else {
             let error = NSError(domain: "", code: 200, userInfo: nil)
             return reject("error", "failed to parse file uri as url", error);
         }
@@ -56,7 +56,7 @@ class DeviceUpgrade {
             self.bleTransport = McuMgrBleTransport(bleUuid)
             self.dfuManager = FirmwareUpgradeManager(transporter: self.bleTransport!, delegate: self)
 
-            let estimatedSwapTime: TimeInterval = options["estimatedSwapTime"] as! TimeInterval
+            let estimatedSwapTime: TimeInterval = self.options["estimatedSwapTime"] as! TimeInterval
             let config = FirmwareUpgradeConfiguration(
                 estimatedSwapTime: estimatedSwapTime
             )

ios/McuManager.swift

@@ -22,24 +22,26 @@ class RNMcuManager: RCTEventEmitter {
 
     @objc
     func eraseImage(_ bleId: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) -> Void {
-        guard let bleUuid = UUID(uuidString: bleId) else {
-            let error = NSError(domain: "", code: 200, userInfo: nil)
-            return reject("error", "failed to parse uuid", error);
-        }
+        DispatchQueue.main.async {
+            guard let bleUuid = UUID(uuidString: bleId) else {
+                let error = NSError(domain: "", code: 200, userInfo: nil)
+                return reject("error", "failed to parse uuid", error);
+            }
+
+            let bleTransport = McuMgrBleTransport(bleUuid)
+            let imageManager = ImageManager(transporter: bleTransport)
 
-        let bleTransport = McuMgrBleTransport(bleUuid)
-        let imageManager = ImageManager(transporter: bleTransport)
+            imageManager.erase { (response: McuMgrResponse?, err: Error?) in
+                bleTransport.close()
 
-        imageManager.erase { (response: McuMgrResponse?, err: Error?) in
-            bleTransport.close()
+                if (err != nil) {
+                    reject("ERASE_ERR", err?.localizedDescription, err)
+                    return
+                }
 
-            if (err != nil) {
-                reject("ERASE_ERR", err?.localizedDescription, err)
+                resolve(nil)
                 return
             }
-
-            resolve(nil)
-            return
         }
     }
 
@@ -50,12 +52,14 @@ class RNMcuManager: RCTEventEmitter {
 
     @objc
     func runUpgrade(_ id: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) -> Void {
-        guard let upgrade = self.upgrades[id] else {
-            reject("ID_NOT_FOUND", "Upgrade object not found", nil)
-            return
-        }
+        DispatchQueue.main.async {
+            guard let upgrade = self.upgrades[id] else {
+                reject("ID_NOT_FOUND", "Upgrade object not found", nil)
+                return
+            }
 
-        upgrade.startUpgrade(resolver: resolve, rejecter: reject)
+            upgrade.startUpgrade(resolver: resolve, rejecter: reject)
+        }
     }
 
     @objc