expo-network 4.0.3 → 4.2.0

package/CHANGELOG.md

@@ -10,11 +10,19 @@
 
 ### 💡 Others
 
-## 4.0.3 — 2021-10-21
+## 4.2.0 — 2022-04-18
 
-_This version does not introduce any user-facing changes._
+### ⚠️ Notices
+
+- On Android bump `compileSdkVersion` to `31`, `targetSdkVersion` to `31` and `Java` version to `11`. ([#16941](https://github.com/expo/expo/pull/16941) by [@bbarthec](https://github.com/bbarthec))
+
+## 4.1.1 - 2022-02-01
+
+### 🐛 Bug fixes
+
+- Fix `Plugin with id 'maven' not found` build error from Android Gradle 7. ([#16080](https://github.com/expo/expo/pull/16080) by [@kudo](https://github.com/kudo))
 
-## 4.0.2 — 2021-10-15
+## 4.1.0 — 2021-12-03
 
 _This version does not introduce any user-facing changes._
 
@@ -35,6 +43,7 @@ _This version does not introduce any user-facing changes._
 ### 💡 Others
 
 - Migrated from `@unimodules/core` to `expo-modules-core`. ([#13757](https://github.com/expo/expo/pull/13757) by [@tsapeta](https://github.com/tsapeta))
+- Rewrite Android code to Kotlin. ([#14474](https://github.com/expo/expo/pull/14474) by [@kkafar](https://github.com/kkafar))
 
 ## 3.2.0 — 2021-06-16
 

package/README.md

@@ -2,20 +2,20 @@
 
 Gets device's network information such as ip address, mac address and check for airplane mode.
 
-See [<ModuleName> docs](https://docs.expo.io/versions/latest/sdk/<module-docs-name>) for documentation of this universal module's API.
+See [<ModuleName> docs](https://docs.expo.dev/versions/latest/sdk/<module-docs-name>) for documentation of this universal module's API.
 
 # API documentation
 
-- [Documentation for the master branch](https://github.com/expo/expo/blob/master/docs/pages/versions/unversioned/sdk/network.md)
-- [Documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/network/)
+- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/network.md)
+- [Documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/network/)
 
 # Installation in managed Expo projects
 
-For managed [managed](https://docs.expo.io/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/network/).
+For [managed](https://docs.expo.dev/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/network/).
 
 # Installation in bare React Native projects
 
-For bare React Native projects, you must ensure that you have [installed and configured the `react-native-unimodules` package](https://github.com/expo/expo/tree/master/packages/react-native-unimodules) before continuing.
+For bare React Native projects, you must ensure that you have [installed and configured the `expo` package](https://docs.expo.dev/bare/installing-expo-modules/) before continuing.
 
 ### Add the package to your npm dependencies
 

package/android/build.gradle

@@ -1,63 +1,80 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '4.0.3'
+version = '4.2.0'
 
 buildscript {
+  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+  if (expoModulesCorePlugin.exists()) {
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+  }
+
   // Simple helper that allows the root project to override versions declared by this library.
   ext.safeExtGet = { prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
   }
 
+  // Ensures backward compatibility
+  ext.getKotlinVersion = {
+    if (ext.has("kotlinVersion")) {
+      ext.kotlinVersion()
+    } else {
+      ext.safeExtGet("kotlinVersion", "1.6.10")
+    }
+  }
+
   repositories {
     mavenCentral()
   }
 
   dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.4.21')}")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
   }
 }
 
-// Upload android library to maven with javadoc and android sources
-configurations {
-  deployerJars
-}
-
 // Creating sources with comments
 task androidSourcesJar(type: Jar) {
   classifier = 'sources'
   from android.sourceSets.main.java.srcDirs
 }
 
-// Put the androidSources and javadoc to the artifacts
-artifacts {
-  archives androidSourcesJar
-}
-
-uploadArchives {
-  repositories {
-    mavenDeployer {
-      configuration = configurations.deployerJars
-      repository(url: mavenLocal().url)
+afterEvaluate {
+  publishing {
+    publications {
+      release(MavenPublication) {
+        from components.release
+        // Add additional sourcesJar to artifacts
+        artifact(androidSourcesJar)
+      }
+    }
+    repositories {
+      maven {
+        url = mavenLocal().url
+      }
     }
   }
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 30)
+  compileSdkVersion safeExtGet("compileSdkVersion", 31)
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
+  }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 30)
+    targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 11
-    versionName '4.0.3'
+    versionName '4.2.0'
   }
   lintOptions {
     abortOnError false
@@ -67,5 +84,5 @@ android {
 dependencies {
   implementation project(':expo-modules-core')
 
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
 }

package/android/src/main/java/expo/modules/network/NetworkModule.kt

@@ -0,0 +1,154 @@
+package expo.modules.network
+
+import expo.modules.core.Promise
+import expo.modules.core.ExportedModule
+import expo.modules.core.interfaces.ExpoMethod
+import expo.modules.core.interfaces.RegistryLifecycleListener
+
+import android.util.Log
+import android.os.Build
+import android.os.Bundle
+import android.content.Context
+import android.net.NetworkInfo
+import android.net.wifi.WifiInfo
+import android.net.wifi.WifiManager
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+import android.provider.Settings
+
+import java.lang.Exception
+import java.math.BigInteger
+import java.net.InetAddress
+import java.net.UnknownHostException
+import java.nio.ByteOrder
+
+private const val NAME = "ExpoNetwork"
+private val TAG = NetworkModule::class.java.simpleName
+
+class NetworkModule(private val appContext: Context) : ExportedModule(appContext), RegistryLifecycleListener {
+
+  enum class NetworkStateType(val value: String) {
+    NONE("NONE"),
+    UNKNOWN("UNKNOWN"),
+    CELLULAR("CELLULAR"),
+    WIFI("WIFI"),
+    BLUETOOTH("BLUETOOTH"),
+    ETHERNET("ETHERNET"),
+    WIMAX("WIMAX"),
+    VPN("VPN"),
+    OTHER("OTHER");
+
+    val isDefined: Boolean
+      get() = this.value != "NONE" && this.value != "UNKNOWN"
+  }
+
+  override fun getName() = NAME
+
+  private val wifiInfo: WifiInfo
+    get() = try {
+      val manager = appContext.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+      manager.connectionInfo
+    } catch (e: Exception) {
+      Log.e(TAG, e.message ?: "Wi-Fi information could not be acquired")
+      throw e
+    }
+
+  private fun getConnectionType(netInfo: NetworkInfo?): NetworkStateType = when (netInfo?.type) {
+    ConnectivityManager.TYPE_MOBILE,
+    ConnectivityManager.TYPE_MOBILE_DUN -> NetworkStateType.CELLULAR
+    ConnectivityManager.TYPE_WIFI -> NetworkStateType.WIFI
+    ConnectivityManager.TYPE_BLUETOOTH -> NetworkStateType.BLUETOOTH
+    ConnectivityManager.TYPE_ETHERNET -> NetworkStateType.ETHERNET
+    ConnectivityManager.TYPE_WIMAX -> NetworkStateType.WIMAX
+    ConnectivityManager.TYPE_VPN -> NetworkStateType.VPN
+    else -> NetworkStateType.UNKNOWN
+  }
+
+  private fun getConnectionType(netCapabilities: NetworkCapabilities?): NetworkStateType =
+    when {
+      netCapabilities == null -> NetworkStateType.UNKNOWN
+      netCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> NetworkStateType.CELLULAR
+      netCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) || netCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI_AWARE) -> NetworkStateType.WIFI
+      netCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) -> NetworkStateType.BLUETOOTH
+      netCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> NetworkStateType.ETHERNET
+      netCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN) -> NetworkStateType.VPN
+      else -> NetworkStateType.UNKNOWN
+    }
+
+  private fun rawIpToString(ip: Int): String {
+    // Convert little-endian to big-endian if needed
+    val ip = if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) {
+      Integer.reverseBytes(ip)
+    } else {
+      ip
+    }
+
+    var ipByteArray = BigInteger.valueOf(ip.toLong()).toByteArray()
+    if (ipByteArray.size < 4) {
+      ipByteArray = frontPadWithZeros(ipByteArray)
+    }
+
+    return try {
+      InetAddress.getByAddress(ipByteArray).hostAddress
+    } catch (e: UnknownHostException) {
+      "0.0.0.0"
+    }
+  }
+
+  @ExpoMethod
+  fun getNetworkStateAsync(promise: Promise) {
+    val result = Bundle()
+    val connectivityManager = appContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+    try {
+      if (Build.VERSION.SDK_INT < 29) { // use getActiveNetworkInfo before api level 29
+        val netInfo = connectivityManager.activeNetworkInfo
+        val connectionType = getConnectionType(netInfo)
+
+        result.apply {
+          putBoolean("isInternetReachable", netInfo!!.isConnected)
+          putString("type", connectionType.value)
+          putBoolean("isConnected", connectionType.isDefined)
+        }
+
+        promise.resolve(result)
+      } else {
+        val network = connectivityManager.activeNetwork
+        val isInternetReachable = network != null
+
+        val connectionType = if (isInternetReachable) {
+          val netCapabilities = connectivityManager.getNetworkCapabilities(network)
+          getConnectionType(netCapabilities)
+        } else {
+          null
+        }
+
+        result.apply {
+          putString("type", connectionType?.value ?: NetworkStateType.NONE.value)
+          putBoolean("isInternetReachable", isInternetReachable)
+          putBoolean("isConnected", connectionType != null && connectionType.isDefined)
+        }
+
+        promise.resolve(result)
+      }
+    } catch (e: Exception) {
+      promise.reject("ERR_NETWORK_NO_ACCESS_NETWORKINFO", "Unable to access network information", e)
+    }
+  }
+
+  @ExpoMethod
+  fun getIpAddressAsync(promise: Promise) {
+    try {
+      promise.resolve(rawIpToString(wifiInfo.ipAddress))
+    } catch (e: Exception) {
+      Log.e(TAG, e.message ?: "Could not get IP address")
+      promise.reject("ERR_NETWORK_IP_ADDRESS", "Unknown Host Exception", e)
+    }
+  }
+
+  @ExpoMethod
+  fun isAirplaneModeEnabledAsync(promise: Promise) {
+    val isAirplaneMode = Settings.Global.getInt(appContext.contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0) != 0
+    promise.resolve(isAirplaneMode)
+  }
+}

package/android/src/main/java/expo/modules/network/NetworkPackage.kt

@@ -0,0 +1,11 @@
+package expo.modules.network
+
+import android.content.Context
+
+import expo.modules.core.BasePackage
+import expo.modules.core.ExportedModule
+
+class NetworkPackage : BasePackage() {
+  override fun createExportedModules(context: Context): List<ExportedModule> =
+    listOf(NetworkModule(context))
+}

package/android/src/main/java/expo/modules/network/NetworkUtils.kt

@@ -0,0 +1,7 @@
+package expo.modules.network
+
+internal fun frontPadWithZeros(inputArray: ByteArray): ByteArray {
+  val newByteArray = byteArrayOf(0, 0, 0, 0)
+  System.arraycopy(inputArray, 0, newByteArray, 4 - inputArray.size, inputArray.size)
+  return newByteArray
+}

package/build/ExpoNetwork.d.ts

@@ -1,2 +1,3 @@
 declare const _default: import("expo-modules-core").ProxyNativeModule;
 export default _default;
+//# sourceMappingURL=ExpoNetwork.d.ts.map

package/build/ExpoNetwork.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoNetwork.d.ts","sourceRoot":"","sources":["../src/ExpoNetwork.ts"],"names":[],"mappings":";AACA,wBAA8C"}

package/build/ExpoNetwork.web.d.ts

@@ -5,3 +5,4 @@ declare const _default: {
     getMacAddressAsync(): Promise<null>;
 };
 export default _default;
+//# sourceMappingURL=ExpoNetwork.web.d.ts.map

package/build/ExpoNetwork.web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoNetwork.web.d.ts","sourceRoot":"","sources":["../src/ExpoNetwork.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAoB,MAAM,iBAAiB,CAAC;;yBAGpC,QAAQ,MAAM,CAAC;4BASZ,QAAQ,YAAY,CAAC;0BAUvB,QAAQ,IAAI,CAAC;;AApB3C,wBAuBE"}

package/build/Network.d.ts

@@ -20,7 +20,7 @@ export { NetworkState, NetworkStateType };
  */
 export declare function getNetworkStateAsync(): Promise<NetworkState>;
 /**
- * Gets the device's current IPv4 address. Returns `0.0.0.0`` if the IP address could not be retrieved.
+ * Gets the device's current IPv4 address. Returns `0.0.0.0` if the IP address could not be retrieved.
  *
  * On web, this method uses the third-party [`ipify service`](https://www.ipify.org/) to get the
  * public IP address of the current device.
@@ -53,9 +53,10 @@ export declare function getIpAddressAsync(): Promise<string>;
  */
 export declare function getMacAddressAsync(interfaceName?: string | null): Promise<string>;
 /**
- * __Android only.__ Tells if the device is in airplane mode.
+ * Tells if the device is in airplane mode.
  * @return Returns a `Promise` that fulfils with a `boolean` value for whether the device is in
  * airplane mode or not.
+ * @platform android
  *
  * @example
  * ```ts
@@ -64,3 +65,4 @@ export declare function getMacAddressAsync(interfaceName?: string | null): Promi
  * ```
  */
 export declare function isAirplaneModeEnabledAsync(): Promise<boolean>;
+//# sourceMappingURL=Network.d.ts.map

package/build/Network.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Network.d.ts","sourceRoot":"","sources":["../src/Network.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,CAAC;AAG1C;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,YAAY,CAAC,CAKlE;AAGD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,CAKzD;AAGD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,kBAAkB,CAAC,aAAa,GAAE,MAAM,GAAG,IAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAK7F;AAGD;;;;;;;;;;;GAWG;AACH,wBAAsB,0BAA0B,IAAI,OAAO,CAAC,OAAO,CAAC,CAKnE"}

package/build/Network.js

@@ -29,7 +29,7 @@ export async function getNetworkStateAsync() {
 }
 // @needsAudit
 /**
- * Gets the device's current IPv4 address. Returns `0.0.0.0`` if the IP address could not be retrieved.
+ * Gets the device's current IPv4 address. Returns `0.0.0.0` if the IP address could not be retrieved.
  *
  * On web, this method uses the third-party [`ipify service`](https://www.ipify.org/) to get the
  * public IP address of the current device.
@@ -72,9 +72,10 @@ export async function getMacAddressAsync(interfaceName = null) {
 }
 // @needsAudit
 /**
- * __Android only.__ Tells if the device is in airplane mode.
+ * Tells if the device is in airplane mode.
  * @return Returns a `Promise` that fulfils with a `boolean` value for whether the device is in
  * airplane mode or not.
+ * @platform android
  *
  * @example
  * ```ts

package/build/Network.js.map

@@ -1 +1 @@
-{"version":3,"file":"Network.js","sourceRoot":"","sources":["../src/Network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,EAAgB,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAgB,gBAAgB,EAAE,CAAC;AAE1C,cAAc;AACd;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB;IACxC,IAAI,CAAC,WAAW,CAAC,oBAAoB,EAAE;QACrC,MAAM,IAAI,mBAAmB,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAAC;KACvE;IACD,OAAO,MAAM,WAAW,CAAC,oBAAoB,EAAE,CAAC;AAClD,CAAC;AAED,cAAc;AACd;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACrC,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE;QAClC,MAAM,IAAI,mBAAmB,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC;KACpE;IACD,OAAO,MAAM,WAAW,CAAC,iBAAiB,EAAE,CAAC;AAC/C,CAAC;AAED,cAAc;AACd;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,gBAA+B,IAAI;IAC1E,OAAO,CAAC,IAAI,CACV,qKAAqK,CACtK,CAAC;IACF,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAED,cAAc;AACd;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B;IAC9C,IAAI,CAAC,WAAW,CAAC,0BAA0B,EAAE;QAC3C,MAAM,IAAI,mBAAmB,CAAC,cAAc,EAAE,4BAA4B,CAAC,CAAC;KAC7E;IACD,OAAO,MAAM,WAAW,CAAC,0BAA0B,EAAE,CAAC;AACxD,CAAC","sourcesContent":["import { UnavailabilityError } from 'expo-modules-core';\n\nimport ExpoNetwork from './ExpoNetwork';\nimport { NetworkState, NetworkStateType } from './Network.types';\n\nexport { NetworkState, NetworkStateType };\n\n// @needsAudit\n/**\n * Gets the device's current network connection state.\n *\n * On web, `navigator.connection.type` is not available on browsers. So if there is an active\n * network connection, the field `type` returns `NetworkStateType.UNKNOWN`. Otherwise, it returns\n * `NetworkStateType.NONE`.\n * @return A `Promise` that fulfils with a `NetworkState` object.\n *\n * @example\n * ```ts\n * await Network.getNetworkStateAsync();\n * // {\n * //   type: NetworkStateType.CELLULAR,\n * //   isConnected: true,\n * //   isInternetReachable: true,\n * // }\n * ```\n */\nexport async function getNetworkStateAsync(): Promise<NetworkState> {\n  if (!ExpoNetwork.getNetworkStateAsync) {\n    throw new UnavailabilityError('expo-network', 'getNetworkStateAsync');\n  }\n  return await ExpoNetwork.getNetworkStateAsync();\n}\n\n// @needsAudit\n/**\n * Gets the device's current IPv4 address. Returns `0.0.0.0`` if the IP address could not be retrieved.\n *\n * On web, this method uses the third-party [`ipify service`](https://www.ipify.org/) to get the\n * public IP address of the current device.\n * @return A `Promise` that fulfils with a `string` of the current IP address of the device's main\n * network interface. Can only be IPv4 address.\n *\n * @example\n * ```ts\n * await Network.getIpAddressAsync();\n * // \"92.168.32.44\"\n * ```\n */\nexport async function getIpAddressAsync(): Promise<string> {\n  if (!ExpoNetwork.getIpAddressAsync) {\n    throw new UnavailabilityError('expo-network', 'getIpAddressAsync');\n  }\n  return await ExpoNetwork.getIpAddressAsync();\n}\n\n// @needsAudit\n/**\n * Gets the specified network interface's MAC address.\n *\n * > Beginning with iOS 7 and Android 11, non-system applications can no longer access the device's\n * MAC address. In SDK 41 and above, this method will always resolve to a predefined value that\n * isn't useful.\n *\n * If you need to identify the device, use the `getIosIdForVendorAsync()` method / `androidId`\n * property of the `expo-application` unimodule instead.\n *\n * @deprecated This method is deprecated and will be removed in a future SDK version.\n *\n * @param interfaceName A string representing interface name (`eth0`, `wlan0`) or `null` (default),\n * meaning the method should fetch the MAC address of the first available interface.\n *\n * @return A `Promise` that fulfils with the value `'02:00:00:00:00:00'`.\n */\nexport async function getMacAddressAsync(interfaceName: string | null = null): Promise<string> {\n  console.warn(\n    'Network.getMacAddressAsync has been deprecated and will be removed in a future SDK version. To uniquely identify a device, use the expo-application module instead.'\n  );\n  return '02:00:00:00:00:00';\n}\n\n// @needsAudit\n/**\n * __Android only.__ Tells if the device is in airplane mode.\n * @return Returns a `Promise` that fulfils with a `boolean` value for whether the device is in\n * airplane mode or not.\n *\n * @example\n * ```ts\n * await Network.isAirplaneModeEnabledAsync();\n * // false\n * ```\n */\nexport async function isAirplaneModeEnabledAsync(): Promise<boolean> {\n  if (!ExpoNetwork.isAirplaneModeEnabledAsync) {\n    throw new UnavailabilityError('expo-network', 'isAirplaneModeEnabledAsync');\n  }\n  return await ExpoNetwork.isAirplaneModeEnabledAsync();\n}\n"]}
+{"version":3,"file":"Network.js","sourceRoot":"","sources":["../src/Network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,EAAgB,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAgB,gBAAgB,EAAE,CAAC;AAE1C,cAAc;AACd;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB;IACxC,IAAI,CAAC,WAAW,CAAC,oBAAoB,EAAE;QACrC,MAAM,IAAI,mBAAmB,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAAC;KACvE;IACD,OAAO,MAAM,WAAW,CAAC,oBAAoB,EAAE,CAAC;AAClD,CAAC;AAED,cAAc;AACd;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACrC,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE;QAClC,MAAM,IAAI,mBAAmB,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC;KACpE;IACD,OAAO,MAAM,WAAW,CAAC,iBAAiB,EAAE,CAAC;AAC/C,CAAC;AAED,cAAc;AACd;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,gBAA+B,IAAI;IAC1E,OAAO,CAAC,IAAI,CACV,qKAAqK,CACtK,CAAC;IACF,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAED,cAAc;AACd;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B;IAC9C,IAAI,CAAC,WAAW,CAAC,0BAA0B,EAAE;QAC3C,MAAM,IAAI,mBAAmB,CAAC,cAAc,EAAE,4BAA4B,CAAC,CAAC;KAC7E;IACD,OAAO,MAAM,WAAW,CAAC,0BAA0B,EAAE,CAAC;AACxD,CAAC","sourcesContent":["import { UnavailabilityError } from 'expo-modules-core';\n\nimport ExpoNetwork from './ExpoNetwork';\nimport { NetworkState, NetworkStateType } from './Network.types';\n\nexport { NetworkState, NetworkStateType };\n\n// @needsAudit\n/**\n * Gets the device's current network connection state.\n *\n * On web, `navigator.connection.type` is not available on browsers. So if there is an active\n * network connection, the field `type` returns `NetworkStateType.UNKNOWN`. Otherwise, it returns\n * `NetworkStateType.NONE`.\n * @return A `Promise` that fulfils with a `NetworkState` object.\n *\n * @example\n * ```ts\n * await Network.getNetworkStateAsync();\n * // {\n * //   type: NetworkStateType.CELLULAR,\n * //   isConnected: true,\n * //   isInternetReachable: true,\n * // }\n * ```\n */\nexport async function getNetworkStateAsync(): Promise<NetworkState> {\n  if (!ExpoNetwork.getNetworkStateAsync) {\n    throw new UnavailabilityError('expo-network', 'getNetworkStateAsync');\n  }\n  return await ExpoNetwork.getNetworkStateAsync();\n}\n\n// @needsAudit\n/**\n * Gets the device's current IPv4 address. Returns `0.0.0.0` if the IP address could not be retrieved.\n *\n * On web, this method uses the third-party [`ipify service`](https://www.ipify.org/) to get the\n * public IP address of the current device.\n * @return A `Promise` that fulfils with a `string` of the current IP address of the device's main\n * network interface. Can only be IPv4 address.\n *\n * @example\n * ```ts\n * await Network.getIpAddressAsync();\n * // \"92.168.32.44\"\n * ```\n */\nexport async function getIpAddressAsync(): Promise<string> {\n  if (!ExpoNetwork.getIpAddressAsync) {\n    throw new UnavailabilityError('expo-network', 'getIpAddressAsync');\n  }\n  return await ExpoNetwork.getIpAddressAsync();\n}\n\n// @needsAudit\n/**\n * Gets the specified network interface's MAC address.\n *\n * > Beginning with iOS 7 and Android 11, non-system applications can no longer access the device's\n * MAC address. In SDK 41 and above, this method will always resolve to a predefined value that\n * isn't useful.\n *\n * If you need to identify the device, use the `getIosIdForVendorAsync()` method / `androidId`\n * property of the `expo-application` unimodule instead.\n *\n * @deprecated This method is deprecated and will be removed in a future SDK version.\n *\n * @param interfaceName A string representing interface name (`eth0`, `wlan0`) or `null` (default),\n * meaning the method should fetch the MAC address of the first available interface.\n *\n * @return A `Promise` that fulfils with the value `'02:00:00:00:00:00'`.\n */\nexport async function getMacAddressAsync(interfaceName: string | null = null): Promise<string> {\n  console.warn(\n    'Network.getMacAddressAsync has been deprecated and will be removed in a future SDK version. To uniquely identify a device, use the expo-application module instead.'\n  );\n  return '02:00:00:00:00:00';\n}\n\n// @needsAudit\n/**\n * Tells if the device is in airplane mode.\n * @return Returns a `Promise` that fulfils with a `boolean` value for whether the device is in\n * airplane mode or not.\n * @platform android\n *\n * @example\n * ```ts\n * await Network.isAirplaneModeEnabledAsync();\n * // false\n * ```\n */\nexport async function isAirplaneModeEnabledAsync(): Promise<boolean> {\n  if (!ExpoNetwork.isAirplaneModeEnabledAsync) {\n    throw new UnavailabilityError('expo-network', 'isAirplaneModeEnabledAsync');\n  }\n  return await ExpoNetwork.isAirplaneModeEnabledAsync();\n}\n"]}

package/build/Network.types.d.ts

@@ -59,3 +59,4 @@ export declare enum NetworkStateType {
      */
     OTHER = "OTHER"
 }
+//# sourceMappingURL=Network.types.d.ts.map

package/build/Network.types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Network.types.d.ts","sourceRoot":"","sources":["../src/Network.types.ts"],"names":[],"mappings":"AACA,oBAAY,YAAY,GAAG;IACzB;;;OAGG;IACH,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B,CAAC;AAGF;;GAEG;AACH,oBAAY,gBAAgB;IAC1B;;OAEG;IACH,IAAI,SAAS;IACb;;OAEG;IACH,OAAO,YAAY;IACnB;;;OAGG;IACH,QAAQ,aAAa;IACrB;;OAEG;IACH,IAAI,SAAS;IACb;;OAEG;IACH,SAAS,cAAc;IACvB;;OAEG;IACH,QAAQ,aAAa;IACrB;;OAEG;IACH,KAAK,UAAU;IACf;;OAEG;IACH,GAAG,QAAQ;IACX;;OAEG;IACH,KAAK,UAAU;CAChB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-network",
-  "version": "4.0.3",
+  "version": "4.2.0",
   "description": "Provides useful information about the device's network such as its IP address, MAC address, and airplane mode status",
   "main": "build/Network.js",
   "types": "build/Network.d.ts",
@@ -29,11 +29,12 @@
   "author": "650 Industries, Inc.",
   "license": "MIT",
   "homepage": "https://docs.expo.dev/versions/latest/sdk/network/",
-  "dependencies": {
-    "expo-modules-core": "~0.4.4"
-  },
+  "dependencies": {},
   "devDependencies": {
     "expo-module-scripts": "^2.0.0"
   },
-  "gitHead": "4fa0497a180ae707fa860cb03858630ab7af19f4"
+  "peerDependencies": {
+    "expo": "*"
+  },
+  "gitHead": "22dce752354bb429c84851bc4389abe47a766b1f"
 }

package/src/Network.ts

@@ -33,7 +33,7 @@ export async function getNetworkStateAsync(): Promise<NetworkState> {
 
 // @needsAudit
 /**
- * Gets the device's current IPv4 address. Returns `0.0.0.0`` if the IP address could not be retrieved.
+ * Gets the device's current IPv4 address. Returns `0.0.0.0` if the IP address could not be retrieved.
  *
  * On web, this method uses the third-party [`ipify service`](https://www.ipify.org/) to get the
  * public IP address of the current device.
@@ -80,9 +80,10 @@ export async function getMacAddressAsync(interfaceName: string | null = null): P
 
 // @needsAudit
 /**
- * __Android only.__ Tells if the device is in airplane mode.
+ * Tells if the device is in airplane mode.
  * @return Returns a `Promise` that fulfils with a `boolean` value for whether the device is in
  * airplane mode or not.
+ * @platform android
  *
  * @example
  * ```ts

package/android/src/main/java/expo/modules/network/NetworkModule.java

@@ -1,199 +0,0 @@
-package expo.modules.network;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.util.Log;
-
-import expo.modules.core.ExportedModule;
-import expo.modules.core.ModuleRegistry;
-import expo.modules.core.Promise;
-import expo.modules.core.interfaces.ActivityProvider;
-import expo.modules.core.interfaces.ExpoMethod;
-import expo.modules.core.interfaces.RegistryLifecycleListener;
-
-import java.math.BigInteger;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.UnknownHostException;
-import java.nio.ByteOrder;
-import java.util.Collections;
-import java.util.List;
-
-public class NetworkModule extends ExportedModule implements RegistryLifecycleListener {
-  private static final String NAME = "ExpoNetwork";
-  private static final String TAG = NetworkModule.class.getSimpleName();
-  private Context mContext;
-  private ModuleRegistry mModuleRegistry;
-  private ActivityProvider mActivityProvider;
-  private Activity mActivity;
-
-  public static enum NetworkStateType {
-    NONE("NONE"),
-    UNKNOWN("UNKNOWN"),
-    CELLULAR("CELLULAR"),
-    WIFI("WIFI"),
-    BLUETOOTH("BLUETOOTH"),
-    ETHERNET("ETHERNET"),
-    WIMAX("WIMAX"),
-    VPN("VPN"),
-    OTHER("OTHER");
-
-    private final String value;
-
-    NetworkStateType(String value) {
-      this.value = value;
-    }
-
-    public String getValue() {
-      return value;
-    }
-
-    public boolean equal(String value) {
-      return this.value.equals(value);
-    }
-  }
-
-  public NetworkModule(Context context) {
-    super(context);
-    mContext = context;
-  }
-
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
-  @Override
-  public void onCreate(ModuleRegistry moduleRegistry) {
-    mModuleRegistry = moduleRegistry;
-    mActivityProvider = moduleRegistry.getModule(ActivityProvider.class);
-    mActivity = mActivityProvider.getCurrentActivity();
-  }
-
-  private WifiInfo getWifiInfo() {
-    try {
-      WifiManager manager = (WifiManager) mContext.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-      return manager.getConnectionInfo();
-    } catch (Exception e) {
-      Log.e(TAG, e.getMessage());
-      throw e;
-    }
-  }
-
-  private NetworkStateType getConnectionType(NetworkInfo netinfo) {
-    switch (netinfo.getType()) {
-      case ConnectivityManager.TYPE_MOBILE:
-      case ConnectivityManager.TYPE_MOBILE_DUN:
-        return NetworkStateType.CELLULAR;
-      case ConnectivityManager.TYPE_WIFI:
-        return NetworkStateType.WIFI;
-      case ConnectivityManager.TYPE_BLUETOOTH:
-        return NetworkStateType.BLUETOOTH;
-      case ConnectivityManager.TYPE_ETHERNET:
-        return NetworkStateType.ETHERNET;
-      case ConnectivityManager.TYPE_WIMAX:
-        return NetworkStateType.WIMAX;
-      case ConnectivityManager.TYPE_VPN:
-        return NetworkStateType.VPN;
-      default:
-        return NetworkStateType.UNKNOWN;
-    }
-  }
-
-  private NetworkStateType getConnectionType(NetworkCapabilities nc) {
-    if (nc.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) return NetworkStateType.CELLULAR;
-    if (nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) || nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI_AWARE))
-      return NetworkStateType.WIFI;
-    if (nc.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH)) return NetworkStateType.BLUETOOTH;
-    if (nc.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)) return NetworkStateType.ETHERNET;
-    if (nc.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) return NetworkStateType.VPN;
-    return NetworkStateType.UNKNOWN;
-  }
-
-  private String rawIpToString(Integer ip) {
-    // Convert little-endian to big-endian if needed
-    if (ByteOrder.nativeOrder().equals(ByteOrder.LITTLE_ENDIAN)) {
-      ip = Integer.reverseBytes(ip);
-    }
-    byte[] ipByteArray = BigInteger.valueOf(ip).toByteArray();
-    if (ipByteArray.length < 4) {
-      ipByteArray = frontPadWithZeros(ipByteArray);
-    }
-    try {
-      return InetAddress.getByAddress(ipByteArray).getHostAddress();
-    } catch (UnknownHostException e) {
-      return "0.0.0.0";
-    }
-  }
-
-  private static byte[] frontPadWithZeros(byte [] inputArray) {
-    byte[] newByteArray = { 0, 0, 0, 0 };
-    System.arraycopy(inputArray, 0, newByteArray, 4 - inputArray.length, inputArray.length);
-    return newByteArray;
-  }
-
-  @ExpoMethod
-  public void getNetworkStateAsync(Promise promise) {
-    Bundle result = new Bundle();
-    ConnectivityManager cm = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
-    //use getActiveNetworkInfo before api level 29
-    if (Build.VERSION.SDK_INT < 29) {
-      try {
-        NetworkInfo netInfo = cm.getActiveNetworkInfo();
-        result.putBoolean("isInternetReachable", netInfo.isConnected());
-        NetworkStateType mConnectionType = getConnectionType(netInfo);
-        result.putString("type", mConnectionType.getValue());
-        result.putBoolean("isConnected", !mConnectionType.equal("NONE") && !mConnectionType.equal("UNKNOWN"));
-        promise.resolve(result);
-      } catch (Exception e) {
-        promise.reject("ERR_NETWORK_NO_ACCESS_NETWORKINFO", "Unable to access network information", e);
-      }
-    } else {
-      try {
-        Network network = cm.getActiveNetwork();
-        boolean isInternetReachable = network != null;
-        NetworkStateType connectionType = null;
-        if (isInternetReachable) {
-          NetworkCapabilities nc = cm.getNetworkCapabilities(network);
-          connectionType = getConnectionType(nc);
-          result.putString("type", connectionType.getValue());
-        } else {
-          result.putString("type", NetworkStateType.NONE.getValue());
-        }
-        result.putBoolean("isInternetReachable", isInternetReachable);
-        result.putBoolean("isConnected", connectionType != null && !connectionType.equal("NONE") && !connectionType.equal("UNKNOWN"));
-        promise.resolve(result);
-      } catch (Exception e) {
-        promise.reject("ERR_NETWORK_NO_ACCESS_NETWORKINFO", "Unable to access network information", e);
-      }
-    }
-  }
-
-  @ExpoMethod
-  public void getIpAddressAsync(Promise promise) {
-    try {
-      Integer ipAddress = getWifiInfo().getIpAddress();
-      String ipAddressString = rawIpToString(ipAddress);
-      promise.resolve(ipAddressString);
-    } catch (Exception e) {
-      Log.e(TAG, e.getMessage());
-      promise.reject("ERR_NETWORK_IP_ADDRESS", "Unknown Host Exception", e);
-    }
-  }
-
-  @ExpoMethod
-  public void isAirplaneModeEnabledAsync(Promise promise) {
-    boolean isAirPlaneMode = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
-    promise.resolve(isAirPlaneMode);
-  }
-}

package/android/src/main/java/expo/modules/network/NetworkPackage.java

@@ -1,16 +0,0 @@
-package expo.modules.network;
-
-import android.content.Context;
-
-import expo.modules.core.BasePackage;
-import expo.modules.core.ExportedModule;
-
-import java.util.Collections;
-import java.util.List;
-
-public class NetworkPackage extends BasePackage {
-  @Override
-  public List<ExportedModule> createExportedModules(Context context) {
-    return Collections.singletonList((ExportedModule) new NetworkModule(context));
-  }
-}