@scr2em/capacitor-scanner 6.0.7 → 6.0.9

package/README.md

@@ -16,7 +16,7 @@ npx cap sync
 * [`startScanning(...)`](#startscanning)
 * [`stopScanning()`](#stopscanning)
 * [`openSettings()`](#opensettings)
-* [`capturePhoto()`](#capturephoto)
+* [`capturePhoto(...)`](#capturephoto)
 * [`checkPermissions()`](#checkpermissions)
 * [`requestPermissions()`](#requestpermissions)
 * [`flipCamera()`](#flipcamera)
@@ -62,12 +62,16 @@ openSettings() => Promise<void>
 --------------------
 
 
-### capturePhoto()
+### capturePhoto(...)
 
 ```typescript
-capturePhoto() => Promise<CapturePhotoResult>
+capturePhoto(options?: CapturePhotoOptions | undefined) => Promise<CapturePhotoResult>
 ```
 
+| Param         | Type                                                                |
+| ------------- | ------------------------------------------------------------------- |
+| **`options`** | <code><a href="#capturephotooptions">CapturePhotoOptions</a></code> |
+
 **Returns:** <code>Promise&lt;<a href="#capturephotoresult">CapturePhotoResult</a>&gt;</code>
 
 --------------------
@@ -151,6 +155,11 @@ removeAllListeners() => Promise<void>
 <code>{ imageBase64: string }</code>
 
 
+#### CapturePhotoOptions
+
+<code>{ /** * The desired quality of the captured image, expressed as a value between 0.0 (lowest quality, smallest file size) * and 1.0 (highest quality, largest file size). Defaults to 1.0. * This parameter directly influences the compression level of the resulting JPEG image. */ qualityRatio?: number; }</code>
+
+
 #### PermissionsResult
 
 <code>{ camera: 'prompt' | 'denied' | 'granted' }</code>

package/android/src/main/java/com/leadliaion/capacitorscanner/CapacitorScannerPlugin.java

@@ -3,8 +3,13 @@ package com.leadliaion.capacitorscanner;
 import android.Manifest;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Color;
+import android.graphics.Matrix;
+import androidx.exifinterface.media.ExifInterface;
 import android.net.Uri;
+import android.os.Build;
 import android.provider.Settings;
 import android.util.Base64;
 import android.util.DisplayMetrics;
@@ -49,8 +54,10 @@ import com.google.mlkit.vision.barcode.BarcodeScannerOptions;
 import com.google.mlkit.vision.barcode.BarcodeScanning;
 import com.google.mlkit.vision.common.InputImage;
 
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
@@ -390,6 +397,10 @@ public class CapacitorScannerPlugin extends Plugin {
             return;
         }
 
+        Double qualityRatioObj = call.getDouble("qualityRatio", 1.0);
+        double qualityRatio = qualityRatioObj != null ? qualityRatioObj : 1.0;
+
+        // Temporary stream to receive the captured image data.
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
 
         ImageCapture.OutputFileOptions outputOptions =
@@ -400,17 +411,112 @@ public class CapacitorScannerPlugin extends Plugin {
                     @Override
                     public void onImageSaved(@NonNull ImageCapture.OutputFileResults outputFileResults) {
                         try {
-                            byte[] bytes = outputStream.toByteArray();
+                            // Get the original image bytes.
+                            byte[] originalBytes = outputStream.toByteArray();
+                            int originalSize = originalBytes.length; // in bytes
+
+                            BitmapFactory.Options options = new BitmapFactory.Options();
+                            options.inJustDecodeBounds = true;
+                            BitmapFactory.decodeByteArray(originalBytes, 0, originalSize, options);
+
+                            // If qualityRatio is between 0 and 1 exclusively, perform quality reduction.
+                            if (qualityRatio > 0 && qualityRatio < 1) {
+                                // Calculate the target size in bytes.
+                                int targetSize = (int) (originalSize * qualityRatio);
+
+                                // Read EXIF orientation data from original image
+                                int orientation = ExifInterface.ORIENTATION_UNDEFINED;
+
+                                try {
+                                    InputStream inputStream = new ByteArrayInputStream(originalBytes);
+                                    ExifInterface exif = null;
+                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                                        exif = new ExifInterface(inputStream);
+                                        orientation = exif.getAttributeInt(
+                                                ExifInterface.TAG_ORIENTATION,
+                                                ExifInterface.ORIENTATION_UNDEFINED);
+                                    }
+                                    inputStream.close();
+                                } catch (IOException e) {
+                                    echo("Warning: Could not read EXIF orientation: " + e.getMessage());
+                                }
+
+
+                                // Decode the captured image into a Bitmap.
+                                options.inJustDecodeBounds = false;
+                                options.inSampleSize = calculateInSampleSize(options, 1024, 1024); // Max size of 1024x1024
+                                Bitmap originalBitmap = BitmapFactory.decodeByteArray(originalBytes, 0, originalSize, options);
+                                if (originalBitmap == null) {
+                                    call.reject("Failed to decode captured image.");
+                                    return;
+                                }
+
+                                // Apply rotation based on EXIF orientation
+                                Matrix matrix = new Matrix();
+                                switch (orientation) {
+                                    case ExifInterface.ORIENTATION_ROTATE_90:
+                                        matrix.postRotate(90);
+                                        break;
+                                    case ExifInterface.ORIENTATION_ROTATE_180:
+                                        matrix.postRotate(180);
+                                        break;
+                                    case ExifInterface.ORIENTATION_ROTATE_270:
+                                        matrix.postRotate(270);
+                                        break;
+                                    case ExifInterface.ORIENTATION_FLIP_HORIZONTAL:
+                                        matrix.postScale(-1, 1);
+                                        break;
+                                    case ExifInterface.ORIENTATION_FLIP_VERTICAL:
+                                        matrix.postScale(1, -1);
+                                        break;
+                                }
+
+                                // Apply the rotation if needed
+                                if (!matrix.isIdentity()) {
+                                    Bitmap rotatedBitmap = Bitmap.createBitmap(
+                                            originalBitmap, 0, 0,
+                                            originalBitmap.getWidth(), originalBitmap.getHeight(),
+                                            matrix, true);
+                                    originalBitmap.recycle();  // Recycle the old bitmap to free memory.
+                                    originalBitmap = rotatedBitmap;
+                                }
+
+                                // Prepare a stream to hold the compressed bitmap.
+                                ByteArrayOutputStream compressedStream = new ByteArrayOutputStream();
+                                int quality = 100;  // Start with maximum quality (100)
+
+                                // Iteratively compress the bitmap until it reaches the target file size or quality drops to 10%.
+                                int maxIterations = 10;  // Limit iterations to prevent excessive looping.
+                                int iterations = 0;
+                                do {
+                                    compressedStream.reset();
+                                    originalBitmap.compress(Bitmap.CompressFormat.JPEG, quality, compressedStream);
+                                    quality -= 5; // Reduce quality step by step.
+                                    iterations++;
+                                } while (compressedStream.toByteArray().length > targetSize && quality > 10 && iterations < maxIterations);
+
+                                // Use the compressed image bytes.
+                                originalBytes = compressedStream.toByteArray();
+
+                                Bitmap finalBitmap = BitmapFactory.decodeByteArray(originalBytes, 0, originalBytes.length);
+                                if (finalBitmap != null) {
+                                    finalBitmap.recycle();
+                                }
 
-                            String base64 = Base64.encodeToString(bytes, Base64.NO_WRAP);
+                                // Cleanup: recycle the bitmap and close the compressed stream.
+                                originalBitmap.recycle();
+                                compressedStream.close();
+                            }
 
+                            // Convert the final image bytes to a Base64 string.
+                            String base64 = Base64.encodeToString(originalBytes, Base64.NO_WRAP);
                             JSObject ret = new JSObject();
                             ret.put("imageBase64", "data:image/jpeg;base64," + base64);
-
                             call.resolve(ret);
                         } catch (Exception e) {
                             call.reject("Failed to process image: " + e.getMessage());
                         } finally {
+                            // Ensure resources are cleaned up.
                             try {
                                 outputStream.close();
                             } catch (IOException e) {
@@ -426,12 +532,32 @@ public class CapacitorScannerPlugin extends Plugin {
                         try {
                             outputStream.close();
                         } catch (IOException e) {
-                           echo("Failed to close output stream: " + e.getMessage());
+                            echo("Failed to close output stream: " + e.getMessage());
                         }
                     }
                 });
     }
 
+    private int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
+        // Calculate the largest inSampleSize that is a power of 2 and keeps the image smaller than the requested width/height.
+        final int height = options.outHeight;
+        final int width = options.outWidth;
+        int inSampleSize = 1;
+
+        if (height > reqHeight || width > reqWidth) {
+            final int halfHeight = height / 2;
+            final int halfWidth = width / 2;
+
+            // Calculate the largest inSampleSize value that is a power of 2 and keeps the image smaller than the requested width/height.
+            while ((halfHeight / inSampleSize) > reqHeight && (halfWidth / inSampleSize) > reqWidth) {
+                inSampleSize *= 2;
+            }
+        }
+        return inSampleSize;
+    }
+
+
+
 
     @PluginMethod
     public void checkPermissions(PluginCall call) {

package/dist/docs.json

@@ -45,13 +45,20 @@
       },
       {
         "name": "capturePhoto",
-        "signature": "() => Promise<CapturePhotoResult>",
-        "parameters": [],
+        "signature": "(options?: CapturePhotoOptions | undefined) => Promise<CapturePhotoResult>",
+        "parameters": [
+          {
+            "name": "options",
+            "docs": "",
+            "type": "CapturePhotoOptions | undefined"
+          }
+        ],
         "returns": "Promise<CapturePhotoResult>",
         "tags": [],
         "docs": "",
         "complexTypes": [
-          "CapturePhotoResult"
+          "CapturePhotoResult",
+          "CapturePhotoOptions"
         ],
         "slug": "capturephoto"
       },
@@ -237,6 +244,17 @@
         }
       ]
     },
+    {
+      "name": "CapturePhotoOptions",
+      "slug": "capturephotooptions",
+      "docs": "",
+      "types": [
+        {
+          "text": "{\n  /**\n   * The desired quality of the captured image, expressed as a value between 0.0 (lowest quality, smallest file size)\n   * and 1.0 (highest quality, largest file size). Defaults to 1.0.\n   * This parameter directly influences the compression level of the resulting JPEG image.\n   */\n  qualityRatio?: number;\n}",
+          "complexTypes": []
+        }
+      ]
+    },
     {
       "name": "PermissionsResult",
       "slug": "permissionsresult",

package/dist/esm/definitions.d.ts

@@ -2,7 +2,7 @@ export interface CapacitorScannerPlugin {
     startScanning(options?: ScannerOptions): Promise<void>;
     stopScanning(): Promise<void>;
     openSettings(): Promise<void>;
-    capturePhoto(): Promise<CapturePhotoResult>;
+    capturePhoto(options?: CapturePhotoOptions): Promise<CapturePhotoResult>;
     checkPermissions(): Promise<PermissionsResult>;
     requestPermissions(): Promise<PermissionsResult>;
     flipCamera(): Promise<void>;
@@ -19,6 +19,14 @@ export declare type BarcodeScannedEvent = {
     scannedCode: string;
     format: string;
 };
+export declare type CapturePhotoOptions = {
+    /**
+     * The desired quality of the captured image, expressed as a value between 0.0 (lowest quality, smallest file size)
+     * and 1.0 (highest quality, largest file size). Defaults to 1.0.
+     * This parameter directly influences the compression level of the resulting JPEG image.
+     */
+    qualityRatio?: number;
+};
 export declare type PermissionsResult = {
     camera: 'prompt' | 'denied' | 'granted';
 };

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"AA2BA,MAAM,CAAN,IAAY,aAYX;AAZD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,mCAAkB,CAAA;IAClB,mCAAkB,CAAA;IAClB,qCAAoB,CAAA;IACpB,2CAA0B,CAAA;IAC1B,+BAAc,CAAA;IACd,iCAAgB,CAAA;IAChB,gCAAe,CAAA;IACf,mCAAkB,CAAA;IAClB,mCAAkB,CAAA;IAClB,+BAAc,CAAA;AAChB,CAAC,EAZW,aAAa,KAAb,aAAa,QAYxB","sourcesContent":["export interface CapacitorScannerPlugin {\n  startScanning(options?: ScannerOptions): Promise<void>;\n  stopScanning(): Promise<void>;\n  openSettings(): Promise<void>;\n  capturePhoto(): Promise<CapturePhotoResult>;\n  checkPermissions(): Promise<PermissionsResult>;\n  requestPermissions(): Promise<PermissionsResult>;\n  flipCamera(): Promise<void>;\n  toggleFlash(): Promise<FlashResult>;\n  addListener(event: 'barcodeScanned', listenerFunc: (result: BarcodeScannedEvent) => void): Promise<void>;\n  removeAllListeners(): Promise<void>;\n}\n\nexport type ScannerOptions = {\n  formats?: BarcodeFormat[];\n  cameraDirection?: 'BACK' | 'FRONT';\n  debounceTimeInMilli?: number\n};\n\nexport type BarcodeScannedEvent = { scannedCode: string; format: string };\n\nexport type PermissionsResult = { camera: 'prompt' | 'denied' | 'granted' };\n\nexport type CapturePhotoResult = { imageBase64: string };\n\nexport type FlashResult = { enabled: boolean };\n\nexport enum BarcodeFormat {\n  Aztec = 'AZTEC',\n  Code39 = 'CODE_39',\n  Code93 = 'CODE_93',\n  Code128 = 'CODE_128',\n  DataMatrix = 'DATA_MATRIX',\n  Ean8 = 'EAN_8',\n  Ean13 = 'EAN_13',\n  Itf14 = 'ITF14',\n  Pdf417 = 'PDF_417',\n  QrCode = 'QR_CODE',\n  UpcE = 'UPC_E',\n}\n\ndeclare global {\n  interface PluginRegistry {\n    QRScanner: CapacitorScannerPlugin;\n  }\n}"]}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"AAoCA,MAAM,CAAN,IAAY,aAYX;AAZD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,mCAAkB,CAAA;IAClB,mCAAkB,CAAA;IAClB,qCAAoB,CAAA;IACpB,2CAA0B,CAAA;IAC1B,+BAAc,CAAA;IACd,iCAAgB,CAAA;IAChB,gCAAe,CAAA;IACf,mCAAkB,CAAA;IAClB,mCAAkB,CAAA;IAClB,+BAAc,CAAA;AAChB,CAAC,EAZW,aAAa,KAAb,aAAa,QAYxB","sourcesContent":["export interface CapacitorScannerPlugin {\n  startScanning(options?: ScannerOptions): Promise<void>;\n  stopScanning(): Promise<void>;\n  openSettings(): Promise<void>;\n  capturePhoto(options?: CapturePhotoOptions): Promise<CapturePhotoResult>;\n  checkPermissions(): Promise<PermissionsResult>;\n  requestPermissions(): Promise<PermissionsResult>;\n  flipCamera(): Promise<void>;\n  toggleFlash(): Promise<FlashResult>;\n  addListener(event: 'barcodeScanned', listenerFunc: (result: BarcodeScannedEvent) => void): Promise<void>;\n  removeAllListeners(): Promise<void>;\n}\n\nexport type ScannerOptions = {\n  formats?: BarcodeFormat[];\n  cameraDirection?: 'BACK' | 'FRONT';\n  debounceTimeInMilli?: number\n};\n\nexport type BarcodeScannedEvent = { scannedCode: string; format: string };\n\nexport type CapturePhotoOptions = {\n  /**\n   * The desired quality of the captured image, expressed as a value between 0.0 (lowest quality, smallest file size)\n   * and 1.0 (highest quality, largest file size). Defaults to 1.0.\n   * This parameter directly influences the compression level of the resulting JPEG image.\n   */\n  qualityRatio?: number;\n};\n\nexport type PermissionsResult = { camera: 'prompt' | 'denied' | 'granted' };\n\nexport type CapturePhotoResult = { imageBase64: string };\n\nexport type FlashResult = { enabled: boolean };\n\nexport enum BarcodeFormat {\n  Aztec = 'AZTEC',\n  Code39 = 'CODE_39',\n  Code93 = 'CODE_93',\n  Code128 = 'CODE_128',\n  DataMatrix = 'DATA_MATRIX',\n  Ean8 = 'EAN_8',\n  Ean13 = 'EAN_13',\n  Itf14 = 'ITF14',\n  Pdf417 = 'PDF_417',\n  QrCode = 'QR_CODE',\n  UpcE = 'UPC_E',\n}\n\ndeclare global {\n  interface PluginRegistry {\n    QRScanner: CapacitorScannerPlugin;\n  }\n}"]}

package/ios/Sources/CapacitorScannerPlugin/CapacitorScannerPlugin.swift

@@ -56,7 +56,24 @@ public class CapacitorScannerPlugin: CAPPlugin, CAPBridgedPlugin, AVCaptureMetad
 			return
 		}
 
-		let photoSettings = AVCapturePhotoSettings()
+		// Get quality ratio from options, default to 1.0, clamp between 0.0 and 1.0
+		let quality = call.getFloat("qualityRatio", 1.0)
+		let clampedQuality = max(0.0, min(1.0, quality))
+		let qualityNumber = NSNumber(value: clampedQuality) // Convert to NSNumber
+
+		var photoSettings = AVCapturePhotoSettings() // Initialize with default settings
+
+		// Check if JPEG is supported and apply compression settings if it is
+		if photoOutput.supportedPhotoCodecTypes(for: .jpg).contains(.jpeg) {
+			// Create settings specific for JPEG with quality
+			photoSettings = AVCapturePhotoSettings(format: [AVVideoCodecKey: AVVideoCodecType.jpeg, // Use the type directly
+			                                                AVVideoCompressionPropertiesKey: [AVVideoQualityKey: qualityNumber]])
+			photoSettings.photoQualityPrioritization = .quality // Prioritize quality
+		} else {
+			print("JPEG codec not supported for photo capture. Using default settings.")
+			// photoSettings remains the default initialized one
+		}
+
 		self.capturePhotoCall = call
 		photoOutput.capturePhoto(with: photoSettings, delegate: self)
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scr2em/capacitor-scanner",
-  "version": "6.0.7",
+  "version": "6.0.9",
   "description": "scan codes",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",