@mentra/glasses-media 3.2.1-dev.294 → 3.2.1-dev.297

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

@@ -39,6 +39,14 @@ public enum LocalMediaPolicy {
         return bytes[3] > 0 && bytes[3] < 255
     }
 
+    /// A Mac may join through its host network controls. Reuse that connection only
+    /// after both its SSID and DHCP address match the hotspot advertised over BLE.
+    public static func canReuseHotspot(requestedSSID: String, currentSSID: String?, address: String?, gateway: String?) -> Bool {
+        guard !requestedSSID.isEmpty, requestedSSID == currentSSID,
+              let address, let gateway else { return false }
+        return isHotspotClientAddress(address, gateway: gateway)
+    }
+
     /// Keep only concrete host candidates on the local link. Never rewrite a cellular socket's
     /// advertised address: a candidate must already belong to the interface it claims.
     public static func localSdp(_ sdp: String, address: String, answer: Bool) throws -> String {

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

@@ -0,0 +1,20 @@
+#if MENTRA_E2E
+    import Foundation
+
+    /// Test-build dependency input, not a production network discovery mechanism.
+    /// The Mac harness owns association and verifies the USB fixture, gateway MAC,
+    /// DHCP address, local health and Ethernet before launching this process.
+    public struct MacE2EHotspotLease: Decodable {
+        public let ssid: String
+        public let gateway: String
+        public let address: String
+        public let issuedAt: TimeInterval
+
+        public func matches(ssid: String, gateway: String?, address: String?, now: TimeInterval) -> Bool {
+            let age = now - issuedAt
+            return age >= 0 && age <= 300 && self.gateway == gateway && self.address == address &&
+                LocalMediaPolicy.canReuseHotspot(requestedSSID: ssid, currentSSID: self.ssid,
+                                                 address: address, gateway: gateway)
+        }
+    }
+#endif

package/ios/GlassesHotspotNetwork.swift

@@ -14,11 +14,15 @@ public final class GlassesHotspotNetwork {
     private var gatewayAddress: String?
     private var generation = 0
     private var applying = false
+    private var ownsConfiguration = false
     private var cancelled = false
     private var joinReply: ((Result<String, Error>) -> Void)?
     private var leaveReplies: [() -> Void] = []
     private var monitor: NWPathMonitor?
     private var localAccess: LocalNetworkAccessRequest?
+    #if MENTRA_E2E
+        private var testLeaseConsumed = false
+    #endif
     public var onLost: ((String) -> Void)?
     public var onPermissionRequired: (() -> Void)?
     public init() {}
@@ -35,8 +39,49 @@ public final class GlassesHotspotNetwork {
             self.lastHotspotSSID = ssid
             self.gatewayAddress = gateway
             self.cancelled = false
+            self.applying = false
+            self.ownsConfiguration = false
             self.joinReply = completion
-            self.applyConfiguration(ssid: ssid, passphrase: passphrase, generation: gen)
+            if ProcessInfo.processInfo.isiOSAppOnMac {
+                #if MENTRA_E2E
+                    if let raw = ProcessInfo.processInfo.environment["MENTRA_E2E_PREJOINED_HOTSPOT"] {
+                        let address = Self.wifiAddress()
+                        guard !self.testLeaseConsumed,
+                              let lease = try? JSONDecoder().decode(MacE2EHotspotLease.self, from: Data(raw.utf8)),
+                              lease.matches(ssid: ssid, gateway: gateway, address: address, now: Date().timeIntervalSince1970),
+                              let address
+                        else {
+                            self.finishJoin(.failure(LocalMediaError("Mac E2E network lease is invalid, expired or already consumed")))
+                            self.finishLeave()
+                            return
+                        }
+                        self.testLeaseConsumed = true
+                        self.localAddress = address
+                        self.logger.notice("HOTSPOT_JOIN test_harness_connection native_association_untested")
+                        self.startMonitor(generation: gen)
+                        self.waitForLocalAccess(address: address, generation: gen)
+                        return
+                    }
+                #endif
+                NEHotspotNetwork.fetchCurrent { network in
+                    self.queue.async {
+                        guard gen == self.generation, !self.cancelled else { return }
+                        let address = Self.wifiAddress()
+                        if let address, LocalMediaPolicy.canReuseHotspot(requestedSSID: ssid, currentSSID: network?.ssid,
+                                                                         address: address, gateway: gateway)
+                        {
+                            self.localAddress = address
+                            self.logger.info("HOTSPOT_JOIN reuse_verified_macos_connection")
+                            self.startMonitor(generation: gen)
+                            self.waitForLocalAccess(address: address, generation: gen)
+                        } else {
+                            self.applyConfiguration(ssid: ssid, passphrase: passphrase, generation: gen)
+                        }
+                    }
+                }
+            } else {
+                self.applyConfiguration(ssid: ssid, passphrase: passphrase, generation: gen)
+            }
             self.queue.asyncAfter(deadline: .now() + 60) {
                 // Once associated, the user may still be reading the Local Network alert.
                 // Its response time is not a hotspot association timeout.
@@ -45,7 +90,7 @@ public final class GlassesHotspotNetwork {
                 self.finishJoin(.failure(LocalMediaError("Hotspot join timed out")))
                 // apply() cannot be cancelled. Retain the reservation until its callback and remove the
                 // late configuration before another call is permitted to acquire the network.
-                NEHotspotConfigurationManager.shared.removeConfiguration(forSSID: ssid)
+                if self.ownsConfiguration { NEHotspotConfigurationManager.shared.removeConfiguration(forSSID: ssid) }
                 if !self.applying { self.finishLeave() }
             }
         }
@@ -56,7 +101,7 @@ public final class GlassesHotspotNetwork {
             self.cancelled = true
             self.leaveReplies.append(completion)
             self.finishJoin(.failure(LocalMediaError("Hotspot join cancelled")))
-            if let ssid = self.ssid { NEHotspotConfigurationManager.shared.removeConfiguration(forSSID: ssid) }
+            if let ssid = self.ssid, self.ownsConfiguration { NEHotspotConfigurationManager.shared.removeConfiguration(forSSID: ssid) }
             if !self.applying { self.finishLeave() }
         }
     }
@@ -147,6 +192,7 @@ public final class GlassesHotspotNetwork {
         let config = NEHotspotConfiguration(ssid: ssid, passphrase: passphrase, isWEP: false)
         config.joinOnce = false
         applying = true
+        ownsConfiguration = true
         logger.info("HOTSPOT_JOIN apply_start ios_on_mac=\(ProcessInfo.processInfo.isiOSAppOnMac)")
         NEHotspotConfigurationManager.shared.apply(config) { error in
             self.queue.async {
@@ -236,7 +282,8 @@ public final class GlassesHotspotNetwork {
         generation += 1
         localAccess?.cancel(); localAccess = nil
         monitor?.cancel(); monitor = nil
-        if let ssid { NEHotspotConfigurationManager.shared.removeConfiguration(forSSID: ssid) }
+        if let ssid, ownsConfiguration { NEHotspotConfigurationManager.shared.removeConfiguration(forSSID: ssid) }
+        ownsConfiguration = false
         ssid = nil
         localAddress = nil
         gatewayAddress = nil

package/package.json

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