@mentra/glasses-media 3.2.0-dev.227 → 3.2.0-dev.233

package/ios/CoreKit/Sources/GlassesMediaCore/LocalMediaPolicy.swift

@@ -53,7 +53,11 @@ public enum LocalMediaPolicy {
             candidates += 1
             return true
         }
-        guard candidates > 0 else { throw LocalMediaError("No host ICE candidate on the glasses hotspot") }
+        guard candidates > 0 else {
+            throw LocalMediaError(answer
+                ? "Phone answer has no host ICE candidate on the glasses hotspot"
+                : "Glasses offer has no host ICE candidate on the glasses hotspot")
+        }
         return lines.joined(separator: "\r\n") + "\r\n"
     }
 }

package/ios/GlassesHotspotNetwork.swift

@@ -7,6 +7,7 @@ import NetworkExtension
 public final class GlassesHotspotNetwork {
     private let queue = DispatchQueue(label: "com.mentra.glassesmedia.hotspot")
     private var ssid: String?
+    private var lastHotspotSSID: String?
     private var localAddress: String?
     private var gatewayAddress: String?
     private var generation = 0
@@ -27,6 +28,7 @@ public final class GlassesHotspotNetwork {
             self.generation += 1
             let gen = self.generation
             self.ssid = ssid
+            self.lastHotspotSSID = ssid
             self.gatewayAddress = gateway
             self.cancelled = false
             self.applying = true
@@ -104,7 +106,7 @@ public final class GlassesHotspotNetwork {
         }
     }
 
-    public func awaitInternet(completion: @escaping (Bool, String) -> Void) {
+    public func awaitInternet(requireCellular: Bool = true, completion: @escaping (Bool, String) -> Void) {
         queue.async {
             let monitor = NWPathMonitor()
             var finished = false
@@ -116,9 +118,21 @@ public final class GlassesHotspotNetwork {
             }
             monitor.pathUpdateHandler = { path in
                 if path.status == .satisfied, path.usesInterfaceType(.cellular) { finish(true, "cellular") }
+                // Once the hotspot is released, a return to the user's Wi-Fi is also valid.
+                // Do not mistake the departing glasses AP's local-only path for restored internet.
+                if !requireCellular, path.status == .satisfied, path.usesInterfaceType(.wifi) {
+                    NEHotspotNetwork.fetchCurrent { network in
+                        self.queue.async {
+                            guard let network, !network.ssid.isEmpty, network.ssid != self.lastHotspotSSID else { return }
+                            finish(true, "wifi")
+                        }
+                    }
+                }
             }
             monitor.start(queue: self.queue)
-            self.queue.asyncAfter(deadline: .now() + 15) { finish(false, "Cellular internet did not become the default route") }
+            self.queue.asyncAfter(deadline: .now() + 15) {
+                finish(false, requireCellular ? "Cellular internet did not become the default route" : "Internet did not return after leaving the glasses hotspot")
+            }
         }
     }
 
@@ -136,7 +150,9 @@ public final class GlassesHotspotNetwork {
                 } else if remaining > 0 {
                     self.queue.asyncAfter(deadline: .now() + 0.5) { self.waitForAddress(ssid: ssid, generation: gen, remaining: remaining - 1) }
                 } else {
-                    self.finishJoin(.failure(LocalMediaError("Glasses hotspot has no verified Wi-Fi address")))
+                    let association = network == nil ? "unavailable" : (network?.ssid == ssid ? "matched" : "different")
+                    let address = Self.wifiAddress() ?? "none"
+                    self.finishJoin(.failure(LocalMediaError("Glasses hotspot has no verified Wi-Fi address (SSID=\(association), Wi-Fi IPv4=\(address))")))
                     self.finishLeave()
                 }
             }

package/ios/GlassesMedia.podspec

@@ -12,7 +12,8 @@ Pod::Spec.new do |s|
   s.swift_version = '5.9'
   s.static_framework = true
   s.dependency 'ExpoModulesCore'
-  s.dependency 'WebRTC-SDK', '137.7151.09'
+  # Keep in sync with the iOS-only @livekit/react-native-webrtc podspec patch.
+  s.dependency 'WebRTC-SDK', '144.7559.15'
   s.frameworks = 'AVFoundation', 'CoreMedia', 'CoreVideo', 'Network', 'NetworkExtension'
   s.source_files = '*.{swift,h,m,mm}', 'CoreKit/Sources/GlassesMediaCore/*.swift'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }

package/ios/GlassesPeerFactory.swift

@@ -0,0 +1,23 @@
+import WebRTC
+
+/// Both legs need real interface enumeration: local Wi-Fi can be absent from the default
+/// internet NWPath while cellular carries the uplink. Each factory's adapter mask and the
+/// receiver's SDP policy still restrict candidates to the appropriate leg.
+enum GlassesPeerFactory {
+    /// M144 honors this field trial for factories with custom audio devices; M137 installed
+    /// NWPathMonitor unconditionally (including when disableNetworkMonitor was set).
+    /// The SDK setting is process-wide. Set it once and never toggle it around factory creation:
+    /// receiver, relay, and React Native WebRTC factories may initialize concurrently.
+    private static let configure: Void = {
+        RTCPeerConnectionFactory.configureFieldTrials("WebRTC-Network-UseNWPathMonitor/Disabled/")
+    }()
+
+    static func make(audioDevice: RTCAudioDevice) -> RTCPeerConnectionFactory {
+        _ = configure
+        return RTCPeerConnectionFactory(
+            encoderFactory: RTCDefaultVideoEncoderFactory(),
+            decoderFactory: RTCDefaultVideoDecoderFactory(),
+            audioDevice: audioDevice
+        )
+    }
+}

package/ios/LocalWhipIngestSource.swift

@@ -67,7 +67,7 @@ public final class LocalWhipIngestSource: NSObject, DecodedGlassesMediaSource {
             let gen = self.generation
             self.transition(.connecting, "listening")
             RTCInitializeSSL()
-            let factory = RTCPeerConnectionFactory(encoderFactory: RTCDefaultVideoEncoderFactory(), decoderFactory: RTCDefaultVideoDecoderFactory(), audioDevice: ReceiveOnlyAudioDevice())
+            let factory = GlassesPeerFactory.make(audioDevice: ReceiveOnlyAudioDevice())
             let options = RTCPeerConnectionFactoryOptions()
             options.ignoreCellularNetworkAdapter = true
             options.ignoreVPNNetworkAdapter = true

package/ios/PhoneWhipPublisher.swift

@@ -39,7 +39,7 @@ final class PhoneWhipPublisher: NSObject {
         queue.async {
             guard !self.stopped else { return }
             RTCInitializeSSL()
-            let factory = RTCPeerConnectionFactory(encoderFactory: RTCDefaultVideoEncoderFactory(), decoderFactory: RTCDefaultVideoDecoderFactory(), audioDevice: self.audioDevice)
+            let factory = GlassesPeerFactory.make(audioDevice: self.audioDevice)
             let options = RTCPeerConnectionFactoryOptions()
             options.ignoreWiFiNetworkAdapter = true
             options.ignoreVPNNetworkAdapter = true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mentra/glasses-media",
-  "version": "3.2.0-dev.227",
+  "version": "3.2.0-dev.233",
   "description": "Shared native glasses media receivers and local network transport",
   "license": "MIT",
   "author": "Mentra Community",