Merge pull request #291 from PlayerData/misc

Misc

Author: ball-hayden

ios/DeviceUpgrade.swift

@@ -49,9 +49,9 @@ class DeviceUpgrade {
     }
 
     do {
-      let fileHandle = try FileHandle(forReadingFrom: fileUrl)
-      let file = Data(fileHandle.availableData)
-      fileHandle.closeFile()
+      let binData = try Data(contentsOf: fileUrl)
+      let binHash = try McuMgrImage(data: binData).hash
+      let image = ImageManager.Image(image: 0, hash: binHash, data: binData)
 
       self.bleTransport = McuMgrBleTransport(bleUuid)
       self.dfuManager = FirmwareUpgradeManager(transporter: self.bleTransport!, delegate: self)
@@ -64,7 +64,7 @@ class DeviceUpgrade {
 
       DispatchQueue.main.async {
         do {
-          try self.dfuManager!.start(data: file as Data, using: config)
+          try self.dfuManager!.start(images: [image], using: config)
         } catch {
           promise.reject(UnexpectedException(error))
         }

ios/ReactNativeMcuManager.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
-  s.dependency 'iOSMcuManagerLibrary', '~> 1.4.3'
+  s.dependency 'iOSMcuManagerLibrary', '~> 1.6.0'
 
   # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {

src/Upgrade.ts

@@ -59,14 +59,23 @@ const McuManagerEvents = new EventEmitter(
 declare const UpgradeIdSymbol: unique symbol;
 type UpgradeID = string & { [UpgradeIdSymbol]: never };
 
+type UpgradeEvent = 'upgradeStateChanged' | 'uploadProgress';
+
+type UpgradeStateChangedPayload = {
+  id: UpgradeID;
+  state: FirmwareUpgradeState;
+};
+type UploadProgressPayload = { id: UpgradeID; progress: number };
+type UpgradeEventPayload = UpgradeStateChangedPayload & UploadProgressPayload;
+
 type AddUpgradeListener = {
   (
     eventType: 'upgradeStateChanged',
-    listener: ({ state }: { state: FirmwareUpgradeState }) => void
+    listener: (event: UpgradeStateChangedPayload) => void
   ): Subscription;
   (
     eventType: 'uploadProgress',
-    listener: ({ progress }: { progress: number }) => void
+    listener: (event: UploadProgressPayload) => void
   ): Subscription;
 };
 
@@ -106,10 +115,17 @@ class Upgrade {
   };
 
   addListener: AddUpgradeListener = (
-    eventType: any,
-    listener: (...args: any[]) => void
+    eventType: UpgradeEvent,
+    listener: (event: UpgradeEventPayload) => void
   ): Subscription => {
-    return McuManagerEvents.addListener(eventType, listener);
+    return McuManagerEvents.addListener<UpgradeEventPayload>(
+      eventType,
+      (event) => {
+        if (event.id !== this.id) return;
+
+        listener(event);
+      }
+    );
   };
 
   /**