expo-network 7.0.0 → 7.0.2

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 7.0.2 — 2024-11-22
+
+_This version does not introduce any user-facing changes._
+
+## 7.0.1 — 2024-11-22
+
+### 🐛 Bug fixes
+
+- [iOS] Added fix to getNetworkStateAsync failing on iOS ([#33137](https://github.com/expo/expo/pull/33137) by [@chrfalch](https://github.com/chrfalch))
+
 ## 7.0.0 — 2024-10-22
 
 ### 🛠 Breaking changes

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '7.0.0'
+version = '7.0.2'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,6 +14,6 @@ android {
   namespace "expo.modules.network"
   defaultConfig {
     versionCode 11
-    versionName '7.0.0'
+    versionName '7.0.2'
   }
 }

package/ios/NetworkModule.swift

@@ -87,9 +87,38 @@ public final class NetworkModule: Module {
     return address
   }
 
+  private func getNetworkPathAsync() -> NWPath? {
+    // create a temporary monitor to avoid interfering with the module's monitor
+    // since we want to wait for the result to be updated once:
+    let tempMonitor = NWPathMonitor()
+    var tempPath: NWPath?
+
+    let semaphore = DispatchSemaphore(value: 0)
+
+    tempMonitor.pathUpdateHandler = { updatedPath in
+      tempPath = updatedPath
+      semaphore.signal() // Notify that we got the path
+    }
+
+    tempMonitor.start(queue: monitorQueue)
+
+    // Wait max 5 seconds to avoid any locking issues if the monitor
+    // doesn't get an update in time.
+    let result = semaphore.wait(timeout: .now() + 5)
+    tempMonitor.cancel()
+
+    if result == .timedOut {
+      // Handle the timeout case
+      print("Timeout waiting for network path.")
+      return nil
+    }
+
+    return tempPath
+  }
+
   private func getNetworkStateAsync(path: NWPath? = nil) -> [String: Any] {
-    let currentPath = path ?? monitor.currentPath
-    let isConnected = currentPath.status == .satisfied
+    let currentPath = path ?? getNetworkPathAsync()
+    let isConnected = currentPath?.status == .satisfied
 
     if !isConnected {
       return [
@@ -102,7 +131,7 @@ public final class NetworkModule: Module {
     let connectionType = NWInterface
       .InterfaceType
       .allCases
-      .filter { currentPath.usesInterfaceType($0) }
+      .filter { currentPath?.usesInterfaceType($0) == true }
       .first
 
     var currentNetworkType = NetworkType.unknown

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-network",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "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",
@@ -37,5 +37,5 @@
     "expo": "*",
     "react": "*"
   },
-  "gitHead": "685ebb8a213326cb33c80281ca8756b374ccb63d"
+  "gitHead": "eb0d9b5b6ba8dd5b64e016e41166e42ced543a69"
 }