capacitor-camera-module 0.0.68 → 0.0.69

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?
@@ -51,13 +48,9 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
 
     // 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) {
@@ -142,107 +135,106 @@ 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
-        }
+            guard AVCaptureDevice.authorizationStatus(for: .video) == .authorized else {
+                call.reject("Camera permission not granted")
+                return
+            }
 
-        let session = AVCaptureSession()
+            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
-        }
+            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.canAddInput(input) {
+                session.addInput(input)
+            }
 
-        if session.canAddOutput(self.photoOutput) {
-            session.addOutput(self.photoOutput)
-        }
+            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 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
-        }
+            guard let webView = self.bridge?.webView as? WKWebView else {
+                call.reject("No webView")
+                return
+            }
 
-        // 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)
-        ])
+            // 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)
+            ])
 
-        // 5. Asegurar orden de capas
-        previewView.layer.zPosition = -1 // Detrás de todo
-        webView.layer.zPosition = 0 // Normal
+            // 5. Asegurar orden de capas
+            previewView.layer.zPosition = -1 // Detrás de todo
+            webView.layer.zPosition = 0 // Normal
 
-        // 6. Forzar layout
-        container.layoutIfNeeded()
+            // 6. Forzar layout
+            container.layoutIfNeeded()
 
-        // 7. Crear previewLayer
-        let previewLayer = AVCaptureVideoPreviewLayer(session: session)
-        previewLayer.videoGravity = .resizeAspectFill
-        previewLayer.frame = previewView.bounds
-        previewLayer.masksToBounds = true
+            // 7. Crear previewLayer
+            let previewLayer = AVCaptureVideoPreviewLayer(session: session)
+            previewLayer.videoGravity = .resizeAspectFill
+            previewLayer.frame = previewView.bounds
+            previewLayer.masksToBounds = true
 
-        previewView.layer.insertSublayer(previewLayer, at: 0)
+            previewView.layer.insertSublayer(previewLayer, at: 0)
 
-        // 8. Guardar referencias
-        self.previewView = previewView
-        self.videoPreviewLayer = previewLayer
-        self.captureSession = session
+            // 8. Guardar referencias
+            self.previewView = previewView
+            self.videoPreviewLayer = previewLayer
+            self.captureSession = session
 
-        // 9. Configurar sesión
-        session.sessionPreset = .photo
+            // 9. Configurar sesión
+            session.sessionPreset = .photo
 
-        // 10. Iniciar sesión en background
-        DispatchQueue.global(qos: .userInitiated).async {
-            session.startRunning()
+            // 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")")
+                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"
-        ])
+            call.resolve([
+                "success": true,
+                "message": "Preview de cámara iniciado"
+            ])
+        }
     }
-}
-
 
     @objc func stopPreview(_ call: CAPPluginCall) {
         DispatchQueue.main.async {
@@ -286,9 +278,6 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
         }
     }
 
-
-
-
     // MARK: - Flash
 
     @objc func toggleFlash(_ call: CAPPluginCall) {
@@ -317,49 +306,49 @@ 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")
+            return
+        }
 
-            let imageManager = PHImageManager.default()
-            let options = PHImageRequestOptions()
-            options.isSynchronous = true
-            options.deliveryMode = .highQualityFormat
-            options.resizeMode = .none
+        let imageManager = PHImageManager.default()
+        let options = PHImageRequestOptions()
+        options.isSynchronous = true
+        options.deliveryMode = .highQualityFormat
+        options.resizeMode = .none
 
-            imageManager.requestImageDataAndOrientation(
-                for: asset,
-                options: options
-            ) { data, _, _, _ in
+        imageManager.requestImageDataAndOrientation(
+            for: asset,
+            options: options
+        ) { data, _, _, _ in
 
-                guard let imageData = data else {
-                    call.reject("Error fetching last image")
-                    return
-                }
+            guard let imageData = data else {
+                call.reject("Error fetching last image")
+                return
+            }
 
-                let base64 = imageData.base64EncodedString()
+            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
 
@@ -434,7 +423,7 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
             let output = AVCaptureVideoDataOutput()
             output.videoSettings = [
                 kCVPixelBufferPixelFormatTypeKey as String:
-                kCVPixelFormatType_32BGRA
+                    kCVPixelFormatType_32BGRA
             ]
             output.alwaysDiscardsLateVideoFrames = true
             output.setSampleBufferDelegate(self, queue: DispatchQueue(label: "barcode.queue"))
@@ -478,9 +467,35 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
         try? handler.perform([request])
     }
 
+    // MARK: - PhotoDelegate Class
 
-// MARK: - UIImagePicker Delegate
+    private 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?) {
+            if let error = error {
+                print("Error capturando foto: \(error)")
+                return
+            }
+
+            guard let data = photo.fileDataRepresentation(),
+                  let base64 = data.base64EncodedString() as? String else {
+                print("No se pudo convertir la imagen a base64")
+                return
+            }
+
+            completion(base64)
+        }
+    }
+}
 
+// MARK: - UIImagePicker Delegate
 extension CameraModulePlugin: UIImagePickerControllerDelegate, UINavigationControllerDelegate {
 
     public func imagePickerController(_ picker: UIImagePickerController,
@@ -511,7 +526,6 @@ extension CameraModulePlugin: UIImagePickerControllerDelegate, UINavigationContr
 }
 
 // MARK: - UIImage Resize
-
 extension UIImage {
     func resized(maxSize: CGFloat) -> UIImage? {
         let maxSide = max(size.width, size.height)
@@ -526,6 +540,4 @@ extension UIImage {
         UIGraphicsEndImageContext()
         return img
     }
-
-
-}
+}

package/package.json

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