@onekeyfe/react-native-sni-connect 3.0.82 → 3.0.86

package/README.md

@@ -38,6 +38,7 @@ import {
   cancelRequest,
   cancelAllRequests,
   clearDNSCache,
+  getDebugSnapshot,
   isProxyActiveForUrl,
 } from '@onekeyfe/react-native-sni-connect';
 
@@ -66,6 +67,12 @@ await cancelAllRequests();
 
 // Drop pinned-IP connections / cached clients
 await clearDNSCache();
+
+// Diagnostics for one validated hostname/IP pair
+const snapshot = await getDebugSnapshot({
+  hostname: 'example.com',
+  ip: '93.184.216.34',
+});
 ```
 
 `multiValueHeaders` preserves repeated response headers when the native transport

package/android/src/main/java/com/sniconnect/SniConnectModule.kt

@@ -57,6 +57,15 @@ internal fun classifySniFailureCode(error: Throwable): String {
   return "SNI_REQUEST_FAILED"
 }
 
+internal fun classifySniResponseFailureCode(
+  error: Throwable,
+  explicitlyCancelled: Boolean,
+): String = when {
+  explicitlyCancelled -> "SNI_CANCELLED"
+  hasCause(error, InterruptedIOException::class.java) -> "SNI_REQUEST_TIMEOUT"
+  else -> "SNI_RESPONSE_FAILED"
+}
+
 private fun hasCause(error: Throwable, type: Class<out Throwable>): Boolean {
   var current: Throwable? = error
   while (current != null) {
@@ -77,12 +86,12 @@ class SniConnectModule(reactContext: ReactApplicationContext) :
     // from JS-controlled host/IP pairs (e.g. speed-testing many endpoints).
     private const val MAX_CLIENTS = 32
 
-    // A single dispatcher + connection pool shared across all cached clients so we
-    // don't spawn a thread pool / connection pool per (hostname, ip) pair.
+    // Native resources are process-shared across the main and background RN runtimes.
     private val sharedDispatcher = Dispatcher().apply {
-      maxRequests = 64
-      maxRequestsPerHost = 64
+      maxRequests = SniConnectValidation.MAX_ACTIVE_REQUESTS
+      maxRequestsPerHost = SniConnectValidation.MAX_ACTIVE_REQUESTS
     }
+    private val sharedAdmission = SniConnectRequestAdmission()
     private val sharedConnectionPool = ConnectionPool()
   }
 
@@ -120,13 +129,50 @@ class SniConnectModule(reactContext: ReactApplicationContext) :
     }
   }
 
-  private val activeCalls = ConcurrentHashMap<String, Call>()
-  private val allActiveCalls = Collections.newSetFromMap(ConcurrentHashMap<Call, Boolean>())
+  private class ManagedRequest(
+    val call: Call,
+    val settled: AtomicBoolean,
+  ) {
+    lateinit var admissionTicket: SniConnectRequestAdmission.Ticket
+    private val explicitlyCancelled = AtomicBoolean(false)
+
+    fun cancel() {
+      explicitlyCancelled.set(true)
+      if (!admissionTicket.cancelPending()) {
+        call.cancel()
+      }
+    }
+
+    fun release() {
+      admissionTicket.release()
+    }
+
+    fun wasExplicitlyCancelled(): Boolean = explicitlyCancelled.get()
+  }
+
+  // Cancellation ownership is per module, so cancelAllRequests only affects its RN runtime.
+  private val activeCalls = ConcurrentHashMap<String, ManagedRequest>()
+  private val allActiveCalls = Collections.newSetFromMap(
+    ConcurrentHashMap<ManagedRequest, Boolean>(),
+  )
   private val activeCallsLock = Any()
-  private val requestLimiter = SniConnectRequestLimiter()
+  private var invalidated = false
 
   override fun getName(): String = NAME
 
+  override fun invalidate() {
+    val cancelledCount = cancelOwnedRequests(markInvalidated = true)
+    SniConnectLogger.info(
+      SniConnectLogger.event(
+        "sni_lifecycle",
+        "action" to "runtime_invalidate",
+        "cancelledCount" to cancelledCount,
+        "success" to true,
+      ),
+    )
+    super.invalidate()
+  }
+
   override fun request(config: ReadableMap, promise: Promise) {
     try {
       val requestConfig = config.toRequestConfig()
@@ -147,11 +193,11 @@ class SniConnectModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   override fun cancelRequest(requestId: String, promise: Promise) {
-    val call = synchronized(activeCallsLock) {
+    val request = synchronized(activeCallsLock) {
       activeCalls.remove(requestId)
     }
-    if (call != null) {
-      call.cancel()
+    if (request != null) {
+      request.cancel()
       SniConnectLogger.info(
         SniConnectLogger.event(
           "sni_cancel",
@@ -174,17 +220,11 @@ class SniConnectModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   override fun cancelAllRequests(promise: Promise) {
-    val calls = synchronized(activeCallsLock) {
-      val snapshot = allActiveCalls.toList()
-      activeCalls.clear()
-      allActiveCalls.clear()
-      snapshot
-    }
-    calls.forEach { call -> call.cancel() }
+    val cancelledCount = cancelOwnedRequests()
     SniConnectLogger.info(
       SniConnectLogger.event(
         "sni_cancel_all",
-        "cancelledCount" to calls.size,
+        "cancelledCount" to cancelledCount,
         "success" to true,
       ),
     )
@@ -208,6 +248,29 @@ class SniConnectModule(reactContext: ReactApplicationContext) :
     promise.resolve(Arguments.createMap().apply { putBoolean("success", true) })
   }
 
+  @ReactMethod
+  override fun getDebugSnapshot(target: ReadableMap, promise: Promise) {
+    try {
+      val ip = target.getString("ip") ?: throw IllegalArgumentException("ip is required")
+      val hostname = target.getString("hostname")
+        ?: throw IllegalArgumentException("hostname is required")
+      val canonicalIp = SniConnectValidation.canonicalizePublicIp(ip)
+      SniConnectValidation.validateHostname(hostname)
+      val snapshot = sharedAdmission.snapshot(hostname, canonicalIp)
+
+      promise.resolve(Arguments.createMap().apply {
+        putInt("activeRequests", snapshot.activeRequests)
+        putInt("activeRequestsForPair", snapshot.activeRequestsForPair)
+        putInt("pendingRequests", snapshot.pendingRequests)
+        putInt("pendingRequestsForPair", snapshot.pendingRequestsForPair)
+        putArray("activeRequestIdsForPair", snapshot.activeRequestIdsForPair.toWritableArray())
+        putArray("pendingRequestIdsForPair", snapshot.pendingRequestIdsForPair.toWritableArray())
+      })
+    } catch (error: Exception) {
+      promise.reject("SNI_INVALID_CONFIG", error.message, error)
+    }
+  }
+
   @ReactMethod
   override fun isProxyActiveForUrl(url: String, promise: Promise) {
     try {
@@ -219,19 +282,14 @@ class SniConnectModule(reactContext: ReactApplicationContext) :
 
   private fun performRequest(config: RequestConfig, promise: Promise) {
     val startedAtMs = android.os.SystemClock.elapsedRealtime()
-    var requestSlot: SniConnectRequestLimiter.Token? = null
-    var registeredCall: Call? = null
+    val startedAtNanos = System.nanoTime()
+    var registeredRequest: ManagedRequest? = null
     try {
-      requestSlot = requestLimiter.acquire(config.hostname, config.ip)
       val client = getOrCreateClient(config)
       val request = buildRequest(config)
       val call = client.newCall(request)
-
-      // Apply per-request timeout
-      call.timeout().timeout(config.timeoutMillis, TimeUnit.MILLISECONDS)
-
-      registerCall(config.requestId, call)
-      registeredCall = call
+      val settled = AtomicBoolean(false)
+      lateinit var managedRequest: ManagedRequest
 
       SniConnectLogger.info(
         SniConnectLogger.event(
@@ -247,16 +305,13 @@ class SniConnectModule(reactContext: ReactApplicationContext) :
         ),
       )
 
-      // Guard against double-settling the promise (RN hard-crashes otherwise).
-      val settled = AtomicBoolean(false)
-
-      call.enqueue(object : Callback {
+      val callback = object : Callback {
         override fun onFailure(call: Call, e: IOException) {
-          unregisterCall(config.requestId, call)
-          requestSlot?.release()
+          unregisterRequest(config.requestId, managedRequest)
+          managedRequest.release()
           if (!settled.compareAndSet(false, true)) return
 
-          if (call.isCanceled()) {
+          if (managedRequest.wasExplicitlyCancelled()) {
             promise.reject("SNI_CANCELLED", "Request cancelled", null)
           } else {
             val code = classifySniFailureCode(e)
@@ -310,17 +365,29 @@ class SniConnectModule(reactContext: ReactApplicationContext) :
                   SniConnectLogger.info(resultLog)
                 }
                 if (settled.compareAndSet(false, true)) {
-                  promise.resolve(result)
+                  if (managedRequest.wasExplicitlyCancelled()) {
+                    promise.reject("SNI_CANCELLED", "Request cancelled", null)
+                  } else {
+                    promise.resolve(result)
+                  }
                 }
               }
             }
           } catch (error: Exception) {
             if (!settled.compareAndSet(false, true)) return
+            val code = classifySniResponseFailureCode(
+              error,
+              managedRequest.wasExplicitlyCancelled(),
+            )
+            if (code == "SNI_CANCELLED") {
+              promise.reject(code, "Request cancelled", null)
+              return
+            }
             SniConnectLogger.error(
               SniConnectLogger.event(
                 "sni_request_result",
                 "result" to "error",
-                "code" to "SNI_RESPONSE_FAILED",
+                "code" to code,
                 "nativeErrorClass" to error.javaClass.simpleName,
                 "requestIdHash" to SniConnectLogger.shortHash(config.requestId),
                 "hostname" to config.hostname.lowercase(Locale.US),
@@ -331,22 +398,57 @@ class SniConnectModule(reactContext: ReactApplicationContext) :
                 "elapsedMs" to SniConnectLogger.elapsedMs(startedAtMs),
               ),
             )
-            promise.reject("SNI_RESPONSE_FAILED", error.message, error)
+            promise.reject(code, error.message, error)
           } finally {
-            unregisterCall(config.requestId, call)
-            requestSlot?.release()
+            unregisterRequest(config.requestId, managedRequest)
+            managedRequest.release()
           }
         }
-      })
+      }
+
+      val timeoutBeforeAdmission = remainingTimeoutMillis(
+        config.timeoutMillis,
+        startedAtNanos,
+      )
+      val admissionTicket = sharedAdmission.createTicket(
+        hostname = config.hostname,
+        ip = config.ip,
+        requestId = config.requestId,
+        timeoutMillis = timeoutBeforeAdmission,
+        onAdmitted = { remainingTimeoutMillis ->
+          try {
+            call.timeout().timeout(remainingTimeoutMillis, TimeUnit.MILLISECONDS)
+            call.enqueue(callback)
+          } catch (error: Exception) {
+            unregisterRequest(config.requestId, managedRequest)
+            managedRequest.release()
+            if (settled.compareAndSet(false, true)) {
+              promise.reject("SNI_REQUEST_FAILED", error.message, error)
+            }
+          }
+        },
+        onPendingFailure = { code, message ->
+          unregisterRequest(config.requestId, managedRequest)
+          if (settled.compareAndSet(false, true)) {
+            promise.reject(code, message, null)
+          }
+        },
+      )
+      managedRequest = ManagedRequest(call, settled).apply {
+        this.admissionTicket = admissionTicket
+      }
+      registerRequest(config.requestId, managedRequest)
+      registeredRequest = managedRequest
+      admissionTicket.submit()
     } catch (error: Exception) {
-      registeredCall?.let { call ->
-        unregisterCall(config.requestId, call)
+      registeredRequest?.let { request ->
+        unregisterRequest(config.requestId, request)
+        request.release()
       }
-      requestSlot?.release()
-      val code = if (error is SniConnectValidation.ValidationException) {
-        "SNI_RESOURCE_LIMIT"
-      } else {
-        "SNI_REQUEST_FAILED"
+      val code = when {
+        error is SniConnectValidation.ValidationException -> "SNI_RESOURCE_LIMIT"
+        hasCause(error, InterruptedIOException::class.java) -> "SNI_REQUEST_TIMEOUT"
+        else -> "SNI_REQUEST_FAILED"
       }
       SniConnectLogger.error(
         SniConnectLogger.event(
@@ -363,18 +465,30 @@ class SniConnectModule(reactContext: ReactApplicationContext) :
           "elapsedMs" to SniConnectLogger.elapsedMs(startedAtMs),
         ),
       )
-      promise.reject(code, error.message, error)
+      val shouldReject = registeredRequest?.settled?.compareAndSet(false, true) ?: true
+      if (shouldReject) {
+        promise.reject(code, error.message, error)
+      }
     }
   }
 
-  private fun registerCall(requestId: String?, call: Call) {
-    val previousCall = synchronized(activeCallsLock) {
-      val previous = requestId?.let { activeCalls.put(it, call) }
-      allActiveCalls.add(call)
+  private fun registerRequest(requestId: String?, request: ManagedRequest) {
+    var shouldCancel = false
+    val previousRequest = synchronized(activeCallsLock) {
+      if (invalidated) {
+        shouldCancel = true
+        return@synchronized null
+      }
+      val previous = requestId?.let { activeCalls.put(it, request) }
+      allActiveCalls.add(request)
       previous
     }
-    if (previousCall != null && previousCall != call) {
-      previousCall.cancel()
+    if (shouldCancel) {
+      request.cancel()
+      return
+    }
+    if (previousRequest != null && previousRequest != request) {
+      previousRequest.cancel()
       SniConnectLogger.warn(
         SniConnectLogger.event(
           "sni_duplicate_request_id",
@@ -385,18 +499,44 @@ class SniConnectModule(reactContext: ReactApplicationContext) :
     }
   }
 
-  private fun unregisterCall(requestId: String?, call: Call) {
+  private fun unregisterRequest(requestId: String?, request: ManagedRequest) {
     synchronized(activeCallsLock) {
       if (requestId != null) {
-        activeCalls.remove(requestId, call)
+        activeCalls.remove(requestId, request)
       }
-      allActiveCalls.remove(call)
+      allActiveCalls.remove(request)
     }
   }
 
+  private fun cancelOwnedRequests(markInvalidated: Boolean = false): Int {
+    val requests = synchronized(activeCallsLock) {
+      if (markInvalidated) {
+        invalidated = true
+      }
+      val snapshot = allActiveCalls.toList()
+      activeCalls.clear()
+      allActiveCalls.clear()
+      snapshot
+    }
+    requests.forEach { request -> request.cancel() }
+    return requests.size
+  }
+
+  private fun remainingTimeoutMillis(totalTimeoutMillis: Long, startedAtNanos: Long): Long {
+    val elapsedNanos = (System.nanoTime() - startedAtNanos).coerceAtLeast(0L)
+    val remainingNanos = TimeUnit.MILLISECONDS.toNanos(totalTimeoutMillis) - elapsedNanos
+    if (remainingNanos <= 0L) {
+      throw java.net.SocketTimeoutException("Request timed out before admission")
+    }
+    return ((remainingNanos + 999_999L) / 1_000_000L).coerceAtLeast(1L)
+  }
+
   private fun getOrCreateClient(config: RequestConfig): OkHttpClient {
     val normalizedHost = config.hostname.lowercase(Locale.US)
-    val key = ClientKey(normalizedHost, config.ip)
+    val key = ClientKey(
+      normalizedHost,
+      SniConnectValidation.canonicalizePublicIp(config.ip),
+    )
 
     synchronized(clientCache) {
       clientCache[key]?.let { return it }
@@ -523,6 +663,10 @@ class SniConnectModule(reactContext: ReactApplicationContext) :
     }
   }
 
+  private fun List<String>.toWritableArray() = Arguments.createArray().apply {
+    forEach { value -> pushString(value) }
+  }
+
   private fun ReadableMap.toRequestConfig(): RequestConfig {
     val rawHeadersMap = if (hasKey("headers") && !isNull("headers")) {
       getMap("headers")?.toHashMap()
@@ -540,7 +684,7 @@ class SniConnectModule(reactContext: ReactApplicationContext) :
 
     val requestId = if (hasKey("requestId") && !isNull("requestId")) getString("requestId") else null
 
-    val ip = getString("ip") ?: throw IllegalArgumentException("ip is required")
+    val rawIp = getString("ip") ?: throw IllegalArgumentException("ip is required")
     val hostname = getString("hostname") ?: throw IllegalArgumentException("hostname is required")
     val method = getString("method") ?: "GET"
     val path = getString("path") ?: "/"
@@ -548,7 +692,7 @@ class SniConnectModule(reactContext: ReactApplicationContext) :
 
     // Validate every caller-controlled field at the boundary.
     SniConnectValidation.validateRequestId(requestId)
-    SniConnectValidation.validatePublicIp(ip)
+    val ip = SniConnectValidation.canonicalizePublicIp(rawIp)
     SniConnectValidation.validateHostname(hostname)
     val headersMap = SniConnectValidation.normalizeHeaders(rawHeadersMap)
     val normalizedMethod = SniConnectValidation.normalizeMethod(method)