@scr2em/capacitor-scanner 6.0.33 → 6.0.34

package/ios/Sources/CapacitorScannerPlugin/CapacitorScannerPlugin.swift

@@ -246,31 +246,24 @@ public class CapacitorScannerPlugin: CAPPlugin, CAPBridgedPlugin, AVCaptureMetad
 			                                                AVVideoCompressionPropertiesKey: [AVVideoQualityKey: qualityNumber]])
 
 			let maxPrioritization = photoOutput.maxPhotoQualityPrioritization
-			// Compare the raw values to determine which prioritization to use
-			if maxPrioritization.rawValue >= AVCapturePhotoOutput.QualityPrioritization.balanced.rawValue {
-				// Device supports .balanced prioritization
+			if maxPrioritization.rawValue >= AVCapturePhotoOutput.QualityPrioritization.quality.rawValue {
+				photoSettings.photoQualityPrioritization = .quality
+			} else if maxPrioritization.rawValue >= AVCapturePhotoOutput.QualityPrioritization.balanced.rawValue {
 				photoSettings.photoQualityPrioritization = .balanced
 			} else {
-				// Use the lowest prioritization (.speed)
 				photoSettings.photoQualityPrioritization = .speed
 			}
 
+			// Enable high-resolution capture for sharper photos
+			photoSettings.isHighResolutionPhotoEnabled = true
+
 		} else {
 			print("JPEG codec not supported for photo capture. Using default settings.")
 			// photoSettings remains the default initialized one
 		}
 
 		self.capturePhotoCall = call
-
-		// If business card detection is enabled, wait for 1 second before capturing
-		if self.enabledDetectionTypes.contains("businessCard") {
-			DispatchQueue.main.asyncAfter(deadline: .now() + 0.6) {
-				photoOutput.capturePhoto(with: photoSettings, delegate: self)
-			}
-		} else {
-			// Otherwise capture immediately
-			photoOutput.capturePhoto(with: photoSettings, delegate: self)
-		}
+		photoOutput.capturePhoto(with: photoSettings, delegate: self)
 	}
 
 	public func photoOutput(_ output: AVCapturePhotoOutput, didFinishProcessingPhoto photo: AVCapturePhoto, error: Error?) {
@@ -297,37 +290,22 @@ public class CapacitorScannerPlugin: CAPPlugin, CAPBridgedPlugin, AVCaptureMetad
 		if self.enabledDetectionTypes.contains("businessCard"),
 		   isRectangleCurrentlyDetected,
 		   let detectedRect = self.rectangleDetector?.lastDetectedRectangle {
-			// If we have a snapshot from the detection, use it directly
-			if let snapshot = detectedRect.snapshot {
-				if let croppedImage = self.cropImage(snapshot, toRectangle: detectedRect.observation) {
-					guard let croppedImageData = croppedImage.jpegData(compressionQuality: 0.9) else {
-						self.capturePhotoCall?.reject("Unable to convert cropped image to data")
-						return
-					}
-					let base64String = croppedImageData.base64EncodedString()
-					self.capturePhotoCall?.resolve(["imageBase64": "data:image/jpeg;base64, \(base64String)"])
-				} else {
-					let base64String = imageData.base64EncodedString()
-					self.capturePhotoCall?.resolve(["imageBase64": "data:image/jpeg;base64, \(base64String)"])
-				}
-			} else {
-				// Use the captured photo if no snapshot available
-				guard let image = UIImage(data: imageData) else {
-					self.capturePhotoCall?.reject("Unable to create image from data")
-					return
-				}
+			// Always use the high-resolution captured photo for cropping (not the video frame snapshot)
+			guard let image = UIImage(data: imageData) else {
+				self.capturePhotoCall?.reject("Unable to create image from data")
+				return
+			}
 
-				if let croppedImage = self.cropImage(image, toRectangle: detectedRect.observation) {
-					guard let croppedImageData = croppedImage.jpegData(compressionQuality: 0.9) else {
-						self.capturePhotoCall?.reject("Unable to convert cropped image to data")
-						return
-					}
-					let base64String = croppedImageData.base64EncodedString()
-					self.capturePhotoCall?.resolve(["imageBase64": "data:image/jpeg;base64, \(base64String)"])
-				} else {
-					let base64String = imageData.base64EncodedString()
-					self.capturePhotoCall?.resolve(["imageBase64": "data:image/jpeg;base64, \(base64String)"])
+			if let croppedImage = self.cropImage(image, toRectangle: detectedRect) {
+				guard let croppedImageData = croppedImage.jpegData(compressionQuality: 0.9) else {
+					self.capturePhotoCall?.reject("Unable to convert cropped image to data")
+					return
 				}
+				let base64String = croppedImageData.base64EncodedString()
+				self.capturePhotoCall?.resolve(["imageBase64": "data:image/jpeg;base64, \(base64String)"])
+			} else {
+				let base64String = imageData.base64EncodedString()
+				self.capturePhotoCall?.resolve(["imageBase64": "data:image/jpeg;base64, \(base64String)"])
 			}
 		} else {
 			// No rectangle detected, return original image
@@ -540,6 +518,8 @@ public class CapacitorScannerPlugin: CAPPlugin, CAPBridgedPlugin, AVCaptureMetad
 			self.photoOutput = photoOutput
 			if captureSession.canAddOutput(photoOutput) {
 				captureSession.addOutput(photoOutput)
+				photoOutput.maxPhotoQualityPrioritization = .quality
+				photoOutput.isHighResolutionCaptureEnabled = true
 			} else {
 				call.reject("Unable to add photo output to capture session")
 				return
@@ -1066,7 +1046,6 @@ extension CapacitorScannerPlugin: AVCaptureVideoDataOutputSampleBufferDelegate {
 		if !isThrottled,
 		   self.enabledDetectionTypes.contains("businessCard"),
 		   let detector = self.rectangleDetector {
-			detector.updatePixelBuffer(pixelBuffer)
 			requests.append(detector.visionRequest)
 		}
 

package/ios/Sources/CapacitorScannerPlugin/RectangleDetector.swift

@@ -18,14 +18,6 @@ struct RectangleCorners {
 /// Handles rectangle/business card detection using Vision framework
 class RectangleDetector {
 
-    // MARK: - Types
-
-    /// Stores detected rectangle with optional snapshot for cropping
-    struct DetectedRectangle {
-        let observation: VNRectangleObservation
-        let snapshot: UIImage?
-    }
-
     // MARK: - Configuration
 
     private let confidenceThreshold: Float = 0.8
@@ -38,10 +30,8 @@ class RectangleDetector {
 
     // MARK: - State
 
-    private(set) var lastDetectedRectangle: DetectedRectangle?
+    private(set) var lastDetectedRectangle: VNRectangleObservation?
     private(set) var lastDetectionTime: Date?
-    private var currentPixelBuffer: CVPixelBuffer?
-    private let ciContext = CIContext(options: nil)
 
     // Stability tracking
     private var previousCorners: RectangleCorners?
@@ -100,11 +90,6 @@ class RectangleDetector {
         emitIntervalSeconds = max(0, seconds)
     }
 
-    /// Update the current pixel buffer for snapshot capture
-    func updatePixelBuffer(_ pixelBuffer: CVPixelBuffer) {
-        self.currentPixelBuffer = pixelBuffer
-    }
-
     /// Check for detection timeout and update overlay
     func checkTimeout() {
         smoother?.checkTimeout()
@@ -120,7 +105,6 @@ class RectangleDetector {
     func reset() {
         lastDetectedRectangle = nil
         lastDetectionTime = nil
-        currentPixelBuffer = nil
         previousCorners = nil
         stabilityStartTime = nil
         lastEmitTime = nil
@@ -157,8 +141,8 @@ class RectangleDetector {
             return
         }
 
-        // Store rectangle with snapshot for cropping
-        captureSnapshot(for: bestCandidate)
+        // Store rectangle observation for cropping
+        lastDetectedRectangle = bestCandidate
 
         // Update detection time
         lastDetectionTime = Date()
@@ -287,34 +271,4 @@ class RectangleDetector {
         }
     }
 
-    private func captureSnapshot(for observation: VNRectangleObservation) {
-        guard let pixelBuffer = currentPixelBuffer else {
-            lastDetectedRectangle = DetectedRectangle(observation: observation, snapshot: nil)
-            return
-        }
-
-        let ciImage = CIImage(cvPixelBuffer: pixelBuffer)
-
-        guard let cgImage = ciContext.createCGImage(ciImage, from: ciImage.extent) else {
-            lastDetectedRectangle = DetectedRectangle(observation: observation, snapshot: nil)
-            return
-        }
-
-        // Create UIImage with correct orientation
-        let deviceOrientation = UIDevice.current.orientation
-        let uiOrientation: UIImage.Orientation
-        switch deviceOrientation {
-        case .landscapeLeft:
-            uiOrientation = .right
-        case .landscapeRight:
-            uiOrientation = .left
-        case .portraitUpsideDown:
-            uiOrientation = .down
-        default:
-            uiOrientation = .up
-        }
-
-        let snapshot = UIImage(cgImage: cgImage, scale: 1.0, orientation: uiOrientation)
-        lastDetectedRectangle = DetectedRectangle(observation: observation, snapshot: snapshot)
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scr2em/capacitor-scanner",
-  "version": "6.0.33",
+  "version": "6.0.34",
   "description": "scan codes",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -29,23 +29,6 @@
     "plugin",
     "native"
   ],
-  "scripts": {
-    "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
-    "verify:ios": "xcodebuild -scheme CapacitorScanner -destination generic/platform=iOS",
-    "verify:android": "cd android && ./gradlew clean build test && cd ..",
-    "verify:web": "npm run build",
-    "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
-    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --fix --format",
-    "eslint": "eslint . --ext ts",
-    "prettier": "prettier \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
-    "swiftlint": "node-swiftlint",
-    "docgen": "docgen --api CapacitorScannerPlugin --output-readme README.md --output-json dist/docs.json",
-    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
-    "clean": "rimraf ./dist",
-    "watch": "tsc --watch",
-    "prepublishOnly": "npm run build",
-    "prepare": "npm run build"
-  },
   "devDependencies": {
     "@capacitor/android": "6.0.0",
     "@capacitor/cli": "6.0.0",
@@ -78,5 +61,20 @@
     "android": {
       "src": "android"
     }
+  },
+  "scripts": {
+    "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
+    "verify:ios": "xcodebuild -scheme CapacitorScanner -destination generic/platform=iOS",
+    "verify:android": "cd android && ./gradlew clean build test && cd ..",
+    "verify:web": "npm run build",
+    "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
+    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --fix --format",
+    "eslint": "eslint . --ext ts",
+    "prettier": "prettier \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
+    "swiftlint": "node-swiftlint",
+    "docgen": "docgen --api CapacitorScannerPlugin --output-readme README.md --output-json dist/docs.json",
+    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
+    "clean": "rimraf ./dist",
+    "watch": "tsc --watch"
   }
 }