@onekeyfe/react-native-sni-connect 3.0.87 → 3.0.89

package/ios/SniConnectClient.swift

@@ -190,10 +190,7 @@ final class SniConnectClient {
   private let tasksQueue = DispatchQueue(label: "com.onekey.sni.connect.tasks", attributes: .concurrent)
   private let requestLimiter = SniConnectRequestLimiter.shared
 
-  private struct SessionKey: Hashable {
-    let hostname: String
-    let ip: String
-  }
+  private typealias SessionKey = SniConnectEndpointKey
 
   private struct SessionLease {
     let session: URLSession
@@ -404,15 +401,15 @@ final class SniConnectClient {
     }
   }
 
-  private static func makeURLSession(for key: SessionKey) throws -> ManagedSession {
+  private static func makeURLSession(hostname: String, ip: String) throws -> ManagedSession {
     let resources = try SniConnectPinnedTransport.makeResources(
-      hostname: key.hostname,
-      ip: key.ip
+      hostname: hostname,
+      ip: ip
     )
     SniConnectLog.info(SniConnectLog.event("sni_transport_config", [
-      ("hostname", key.hostname),
-      ("ipHash", SniConnectLog.shortHash(key.ip)),
-      ("ipFamily", SniConnectLog.ipFamily(key.ip)),
+      ("hostname", hostname),
+      ("ipHash", SniConnectLog.shortHash(ip)),
+      ("ipFamily", SniConnectLog.ipFamily(ip)),
       ("proxyMode", "no_proxy"),
       ("pinnedResolver", true),
       ("protocol", "http1"),
@@ -430,7 +427,7 @@ final class SniConnectClient {
   }
 
   private func sessionLease(for config: RequestConfig) async throws -> SessionLease {
-    let key = SessionKey(hostname: config.hostname.lowercased(), ip: config.ip)
+    let key = SessionKey(hostname: config.hostname, ip: config.ip)
     while true {
       let acquisition = try Self.sessionsQueue.sync { () throws -> SessionAcquisition in
         Self.pendingResolverSlots.removeAll { $0.isReleased }
@@ -448,7 +445,7 @@ final class SniConnectClient {
           return .waitForResolverSlots(pendingResolverSlots)
         }
 
-        let managedSession = try Self.makeURLSession(for: key)
+        let managedSession = try Self.makeURLSession(hostname: key.hostname, ip: config.ip)
         Self.sessionCache[key] = managedSession
         Self.markSessionUsed(key)
         return .ready(Self.retainSession(managedSession.session))
@@ -460,7 +457,7 @@ final class SniConnectClient {
       case .waitForResolverSlots(let resolverLeases):
         SniConnectLog.info(SniConnectLog.event("sni_resolver_slot_wait", [
           ("hostname", key.hostname),
-          ("ipHash", SniConnectLog.shortHash(key.ip)),
+          ("ipHash", SniConnectLog.shortHash(config.ip)),
           ("waitCount", resolverLeases.count),
         ]))
         for resolverLease in resolverLeases {
@@ -511,7 +508,7 @@ final class SniConnectClient {
       }
       SniConnectLog.info(SniConnectLog.event("sni_cache_evict", [
         ("hostname", evictedKey.hostname),
-        ("ipHash", SniConnectLog.shortHash(evictedKey.ip)),
+        ("ipHash", SniConnectLog.shortHash(evictedKey.canonicalIP)),
         ("cacheSize", sessionCache.count),
         ("limit", Self.maxCachedSessions),
         ("reason", forPendingInsert ? "max_cached_sessions_pending_insert" : "max_cached_sessions"),

package/ios/SniConnectCore.swift

@@ -47,6 +47,16 @@ struct SniConnectResolverConfig: Equatable {
   let ip: String
 }
 
+struct SniConnectEndpointKey: Hashable {
+  let hostname: String
+  let canonicalIP: String
+
+  init(hostname: String, ip: String) {
+    self.hostname = hostname.lowercased()
+    canonicalIP = SniConnectValidation.canonicalIPKey(ip)
+  }
+}
+
 enum SniConnectCoreError: Error {
   case resourceLimit(String)
 }
@@ -55,9 +65,9 @@ final class SniConnectPinnedResolverRegistry {
   static let defaultMaxEntries = 32
 
   private let maxEntries: Int
-  private var classesByKey: [String: AnyClass] = [:]
+  private var classesByKey: [SniConnectEndpointKey: AnyClass] = [:]
   private var configsByClassName: [String: SniConnectResolverConfig] = [:]
-  private var referenceCountsByKey: [String: Int] = [:]
+  private var referenceCountsByKey: [SniConnectEndpointKey: Int] = [:]
   private var reusableClasses: [AnyClass] = []
   private var allocatedClassNames: Set<String> = []
 
@@ -78,8 +88,7 @@ final class SniConnectPinnedResolverRegistry {
     ip: String,
     allocateClass: () -> AnyClass
   ) throws -> AnyClass {
-    let normalizedHost = hostname.lowercased()
-    let key = Self.key(hostname: normalizedHost, ip: ip)
+    let key = SniConnectEndpointKey(hostname: hostname, ip: ip)
     if let resolverClass = classesByKey[key] {
       referenceCountsByKey[key, default: 0] += 1
       return resolverClass
@@ -93,7 +102,7 @@ final class SniConnectPinnedResolverRegistry {
     let className = NSStringFromClass(resolverClass)
     allocatedClassNames.insert(className)
     classesByKey[key] = resolverClass
-    configsByClassName[className] = SniConnectResolverConfig(hostname: normalizedHost, ip: ip)
+    configsByClassName[className] = SniConnectResolverConfig(hostname: key.hostname, ip: ip)
     referenceCountsByKey[key] = 1
     return resolverClass
   }
@@ -114,7 +123,7 @@ final class SniConnectPinnedResolverRegistry {
   }
 
   func release(hostname: String, ip: String) {
-    let key = Self.key(hostname: hostname.lowercased(), ip: ip)
+    let key = SniConnectEndpointKey(hostname: hostname, ip: ip)
     guard let referenceCount = referenceCountsByKey[key] else {
       return
     }
@@ -137,10 +146,6 @@ final class SniConnectPinnedResolverRegistry {
     configsByClassName.removeAll()
     referenceCountsByKey.removeAll()
   }
-
-  private static func key(hostname: String, ip: String) -> String {
-    return "\(hostname)|\(ip)"
-  }
 }
 
 enum SniConnectResponseText {

package/ios/Tests/SniConnectValidationTests/SniConnectValidationTests.swift

@@ -450,6 +450,36 @@ final class SniConnectValidationTests: XCTestCase {
     XCTAssertEqual(registry.resolve(domain: "example.net", resolverClass: reused), "93.184.216.36")
   }
 
+  func testEndpointCachesReuseEquivalentIPv6Spellings() throws {
+    final class ResolverA: NSObject {}
+    final class ResolverB: NSObject {}
+    let registry = SniConnectPinnedResolverRegistry(maxEntries: 2)
+    let compressedIP = "2606:4700:4700::1111"
+    let expandedIP = "2606:4700:4700:0:0:0:0:1111"
+
+    XCTAssertEqual(
+      SniConnectEndpointKey(hostname: "Example.com", ip: compressedIP),
+      SniConnectEndpointKey(hostname: "example.com", ip: expandedIP)
+    )
+
+    let first: AnyClass = try registry.resolverClass(hostname: "Example.com", ip: compressedIP) {
+      ResolverA.self
+    }
+    let same: AnyClass = try registry.resolverClass(hostname: "example.com", ip: expandedIP) {
+      XCTFail("Equivalent IPv6 spellings must reuse the resolver entry")
+      return ResolverB.self
+    }
+
+    XCTAssertTrue(first === same)
+    XCTAssertEqual(registry.entryCount, 1)
+    XCTAssertEqual(registry.allocatedClassCount, 1)
+
+    registry.release(hostname: "example.com", ip: expandedIP)
+    XCTAssertEqual(registry.entryCount, 1)
+    registry.release(hostname: "example.com", ip: compressedIP)
+    XCTAssertEqual(registry.entryCount, 0)
+  }
+
   func testResponseTextDecodePreservesOriginalJsonText() throws {
     let json = "{  \"b\": 1, \"a\": [true, null] }\n"
     XCTAssertEqual(SniConnectResponseText.decode(Data(json.utf8)), json)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-sni-connect",
-  "version": "3.0.87",
+  "version": "3.0.89",
   "description": "A React Native library for SNI-based HTTP requests with DNS caching and request management",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -64,8 +64,8 @@
     "@eslint/compat": "^1.3.2",
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.35.0",
-    "@react-native/babel-preset": "0.83.0",
-    "@react-native/eslint-config": "0.83.0",
+    "@react-native/babel-preset": "0.86.2",
+    "@react-native/eslint-config": "0.86.2",
     "@release-it/conventional-changelog": "^10.0.1",
     "@types/jest": "^29.5.14",
     "@types/react": "^19.2.0",
@@ -77,8 +77,8 @@
     "jest": "^29.7.0",
     "lefthook": "^2.0.3",
     "prettier": "^2.8.8",
-    "react": "19.2.0",
-    "react-native": "patch:react-native@npm%3A0.83.0#~/.yarn/patches/react-native-npm-0.83.0-577d0f2d83.patch",
+    "react": "19.2.3",
+    "react-native": "patch:react-native@npm%3A0.86.2#~/.yarn/patches/react-native-npm-0.86.2-c9d546616f.patch",
     "react-native-builder-bob": "^0.40.17",
     "release-it": "^19.0.4",
     "turbo": "^2.5.6",