@mentra/glasses-media 3.2.1 → 3.3.0-beta.954

package/ios/GlassesMedia.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.dependency 'ExpoModulesCore'
   # 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.frameworks = 'AVFoundation', 'CoreMedia', 'CoreVideo', 'CoreLocation', 'Network', 'NetworkExtension'
   s.source_files = '*.{swift,h,m,mm}', 'CoreKit/Sources/GlassesMediaCore/*.swift'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
 end

package/ios/GlassesMediaRelayModule.swift

@@ -4,11 +4,49 @@ import Foundation
 public final class GlassesMediaRelayModule: Module {
     private let queue = DispatchQueue(label: "com.mentra.glassesmedia.relay")
     private var session: ManagedRelaySession?
+    private let localHotspot = GlassesHotspotNetwork()
+    private var localHotspotOwner: String?
 
     public func definition() -> ModuleDefinition {
         Name("MentraGlassesMediaRelay")
         Events("onRelayState")
 
+        AsyncFunction("joinLocalHotspot") { (id: String, ssid: String, password: String, gateway: String?, purpose: String, promise: Promise) in
+            self.queue.async {
+                guard self.localHotspotOwner == nil else {
+                    promise.reject(LocalMediaError("Previous hotspot session has not been released")); return
+                }
+                guard let accessPurpose = HotspotAccessPurpose(rawValue: purpose) else {
+                    promise.reject(LocalMediaError("Invalid hotspot access purpose")); return
+                }
+                self.localHotspotOwner = id
+                self.localHotspot.join(ssid: ssid, passphrase: password, gateway: gateway, purpose: accessPurpose) { result in
+                    switch result {
+                    case let .success(address): promise.resolve(address)
+                    case let .failure(error):
+                        let failure = HotspotJoinFailure(error)
+                        promise.reject(Exception(name: "HotspotJoinFailure", description: failure.message, code: failure.code))
+                    }
+                }
+            }
+        }
+
+        AsyncFunction("leaveLocalHotspot") { (id: String, promise: Promise) in
+            self.queue.async {
+                guard self.localHotspotOwner == id else { promise.resolve(nil); return }
+                self.localHotspot.leave { result in
+                    self.queue.async {
+                        switch result {
+                        case .success:
+                            if self.localHotspotOwner == id { self.localHotspotOwner = nil }
+                            promise.resolve(nil)
+                        case let .failure(error): promise.reject(error)
+                        }
+                    }
+                }
+            }
+        }
+
         AsyncFunction("prepare") { (options: [String: Any], promise: Promise) in
             guard let id = options["attemptId"] as? String,
                   let ingest = options["ingestUrl"] as? String, let url = URL(string: ingest), url.scheme == "https",
@@ -38,16 +76,23 @@ public final class GlassesMediaRelayModule: Module {
         AsyncFunction("stop") { (id: String, promise: Promise) in
             self.queue.async {
                 guard let session = self.session, session.id == id else { promise.resolve(nil); return }
-                session.stop {
-                    if self.session === session { self.session = nil }
-                    promise.resolve(nil)
+                session.stop { result in
+                    switch result {
+                    case .success:
+                        if self.session === session { self.session = nil }
+                        promise.resolve(nil)
+                    case let .failure(error): promise.reject(error)
+                    }
                 }
             }
         }
 
         OnDestroy {
             self.queue.async {
-                self.session?.stop { self.session = nil }
+                self.session?.stop { result in
+                    if case .success = result { self.session = nil }
+                }
+                self.localHotspot.leave { _ in }
             }
         }
     }
@@ -62,7 +107,7 @@ private final class ManagedRelaySession {
     private var publisher: PhoneWhipPublisher?
     private var stopped = false
     private var stopFinished = false
-    private var stopReplies: [() -> Void] = []
+    private var stopReplies: [(Result<Void, Error>) -> Void] = []
     private var ready: ((Result<String, Error>) -> Void)?
 
     init(id: String, queue: DispatchQueue) {
@@ -116,10 +161,11 @@ private final class ManagedRelaySession {
         let callback = ready; ready = nil; callback?(result)
     }
 
-    func stop(completion: @escaping () -> Void) {
-        if stopFinished { completion(); return }
+    func stop(completion: @escaping (Result<Void, Error>) -> Void) {
+        if stopFinished { completion(.success(())); return }
+        let stopping = !stopReplies.isEmpty
         stopReplies.append(completion)
-        guard !stopped else { return }
+        guard !stopping else { return }
         stopped = true
         finish(.failure(LocalMediaError("Relay cancelled")))
         hotspot.onLost = nil
@@ -131,10 +177,14 @@ private final class ManagedRelaySession {
         if let publisher {
             group.enter(); publisher.stop { group.leave() }
         }
-        group.enter(); hotspot.leave { group.leave() }
+        var cleanupResult: Result<Void, Error> = .success(())
+        group.enter(); hotspot.leave { result in
+            self.queue.async { cleanupResult = result; group.leave() }
+        }
         group.notify(queue: queue) {
-            self.receiver = nil; self.publisher = nil; self.stopFinished = true
-            let replies = self.stopReplies; self.stopReplies.removeAll(); replies.forEach { $0() }
+            self.receiver = nil; self.publisher = nil
+            if case .success = cleanupResult { self.stopFinished = true }
+            let replies = self.stopReplies; self.stopReplies.removeAll(); replies.forEach { $0(cleanupResult) }
         }
     }
 }

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@mentra/glasses-media",
-  "version": "3.2.1",
+  "version": "3.3.0-beta.954",
   "description": "Shared native glasses media receivers and local network transport",
   "license": "MIT",
   "author": "Mentra Community",
   "homepage": "https://github.com/Mentra-Community/MentraOS",
   "main": "index.js",
+  "types": "index.d.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Mentra-Community/MentraOS.git",
@@ -14,8 +15,12 @@
   "publishConfig": {
     "access": "public"
   },
+  "peerDependencies": {
+    "expo-modules-core": "~55.0.25"
+  },
   "files": [
     "index.js",
+    "index.d.ts",
     "expo-module.config.json",
     "android/build.gradle",
     "android/src/main",

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

@@ -1,20 +0,0 @@
-#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