@mentra/acs-meeting 3.2.0-dev.136 → 3.2.0-dev.153

package/README.md

@@ -4,6 +4,14 @@ Phone-native Azure Communication Services client that puts a MentraOS wearer int
 Microsoft Teams meeting as a guest. The glasses provide the camera and the microphone;
 the phone does all the WebRTC and ACS work.
 
+## Host setup
+
+Add `"@mentra/acs-meeting"` to the host's Expo `plugins` list, including when
+this module is installed through `@mentra/engine`, then run Expo prebuild for
+the target platform. The plugin enables Android core library desugaring and
+builds `AzureCommunicationCommon` as the framework required by ACS on iOS.
+These requirements apply even when the host does not use Crust or Mapbox.
+
 The phone is a **relay, not a capture device**. It subscribes to whatever the glasses
 already published to Cloudflare, decodes it, and re-publishes it into ACS. No frame
 crosses the JavaScript bridge. Production never generates pixels on the phone.

package/app.plugin.js

@@ -1,5 +1,9 @@
-const {withPodfile} = require("expo/config-plugins")
-const {mergeContents} = require("@expo/config-plugins/build/utils/generateCode")
+const {withAppBuildGradle, withPodfile} = require("expo/config-plugins")
+const {
+  createGeneratedHeaderComment,
+  mergeContents,
+  removeGeneratedContents,
+} = require("@expo/config-plugins/build/utils/generateCode")
 
 // Calling is a vendored dynamic framework: its umbrella header and LC_LOAD_DYLIB
 // both require Common.framework. Expo otherwise builds Common as a static library.
@@ -16,6 +20,31 @@ const commonFramework = `  installer.pod_targets.each do |pod|
   end`
 
 module.exports = function withAcsMeeting(config) {
+  config = withAppBuildGradle(config, (config) => {
+    if (config.modResults.language !== "groovy") {
+      throw new Error("@mentra/acs-meeting requires a Groovy app/build.gradle")
+    }
+    // A library cannot enable desugaring for its consuming app. Keep this
+    // requirement with ACS, including hosts that do not use the Crust plugin.
+    const tag = "acs-core-library-desugaring"
+    const contents = removeGeneratedContents(config.modResults.contents, tag) ?? config.modResults.contents
+    const desugaring = `android {
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+    }
+}
+dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
+}`
+    config.modResults.contents = [
+      contents.trimEnd(),
+      createGeneratedHeaderComment(desugaring, tag, "//"),
+      desugaring,
+      `// @generated end ${tag}`,
+      "",
+    ].join("\n")
+    return config
+  })
   return withPodfile(config, (config) => {
     let contents = config.modResults.contents
     const hook = /^\s*pre_install do \|installer\|\s*$/m

package/ios/AcsFrameSender.swift

@@ -5,70 +5,70 @@ import Foundation
 /// Fresh Swift sender on ACS iOS RawOutgoingVideoStream + CVPixelBuffer.
 /// No RealWear code (they have no iOS equivalent).
 final class AcsFrameSender: NSObject {
-  private var stream: VirtualOutgoingVideoStream?
-  private var running = false
-  private var lastSent: CFTimeInterval = 0
-  private let sendGate = VideoSendGate()
-  private let stateLock = NSLock()
+    private var stream: VirtualOutgoingVideoStream?
+    private var running = false
+    private var lastSent: CFTimeInterval = 0
+    private let sendGate = VideoSendGate()
+    private let stateLock = NSLock()
 
-  func attach(_ stream: VirtualOutgoingVideoStream) {
-    detach()
-    stateLock.lock()
-    self.stream = stream
-    lastSent = 0
-    stateLock.unlock()
-    stream.delegate = self
-  }
-
-  func send(_ pixelBuffer: CVPixelBuffer) {
-    stateLock.lock()
-    guard running, let stream else {
-      stateLock.unlock()
-      return
-    }
-    let fps = stream.format.framesPerSecond
-    let now = CFAbsoluteTimeGetCurrent()
-    if lastSent > 0, now - lastSent < 1.0 / Double(max(fps, 1)) {
-      stateLock.unlock()
-      return
-    }
-    guard let token = sendGate.acquire() else {
-      stateLock.unlock()
-      return
+    func attach(_ stream: VirtualOutgoingVideoStream) {
+        detach()
+        stateLock.lock()
+        self.stream = stream
+        lastSent = 0
+        stateLock.unlock()
+        stream.delegate = self
     }
-    lastSent = now
-    stateLock.unlock()
-    let frame = RawVideoFrameBuffer()
-    frame.buffer = pixelBuffer
-    frame.streamFormat = stream.format
-    frame.timestampInTicks = stream.timestampInTicks
-    stream.send(frame: frame) { [sendGate] error in
-      // Keep the source pixels alive until ACS finishes reading the frame.
-      withExtendedLifetime(pixelBuffer) { frame.dispose() }
-      sendGate.release(token)
-      if let error { NSLog("ACS-SPIKE send frame failed: \(error)") }
+
+    func send(_ pixelBuffer: CVPixelBuffer) {
+        stateLock.lock()
+        guard running, let stream else {
+            stateLock.unlock()
+            return
+        }
+        let fps = stream.format.framesPerSecond
+        let now = CFAbsoluteTimeGetCurrent()
+        if lastSent > 0, now - lastSent < 1.0 / Double(max(fps, 1)) {
+            stateLock.unlock()
+            return
+        }
+        guard let token = sendGate.acquire() else {
+            stateLock.unlock()
+            return
+        }
+        lastSent = now
+        stateLock.unlock()
+        let frame = RawVideoFrameBuffer()
+        frame.buffer = pixelBuffer
+        frame.streamFormat = stream.format
+        frame.timestampInTicks = stream.timestampInTicks
+        stream.send(frame: frame) { [sendGate] error in
+            // Keep the source pixels alive until ACS finishes reading the frame.
+            withExtendedLifetime(pixelBuffer) { frame.dispose() }
+            sendGate.release(token)
+            if let error { NSLog("ACS-SPIKE send frame failed: \(error)") }
+        }
     }
-  }
 
-  func detach() {
-    stateLock.lock()
-    running = false
-    // Drop the delegate on the previous stream so a late STOPPED from a prior
-    // call cannot freeze outgoing video for the current meeting.
-    let previous = stream
-    stream = nil
-    sendGate.reset()
-    stateLock.unlock()
-    previous?.delegate = nil
-  }
+    func detach() {
+        stateLock.lock()
+        running = false
+        // Drop the delegate on the previous stream so a late STOPPED from a prior
+        // call cannot freeze outgoing video for the current meeting.
+        let previous = stream
+        stream = nil
+        sendGate.reset()
+        stateLock.unlock()
+        previous?.delegate = nil
+    }
 }
 
 extension AcsFrameSender: VirtualOutgoingVideoStreamDelegate {
-  func virtualOutgoingVideoStream(_ virtualOutgoingVideoStream: VirtualOutgoingVideoStream, didChangeState _: VideoStreamStateChangedEventArgs) {
-    stateLock.lock()
-    defer { stateLock.unlock() }
-    guard virtualOutgoingVideoStream === stream else { return }
-    running = virtualOutgoingVideoStream.state == .started
-    NSLog("ACS-SPIKE iOS raw video state=\(virtualOutgoingVideoStream.state)")
-  }
+    func virtualOutgoingVideoStream(_ virtualOutgoingVideoStream: VirtualOutgoingVideoStream, didChangeState _: VideoStreamStateChangedEventArgs) {
+        stateLock.lock()
+        defer { stateLock.unlock() }
+        guard virtualOutgoingVideoStream === stream else { return }
+        running = virtualOutgoingVideoStream.state == .started
+        NSLog("ACS-SPIKE iOS raw video state=\(virtualOutgoingVideoStream.state)")
+    }
 }

package/ios/AcsMeeting.podspec

@@ -22,6 +22,66 @@ Pod::Spec.new do |s|
   s.frameworks = 'AVFoundation', 'AudioToolbox', 'CoreMedia', 'CoreVideo', 'UIKit'
   s.pod_target_xcconfig = {
     'DEFINES_MODULE' => 'YES',
+    # Calling's umbrella does #import <AzureCommunicationCommon/AzureCommunicationCommon-Swift.h>.
+    # Vendored Common headers must resolve inside their framework module.
+    # Source-built pods retain the public-header compatibility fallback, and
+    # only the static-lib fallback needs a header-only framework.
+    'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "${PODS_XCFRAMEWORKS_BUILD_DIR}/AzureCommunicationCommon" "${PODS_CONFIGURATION_BUILD_DIR}/AzureCommunicationCommon" "${PODS_CONFIGURATION_BUILD_DIR}/AcsMeeting"',
+    'HEADER_SEARCH_PATHS' => '$(inherited) "${PODS_CONFIGURATION_BUILD_DIR}" "${PODS_CONFIGURATION_BUILD_DIR}/AzureCommunicationCommon"',
   }
+  s.script_phases = [
+    {
+      :name => 'Expose AzureCommunicationCommon Swift header',
+      :execution_position => :before_compile,
+      :script => %(
+        set -e
+        # CocoaPods stages the slice for the current platform/architecture here.
+        # Do not pick a device or simulator slice directly from the pod sources.
+        XC_HDR="${PODS_XCFRAMEWORKS_BUILD_DIR}/AzureCommunicationCommon/AzureCommunicationCommon.framework/Headers/AzureCommunicationCommon-Swift.h"
+        FW_HDR="${PODS_CONFIGURATION_BUILD_DIR}/AzureCommunicationCommon/AzureCommunicationCommon.framework/Headers/AzureCommunicationCommon-Swift.h"
+        STATIC_HDR="${PODS_CONFIGURATION_BUILD_DIR}/AzureCommunicationCommon/Swift Compatibility Header/AzureCommunicationCommon-Swift.h"
+        if [ -f "$XC_HDR" ]; then
+          SRC="$XC_HDR"
+        elif [ -f "$FW_HDR" ]; then
+          SRC="$FW_HDR"
+        elif [ -f "$STATIC_HDR" ]; then
+          SRC="$STATIC_HDR"
+        else
+          echo "error: AzureCommunicationCommon-Swift.h missing (Common must build first)"
+          echo "looked for: $XC_HDR"
+          echo "looked for: $FW_HDR"
+          echo "looked for: $STATIC_HDR"
+          exit 1
+        fi
+        # This phase runs on every build, so only write when the bytes actually
+        # differ. An unconditional cp refreshes the mtime of a public header and
+        # makes Xcode recompile every dependent target for no reason.
+        copy_if_changed() {
+          if [ ! -f "$2" ] || ! cmp -s "$1" "$2"; then
+            mkdir -p "$(dirname "$2")"
+            cp -f "$1" "$2"
+          fi
+        }
+        # Never write a fake AzureCommunicationCommon.framework into BUILT_PRODUCTS_DIR.
+        # CocoaPods' embed script prefers ${BUILT_PRODUCTS_DIR}/$(basename) and would
+        # then codesign an empty header-only bundle ("bundle format unrecognized").
+        rm -rf "${PODS_CONFIGURATION_BUILD_DIR}/AzureCommunicationCommon.framework"
+        PUBLIC_HDR="${PODS_ROOT}/Headers/Public/AzureCommunicationCommon/AzureCommunicationCommon-Swift.h"
+        if [ -f "$XC_HDR" ]; then
+          # A loose copy shadows the vendored framework's modular header. Clang
+          # then imports its credential into Calling as a second Swift type,
+          # incompatible with Common.CommunicationTokenCredential. Remove copies
+          # left by earlier builds and let the framework search path resolve it.
+          rm -f "$PUBLIC_HDR"
+        else
+          copy_if_changed "$SRC" "$PUBLIC_HDR"
+        fi
+        if [ ! -f "$XC_HDR" ] && [ ! -f "$FW_HDR" ]; then
+          FAKE_HEADERS="${PODS_CONFIGURATION_BUILD_DIR}/AcsMeeting/AzureCommunicationCommon.framework/Headers"
+          copy_if_changed "$SRC" "$FAKE_HEADERS/AzureCommunicationCommon-Swift.h"
+        fi
+      ),
+    },
+  ]
   s.source_files = '*.{h,m,mm,swift}', 'PolicyKit/Sources/AcsAudioPolicy/*.swift'
 end