@onekeyfe/react-native-range-downloader 3.0.81-alpha.10 → 3.0.81-alpha.11

package/ReactNativeRangeDownloader.podspec

@@ -23,13 +23,12 @@ Pod::Spec.new do |s|
   s.dependency 'React-jsi'
   s.dependency 'React-callinvoker'
   s.dependency 'ReactNativeNativeLogger'
-  s.dependency 'SniConnect', package["peerDependencies"]["@onekeyfe/react-native-sni-connect"]
   s.public_header_files = "ios/FirmwareArchiveMinizipBridge.h"
   s.pod_target_xcconfig = {
     'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/SSZipArchive/SSZipArchive/minizip"',
   }
 
-  s.dependency 'SSZipArchive', '>= 2.5.4'
+  s.dependency 'SSZipArchive', '2.5.5'
 
   load 'nitrogen/generated/ios/ReactNativeRangeDownloader+autolinking.rb'
   add_nitrogen_files(s)

package/android/build.gradle

@@ -127,7 +127,6 @@ dependencies {
   implementation project(":react-native-nitro-modules")
 
   implementation project(":onekeyfe_react-native-native-logger")
-  implementation project(":onekeyfe_react-native-sni-connect")
 
   implementation "com.squareup.okhttp3:okhttp:4.12.0"
 

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

@@ -2,7 +2,6 @@ package com.margelo.nitro.reactnativerangedownloader
 
 import android.system.Os
 import com.margelo.nitro.NitroModules
-import com.sniconnect.SniPinnedTransport
 import java.io.BufferedInputStream
 import java.io.File
 import java.io.FileInputStream
@@ -70,7 +69,7 @@ private class FirmwareDownloadLock {
 internal object FirmwareArtifactStore {
   const val MAX_READ_BYTES = 256 * 1024
 
-  private const val MAX_ARTIFACT_BYTES = 512L * 1024 * 1024
+  const val MAX_ARTIFACT_BYTES = 512L * 1024 * 1024
   private val sha256Pattern = Regex("^[a-fA-F0-9]{64}$")
   private val artifactRefPattern = Regex("^fw:[a-f0-9]{64}$")
   private val leaseRefPattern = Regex("^fwlease:[a-f0-9-]{36}$")
@@ -331,7 +330,6 @@ internal object FirmwareArtifactStore {
     val maxBytes: Long,
     val expectedSha256: String?,
     val downloadToken: String,
-    val hostname: String,
     val overallDeadlineSeconds: Double,
   )
 
@@ -379,24 +377,17 @@ internal object FirmwareArtifactStore {
     }
     val overallDeadlineSeconds =
       validateFirmwareDownloadDeadlineSeconds(params.overallDeadlineSeconds)
-    require(params.routeType == "domain" || params.routeType == "pinnedIp") {
+    require(params.routeType == "domain") {
       "Invalid firmware route type"
     }
-    if (params.routeType == "pinnedIp") {
-      require(!params.resolvedIp.isNullOrEmpty()) {
-        "Pinned route requires resolvedIp"
-      }
-    } else {
-      require(params.resolvedIp == null) {
-        "Domain route must not include resolvedIp"
-      }
+    require(params.resolvedIp == null) {
+      "Domain route must not include resolvedIp"
     }
     return ValidatedDownload(
       expectedSize = expectedSize,
       maxBytes = maxBytes,
       expectedSha256 = expectedSha256,
       downloadToken = expectedSha256 ?: sha256(params.url),
-      hostname = url.host,
       overallDeadlineSeconds = overallDeadlineSeconds,
     )
   }
@@ -455,18 +446,11 @@ internal object FirmwareArtifactStore {
       requestBuilder.header("Range", "bytes=$resumeOffset-")
     }
 
-    val client = if (params.routeType == "pinnedIp") {
-      SniPinnedTransport.createClient(
-        ip = checkNotNull(params.resolvedIp),
-        hostname = validated.hostname,
-      )
-    } else {
-      OkHttpClient.Builder()
-        .protocols(listOf(Protocol.HTTP_1_1))
-        .followRedirects(false)
-        .followSslRedirects(false)
-        .build()
-    }
+    val client = OkHttpClient.Builder()
+      .protocols(listOf(Protocol.HTTP_1_1))
+      .followRedirects(false)
+      .followSslRedirects(false)
+      .build()
     val call = client.newCall(requestBuilder.build())
     call.timeout().timeout(
       ceil(validated.overallDeadlineSeconds * 1000).toLong(),

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

@@ -272,8 +272,8 @@ class ReactNativeRangeDownloader : HybridReactNativeRangeDownloaderSpec() {
 
   override fun getFirmwareArtifactCapabilities(): FirmwareArtifactCapabilities {
     return FirmwareArtifactCapabilities(
-      firmwareArtifactProtocolVersion = 3.0,
-      supportedRouteTypes = arrayOf("domain", "pinnedIp"),
+      firmwareArtifactProtocolVersion = 4.0,
+      supportedRouteTypes = arrayOf("domain"),
       supportsArchiveMaterialization = true,
       maxReadBytes = FirmwareArtifactStore.MAX_READ_BYTES.toDouble(),
     )
@@ -288,6 +288,7 @@ class ReactNativeRangeDownloader : HybridReactNativeRangeDownloaderSpec() {
         artifactRef = artifact.artifactRef,
         size = artifact.size.toDouble(),
         sha256 = artifact.sha256,
+        expectedSha256Verified = params.expectedSha256 != null,
       )
     }
   }
@@ -324,9 +325,11 @@ class ReactNativeRangeDownloader : HybridReactNativeRangeDownloaderSpec() {
       require(
         params.offset.isFinite() &&
           params.offset >= 0 &&
+          params.offset <= FirmwareArtifactStore.MAX_ARTIFACT_BYTES.toDouble() &&
           params.offset.toLong().toDouble() == params.offset &&
           params.length.isFinite() &&
           params.length > 0 &&
+          params.length <= FirmwareArtifactStore.MAX_READ_BYTES.toDouble() &&
           params.length.toInt().toDouble() == params.length
       ) {
         "Invalid firmware artifact read"
@@ -366,6 +369,7 @@ class ReactNativeRangeDownloader : HybridReactNativeRangeDownloaderSpec() {
               artifactRef = entry.artifact.artifactRef,
               size = entry.artifact.size.toDouble(),
               sha256 = entry.artifact.sha256,
+              expectedSha256Verified = params.expectedEntries != null,
             ),
           )
         }.toTypedArray(),

package/ios/FirmwareArtifactStore.swift

@@ -1,7 +1,6 @@
 import CryptoKit
 import Foundation
 import ReactNativeNativeLogger
-import SniConnect
 
 func isFirmwareArtifactTLSError(_ error: Error) -> Bool {
   var current: NSError? = error as NSError
@@ -384,7 +383,8 @@ private actor FirmwareArtifactDownloadCoordinator {
 
 final class FirmwareArtifactStore {
   static let shared = FirmwareArtifactStore()
-  static let maxReadBytes = 256 * 1024
+  static let maxReadBytes = Int(firmwareArtifactMaxReadBytes)
+  static let maxArtifactBytes = firmwareArtifactMaxBytes
   private static let defaultDownloadDeadline: TimeInterval = 180
   private static let maxDownloadDeadline: TimeInterval = 24 * 60 * 60
 
@@ -461,30 +461,26 @@ final class FirmwareArtifactStore {
     }
     let expectedSize: Int64?
     if let value = params.expectedSize {
-      guard
-        value.isFinite,
-        value > 0,
-        value <= Double(Int64.max),
-        value.rounded() == value
-      else {
+      guard let converted = firmwareArtifactExactInt64(
+        value,
+        minimum: 1,
+        maximum: Self.maxArtifactBytes
+      ) else {
         throw FirmwareArtifactStoreError.invalidInput(
           "Invalid firmware artifact expected size"
         )
       }
-      expectedSize = Int64(value)
+      expectedSize = converted
     } else {
       expectedSize = nil
     }
-    guard
-      params.maxBytes.isFinite,
-      params.maxBytes > 0,
-      params.maxBytes <= Double(Int64.max),
-      params.maxBytes.rounded() == params.maxBytes,
-      params.maxBytes <= Double(512 * 1024 * 1024)
-    else {
+    guard let maxBytes = firmwareArtifactExactInt64(
+      params.maxBytes,
+      minimum: 1,
+      maximum: Self.maxArtifactBytes
+    ) else {
       throw FirmwareArtifactStoreError.invalidInput("Invalid firmware artifact size")
     }
-    let maxBytes = Int64(params.maxBytes)
     guard expectedSize.map({ $0 <= maxBytes }) ?? true else {
       throw FirmwareArtifactStoreError.invalidInput(
         "Firmware artifact expected size exceeds maxBytes"
@@ -501,7 +497,7 @@ final class FirmwareArtifactStore {
         )
       }
     }
-    guard params.routeType == "domain" || params.routeType == "pinnedIp" else {
+    guard params.routeType == "domain" else {
       throw FirmwareArtifactStoreError.invalidInput("Invalid firmware route type")
     }
     let deadline = params.overallDeadlineSeconds ?? defaultDownloadDeadline
@@ -512,11 +508,7 @@ final class FirmwareArtifactStore {
     else {
       throw FirmwareArtifactStoreError.invalidInput("Invalid firmware download deadline")
     }
-    if params.routeType == "pinnedIp" {
-      guard let resolvedIp = params.resolvedIp, !resolvedIp.isEmpty else {
-        throw FirmwareArtifactStoreError.invalidInput("Pinned route requires resolvedIp")
-      }
-    } else if params.resolvedIp != nil {
+    if params.resolvedIp != nil {
       throw FirmwareArtifactStoreError.invalidInput("Domain route must not include resolvedIp")
     }
     return ValidatedDownload(
@@ -1334,27 +1326,13 @@ final class FirmwareArtifactStore {
           self?.isTransactionCancelled(params.transactionId) == true
       }
     )
-    let pinnedSession: SniConnectPinnedSession?
-    if params.routeType == "pinnedIp" {
-      pinnedSession = try SniConnectPinnedTransport.makeSession(
-          hostname: hostname,
-          ip: params.resolvedIp!,
-          dataDelegate: streamDelegate
-        )
-    } else {
-      pinnedSession = nil
-    }
-    let session = pinnedSession?.session ?? URLSession(
+    let session = URLSession(
       configuration: .ephemeral,
       delegate: streamDelegate,
       delegateQueue: nil
     )
     defer {
-      if let pinnedSession {
-        pinnedSession.close()
-      } else {
-        session.finishTasksAndInvalidate()
-      }
+      session.finishTasksAndInvalidate()
     }
 
     do {

package/ios/RangeDownloadLogic.swift

@@ -142,6 +142,26 @@ func firmwareArtifactResponseFits(
 let firmwareArtifactFinalGrace: TimeInterval = 24 * 60 * 60
 let firmwareArtifactPartialGrace: TimeInterval = 7 * 24 * 60 * 60
 let firmwareArtifactScratchGrace: TimeInterval = firmwareArtifactPartialGrace
+let firmwareArtifactMaxBytes: Int64 = 512 * 1024 * 1024
+let firmwareArtifactMaxReadBytes: Int64 = 256 * 1024
+
+func firmwareArtifactExactInt64(
+  _ value: Double,
+  minimum: Int64,
+  maximum: Int64
+) -> Int64? {
+  guard
+    minimum <= maximum,
+    value.isFinite,
+    value.rounded() == value,
+    let converted = Int64(exactly: value),
+    converted >= minimum,
+    converted <= maximum
+  else {
+    return nil
+  }
+  return converted
+}
 
 func firmwareArtifactIdentifierIsSafe(_ value: String) -> Bool {
   value.range(

package/ios/ReactNativeRangeDownloader.swift

@@ -108,8 +108,8 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
 
   func getFirmwareArtifactCapabilities() throws -> FirmwareArtifactCapabilities {
     FirmwareArtifactCapabilities(
-      firmwareArtifactProtocolVersion: 3,
-      supportedRouteTypes: ["domain", "pinnedIp"],
+      firmwareArtifactProtocolVersion: 4,
+      supportedRouteTypes: ["domain"],
       supportsArchiveMaterialization: true,
       maxReadBytes: Double(FirmwareArtifactStore.maxReadBytes)
     )
@@ -124,7 +124,8 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
           withResult: FirmwareArtifactReceipt(
             artifactRef: artifact.artifactRef,
             size: Double(artifact.size),
-            sha256: artifact.sha256
+            sha256: artifact.sha256,
+            expectedSha256Verified: params.expectedSha256 != nil
           )
         )
       }
@@ -136,7 +137,8 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
       return FirmwareArtifactReceipt(
         artifactRef: artifact.artifactRef,
         size: Double(artifact.size),
-        sha256: artifact.sha256
+        sha256: artifact.sha256,
+        expectedSha256Verified: params.expectedSha256 != nil
       )
     }
   }
@@ -185,14 +187,16 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
   ) throws -> Promise<ArrayBuffer> {
     settledFirmwareArtifactPromise {
       guard
-        params.offset.isFinite,
-        params.offset >= 0,
-        params.offset <= Double(Int64.max),
-        params.offset.rounded() == params.offset,
-        params.length.isFinite,
-        params.length > 0,
-        params.length <= Double(Int.max),
-        params.length.rounded() == params.length
+        let offset = firmwareArtifactExactInt64(
+          params.offset,
+          minimum: 0,
+          maximum: FirmwareArtifactStore.maxArtifactBytes
+        ),
+        let length = firmwareArtifactExactInt64(
+          params.length,
+          minimum: 1,
+          maximum: firmwareArtifactMaxReadBytes
+        )
       else {
         throw FirmwareArtifactStoreError.readerInvalid(
           "Invalid firmware artifact read"
@@ -200,8 +204,8 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
       }
       let data = try FirmwareArtifactStore.shared.read(
         readerId: params.readerId,
-        offset: Int64(params.offset),
-        length: Int(params.length)
+        offset: offset,
+        length: Int(length)
       )
       return try ArrayBuffer.copy(data: data)
     }
@@ -231,7 +235,8 @@ class ReactNativeRangeDownloader: HybridReactNativeRangeDownloaderSpec {
             receipt: FirmwareArtifactReceipt(
               artifactRef: entry.artifact.artifactRef,
               size: Double(entry.artifact.size),
-              sha256: entry.artifact.sha256
+              sha256: entry.artifact.sha256,
+              expectedSha256Verified: params.expectedEntries != nil
             )
           )
         }

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

@@ -45,6 +45,7 @@ export interface FirmwareArtifactReceipt {
     artifactRef: string;
     size: number;
     sha256: string;
+    expectedSha256Verified: boolean;
 }
 export interface FirmwareArtifactCapabilities {
     firmwareArtifactProtocolVersion: number;

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":"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"}
+{"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;IAGf,sBAAsB,EAAE,OAAO,CAAC;CACjC;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++/JFirmwareArtifactReceipt.hpp

@@ -37,10 +37,13 @@ namespace margelo::nitro::reactnativerangedownloader {
       double size = this->getFieldValue(fieldSize);
       static const auto fieldSha256 = clazz->getField<jni::JString>("sha256");
       jni::local_ref<jni::JString> sha256 = this->getFieldValue(fieldSha256);
+      static const auto fieldExpectedSha256Verified = clazz->getField<jboolean>("expectedSha256Verified");
+      jboolean expectedSha256Verified = this->getFieldValue(fieldExpectedSha256Verified);
       return FirmwareArtifactReceipt(
         artifactRef->toStdString(),
         size,
-        sha256->toStdString()
+        sha256->toStdString(),
+        static_cast<bool>(expectedSha256Verified)
       );
     }
 
@@ -50,14 +53,15 @@ namespace margelo::nitro::reactnativerangedownloader {
      */
     [[maybe_unused]]
     static jni::local_ref<JFirmwareArtifactReceipt::javaobject> fromCpp(const FirmwareArtifactReceipt& value) {
-      using JSignature = JFirmwareArtifactReceipt(jni::alias_ref<jni::JString>, double, jni::alias_ref<jni::JString>);
+      using JSignature = JFirmwareArtifactReceipt(jni::alias_ref<jni::JString>, double, jni::alias_ref<jni::JString>, jboolean);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
         clazz,
         jni::make_jstring(value.artifactRef),
         value.size,
-        jni::make_jstring(value.sha256)
+        jni::make_jstring(value.sha256),
+        value.expectedSha256Verified
       );
     }
   };

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

@@ -25,7 +25,10 @@ data class FirmwareArtifactReceipt(
   val size: Double,
   @DoNotStrip
   @Keep
-  val sha256: String
+  val sha256: String,
+  @DoNotStrip
+  @Keep
+  val expectedSha256Verified: Boolean
 ) {
   /* primary constructor */
 
@@ -37,8 +40,8 @@ data class FirmwareArtifactReceipt(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(artifactRef: String, size: Double, sha256: String): FirmwareArtifactReceipt {
-      return FirmwareArtifactReceipt(artifactRef, size, sha256)
+    private fun fromCpp(artifactRef: String, size: Double, sha256: String, expectedSha256Verified: Boolean): FirmwareArtifactReceipt {
+      return FirmwareArtifactReceipt(artifactRef, size, sha256, expectedSha256Verified)
     }
   }
 }

package/nitrogen/generated/ios/swift/FirmwareArtifactReceipt.swift

@@ -19,8 +19,8 @@ public extension FirmwareArtifactReceipt {
   /**
    * Create a new instance of `FirmwareArtifactReceipt`.
    */
-  init(artifactRef: String, size: Double, sha256: String) {
-    self.init(std.string(artifactRef), size, std.string(sha256))
+  init(artifactRef: String, size: Double, sha256: String, expectedSha256Verified: Bool) {
+    self.init(std.string(artifactRef), size, std.string(sha256), expectedSha256Verified)
   }
 
   var artifactRef: String {
@@ -55,4 +55,15 @@ public extension FirmwareArtifactReceipt {
       self.__sha256 = std.string(newValue)
     }
   }
+  
+  var expectedSha256Verified: Bool {
+    @inline(__always)
+    get {
+      return self.__expectedSha256Verified
+    }
+    @inline(__always)
+    set {
+      self.__expectedSha256Verified = newValue
+    }
+  }
 }

package/nitrogen/generated/shared/c++/FirmwareArtifactReceipt.hpp

@@ -37,10 +37,11 @@ namespace margelo::nitro::reactnativerangedownloader {
     std::string artifactRef     SWIFT_PRIVATE;
     double size     SWIFT_PRIVATE;
     std::string sha256     SWIFT_PRIVATE;
+    bool expectedSha256Verified     SWIFT_PRIVATE;
 
   public:
     FirmwareArtifactReceipt() = default;
-    explicit FirmwareArtifactReceipt(std::string artifactRef, double size, std::string sha256): artifactRef(artifactRef), size(size), sha256(sha256) {}
+    explicit FirmwareArtifactReceipt(std::string artifactRef, double size, std::string sha256, bool expectedSha256Verified): artifactRef(artifactRef), size(size), sha256(sha256), expectedSha256Verified(expectedSha256Verified) {}
   };
 
 } // namespace margelo::nitro::reactnativerangedownloader
@@ -55,7 +56,8 @@ namespace margelo::nitro {
       return margelo::nitro::reactnativerangedownloader::FirmwareArtifactReceipt(
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "artifactRef")),
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "size")),
-        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "sha256"))
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "sha256")),
+        JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, "expectedSha256Verified"))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::reactnativerangedownloader::FirmwareArtifactReceipt& arg) {
@@ -63,6 +65,7 @@ namespace margelo::nitro {
       obj.setProperty(runtime, "artifactRef", JSIConverter<std::string>::toJSI(runtime, arg.artifactRef));
       obj.setProperty(runtime, "size", JSIConverter<double>::toJSI(runtime, arg.size));
       obj.setProperty(runtime, "sha256", JSIConverter<std::string>::toJSI(runtime, arg.sha256));
+      obj.setProperty(runtime, "expectedSha256Verified", JSIConverter<bool>::toJSI(runtime, arg.expectedSha256Verified));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -76,6 +79,7 @@ namespace margelo::nitro {
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "artifactRef"))) return false;
       if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "size"))) return false;
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "sha256"))) return false;
+      if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, "expectedSha256Verified"))) return false;
       return true;
     }
   };

package/package.json

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

package/src/ReactNativeRangeDownloader.nitro.ts

@@ -86,6 +86,9 @@ export interface FirmwareArtifactReceipt {
   artifactRef: string;
   size: number;
   sha256: string;
+  // True only when sha256 was compared with expectedSha256 supplied by the caller.
+  // A locally computed content-address digest without that expectation is not trusted integrity.
+  expectedSha256Verified: boolean;
 }
 
 export interface FirmwareArtifactCapabilities {