capacitor-camera-module 0.0.63 → 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,22 +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() {
-        guard let webView = bridge?.webView else { return }
-
-        webView.isOpaque = true
-        webView.backgroundColor = .black
-        webView.scrollView.backgroundColor = .black
+        print("📱 CameraModulePlugin cargado")
     }
 
-
-
     // MARK: - Camera Permission
-
     @objc func checkPermission(_ call: CAPPluginCall) {
         let status = AVCaptureDevice.authorizationStatus(for: .video)
         call.resolve([
@@ -82,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"])
@@ -118,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 {
@@ -143,7 +128,6 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
     }
 
     // MARK: - Camera Preview
-
     @objc func startPreview(_ call: CAPPluginCall) {
         DispatchQueue.main.async {
             if self.previewView != nil {
@@ -177,41 +161,42 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
                 return
             }
 
-            // 1. Cambia isUserInteractionEnabled a true
-            let previewView = UIView()
-            previewView.translatesAutoresizingMaskIntoConstraints = false
-            previewView.backgroundColor = .black
-            previewView.isUserInteractionEnabled = true // CAMBIO IMPORTANTE
-
-
-            previewView.backgroundColor = .red // Para ver si la vista se muestra
-
-
-            // Agrega esto después de crear la vista
-            print("PreviewView frame: \(previewView.frame)")
-            print("Superview: \(previewView.superview)")
-
-            guard let webView = self.bridge?.webView else {
+            guard let webView = self.bridge?.webView as? WKWebView else {
                 call.reject("No webView")
                 return
             }
 
-            // 2. Inserta la previewView sobre el webView temporalmente para debug
-            container.addSubview(previewView)
+            // 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
 
-            // 3. Configura constraints
-            let safeArea = container.safeAreaLayoutGuide
+            // Insertar previewView DETRÁS de todo
+            container.insertSubview(previewView, at: 0)
+
+            // Configurar constraints para toda la pantalla
             NSLayoutConstraint.activate([
-                previewView.topAnchor.constraint(equalTo: safeArea.topAnchor), // NO container.topAnchor
-                previewView.bottomAnchor.constraint(equalTo: safeArea.bottomAnchor, constant: -180),
+                previewView.topAnchor.constraint(equalTo: container.topAnchor),
+                previewView.bottomAnchor.constraint(equalTo: container.bottomAnchor),
                 previewView.leadingAnchor.constraint(equalTo: container.leadingAnchor),
                 previewView.trailingAnchor.constraint(equalTo: container.trailingAnchor)
             ])
 
-            // 4. FORZA el layout inmediatamente
+            // Asegurar orden de capas
+            previewView.layer.zPosition = -1
+            webView.layer.zPosition = 0
+
+            // Forzar layout
             container.layoutIfNeeded()
 
-            // 5. Crea el previewLayer después de tener el tamaño correcto
+            // Crear previewLayer
             let previewLayer = AVCaptureVideoPreviewLayer(session: session)
             previewLayer.videoGravity = .resizeAspectFill
             previewLayer.frame = previewView.bounds
@@ -219,50 +204,52 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
 
             previewView.layer.insertSublayer(previewLayer, at: 0)
 
-            // 6. Guarda referencias
+            // Guardar referencias
             self.previewView = previewView
             self.videoPreviewLayer = previewLayer
             self.captureSession = session
 
-            // 7. Configura la sesión ANTES de iniciarla
+            // Configurar sesión
             session.sessionPreset = .photo
 
-            // 8. Inicia la sesión en background
+            // Iniciar sesión en background
             DispatchQueue.global(qos: .userInitiated).async {
                 session.startRunning()
-
-                // 9. Vuelve al main thread para verificar que se esté mostrando
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-                    print("Preview frame: \(previewView.frame)")
-                    print("Preview layer frame: \(previewLayer.frame)")
-                    print("Preview visible: \(previewView.window != nil)")
-                }
             }
 
-            call.resolve()
+            call.resolve([
+                "success": true,
+                "message": "Preview de cámara iniciado"
+            ])
         }
     }
 
-
     @objc func stopPreview(_ call: CAPPluginCall) {
         DispatchQueue.main.async {
+            // Detener cámara
             self.captureSession?.stopRunning()
             self.captureSession = nil
+
+            // Remover preview
             self.videoPreviewLayer?.removeFromSuperlayer()
             self.previewView?.removeFromSuperview()
             self.videoPreviewLayer?.session = nil
-
             self.videoPreviewLayer = nil
-
             self.previewView = nil
+
+            // Restaurar webView a estado normal
+            if let webView = self.bridge?.webView as? WKWebView {
+                webView.isOpaque = true
+                webView.backgroundColor = .white
+                webView.scrollView.backgroundColor = .white
+                webView.scrollView.isOpaque = true
+            }
+
             call.resolve()
         }
     }
 
-
-
     // MARK: - Flash
-
     @objc func toggleFlash(_ call: CAPPluginCall) {
         guard let enable = call.getBool("enable"),
               let device = AVCaptureDevice.default(for: .video),
@@ -288,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")
@@ -356,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")
@@ -433,8 +416,7 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
 
         let handler = VNImageRequestHandler(
             cvPixelBuffer: pixelBuffer,
-            orientation: CGImagePropertyOrientation.right
-,
+            orientation: CGImagePropertyOrientation.right,
             options: [:]
         )
 
@@ -443,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,
@@ -474,7 +454,6 @@ extension CameraModulePlugin: UIImagePickerControllerDelegate, UINavigationContr
 }
 
 // MARK: - UIImage Resize
-
 extension UIImage {
     func resized(maxSize: CGFloat) -> UIImage? {
         let maxSide = max(size.width, size.height)
@@ -489,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.63",
+  "version": "0.0.65",
   "description": "Plugin to request permissiones view camera take phots",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",