@capgo/camera-preview 7.3.9 → 7.4.0-beta.2

package/ios/{Plugin → Sources/CapgoCameraPreview}/CameraController.swift

@@ -40,34 +40,78 @@ class CameraController: NSObject {
     var zoomFactor: CGFloat = 1.0
 
     var videoFileURL: URL?
+    private let saneMaxZoomFactor: CGFloat = 25.5
+
+    var isUsingMultiLensVirtualCamera: Bool {
+        guard let device = (currentCameraPosition == .rear) ? rearCamera : frontCamera else { return false }
+        // A rear multi-lens virtual camera will have a min zoom of 1.0 but support wider angles
+        return device.position == .back && device.isVirtualDevice && device.constituentDevices.count > 1
+    }
 }
 
 extension CameraController {
-    func prepare(cameraPosition: String, disableAudio: Bool, cameraMode: Bool, completionHandler: @escaping (Error?) -> Void) {
+    func prepare(cameraPosition: String, deviceId: String? = nil, disableAudio: Bool, cameraMode: Bool, completionHandler: @escaping (Error?) -> Void) {
         func createCaptureSession() {
             self.captureSession = AVCaptureSession()
         }
 
         func configureCaptureDevices() throws {
+            // Expanded device types to support more camera configurations
+            let deviceTypes: [AVCaptureDevice.DeviceType] = [
+                .builtInWideAngleCamera,
+                .builtInUltraWideCamera,
+                .builtInTelephotoCamera,
+                .builtInDualCamera,
+                .builtInDualWideCamera,
+                .builtInTripleCamera,
+                .builtInTrueDepthCamera
+            ]
 
-            let session = AVCaptureDevice.DiscoverySession(deviceTypes: [.builtInWideAngleCamera], mediaType: AVMediaType.video, position: .unspecified)
+            let session = AVCaptureDevice.DiscoverySession(deviceTypes: deviceTypes, mediaType: AVMediaType.video, position: .unspecified)
 
             let cameras = session.devices.compactMap { $0 }
-            guard !cameras.isEmpty else { throw CameraControllerError.noCamerasAvailable }
 
+            // Log all found devices for debugging
+            print("[CameraPreview] Found \(cameras.count) devices:")
             for camera in cameras {
-                if camera.position == .front {
-                    self.frontCamera = camera
-                }
+                let constituentCount = camera.isVirtualDevice ? camera.constituentDevices.count : 1
+                print("[CameraPreview] - \(camera.localizedName) (Position: \(camera.position.rawValue), Virtual: \(camera.isVirtualDevice), Lenses: \(constituentCount), Zoom: \(camera.minAvailableVideoZoomFactor)-\(camera.maxAvailableVideoZoomFactor))")
+            }
 
-                if camera.position == .back {
-                    self.rearCamera = camera
+            guard !cameras.isEmpty else {
+                print("[CameraPreview] ERROR: No cameras found.")
+                throw CameraControllerError.noCamerasAvailable
+            }
+
+            // --- Corrected Device Selection Logic ---
+            // Find the virtual device with the most constituent cameras (this is the most capable one)
+            let rearVirtualDevices = cameras.filter { $0.position == .back && $0.isVirtualDevice }
+            let bestRearVirtualDevice = rearVirtualDevices.max { $0.constituentDevices.count < $1.constituentDevices.count }
+
+            self.frontCamera = cameras.first(where: { $0.position == .front })
+
+            if let bestCamera = bestRearVirtualDevice {
+                self.rearCamera = bestCamera
+                print("[CameraPreview] Selected best virtual rear camera: \(bestCamera.localizedName) with \(bestCamera.constituentDevices.count) physical cameras.")
+            } else if let firstRearCamera = cameras.first(where: { $0.position == .back }) {
+                // Fallback for devices without a virtual camera system
+                self.rearCamera = firstRearCamera
+                print("[CameraPreview] WARN: No virtual rear camera found. Selected first available: \(firstRearCamera.localizedName)")
+            }
+            // --- End of Correction ---
 
-                    try camera.lockForConfiguration()
-                    camera.focusMode = .continuousAutoFocus
-                    camera.unlockForConfiguration()
+            if let rearCamera = self.rearCamera {
+                do {
+                    try rearCamera.lockForConfiguration()
+                    if rearCamera.isFocusModeSupported(.continuousAutoFocus) {
+                        rearCamera.focusMode = .continuousAutoFocus
+                    }
+                    rearCamera.unlockForConfiguration()
+                } catch {
+                    print("[CameraPreview] WARN: Could not set focus mode on rear camera. \(error)")
                 }
             }
+
             if disableAudio == false {
                 self.audioDevice = AVCaptureDevice.default(for: AVMediaType.audio)
             }
@@ -76,23 +120,72 @@ extension CameraController {
         func configureDeviceInputs() throws {
             guard let captureSession = self.captureSession else { throw CameraControllerError.captureSessionIsMissing }
 
-            if cameraPosition == "rear" {
-                if let rearCamera = self.rearCamera {
-                    self.rearCameraInput = try AVCaptureDeviceInput(device: rearCamera)
+            var selectedDevice: AVCaptureDevice?
 
-                    if captureSession.canAddInput(self.rearCameraInput!) { captureSession.addInput(self.rearCameraInput!) }
+            // If deviceId is specified, use that specific device
+            if let deviceId = deviceId {
+                let allDevices = AVCaptureDevice.DiscoverySession(
+                    deviceTypes: [.builtInWideAngleCamera, .builtInUltraWideCamera, .builtInTelephotoCamera, .builtInDualCamera, .builtInDualWideCamera, .builtInTripleCamera, .builtInTrueDepthCamera],
+                    mediaType: .video,
+                    position: .unspecified
+                ).devices
 
-                    self.currentCameraPosition = .rear
+                selectedDevice = allDevices.first(where: { $0.uniqueID == deviceId })
+                guard selectedDevice != nil else {
+                    throw CameraControllerError.noCamerasAvailable
                 }
-            } else if cameraPosition == "front" {
-                if let frontCamera = self.frontCamera {
-                    self.frontCameraInput = try AVCaptureDeviceInput(device: frontCamera)
+            } else {
+                // Use position-based selection
+                if cameraPosition == "rear" {
+                    selectedDevice = self.rearCamera
+                } else if cameraPosition == "front" {
+                    selectedDevice = self.frontCamera
+                }
+            }
 
-                    if captureSession.canAddInput(self.frontCameraInput!) { captureSession.addInput(self.frontCameraInput!) } else { throw CameraControllerError.inputsAreInvalid }
+            guard let finalDevice = selectedDevice else {
+                print("[CameraPreview] ERROR: No camera device selected for position: \(cameraPosition)")
+                throw CameraControllerError.noCamerasAvailable
+            }
+
+            print("[CameraPreview] Configuring device: \(finalDevice.localizedName)")
+            let deviceInput = try AVCaptureDeviceInput(device: finalDevice)
 
+            if captureSession.canAddInput(deviceInput) {
+                captureSession.addInput(deviceInput)
+
+                if finalDevice.position == .front {
+                    self.frontCameraInput = deviceInput
+                    self.frontCamera = finalDevice
                     self.currentCameraPosition = .front
+                } else {
+                    self.rearCameraInput = deviceInput
+                    self.rearCamera = finalDevice
+                    self.currentCameraPosition = .rear
+
+                    // --- Corrected Initial Zoom Logic ---
+                    try finalDevice.lockForConfiguration()
+                    if finalDevice.isFocusModeSupported(.continuousAutoFocus) {
+                        finalDevice.focusMode = .continuousAutoFocus
+                    }
+
+                    // On a multi-camera system, a zoom factor of 2.0 often corresponds to the standard "1x" wide-angle lens.
+                    // We set this as the default to provide a familiar starting point for users.
+                    let defaultWideAngleZoom: CGFloat = 2.0
+                    if finalDevice.isVirtualDevice && finalDevice.constituentDevices.count > 1 && finalDevice.videoZoomFactor != defaultWideAngleZoom {
+                        // Check if 2.0 is a valid zoom factor before setting it.
+                        if defaultWideAngleZoom >= finalDevice.minAvailableVideoZoomFactor && defaultWideAngleZoom <= finalDevice.maxAvailableVideoZoomFactor {
+                             print("[CameraPreview] Multi-camera system detected. Setting initial zoom to \(defaultWideAngleZoom) (standard wide-angle).")
+                             finalDevice.videoZoomFactor = defaultWideAngleZoom
+                        }
+                    }
+                    finalDevice.unlockForConfiguration()
+                    // --- End of Correction ---
                 }
-            } else { throw CameraControllerError.noCamerasAvailable }
+            } else {
+                print("[CameraPreview] ERROR: Cannot add device input to session.")
+                throw CameraControllerError.inputsAreInvalid
+            }
 
             // Add audio input
             if disableAudio == false {
@@ -213,7 +306,7 @@ extension CameraController {
 
     private func updateVideoOrientationOnMainThread() {
         let videoOrientation: AVCaptureVideoOrientation
-        
+
         // Use window scene interface orientation
         if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene {
             switch windowScene.interfaceOrientation {
@@ -244,19 +337,19 @@ extension CameraController {
               let captureSession = self.captureSession else {
             throw CameraControllerError.captureSessionIsMissing
         }
-        
+
         // Ensure we have the necessary cameras
         guard (currentCameraPosition == .front && rearCamera != nil) ||
               (currentCameraPosition == .rear && frontCamera != nil) else {
             throw CameraControllerError.noCamerasAvailable
         }
-        
+
         // Store the current running state
         let wasRunning = captureSession.isRunning
         if wasRunning {
             captureSession.stopRunning()
         }
-        
+
         // Begin configuration
         captureSession.beginConfiguration()
         defer {
@@ -268,7 +361,7 @@ extension CameraController {
                 }
             }
         }
-        
+
         // Store audio input if it exists
         let audioInput = captureSession.inputs.first { ($0 as? AVCaptureDeviceInput)?.device.hasMediaType(.audio) ?? false }
 
@@ -278,21 +371,21 @@ extension CameraController {
             captureSession.removeInput(input)
             }
         }
-        
+
         // Configure new camera
         switch currentCameraPosition {
         case .front:
             guard let rearCamera = rearCamera else {
                 throw CameraControllerError.invalidOperation
             }
-            
+
             // Configure rear camera
             try rearCamera.lockForConfiguration()
             if rearCamera.isFocusModeSupported(.continuousAutoFocus) {
                 rearCamera.focusMode = .continuousAutoFocus
             }
             rearCamera.unlockForConfiguration()
-            
+
             if let newInput = try? AVCaptureDeviceInput(device: rearCamera),
                 captureSession.canAddInput(newInput) {
                 captureSession.addInput(newInput)
@@ -306,13 +399,13 @@ extension CameraController {
                 throw CameraControllerError.invalidOperation
             }
 
-            // Configure front camera 
+            // Configure front camera
             try frontCamera.lockForConfiguration()
             if frontCamera.isFocusModeSupported(.continuousAutoFocus) {
                 frontCamera.focusMode = .continuousAutoFocus
             }
             frontCamera.unlockForConfiguration()
-    
+
             if let newInput = try? AVCaptureDeviceInput(device: frontCamera),
                 captureSession.canAddInput(newInput) {
                 captureSession.addInput(newInput)
@@ -327,7 +420,7 @@ extension CameraController {
         if let audioInput = audioInput, captureSession.canAddInput(audioInput) {
             captureSession.addInput(audioInput)
         }
-        
+
         // Update video orientation
         DispatchQueue.main.async { [weak self] in
             self?.updateVideoOrientation()
@@ -415,8 +508,15 @@ extension CameraController {
             throw CameraControllerError.noCamerasAvailable
         }
 
-        return device.activeFormat.videoFieldOfView
+        // Get the active format and field of view
+        let activeFormat = device.activeFormat
+        let fov = activeFormat.videoFieldOfView
 
+        // Adjust for current zoom level
+        let zoomFactor = device.videoZoomFactor
+        let adjustedFov = fov / Float(zoomFactor)
+
+        return adjustedFov
     }
     func setFlashMode(flashMode: AVCaptureDevice.FlashMode) throws {
         var currentCamera: AVCaptureDevice?
@@ -489,6 +589,230 @@ extension CameraController {
         }
     }
 
+    func getZoom() throws -> (min: Float, max: Float, current: Float) {
+        var currentCamera: AVCaptureDevice?
+        switch currentCameraPosition {
+        case .front:
+            currentCamera = self.frontCamera
+        case .rear:
+            currentCamera = self.rearCamera
+        default: break
+        }
+
+        guard let device = currentCamera else {
+            throw CameraControllerError.noCamerasAvailable
+        }
+
+        let effectiveMaxZoom = min(device.maxAvailableVideoZoomFactor, self.saneMaxZoomFactor)
+
+        return (
+            min: Float(device.minAvailableVideoZoomFactor),
+            max: Float(effectiveMaxZoom),
+            current: Float(device.videoZoomFactor)
+        )
+    }
+
+    func setZoom(level: CGFloat, ramp: Bool) throws {
+        var currentCamera: AVCaptureDevice?
+        switch currentCameraPosition {
+        case .front:
+            currentCamera = self.frontCamera
+        case .rear:
+            currentCamera = self.rearCamera
+        default: break
+        }
+
+        guard let device = currentCamera else {
+            throw CameraControllerError.noCamerasAvailable
+        }
+
+        let effectiveMaxZoom = min(device.maxAvailableVideoZoomFactor, self.saneMaxZoomFactor)
+        let zoomLevel = max(device.minAvailableVideoZoomFactor, min(level, effectiveMaxZoom))
+
+        do {
+            try device.lockForConfiguration()
+
+            if ramp {
+                device.ramp(toVideoZoomFactor: zoomLevel, withRate: 1.0)
+            } else {
+                device.videoZoomFactor = zoomLevel
+            }
+
+            device.unlockForConfiguration()
+
+            // Update our internal zoom factor tracking
+            self.zoomFactor = zoomLevel
+        } catch {
+            throw CameraControllerError.invalidOperation
+        }
+    }
+
+    func getFlashMode() throws -> String {
+        switch self.flashMode {
+        case .off:
+            return "off"
+        case .on:
+            return "on"
+        case .auto:
+            return "auto"
+        @unknown default:
+            return "off"
+        }
+    }
+
+    func getCurrentDeviceId() throws -> String {
+        var currentCamera: AVCaptureDevice?
+        switch currentCameraPosition {
+        case .front:
+            currentCamera = self.frontCamera
+        case .rear:
+            currentCamera = self.rearCamera
+        default:
+            break
+        }
+
+        guard let device = currentCamera else {
+            throw CameraControllerError.noCamerasAvailable
+        }
+
+        return device.uniqueID
+    }
+    
+    func getCurrentLensInfo() throws -> (focalLength: Float, deviceType: String, baseZoomRatio: Float) {
+        var currentCamera: AVCaptureDevice?
+        switch currentCameraPosition {
+        case .front:
+            currentCamera = self.frontCamera
+        case .rear:
+            currentCamera = self.rearCamera
+        default:
+            break
+        }
+
+        guard let device = currentCamera else {
+            throw CameraControllerError.noCamerasAvailable
+        }
+
+        var deviceType = "wideAngle"
+        var baseZoomRatio: Float = 1.0
+
+        switch device.deviceType {
+        case .builtInWideAngleCamera:
+            deviceType = "wideAngle"
+            baseZoomRatio = 1.0
+        case .builtInUltraWideCamera:
+            deviceType = "ultraWide"
+            baseZoomRatio = 0.5
+        case .builtInTelephotoCamera:
+            deviceType = "telephoto"
+            baseZoomRatio = 2.0
+        case .builtInDualCamera:
+            deviceType = "dual"
+            baseZoomRatio = 1.0
+        case .builtInDualWideCamera:
+            deviceType = "dualWide"
+            baseZoomRatio = 1.0
+        case .builtInTripleCamera:
+            deviceType = "triple"
+            baseZoomRatio = 1.0
+        case .builtInTrueDepthCamera:
+            deviceType = "trueDepth"
+            baseZoomRatio = 1.0
+        default:
+            deviceType = "wideAngle"
+            baseZoomRatio = 1.0
+        }
+
+        // Approximate focal length for mobile devices
+        let focalLength: Float = 4.25
+
+        return (focalLength: focalLength, deviceType: deviceType, baseZoomRatio: baseZoomRatio)
+    }
+
+    func swapToDevice(deviceId: String) throws {
+        guard let captureSession = self.captureSession else {
+            throw CameraControllerError.captureSessionIsMissing
+        }
+
+        // Find the device with the specified deviceId
+        let allDevices = AVCaptureDevice.DiscoverySession(
+            deviceTypes: [.builtInWideAngleCamera, .builtInUltraWideCamera, .builtInTelephotoCamera, .builtInDualCamera, .builtInDualWideCamera, .builtInTripleCamera, .builtInTrueDepthCamera],
+            mediaType: .video,
+            position: .unspecified
+        ).devices
+
+        guard let targetDevice = allDevices.first(where: { $0.uniqueID == deviceId }) else {
+            throw CameraControllerError.noCamerasAvailable
+        }
+
+        // Store the current running state
+        let wasRunning = captureSession.isRunning
+        if wasRunning {
+            captureSession.stopRunning()
+        }
+
+        // Begin configuration
+        captureSession.beginConfiguration()
+        defer {
+            captureSession.commitConfiguration()
+            // Restart the session if it was running before
+            if wasRunning {
+                DispatchQueue.global(qos: .userInitiated).async { [weak self] in
+                    self?.captureSession?.startRunning()
+                }
+            }
+        }
+
+        // Store audio input if it exists
+        let audioInput = captureSession.inputs.first { ($0 as? AVCaptureDeviceInput)?.device.hasMediaType(.audio) ?? false }
+
+        // Remove only video inputs
+        captureSession.inputs.forEach { input in
+            if (input as? AVCaptureDeviceInput)?.device.hasMediaType(.video) ?? false {
+                captureSession.removeInput(input)
+            }
+        }
+
+        // Configure the new device
+        let newInput = try AVCaptureDeviceInput(device: targetDevice)
+
+        if captureSession.canAddInput(newInput) {
+            captureSession.addInput(newInput)
+
+            // Update camera references based on device position
+            if targetDevice.position == .front {
+                self.frontCameraInput = newInput
+                self.frontCamera = targetDevice
+                self.currentCameraPosition = .front
+            } else {
+                self.rearCameraInput = newInput
+                self.rearCamera = targetDevice
+                self.currentCameraPosition = .rear
+
+                // Configure rear camera
+                try targetDevice.lockForConfiguration()
+                if targetDevice.isFocusModeSupported(.continuousAutoFocus) {
+                    targetDevice.focusMode = .continuousAutoFocus
+                }
+                targetDevice.unlockForConfiguration()
+            }
+        } else {
+            throw CameraControllerError.invalidOperation
+        }
+
+        // Re-add audio input if it existed
+        if let audioInput = audioInput, captureSession.canAddInput(audioInput) {
+            captureSession.addInput(audioInput)
+        }
+
+        // Update video orientation
+        DispatchQueue.main.async { [weak self] in
+            self?.updateVideoOrientation()
+        }
+    }
+
+
+
     func cleanup() {
         if let captureSession = self.captureSession {
             captureSession.stopRunning()
@@ -613,7 +937,8 @@ extension CameraController: UIGestureRecognizerDelegate {
     private func handlePinch(_ pinch: UIPinchGestureRecognizer) {
         guard let device = self.currentCameraPosition == .rear ? rearCamera : frontCamera else { return }
 
-        func minMaxZoom(_ factor: CGFloat) -> CGFloat { return max(1.0, min(factor, device.activeFormat.videoMaxZoomFactor)) }
+        let effectiveMaxZoom = min(device.maxAvailableVideoZoomFactor, self.saneMaxZoomFactor)
+        func minMaxZoom(_ factor: CGFloat) -> CGFloat { return max(device.minAvailableVideoZoomFactor, min(factor, effectiveMaxZoom)) }
 
         func update(scale factor: CGFloat) {
             do {