@onekeyfe/react-native-network-throttle 3.0.82-alpha.0 → 3.0.82

package/README.md

@@ -2,13 +2,8 @@
 
 React Native native network throttle for OneKey iOS and Android development settings.
 
-Current scope is RN HTTP(S) latency and upload/download throughput. It does not
-emulate offline mode, WebView traffic, or third-party native networking stacks.
-
-`bypassUrlOrigins` excludes exact HTTP(S) origins from all throttling. Origins
-are canonicalized with their effective port and registered additively for the
-lifetime of the native process. This allows independently initialized React
-Native runtimes to register local development servers without clearing each
-other's configuration.
+Current scope is an RN HTTP response latency gate. It does not emulate download
+throughput, upload throughput, offline mode, WebView traffic, or third-party
+native networking stacks.
 
 This package only owns native request throttling. Product settings, persistence, and UI controls should remain in the host app.

package/android/src/main/java/com/onekeyfe/reactnativenetworkthrottle/NetworkThrottle.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.util.Log
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.ReadableType
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.network.OkHttpClientProvider
 import java.io.IOException
@@ -12,9 +11,6 @@ import java.io.InterruptedIOException
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicLong
-import java.util.concurrent.atomic.AtomicReference
-import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Interceptor
 import okhttp3.MediaType
 import okhttp3.OkHttpClient
@@ -40,7 +36,6 @@ internal object NetworkThrottle {
     private val downloadBps = AtomicLong(DEFAULT_THROUGHPUT_BPS.toLong())
     private val uploadBps = AtomicLong(DEFAULT_THROUGHPUT_BPS.toLong())
     private val installed = AtomicBoolean(false)
-    private val bypassUrlOrigins = AtomicReference<Set<String>>(emptySet())
 
     fun install(context: Context) {
         if (!installed.compareAndSet(false, true)) {
@@ -90,19 +85,6 @@ internal object NetworkThrottle {
         if (nextUploadBps <= 0) {
             nextUploadBps = DEFAULT_THROUGHPUT_BPS.toLong()
         }
-        if (config.hasKey("bypassUrlOrigins") && !config.isNull("bypassUrlOrigins")) {
-            val origins = config.getArray("bypassUrlOrigins")
-            val normalizedOrigins = buildSet {
-                if (origins != null) {
-                    for (index in 0 until origins.size()) {
-                        if (origins.getType(index) == ReadableType.String) {
-                            normalizeOrigin(origins.getString(index))?.let(::add)
-                        }
-                    }
-                }
-            }
-            bypassUrlOrigins.updateAndGet { current -> current + normalizedOrigins }
-        }
 
         enabled.set(nextEnabled)
         latencyNanos.set((nextLatencyMs * 1_000_000.0).toLong())
@@ -122,9 +104,6 @@ internal object NetworkThrottle {
         map.putDouble("latencyMs", latencyNanos.get() / 1_000_000.0)
         map.putDouble("downloadBps", downloadBps.get().toDouble())
         map.putDouble("uploadBps", uploadBps.get().toDouble())
-        val origins = Arguments.createArray()
-        bypassUrlOrigins.get().sorted().forEach(origins::pushString)
-        map.putArray("bypassUrlOrigins", origins)
         return map
     }
 
@@ -132,21 +111,6 @@ internal object NetworkThrottle {
     private fun getDownloadBps(): Long = if (enabled.get()) downloadBps.get() else 0L
     private fun getUploadBps(): Long = if (enabled.get()) uploadBps.get() else 0L
 
-    private fun canonicalOrigin(url: HttpUrl): String =
-        HttpUrl.Builder()
-            .scheme(url.scheme)
-            .host(url.host)
-            .port(url.port)
-            .build()
-            .toString()
-            .removeSuffix("/")
-
-    private fun normalizeOrigin(value: String?): String? =
-        value?.toHttpUrlOrNull()?.let(::canonicalOrigin)
-
-    private fun shouldBypass(requestUrl: HttpUrl): Boolean =
-        bypassUrlOrigins.get().contains(canonicalOrigin(requestUrl))
-
     private fun sleepNanos(delayNanos: Long) {
         if (delayNanos <= 0) {
             return
@@ -237,12 +201,9 @@ internal object NetworkThrottle {
 
     private class ThrottleInterceptor : Interceptor {
         override fun intercept(chain: Interceptor.Chain): Response {
-            val request = chain.request()
-            if (shouldBypass(request.url)) {
-                return chain.proceed(request)
-            }
             val requestStartNanos = System.nanoTime()
             val delayNanos = getLatencyNanos()
+            val request = chain.request()
             val requestBody = request.body
             val activeUploadBps = getUploadBps()
             val throttledRequest =

package/ios/OneKeyNetworkThrottle.m

@@ -10,32 +10,16 @@ static const NSTimeInterval OneKeyNetworkThrottleDefaultLatencyMs = 562.5;
 static const NSInteger OneKeyNetworkThrottleDefaultThroughputBps = 102 * 1024;
 static const NSUInteger OneKeyNetworkThrottleMaxPendingDownloadBytes = 256 * 1024;
 
-static NSString *OneKeyNetworkThrottleCanonicalOrigin(NSURL *url)
-{
-  NSString *scheme = url.scheme.lowercaseString;
-  NSString *host = url.host.lowercaseString;
-  if ((!([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"])) || host.length == 0) {
-    return nil;
-  }
-  NSURLComponents *components = [[NSURLComponents alloc] init];
-  components.scheme = scheme;
-  components.host = host;
-  components.port = url.port ?: @([scheme isEqualToString:@"https"] ? 443 : 80);
-  return components.string;
-}
-
 @interface OneKeyNetworkThrottleState : NSObject
 + (NSDictionary *)currentConfig;
 + (BOOL)isEnabled;
 + (NSTimeInterval)latencyMs;
 + (NSInteger)downloadBps;
 + (NSInteger)uploadBps;
-+ (BOOL)shouldBypassURL:(NSURL *)url;
 + (NSDictionary *)setEnabled:(BOOL)enabled
                     latencyMs:(NSTimeInterval)latencyMs
                    downloadBps:(NSInteger)downloadBps
-                      uploadBps:(NSInteger)uploadBps
-                bypassUrlOrigins:(NSArray *)bypassUrlOrigins;
+                      uploadBps:(NSInteger)uploadBps;
 @end
 
 @implementation OneKeyNetworkThrottleState
@@ -44,25 +28,18 @@ static atomic_bool _oneKeyNetworkThrottleEnabled = ATOMIC_VAR_INIT(false);
 static atomic_llong _oneKeyNetworkThrottleLatencyMicros = ATOMIC_VAR_INIT(562500);
 static atomic_llong _oneKeyNetworkThrottleDownloadBps = ATOMIC_VAR_INIT(102 * 1024);
 static atomic_llong _oneKeyNetworkThrottleUploadBps = ATOMIC_VAR_INIT(102 * 1024);
-static NSSet<NSString *> *_oneKeyNetworkThrottleBypassOrigins;
 
 + (NSDictionary *)currentConfig
 {
   BOOL enabled = atomic_load_explicit(&_oneKeyNetworkThrottleEnabled, memory_order_acquire);
   NSTimeInterval latencyMs =
     ((NSTimeInterval)atomic_load_explicit(&_oneKeyNetworkThrottleLatencyMicros, memory_order_relaxed)) / 1000.0;
-  NSArray<NSString *> *bypassUrlOrigins = nil;
-  @synchronized (self) {
-    bypassUrlOrigins = [[_oneKeyNetworkThrottleBypassOrigins ?: [NSSet set] allObjects]
-      sortedArrayUsingSelector:@selector(compare:)];
-  }
   return @{
     @"enabled": @(enabled),
     @"profile": OneKeyNetworkThrottleProfileSlow4G,
     @"latencyMs": @(latencyMs),
     @"downloadBps": @([self downloadBps]),
-    @"uploadBps": @([self uploadBps]),
-    @"bypassUrlOrigins": bypassUrlOrigins
+    @"uploadBps": @([self uploadBps])
   };
 }
 
@@ -86,17 +63,6 @@ static NSSet<NSString *> *_oneKeyNetworkThrottleBypassOrigins;
   return (NSInteger)atomic_load_explicit(&_oneKeyNetworkThrottleUploadBps, memory_order_relaxed);
 }
 
-+ (BOOL)shouldBypassURL:(NSURL *)url
-{
-  NSString *origin = OneKeyNetworkThrottleCanonicalOrigin(url);
-  if (origin == nil) {
-    return NO;
-  }
-  @synchronized (self) {
-    return [_oneKeyNetworkThrottleBypassOrigins containsObject:origin];
-  }
-}
-
 + (NSInteger)normalizeThroughputBps:(NSInteger)throughputBps
 {
   return throughputBps > 0 ? throughputBps : OneKeyNetworkThrottleDefaultThroughputBps;
@@ -106,29 +72,10 @@ static NSSet<NSString *> *_oneKeyNetworkThrottleBypassOrigins;
                     latencyMs:(NSTimeInterval)latencyMs
                    downloadBps:(NSInteger)downloadBps
                       uploadBps:(NSInteger)uploadBps
-                bypassUrlOrigins:(NSArray *)bypassUrlOrigins
 {
   NSTimeInterval normalizedLatencyMs = latencyMs > 0 ? latencyMs : OneKeyNetworkThrottleDefaultLatencyMs;
   NSInteger normalizedDownloadBps = [self normalizeThroughputBps:downloadBps];
   NSInteger normalizedUploadBps = [self normalizeThroughputBps:uploadBps];
-  if ([bypassUrlOrigins isKindOfClass:[NSArray class]]) {
-    NSMutableSet<NSString *> *normalizedOrigins = [NSMutableSet set];
-    for (id value in bypassUrlOrigins) {
-      if (![value isKindOfClass:[NSString class]]) {
-        continue;
-      }
-      NSString *origin = OneKeyNetworkThrottleCanonicalOrigin([NSURL URLWithString:(NSString *)value]);
-      if (origin != nil) {
-        [normalizedOrigins addObject:origin];
-      }
-    }
-    @synchronized (self) {
-      NSMutableSet<NSString *> *nextOrigins =
-        [_oneKeyNetworkThrottleBypassOrigins mutableCopy] ?: [NSMutableSet set];
-      [nextOrigins unionSet:normalizedOrigins];
-      _oneKeyNetworkThrottleBypassOrigins = [nextOrigins copy];
-    }
-  }
   atomic_store_explicit(
     &_oneKeyNetworkThrottleLatencyMicros,
     (long long)llround(normalizedLatencyMs * 1000.0),
@@ -190,9 +137,6 @@ static NSSet<NSString *> *_oneKeyNetworkThrottleBypassOrigins;
   if ([NSURLProtocol propertyForKey:OneKeyNetworkThrottleHandledKey inRequest:request]) {
     return NO;
   }
-  if ([OneKeyNetworkThrottleState shouldBypassURL:request.URL]) {
-    return NO;
-  }
   NSString *scheme = request.URL.scheme.lowercaseString;
   return [scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"];
 }
@@ -573,14 +517,7 @@ RCT_REMAP_METHOD(setConfig, setConfig:(NSDictionary *)config resolver:(RCTPromis
     uploadBpsValue != nil && uploadBpsValue != [NSNull null]
       ? [uploadBpsValue integerValue]
       : [OneKeyNetworkThrottleState uploadBps];
-  id bypassUrlOriginsValue = config[@"bypassUrlOrigins"];
-  NSArray *bypassUrlOrigins = [bypassUrlOriginsValue isKindOfClass:[NSArray class]] ? bypassUrlOriginsValue : nil;
-  resolve([OneKeyNetworkThrottleState
-    setEnabled:enabled
-    latencyMs:latencyMs
-    downloadBps:downloadBps
-    uploadBps:uploadBps
-    bypassUrlOrigins:bypassUrlOrigins]);
+  resolve([OneKeyNetworkThrottleState setEnabled:enabled latencyMs:latencyMs downloadBps:downloadBps uploadBps:uploadBps]);
 }
 
 @end

package/lib/module/index.js

@@ -10,25 +10,17 @@ const LINKING_ERROR = `The package '@onekeyfe/react-native-network-throttle' doe
   default: ''
 }) + '- rebuild the app after installing the package';
 const nativeModule = NativeModules.OneKeyNetworkThrottle;
-function normalizeNativeConfig(config) {
-  return {
-    ...config,
-    bypassUrlOrigins: config.bypassUrlOrigins ?? []
-  };
-}
 export const NetworkThrottle = nativeModule ? {
-  getConfig: async () => normalizeNativeConfig(await nativeModule.getConfig()),
+  getConfig: () => nativeModule.getConfig(),
   setConfig: async config => {
-    const currentConfig = normalizeNativeConfig(await nativeModule.getConfig());
-    const nativeConfig = await nativeModule.setConfig({
+    const currentConfig = await nativeModule.getConfig();
+    return nativeModule.setConfig({
       enabled: config.enabled ?? currentConfig.enabled,
       profile: config.profile ?? currentConfig.profile,
       latencyMs: config.latencyMs ?? currentConfig.latencyMs,
       downloadBps: config.downloadBps ?? currentConfig.downloadBps,
-      uploadBps: config.uploadBps ?? currentConfig.uploadBps,
-      bypassUrlOrigins: config.bypassUrlOrigins ?? currentConfig.bypassUrlOrigins ?? []
+      uploadBps: config.uploadBps ?? currentConfig.uploadBps
     });
-    return normalizeNativeConfig(nativeConfig);
   }
 } : new Proxy({}, {
   get() {

package/lib/typescript/src/index.d.ts

@@ -5,7 +5,6 @@ export type NetworkThrottleConfig = {
     latencyMs: number;
     downloadBps: number;
     uploadBps: number;
-    bypassUrlOrigins: string[];
 };
 export declare const NETWORK_THROTTLE_SLOW_4G_LATENCY_MS = 562.5;
 export declare const NETWORK_THROTTLE_102_KIB_BPS: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-network-throttle",
-  "version": "3.0.82-alpha.0",
+  "version": "3.0.82",
   "description": "react-native-network-throttle",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -142,6 +142,5 @@
         }
       }
     }
-  },
-  "stableVersion": "3.0.81"
+  }
 }

package/src/index.tsx

@@ -8,7 +8,6 @@ export type NetworkThrottleConfig = {
   latencyMs: number;
   downloadBps: number;
   uploadBps: number;
-  bypassUrlOrigins: string[];
 };
 
 export const NETWORK_THROTTLE_SLOW_4G_LATENCY_MS = 562.5;
@@ -17,18 +16,9 @@ export const NETWORK_THROTTLE_SLOW_4G_DOWNLOAD_BPS =
   NETWORK_THROTTLE_102_KIB_BPS;
 export const NETWORK_THROTTLE_SLOW_4G_UPLOAD_BPS = NETWORK_THROTTLE_102_KIB_BPS;
 
-type NativeNetworkThrottleConfig = Omit<
-  NetworkThrottleConfig,
-  'bypassUrlOrigins'
-> & {
-  bypassUrlOrigins?: string[];
-};
-
 type NativeNetworkThrottleModule = {
-  getConfig: () => Promise<NativeNetworkThrottleConfig>;
-  setConfig: (
-    config: NativeNetworkThrottleConfig
-  ) => Promise<NativeNetworkThrottleConfig>;
+  getConfig: () => Promise<NetworkThrottleConfig>;
+  setConfig: (config: NetworkThrottleConfig) => Promise<NetworkThrottleConfig>;
 };
 
 export type NetworkThrottleModule = {
@@ -47,33 +37,18 @@ const nativeModule = NativeModules.OneKeyNetworkThrottle as
   | NativeNetworkThrottleModule
   | undefined;
 
-function normalizeNativeConfig(
-  config: NativeNetworkThrottleConfig
-): NetworkThrottleConfig {
-  return {
-    ...config,
-    bypassUrlOrigins: config.bypassUrlOrigins ?? [],
-  };
-}
-
 export const NetworkThrottle: NetworkThrottleModule = nativeModule
   ? {
-      getConfig: async () =>
-        normalizeNativeConfig(await nativeModule.getConfig()),
+      getConfig: () => nativeModule.getConfig(),
       setConfig: async (config) => {
-        const currentConfig = normalizeNativeConfig(
-          await nativeModule.getConfig()
-        );
-        const nativeConfig = await nativeModule.setConfig({
+        const currentConfig = await nativeModule.getConfig();
+        return nativeModule.setConfig({
           enabled: config.enabled ?? currentConfig.enabled,
           profile: config.profile ?? currentConfig.profile,
           latencyMs: config.latencyMs ?? currentConfig.latencyMs,
           downloadBps: config.downloadBps ?? currentConfig.downloadBps,
           uploadBps: config.uploadBps ?? currentConfig.uploadBps,
-          bypassUrlOrigins:
-            config.bypassUrlOrigins ?? currentConfig.bypassUrlOrigins ?? [],
         });
-        return normalizeNativeConfig(nativeConfig);
       },
     }
   : (new Proxy(