@onekeyfe/react-native-network-info 3.0.7 → 3.0.8

package/android/src/main/java/com/rnnetworkinfo/NetworkInfoModule.kt

@@ -1,27 +1,38 @@
 package com.rnnetworkinfo
 
 import android.content.Context
-import android.net.ConnectivityManager
-import android.net.NetworkCapabilities
+import android.net.wifi.SupplicantState
 import android.net.wifi.WifiInfo
 import android.net.wifi.WifiManager
-import android.os.Build
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.annotations.ReactModule
 import java.net.Inet4Address
 import java.net.Inet6Address
 import java.net.InetAddress
+import java.net.InterfaceAddress
 import java.net.NetworkInterface
 
+/**
+ * Ported from upstream react-native-network-info RNNetworkInfo.java.
+ * Adapted to extend NativeRNNetworkInfoSpec (TurboModule).
+ */
 @ReactModule(name = NetworkInfoModule.NAME)
 class NetworkInfoModule(reactContext: ReactApplicationContext) :
     NativeRNNetworkInfoSpec(reactContext) {
 
     companion object {
         const val NAME = "RNNetworkInfo"
+
+        val DSLITE_LIST = listOf(
+            "192.0.0.0", "192.0.0.1", "192.0.0.2", "192.0.0.3",
+            "192.0.0.4", "192.0.0.5", "192.0.0.6", "192.0.0.7"
+        )
     }
 
+    private val wifi: WifiManager =
+        reactContext.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+
     override fun getName(): String = NAME
 
     // MARK: - getSSID
@@ -29,7 +40,16 @@ class NetworkInfoModule(reactContext: ReactApplicationContext) :
     override fun getSSID(promise: Promise) {
         Thread {
             try {
-                val ssid = getWifiSSID()
+                @Suppress("DEPRECATION")
+                val info: WifiInfo = wifi.connectionInfo
+                var ssid: String? = null
+                if (info.supplicantState == SupplicantState.COMPLETED) {
+                    @Suppress("DEPRECATION")
+                    ssid = info.ssid
+                    if (ssid != null && ssid.startsWith("\"") && ssid.endsWith("\"")) {
+                        ssid = ssid.substring(1, ssid.length - 1)
+                    }
+                }
                 promise.resolve(ssid)
             } catch (e: Exception) {
                 promise.resolve(null)
@@ -37,31 +57,18 @@ class NetworkInfoModule(reactContext: ReactApplicationContext) :
         }.start()
     }
 
-    private fun getWifiSSID(): String? {
-        val context = reactApplicationContext
-        val wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as? WifiManager
-            ?: return null
-        @Suppress("DEPRECATION")
-        val wifiInfo: WifiInfo = wifiManager.connectionInfo ?: return null
-        @Suppress("DEPRECATION")
-        val ssid = wifiInfo.ssid
-        if (ssid == null || ssid == "<unknown ssid>") return null
-        return if (ssid.startsWith("\"") && ssid.endsWith("\"")) {
-            ssid.substring(1, ssid.length - 1)
-        } else {
-            ssid
-        }
-    }
-
     // MARK: - getBSSID
 
     override fun getBSSID(promise: Promise) {
         Thread {
             try {
-                val context = reactApplicationContext
-                val wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as? WifiManager
                 @Suppress("DEPRECATION")
-                val bssid = wifiManager?.connectionInfo?.bssid
+                val info: WifiInfo = wifi.connectionInfo
+                var bssid: String? = null
+                if (info.supplicantState == SupplicantState.COMPLETED) {
+                    @Suppress("DEPRECATION")
+                    bssid = wifi.connectionInfo.bssid
+                }
                 promise.resolve(bssid)
             } catch (e: Exception) {
                 promise.resolve(null)
@@ -74,22 +81,16 @@ class NetworkInfoModule(reactContext: ReactApplicationContext) :
     override fun getBroadcast(promise: Promise) {
         Thread {
             try {
-                var broadcast: String? = null
-                val interfaces = NetworkInterface.getNetworkInterfaces()
-                while (interfaces.hasMoreElements()) {
-                    val iface = interfaces.nextElement()
-                    if (iface.name == "wlan0" || iface.name == "eth0") {
-                        for (ia in iface.interfaceAddresses) {
-                            val broadcastAddr = ia.broadcast
-                            if (broadcastAddr != null) {
-                                broadcast = broadcastAddr.hostAddress
-                                break
-                            }
+                var ipAddress: String? = null
+                for (address in getInetAddresses()) {
+                    if (!address.address.isLoopbackAddress) {
+                        val broadCast: InetAddress? = address.broadcast
+                        if (broadCast != null) {
+                            ipAddress = broadCast.toString()
                         }
                     }
-                    if (broadcast != null) break
                 }
-                promise.resolve(broadcast)
+                promise.resolve(ipAddress)
             } catch (e: Exception) {
                 promise.resolve(null)
             }
@@ -101,10 +102,41 @@ class NetworkInfoModule(reactContext: ReactApplicationContext) :
     override fun getIPAddress(promise: Promise) {
         Thread {
             try {
-                val address = getIPv4Address()
-                promise.resolve(address ?: "")
+                var ipAddress: String? = null
+                var tmp = "0.0.0.0"
+                for (address in getInetAddresses()) {
+                    if (!address.address.isLoopbackAddress) {
+                        tmp = address.address.hostAddress.toString()
+                        if (!inDSLITERange(tmp)) {
+                            ipAddress = tmp
+                        }
+                    }
+                }
+                promise.resolve(ipAddress)
             } catch (e: Exception) {
-                promise.resolve("")
+                promise.resolve(null)
+            }
+        }.start()
+    }
+
+    // MARK: - getIPV4Address
+
+    override fun getIPV4Address(promise: Promise) {
+        Thread {
+            try {
+                var ipAddress: String? = null
+                var tmp = "0.0.0.0"
+                for (address in getInetAddresses()) {
+                    if (!address.address.isLoopbackAddress && address.address is Inet4Address) {
+                        tmp = address.address.hostAddress.toString()
+                        if (!inDSLITERange(tmp)) {
+                            ipAddress = tmp
+                        }
+                    }
+                }
+                promise.resolve(ipAddress)
+            } catch (e: Exception) {
+                promise.resolve(null)
             }
         }.start()
     }
@@ -135,131 +167,126 @@ class NetworkInfoModule(reactContext: ReactApplicationContext) :
         }.start()
     }
 
-    // MARK: - getGatewayIPAddress
+    // MARK: - getWIFIIPV4Address
 
-    override fun getGatewayIPAddress(promise: Promise) {
+    override fun getWIFIIPV4Address(promise: Promise) {
         Thread {
             try {
-                val context = reactApplicationContext
-                val wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as? WifiManager
                 @Suppress("DEPRECATION")
-                val dhcpInfo = wifiManager?.dhcpInfo
-                val gateway = if (dhcpInfo != null && dhcpInfo.gateway != 0) {
-                    formatIpAddress(dhcpInfo.gateway)
-                } else {
-                    null
-                }
-                promise.resolve(gateway ?: "")
+                val info: WifiInfo = wifi.connectionInfo
+                val ipAddress = info.ipAddress
+                val stringIp = String.format(
+                    "%d.%d.%d.%d",
+                    ipAddress and 0xff,
+                    ipAddress shr 8 and 0xff,
+                    ipAddress shr 16 and 0xff,
+                    ipAddress shr 24 and 0xff
+                )
+                promise.resolve(stringIp)
             } catch (e: Exception) {
-                promise.resolve("")
+                promise.resolve(null)
             }
         }.start()
     }
 
-    // MARK: - getIPV4Address
+    // MARK: - getSubnet
 
-    override fun getIPV4Address(promise: Promise) {
+    override fun getSubnet(promise: Promise) {
         Thread {
             try {
-                val address = getIPv4Address()
-                promise.resolve(address ?: "0.0.0.0")
+                val interfaces = NetworkInterface.getNetworkInterfaces()
+                while (interfaces.hasMoreElements()) {
+                    val iface = interfaces.nextElement()
+                    if (iface.isLoopback || !iface.isUp) continue
+
+                    val addresses = iface.inetAddresses
+                    for (address in iface.interfaceAddresses) {
+                        val addr = addresses.nextElement()
+                        if (addr is Inet6Address) continue
+
+                        promise.resolve(intToIP(address.networkPrefixLength.toInt()))
+                        return@Thread
+                    }
+                }
+                promise.resolve("0.0.0.0")
             } catch (e: Exception) {
                 promise.resolve("0.0.0.0")
             }
         }.start()
     }
 
-    // MARK: - getWIFIIPV4Address
+    // MARK: - getGatewayIPAddress
 
-    override fun getWIFIIPV4Address(promise: Promise) {
+    override fun getGatewayIPAddress(promise: Promise) {
         Thread {
             try {
-                var address: String? = null
-                val interfaces = NetworkInterface.getNetworkInterfaces()
-                loop@ while (interfaces.hasMoreElements()) {
-                    val iface = interfaces.nextElement()
-                    if (iface.name == "wlan0") {
-                        val addrs = iface.inetAddresses
-                        while (addrs.hasMoreElements()) {
-                            val addr = addrs.nextElement()
-                            if (addr is Inet4Address && !addr.isLoopbackAddress) {
-                                address = addr.hostAddress
-                                break@loop
-                            }
-                        }
-                    }
-                }
-                promise.resolve(address ?: "0.0.0.0")
+                @Suppress("DEPRECATION")
+                val dhcpInfo = wifi.dhcpInfo
+                val gatewayIPInt = dhcpInfo.gateway
+                val gatewayIP = String.format(
+                    "%d.%d.%d.%d",
+                    gatewayIPInt and 0xFF,
+                    gatewayIPInt shr 8 and 0xFF,
+                    gatewayIPInt shr 16 and 0xFF,
+                    gatewayIPInt shr 24 and 0xFF
+                )
+                promise.resolve(gatewayIP)
             } catch (e: Exception) {
-                promise.resolve("0.0.0.0")
+                promise.resolve(null)
             }
         }.start()
     }
 
-    // MARK: - getSubnet
+    // MARK: - getFrequency
 
-    override fun getSubnet(promise: Promise) {
+    override fun getFrequency(promise: Promise) {
         Thread {
             try {
-                var subnet: String? = null
-                val interfaces = NetworkInterface.getNetworkInterfaces()
-                loop@ while (interfaces.hasMoreElements()) {
-                    val iface = interfaces.nextElement()
-                    if (!iface.isUp || iface.isLoopback) continue
-                    for (ia in iface.interfaceAddresses) {
-                        val addr = ia.address
-                        if (addr is Inet4Address && !addr.isLoopbackAddress) {
-                            val prefixLen = ia.networkPrefixLength.toInt()
-                            val mask = prefixLengthToSubnetMask(prefixLen)
-                            subnet = mask
-                            break@loop
-                        }
-                    }
-                }
-                promise.resolve(subnet ?: "0.0.0.0")
+                @Suppress("DEPRECATION")
+                val info: WifiInfo = wifi.connectionInfo
+                val frequency = info.frequency.toDouble()
+                promise.resolve(frequency)
             } catch (e: Exception) {
-                promise.resolve("0.0.0.0")
+                promise.resolve(null)
             }
         }.start()
     }
 
-    // MARK: - Helpers
-
-    private fun getIPv4Address(): String? {
-        val interfaces = NetworkInterface.getNetworkInterfaces()
-        while (interfaces.hasMoreElements()) {
-            val iface = interfaces.nextElement()
-            if (!iface.isUp || iface.isLoopback) continue
-            val addrs = iface.inetAddresses
-            while (addrs.hasMoreElements()) {
-                val addr = addrs.nextElement()
-                if (addr is Inet4Address && !addr.isLoopbackAddress) {
-                    return addr.hostAddress
+    // --- Private helpers (ported from upstream RNNetworkInfo.java) ---
+
+    private fun intToIP(ip: Int): String {
+        val finl = arrayOf("", "", "", "")
+        var k = 1
+        for (i in 0 until 4) {
+            for (j in 0 until 8) {
+                if (k <= ip) {
+                    finl[i] += "1"
+                } else {
+                    finl[i] += "0"
                 }
+                k++
             }
         }
-        return null
+        return "${Integer.parseInt(finl[0], 2)}.${Integer.parseInt(finl[1], 2)}.${Integer.parseInt(finl[2], 2)}.${Integer.parseInt(finl[3], 2)}"
     }
 
-    @Suppress("DEPRECATION")
-    private fun formatIpAddress(ip: Int): String {
-        return String.format(
-            "%d.%d.%d.%d",
-            ip and 0xff,
-            ip shr 8 and 0xff,
-            ip shr 16 and 0xff,
-            ip shr 24 and 0xff
-        )
+    private fun inDSLITERange(ip: String): Boolean {
+        return DSLITE_LIST.contains(ip)
     }
 
-    private fun prefixLengthToSubnetMask(prefixLength: Int): String {
-        val mask = if (prefixLength == 0) 0 else (-1 shl (32 - prefixLength))
-        return String.format(
-            "%d.%d.%d.%d",
-            mask shr 24 and 0xff,
-            mask shr 16 and 0xff,
-            mask shr 8 and 0xff,
-            mask and 0xff
-        )
+    private fun getInetAddresses(): List<InterfaceAddress> {
+        val addresses = mutableListOf<InterfaceAddress>()
+        try {
+            val en = NetworkInterface.getNetworkInterfaces()
+            while (en.hasMoreElements()) {
+                val intf = en.nextElement()
+                for (interfaceAddress in intf.interfaceAddresses) {
+                    addresses.add(interfaceAddress)
+                }
+            }
+        } catch (ex: Exception) {
+            android.util.Log.e(NAME, ex.toString())
+        }
+        return addresses
     }
 }

package/ios/NetworkInfo.h

@@ -20,5 +20,7 @@
                     reject:(RCTPromiseRejectBlock)reject;
 - (void)getSubnet:(RCTPromiseResolveBlock)resolve
            reject:(RCTPromiseRejectBlock)reject;
+- (void)getFrequency:(RCTPromiseResolveBlock)resolve
+              reject:(RCTPromiseRejectBlock)reject;
 
 @end

package/ios/NetworkInfo.mm

@@ -305,6 +305,15 @@
     });
 }
 
+// MARK: - getFrequency
+
+- (void)getFrequency:(RCTPromiseResolveBlock)resolve
+              reject:(RCTPromiseRejectBlock)reject
+{
+    // WiFi frequency is not available on iOS
+    resolve(nil);
+}
+
 // MARK: - getAllIPAddresses helper
 
 - (NSDictionary *)getAllIPAddresses

package/lib/module/NativeNetworkInfo.js.map

@@ -1 +1 @@
-{"version":3,"names":["TurboModuleRegistry","getEnforcing"],"sourceRoot":"../../src","sources":["NativeNetworkInfo.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,cAAc;AAelD,eAAeA,mBAAmB,CAACC,YAAY,CAAO,eAAe,CAAC","ignoreList":[]}
+{"version":3,"names":["TurboModuleRegistry","getEnforcing"],"sourceRoot":"../../src","sources":["NativeNetworkInfo.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAAQ,cAAc;AAgBlD,eAAeA,mBAAmB,CAACC,YAAY,CAAO,eAAe,CAAC","ignoreList":[]}

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

@@ -9,6 +9,7 @@ export interface Spec extends TurboModule {
     getIPV4Address(): Promise<string>;
     getWIFIIPV4Address(): Promise<string>;
     getSubnet(): Promise<string>;
+    getFrequency(): Promise<number | null>;
 }
 declare const _default: Spec;
 export default _default;

package/lib/typescript/src/NativeNetworkInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeNetworkInfo.d.ts","sourceRoot":"","sources":["../../../src/NativeNetworkInfo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAClC,QAAQ,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACnC,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACvC,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9B;;AAED,wBAAuE"}
+{"version":3,"file":"NativeNetworkInfo.d.ts","sourceRoot":"","sources":["../../../src/NativeNetworkInfo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAClC,QAAQ,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACnC,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACvC,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACxC;;AAED,wBAAuE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-network-info",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "react-native-network-info",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/NativeNetworkInfo.ts

@@ -11,6 +11,7 @@ export interface Spec extends TurboModule {
   getIPV4Address(): Promise<string>;
   getWIFIIPV4Address(): Promise<string>;
   getSubnet(): Promise<string>;
+  getFrequency(): Promise<number | null>;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('RNNetworkInfo');