capacitor-camera-module 0.0.48 → 0.0.49

package/ios/Sources/CameraModulePlugin/CameraModulePlugin.swift

@@ -7,8 +7,6 @@ import Photos
 @objc(CameraModule)
 public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOutputSampleBufferDelegate {
 
-    // MARK: - Camera
-
     private var previewView: UIView?
     private var captureSession: AVCaptureSession?
     private var videoPreviewLayer: AVCaptureVideoPreviewLayer?
@@ -33,27 +31,24 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
 
     public static let identifier = "CameraModule"
     public static 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)
 
-    public static 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)
-    ]
 
 
     // MARK: - Lifecycle
@@ -154,6 +149,11 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
                 return
             }
 
+            guard AVCaptureDevice.authorizationStatus(for: .video) == .authorized else {
+                call.reject("Camera permission not granted")
+                return
+            }
+
             let session = AVCaptureSession()
             session.sessionPreset = .photo
 
@@ -163,10 +163,18 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
                 return
             }
 
-            session.addInput(input)
-            session.addOutput(self.photoOutput)
+            if session.canAddInput(input) {
+                session.addInput(input)
+            }
+
+            if session.canAddOutput(self.photoOutput) {
+                session.addOutput(self.photoOutput)
+            }
+
+
+            let container = self.bridge?.viewController?.view
+            let view = UIView(frame: container?.bounds ?? .zero)
 
-            let view = UIView(frame: UIScreen.main.bounds)
             let layer = AVCaptureVideoPreviewLayer(session: session)
             layer.videoGravity = .resizeAspectFill
             layer.frame = view.bounds
@@ -285,8 +293,15 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
 
         if videoDataOutput == nil {
             let output = AVCaptureVideoDataOutput()
+            output.videoSettings = [
+                kCVPixelBufferPixelFormatTypeKey as String:
+                kCVPixelFormatType_32BGRA
+            ]
+            output.alwaysDiscardsLateVideoFrames = true
             output.setSampleBufferDelegate(self, queue: DispatchQueue(label: "barcode.queue"))
-            session.addOutput(output)
+            if session.canAddOutput(output) {
+                session.addOutput(output)
+            }
             videoDataOutput = output
         }
     }
@@ -299,6 +314,9 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
         videoDataOutput = nil
         scanCall?.keepAlive = false
         scanCall = nil
+        barcodeRequest = nil
+        lastScannedValue = nil
+        lastScanTime = nil
         call.resolve()
     }
 
@@ -311,7 +329,8 @@ public class CameraModulePlugin: CAPPlugin,CAPBridgedPlugin,AVCaptureVideoDataOu
 
         let handler = VNImageRequestHandler(
             cvPixelBuffer: pixelBuffer,
-            orientation: .right,
+            orientation: CGImagePropertyOrientation.right
+,
             options: [:]
         )
 
@@ -360,7 +379,7 @@ extension UIImage {
         let scale = maxSize / maxSide
         let newSize = CGSize(width: size.width * scale, height: size.height * scale)
 
-        UIGraphicsBeginImageContextWithOptions(newSize, false, 1)
+        UIGraphicsBeginImageContextWithOptions(newSize, false, 0)
         draw(in: CGRect(origin: .zero, size: newSize))
         let img = UIGraphicsGetImageFromCurrentImageContext()
         UIGraphicsEndImageContext()

package/package.json

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