@momo-kits/camerakit 0.161.2-beta.25 → 0.161.2-beta.27

package/ios/ReactNativeCameraKit/RealCamera.swift

@@ -72,6 +72,23 @@ class RealCamera: NSObject, CameraProtocol, AVCaptureMetadataOutputObjectsDelega
 
     // MARK: - Lifecycle
 
+    override init() {
+        super.init()
+        #if DEBUG
+        assert(Thread.isMainThread, "RealCamera must be initialized on the main thread (it wires the preview CALayer).")
+        #endif
+        // Wire the preview to the (idle, never-started) session AND set its gravity
+        // ONCE here at init, on the main thread, before anything starts. Benefits:
+        //  (a) the preview renders the instant the first frame arrives (~camera warm-up)
+        //      instead of waiting for a late post-setup attach → less black.
+        //  (b) assigning previewLayer.session opens an implicit AVFoundation config
+        //      transaction; doing it now (session idle, no startRunning yet, never
+        //      reassigned) makes it impossible to race startRunning() → the begin/commit
+        //      crash class is closed by construction, on every device.
+        cameraPreview.session = session
+        cameraPreview.previewLayer.videoGravity = .resizeAspectFill
+    }
+
     func cameraRemovedFromSuperview() {
         sessionQueue.async { [weak self] in
             guard let self, self.setupResult == .success else { return }
@@ -123,38 +140,33 @@ class RealCamera: NSObject, CameraProtocol, AVCaptureMetadataOutputObjectsDelega
             // handled by startCamera() -> startSessionIfNeeded().
             guard self.setupResult == .notStarted else { return }
 
-            // PHASE 1 — minimal config so the preview renders ASAP. Only the video
-            // input + a lightweight (.high) preview preset go in this first
-            // transaction. The heavier work (.photo preset + photo / barcode / OCR
-            // outputs) is deferred to phase 2 below, AFTER the session is already
-            // running and the preview layer is attached. This restores the
-            // "camera shows up instantly" feel without weakening the crash fix.
-            self.setupResult = self.configureBaseSession(cameraType: cameraType)
+            // Configure the WHOLE session (inputs, preset, outputs) inside a single
+            // begin/commit transaction on the session queue. The preset is set here
+            // and never on the main queue, so the startRunning() below can no longer
+            // observe the session mid-configuration from another thread.
+            //
+            // This is the root-cause fix for:
+            // "[AVCaptureSession startRunning] startRunning may not be called between
+            //  calls to beginConfiguration and commitConfiguration".
+            self.setupResult = self.configureSession(cameraType: cameraType,
+                                                     supportedBarcodeType: supportedBarcodeType)
+
             guard self.setupResult == .success else { return }
 
-            // Attach the preview LAYER on the main queue BEFORE startRunning so the
-            // first frames render the moment the session starts. Connecting an
-            // AVCaptureVideoPreviewLayer to a session from the main thread is
-            // sanctioned by AVFoundation (see Apple's AVCam), does NOT open a
-            // session configuration transaction, and cannot race startRunning().
+            // Set the preview orientation on the main queue NOW — BEFORE the (~145ms)
+            // startRunning below — so the very first frame renders at the correct
+            // orientation instead of appearing once and then snapping ("giật 1 nhịp").
+            // The preview's `.session` and gravity are already wired at init; this is a
+            // pure connection-property write (no session config transaction → no race
+            // with startRunning). The connection exists because configureSession has
+            // committed the video input above.
             DispatchQueue.main.async { [weak self] in
                 guard let self else { return }
-                self.cameraPreview.session = self.session
-                self.cameraPreview.previewLayer.videoGravity = .resizeAspectFill
                 self.setVideoOrientationToInterfaceOrientation()
             }
 
-            // Start running with just the preview-friendly config → fast first frame.
+            // Order matches the previous behaviour: start, then observe, then torch.
             self.startSessionIfNeeded()
-
-            // PHASE 2 — add the heavier outputs and upgrade to the .photo preset in a
-            // SECOND transaction on this same serial queue, now that preview is live.
-            // Adding outputs to an already-running session inside begin/commit is
-            // legal; because startRunning() is NEVER called while configurationDepth
-            // > 0 (see startSessionIfNeeded), the "startRunning may not be called
-            // between beginConfiguration and commitConfiguration" crash stays fixed.
-            self.configureAdditionalOutputs(supportedBarcodeType: supportedBarcodeType)
-
             self.addObservers()
             self.update(torchMode: self.torchMode)
         }
@@ -166,11 +178,10 @@ class RealCamera: NSObject, CameraProtocol, AVCaptureMetadataOutputObjectsDelega
 
     // MARK: - Private optimization methods
 
-    /// Phase 1 of setup: video input + a lightweight (.high) preview preset, in ONE
-    /// transaction. Must run on `sessionQueue`. Kept deliberately minimal so
-    /// `startRunning()` — and therefore the first preview frame — is not delayed by
-    /// wiring up the photo / barcode / OCR outputs (that is `configureAdditionalOutputs`).
-    private func configureBaseSession(cameraType: CameraType) -> SetupResult {
+    /// Configures the video input, session preset and every output in ONE atomic
+    /// transaction. Must be called on `sessionQueue`. Order is significant:
+    /// beginConfiguration -> addInput -> set preset -> addOutputs -> commitConfiguration.
+    private func configureSession(cameraType: CameraType, supportedBarcodeType: [CodeFormat]) -> SetupResult {
         assertOnSessionQueue()
         guard let videoDevice = self.getBestDevice(for: cameraType),
               let videoDeviceInput = try? AVCaptureDeviceInput(device: videoDevice) else {
@@ -180,7 +191,7 @@ class RealCamera: NSObject, CameraProtocol, AVCaptureMetadataOutputObjectsDelega
         beginConfiguration()
         defer { commitConfiguration() }
 
-        // Video input
+        // 1. Video input
         guard session.canAddInput(videoDeviceInput) else {
             return .sessionConfigurationFailed
         }
@@ -188,33 +199,15 @@ class RealCamera: NSObject, CameraProtocol, AVCaptureMetadataOutputObjectsDelega
         self.videoDeviceInput = videoDeviceInput
         self.resetZoom(forDevice: videoDevice)
 
-        // Lightweight preset for the fastest possible first frame. Upgraded to
-        // `.photo` in configureAdditionalOutputs() once the preview is live.
-        if session.canSetSessionPreset(.high) {
-            session.sessionPreset = .high
-        }
-
-        return .success
-    }
-
-    /// Phase 2 of setup: the .photo preset + photo / barcode / OCR outputs, in ONE
-    /// transaction on `sessionQueue`. Runs AFTER the session is already running and
-    /// the preview is attached, so none of this work delays the first frame. Adding
-    /// outputs to a running session inside begin/commit is legal; the crash fix is
-    /// preserved because startRunning() is never called while a transaction is open.
-    private func configureAdditionalOutputs(supportedBarcodeType: [CodeFormat]) {
-        assertOnSessionQueue()
-        beginConfiguration()
-        defer { commitConfiguration() }
-
-        // Upgrade to the full still-capture preset now that preview is rendering.
-        // `.photo` is supported by every camera device; if it somehow is not, we
-        // keep the `.high` preset from phase 1 rather than crashing.
+        // 2. Preset — set inside the transaction with the device input already
+        // present, so `canSetSessionPreset` reflects the real device. `.photo` is
+        // supported by every camera device; if it somehow is not, we keep whatever
+        // preset the session defaults to rather than crashing.
         if session.canSetSessionPreset(.photo) {
             session.sessionPreset = .photo
         }
 
-        // Photo output
+        // 3. Photo output
         if #available(iOS 13.0, *) {
             if let maxPhotoQualityPrioritization = maxPhotoQualityPrioritization {
                 photoOutput.maxPhotoQualityPrioritization = maxPhotoQualityPrioritization.avQualityPrioritization
@@ -229,7 +222,7 @@ class RealCamera: NSObject, CameraProtocol, AVCaptureMetadataOutputObjectsDelega
             }
         }
 
-        // Metadata output for barcode scanning
+        // 4. Metadata output for barcode scanning
         if self.session.canAddOutput(metadataOutput) {
             self.session.addOutput(metadataOutput)
             metadataOutput.setMetadataObjectsDelegate(self, queue: DispatchQueue.main)
@@ -242,10 +235,12 @@ class RealCamera: NSObject, CameraProtocol, AVCaptureMetadataOutputObjectsDelega
             metadataOutput.metadataObjectTypes = filteredTypes
         }
 
-        // Video data output for text / MRZ detection
+        // 5. Video data output for text / MRZ detection
         if textRequest != nil && self.session.canAddOutput(self.videoDataOutput) {
             self.session.addOutput(self.videoDataOutput)
         }
+
+        return .success
     }
 
     // MARK: - Pause / Resume non-essential outputs

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/camerakit",
-    "version": "0.161.2-beta.25",
+    "version": "0.161.2-beta.27",
     "repository": {
         "type": "git",
         "url": "https://github.com/teslamotors/react-native-camera-kit.git"