@onekeyfe/react-native-range-downloader 3.0.81-alpha.2 → 3.0.81-alpha.3

package/android/src/main/java/com/margelo/nitro/reactnativerangedownloader/ReactNativeRangeDownloader.kt

@@ -9,6 +9,9 @@ import java.io.File
 import java.security.MessageDigest
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.atomic.AtomicLong
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 
 // P1: Nitro adapter for the Android concurrent multi-range downloader.
 //
@@ -34,6 +37,7 @@ class ReactNativeRangeDownloader : HybridReactNativeRangeDownloaderSpec() {
 
   private val listeners = CopyOnWriteArrayList<Listener>()
   private val nextListenerId = AtomicLong(1)
+  private val firmwareArtifactScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
   // Active downloads keyed by "channel|taskId" so cancel/discardArtifacts can
   // flip the abort flag + stop the worker pool BEFORE deleting files, instead of
@@ -278,7 +282,7 @@ class ReactNativeRangeDownloader : HybridReactNativeRangeDownloaderSpec() {
   override fun downloadFirmwareArtifact(
     params: FirmwareArtifactDownloadParams,
   ): Promise<FirmwareArtifactReceipt> {
-    return Promise.async {
+    return Promise.async(firmwareArtifactScope) {
       val artifact = FirmwareArtifactStore.download(params)
       FirmwareArtifactReceipt(
         artifactRef = artifact.artifactRef,
@@ -291,7 +295,7 @@ class ReactNativeRangeDownloader : HybridReactNativeRangeDownloaderSpec() {
   override fun cancelFirmwareArtifactDownloads(
     params: FirmwareArtifactCancelParams,
   ): Promise<Unit> {
-    return Promise.async {
+    return Promise.async(firmwareArtifactScope) {
       FirmwareArtifactStore.cancelDownloads(params.transactionId)
     }
   }
@@ -299,7 +303,7 @@ class ReactNativeRangeDownloader : HybridReactNativeRangeDownloaderSpec() {
   override fun discardFirmwareArtifact(
     params: FirmwareArtifactRefParams,
   ): Promise<Unit> {
-    return Promise.async {
+    return Promise.async(firmwareArtifactScope) {
       FirmwareArtifactStore.discard(params.artifactRef)
     }
   }
@@ -307,7 +311,7 @@ class ReactNativeRangeDownloader : HybridReactNativeRangeDownloaderSpec() {
   override fun openFirmwareArtifact(
     params: FirmwareArtifactRefParams,
   ): Promise<FirmwareArtifactReaderInfo> {
-    return Promise.async {
+    return Promise.async(firmwareArtifactScope) {
       val (readerId, size) = FirmwareArtifactStore.open(params.artifactRef)
       FirmwareArtifactReaderInfo(readerId = readerId, size = size.toDouble())
     }
@@ -316,7 +320,7 @@ class ReactNativeRangeDownloader : HybridReactNativeRangeDownloaderSpec() {
   override fun readFirmwareArtifact(
     params: FirmwareArtifactReaderReadParams,
   ): Promise<ArrayBuffer> {
-    return Promise.async {
+    return Promise.async(firmwareArtifactScope) {
       require(
         params.offset.isFinite() &&
           params.offset >= 0 &&
@@ -340,7 +344,7 @@ class ReactNativeRangeDownloader : HybridReactNativeRangeDownloaderSpec() {
   override fun closeFirmwareArtifact(
     params: FirmwareArtifactReaderCloseParams,
   ): Promise<Unit> {
-    return Promise.async {
+    return Promise.async(firmwareArtifactScope) {
       FirmwareArtifactStore.close(params.readerId)
     }
   }
@@ -348,7 +352,7 @@ class ReactNativeRangeDownloader : HybridReactNativeRangeDownloaderSpec() {
   override fun materializeFirmwareArchive(
     params: FirmwareArchiveMaterializeParams,
   ): Promise<FirmwareArchiveMaterializeResult> {
-    return Promise.async {
+    return Promise.async(firmwareArtifactScope) {
       val artifacts = FirmwareArtifactStore.materializeArchive(
         params.leaseRef,
         params.archiveArtifactRef,
@@ -372,7 +376,7 @@ class ReactNativeRangeDownloader : HybridReactNativeRangeDownloaderSpec() {
   override fun createFirmwareArtifactLease(
     params: FirmwareArtifactLeaseCreateParams,
   ): Promise<FirmwareArtifactLease> {
-    return Promise.async {
+    return Promise.async(firmwareArtifactScope) {
       FirmwareArtifactLease(
         leaseRef = FirmwareArtifactStore.createLease(params.transactionId),
       )
@@ -382,7 +386,7 @@ class ReactNativeRangeDownloader : HybridReactNativeRangeDownloaderSpec() {
   override fun retainFirmwareArtifact(
     params: FirmwareArtifactLeaseRetainParams,
   ): Promise<Unit> {
-    return Promise.async {
+    return Promise.async(firmwareArtifactScope) {
       FirmwareArtifactStore.retain(params.leaseRef, params.artifactRef)
     }
   }
@@ -390,13 +394,13 @@ class ReactNativeRangeDownloader : HybridReactNativeRangeDownloaderSpec() {
   override fun releaseFirmwareArtifactLease(
     params: FirmwareArtifactLeaseReleaseParams,
   ): Promise<Unit> {
-    return Promise.async {
+    return Promise.async(firmwareArtifactScope) {
       FirmwareArtifactStore.releaseLease(params.leaseRef, params.disposition)
     }
   }
 
   override fun sweepFirmwareArtifactOrphans(): Promise<FirmwareArtifactSweepResult> {
-    return Promise.async {
+    return Promise.async(firmwareArtifactScope) {
       val (deletedFiles, deletedBytes) = FirmwareArtifactStore.sweepOrphans()
       FirmwareArtifactSweepResult(
         deletedFiles = deletedFiles.toDouble(),

package/ios/FirmwareArtifactStore.swift

@@ -219,7 +219,11 @@ final class FirmwareArtifactStore {
       transactionId: params.transactionId,
       artifactRef: "fw:\(expectedSha256)"
     )
-    let key = "\(expectedSha256):\(Int64(params.expectedSize))"
+    let key = firmwareArtifactDownloadKey(
+      transactionId: params.transactionId,
+      expectedSize: Int64(params.expectedSize),
+      expectedSha256: expectedSha256
+    )
     markDownloadActive(expectedSha256, delta: 1)
     do {
       let artifact = try await downloadCoordinator.run(
@@ -913,6 +917,29 @@ final class FirmwareArtifactStore {
     _ params: FirmwareArtifactDownloadParams,
     partialURL: URL,
     resumeOffset: Int64
+  ) async throws {
+    do {
+      try await FirmwareArtifactWallClockDeadline.run(
+        timeoutSeconds:
+          params.overallDeadlineSeconds ?? Self.defaultDownloadDeadline
+      ) { [self] in
+        try await streamDownloadWithinDeadline(
+          params,
+          partialURL: partialURL,
+          resumeOffset: resumeOffset
+        )
+      }
+    } catch FirmwareArtifactDeadlineError.exceeded {
+      throw FirmwareArtifactStoreError.downloadFailed(
+        "ARTIFACT_DEADLINE_EXCEEDED: firmware download exceeded its deadline"
+      )
+    }
+  }
+
+  private func streamDownloadWithinDeadline(
+    _ params: FirmwareArtifactDownloadParams,
+    partialURL: URL,
+    resumeOffset: Int64
   ) async throws {
     guard let url = URL(string: params.url), let hostname = url.host else {
       throw FirmwareArtifactStoreError.invalidInput("Invalid firmware URL")
@@ -949,10 +976,10 @@ final class FirmwareArtifactStore {
       }
     }
 
-    let bytes: URLSession.AsyncBytes
+    let downloadedURL: URL
     let response: URLResponse
     do {
-      (bytes, response) = try await session.bytes(for: request)
+      (downloadedURL, response) = try await session.download(for: request)
     } catch {
       if isCancellationError(
         error,
@@ -971,9 +998,20 @@ final class FirmwareArtifactStore {
         "ARTIFACT_NETWORK_FAILED: firmware request failed"
       )
     }
+    defer { try? fileManager.removeItem(at: downloadedURL) }
     guard let httpResponse = response as? HTTPURLResponse else {
       throw FirmwareArtifactStoreError.downloadFailed("Firmware response is not HTTP")
     }
+    guard
+      let responseURL = httpResponse.url,
+      responseURL.scheme?.lowercased() == "https",
+      responseURL.host?.lowercased() == hostname.lowercased(),
+      responseURL.port == nil || responseURL.port == 443
+    else {
+      throw FirmwareArtifactStoreError.downloadFailed(
+        "ARTIFACT_REDIRECT_REJECTED: firmware response changed canonical identity"
+      )
+    }
     guard httpResponse.statusCode == 200 || httpResponse.statusCode == 206 else {
       throw FirmwareArtifactStoreError.downloadFailed(
         "ARTIFACT_HTTP_\(httpResponse.statusCode): firmware request failed"
@@ -1003,21 +1041,25 @@ final class FirmwareArtifactStore {
     }
 
     var written = append ? resumeOffset : 0
-    var buffer = Data()
-    buffer.reserveCapacity(64 * 1024)
+    let source = try FileHandle(forReadingFrom: downloadedURL)
+    defer { try? source.close() }
     do {
-      for try await byte in bytes {
-        buffer.append(byte)
-        if buffer.count >= 64 * 1024 {
-          written += Int64(buffer.count)
-          guard written <= Int64(params.maxBytes) else {
-            throw FirmwareArtifactStoreError.downloadFailed(
-              "ARTIFACT_PROTOCOL_INVALID: firmware artifact exceeds maxBytes"
-            )
-          }
-          try handle.write(contentsOf: buffer)
-          buffer.removeAll(keepingCapacity: true)
+      while true {
+        try Task.checkCancellation()
+        try rejectIfCancelled(transactionId: params.transactionId)
+        guard
+          let buffer = try source.read(upToCount: 64 * 1024),
+          !buffer.isEmpty
+        else {
+          break
         }
+        written += Int64(buffer.count)
+        guard written <= Int64(params.maxBytes) else {
+          throw FirmwareArtifactStoreError.downloadFailed(
+            "ARTIFACT_PROTOCOL_INVALID: firmware artifact exceeds maxBytes"
+          )
+        }
+        try handle.write(contentsOf: buffer)
       }
     } catch let error as FirmwareArtifactStoreError {
       throw error
@@ -1039,15 +1081,6 @@ final class FirmwareArtifactStore {
         "ARTIFACT_NETWORK_FAILED: firmware response stream failed"
       )
     }
-    if !buffer.isEmpty {
-      written += Int64(buffer.count)
-      guard written <= Int64(params.maxBytes) else {
-        throw FirmwareArtifactStoreError.downloadFailed(
-          "ARTIFACT_PROTOCOL_INVALID: firmware artifact exceeds maxBytes"
-        )
-      }
-      try handle.write(contentsOf: buffer)
-    }
     try handle.synchronize()
     try rejectIfCancelled(transactionId: params.transactionId)
   }

package/ios/RangeDownloadLogic.swift

@@ -1,6 +1,77 @@
 import Foundation
 import CommonCrypto
 
+enum FirmwareArtifactDeadlineError: Error {
+  case exceeded
+}
+
+enum FirmwareArtifactWallClockDeadline {
+  static func run<T>(
+    timeoutSeconds: TimeInterval,
+    operation: @escaping @Sendable () async throws -> T
+  ) async throws -> T {
+    let timeoutNanoseconds = UInt64(max(0.001, timeoutSeconds) * 1_000_000_000.0)
+    return try await withThrowingTaskGroup(of: T.self) { group in
+      group.addTask {
+        try await operation()
+      }
+      group.addTask {
+        try await Task.sleep(nanoseconds: timeoutNanoseconds)
+        throw FirmwareArtifactDeadlineError.exceeded
+      }
+      defer { group.cancelAll() }
+      guard let result = try await group.next() else {
+        throw FirmwareArtifactDeadlineError.exceeded
+      }
+      return result
+    }
+  }
+}
+
+func firmwareArtifactDownloadKey(
+  transactionId: String,
+  expectedSize: Int64,
+  expectedSha256: String
+) -> String {
+  "\(transactionId)|\(expectedSize)|\(expectedSha256)"
+}
+
+enum FirmwareBackgroundDownloadError: LocalizedError, CustomStringConvertible {
+  case cancelled
+  case invalidTask
+  case deadlineExceeded
+  case redirectRejected
+  case responseRejected
+  case sizeRejected
+  case tlsRejected
+  case transferFailed
+
+  var errorDescription: String? {
+    switch self {
+    case .cancelled:
+      return "ARTIFACT_CANCELLED: firmware background download was cancelled"
+    case .invalidTask:
+      return "ARTIFACT_PROTOCOL_INVALID: firmware background task is invalid"
+    case .deadlineExceeded:
+      return "ARTIFACT_DEADLINE_EXCEEDED: firmware download exceeded its deadline"
+    case .redirectRejected:
+      return "ARTIFACT_REDIRECT_REJECTED: firmware redirect changed canonical identity"
+    case .responseRejected:
+      return "ARTIFACT_PROTOCOL_INVALID: firmware response is invalid"
+    case .sizeRejected:
+      return "ARTIFACT_PROTOCOL_INVALID: firmware artifact size is invalid"
+    case .tlsRejected:
+      return "ARTIFACT_TLS_FAILED: firmware TLS validation failed"
+    case .transferFailed:
+      return "ARTIFACT_NETWORK_FAILED: firmware background transfer failed"
+    }
+  }
+
+  var description: String {
+    errorDescription ?? "ARTIFACT_NETWORK_FAILED: firmware background transfer failed"
+  }
+}
+
 // MARK: - Dependency-free RangeDownloader logic (OCDS §4 / §5)
 //
 // This file holds the DETERMINISTIC, dependency-light pieces of the range

package/ios/ReactNativeRangeDownloader.swift

@@ -323,49 +323,22 @@ private struct FirmwareBackgroundTaskDescriptor: Codable, Equatable {
   let deadlineAt: TimeInterval
 
   var key: String {
-    "\(expectedSize)|\(expectedSha256)"
+    firmwareArtifactDownloadKey(
+      transactionId: transactionId,
+      expectedSize: expectedSize,
+      expectedSha256: expectedSha256
+    )
   }
 
-  func hasSameArtifactIdentity(
+  func hasSameDownloadIdentity(
     as other: FirmwareBackgroundTaskDescriptor
   ) -> Bool {
-    expectedSize == other.expectedSize &&
+    transactionId == other.transactionId &&
+      expectedSize == other.expectedSize &&
       expectedSha256 == other.expectedSha256
   }
 }
 
-private enum FirmwareBackgroundDownloadError: LocalizedError {
-  case cancelled
-  case invalidTask
-  case deadlineExceeded
-  case redirectRejected
-  case responseRejected
-  case sizeRejected
-  case tlsRejected
-  case transferFailed
-
-  var errorDescription: String? {
-    switch self {
-    case .cancelled:
-      return "ARTIFACT_CANCELLED: firmware background download was cancelled"
-    case .invalidTask:
-      return "ARTIFACT_PROTOCOL_INVALID: firmware background task is invalid"
-    case .deadlineExceeded:
-      return "ARTIFACT_DEADLINE_EXCEEDED: firmware download exceeded its deadline"
-    case .redirectRejected:
-      return "ARTIFACT_REDIRECT_REJECTED: firmware redirect changed canonical identity"
-    case .responseRejected:
-      return "ARTIFACT_PROTOCOL_INVALID: firmware response is invalid"
-    case .sizeRejected:
-      return "ARTIFACT_PROTOCOL_INVALID: firmware artifact size is invalid"
-    case .tlsRejected:
-      return "ARTIFACT_TLS_FAILED: firmware TLS validation failed"
-    case .transferFailed:
-      return "ARTIFACT_NETWORK_FAILED: firmware background transfer failed"
-    }
-  }
-}
-
 public final class RangeDownloader: NSObject, URLSessionDownloadDelegate {
 
   public static let shared = RangeDownloader()
@@ -836,9 +809,12 @@ public final class RangeDownloader: NSObject, URLSessionDownloadDelegate {
       else {
         continue
       }
-      if candidate.hasSameArtifactIdentity(as: descriptor) {
+      if candidate.hasSameDownloadIdentity(as: descriptor) {
         matchingTaskFound = true
-      } else if candidate.taskId == descriptor.taskId {
+      } else if
+        candidate.transactionId == descriptor.transactionId &&
+        candidate.taskId == descriptor.taskId
+      {
         task.cancel()
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-range-downloader",
-  "version": "3.0.81-alpha.2",
+  "version": "3.0.81-alpha.3",
   "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.2",
+    "@onekeyfe/react-native-sni-connect": "3.0.81-alpha.3",
     "react": "*",
     "react-native": "*",
     "react-native-nitro-modules": "0.33.2"