capacitor-camera-module 0.0.65 → 0.0.68

package/ios/Sources/CameraModulePlugin/CameraModulePlugin.swift

@@ -5,26 +5,29 @@ import UIKit
 import Photos
 
 @objc(CameraModule)
-public class CameraModulePlugin: CAPPlugin, CAPBridgedPlugin, AVCaptureVideoDataOutputSampleBufferDelegate {
-
-    public let identifier = "CameraModule"
-    public let jsName = "CameraModule"
-    public let pluginMethods: [CAPPluginMethod] = [
-        CAPPluginMethod(name: "checkPermission", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "requestPermission", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "checkGalleryPermission", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "requestGalleryPermission", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "checkAndRequestGalleryPermission", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "pickImageBase64", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "startPreview", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "stopPreview", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "toggleFlash", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "hasFlash", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "takePhotoBase64", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "startBarcodeScan", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "stopBarcodeScan", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "getLastGalleryImage", returnType: CAPPluginReturnPromise)
-    ]
+public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOutputSampleBufferDelegate {
+
+
+        public let identifier = "CameraModule"
+        public let jsName = "CameraModule"
+        public let pluginMethods: [CAPPluginMethod] = [
+                CAPPluginMethod(name: "checkPermission", returnType: CAPPluginReturnPromise),
+                CAPPluginMethod(name: "requestPermission", returnType: CAPPluginReturnPromise),
+                CAPPluginMethod(name: "checkGalleryPermission", returnType: CAPPluginReturnPromise),
+                CAPPluginMethod(name: "requestGalleryPermission", returnType: CAPPluginReturnPromise),
+                CAPPluginMethod(name: "checkAndRequestGalleryPermission", returnType: CAPPluginReturnPromise),
+                CAPPluginMethod(name: "pickImageBase64", returnType: CAPPluginReturnPromise),
+                CAPPluginMethod(name: "startPreview", returnType: CAPPluginReturnPromise),
+                CAPPluginMethod(name: "stopPreview", returnType: CAPPluginReturnPromise),
+                CAPPluginMethod(name: "toggleFlash", returnType: CAPPluginReturnPromise),
+                CAPPluginMethod(name: "hasFlash", returnType: CAPPluginReturnPromise),
+                CAPPluginMethod(name: "takePhotoBase64", returnType: CAPPluginReturnPromise),
+                CAPPluginMethod(name: "startBarcodeScan", returnType: CAPPluginReturnPromise),
+                CAPPluginMethod(name: "stopBarcodeScan", returnType: CAPPluginReturnPromise),
+                CAPPluginMethod(name: "getLastGalleryImage", returnType: CAPPluginReturnPromise)
+
+            ]
+
 
     private var previewView: UIView?
     private var captureSession: AVCaptureSession?
@@ -33,6 +36,7 @@ public class CameraModulePlugin: CAPPlugin, CAPBridgedPlugin, AVCaptureVideoData
     private var photoDelegate: PhotoDelegate?
 
     // MARK: - Barcode
+
     private var isScanning = false
     private var scanCall: CAPPluginCall?
     private var barcodeRequest: VNDetectBarcodesRequest?
@@ -42,14 +46,20 @@ public class CameraModulePlugin: CAPPlugin, CAPBridgedPlugin, AVCaptureVideoData
     private let scanDebounceInterval: TimeInterval = 0.5
 
     // MARK: - Gallery
+
     private var galleryCall: CAPPluginCall?
 
     // MARK: - Lifecycle
     public override func load() {
+        // Este método ya no fuerza el color negro
+        // El webView será configurado dinámicamente en startPreview/stopPreview
         print("📱 CameraModulePlugin cargado")
     }
 
+
+
     // MARK: - Camera Permission
+
     @objc func checkPermission(_ call: CAPPluginCall) {
         let status = AVCaptureDevice.authorizationStatus(for: .video)
         call.resolve([
@@ -70,8 +80,10 @@ public class CameraModulePlugin: CAPPlugin, CAPBridgedPlugin, AVCaptureVideoData
     }
 
     // MARK: - Gallery Permission
+
     @objc func checkGalleryPermission(_ call: CAPPluginCall) {
         let status = PHPhotoLibrary.authorizationStatus(for: .readWrite)
+
         switch status {
         case .authorized, .limited:
             call.resolve(["granted": true, "status": "granted"])
@@ -104,6 +116,7 @@ public class CameraModulePlugin: CAPPlugin, CAPBridgedPlugin, AVCaptureVideoData
     }
 
     // MARK: - Pick Image
+
     @objc func pickImageBase64(_ call: CAPPluginCall) {
         let status = PHPhotoLibrary.authorizationStatus(for: .readWrite)
         guard status == .authorized || status == .limited else {
@@ -128,116 +141,139 @@ public class CameraModulePlugin: CAPPlugin, CAPBridgedPlugin, AVCaptureVideoData
     }
 
     // MARK: - Camera Preview
-    @objc func startPreview(_ call: CAPPluginCall) {
-        DispatchQueue.main.async {
-            if self.previewView != nil {
-                call.resolve()
-                return
-            }
 
-            guard AVCaptureDevice.authorizationStatus(for: .video) == .authorized else {
-                call.reject("Camera permission not granted")
-                return
-            }
+@objc func startPreview(_ call: CAPPluginCall) {
+    DispatchQueue.main.async {
+        if self.previewView != nil {
+            call.resolve()
+            return
+        }
 
-            let session = AVCaptureSession()
+        guard AVCaptureDevice.authorizationStatus(for: .video) == .authorized else {
+            call.reject("Camera permission not granted")
+            return
+        }
 
-            guard let device = AVCaptureDevice.default(.builtInWideAngleCamera, for: .video, position: .back),
-                  let input = try? AVCaptureDeviceInput(device: device) else {
-                call.reject("Camera not available")
-                return
-            }
+        let session = AVCaptureSession()
 
-            if session.canAddInput(input) {
-                session.addInput(input)
-            }
+        guard let device = AVCaptureDevice.default(.builtInWideAngleCamera, for: .video, position: .back),
+              let input = try? AVCaptureDeviceInput(device: device) else {
+            call.reject("Camera not available")
+            return
+        }
 
-            if session.canAddOutput(self.photoOutput) {
-                session.addOutput(self.photoOutput)
-            }
+        if session.canAddInput(input) {
+            session.addInput(input)
+        }
 
-            guard let container = self.bridge?.viewController?.view else {
-                call.reject("No container view")
-                return
-            }
+        if session.canAddOutput(self.photoOutput) {
+            session.addOutput(self.photoOutput)
+        }
 
-            guard let webView = self.bridge?.webView as? WKWebView else {
-                call.reject("No webView")
-                return
-            }
+        guard let container = self.bridge?.viewController?.view else {
+            call.reject("No container view")
+            return
+        }
 
-            // Hacer el webView transparente
-            webView.isOpaque = false
-            webView.backgroundColor = .clear
-            webView.scrollView.backgroundColor = .clear
-            webView.scrollView.isOpaque = false
-
-            // Crear previewView
-            let previewView = UIView()
-            previewView.translatesAutoresizingMaskIntoConstraints = false
-            previewView.backgroundColor = .clear
-            previewView.isUserInteractionEnabled = false
-
-            // Insertar previewView DETRÁS de todo
-            container.insertSubview(previewView, at: 0)
-
-            // Configurar constraints para toda la pantalla
-            NSLayoutConstraint.activate([
-                previewView.topAnchor.constraint(equalTo: container.topAnchor),
-                previewView.bottomAnchor.constraint(equalTo: container.bottomAnchor),
-                previewView.leadingAnchor.constraint(equalTo: container.leadingAnchor),
-                previewView.trailingAnchor.constraint(equalTo: container.trailingAnchor)
-            ])
+        guard let webView = self.bridge?.webView as? WKWebView else {
+            call.reject("No webView")
+            return
+        }
 
-            // Asegurar orden de capas
-            previewView.layer.zPosition = -1
-            webView.layer.zPosition = 0
+        // 1. Hacer el webView transparente
+        webView.isOpaque = false
+        webView.backgroundColor = .clear
+        webView.scrollView.backgroundColor = .clear
+        webView.scrollView.isOpaque = false
+
+        // 2. Crear previewView
+        let previewView = UIView()
+        previewView.translatesAutoresizingMaskIntoConstraints = false
+        previewView.backgroundColor = .clear // Transparente desde el inicio
+        previewView.isUserInteractionEnabled = false // No intercepta toques
+
+        // 3. Insertar previewView DETRÁS de todo
+        container.insertSubview(previewView, at: 0)
+
+        // 4. Configurar constraints para toda la pantalla
+        NSLayoutConstraint.activate([
+            previewView.topAnchor.constraint(equalTo: container.topAnchor),
+            previewView.bottomAnchor.constraint(equalTo: container.bottomAnchor),
+            previewView.leadingAnchor.constraint(equalTo: container.leadingAnchor),
+            previewView.trailingAnchor.constraint(equalTo: container.trailingAnchor)
+        ])
 
-            // Forzar layout
-            container.layoutIfNeeded()
+        // 5. Asegurar orden de capas
+        previewView.layer.zPosition = -1 // Detrás de todo
+        webView.layer.zPosition = 0 // Normal
 
-            // Crear previewLayer
-            let previewLayer = AVCaptureVideoPreviewLayer(session: session)
-            previewLayer.videoGravity = .resizeAspectFill
-            previewLayer.frame = previewView.bounds
-            previewLayer.masksToBounds = true
+        // 6. Forzar layout
+        container.layoutIfNeeded()
 
-            previewView.layer.insertSublayer(previewLayer, at: 0)
+        // 7. Crear previewLayer
+        let previewLayer = AVCaptureVideoPreviewLayer(session: session)
+        previewLayer.videoGravity = .resizeAspectFill
+        previewLayer.frame = previewView.bounds
+        previewLayer.masksToBounds = true
 
-            // Guardar referencias
-            self.previewView = previewView
-            self.videoPreviewLayer = previewLayer
-            self.captureSession = session
+        previewView.layer.insertSublayer(previewLayer, at: 0)
 
-            // Configurar sesión
-            session.sessionPreset = .photo
+        // 8. Guardar referencias
+        self.previewView = previewView
+        self.videoPreviewLayer = previewLayer
+        self.captureSession = session
 
-            // Iniciar sesión en background
-            DispatchQueue.global(qos: .userInitiated).async {
-                session.startRunning()
-            }
+        // 9. Configurar sesión
+        session.sessionPreset = .photo
 
-            call.resolve([
-                "success": true,
-                "message": "Preview de cámara iniciado"
-            ])
+        // 10. Iniciar sesión en background
+        DispatchQueue.global(qos: .userInitiated).async {
+            session.startRunning()
+
+            DispatchQueue.main.async {
+                print("Cámara iniciada correctamente")
+                print("Preview visible: \(previewView.window != nil ? "SÍ" : "NO")")
+            }
         }
+
+        call.resolve([
+            "success": true,
+            "message": "Preview de cámara iniciado"
+        ])
     }
+}
+
 
     @objc func stopPreview(_ call: CAPPluginCall) {
         DispatchQueue.main.async {
-            // Detener cámara
+
+            if self.isScanning {
+                self.isScanning = false
+                self.scanCall?.keepAlive = false
+                self.scanCall = nil
+                self.barcodeRequest = nil
+                self.lastScannedValue = nil
+                self.lastScanTime = nil
+
+                if let output = self.videoDataOutput,
+                   let session = self.captureSession {
+                    session.removeOutput(output)
+                }
+                self.videoDataOutput = nil
+            }
+
+            // 🛑 Detener cámara
             self.captureSession?.stopRunning()
             self.captureSession = nil
 
-            // Remover preview
+            // 🧹 Limpiar preview
             self.videoPreviewLayer?.removeFromSuperlayer()
             self.previewView?.removeFromSuperview()
             self.videoPreviewLayer?.session = nil
             self.videoPreviewLayer = nil
             self.previewView = nil
 
-            // Restaurar webView a estado normal
+            // 🔁 Restaurar WebView
             if let webView = self.bridge?.webView as? WKWebView {
                 webView.isOpaque = true
                 webView.backgroundColor = .white
@@ -245,11 +281,16 @@ public class CameraModulePlugin: CAPPlugin, CAPBridgedPlugin, AVCaptureVideoData
                 webView.scrollView.isOpaque = true
             }
 
+            print("Preview y escaneo detenidos correctamente")
             call.resolve()
         }
     }
 
+
+
+
     // MARK: - Flash
+
     @objc func toggleFlash(_ call: CAPPluginCall) {
         guard let enable = call.getBool("enable"),
               let device = AVCaptureDevice.default(for: .video),
@@ -275,50 +316,53 @@ public class CameraModulePlugin: CAPPlugin, CAPBridgedPlugin, AVCaptureVideoData
     }
 
     @objc func getLastGalleryImage(_ call: CAPPluginCall) {
-        let status = PHPhotoLibrary.authorizationStatus(for: .readWrite)
 
-        guard status == .authorized || status == .limited else {
-            call.reject("Gallery permission not granted")
-            return
-        }
+            let status = PHPhotoLibrary.authorizationStatus(for: .readWrite)
 
-        let fetchOptions = PHFetchOptions()
-        fetchOptions.sortDescriptors = [
-            NSSortDescriptor(key: "creationDate", ascending: false)
-        ]
-        fetchOptions.fetchLimit = 1
+            guard status == .authorized || status == .limited else {
+                call.reject("Gallery permission not granted")
+                return
+            }
 
-        let assets = PHAsset.fetchAssets(with: .image, options: fetchOptions)
+            let fetchOptions = PHFetchOptions()
+            fetchOptions.sortDescriptors = [
+                NSSortDescriptor(key: "creationDate", ascending: false)
+            ]
+            fetchOptions.fetchLimit = 1
 
-        guard let asset = assets.firstObject else {
-            call.reject("No images found")
-            return
-        }
+            let assets = PHAsset.fetchAssets(with: .image, options: fetchOptions)
 
-        let imageManager = PHImageManager.default()
-        let options = PHImageRequestOptions()
-        options.isSynchronous = true
-        options.deliveryMode = .highQualityFormat
-        options.resizeMode = .none
-
-        imageManager.requestImageDataAndOrientation(
-            for: asset,
-            options: options
-        ) { data, _, _, _ in
-            guard let imageData = data else {
-                call.reject("Error fetching last image")
+            guard let asset = assets.firstObject else {
+                call.reject("No images found")
                 return
             }
 
-            let base64 = imageData.base64EncodedString()
+            let imageManager = PHImageManager.default()
+            let options = PHImageRequestOptions()
+            options.isSynchronous = true
+            options.deliveryMode = .highQualityFormat
+            options.resizeMode = .none
+
+            imageManager.requestImageDataAndOrientation(
+                for: asset,
+                options: options
+            ) { data, _, _, _ in
 
-            var ret = JSObject()
-            ret["base64"] = base64
-            call.resolve(ret)
+                guard let imageData = data else {
+                    call.reject("Error fetching last image")
+                    return
+                }
+
+                let base64 = imageData.base64EncodedString()
+
+                var ret = JSObject()
+                ret["base64"] = base64
+                call.resolve(ret)
+            }
         }
-    }
 
     // MARK: - Photo Capture
+
     @objc func takePhotoBase64(_ call: CAPPluginCall) {
         guard captureSession?.isRunning == true else {
             call.reject("Camera not started")
@@ -340,6 +384,7 @@ public class CameraModulePlugin: CAPPlugin, CAPBridgedPlugin, AVCaptureVideoData
     }
 
     // MARK: - Barcode Scan
+
     @objc func startBarcodeScan(_ call: CAPPluginCall) {
         guard let session = captureSession else {
             call.reject("Preview not started")
@@ -370,12 +415,19 @@ public class CameraModulePlugin: CAPPlugin, CAPBridgedPlugin, AVCaptureVideoData
             self.lastScanTime = now
             self.isScanning = false
 
+            if let output = self.videoDataOutput,
+               let session = self.captureSession {
+                session.removeOutput(output)
+            }
+            self.videoDataOutput = nil
+
             self.scanCall?.resolve([
                 "rawValue": value,
                 "format": barcode.symbology.rawValue
             ])
             self.scanCall?.keepAlive = false
             self.scanCall = nil
+
         }
 
         if videoDataOutput == nil {
@@ -410,25 +462,30 @@ public class CameraModulePlugin: CAPPlugin, CAPBridgedPlugin, AVCaptureVideoData
     public func captureOutput(_ output: AVCaptureOutput,
                               didOutput sampleBuffer: CMSampleBuffer,
                               from connection: AVCaptureConnection) {
+
         guard isScanning,
+              captureSession?.isRunning == true,
               let request = barcodeRequest,
-              let pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer) else { return }
+              let pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer)
+        else { return }
 
         let handler = VNImageRequestHandler(
             cvPixelBuffer: pixelBuffer,
-            orientation: CGImagePropertyOrientation.right,
+            orientation: .right,
             options: [:]
         )
 
         try? handler.perform([request])
     }
-}
+
 
 // MARK: - UIImagePicker Delegate
+
 extension CameraModulePlugin: UIImagePickerControllerDelegate, UINavigationControllerDelegate {
 
     public func imagePickerController(_ picker: UIImagePickerController,
                                       didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
+
         picker.dismiss(animated: true)
 
         guard let image = info[.originalImage] as? UIImage,
@@ -454,6 +511,7 @@ extension CameraModulePlugin: UIImagePickerControllerDelegate, UINavigationContr
 }
 
 // MARK: - UIImage Resize
+
 extension UIImage {
     func resized(maxSize: CGFloat) -> UIImage? {
         let maxSide = max(size.width, size.height)
@@ -468,23 +526,6 @@ extension UIImage {
         UIGraphicsEndImageContext()
         return img
     }
-}
 
-// MARK: - Photo Delegate (si necesitas esta clase)
-class PhotoDelegate: NSObject, AVCapturePhotoCaptureDelegate {
-    private let completion: (String) -> Void
 
-    init(completion: @escaping (String) -> Void) {
-        self.completion = completion
-    }
-
-    func photoOutput(_ output: AVCapturePhotoOutput,
-                     didFinishProcessingPhoto photo: AVCapturePhoto,
-                     error: Error?) {
-        guard let data = photo.fileDataRepresentation(),
-              let base64 = data.base64EncodedString() else {
-            return
-        }
-        completion(base64)
-    }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-camera-module",
-  "version": "0.0.65",
+  "version": "0.0.68",
   "description": "Plugin to request permissiones view camera take phots",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",