react-native-local-network-info 1.0.1 → 1.0.2

package/android/build.gradle

@@ -4,15 +4,15 @@ plugins {
 }
 
 group = 'com.localnetworkinfo'
-version = '1.0.0'
+version = '1.0.2'
 
 // compileSdk (36), minSdk (24), targetSdk (36), Kotlin (2.0.21) and the
 // JVM toolchain (17) are supplied by the `expo-module-gradle-plugin`.
 android {
   namespace 'com.localnetworkinfo'
   defaultConfig {
-    versionCode 1
-    versionName '1.0.0'
+    versionCode 2
+    versionName '1.0.2'
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/com/localnetworkinfo/LocalNetworkInfoModule.kt

@@ -204,6 +204,19 @@ class LocalNetworkInfoModule : Module() {
       for (network in networks) {
         val capabilities = connectivityManager.getNetworkCapabilities(network) ?: continue
         if (!capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) continue
+        // A real WiFi *station* provides the device's internet, so it advertises
+        // NET_CAPABILITY_INTERNET as soon as it connects — independent of
+        // NET_CAPABILITY_VALIDATED, so captive-portal / LAN-only stations still
+        // count and never flap to "hotspot". The device's OWN tethered SoftAP can
+        // surface as a TRANSPORT_WIFI network on some OEM builds, but it does NOT
+        // provide internet, so excluding no-INTERNET networks keeps the hotspot
+        // interface classified as HOTSPOT rather than WIFI.
+        //
+        // Trade-off: app-scoped local-only WiFi clients (WifiNetworkSpecifier,
+        // WiFi Direct/P2P, WiFi Aware) deliberately drop INTERNET too, so they are
+        // treated as non-stations here. Ordinary stations joined via Settings keep
+        // INTERNET even on an internet-less router, so they are unaffected.
+        if (!capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) continue
         connectivityManager.getLinkProperties(network)?.interfaceName?.let { names.add(it) }
       }
     } catch (_: Exception) {
@@ -269,7 +282,7 @@ class LocalNetworkInfoModule : Module() {
       interfaceName = station.name
       netmask = station.netmask
       // Prefer the real default-route gateway; fall back to a subnet guess.
-      gateway = stationGateway() ?: deriveGateway(station.ip, station.prefixLength)
+      gateway = stationGateway(station.name) ?: deriveGateway(station.ip, station.prefixLength)
     } else if (host != null) {
       ip = host.ip
       role = "hotspot"
@@ -293,15 +306,34 @@ class LocalNetworkInfoModule : Module() {
     )
   }
 
-  /** Real station gateway via LinkProperties (default route), with a DHCP fallback. */
-  private fun stationGateway(): String? {
+  /**
+   * Gateway for the WiFi station on [interfaceName], read from THAT network's own
+   * LinkProperties — NOT `activeNetwork`. `activeNetwork` is the default network,
+   * which is the cellular network whenever WiFi is present but not the default
+   * (captive portal, LAN-only / IoT AP, or "avoid bad WiFi"); reading its route
+   * there would report the cellular gateway. Falls back to the DHCP server
+   * address, then to null (the caller then derives a subnet-guess gateway).
+   */
+  private fun stationGateway(interfaceName: String?): String? {
     return try {
-      val network = connectivityManager.activeNetwork ?: return null
+      @Suppress("DEPRECATION")
+      val network = connectivityManager.allNetworks.firstOrNull { n ->
+        val caps = connectivityManager.getNetworkCapabilities(n)
+        caps != null &&
+          caps.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) &&
+          caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
+          connectivityManager.getLinkProperties(n)?.interfaceName == interfaceName
+      } ?: return null
       val linkProperties = connectivityManager.getLinkProperties(network) ?: return null
-      // Ignore the 0.0.0.0 wildcard (appears as the "gateway" of a directly-connected
-      // default route, e.g. when the device is tethering rather than a real station).
+      // Require an IPv4 default route: without this a dual-stack station can return
+      // its IPv6 link-local next-hop (fe80::…%wlan0) depending on route ordering.
+      // Ignore the 0.0.0.0 wildcard (a directly-connected default route).
       val routeGateway = linkProperties.routes
-        .firstOrNull { it.isDefaultRoute && it.gateway?.isAnyLocalAddress == false }
+        .firstOrNull {
+          it.isDefaultRoute &&
+            it.gateway is Inet4Address &&
+            it.gateway?.isAnyLocalAddress == false
+        }
         ?.gateway
         ?.hostAddress
       if (routeGateway != null) return routeGateway

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-local-network-info",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Read a React Native device's own local IPv4 address and whether it is connected to WiFi or acting as a hotspot host, with live network-change events. Built with the Expo Modules API; works in bare React Native and Expo.",
   "main": "build/index.js",
   "types": "build/index.d.ts",