@onekeyfe/react-native-sni-connect 3.0.71 → 3.0.72

package/ios/SniConnect.swift

@@ -1,4 +1,5 @@
 import Foundation
+import CFNetwork
 import React
 
 private enum SniConnectError: Error {
@@ -25,7 +26,12 @@ final class SniConnectImpl: NSObject {
       let parsed = try Self.parseDictionary(config)
       handleRequest(config: parsed, resolve: resolve, reject: reject)
     } catch {
-      SniConnectLog.error("Config parsing failed: \(error)")
+      SniConnectLog.error(SniConnectLog.event("sni_request_result", [
+        ("result", "error"),
+        ("code", "SNI_INVALID_CONFIG"),
+        ("nativeErrorClass", String(describing: type(of: error))),
+        ("stage", "parse_config"),
+      ]))
       reject("SNI_INVALID_CONFIG", "\(error)", error)
     }
   }
@@ -38,29 +44,41 @@ final class SniConnectImpl: NSObject {
     do {
       try Self.validate(config)
     } catch {
-      SniConnectLog.error("Config validation failed: \(error)")
+      SniConnectLog.error(SniConnectLog.event("sni_request_result", [
+        ("result", "error"),
+        ("code", "SNI_INVALID_CONFIG"),
+        ("nativeErrorClass", String(describing: type(of: error))),
+        ("stage", "validate_config"),
+        ("requestIdHash", SniConnectLog.shortHash(config.requestId)),
+        ("hostname", config.hostname.lowercased()),
+        ("ipHash", SniConnectLog.shortHash(config.ip)),
+        ("ipFamily", SniConnectLog.ipFamily(config.ip)),
+        ("method", config.method.uppercased()),
+        ("timeoutMs", Int(config.effectiveTotalTimeout)),
+      ]))
       reject("SNI_INVALID_CONFIG", "\(error)", error)
       return
     }
 
     // Create the task and register it synchronously before JS can cancel it.
+    // Unregistering is owned by the result waiter below, so even a task that
+    // completes immediately cannot unregister before it has been registered.
     let task = Task { () -> SniConnectClient.Response in
       return try await client.performRequest(config: config)
     }
 
-    // Register task if requestId is provided
-    if let requestId = config.requestId {
-      client.registerTask(task, for: requestId)
-    }
+    let registrationToken = client.registerTask(task, for: config.requestId)
 
     // Handle the task result asynchronously
     Task {
+      defer {
+        client.unregisterTask(requestId: config.requestId, token: registrationToken)
+      }
+
       do {
         let result = try await task.value
-        let responseBody = Self.serializeResponseData(result.data)
-
         resolve([
-          "data": responseBody,
+          "data": result.data,
           "status": result.status,
           "statusText": result.statusText,
           "headers": result.headers,
@@ -71,7 +89,17 @@ final class SniConnectImpl: NSObject {
       } catch is CancellationError {
         reject("SNI_CANCELLED", "Request cancelled", nil)
       } catch {
-        SniConnectLog.error("Request failed: \(error.localizedDescription)")
+        SniConnectLog.error(SniConnectLog.event("sni_request_result", [
+          ("result", "error"),
+          ("code", "SNI_UNKNOWN_ERROR"),
+          ("nativeErrorClass", String(describing: type(of: error))),
+          ("requestIdHash", SniConnectLog.shortHash(config.requestId)),
+          ("hostname", config.hostname.lowercased()),
+          ("ipHash", SniConnectLog.shortHash(config.ip)),
+          ("ipFamily", SniConnectLog.ipFamily(config.ip)),
+          ("method", config.method.uppercased()),
+          ("timeoutMs", Int(config.effectiveTotalTimeout)),
+        ]))
         reject("SNI_UNKNOWN_ERROR", error.localizedDescription, error)
       }
     }
@@ -83,8 +111,8 @@ final class SniConnectImpl: NSObject {
     resolve: @escaping RCTPromiseResolveBlock,
     reject: @escaping RCTPromiseRejectBlock
   ) {
-    client.cancelRequest(requestId: requestId)
-    resolve(["success": true])
+    let success = client.cancelRequest(requestId: requestId)
+    resolve(["success": success])
   }
 
   @objc
@@ -105,6 +133,19 @@ final class SniConnectImpl: NSObject {
     resolve(["success": true])
   }
 
+  @objc
+  public func isProxyActiveForUrl(
+    _ url: String,
+    resolve: @escaping RCTPromiseResolveBlock,
+    reject: @escaping RCTPromiseRejectBlock
+  ) {
+    do {
+      resolve(try Self.isProxyActive(forUrl: url))
+    } catch {
+      reject("SNI_INVALID_URL", "\(error)", error)
+    }
+  }
+
   private static func parseDictionary(_ dictionary: NSDictionary) throws -> SniConnectClient.RequestConfig {
     guard let ip = dictionary["ip"] as? String, !ip.isEmpty else {
       throw SniConnectError.invalidConfig("Missing ip")
@@ -141,22 +182,78 @@ final class SniConnectImpl: NSObject {
   private static func validate(_ config: SniConnectClient.RequestConfig) throws {
     try SniConnectValidation.validatePublicIP(config.ip)
     try SniConnectValidation.validateHostname(config.hostname)
-    try SniConnectValidation.validateHeaders(config.headers)
-    _ = try SniConnectValidation.normalizeMethod(config.method)
+    _ = try SniConnectValidation.normalizeHeaders(config.headers)
+    let method = try SniConnectValidation.normalizeMethod(config.method)
     _ = try SniConnectValidation.normalizePath(config.path)
+    try SniConnectValidation.validateRequestId(config.requestId)
+    try SniConnectValidation.validateTimeout(config.effectiveTotalTimeout)
+    try SniConnectValidation.validateBody(config.body)
+    try SniConnectValidation.validateMethodBody(method: method, body: config.body)
   }
 
-  private static func serializeResponseData(_ data: Any) -> String {
-    if let stringValue = data as? String {
-      return stringValue
+  private static func isProxyActive(forUrl urlString: String) throws -> Bool {
+    let startedAt = Date()
+    guard let url = URL(string: urlString),
+          let scheme = url.scheme?.lowercased(),
+          ["http", "https"].contains(scheme),
+          let host = url.host else {
+      SniConnectLog.warn(SniConnectLog.event("proxy_preflight", [
+        ("platform", "ios"),
+        ("scheme", "unknown"),
+        ("host", "unknown"),
+        ("result", "invalid_url"),
+        ("source", "CFNetwork"),
+        ("proxyCount", 0),
+        ("elapsedMs", SniConnectLog.elapsedMs(since: startedAt)),
+      ]))
+      throw SniConnectError.invalidConfig("Invalid URL")
     }
 
-    if JSONSerialization.isValidJSONObject(data),
-       let jsonData = try? JSONSerialization.data(withJSONObject: data, options: []),
-       let jsonString = String(data: jsonData, encoding: .utf8) {
-      return jsonString
+    guard let settings = CFNetworkCopySystemProxySettings()?.takeRetainedValue() else {
+      SniConnectLog.info(SniConnectLog.event("proxy_preflight", [
+        ("platform", "ios"),
+        ("scheme", scheme),
+        ("host", host),
+        ("result", false),
+        ("source", "CFNetwork"),
+        ("proxyCount", 0),
+        ("elapsedMs", SniConnectLog.elapsedMs(since: startedAt)),
+      ]))
+      return false
     }
 
-    return String(describing: data)
+    let proxies = CFNetworkCopyProxiesForURL(url as CFURL, settings).takeRetainedValue() as NSArray
+    var proxyTypes: [String] = []
+    for proxy in proxies {
+      guard let proxyDictionary = proxy as? NSDictionary,
+            let type = proxyDictionary[kCFProxyTypeKey] as? String else {
+        continue
+      }
+      proxyTypes.append(type)
+      if type != (kCFProxyTypeNone as String) {
+        SniConnectLog.info(SniConnectLog.event("proxy_preflight", [
+          ("platform", "ios"),
+          ("scheme", scheme),
+          ("host", host),
+          ("result", true),
+          ("source", "CFNetwork"),
+          ("proxyCount", proxies.count),
+          ("proxyTypes", proxyTypes.joined(separator: ",")),
+          ("elapsedMs", SniConnectLog.elapsedMs(since: startedAt)),
+        ]))
+        return true
+      }
+    }
+    SniConnectLog.info(SniConnectLog.event("proxy_preflight", [
+      ("platform", "ios"),
+      ("scheme", scheme),
+      ("host", host),
+      ("result", false),
+      ("source", "CFNetwork"),
+      ("proxyCount", proxies.count),
+      ("proxyTypes", proxyTypes.joined(separator: ",")),
+      ("elapsedMs", SniConnectLog.elapsedMs(since: startedAt)),
+    ]))
+    return false
   }
 }