capacitor-camera-module 0.0.64 → 0.0.65

package/ios/Sources/CameraModulePlugin/CameraModulePlugin.swift

@@ -5,29 +5,26 @@ 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?
@@ -36,7 +33,6 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
     private var photoDelegate: PhotoDelegate?
 
     // MARK: - Barcode
-
     private var isScanning = false
     private var scanCall: CAPPluginCall?
     private var barcodeRequest: VNDetectBarcodesRequest?
@@ -46,20 +42,14 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
     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([
@@ -80,10 +70,8 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
     }
 
     // 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"])
@@ -116,7 +104,6 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
     }
 
     // MARK: - Pick Image
-
     @objc func pickImageBase64(_ call: CAPPluginCall) {
         let status = PHPhotoLibrary.authorizationStatus(for: .readWrite)
         guard status == .authorized || status == .limited else {
@@ -141,131 +128,101 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
     }
 
     // MARK: - Camera Preview
+    @objc func startPreview(_ call: CAPPluginCall) {
+        DispatchQueue.main.async {
+            if self.previewView != nil {
+                call.resolve()
+                return
+            }
 
-@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
-        }
-
-        let session = AVCaptureSession()
-
-        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.canAddInput(input) {
-            session.addInput(input)
-        }
-
-        if session.canAddOutput(self.photoOutput) {
-            session.addOutput(self.photoOutput)
-        }
-
-        guard let container = self.bridge?.viewController?.view else {
-            call.reject("No container view")
-            return
-        }
-
-        guard let webView = self.bridge?.webView as? WKWebView else {
-            call.reject("No webView")
-            return
-        }
-
-        // 1. Hacer el webView transparente ANTES de crear el preview
-        webView.isOpaque = false
-        webView.backgroundColor = .clear
-        webView.scrollView.backgroundColor = .clear
-
-        // Si necesitas mantener scroll pero transparente:
-        webView.scrollView.isOpaque = false
-
-        // 2. Crear previewView
-        let previewView = UIView()
-        previewView.translatesAutoresizingMaskIntoConstraints = false
-        previewView.backgroundColor = .black // Temporal para debug
-        previewView.isUserInteractionEnabled = false // Importante: no intercepta toques
-
-        // DEBUG: Borde para ver los límites
-        previewView.layer.borderWidth = 2
-        previewView.layer.borderColor = UIColor.green.cgColor
+            guard AVCaptureDevice.authorizationStatus(for: .video) == .authorized else {
+                call.reject("Camera permission not granted")
+                return
+            }
 
-        print("🔍 DEBUG: Container frame: \(container.frame)")
-        print("🔍 DEBUG: WebView frame: \(webView.frame)")
+            let session = AVCaptureSession()
 
-        // 3. Insertar previewView DETRÁS de todo (posición 0)
-        container.insertSubview(previewView, at: 0)
+            guard let device = AVCaptureDevice.default(.builtInWideAngleCamera, for: .video, position: .back),
+                  let input = try? AVCaptureDeviceInput(device: device) else {
+                call.reject("Camera not available")
+                return
+            }
 
-        // 4. Configurar constraints para que ocupe 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)
-        ])
+            if session.canAddInput(input) {
+                session.addInput(input)
+            }
 
-        // 5. Asegurar orden de capas
-        previewView.layer.zPosition = -1 // Detrás de todo
-        webView.layer.zPosition = 0 // Normal
+            if session.canAddOutput(self.photoOutput) {
+                session.addOutput(self.photoOutput)
+            }
 
-        // 6. Forzar layout
-        container.layoutIfNeeded()
+            guard let container = self.bridge?.viewController?.view else {
+                call.reject("No container view")
+                return
+            }
 
-        print("🔍 DEBUG: PreviewView frame después de layout: \(previewView.frame)")
+            guard let webView = self.bridge?.webView as? WKWebView else {
+                call.reject("No webView")
+                return
+            }
 
-        // 7. Crear previewLayer
-        let previewLayer = AVCaptureVideoPreviewLayer(session: session)
-        previewLayer.videoGravity = .resizeAspectFill
-        previewLayer.frame = previewView.bounds
-        previewLayer.masksToBounds = true
+            // 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)
+            ])
 
-        // DEBUG: Borde para el layer también
-        previewLayer.borderWidth = 1
-        previewLayer.borderColor = UIColor.yellow.cgColor
+            // Asegurar orden de capas
+            previewView.layer.zPosition = -1
+            webView.layer.zPosition = 0
 
-        previewView.layer.insertSublayer(previewLayer, at: 0)
+            // Forzar layout
+            container.layoutIfNeeded()
 
-        // 8. Guardar referencias
-        self.previewView = previewView
-        self.videoPreviewLayer = previewLayer
-        self.captureSession = session
+            // Crear previewLayer
+            let previewLayer = AVCaptureVideoPreviewLayer(session: session)
+            previewLayer.videoGravity = .resizeAspectFill
+            previewLayer.frame = previewView.bounds
+            previewLayer.masksToBounds = true
 
-        // 9. Configurar sesión
-        session.sessionPreset = .photo
+            previewView.layer.insertSublayer(previewLayer, at: 0)
 
-        // 10. Iniciar sesión en background
-        DispatchQueue.global(qos: .userInitiated).async {
-            session.startRunning()
+            // Guardar referencias
+            self.previewView = previewView
+            self.videoPreviewLayer = previewLayer
+            self.captureSession = session
 
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-                print("✅ Cámara iniciada")
-                print("📍 Preview visible: \(previewView.window != nil ? "SÍ" : "NO")")
-                print("📍 WebView transparente: \(webView.isOpaque ? "NO" : "SÍ")")
+            // Configurar sesión
+            session.sessionPreset = .photo
 
-                // Quitar borde de debug después de 3 segundos
-                DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
-                    previewView.layer.borderWidth = 0
-                    previewLayer.borderWidth = 0
-                    previewView.backgroundColor = .clear // Ahora sí transparente
-                }
+            // Iniciar sesión en background
+            DispatchQueue.global(qos: .userInitiated).async {
+                session.startRunning()
             }
-        }
 
-        call.resolve([
-            "success": true,
-            "message": "Preview iniciado con webView transparente"
-        ])
+            call.resolve([
+                "success": true,
+                "message": "Preview de cámara iniciado"
+            ])
+        }
     }
-}
-
 
     @objc func stopPreview(_ call: CAPPluginCall) {
         DispatchQueue.main.async {
@@ -280,23 +237,19 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
             self.videoPreviewLayer = nil
             self.previewView = nil
 
-            // Restaurar webView a estado normal (opcional)
+            // Restaurar webView a estado normal
             if let webView = self.bridge?.webView as? WKWebView {
                 webView.isOpaque = true
-                webView.backgroundColor = .white // O el color de tu app
+                webView.backgroundColor = .white
                 webView.scrollView.backgroundColor = .white
                 webView.scrollView.isOpaque = true
             }
 
-            print("🛑 Preview detenido - webView restaurado")
             call.resolve()
         }
     }
 
-
-
     // MARK: - Flash
-
     @objc func toggleFlash(_ call: CAPPluginCall) {
         guard let enable = call.getBool("enable"),
               let device = AVCaptureDevice.default(for: .video),
@@ -322,53 +275,50 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
     }
 
     @objc func getLastGalleryImage(_ call: CAPPluginCall) {
+        let status = PHPhotoLibrary.authorizationStatus(for: .readWrite)
 
-            let status = PHPhotoLibrary.authorizationStatus(for: .readWrite)
+        guard status == .authorized || status == .limited else {
+            call.reject("Gallery permission not granted")
+            return
+        }
 
-            guard status == .authorized || status == .limited else {
-                call.reject("Gallery permission not granted")
-                return
-            }
+        let fetchOptions = PHFetchOptions()
+        fetchOptions.sortDescriptors = [
+            NSSortDescriptor(key: "creationDate", ascending: false)
+        ]
+        fetchOptions.fetchLimit = 1
 
-            let fetchOptions = PHFetchOptions()
-            fetchOptions.sortDescriptors = [
-                NSSortDescriptor(key: "creationDate", ascending: false)
-            ]
-            fetchOptions.fetchLimit = 1
+        let assets = PHAsset.fetchAssets(with: .image, options: fetchOptions)
 
-            let assets = PHAsset.fetchAssets(with: .image, options: fetchOptions)
+        guard let asset = assets.firstObject else {
+            call.reject("No images found")
+            return
+        }
 
-            guard let asset = assets.firstObject else {
-                call.reject("No images found")
+        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")
                 return
             }
 
-            let imageManager = PHImageManager.default()
-            let options = PHImageRequestOptions()
-            options.isSynchronous = true
-            options.deliveryMode = .highQualityFormat
-            options.resizeMode = .none
-
-            imageManager.requestImageDataAndOrientation(
-                for: asset,
-                options: options
-            ) { data, _, _, _ in
+            let base64 = imageData.base64EncodedString()
 
-                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)
-            }
+            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")
@@ -390,7 +340,6 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
     }
 
     // MARK: - Barcode Scan
-
     @objc func startBarcodeScan(_ call: CAPPluginCall) {
         guard let session = captureSession else {
             call.reject("Preview not started")
@@ -467,8 +416,7 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
 
         let handler = VNImageRequestHandler(
             cvPixelBuffer: pixelBuffer,
-            orientation: CGImagePropertyOrientation.right
-,
+            orientation: CGImagePropertyOrientation.right,
             options: [:]
         )
 
@@ -477,12 +425,10 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
 }
 
 // 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,
@@ -508,7 +454,6 @@ extension CameraModulePlugin: UIImagePickerControllerDelegate, UINavigationContr
 }
 
 // MARK: - UIImage Resize
-
 extension UIImage {
     func resized(maxSize: CGFloat) -> UIImage? {
         let maxSide = max(size.width, size.height)
@@ -523,6 +468,23 @@ 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.64",
+  "version": "0.0.65",
   "description": "Plugin to request permissiones view camera take phots",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",