aspose.barcode 24.4.0 → 24.5.1

package/lib/AsposeBarcode.js

@@ -4,7 +4,7 @@ const joint_ = require('./Joint');
 const complexbarcode_ = require("./ComplexBarcode");
 const generation_ = require("./Generation");
 const recognition_ = require("./Recognition");
-const jar_name_ = "/aspose-barcode-nodejs-24.4.jar";
+const jar_name_ = "/aspose-barcode-nodejs-24.5.jar";
 const jar_path_ = __dirname + jar_name_;
 const fs = require("fs");
 

package/lib/Generation.js

@@ -859,7 +859,7 @@ class BaseGenerationParameters extends joint.BaseJavaClass
      */
     setAutoSizeMode(value)
     {
-        this.getJavaClass().setAutoSizeModeSync(value + "");
+        this.getJavaClass().setAutoSizeModeSync(value);
     }
 
 

package/lib/Joint.js

@@ -1,5 +1,7 @@
 const java = require('java');
 const fs = require("fs");
+const URL = require('url');
+const https = require('https');
 
 
 function isPath(image)
@@ -15,19 +17,93 @@ function isPath(image)
     return false;
 }
 
-function convertResourceToBase64String(resource)
+
+function isValidURL(str) {
+    try {
+        new URL(str);
+        return true;
+    } catch (err) {
+        return false;
+    }
+}
+
+function isBase64(str)
 {
-    let is_path_to_image = false;
-    is_path_to_image = fs.existsSync(resource);
+    try
+    {
+        return (Buffer.from(str, 'base64').toString('base64')) === str;
+    }
+    catch (err)
+    {
+        return false;
+    }
+}
 
-    if (is_path_to_image)
+function convertImageResourceToBase64(imageResource)
+{
+    if(imageResource === null)
+    {
+        return null;
+    }
+    else if ((typeof imageResource === 'string') && (isBase64(imageResource)))
+    {
+        return imageResource;
+    }
+    else if (fs.existsSync(imageResource))
     {
-        return fs.readFileSync(resource).toString('base64');
+        return fs.readFileSync(imageResource).toString('base64');
+    }
+    throw new BarcodeException("Image is not available or this resouce is not supported!");
+}
+
+function convertDecodeTypeToFormattedDecodeType(decodeTypes)
+{
+    if (decodeTypes === undefined || decodeTypes == null)
+    {
+        return [DecodeType.ALL_SUPPORTED_TYPES];
+    }
+    else
+    {
+        if(!Array.isArray(decodeTypes))
+            decodeTypes = [decodeTypes];
+
+        for (let i = 0; i < decodeTypes.length; i++)
+        {
+            if(!Number.isInteger(decodeTypes[i]))
+                throw new Error("Unsuported decodeType format");
+        }
+        return decodeTypes;
+    }
+}
+
+function convertAreasToStringFormattedAreas(areas)  // TODO move to Joint
+{
+    let stringFormattedAreas = null;
+    if (areas != null)
+    {
+        stringFormattedAreas = [];
+        if(Array.isArray(areas))
+        {
+            if(!areas.every(area => area === null))
+            {
+                for(let i = 0; i < areas.length; i++)
+    {
+                    let area = areas[i];
+                    if (area === null || !(area instanceof Rectangle))
+                        throw new BarcodeException('All elements of areas should be instances of Rectangle class');
+                    stringFormattedAreas.push(area.toString());
+                }
+            }
     }
     else
     {
-        return resource;
+            if (!(areas instanceof Rectangle))
+                throw new BarcodeException('All elements of areas should be instances of Rectangle class');
+            stringFormattedAreas.push(areas.toString());
+        }
+        stringFormattedAreas = stringFormattedAreas.length > 0 ? stringFormattedAreas : null
     }
+    return stringFormattedAreas;
 }
 
 class BaseJavaClass
@@ -484,5 +560,6 @@ class BuildVersionInfo
 }
 
 module.exports = {
-    BaseJavaClass, BarcodeException, Rectangle, Point, License, BuildVersionInfo, isPath, convertResourceToBase64String
+    BaseJavaClass, BarcodeException, Rectangle, Point, License, BuildVersionInfo, isPath, convertImageResourceToBase64,
+    convertDecodeTypeToFormattedDecodeType, convertAreasToStringFormattedAreas
 };

package/lib/Recognition.js

@@ -31,55 +31,21 @@ class BarCodeReader extends joint.BaseJavaClass
      * @param rectangles array of object by type Rectangle
      * @param decodeTypes the array of objects by DecodeType
      */
-    constructor(image, rectangles, decodeTypes)
+    constructor(image, areas, decodeTypes)
     {
-        if (image != null)
-        {
-            if (joint.isPath(image))
-            {
-                image = joint.convertResourceToBase64String(image);
-            }
-        }
-        if (rectangles != null)
-        {
-            if (!Array.isArray(rectangles))
-            {
-                rectangles = [rectangles];
-            }
-            for (let i = 0; i < rectangles.length; i++)
-            {
-                if(!(rectangles[i] instanceof Rectangle))
-                    throw new Error("Invalid arguments");
-                rectangles[i] = rectangles[i].toString();
-            }
-        }
-        if (decodeTypes === undefined || decodeTypes == null)
-        {
-            decodeTypes = DecodeType.ALL_SUPPORTED_TYPES
-        }
-        if (!Array.isArray(decodeTypes))
-        {
-            decodeTypes = [decodeTypes];
-        }
-        for (let i = 0; i < decodeTypes.length; i++)
-        {
-            decodeTypes[i] = decodeTypes[i] + "";
-        }
         try
         {
+            let stringFormattedAreas = joint.convertAreasToStringFormattedAreas(areas);
+            let decodeTypesArray = joint.convertDecodeTypeToFormattedDecodeType(decodeTypes);
+
+            let base64Image = joint.convertImageResourceToBase64(image);
+
             let java_class_link = new java.import(BarCodeReader.javaClassName);
-            let java_class = null;
-            if (image == null && rectangles == null && image == null)
-            {
-                java_class = new java_class_link();
-            }
-            else
-            {
-                java_class = new java_class_link(image, rectangles, decodeTypes);
-            }
+            let java_class = new java_class_link(base64Image, stringFormattedAreas, decodeTypesArray);
             super(java_class);
             this.init()
-        } catch (e)
+        }
+        catch (e)
         {
             console.error("Invalid arguments");
             throw e;
@@ -142,7 +108,7 @@ class BarCodeReader extends joint.BaseJavaClass
     init()
     {
         this.qualitySettings = new QualitySettings(this.getJavaClass().getQualitySettingsSync());
-        this.barcodeSettings = BarcodeSettings.construct(this.getJavaClass().getBarcodeSettingsSync());
+        this.barcodeSettings = new BarcodeSettings(this.getJavaClass().getBarcodeSettingsSync());
     }
 
     /**
@@ -359,38 +325,15 @@ class BarCodeReader extends joint.BaseJavaClass
      *    console.log("BarCode Type: " + result.getCodeTypeName());
      *    console.log("BarCode CodeText: " + result.getCodeText());
      * });
-     * @param value The bitmap image for recognition.
+     * @param imageResource The image for recognition.
      * @param areas areas list for recognition
      * @throws BarcodeException
      */
-    setBarCodeImage(image, ...areas)
+    setBarCodeImage(imageResource, ...areas)
     {
-        image = joint.convertResourceToBase64String(image);
-        let stringAreas = [];
-        let isAllRectanglesNotNull = false;
-        if (!(areas == null) && areas.length > 0)
-        {
-            for (let i = 0; i < areas.length; i++)
-            {
-                if (!(areas[i] == null))
-                {
-                    isAllRectanglesNotNull |= true;
-                    stringAreas[i] = areas[i].toString();
-                }
-            }
-            if (!isAllRectanglesNotNull)
-            {
-                stringAreas = [];
-            }
-        }
-        if (stringAreas.length == 0)
-        {
-            this.getJavaClass().setBarCodeImageSync(image);
-        }
-        else
-        {
-            this.getJavaClass().setBarCodeImageSync(image, stringAreas);
-        }
+        let base64Image = joint.convertImageResourceToBase64(imageResource);
+        let stringFormattedAreas = joint.convertAreasToStringFormattedAreas(areas);
+        this.getJavaClass().setBarCodeImageSync(base64Image, stringFormattedAreas);
     }
 
     /**
@@ -423,7 +366,14 @@ class BarCodeReader extends joint.BaseJavaClass
      */
     getBarCodeDecodeType()
     {
-        return this.getJavaClass().getBarCodeDecodeTypeSync();
+        let barcodeTypesArray = [];
+        let javaDecodeTypes = this.getJavaClass().getBarCodeDecodeTypeSync();
+        for(let i = 0; i < javaDecodeTypes.sizeSync(); i++)
+        {
+            barcodeTypesArray.push(javaDecodeTypes.getSync(i));
+        }
+
+        return barcodeTypesArray;
     }
 
     /**
@@ -1077,7 +1027,7 @@ class Code128ExtendedParameters extends joint.BaseJavaClass
         let code128DataPortions = [];
         for (let i = 0; i < code128DataPortionsValues.length; i++)
         {
-            code128DataPortions[i] = Code128DataPortion.construct(code128DataPortionsValues[i]);
+            code128DataPortions.push(new Code128DataPortion(code128DataPortionsValues[i]));
         }
         return code128DataPortions;
     }
@@ -1592,33 +1542,17 @@ class BarCodeExtendedParameters extends joint.BaseJavaClass
 class QualitySettings extends joint.BaseJavaClass
 {
 
-    static get javaClassName()
+    constructor($javaClass)
     {
-        return "com.aspose.mw.barcode.recognition.MwQualitySettings";
-    }
-
-    constructor(qualitySettings)
-    {
-        super(QualitySettings.initQualitySettings(qualitySettings));
-        if (qualitySettings instanceof QualitySettings)
-        {
-            this.applyAll(qualitySettings);
-        }
+        super($javaClass);
         this.init();
     }
 
-    static initQualitySettings(qualitySettings)
+    static initQualitySettings()
     {
         let javaClassName = "com.aspose.mw.barcode.recognition.MwQualitySettings";
-        if (qualitySettings instanceof QualitySettings || (qualitySettings === null))
-        {
-            let QualitySettings = java.import(javaClassName);
-            return new QualitySettings();
-        }
-        else
-        {
-            return qualitySettings;
-        }
+        let QualitySettings = java.import(javaClassName);
+        return QualitySettings;
     }
 
     init()
@@ -1633,7 +1567,7 @@ class QualitySettings extends joint.BaseJavaClass
      */
     static getHighPerformance()
     {
-        let JavaQualitySettings = java.import(QualitySettings.javaClassName);
+        let JavaQualitySettings = QualitySettings.initQualitySettings();
         return new QualitySettings(JavaQualitySettings.getHighPerformanceSync());
     }
 
@@ -1647,48 +1581,45 @@ class QualitySettings extends joint.BaseJavaClass
      */
     static getNormalQuality()
     {
-        let JavaQualitySettings = java.import(QualitySettings.javaClassName);
+        let JavaQualitySettings = QualitySettings.initQualitySettings();
         return new QualitySettings(JavaQualitySettings.getNormalQualitySync());
     }
 
     /**
-     * HighQualityDetection recognition quality preset. Same as NormalQuality but with high quality DetectorSettings
+     * HighQuality recognition quality preset. This preset is developed for low quality barcodes.
      *
      * @example
      * let reader = new BarCodeReader("test.png");
-     * reader.setQualitySettings(QualitySettings.getHighQualityDetection());     *
+     * reader.setQualitySettings(QualitySettings.getHighQuality());
      */
-    static getHighQualityDetection()
+    static getHighQuality()
     {
-        let JavaQualitySettings = java.import(QualitySettings.javaClassName);
-        return new QualitySettings(JavaQualitySettings.getHighQualityDetectionSync());
+        let JavaQualitySettings = QualitySettings.initQualitySettings();
+        return new QualitySettings(JavaQualitySettings.getHighQualitySync());
     }
 
     /**
-     * MaxQualityDetection recognition quality preset. Same as NormalQuality but with highest quality DetectorSettings.<br>
-     * Allows to detect diagonal and damaged barcodes.
+     * <p>
+     *  MaxQuality recognition quality preset. This preset is developed to recognize all possible barcodes, even incorrect barcodes.
+     *  </p><p><hr><blockquote><pre>
+     *  This sample shows how to use MaxQuality mode
+     *  <pre>
      *
-     * @example
-     * let reader = new BarCodeReader("test.png");
-     * reader.setQualitySettings(QualitySettings.getMaxQualityDetection());
-     */
-    static getMaxQualityDetection()
-    {
-        let JavaQualitySettings = java.import(QualitySettings.javaClassName);
-        return new QualitySettings(JavaQualitySettings.getMaxQualityDetectionSync());
-    }
-
-    /**
-     * HighQuality recognition quality preset. This preset is developed for low quality barcodes.
+     *  $reader = new BarCodeReader("test.png"null, null, DecodeType::CODE_39_EXTENDED, DecodeType::CODE_128);
+     *  {
+     *      $reader->setQualitySettings(QualitySettings::getMaxQuality());
+     *      foreach($reader->readBarCodes() as $result)
+     *          echo ($result->getCodeText());
+     *  }
+     * 	</pre>
+     *  </pre></blockquote></hr></p>Value:
+     *  MaxQuality recognition quality preset.
      *
-     * @example
-     * let reader = new BarCodeReader("test.png");
-     * reader.setQualitySettings(QualitySettings.getHighQuality());
      */
-    static getHighQuality()
+    static getMaxQuality()
     {
-        let JavaQualitySettings = java.import(QualitySettings.javaClassName);
-        return new QualitySettings(JavaQualitySettings.getHighQualitySync());
+        let JavaQualitySettings = QualitySettings.initQualitySettings();
+        return new QualitySettings(JavaQualitySettings.getMaxQualitySync());
     }
 
     /**
@@ -1819,23 +1750,6 @@ class QualitySettings extends joint.BaseJavaClass
     {
         this.getJavaClass().setAllowIncorrectBarcodesSync(value);
     }
-
-    /**
-     * <p>
-     * Function apply all values from Src setting to Dst
-     * </p>
-     * @param Src source settings
-     */
-    applyAll(Src)
-    {
-        this.setXDimension(Src.getXDimension());
-        this.setMinimalXDimension(Src.getMinimalXDimension());
-        this.setBarcodeQuality(Src.getBarcodeQuality());
-        this.setDeconvolution(Src.getDeconvolution());
-        this.setInverseImage(Src.getInverseImage());
-        this.setComplexBackground(Src.getComplexBackground());
-        this.setAllowIncorrectBarcodes(Src.getAllowIncorrectBarcodes());
-    }
 }
 
 /**
@@ -1843,30 +1757,17 @@ class QualitySettings extends joint.BaseJavaClass
  */
 class Code128DataPortion extends joint.BaseJavaClass
 {
-    static get javaClassName()
-    {
-        return "com.aspose.mw.barcode.recognition.MwCode128DataPortion";
-    }
-
     /**
      * Creates a new instance of the {@code Code128DataPortion} class with start code symbol and decoded codetext.
-     *
-     * @param code128SubType A start encoding symbol
-     * @param data A partial codetext
      */
-    constructor(code128SubType, data)
+    constructor(javaclass)
     {
-        let java_link = java.import(Code128DataPortion.javaClassName);
-        let code128DataPortion = new java_link(code128SubType + "", data);
-        super(code128DataPortion);
-        this.init();
+        super(javaclass);
+        this.init()
     }
 
-    static construct(javaClass)
+    init()
     {
-        let code128DataPortion = new Code128DataPortion(0, "");
-        code128DataPortion.setJavaClass(javaClass);
-        return code128DataPortion;
     }
 
     /**
@@ -1879,16 +1780,6 @@ class Code128DataPortion extends joint.BaseJavaClass
         return this.getJavaClass().getDataSync();
     }
 
-    /**
-     * Gets the part of code text related to subtype.
-     *
-     * @return The part of code text related to subtype
-     */
-    setData(value)
-    {
-        this.getJavaClass().setDataSync(value);
-    }
-
     /**
      * Gets the type of Code128 subset
      *
@@ -1899,20 +1790,6 @@ class Code128DataPortion extends joint.BaseJavaClass
         return this.getJavaClass().getCode128SubTypeSync();
     }
 
-    /**
-     * Sets the type of Code128 subset
-     *
-     * @return The type of Code128 subset
-     */
-    setCode128SubType(value)
-    {
-        this.getJavaClass().setCode128SubTypeSync(value);
-    }
-
-    init()
-    {
-    }
-
     /**
      * Returns a human-readable string representation of this {@code Code128DataPortion}.
      * @return A string that represents this {@code Code128DataPortion}.
@@ -1984,37 +1861,18 @@ class DataBarExtendedParameters extends joint.BaseJavaClass
  */
 class AustraliaPostSettings extends joint.BaseJavaClass
 {
-    static get javaClassName()
-    {
-        return "com.aspose.mw.barcode.recognition.MwAustraliaPostSettings";
-    }
-
-    init()
-    {
-    }
 
     /**
      * AustraliaPostSettings constructor
      */
-    constructor(settings)
+    constructor(javaclass)
     {
-        if (settings != null)
-        {
-            super(settings.getJavaClass());
-        }
-        else
-        {
-            let java_link = java.import(AustraliaPostSettings.javaClassName);
-            let australiaPostSettings = new java_link();
-            super(australiaPostSettings);
-        }
+        super(javaclass);
+        this.init()
     }
 
-    static construct(javaClass)
+    init()
     {
-        let australiaPostSettings = new AustraliaPostSettings(null);
-        australiaPostSettings.setJavaClass(javaClass);
-        return australiaPostSettings;
     }
 
     /**
@@ -2091,46 +1949,21 @@ class AustraliaPostSettings extends joint.BaseJavaClass
  */
 class BarcodeSettings extends joint.BaseJavaClass
 {
-
     _australiaPost;
 
-    static get javaClassName()
-    {
-        return "com.aspose.mw.barcode.recognition.MwBarcodeSettings";
-    }
-
-    /**
-     * BarcodeSettings copy constructor
-     * @param settings The source of the data
-     */
-    constructor(settings)
-    {
-        if (settings != null)
-        {
-            super(settings.getJavaClass());
-        }
-        else
-        {
-            let java_link = java.import(BarcodeSettings.javaClassName);
-            let barcodeSettings = new java_link();
-            super(barcodeSettings);
-        }
-    }
-
     /**
      * BarcodeSettings copy constructor
      * @param settings The source of the data
      */
-    static construct(javaClass)
+    constructor(javaclass)
     {
-        let barcodeSettings = new BarcodeSettings(null);
-        barcodeSettings.setJavaClass(javaClass);
-        return barcodeSettings;
+        super(javaclass);
+        this.init()
     }
 
     init()
     {
-        this._australiaPost = AustraliaPostSettings.construct(this.getJavaClass().getAustraliaPostSync());
+        this._australiaPost = new AustraliaPostSettings(this.getJavaClass().getAustraliaPostSync());
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aspose.barcode",
-  "version": "24.4.0",
+  "version": "24.5.1",
   "description": "barcode generation and recognition component",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"