capacitor-camera-view 2.3.1 → 3.0.0

package/ios/Sources/CameraViewPlugin/CameraViewPlugin.swift

@@ -35,6 +35,7 @@ public class CameraViewPlugin: CAPPlugin, CAPBridgedPlugin, CameraEventDelegate
         CAPPluginMethod(name: "flipCamera", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "getZoom", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "setZoom", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setFocusPoint", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "getFlashMode", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "getSupportedFlashModes", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "setFlashMode", returnType: CAPPluginReturnPromise),
@@ -54,25 +55,41 @@ public class CameraViewPlugin: CAPPlugin, CAPBridgedPlugin, CameraEventDelegate
     public func cameraDidDetectBarcode(_ event: BarcodeDetectedEvent) {
         notifyListeners("barcodeDetected", data: event.toDictionary())
     }
+
+    public func cameraWasInterrupted(reason: String) {
+        notifyListeners("cameraInterrupted", data: ["reason": reason])
+    }
+
+    public func cameraInterruptionEnded() {
+        notifyListeners("cameraResumed", data: [:])
+    }
+
+    public func cameraRuntimeError(message: String, code: Int?) {
+        var data: [String: Any] = ["message": message]
+        if let code = code {
+            data["code"] = code
+        }
+        notifyListeners("cameraRuntimeError", data: data)
+    }
     
     @objc func start(_ call: CAPPluginCall) {
         guard let webView = self.webView else {
-            call.reject("Cannot find web view")
+            call.reject("Cannot find web view", CameraError.missingWebView.code)
             return
         }
-        
+
         maybeRequestCameraAccess { [weak self] granted in
             guard granted else {
-                call.reject("Camera access denied")
+                call.reject("Camera access denied", CameraError.permissionDenied.code)
                 return
             }
-            
+
             self?.implementation.startSession(
                 configuration: sessionConfigFromPluginCall(call),
                 webView: webView,
                 completion: { (error) in
                     if let error = error {
-                        call.reject("Failed to start camera preview", nil, error)
+                        call.reject("Failed to start camera preview", error.cameraErrorCode, error)
                         return
                     }
                     call.resolve()
@@ -97,22 +114,22 @@ public class CameraViewPlugin: CAPPlugin, CAPBridgedPlugin, CameraEventDelegate
         let saveToFile = call.getBool("saveToFile", false)
         
         guard quality >= 0.0 && quality <= 100.0 else {
-            call.reject("Quality must be between 0 and 100")
+            call.reject("Quality must be between 0 and 100", CameraError.invalidArgument.code)
             return
         }
-        
+
         // Use optimized Data-based capture to avoid double JPEG encoding
         implementation.capturePhotoData(completion: { [weak self] (data, error) in
             if let error = error {
-                call.reject("Failed to capture image", nil, error)
+                call.reject("Failed to capture image", error.cameraErrorCode, error)
                 return
             }
-            
+
             guard let originalData = data else {
-                call.reject("No image data")
+                call.reject("No image data", CameraError.captureOutputMissing.code)
                 return
             }
-            
+
             // Determine final image data based on quality setting
             // For quality >= 90%, use original camera JPEG data to avoid re-encoding
             // For lower quality, re-encode to reduce file size
@@ -121,30 +138,34 @@ public class CameraViewPlugin: CAPPlugin, CAPBridgedPlugin, CameraEventDelegate
                 // Use original JPEG data from camera (avoids quality loss and CPU overhead)
                 imageData = originalData
             } else {
-                // Re-encode at lower quality for smaller file size
-                guard let image = UIImage(data: originalData),
-                      let compressedData = image.jpegData(compressionQuality: quality / 100.0) else {
-                    call.reject("Failed to compress image")
+                // Re-encode at lower quality for smaller file size. Uses ImageIO
+                // directly (rather than UIImage.jpegData) so EXIF/GPS metadata
+                // from the original camera JPEG survives the re-encode.
+                guard let compressedData = reencodeJPEG(data: originalData, compressionQuality: quality / 100.0) else {
+                    call.reject("Failed to compress image", CameraError.imageCompressionFailed.code)
                     return
                 }
                 imageData = compressedData
             }
-            
+
             if saveToFile {
                 // Use TempFileManager for tracked temp files with automatic cleanup
                 let tempFileURL = TempFileManager.shared.createTempImageFile()
                 do {
                     try imageData.write(to: tempFileURL)
-                    
+
                     // Convert file URL to webView-accessible path using Capacitor bridge
                     guard let webPath = self?.bridge?.portablePath(fromLocalURL: tempFileURL)?.absoluteString else {
-                        call.reject("Failed to create web-accessible path")
+                        call.reject("Failed to create web-accessible path", CameraError.pathConversionFailed.code)
                         return
                     }
-                    
-                    call.resolve(["webPath": webPath])
+
+                    call.resolve([
+                        "path": tempFileURL.absoluteString,
+                        "webPath": webPath,
+                    ])
                 } catch {
-                    call.reject("Failed to save image to file", nil, error)
+                    call.reject("Failed to save image to file", CameraError.fileWriteFailed.code, error)
                 }
             } else {
                 // Return as base64
@@ -160,41 +181,44 @@ public class CameraViewPlugin: CAPPlugin, CAPBridgedPlugin, CameraEventDelegate
         let saveToFile = call.getBool("saveToFile", false)
         
         guard quality >= 0.0 && quality <= 100.0 else {
-            call.reject("Quality must be between 0 and 100")
+            call.reject("Quality must be between 0 and 100", CameraError.invalidArgument.code)
             return
         }
-        
+
         implementation.captureSnapshot { [weak self] (image, error) in
             if let error = error {
-                call.reject("Failed to capture frame", nil, error)
+                call.reject("Failed to capture frame", error.cameraErrorCode, error)
                 return
             }
-            
+
             guard let image = image else {
-                call.reject("No frame data")
+                call.reject("No frame data", CameraError.captureOutputMissing.code)
                 return
             }
-            
+
             guard let imageData = image.jpegData(compressionQuality: quality / 100.0) else {
-                call.reject("Failed to compress image")
+                call.reject("Failed to compress image", CameraError.imageCompressionFailed.code)
                 return
             }
-            
+
             if saveToFile {
                 // Use TempFileManager for tracked temp files with automatic cleanup
                 let tempFileURL = TempFileManager.shared.createTempImageFile()
                 do {
                     try imageData.write(to: tempFileURL)
-                    
+
                     // Convert file URL to webView-accessible path using Capacitor bridge
                     guard let webPath = self?.bridge?.portablePath(fromLocalURL: tempFileURL)?.absoluteString else {
-                        call.reject("Failed to create web-accessible path")
+                        call.reject("Failed to create web-accessible path", CameraError.pathConversionFailed.code)
                         return
                     }
-                    
-                    call.resolve(["webPath": webPath])
+
+                    call.resolve([
+                        "path": tempFileURL.absoluteString,
+                        "webPath": webPath,
+                    ])
                 } catch {
-                    call.reject("Failed to save sample to file", nil, error)
+                    call.reject("Failed to save sample to file", CameraError.fileWriteFailed.code, error)
                 }
             } else {
                 // Return as base64
@@ -210,14 +234,14 @@ public class CameraViewPlugin: CAPPlugin, CAPBridgedPlugin, CameraEventDelegate
         let videoQuality = call.getString("videoQuality") ?? "highest"
 
         guard let parsedVideoQuality = VideoRecordingQuality(rawValue: videoQuality) else {
-            call.reject("Invalid videoQuality. Use one of: lowest, sd, hd, fhd, uhd, highest")
+            call.reject("Invalid videoQuality. Use one of: lowest, sd, hd, fhd, uhd, highest", CameraError.invalidArgument.code)
             return
         }
-        
+
         if enableAudio {
             maybeRequestMicrophoneAccess { [weak self] granted in
                 guard granted else {
-                    call.reject("Microphone access denied")
+                    call.reject("Microphone access denied", CameraError.permissionDenied.code)
                     return
                 }
                 self?.doStartRecording(call: call, enableAudio: true, videoQuality: parsedVideoQuality)
@@ -226,7 +250,7 @@ public class CameraViewPlugin: CAPPlugin, CAPBridgedPlugin, CameraEventDelegate
             doStartRecording(call: call, enableAudio: false, videoQuality: parsedVideoQuality)
         }
     }
-    
+
     private func doStartRecording(
         call: CAPPluginCall,
         enableAudio: Bool,
@@ -234,34 +258,37 @@ public class CameraViewPlugin: CAPPlugin, CAPBridgedPlugin, CameraEventDelegate
     ) {
         implementation.startRecording(enableAudio: enableAudio, videoQuality: videoQuality) { error in
             if let error = error {
-                call.reject("Failed to start recording", nil, error)
+                call.reject("Failed to start recording", error.cameraErrorCode, error)
                 return
             }
             call.resolve()
         }
     }
-    
+
     @objc func stopRecording(_ call: CAPPluginCall) {
         implementation.stopRecording { [weak self] (outputURL, error) in
             if let error = error {
-                call.reject("Failed to stop recording", nil, error)
+                call.reject("Failed to stop recording", error.cameraErrorCode, error)
                 return
             }
-            
+
             guard let outputURL = outputURL else {
-                call.reject("No output file URL")
+                call.reject("No output file URL", CameraError.captureOutputMissing.code)
                 return
             }
-            
+
             guard let webPath = self?.bridge?.portablePath(fromLocalURL: outputURL)?.absoluteString else {
-                call.reject("Failed to create web-accessible path")
+                call.reject("Failed to create web-accessible path", CameraError.pathConversionFailed.code)
                 return
             }
-            
-            call.resolve(["webPath": webPath])
+
+            call.resolve([
+                "path": outputURL.absoluteString,
+                "webPath": webPath,
+            ])
         }
     }
-    
+
     @objc func getAvailableDevices(_ call: CAPPluginCall) {
         let devices = implementation.getAvailableDevices()
         
@@ -281,12 +308,12 @@ public class CameraViewPlugin: CAPPlugin, CAPBridgedPlugin, CameraEventDelegate
     }
     
     @objc func flipCamera(_ call: CAPPluginCall) {
-        do {
-            try implementation.flipCamera()
+        implementation.flipCamera { error in
+            if let error = error {
+                call.reject("Failed to switch camera", error.cameraErrorCode, error)
+                return
+            }
             call.resolve()
-        } catch {
-            call.reject("Failed to switch camera", nil, error)
-            return
         }
     }
     
@@ -302,21 +329,36 @@ public class CameraViewPlugin: CAPPlugin, CAPBridgedPlugin, CameraEventDelegate
     
     @objc func setZoom(_ call: CAPPluginCall) {
         guard let level = call.getDouble("level") else {
-            call.reject("Zoom level must be provided")
+            call.reject("Zoom level must be provided", CameraError.invalidArgument.code)
             return
         }
-        
+
         let ramp = call.getBool("ramp") ?? false
-        
+
         do {
             try implementation.setZoomFactor(level, ramp: ramp)
             call.resolve()
         } catch {
-            call.reject("Failed to set zoom level", nil, error)
+            call.reject("Failed to set zoom level", error.cameraErrorCode, error)
             return
         }
     }
     
+    @objc func setFocusPoint(_ call: CAPPluginCall) {
+        guard let pointX = call.getDouble("x"), let pointY = call.getDouble("y") else {
+            call.reject("Focus point x and y must be provided", CameraError.invalidArgument.code)
+            return
+        }
+
+        implementation.setFocusPoint(x: CGFloat(pointX), y: CGFloat(pointY)) { error in
+            if let error = error {
+                call.reject("Failed to set focus point", error.cameraErrorCode, error)
+                return
+            }
+            call.resolve()
+        }
+    }
+
     @objc func getFlashMode(_ call: CAPPluginCall) {
         let flashMode = implementation.getFlashMode()
         
@@ -327,7 +369,7 @@ public class CameraViewPlugin: CAPPlugin, CAPBridgedPlugin, CameraEventDelegate
     
     @objc func getSupportedFlashModes(_ call: CAPPluginCall) {
         let supportedFlashModes = implementation.getSupportedFlashModes()
-        let supportedFlashModeStrArr = supportedFlashModes.map { flashModeToStrMap[$0] }
+        let supportedFlashModeStrArr = supportedFlashModes.compactMap { flashModeToStrMap[$0] }
         
         call.resolve([
             "flashModes": supportedFlashModeStrArr
@@ -336,20 +378,20 @@ public class CameraViewPlugin: CAPPlugin, CAPBridgedPlugin, CameraEventDelegate
     
     @objc func setFlashMode(_ call: CAPPluginCall) {
         guard let mode = call.getString("mode") else {
-            call.reject("Flash mode must be provided")
+            call.reject("Flash mode must be provided", CameraError.invalidArgument.code)
             return
         }
-        
+
         guard let flashMode = strToFlashModeMap[mode] else {
-            call.reject("Invalid flash mode")
+            call.reject("Invalid flash mode", CameraError.invalidArgument.code)
             return
         }
-        
+
         do {
             try implementation.setFlashMode(flashMode)
             call.resolve()
         } catch {
-            call.reject("Failed to set flash mode", nil, error)
+            call.reject("Failed to set flash mode", error.cameraErrorCode, error)
         }
     }
     
@@ -370,22 +412,22 @@ public class CameraViewPlugin: CAPPlugin, CAPBridgedPlugin, CameraEventDelegate
     
     @objc func setTorchMode(_ call: CAPPluginCall) {
         guard let enabled = call.getBool("enabled") else {
-            call.reject("Enabled parameter is required")
+            call.reject("Enabled parameter is required", CameraError.invalidArgument.code)
             return
         }
-        
+
         let level = call.getFloat("level") ?? 1.0
-        
+
         guard level >= 0.0 && level <= 1.0 else {
-            call.reject("Level must be between 0.0 and 1.0")
+            call.reject("Level must be between 0.0 and 1.0", CameraError.invalidArgument.code)
             return
         }
-        
+
         do {
             try implementation.setTorchMode(enabled: enabled, level: level)
             call.resolve()
         } catch {
-            call.reject("Failed to set torch mode", nil, error)
+            call.reject("Failed to set torch mode", error.cameraErrorCode, error)
         }
     }
     

package/ios/Sources/CameraViewPlugin/Utils.swift

@@ -1,4 +1,11 @@
 import AVFoundation
+import ImageIO
+import os
+import UniformTypeIdentifiers
+
+/// Shared logger for camera plugin diagnostics (visible in Console.app / `log stream`),
+/// used instead of `print()` so failures are visible in production logs.
+internal let cameraViewLogger = Logger(subsystem: "com.michaelwolz.capacitorcameraview", category: "CameraViewManager")
 
 // MARK: - Camera Type Conversion
 
@@ -57,25 +64,66 @@ public func convertToNativeCameraTypes(_ stringTypes: [String]) -> [AVCaptureDev
     return stringTypes.compactMap { convertToNativeCameraType($0) }
 }
 
-/// Creates a temporary file URL for storing captured images
-/// @deprecated Use TempFileManager.shared.createTempImageFile() for automatic cleanup
-public func createTempImageFile() throws -> URL {
-    let timestamp = Int(Date().timeIntervalSince1970 * 1000)
-    let fileName = "camera_capture_\(timestamp).jpg"
-    let tempDir = FileManager.default.temporaryDirectory
-    return tempDir.appendingPathComponent(fileName)
+// MARK: - Image Re-encoding
+
+/// Re-encodes JPEG data at a lower compression quality while preserving the
+/// original image metadata (EXIF, TIFF, GPS, orientation, etc.).
+///
+/// Uses ImageIO directly instead of round-tripping through `UIImage`/
+/// `UIImage.jpegData(compressionQuality:)`, which silently drops all metadata
+/// from the source JPEG.
+///
+/// - Parameters:
+///   - data: The source JPEG data.
+///   - compressionQuality: The lossy compression quality (0.0-1.0).
+/// - Returns: The re-encoded JPEG data, or nil if the source data or
+///   destination could not be created.
+public func reencodeJPEG(data: Data, compressionQuality: CGFloat) -> Data? {
+    guard let source = CGImageSourceCreateWithData(data as CFData, nil) else {
+        return nil
+    }
+
+    let destinationData = NSMutableData()
+    guard let destination = CGImageDestinationCreateWithData(
+        destinationData,
+        UTType.jpeg.identifier as CFString,
+        1,
+        nil
+    ) else {
+        return nil
+    }
+
+    // Start from the source image's own metadata so EXIF/GPS/orientation
+    // survive the re-encode, then layer the compression quality on top.
+    var properties = (CGImageSourceCopyPropertiesAtIndex(source, 0, nil) as? [CFString: Any]) ?? [:]
+    properties[kCGImageDestinationLossyCompressionQuality] = compressionQuality
+
+    CGImageDestinationAddImageFromSource(destination, source, 0, properties as CFDictionary)
+
+    guard CGImageDestinationFinalize(destination) else {
+        return nil
+    }
+
+    return destinationData as Data
 }
 
 // MARK: - Barcode Type Conversion
 
 /// All supported barcode types for detection.
 /// These are enabled by default when no specific types are configured.
+///
+/// Note: there is no UPC-A entry. AVFoundation has no UPC-A metadata object
+/// type and reports UPC-A codes as `.ean13` (a UPC-A value is an EAN-13 with a
+/// leading `0`), so on iOS the `upcA` union member is neither requestable nor
+/// emitted — such codes arrive as `ean13`. `.codabar` is available since iOS
+/// 15.4; the deployment target is 16, so no availability guard is needed.
 public let ALL_SUPPORTED_BARCODE_TYPES: [AVMetadataObject.ObjectType] = [
     .qr,
     .code128,
     .code39,
     .code39Mod43,
     .code93,
+    .codabar,
     .ean8,
     .ean13,
     .interleaved2of5,
@@ -101,6 +149,10 @@ public func convertToNativeBarcodeType(_ stringType: String) -> AVMetadataObject
         return .code39Mod43
     case "code93":
         return .code93
+    case "codabar":
+        return .codabar
+    // Note: "upcA" is intentionally unmapped. AVFoundation has no UPC-A metadata
+    // type and reports UPC-A codes as .ean13, so it cannot be requested on iOS.
     case "ean8":
         return .ean8
     case "ean13":
@@ -137,6 +189,8 @@ public func convertToStringBarcodeType(_ barcodeType: AVMetadataObject.ObjectTyp
         return "code39Mod43"
     case .code93:
         return "code93"
+    case .codabar:
+        return "codabar"
     case .ean8:
         return "ean8"
     case .ean13:

package/package.json

@@ -1,11 +1,20 @@
 {
   "name": "capacitor-camera-view",
-  "version": "2.3.1",
+  "version": "3.0.0",
   "description": "A Capacitor plugin for embedding a live camera feed directly into your app.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
   "unpkg": "dist/plugin.js",
+  "exports": {
+    ".": {
+      "types": "./dist/esm/index.d.ts",
+      "import": "./dist/esm/index.js",
+      "require": "./dist/plugin.cjs.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "sideEffects": false,
   "files": [
     "android/src/main/",
     "android/build.gradle",
@@ -29,23 +38,29 @@
     "plugin",
     "native"
   ],
+  "packageManager": "pnpm@11.18.0",
+  "engines": {
+    "node": ">=24",
+    "pnpm": ">=11"
+  },
   "scripts": {
-    "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
+    "verify": "pnpm run verify:ios && pnpm run verify:android && pnpm run verify:web",
     "verify:ios": "xcodebuild -scheme CapacitorCameraView -destination generic/platform=iOS",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
-    "verify:web": "npm run build",
-    "lint": "npm run eslint",
-    "lint:ios": "npm run swiftlint -- lint",
-    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --fix --format",
+    "verify:web": "pnpm run build",
+    "lint": "pnpm run eslint",
+    "lint:ios": "pnpm run swiftlint lint",
+    "fmt": "pnpm run eslint --fix && pnpm run prettier --write && pnpm run swiftlint --fix --format",
     "eslint": "eslint . --ext ts",
     "prettier": "prettier \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
     "prettier:check": "prettier --check \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
     "swiftlint": "node-swiftlint",
+    "test": "vitest run",
     "docgen": "docgen --api CameraViewPlugin --output-readme README.md --output-json dist/docs.json",
-    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
+    "build": "pnpm run clean && pnpm run docgen && tsc && rollup -c rollup.config.mjs",
     "clean": "rimraf ./dist",
     "watch": "tsc --watch",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "pnpm run build"
   },
   "devDependencies": {
     "@capacitor/android": "^8.3.1",
@@ -76,7 +91,8 @@
     "rollup": "^4.60.2",
     "semantic-release": "^25.0.3",
     "swiftlint": "^2.0.0",
-    "typescript": "^5.9.3"
+    "typescript": "~6.0.3",
+    "vitest": "^4.1.10"
   },
   "peerDependencies": {
     "@capacitor/core": ">=8.0.0"