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

package/ios/ReactNativeRangeDownloader.swift

@@ -108,7 +108,7 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
 
   func getFirmwareArtifactCapabilities() throws -> FirmwareArtifactCapabilities {
     FirmwareArtifactCapabilities(
-      firmwareArtifactProtocolVersion: 2,
+      firmwareArtifactProtocolVersion: 3,
       supportedRouteTypes: ["domain", "pinnedIp"],
       supportsArchiveMaterialization: true,
       maxReadBytes: Double(FirmwareArtifactStore.maxReadBytes)
@@ -144,7 +144,14 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
   func cancelFirmwareArtifactDownloads(
     params: FirmwareArtifactCancelParams
   ) throws -> Promise<Void> {
-    Promise.async {
+    guard FirmwareArtifactStore.isSafeIdentifier(params.transactionId) else {
+      return Promise.rejected(
+        withError: FirmwareArtifactStoreError.invalidInput(
+          "Invalid firmware transactionId"
+        )
+      )
+    }
+    return Promise.async {
       try await FirmwareArtifactStore.shared.cancelDownloads(
         transactionId: params.transactionId
       )
@@ -336,50 +343,10 @@ extension RangeFallbackClass {
   }
 }
 
-private struct FirmwareBackgroundTaskDescriptor: Codable, Equatable {
-  let schemaVersion: Int
-  let taskId: String
-  let transactionId: String
-  let expectedSize: Int64
-  let expectedSha256: String
-  let hostname: String
-  let deadlineAt: TimeInterval
-
-  var key: String {
-    firmwareArtifactDownloadKey(
-      transactionId: transactionId,
-      expectedSize: expectedSize,
-      expectedSha256: expectedSha256
-    )
-  }
-
-  func hasSameDownloadIdentity(
-    as other: FirmwareBackgroundTaskDescriptor
-  ) -> Bool {
-    transactionId == other.transactionId &&
-      expectedSize == other.expectedSize &&
-      expectedSha256 == other.expectedSha256
-  }
-}
-
 public final class RangeDownloader: NSObject, URLSessionDownloadDelegate {
 
   public static let shared = RangeDownloader()
 
-  public static func routeFirmwareBackgroundEvents(
-    identifier: String,
-    completionHandler: @escaping () -> Void
-  ) -> Bool {
-    guard identifier == sessionIdentifier(for: .firmware) else {
-      return false
-    }
-    shared.attachBackgroundEvents(
-      identifier: identifier,
-      completionHandler: completionHandler
-    )
-    return true
-  }
-
   /// Posted by the AppDelegate from
   /// application(_:handleEventsForBackgroundURLSession:completionHandler:).
   /// userInfo: ["identifier": String, "completionHandler": () -> Void].
@@ -416,11 +383,6 @@ public final class RangeDownloader: NSObject, URLSessionDownloadDelegate {
   /// notification), keyed by session identifier, so we can call each back once
   /// all its queued background events have been delivered.
   private var backgroundCompletionHandlers: [String: () -> Void] = [:]
-  private var firmwareWaiters: [
-    String: [CheckedContinuation<StoredFirmwareArtifact, Error>]
-  ] = [:]
-  private var firmwareTaskErrors: [Int: Error] = [:]
-  private var completedFirmwareTasks: Set<Int> = []
 
   // Per-run mutable state.
   private final class RunState {
@@ -678,238 +640,6 @@ public final class RangeDownloader: NSObject, URLSessionDownloadDelegate {
     return (r, decoded.segIndex)
   }
 
-  private static let firmwareTaskDescriptionPrefix = "firmware-v2:"
-
-  private static func encodeFirmwareTaskDescription(
-    _ descriptor: FirmwareBackgroundTaskDescriptor
-  ) throws -> String {
-    let data = try JSONEncoder().encode(descriptor)
-    return firmwareTaskDescriptionPrefix + data.base64EncodedString()
-  }
-
-  private static func decodeFirmwareTaskDescription(
-    _ description: String?
-  ) -> FirmwareBackgroundTaskDescriptor? {
-    guard
-      let description,
-      description.hasPrefix(firmwareTaskDescriptionPrefix),
-      let data = Data(
-        base64Encoded: String(
-          description.dropFirst(firmwareTaskDescriptionPrefix.count)
-        )
-      ),
-      data.count <= 2048,
-      let descriptor = try? JSONDecoder().decode(
-        FirmwareBackgroundTaskDescriptor.self,
-        from: data
-      ),
-      descriptor.schemaVersion == 2,
-      descriptor.taskId.range(
-        of: "^[A-Za-z0-9._-]{1,100}$",
-        options: .regularExpression
-      ) != nil,
-      descriptor.transactionId.range(
-        of: "^[A-Za-z0-9._:-]{1,160}$",
-        options: .regularExpression
-      ) != nil,
-      descriptor.expectedSize > 0,
-      descriptor.expectedSize <= 512 * 1024 * 1024,
-      descriptor.expectedSha256.range(
-        of: "^[a-f0-9]{64}$",
-        options: .regularExpression
-      ) != nil,
-      !descriptor.hostname.isEmpty,
-      descriptor.hostname.count <= 253,
-      descriptor.deadlineAt.isFinite,
-      descriptor.deadlineAt > 0
-    else {
-      return nil
-    }
-    return descriptor
-  }
-
-  func downloadFirmwareArtifact(
-    params: FirmwareArtifactDownloadParams
-  ) async throws -> StoredFirmwareArtifact {
-    guard
-      params.routeType == "domain",
-      let url = URL(string: params.url),
-      let hostname = url.host?.lowercased()
-    else {
-      throw FirmwareBackgroundDownloadError.invalidTask
-    }
-    let deadlineSeconds = params.overallDeadlineSeconds ?? 180
-    guard
-      deadlineSeconds.isFinite,
-      deadlineSeconds > 0,
-      deadlineSeconds <= 24 * 60 * 60
-    else {
-      throw FirmwareBackgroundDownloadError.invalidTask
-    }
-    let descriptor = FirmwareBackgroundTaskDescriptor(
-      schemaVersion: 2,
-      taskId: params.taskId,
-      transactionId: params.transactionId,
-      expectedSize: Int64(params.expectedSize),
-      expectedSha256: params.expectedSha256.lowercased(),
-      hostname: hostname,
-      deadlineAt: Date().timeIntervalSince1970 + deadlineSeconds
-    )
-    guard !FirmwareArtifactStore.shared.isTransactionCancelled(
-      descriptor.transactionId
-    ) else {
-      throw FirmwareBackgroundDownloadError.cancelled
-    }
-    if let stored = try FirmwareArtifactStore.shared.storedArtifact(
-      expectedSize: descriptor.expectedSize,
-      expectedSha256: descriptor.expectedSha256
-    ) {
-      return stored
-    }
-
-    return try await withCheckedThrowingContinuation { continuation in
-      lock.withLockValue {
-        firmwareWaiters[descriptor.key, default: []].append(continuation)
-      }
-      Task { [weak self] in
-        await self?.reconcileOrStartFirmwareTask(
-          descriptor: descriptor,
-          url: url
-        )
-      }
-    }
-  }
-
-  func cancelFirmwareArtifactDownloads(
-    transactionId: String
-  ) async throws {
-    guard transactionId.range(
-      of: "^[A-Za-z0-9._:-]{1,160}$",
-      options: .regularExpression
-    ) != nil else {
-      throw FirmwareBackgroundDownloadError.invalidTask
-    }
-    let session = session(forChannel: .firmware, segmentCount: 1)
-    let tasks = await allTasks(in: session)
-    for task in tasks {
-      guard
-        let descriptor = Self.decodeFirmwareTaskDescription(
-          task.taskDescription
-        ),
-        descriptor.transactionId == transactionId
-      else {
-        continue
-      }
-      recordFirmwareTaskError(
-        taskIdentifier: task.taskIdentifier,
-        error: FirmwareBackgroundDownloadError.cancelled
-      )
-      task.cancel()
-    }
-  }
-
-  private func reconcileOrStartFirmwareTask(
-    descriptor: FirmwareBackgroundTaskDescriptor,
-    url: URL
-  ) async {
-    guard !FirmwareArtifactStore.shared.isTransactionCancelled(
-      descriptor.transactionId
-    ) else {
-      finishFirmwareTask(
-        key: descriptor.key,
-        result: .failure(FirmwareBackgroundDownloadError.cancelled)
-      )
-      return
-    }
-    let session = session(forChannel: .firmware, segmentCount: 1)
-    let tasks = await allTasks(in: session)
-    var matchingTaskFound = false
-    for task in tasks {
-      guard
-        let candidate = Self.decodeFirmwareTaskDescription(
-          task.taskDescription
-        )
-      else {
-        continue
-      }
-      if candidate.hasSameDownloadIdentity(as: descriptor) {
-        matchingTaskFound = true
-      } else if
-        candidate.transactionId == descriptor.transactionId &&
-        candidate.taskId == descriptor.taskId
-      {
-        task.cancel()
-      }
-    }
-    if matchingTaskFound {
-      return
-    }
-    do {
-      if let stored = try FirmwareArtifactStore.shared.storedArtifact(
-        expectedSize: descriptor.expectedSize,
-        expectedSha256: descriptor.expectedSha256
-      ) {
-        finishFirmwareTask(
-          key: descriptor.key,
-          result: .success(stored)
-        )
-        return
-      }
-      guard Date().timeIntervalSince1970 < descriptor.deadlineAt else {
-        throw FirmwareBackgroundDownloadError.deadlineExceeded
-      }
-      guard !FirmwareArtifactStore.shared.isTransactionCancelled(
-        descriptor.transactionId
-      ) else {
-        throw FirmwareBackgroundDownloadError.cancelled
-      }
-      var request = URLRequest(url: url)
-      request.cachePolicy = .reloadIgnoringLocalCacheData
-      request.timeoutInterval = max(
-        1,
-        descriptor.deadlineAt - Date().timeIntervalSince1970
-      )
-      request.setValue("identity", forHTTPHeaderField: "Accept-Encoding")
-      let task = session.downloadTask(with: request)
-      task.taskDescription = try Self.encodeFirmwareTaskDescription(
-        descriptor
-      )
-      task.resume()
-    } catch {
-      finishFirmwareTask(
-        key: descriptor.key,
-        result: .failure(error)
-      )
-    }
-  }
-
-  private func allTasks(in session: URLSession) async -> [URLSessionTask] {
-    await withCheckedContinuation { continuation in
-      session.getAllTasks { tasks in
-        continuation.resume(returning: tasks)
-      }
-    }
-  }
-
-  private func finishFirmwareTask(
-    key: String,
-    result: Result<StoredFirmwareArtifact, Error>
-  ) {
-    let continuations: [
-      CheckedContinuation<StoredFirmwareArtifact, Error>
-    ] = lock.withLockValue {
-      firmwareWaiters.removeValue(forKey: key) ?? []
-    }
-    for continuation in continuations {
-      switch result {
-      case let .success(artifact):
-        continuation.resume(returning: artifact)
-      case let .failure(error):
-        continuation.resume(throwing: error)
-      }
-    }
-  }
-
   // MARK: - Public entry
 
   /// Downloads [urlString] into [filePath] using concurrent background ranges.
@@ -1445,28 +1175,6 @@ public final class RangeDownloader: NSObject, URLSessionDownloadDelegate {
   public func urlSession(_ session: URLSession, downloadTask: URLSessionDownloadTask,
                   didWriteData bytesWritten: Int64, totalBytesWritten: Int64,
                   totalBytesExpectedToWrite: Int64) {
-    if let descriptor = Self.decodeFirmwareTaskDescription(
-      downloadTask.taskDescription
-    ) {
-      let exceedsBound =
-        totalBytesWritten > descriptor.expectedSize ||
-        (
-          totalBytesExpectedToWrite != NSURLSessionTransferSizeUnknown &&
-            totalBytesExpectedToWrite != descriptor.expectedSize
-        )
-      let expired =
-        Date().timeIntervalSince1970 >= descriptor.deadlineAt
-      if exceedsBound || expired {
-        recordFirmwareTaskError(
-          taskIdentifier: downloadTask.taskIdentifier,
-          error: exceedsBound
-            ? FirmwareBackgroundDownloadError.sizeRejected
-            : FirmwareBackgroundDownloadError.deadlineExceeded
-        )
-        downloadTask.cancel()
-      }
-      return
-    }
     guard let desc = downloadTask.taskDescription,
           let (state, idx) = run(for: desc) else { return }
     lock.lock()
@@ -1497,52 +1205,6 @@ public final class RangeDownloader: NSObject, URLSessionDownloadDelegate {
 
   public func urlSession(_ session: URLSession, downloadTask: URLSessionDownloadTask,
                   didFinishDownloadingTo location: URL) {
-    if let descriptor = Self.decodeFirmwareTaskDescription(
-      downloadTask.taskDescription
-    ) {
-      guard firmwareTaskError(
-        taskIdentifier: downloadTask.taskIdentifier
-      ) == nil else {
-        return
-      }
-      do {
-        guard
-          !FirmwareArtifactStore.shared.isTransactionCancelled(
-            descriptor.transactionId
-          ),
-          Date().timeIntervalSince1970 < descriptor.deadlineAt,
-          let response = downloadTask.response as? HTTPURLResponse,
-          response.statusCode == 200,
-          response.url?.scheme?.lowercased() == "https",
-          response.url?.host?.lowercased() == descriptor.hostname,
-          response.url?.port == nil || response.url?.port == 443
-        else {
-          throw FirmwareBackgroundDownloadError.responseRejected
-        }
-        let artifact = try FirmwareArtifactStore.shared.acceptBackgroundDownload(
-          temporaryURL: location,
-          transactionId: descriptor.transactionId,
-          expectedSize: descriptor.expectedSize,
-          expectedSha256: descriptor.expectedSha256
-        )
-        lock.withLockValue {
-          firmwareTaskErrors.removeValue(
-            forKey: downloadTask.taskIdentifier
-          )
-          completedFirmwareTasks.insert(downloadTask.taskIdentifier)
-        }
-        finishFirmwareTask(
-          key: descriptor.key,
-          result: .success(artifact)
-        )
-      } catch {
-        recordFirmwareTaskError(
-          taskIdentifier: downloadTask.taskIdentifier,
-          error: error
-        )
-      }
-      return
-    }
     guard let desc = downloadTask.taskDescription,
           let (state, idx) = run(for: desc) else { return }
     let ranges = lock.withLockValue { state.ranges }
@@ -1641,43 +1303,6 @@ public final class RangeDownloader: NSObject, URLSessionDownloadDelegate {
   }
 
   public func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
-    if let descriptor = Self.decodeFirmwareTaskDescription(
-      task.taskDescription
-    ) {
-      let completion: (completed: Bool, error: Error?) =
-        lock.withLockValue {
-          let completed = completedFirmwareTasks.remove(
-            task.taskIdentifier
-          ) != nil
-          let recordedError = firmwareTaskErrors.removeValue(
-            forKey: task.taskIdentifier
-          )
-          return (completed, recordedError)
-        }
-      if completion.completed {
-        return
-      }
-      let failure: Error
-      if let recordedError = completion.error {
-        failure = recordedError
-      } else if FirmwareArtifactStore.shared.isTransactionCancelled(
-        descriptor.transactionId
-      ) {
-        failure = FirmwareBackgroundDownloadError.cancelled
-      } else if let taskError = error {
-        failure =
-          isFirmwareArtifactTLSError(taskError)
-            ? FirmwareBackgroundDownloadError.tlsRejected
-            : FirmwareBackgroundDownloadError.transferFailed
-      } else {
-        failure = FirmwareBackgroundDownloadError.transferFailed
-      }
-      finishFirmwareTask(
-        key: descriptor.key,
-        result: .failure(failure)
-      )
-      return
-    }
     guard let desc = task.taskDescription,
           let (state, idx) = run(for: desc) else { return }
     let ranges = lock.withLockValue { state.ranges }
@@ -1853,26 +1478,6 @@ public final class RangeDownloader: NSObject, URLSessionDownloadDelegate {
                          willPerformHTTPRedirection response: HTTPURLResponse,
                          newRequest request: URLRequest,
                          completionHandler: @escaping (URLRequest?) -> Void) {
-    if let descriptor = Self.decodeFirmwareTaskDescription(
-      task.taskDescription
-    ) {
-      guard
-        request.url?.scheme?.lowercased() == "https",
-        request.url?.host?.lowercased() == descriptor.hostname,
-        request.url?.port == nil || request.url?.port == 443,
-        request.url?.user == nil,
-        request.url?.password == nil
-      else {
-        recordFirmwareTaskError(
-          taskIdentifier: task.taskIdentifier,
-          error: FirmwareBackgroundDownloadError.redirectRejected
-        )
-        completionHandler(nil)
-        return
-      }
-      completionHandler(request)
-      return
-    }
     if request.url?.scheme?.lowercased() != "https" {
       OneKeyLog.error("RangeDownloader", "blocked redirect to non-HTTPS URL")
       if let desc = task.taskDescription, let (state, _) = run(for: desc) {
@@ -1884,25 +1489,6 @@ public final class RangeDownloader: NSObject, URLSessionDownloadDelegate {
     }
   }
 
-  private func recordFirmwareTaskError(
-    taskIdentifier: Int,
-    error: Error
-  ) {
-    lock.withLockValue {
-      if firmwareTaskErrors[taskIdentifier] == nil {
-        firmwareTaskErrors[taskIdentifier] = error
-      }
-    }
-  }
-
-  private func firmwareTaskError(
-    taskIdentifier: Int
-  ) -> Error? {
-    lock.withLockValue {
-      firmwareTaskErrors[taskIdentifier]
-    }
-  }
-
   /// Called on the session delegate queue when all background events for this
   /// session have been delivered after a background relaunch.
   public func urlSessionDidFinishEvents(forBackgroundURLSession session: URLSession) {

package/lib/typescript/src/ReactNativeRangeDownloader.nitro.d.ts

@@ -36,8 +36,8 @@ export interface FirmwareArtifactDownloadParams {
     url: string;
     routeType: string;
     resolvedIp?: string;
-    expectedSize: number;
-    expectedSha256: string;
+    expectedSize?: number;
+    expectedSha256?: string;
     maxBytes: number;
     overallDeadlineSeconds?: number;
 }
@@ -73,7 +73,7 @@ export interface FirmwareArtifactReaderCloseParams {
 export interface FirmwareArchiveMaterializeParams {
     leaseRef: string;
     archiveArtifactRef: string;
-    expectedEntries: FirmwareArchiveExpectedEntry[];
+    expectedEntries?: FirmwareArchiveExpectedEntry[];
 }
 export interface FirmwareArchiveExpectedEntry {
     artifactId: string;

package/lib/typescript/src/ReactNativeRangeDownloader.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReactNativeRangeDownloader.nitro.d.ts","sourceRoot":"","sources":["../../../src/ReactNativeRangeDownloader.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAM/D,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,GAAG,UAAU,CAAC;AAEtE,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,eAAe,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAI5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAWD,MAAM,MAAM,oBAAoB,GAC5B,WAAW,GACX,mBAAmB,GACnB,mBAAmB,GACnB,UAAU,CAAC;AAKf,MAAM,MAAM,iBAAiB,GACzB,oBAAoB,GACpB,kBAAkB,GAClB,aAAa,GACb,UAAU,GACV,kBAAkB,GAClB,kBAAkB,GAClB,qBAAqB,GACrB,kBAAkB,GAClB,WAAW,GACX,iBAAiB,CAAC;AAEtB,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,oBAAoB,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,iBAAiB,CAAC;CAClC;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,eAAe,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,8BAA8B;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,uBAAuB;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,4BAA4B;IAC3C,+BAA+B,EAAE,MAAM,CAAC;IACxC,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,8BAA8B,EAAE,OAAO,CAAC;IACxC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,yBAAyB;IACxC,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,4BAA4B;IAC3C,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iCAAiC;IAChD,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,4BAA4B,EAAE,CAAC;CACjD;AAED,MAAM,WAAW,4BAA4B;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mCAAmC;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,uBAAuB,CAAC;CAClC;AAED,MAAM,WAAW,gCAAgC;IAC/C,SAAS,EAAE,mCAAmC,EAAE,CAAC;CAClD;AAED,MAAM,WAAW,iCAAiC;IAChD,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,iCAAiC;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,kCAAkC;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,2BAA2B;IAC1C,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,0BACf,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IAIzD,QAAQ,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAMpE,gBAAgB,CACd,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAAC;IAKjB,MAAM,CACJ,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAAC;IAGjB,mBAAmB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,GAAG,MAAM,CAAC;IAC3E,sBAAsB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAKzC,eAAe,IAAI,MAAM,CAAC;IAE1B,+BAA+B,IAAI,4BAA4B,CAAC;IAChE,wBAAwB,CACtB,MAAM,EAAE,8BAA8B,GACrC,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACpC,+BAA+B,CAC7B,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,uBAAuB,CAAC,MAAM,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,oBAAoB,CAClB,MAAM,EAAE,yBAAyB,GAChC,OAAO,CAAC,0BAA0B,CAAC,CAAC;IACvC,oBAAoB,CAClB,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,WAAW,CAAC,CAAC;IACxB,qBAAqB,CACnB,MAAM,EAAE,iCAAiC,GACxC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,0BAA0B,CACxB,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,gCAAgC,CAAC,CAAC;IAC7C,2BAA2B,CACzB,MAAM,EAAE,iCAAiC,GACxC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAClC,sBAAsB,CACpB,MAAM,EAAE,iCAAiC,GACxC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,4BAA4B,CAC1B,MAAM,EAAE,kCAAkC,GACzC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,4BAA4B,IAAI,OAAO,CAAC,2BAA2B,CAAC,CAAC;CACtE"}
+{"version":3,"file":"ReactNativeRangeDownloader.nitro.d.ts","sourceRoot":"","sources":["../../../src/ReactNativeRangeDownloader.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAM/D,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,GAAG,UAAU,CAAC;AAEtE,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,eAAe,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAI5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAWD,MAAM,MAAM,oBAAoB,GAC5B,WAAW,GACX,mBAAmB,GACnB,mBAAmB,GACnB,UAAU,CAAC;AAKf,MAAM,MAAM,iBAAiB,GACzB,oBAAoB,GACpB,kBAAkB,GAClB,aAAa,GACb,UAAU,GACV,kBAAkB,GAClB,kBAAkB,GAClB,qBAAqB,GACrB,kBAAkB,GAClB,WAAW,GACX,iBAAiB,CAAC;AAEtB,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,oBAAoB,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,iBAAiB,CAAC;CAClC;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,eAAe,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,8BAA8B;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,uBAAuB;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,4BAA4B;IAC3C,+BAA+B,EAAE,MAAM,CAAC;IACxC,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,8BAA8B,EAAE,OAAO,CAAC;IACxC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,yBAAyB;IACxC,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,4BAA4B;IAC3C,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iCAAiC;IAChD,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,4BAA4B,EAAE,CAAC;CAClD;AAED,MAAM,WAAW,4BAA4B;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mCAAmC;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,uBAAuB,CAAC;CAClC;AAED,MAAM,WAAW,gCAAgC;IAC/C,SAAS,EAAE,mCAAmC,EAAE,CAAC;CAClD;AAED,MAAM,WAAW,iCAAiC;IAChD,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,iCAAiC;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,kCAAkC;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,2BAA2B;IAC1C,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,0BACf,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IAIzD,QAAQ,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAMpE,gBAAgB,CACd,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAAC;IAKjB,MAAM,CACJ,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAAC;IAGjB,mBAAmB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,GAAG,MAAM,CAAC;IAC3E,sBAAsB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAKzC,eAAe,IAAI,MAAM,CAAC;IAE1B,+BAA+B,IAAI,4BAA4B,CAAC;IAChE,wBAAwB,CACtB,MAAM,EAAE,8BAA8B,GACrC,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACpC,+BAA+B,CAC7B,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,uBAAuB,CAAC,MAAM,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,oBAAoB,CAClB,MAAM,EAAE,yBAAyB,GAChC,OAAO,CAAC,0BAA0B,CAAC,CAAC;IACvC,oBAAoB,CAClB,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,WAAW,CAAC,CAAC;IACxB,qBAAqB,CACnB,MAAM,EAAE,iCAAiC,GACxC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,0BAA0B,CACxB,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,gCAAgC,CAAC,CAAC;IAC7C,2BAA2B,CACzB,MAAM,EAAE,iCAAiC,GACxC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAClC,sBAAsB,CACpB,MAAM,EAAE,iCAAiC,GACxC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,4BAA4B,CAC1B,MAAM,EAAE,kCAAkC,GACzC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,4BAA4B,IAAI,OAAO,CAAC,2BAA2B,CAAC,CAAC;CACtE"}

package/nitrogen/generated/android/c++/JFirmwareArchiveMaterializeParams.hpp

@@ -12,6 +12,7 @@
 
 #include "FirmwareArchiveExpectedEntry.hpp"
 #include "JFirmwareArchiveExpectedEntry.hpp"
+#include <optional>
 #include <string>
 #include <vector>
 
@@ -43,7 +44,7 @@ namespace margelo::nitro::reactnativerangedownloader {
       return FirmwareArchiveMaterializeParams(
         leaseRef->toStdString(),
         archiveArtifactRef->toStdString(),
-        [&]() {
+        expectedEntries != nullptr ? std::make_optional([&]() {
           size_t __size = expectedEntries->size();
           std::vector<FirmwareArchiveExpectedEntry> __vector;
           __vector.reserve(__size);
@@ -52,7 +53,7 @@ namespace margelo::nitro::reactnativerangedownloader {
             __vector.push_back(__element->toCpp());
           }
           return __vector;
-        }()
+        }()) : std::nullopt
       );
     }
 
@@ -69,16 +70,16 @@ namespace margelo::nitro::reactnativerangedownloader {
         clazz,
         jni::make_jstring(value.leaseRef),
         jni::make_jstring(value.archiveArtifactRef),
-        [&]() {
-          size_t __size = value.expectedEntries.size();
+        value.expectedEntries.has_value() ? [&]() {
+          size_t __size = value.expectedEntries.value().size();
           jni::local_ref<jni::JArrayClass<JFirmwareArchiveExpectedEntry>> __array = jni::JArrayClass<JFirmwareArchiveExpectedEntry>::newArray(__size);
           for (size_t __i = 0; __i < __size; __i++) {
-            const auto& __element = value.expectedEntries[__i];
+            const auto& __element = value.expectedEntries.value()[__i];
             auto __elementJni = JFirmwareArchiveExpectedEntry::fromCpp(__element);
             __array->setElement(__i, *__elementJni);
           }
           return __array;
-        }()
+        }() : nullptr
       );
     }
   };

package/nitrogen/generated/android/c++/JFirmwareArtifactDownloadParams.hpp

@@ -46,8 +46,8 @@ namespace margelo::nitro::reactnativerangedownloader {
       jni::local_ref<jni::JString> routeType = this->getFieldValue(fieldRouteType);
       static const auto fieldResolvedIp = clazz->getField<jni::JString>("resolvedIp");
       jni::local_ref<jni::JString> resolvedIp = this->getFieldValue(fieldResolvedIp);
-      static const auto fieldExpectedSize = clazz->getField<double>("expectedSize");
-      double expectedSize = this->getFieldValue(fieldExpectedSize);
+      static const auto fieldExpectedSize = clazz->getField<jni::JDouble>("expectedSize");
+      jni::local_ref<jni::JDouble> expectedSize = this->getFieldValue(fieldExpectedSize);
       static const auto fieldExpectedSha256 = clazz->getField<jni::JString>("expectedSha256");
       jni::local_ref<jni::JString> expectedSha256 = this->getFieldValue(fieldExpectedSha256);
       static const auto fieldMaxBytes = clazz->getField<double>("maxBytes");
@@ -62,8 +62,8 @@ namespace margelo::nitro::reactnativerangedownloader {
         url->toStdString(),
         routeType->toStdString(),
         resolvedIp != nullptr ? std::make_optional(resolvedIp->toStdString()) : std::nullopt,
-        expectedSize,
-        expectedSha256->toStdString(),
+        expectedSize != nullptr ? std::make_optional(expectedSize->value()) : std::nullopt,
+        expectedSha256 != nullptr ? std::make_optional(expectedSha256->toStdString()) : std::nullopt,
         maxBytes,
         overallDeadlineSeconds != nullptr ? std::make_optional(overallDeadlineSeconds->value()) : std::nullopt
       );
@@ -75,7 +75,7 @@ namespace margelo::nitro::reactnativerangedownloader {
      */
     [[maybe_unused]]
     static jni::local_ref<JFirmwareArtifactDownloadParams::javaobject> fromCpp(const FirmwareArtifactDownloadParams& value) {
-      using JSignature = JFirmwareArtifactDownloadParams(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, double, jni::alias_ref<jni::JString>, double, jni::alias_ref<jni::JDouble>);
+      using JSignature = JFirmwareArtifactDownloadParams(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JString>, double, jni::alias_ref<jni::JDouble>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
@@ -87,8 +87,8 @@ namespace margelo::nitro::reactnativerangedownloader {
         jni::make_jstring(value.url),
         jni::make_jstring(value.routeType),
         value.resolvedIp.has_value() ? jni::make_jstring(value.resolvedIp.value()) : nullptr,
-        value.expectedSize,
-        jni::make_jstring(value.expectedSha256),
+        value.expectedSize.has_value() ? jni::JDouble::valueOf(value.expectedSize.value()) : nullptr,
+        value.expectedSha256.has_value() ? jni::make_jstring(value.expectedSha256.value()) : nullptr,
         value.maxBytes,
         value.overallDeadlineSeconds.has_value() ? jni::JDouble::valueOf(value.overallDeadlineSeconds.value()) : nullptr
       );

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativerangedownloader/FirmwareArchiveMaterializeParams.kt

@@ -25,7 +25,7 @@ data class FirmwareArchiveMaterializeParams(
   val archiveArtifactRef: String,
   @DoNotStrip
   @Keep
-  val expectedEntries: Array<FirmwareArchiveExpectedEntry>
+  val expectedEntries: Array<FirmwareArchiveExpectedEntry>?
 ) {
   /* primary constructor */
 
@@ -37,7 +37,7 @@ data class FirmwareArchiveMaterializeParams(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(leaseRef: String, archiveArtifactRef: String, expectedEntries: Array<FirmwareArchiveExpectedEntry>): FirmwareArchiveMaterializeParams {
+    private fun fromCpp(leaseRef: String, archiveArtifactRef: String, expectedEntries: Array<FirmwareArchiveExpectedEntry>?): FirmwareArchiveMaterializeParams {
       return FirmwareArchiveMaterializeParams(leaseRef, archiveArtifactRef, expectedEntries)
     }
   }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativerangedownloader/FirmwareArtifactDownloadParams.kt

@@ -40,10 +40,10 @@ data class FirmwareArtifactDownloadParams(
   val resolvedIp: String?,
   @DoNotStrip
   @Keep
-  val expectedSize: Double,
+  val expectedSize: Double?,
   @DoNotStrip
   @Keep
-  val expectedSha256: String,
+  val expectedSha256: String?,
   @DoNotStrip
   @Keep
   val maxBytes: Double,
@@ -61,7 +61,7 @@ data class FirmwareArtifactDownloadParams(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(taskId: String, transactionId: String, leaseRef: String, artifactId: String, url: String, routeType: String, resolvedIp: String?, expectedSize: Double, expectedSha256: String, maxBytes: Double, overallDeadlineSeconds: Double?): FirmwareArtifactDownloadParams {
+    private fun fromCpp(taskId: String, transactionId: String, leaseRef: String, artifactId: String, url: String, routeType: String, resolvedIp: String?, expectedSize: Double?, expectedSha256: String?, maxBytes: Double, overallDeadlineSeconds: Double?): FirmwareArtifactDownloadParams {
       return FirmwareArtifactDownloadParams(taskId, transactionId, leaseRef, artifactId, url, routeType, resolvedIp, expectedSize, expectedSha256, maxBytes, overallDeadlineSeconds)
     }
   }