node-hp-scan-to 1.4.0 → 1.4.1

package/dist/test/scanProcessing.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scanProcessing.test.js","sourceRoot":"","sources":["../../test/scanProcessing.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { describe } from \"mocha\";\nimport { expect } from \"chai\";\nimport {\n  getScanWidth,\n  getScanHeight,\n  ScanConfig,\n} from \"../src/scanProcessing\";\nimport { DeviceCapabilities } from \"../src/DeviceCapabilities\";\nimport { InputSource } from \"../src/InputSource\";\n\ndescribe(\"scanProcessing\", () => {\n  let scanConfig: ScanConfig;\n  let deviceCapabilities: DeviceCapabilities;\n\n  beforeEach(async () => {\n    scanConfig = {\n      resolution: 200,\n      width: null,\n      height: null,\n      directoryConfig: {\n        directory: undefined,\n        tempDirectory: undefined,\n        filePattern: undefined,\n      },\n    };\n    deviceCapabilities = {\n      supportsMultiItemScanFromPlaten: false,\n      useWalkupScanToComp: false,\n      platenMaxWidth: null,\n      platenMaxHeight: null,\n      adfMaxWidth: null,\n      adfMaxHeight: null,\n    };\n  });\n\n  describe(\"getScanWidth\", async () => {\n    const inputSource = InputSource.Adf;\n    describe(\"Adf\", async () => {\n      it(\"Does not define a value if nothing provided\", async () => {\n        const width = getScanWidth(scanConfig, inputSource, deviceCapabilities);\n        expect(width).to.be.eq(null);\n      });\n      it(\"Does not define a value if negative provided\", async () => {\n        scanConfig.width = -1;\n        const width = getScanWidth(scanConfig, inputSource, deviceCapabilities);\n        expect(width).to.be.eq(null);\n      });\n      it(\"Define the value if no max available from device\", async () => {\n        scanConfig.width = 2583;\n        const width = getScanWidth(scanConfig, inputSource, deviceCapabilities);\n        expect(width).to.be.eq(2583);\n      });\n    });\n    describe(\"Platen\", async () => {\n      const inputSource = InputSource.Platen;\n      it(\"Does not define a value if nothing provided\", async () => {\n        const width = getScanWidth(scanConfig, inputSource, deviceCapabilities);\n        expect(width).to.be.eq(null);\n      });\n      it(\"Does not define a value if negative provided\", async () => {\n        scanConfig.width = -1;\n        const width = getScanWidth(scanConfig, inputSource, deviceCapabilities);\n        expect(width).to.be.eq(null);\n      });\n      it(\"Define the value if no max available from device\", async () => {\n        scanConfig.width = 2583;\n        const width = getScanWidth(scanConfig, inputSource, deviceCapabilities);\n        expect(width).to.be.eq(2583);\n      });\n    });\n  });\n\n  describe(\"getScanHeight\", async () => {\n    const inputSource = InputSource.Adf;\n    describe(\"Adf\", async () => {\n      it(\"Does not define a value if nothing provided\", async () => {\n        const height = getScanHeight(scanConfig, inputSource, deviceCapabilities);\n        expect(height).to.be.eq(null);\n      });\n      it(\"Does not define a value if negative provided\", async () => {\n        scanConfig.height = -1;\n        const height = getScanHeight(scanConfig, inputSource, deviceCapabilities);\n        expect(height).to.be.eq(null);\n      });\n      it(\"Define the value if no max available from device\", async () => {\n        scanConfig.height = 1269;\n        const width = getScanHeight(scanConfig, inputSource, deviceCapabilities);\n        expect(width).to.be.eq(1269);\n      });\n    });\n    describe(\"Platen\", async () => {\n      const inputSource = InputSource.Platen;\n      it(\"Does not define a value if nothing provided\", async () => {\n        const height = getScanHeight(scanConfig, inputSource, deviceCapabilities);\n        expect(height).to.be.eq(null);\n      });\n      it(\"Does not define a value if negative provided\", async () => {\n        scanConfig.height = -1;\n        const height = getScanHeight(scanConfig, inputSource, deviceCapabilities);\n        expect(height).to.be.eq(null);\n      });\n      it(\"Define the value if no max available from device\", async () => {\n        scanConfig.height = 1269;\n        const height = getScanHeight(scanConfig, inputSource, deviceCapabilities);\n        expect(height).to.be.eq(1269);\n      });\n    });\n  });\n});\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-hp-scan-to",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Scan document to Computer for HP All-in-One Printers",
   "keywords": [
     "Officejet",

package/src/ScanCaps.ts

@@ -8,14 +8,14 @@ export interface ScanCapsData {
   ScanCaps: {
     Platen: {
       InputSourceCaps: {
-        MaxWidth: number;
-        MaxHeight: number;
+        MaxWidth: string[];
+        MaxHeight: string[];
       }[];
     }[];
     Adf: {
       InputSourceCaps: {
-        MaxWidth: number;
-        MaxHeight: number;
+        MaxWidth: string[];
+        MaxHeight: string[];
       }[];
     }[];
   };
@@ -33,29 +33,39 @@ export default class ScanCaps {
     return new ScanCaps(parsed);
   }
 
-  get PlatenMaxWidth(): number | null {
-    return (
-      this.data["ScanCaps"]["Platen"][0]["InputSourceCaps"][0]["MaxWidth"] ||
-      null
+  get platenMaxWidth(): number | null {
+    return Number.parseInt(
+      this.data["ScanCaps"]["Platen"][0]["InputSourceCaps"][0]["MaxWidth"][0],
+      10,
     );
   }
 
-  get PlatenMaxHeight(): number | null {
-    return (
-      this.data["ScanCaps"]["Platen"][0]["InputSourceCaps"][0]["MaxHeight"] ||
-      null
+  get platenMaxHeight(): number | null {
+    return Number.parseInt(
+      this.data["ScanCaps"]["Platen"][0]["InputSourceCaps"][0]["MaxHeight"][0],
+      10,
     );
   }
 
-  get AdfMaxWidth(): number | null {
-    return (
-      this.data["ScanCaps"]["Adf"][0]["InputSourceCaps"][0]["MaxWidth"] || null
-    );
+  get adfMaxWidth(): number | null {
+    if (Object.prototype.hasOwnProperty.call(this.data["ScanCaps"], "Adf")) {
+      return Number.parseInt(
+        this.data["ScanCaps"]["Adf"][0]["InputSourceCaps"][0]["MaxWidth"][0],
+        10,
+      );
+    } else {
+      return null;
+    }
   }
 
-  get AdfMaxHeight(): number | null {
-    return (
-      this.data["ScanCaps"]["Adf"][0]["InputSourceCaps"][0]["MaxHeight"] || null
-    );
+  get adfMaxHeight(): number | null {
+    if (Object.prototype.hasOwnProperty.call(this.data["ScanCaps"], "Adf")) {
+      return Number.parseInt(
+        this.data["ScanCaps"]["Adf"][0]["InputSourceCaps"][0]["MaxHeight"][0],
+        10,
+      );
+    } else {
+      return null;
+    }
   }
 }

package/src/readDeviceCapabilities.ts

@@ -44,9 +44,9 @@ export async function readDeviceCapabilities(): Promise<DeviceCapabilities> {
   return {
     supportsMultiItemScanFromPlaten,
     useWalkupScanToComp: walkupScanToCompCaps != null,
-    platenMaxWidth: scanCaps?.PlatenMaxWidth || null,
-    platenMaxHeight: scanCaps?.PlatenMaxHeight || null,
-    adfMaxWidth: scanCaps?.AdfMaxWidth || null,
-    adfMaxHeight: scanCaps?.AdfMaxHeight || null,
+    platenMaxWidth: scanCaps?.platenMaxWidth || null,
+    platenMaxHeight: scanCaps?.platenMaxHeight || null,
+    adfMaxWidth: scanCaps?.adfMaxWidth || null,
+    adfMaxHeight: scanCaps?.adfMaxHeight || null,
   };
 }

package/src/scanProcessing.ts

@@ -362,12 +362,12 @@ function isPdf(
 
 export function getScanWidth(
   scanConfig: ScanConfig,
-  inputSource: "Adf" | "Platen",
+  inputSource: InputSource,
   deviceCapabilities: DeviceCapabilities,
 ) {
   if (scanConfig.width && scanConfig.width > 0) {
     const maxWidth =
-      inputSource === "Adf"
+      inputSource === InputSource.Adf
         ? deviceCapabilities.adfMaxWidth
         : deviceCapabilities.platenMaxWidth;
 
@@ -383,12 +383,12 @@ export function getScanWidth(
 
 export function getScanHeight(
   scanConfig: ScanConfig,
-  inputSource: "Adf" | "Platen",
+  inputSource: InputSource,
   deviceCapabilities: DeviceCapabilities,
 ) {
   if (scanConfig.height && scanConfig.height > 0) {
     const maxHeight =
-      inputSource === "Adf"
+      inputSource === InputSource.Adf
         ? deviceCapabilities.adfMaxHeight
         : deviceCapabilities.platenMaxHeight;
 
@@ -533,10 +533,10 @@ export async function scanFromAdf(
     destinationFolder = folder;
   }
 
-  const scanWidth = getScanWidth(adfAutoScanConfig, "Adf", deviceCapabilities);
+  const scanWidth = getScanWidth(adfAutoScanConfig, InputSource.Adf, deviceCapabilities);
   const scanHeight = getScanHeight(
     adfAutoScanConfig,
-    "Adf",
+    InputSource.Adf,
     deviceCapabilities,
   );