blix-expo-settings 0.1.9 → 0.1.10

package/ios/ExpoSettingsModule.swift

@@ -11,10 +11,7 @@ public class ExpoSettingsModule: Module {
   public func definition() -> ModuleDefinition {
     Name("ExpoSettings")
 
-    // View component (preview)
-    View(ExpoSettingsView.self) {
-      // sem props
-    }
+    View(ExpoSettingsView.self) {}
 
     Events("onStreamStatus")
 
@@ -23,97 +20,72 @@ public class ExpoSettingsModule: Module {
     }
 
     Function("initializePreview") { () -> Void in
-      Task {
-        self.setStatus("previewInitializing")
+      self.setStatus("previewInitializing")
 
-        // 0) Configura AVAudioSession
-        self.configureAudioSession()
+      self.configureAudioSession()
 
-        // 1) Cria connection + stream
-        let connection = RTMPConnection()
-        self.rtmpConnection = connection
+      let connection = RTMPConnection()
+      self.rtmpConnection = connection
 
-        let stream = RTMPStream(connection: connection)
-        self.rtmpStream = stream
-
-        // 2) Configura stream (tudo que influencia proporção/encode)
-        self.configureStream(stream)
-
-        // 3) Attach áudio
-        self.attachAudioIfAvailable(stream)
+      let stream = RTMPStream(connection: connection)
+      self.rtmpStream = stream
 
-        // 4) Attach câmera frontal (portrait + mirror)
-        await self.attachFrontCamera(stream)
+      self.configureStream(stream)
+      self.attachAudioIfAvailable(stream)
+      self.attachFrontCamera(stream)
+      self.attachPreviewIfAvailable(stream)
 
-        // 5) Attach preview (MainActor)
-        await self.attachPreviewIfAvailable(stream)
-
-        self.setStatus("previewReady")
-      }
+      self.setStatus("previewReady")
     }
 
     Function("publishStream") { (url: String, streamKey: String) -> Void in
-      Task {
-        print("[ExpoSettings] Publishing stream to URL: \(url) with key: \(streamKey)")
-        self.setStatus("connecting")
+      self.setStatus("connecting")
+      print("[ExpoSettings] Publishing to: \(url) key: \(streamKey)")
 
-        // Caso não tenha initializePreview, cria do zero com config completa
-        if self.rtmpConnection == nil || self.rtmpStream == nil {
-          print("[ExpoSettings] WARNING: Connection or stream not initialized. Creating new ones.")
-
-          let connection = RTMPConnection()
-          self.rtmpConnection = connection
+      // Se não existe stream/connection, cria e aplica TODA a config
+      if self.rtmpConnection == nil || self.rtmpStream == nil {
+        let connection = RTMPConnection()
+        self.rtmpConnection = connection
 
-          let stream = RTMPStream(connection: connection)
-          self.rtmpStream = stream
+        let stream = RTMPStream(connection: connection)
+        self.rtmpStream = stream
 
-          self.configureStream(stream)
-          self.attachAudioIfAvailable(stream)
-          await self.attachFrontCamera(stream)
-          await self.attachPreviewIfAvailable(stream)
-        }
+        self.configureStream(stream)
+        self.attachAudioIfAvailable(stream)
+        self.attachFrontCamera(stream)
+        self.attachPreviewIfAvailable(stream)
+      }
 
-        // Conecta
-        self.rtmpConnection?.connect(url)
-        self.setStatus("connected")
+      self.rtmpConnection?.connect(url)
+      self.setStatus("connected")
 
-        // Publica
-        self.setStatus("publishing")
-        self.rtmpStream?.publish(streamKey)
-        print("[ExpoSettings] Stream published successfully")
+      self.setStatus("publishing")
+      self.rtmpStream?.publish(streamKey)
 
-        self.setStatus("started")
-      }
+      self.setStatus("started")
     }
 
     Function("stopStream") { () -> Void in
-      Task {
-        print("[ExpoSettings] stopStream called")
-
-        if let stream = self.rtmpStream {
-          print("[ExpoSettings] Stopping stream publication")
-          stream.close()
+      print("[ExpoSettings] stopStream called")
 
-          // Libera recursos
-          stream.attachCamera(nil)
-          stream.attachAudio(nil)
-        }
+      if let stream = self.rtmpStream {
+        stream.close()
+        stream.attachCamera(nil)
+        stream.attachAudio(nil)
+      }
 
-        if let connection = self.rtmpConnection {
-          print("[ExpoSettings] Closing RTMP connection")
-          connection.close()
-        }
+      if let connection = self.rtmpConnection {
+        connection.close()
+      }
 
-        self.rtmpStream = nil
-        self.rtmpConnection = nil
+      self.rtmpStream = nil
+      self.rtmpConnection = nil
 
-        print("[ExpoSettings] Stream and connection closed and resources released")
-        self.setStatus("stopped")
-      }
+      self.setStatus("stopped")
     }
   }
 
-  // MARK: - Helpers
+  // MARK: - Internals
 
   private func setStatus(_ status: String) {
     self.currentStreamStatus = status
@@ -123,46 +95,38 @@ public class ExpoSettingsModule: Module {
   private func configureAudioSession() {
     let session = AVAudioSession.sharedInstance()
     do {
-      try session.setCategory(.playAndRecord,
-                              mode: .default,
-                              options: [.defaultToSpeaker, .allowBluetooth])
+      try session.setCategory(
+        .playAndRecord,
+        mode: .default,
+        options: [.defaultToSpeaker, .allowBluetooth]
+      )
       try session.setActive(true)
     } catch {
       print("[ExpoSettings] AVAudioSession error:", error)
     }
   }
 
-  /// Configuração centralizada do stream (evita mismatch entre preview/publish).
   private func configureStream(_ stream: RTMPStream) {
     print("[ExpoSettings] Configuring stream...")
 
-    // IMPORTANTE: preset primeiro, depois FPS (evita fallback estranho)
+    // 1) Captura previsível (16:9)
     stream.sessionPreset = .hd1280x720
     stream.frameRate = 30
 
-    // Orientação no nível do stream (governança do pipeline)
+    // 2) Orientação no nível do stream (governa pipeline)
     stream.videoOrientation = .portrait
 
-    // Sugestão para estabilidade de scaling/mix
-    stream.videoMixerSettings.mode = .offscreen
-
-    // Opcional: deixa o capture session gerenciar áudio automaticamente
-    stream.configuration { captureSession in
-      captureSession.automaticallyConfiguresApplicationAudioSession = true
-    }
-
-    // Áudio
+    // 3) Áudio
     var audioSettings = AudioCodecSettings()
     audioSettings.bitRate = 128 * 1000
     stream.audioSettings = audioSettings
 
-    // Vídeo (vertical 9:16)
-    // 720x1280 é um “sweet spot” pra compatibilidade e estabilidade
+    // 4) Vídeo (9:16). Use 720x1280 para estabilidade
     let videoSettings = VideoCodecSettings(
       videoSize: .init(width: 720, height: 1280),
       bitRate: 4_000 * 1000,
       profileLevel: kVTProfileLevel_H264_Baseline_3_1 as String,
-      scalingMode: .trim, // sem distorção (corta excesso). Alternativa: .letterbox (barras)
+      scalingMode: .trim, // sem distorção (corta). Alternativa: .letterbox (barras)
       bitRateMode: .average,
       maxKeyFrameIntervalDuration: 2,
       allowFrameReordering: nil,
@@ -170,28 +134,30 @@ public class ExpoSettingsModule: Module {
     )
     stream.videoSettings = videoSettings
 
-    print("[ExpoSettings] Stream configured: preset=\(stream.sessionPreset.rawValue), fps=\(stream.frameRate), orientation=\(stream.videoOrientation.rawValue)")
-    print("[ExpoSettings] Encoder target: \(Int(videoSettings.videoSize.width))x\(Int(videoSettings.videoSize.height)) scaling=\(videoSettings.scalingMode.rawValue)")
+    print("[ExpoSettings] Stream configured preset=\(stream.sessionPreset.rawValue) fps=\(stream.frameRate)")
+    print("[ExpoSettings] Target=\(Int(videoSettings.videoSize.width))x\(Int(videoSettings.videoSize.height)) orientation=portrait")
   }
 
   private func attachAudioIfAvailable(_ stream: RTMPStream) {
     if let audioDevice = AVCaptureDevice.default(for: .audio) {
-      print("[ExpoSettings] Attaching audio device")
+      print("[ExpoSettings] Attaching audio")
       stream.attachAudio(audioDevice)
     } else {
       print("[ExpoSettings] No audio device found")
     }
   }
 
-  private func attachFrontCamera(_ stream: RTMPStream) async {
-    guard let camera = AVCaptureDevice.default(.builtInWideAngleCamera,
-                                               for: .video,
-                                               position: .front) else {
-      print("[ExpoSettings] No front camera device found")
+  private func attachFrontCamera(_ stream: RTMPStream) {
+    guard let camera = AVCaptureDevice.default(
+      .builtInWideAngleCamera,
+      for: .video,
+      position: .front
+    ) else {
+      print("[ExpoSettings] No front camera found")
       return
     }
 
-    print("[ExpoSettings] Attaching front camera device")
+    print("[ExpoSettings] Attaching front camera")
 
     stream.attachCamera(camera) { videoUnit, error in
       guard let unit = videoUnit else {
@@ -200,4 +166,20 @@ public class ExpoSettingsModule: Module {
       }
 
       unit.isVideoMirrored = true
-      unit.videoOrientation = .po
+      unit.videoOrientation = .portrait   // <-- GARANTA que está .portrait (não .po)
+      unit.preferredVideoStabilizationMode = .standard
+      unit.colorFormat = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
+    }
+  }
+
+  private func attachPreviewIfAvailable(_ stream: RTMPStream) {
+    DispatchQueue.main.async {
+      if let preview = ExpoSettingsView.current {
+        print("[ExpoSettings] Attaching stream to preview")
+        preview.attachStream(stream)
+      } else {
+        print("[ExpoSettings] Preview not available yet")
+      }
+    }
+  }
+}

package/ios/ExpoSettingsView.swift

@@ -3,40 +3,34 @@ import HaishinKit
 import AVFoundation
 
 public class ExpoSettingsView: ExpoView {
-    
-    public static weak var current: ExpoSettingsView?
-    
-    // A view de preview do HaishinKit
-    private let hkView: MTHKView = {
-        let view = MTHKView(frame: .zero)
-        view.videoGravity = .resizeAspectFill
-        return view
-    }()
+  public static weak var current: ExpoSettingsView?
 
-    required init(appContext: AppContext? = nil) {
-        super.init(appContext: appContext)
-        clipsToBounds = true
-        addSubview(hkView)
-        ExpoSettingsView.current = self
-        print("[ExpoSettingsView] View initialized and set as current")
-    }
+  private let hkView: MTHKView = {
+    let view = MTHKView(frame: .zero)
+    view.videoGravity = .resizeAspectFill
+    return view
+  }()
 
-    override public func layoutSubviews() {
-        super.layoutSubviews()
-        hkView.frame = bounds
-        print("[ExpoSettingsView] Layout updated, frame: \(bounds)")
-    }
+  required init(appContext: AppContext? = nil) {
+    super.init(appContext: appContext)
+    clipsToBounds = true
+    addSubview(hkView)
+    ExpoSettingsView.current = self
+    print("[ExpoSettingsView] initialized")
+  }
 
-    /// Conecta o RTMPStream a essa view (internamente já faz o attachCamera + renderização)
-    public func attachStream(_ stream: RTMPStream) {
-        print("[ExpoSettingsView] Attaching stream to view")
-        hkView.attachStream(stream)
-    }
-    
-    deinit {
-        print("[ExpoSettingsView] View being deinitialized")
-        if ExpoSettingsView.current === self {
-            ExpoSettingsView.current = nil
-        }
+  public override func layoutSubviews() {
+    super.layoutSubviews()
+    hkView.frame = bounds
+  }
+
+  public func attachStream(_ stream: RTMPStream) {
+    hkView.attachStream(stream)
+  }
+
+  deinit {
+    if ExpoSettingsView.current === self {
+      ExpoSettingsView.current = nil
     }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blix-expo-settings",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "LiveStream",
   "main": "build/index.js",
   "types": "build/index.d.ts",