@onekeyfe/react-native-range-downloader 3.0.81-alpha.5 → 3.0.81-alpha.7

package/ios/FirmwareArtifactStore.swift

@@ -1,5 +1,6 @@
 import CryptoKit
 import Foundation
+import ReactNativeNativeLogger
 import SniConnect
 
 func isFirmwareArtifactTLSError(_ error: Error) -> Bool {
@@ -520,6 +521,10 @@ final class FirmwareArtifactStore {
       return artifact
     } catch {
       markDownloadActive(expectedSha256, delta: -1)
+      OneKeyLog.error(
+        "FirmwareArtifact",
+        "event=download_failed transactionId=\(params.transactionId) artifactId=\(params.artifactId) route=\(params.routeType) errorType=\(String(describing: type(of: error)))"
+      )
       if error is CancellationError ||
         isTransactionCancelled(params.transactionId) {
         throw FirmwareArtifactStoreError.downloadFailed(
@@ -530,6 +535,29 @@ final class FirmwareArtifactStore {
     }
   }
 
+  func cachedArtifact(
+    _ params: FirmwareArtifactDownloadParams
+  ) throws -> StoredFirmwareArtifact? {
+    try Self.validateDownloadParams(params)
+    try rejectIfCancelled(transactionId: params.transactionId)
+    let expectedSha256 = params.expectedSha256.lowercased()
+    let finalURL = artifactURL(sha256: expectedSha256)
+    guard let artifact = try? validateStoredArtifact(
+      fileURL: finalURL,
+      expectedSize: Int64(params.expectedSize),
+      expectedSha256: expectedSha256
+    ) else {
+      return nil
+    }
+    try retainExpectedArtifact(
+      leaseRef: params.leaseRef,
+      transactionId: params.transactionId,
+      artifactRef: artifact.artifactRef
+    )
+    try rejectIfCancelled(transactionId: params.transactionId)
+    return artifact
+  }
+
   func cancelDownloads(transactionId: String) async throws {
     guard Self.isSafeIdentifier(transactionId) else {
       throw FirmwareArtifactStoreError.invalidInput(
@@ -558,12 +586,8 @@ final class FirmwareArtifactStore {
       return existing
     }
 
-    if params.routeType == "domain" {
-      return try await RangeDownloader.shared.downloadFirmwareArtifact(
-        params: params
-      )
-    }
-
+    // Firmware preflight is foreground-bound, so both routes use the same
+    // cancellable stream instead of waiting on process-owned background tasks.
     let partialURL = rootURL.appendingPathComponent(
       firmwareArtifactPartialFileName(
         transactionId: params.transactionId,
@@ -600,11 +624,19 @@ final class FirmwareArtifactStore {
       currentSize = 0
     }
 
+    OneKeyLog.info(
+      "FirmwareArtifact",
+      "event=stream_start transactionId=\(params.transactionId) artifactId=\(params.artifactId) route=\(params.routeType) expectedBytes=\(Int64(params.expectedSize)) resumeBytes=\(currentSize)"
+    )
     try await streamDownload(
       params,
       partialURL: partialURL,
       resumeOffset: min(currentSize, Int64(params.expectedSize))
     )
+    OneKeyLog.info(
+      "FirmwareArtifact",
+      "event=stream_complete transactionId=\(params.transactionId) artifactId=\(params.artifactId) route=\(params.routeType) expectedBytes=\(Int64(params.expectedSize))"
+    )
     let artifact: StoredFirmwareArtifact
     do {
       artifact = try validateStoredArtifact(

package/ios/ReactNativeRangeDownloader.swift

@@ -2,6 +2,16 @@ import Foundation
 import NitroModules
 import ReactNativeNativeLogger
 
+private func settledFirmwareArtifactPromise<T>(
+  _ operation: () throws -> T
+) -> Promise<T> {
+  do {
+    return Promise.resolved(withResult: try operation())
+  } catch {
+    return Promise.rejected(withError: error)
+  }
+}
+
 // MARK: - Nitro HybridObject entry point
 //
 // Thin Nitro shim over `RangeDownloader.shared`. The heavy lifting — concurrent
@@ -108,7 +118,20 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
   func downloadFirmwareArtifact(
     params: FirmwareArtifactDownloadParams
   ) throws -> Promise<FirmwareArtifactReceipt> {
-    Promise.async {
+    do {
+      if let artifact = try FirmwareArtifactStore.shared.cachedArtifact(params) {
+        return Promise.resolved(
+          withResult: FirmwareArtifactReceipt(
+            artifactRef: artifact.artifactRef,
+            size: Double(artifact.size),
+            sha256: artifact.sha256
+          )
+        )
+      }
+    } catch {
+      return Promise.rejected(withError: error)
+    }
+    return Promise.async {
       let artifact = try await FirmwareArtifactStore.shared.download(params)
       return FirmwareArtifactReceipt(
         artifactRef: artifact.artifactRef,
@@ -131,7 +154,7 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
   func discardFirmwareArtifact(
     params: FirmwareArtifactRefParams
   ) throws -> Promise<Void> {
-    Promise.async {
+    settledFirmwareArtifactPromise {
       try FirmwareArtifactStore.shared.discard(artifactRef: params.artifactRef)
     }
   }
@@ -139,7 +162,7 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
   func openFirmwareArtifact(
     params: FirmwareArtifactRefParams
   ) throws -> Promise<FirmwareArtifactReaderInfo> {
-    Promise.async {
+    settledFirmwareArtifactPromise {
       let reader = try FirmwareArtifactStore.shared.open(
         artifactRef: params.artifactRef
       )
@@ -153,7 +176,7 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
   func readFirmwareArtifact(
     params: FirmwareArtifactReaderReadParams
   ) throws -> Promise<ArrayBuffer> {
-    Promise.async {
+    settledFirmwareArtifactPromise {
       guard
         params.offset.isFinite,
         params.offset >= 0,
@@ -180,7 +203,7 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
   func closeFirmwareArtifact(
     params: FirmwareArtifactReaderCloseParams
   ) throws -> Promise<Void> {
-    Promise.async {
+    settledFirmwareArtifactPromise {
       try FirmwareArtifactStore.shared.close(readerId: params.readerId)
     }
   }
@@ -188,7 +211,7 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
   func materializeFirmwareArchive(
     params: FirmwareArchiveMaterializeParams
   ) throws -> Promise<FirmwareArchiveMaterializeResult> {
-    Promise.async {
+    settledFirmwareArtifactPromise {
       let entries = try FirmwareArtifactStore.shared.materializeArchive(
         leaseRef: params.leaseRef,
         artifactRef: params.archiveArtifactRef,
@@ -212,7 +235,7 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
   func createFirmwareArtifactLease(
     params: FirmwareArtifactLeaseCreateParams
   ) throws -> Promise<FirmwareArtifactLease> {
-    Promise.async {
+    settledFirmwareArtifactPromise {
       FirmwareArtifactLease(
         leaseRef: try FirmwareArtifactStore.shared.createLease(
           transactionId: params.transactionId
@@ -224,7 +247,7 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
   func retainFirmwareArtifact(
     params: FirmwareArtifactLeaseRetainParams
   ) throws -> Promise<Void> {
-    Promise.async {
+    settledFirmwareArtifactPromise {
       try FirmwareArtifactStore.shared.retain(
         leaseRef: params.leaseRef,
         artifactRef: params.artifactRef
@@ -235,7 +258,7 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
   func releaseFirmwareArtifactLease(
     params: FirmwareArtifactLeaseReleaseParams
   ) throws -> Promise<Void> {
-    Promise.async {
+    settledFirmwareArtifactPromise {
       try FirmwareArtifactStore.shared.releaseLease(
         leaseRef: params.leaseRef,
         disposition: params.disposition
@@ -244,7 +267,7 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
   }
 
   func sweepFirmwareArtifactOrphans() throws -> Promise<FirmwareArtifactSweepResult> {
-    Promise.async {
+    settledFirmwareArtifactPromise {
       let result = try FirmwareArtifactStore.shared.sweepOrphans()
       return FirmwareArtifactSweepResult(
         deletedFiles: Double(result.deletedFiles),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-range-downloader",
-  "version": "3.0.81-alpha.5",
+  "version": "3.0.81-alpha.7",
   "description": "react-native-range-downloader",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -88,7 +88,7 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "@onekeyfe/react-native-sni-connect": "3.0.81-alpha.5",
+    "@onekeyfe/react-native-sni-connect": "3.0.81-alpha.7",
     "react": "*",
     "react-native": "*",
     "react-native-nitro-modules": "0.33.2"