node-hp-scan-to 1.7.1 → 1.8.0

package/dist/postProcessing.js

@@ -21,7 +21,7 @@ async function handlePdfPostProcessing(folder, tempFolder, scanCount, scanJobCon
     const nextcloudConfig = scanConfig.nextcloudConfig;
     const pdfFilePath = await (0, pdfProcessing_1.mergeToPdf)(paperlessConfig ? tempFolder : folder, scanCount, scanJobContent, scanConfig.directoryConfig.filePattern, scanDate, true);
     if (pdfFilePath != null) {
-        displayPdfScan(pdfFilePath, scanJobContent);
+        displayPdfScan(pdfFilePath, scanJobContent, scanCount);
         if (paperlessConfig) {
             await (0, paperless_1.uploadPdfToPaperless)(pdfFilePath, paperlessConfig);
         }
@@ -34,7 +34,7 @@ async function handlePdfPostProcessing(folder, tempFolder, scanCount, scanJobCon
 async function handleImagePostProcessing(folder, scanCount, scanJobContent, scanDate, scanConfig) {
     const paperlessConfig = scanConfig.paperlessConfig;
     const nextcloudConfig = scanConfig.nextcloudConfig;
-    displayJpegScan(scanJobContent);
+    displayJpegScan(scanJobContent, scanCount);
     if (paperlessConfig) {
         if (paperlessConfig.groupMultiPageScanIntoAPdf) {
             await (0, paperless_1.mergeToPdfAndUploadAsSingleDocumentToPaperless)(folder, scanCount, scanJobContent, scanConfig, scanDate, paperlessConfig);
@@ -54,15 +54,16 @@ async function handleImagePostProcessing(folder, scanCount, scanJobContent, scan
     const filePaths = scanJobContent.elements.map((element) => element.path);
     await cleanUpFilesIfNeeded(filePaths, paperlessConfig, nextcloudConfig);
 }
-function displayPdfScan(pdfFilePath, scanJobContent) {
+function displayPdfScan(pdfFilePath, scanJobContent, scanCount) {
     if (pdfFilePath === null) {
         console.log(`Pdf generated has not been generated`);
         return;
     }
-    console.log(`The following page(s) have been rendered inside '${pdfFilePath}': `);
+    console.log(`The following page(s) have been rendered inside '${pdfFilePath}' as part of scan #${scanCount}: `);
     scanJobContent.elements.forEach((e) => console.log(`\t- page ${e.pageNumber.toString().padStart(3, " ")} - ${e.width}x${e.height}`));
 }
-function displayJpegScan(scanJobContent) {
+function displayJpegScan(scanJobContent, scanCount) {
+    console.log(`The following page(s) are part of scan #${scanCount}: `);
     scanJobContent.elements.forEach((e) => console.log(`\t- page ${e.pageNumber.toString().padStart(3, " ")} - ${e.width}x${e.height} - ${e.path}`));
 }
 async function cleanUpFilesIfNeeded(filePaths, paperlessConfig, nextcloudConfig) {

package/dist/postProcessing.js.map

@@ -1 +1 @@
-{"version":3,"file":"postProcessing.js","sourceRoot":"","sources":["../src/postProcessing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"postProcessing.js","sourceRoot":"","sources":["../src/postProcessing.ts"],"names":[],"mappings":"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"}

package/dist/readDeviceCapabilities.d.ts

@@ -1,2 +1,2 @@
-import { DeviceCapabilities } from "./DeviceCapabilities";
+import { DeviceCapabilities } from "./type/DeviceCapabilities";
 export declare function readDeviceCapabilities(): Promise<DeviceCapabilities>;

package/dist/readDeviceCapabilities.js

@@ -33,7 +33,7 @@ async function readDeviceCapabilities() {
         await HPApi_1.default.getWalkupScanManifest(discoveryTree.WalkupScanManifestURI);
     }
     else {
-        console.log("Unknown device!");
+        console.log("WARNING: No compatible device capabilities detected. The device may not support the listen command, and while the application will continue to run, it is likely to encounter a crash. If your device has an automatic document feeder, you may want to try using the adf-autoscan command.");
     }
     const scanCaps = await getScanCaps(discoveryTree);
     return {
@@ -45,6 +45,8 @@ async function readDeviceCapabilities() {
         adfMaxHeight: scanCaps?.adfMaxHeight || null,
         adfDuplexMaxWidth: scanCaps?.adfDuplexMaxWidth || null,
         adfDuplexMaxHeight: scanCaps?.adfDuplexMaxHeight || null,
+        hasAdfDuplex: scanCaps?.hasAdfDuplex || false,
+        hasAdfDetectPaperLoaded: scanCaps?.hasAdfDetectPaperLoaded || false,
     };
 }
 //# sourceMappingURL=readDeviceCapabilities.js.map

package/dist/readDeviceCapabilities.js.map

@@ -1 +1 @@
-{"version":3,"file":"readDeviceCapabilities.js","sourceRoot":"","sources":["../src/readDeviceCapabilities.ts"],"names":[],"mappings":";;;;;AAkBA,wDAsCC;AAvDD,oDAA4B;AAI5B,KAAK,UAAU,WAAW,CAAC,aAA4B;IACrD,IAAI,QAAQ,GAAoB,IAAI,CAAC;IACrC,IAAI,aAAa,CAAC,kBAAkB,IAAI,IAAI,EAAE,CAAC;QAC7C,MAAM,eAAe,GAAG,MAAM,eAAK,CAAC,kBAAkB,CACpD,aAAa,CAAC,kBAAkB,CACjC,CAAC;QACF,IAAI,eAAe,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;YACxC,QAAQ,GAAG,MAAM,eAAK,CAAC,WAAW,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,sBAAsB;IAC1C,IAAI,+BAA+B,GAAG,IAAI,CAAC;IAC3C,IAAI,mBAAmB,GAAG,KAAK,CAAC;IAEhC,MAAM,aAAa,GAAG,MAAM,eAAK,CAAC,gBAAgB,EAAE,CAAC;IAErD,IAAI,aAAa,CAAC,2BAA2B,IAAI,IAAI,EAAE,CAAC;QACtD,mBAAmB,GAAG,IAAI,CAAC;QAC3B,MAAM,wBAAwB,GAAG,MAAM,eAAK,CAAC,2BAA2B,CACtE,aAAa,CAAC,2BAA2B,CAC1C,CAAC;QACF,IAAI,wBAAwB,CAAC,uBAAuB,IAAI,IAAI,EAAE,CAAC;YAC7D,MAAM,oBAAoB,GAAG,MAAM,eAAK,CAAC,uBAAuB,CAC9D,wBAAwB,CAAC,uBAAuB,CACjD,CAAC;YACF,+BAA+B;gBAC7B,oBAAoB,CAAC,+BAA+B,CAAC;QACzD,CAAC;IACH,CAAC;SAAM,IAAI,aAAa,CAAC,qBAAqB,IAAI,IAAI,EAAE,CAAC;QACvD,oEAAoE;QACpE,MAAM,eAAK,CAAC,qBAAqB,CAC/B,aAAa,CAAC,qBAAqB,CACpC,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACjC,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,aAAa,CAAC,CAAC;IAElD,OAAO;QACL,+BAA+B;QAC/B,mBAAmB;QACnB,cAAc,EAAE,QAAQ,EAAE,cAAc,IAAI,IAAI;QAChD,eAAe,EAAE,QAAQ,EAAE,eAAe,IAAI,IAAI;QAClD,WAAW,EAAE,QAAQ,EAAE,WAAW,IAAI,IAAI;QAC1C,YAAY,EAAE,QAAQ,EAAE,YAAY,IAAI,IAAI;QAC5C,iBAAiB,EAAE,QAAQ,EAAE,iBAAiB,IAAI,IAAI;QACtD,kBAAkB,EAAE,QAAQ,EAAE,kBAAkB,IAAI,IAAI;KACzD,CAAC;AACJ,CAAC"}
+{"version":3,"file":"readDeviceCapabilities.js","sourceRoot":"","sources":["../src/readDeviceCapabilities.ts"],"names":[],"mappings":";;;;;AAoBA,wDAsCC;AAzDD,oDAA4B;AAI5B,KAAK,UAAU,WAAW,CACxB,aAA4B;IAE5B,IAAI,QAAQ,GAAoB,IAAI,CAAC;IACrC,IAAI,aAAa,CAAC,kBAAkB,IAAI,IAAI,EAAE,CAAC;QAC7C,MAAM,eAAe,GAAG,MAAM,eAAK,CAAC,kBAAkB,CACpD,aAAa,CAAC,kBAAkB,CACjC,CAAC;QACF,IAAI,eAAe,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;YACxC,QAAQ,GAAG,MAAM,eAAK,CAAC,WAAW,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,sBAAsB;IAC1C,IAAI,+BAA+B,GAAG,IAAI,CAAC;IAC3C,IAAI,mBAAmB,GAAG,KAAK,CAAC;IAEhC,MAAM,aAAa,GAAG,MAAM,eAAK,CAAC,gBAAgB,EAAE,CAAC;IAErD,IAAI,aAAa,CAAC,2BAA2B,IAAI,IAAI,EAAE,CAAC;QACtD,mBAAmB,GAAG,IAAI,CAAC;QAC3B,MAAM,wBAAwB,GAAG,MAAM,eAAK,CAAC,2BAA2B,CACtE,aAAa,CAAC,2BAA2B,CAC1C,CAAC;QACF,IAAI,wBAAwB,CAAC,uBAAuB,IAAI,IAAI,EAAE,CAAC;YAC7D,MAAM,oBAAoB,GAAG,MAAM,eAAK,CAAC,uBAAuB,CAC9D,wBAAwB,CAAC,uBAAuB,CACjD,CAAC;YACF,+BAA+B;gBAC7B,oBAAoB,CAAC,+BAA+B,CAAC;QACzD,CAAC;IACH,CAAC;SAAM,IAAI,aAAa,CAAC,qBAAqB,IAAI,IAAI,EAAE,CAAC;QACvD,oEAAoE;QACpE,MAAM,eAAK,CAAC,qBAAqB,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACzE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,6RAA6R,CAAC,CAAC;IAC7S,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,aAAa,CAAC,CAAC;IAElD,OAAO;QACL,+BAA+B;QAC/B,mBAAmB;QACnB,cAAc,EAAE,QAAQ,EAAE,cAAc,IAAI,IAAI;QAChD,eAAe,EAAE,QAAQ,EAAE,eAAe,IAAI,IAAI;QAClD,WAAW,EAAE,QAAQ,EAAE,WAAW,IAAI,IAAI;QAC1C,YAAY,EAAE,QAAQ,EAAE,YAAY,IAAI,IAAI;QAC5C,iBAAiB,EAAE,QAAQ,EAAE,iBAAiB,IAAI,IAAI;QACtD,kBAAkB,EAAE,QAAQ,EAAE,kBAAkB,IAAI,IAAI;QACxD,YAAY,EAAE,QAAQ,EAAE,YAAY,IAAI,KAAK;QAC7C,uBAAuB,EAAE,QAAQ,EAAE,uBAAuB,IAAI,KAAK;KACpE,CAAC;AACJ,CAAC"}

package/dist/scanJobHandlers.d.ts

@@ -0,0 +1,8 @@
+import { DeviceCapabilities } from "./type/DeviceCapabilities";
+import ScanJobSettings from "./hpModels/ScanJobSettings";
+import { ScanContent } from "./type/ScanContent";
+import { InputSource } from "./type/InputSource";
+import { SelectedScanTarget } from "./type/scanTargetDefinitions";
+import { PageCountingStrategy } from "./type/pageCountingStrategy";
+export declare function executeScanJob(scanJobSettings: ScanJobSettings, inputSource: InputSource, folder: string, scanCount: number, scanJobContent: ScanContent, filePattern: string | undefined, pageCountingStrategy: PageCountingStrategy): Promise<"Completed" | "Canceled">;
+export declare function executeScanJobs(scanJobSettings: ScanJobSettings, inputSource: InputSource, folder: string, scanCount: number, scanJobContent: ScanContent, selectedScanTarget: SelectedScanTarget, deviceCapabilities: DeviceCapabilities, filePattern: string | undefined, pageCountingStrategy: PageCountingStrategy): Promise<void>;

package/dist/scanJobHandlers.js

@@ -0,0 +1,182 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeScanJob = executeScanJob;
+exports.executeScanJobs = executeScanJobs;
+const HPApi_1 = __importDefault(require("./HPApi"));
+const listening_1 = require("./listening");
+const delay_1 = require("./delay");
+const PathHelper_1 = __importDefault(require("./PathHelper"));
+const InputSource_1 = require("./type/InputSource");
+const promises_1 = __importDefault(require("fs/promises"));
+const JpegUtil_1 = __importDefault(require("./JpegUtil"));
+const pageCountingStrategy_1 = require("./type/pageCountingStrategy");
+async function waitDeviceUntilItIsReadyToUploadOrCompleted(jobUrl) {
+    let job = null;
+    let isReadyToUpload = false;
+    do {
+        job = await HPApi_1.default.getJob(jobUrl);
+        if (job.jobState === "Canceled") {
+            return job;
+        }
+        else if (job.pageState === "ReadyToUpload" ||
+            job.jobState === "Completed") {
+            isReadyToUpload = true;
+        }
+        else if (job.jobState == "Processing") {
+            isReadyToUpload = false;
+        }
+        else {
+            console.log(`Unknown jobState: ${job.jobState}`);
+        }
+        await (0, delay_1.delay)(300);
+    } while (!isReadyToUpload);
+    return job;
+}
+async function scanProcessing(filePath) {
+    const buffer = await promises_1.default.readFile(filePath);
+    const height = JpegUtil_1.default.fixSizeWithDNL(buffer);
+    if (height != null) {
+        // rewrite the fixed file
+        await promises_1.default.writeFile(filePath, buffer);
+        return height;
+    }
+    return null;
+}
+function createScanPage(job, currentPageNumber, filePath, sizeFixed) {
+    const height = sizeFixed ?? job.imageHeight;
+    return {
+        path: filePath,
+        pageNumber: currentPageNumber,
+        width: job.imageWidth ?? 0,
+        height: height ?? 0,
+        xResolution: job.xResolution ?? 200,
+        yResolution: job.yResolution ?? 200,
+    };
+}
+async function handleScanProcessingState(job, inputSource, folder, scanCount, currentPageNumber, filePattern, date) {
+    if (job.pageState == "ReadyToUpload" &&
+        job.binaryURL != null &&
+        job.currentPageNumber != null) {
+        console.log(`Ready to download page job page ${job.currentPageNumber} at:`, job.binaryURL);
+        const destinationFilePath = PathHelper_1.default.getFileForPage(folder, scanCount, currentPageNumber, filePattern, "jpg", date);
+        const filePath = await HPApi_1.default.downloadPage(job.binaryURL, destinationFilePath);
+        console.log("Page downloaded to:", filePath);
+        let sizeFixed = null;
+        if (inputSource == InputSource_1.InputSource.Adf) {
+            sizeFixed = await scanProcessing(filePath);
+            if (sizeFixed == null) {
+                console.log(`File size has not been fixed, DNF may not have been found and approximate height is: ${job.imageHeight}`);
+            }
+        }
+        return createScanPage(job, currentPageNumber, filePath, sizeFixed);
+    }
+    else {
+        console.log(`Unknown pageState: ${job.pageState}`);
+        await (0, delay_1.delay)(200);
+        return null;
+    }
+}
+async function executeScanJob(scanJobSettings, inputSource, folder, scanCount, scanJobContent, filePattern, pageCountingStrategy) {
+    const jobUrl = await HPApi_1.default.postJob(scanJobSettings);
+    console.log(`Creating job with settings: ${JSON.stringify(scanJobSettings)}`);
+    console.log("New job created:", jobUrl);
+    let job = await HPApi_1.default.getJob(jobUrl);
+    while (job.jobState !== "Completed") {
+        job = await waitDeviceUntilItIsReadyToUploadOrCompleted(jobUrl);
+        if (job.jobState == "Completed") {
+            continue;
+        }
+        if (job.jobState === "Processing") {
+            let pageNumber;
+            if (pageCountingStrategy === pageCountingStrategy_1.PageCountingStrategy.Normal) {
+                pageNumber = scanJobContent.elements.length + 1;
+            }
+            else if (pageCountingStrategy === pageCountingStrategy_1.PageCountingStrategy.OddOnly) {
+                pageNumber = scanJobContent.elements.length * 2 + 1;
+            }
+            else if (pageCountingStrategy === pageCountingStrategy_1.PageCountingStrategy.EvenOnly) {
+                pageNumber = (scanJobContent.elements.length + 1) * 2;
+            }
+            else {
+                throw new Error(`Unknown page counting strategy: ${pageCountingStrategy}`);
+            }
+            const page = await handleScanProcessingState(job, inputSource, folder, scanCount, pageNumber, filePattern, new Date());
+            job = await HPApi_1.default.getJob(jobUrl);
+            if (page != null && job.jobState != "Canceled") {
+                scanJobContent.elements.push(page);
+            }
+        }
+        else if (job.jobState === "Canceled") {
+            console.log("Job cancelled by device");
+            break;
+        }
+        else {
+            console.log(`Unhandled jobState: ${job.jobState}`);
+            await (0, delay_1.delay)(200);
+        }
+    }
+    console.log(`Job state: ${job.jobState}, totalPages: ${scanJobContent.elements.length}:`);
+    return job.jobState;
+}
+async function waitScanNewPageRequest(compEventURI) {
+    let startNewScanJob = false;
+    let wait = true;
+    while (wait) {
+        await new Promise((resolve) => setTimeout(resolve, 1000)); //wait 1s
+        const walkupScanToCompEvent = await HPApi_1.default.getWalkupScanToCompEvent(compEventURI);
+        const message = walkupScanToCompEvent.eventType;
+        if (message === "ScanNewPageRequested") {
+            startNewScanJob = true;
+            wait = false;
+        }
+        else if (message === "ScanPagesComplete") {
+            wait = false;
+        }
+        else if (message === "ScanRequested") {
+            // continue waiting
+        }
+        else {
+            wait = false;
+            console.log(`Unknown eventType: ${message}`);
+        }
+    }
+    return startNewScanJob;
+}
+async function executeScanJobs(scanJobSettings, inputSource, folder, scanCount, scanJobContent, selectedScanTarget, deviceCapabilities, filePattern, pageCountingStrategy) {
+    let jobState = await executeScanJob(scanJobSettings, inputSource, folder, scanCount, scanJobContent, filePattern, pageCountingStrategy);
+    const scanTarget = {
+        resourceURI: selectedScanTarget.resourceURI,
+        label: selectedScanTarget.label,
+        isDuplexSingleSide: selectedScanTarget.isDuplexSingleSide,
+    };
+    let lastEvent = selectedScanTarget.event;
+    if (jobState === "Completed" &&
+        lastEvent.compEventURI &&
+        inputSource !== InputSource_1.InputSource.Adf &&
+        lastEvent.destinationURI &&
+        deviceCapabilities.supportsMultiItemScanFromPlaten) {
+        lastEvent = await (0, listening_1.waitForScanEventFromTarget)(scanTarget, lastEvent.agingStamp);
+        if (!lastEvent.compEventURI) {
+            return;
+        }
+        let startNewScanJob = await waitScanNewPageRequest(lastEvent.compEventURI);
+        while (startNewScanJob) {
+            jobState = await executeScanJob(scanJobSettings, inputSource, folder, scanCount, scanJobContent, filePattern, pageCountingStrategy);
+            if (jobState !== "Completed") {
+                return;
+            }
+            if (!lastEvent.destinationURI) {
+                break;
+            }
+            lastEvent = await (0, listening_1.waitForScanEventFromTarget)(scanTarget, lastEvent.agingStamp);
+            if (!lastEvent.compEventURI) {
+                return;
+            }
+            startNewScanJob = await waitScanNewPageRequest(lastEvent.compEventURI);
+        }
+    }
+}
+//# sourceMappingURL=scanJobHandlers.js.map

package/dist/scanJobHandlers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scanJobHandlers.js","sourceRoot":"","sources":["../src/scanJobHandlers.ts"],"names":[],"mappings":"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"}

package/dist/scanProcessing.d.ts

@@ -1,33 +1,17 @@
-import Event from "./Event";
-import { DeviceCapabilities } from "./DeviceCapabilities";
-import { InputSource } from "./InputSource";
-import { PaperlessConfig } from "./paperless/PaperlessConfig";
-import { NextcloudConfig } from "./nextcloud/NextcloudConfig";
+import Event from "./hpModels/Event";
+import WalkupScanDestination from "./hpModels/WalkupScanDestination";
+import WalkupScanToCompDestination from "./hpModels/WalkupScanToCompDestination";
+import { DeviceCapabilities } from "./type/DeviceCapabilities";
+import { ScanContent } from "./type/ScanContent";
+import { InputSource } from "./type/InputSource";
+import { SelectedScanTarget } from "./type/scanTargetDefinitions";
+import { AdfAutoScanConfig, ScanConfig, SingleScanConfig } from "./type/scanConfigs";
+import { PageCountingStrategy } from "./type/pageCountingStrategy";
+export declare function tryGetDestination(event: Event): Promise<WalkupScanDestination | WalkupScanToCompDestination | null>;
+export declare function isPdf(destination: WalkupScanDestination | WalkupScanToCompDestination): boolean;
 export declare function getScanWidth(scanConfig: ScanConfig, inputSource: InputSource, deviceCapabilities: DeviceCapabilities, isDuplex: boolean): number | null;
 export declare function getScanHeight(scanConfig: ScanConfig, inputSource: InputSource, deviceCapabilities: DeviceCapabilities, isDuplex: boolean): number | null;
-export declare function saveScanFromEvent(event: Event, folder: string, tempFolder: string, scanCount: number, deviceCapabilities: DeviceCapabilities, scanConfig: ScanConfig): Promise<void>;
-export type DirectoryConfig = {
-    directory: string | undefined;
-    tempDirectory: string | undefined;
-    filePattern: string | undefined;
-};
-export type ScanConfig = {
-    resolution: number;
-    width: number | null;
-    height: number | null;
-    directoryConfig: DirectoryConfig;
-    paperlessConfig: PaperlessConfig | undefined;
-    nextcloudConfig: NextcloudConfig | undefined;
-};
-export type AdfAutoScanConfig = ScanConfig & {
-    isDuplex: boolean;
-    generatePdf: boolean;
-    pollingInterval: number;
-    startScanDelay: number;
-};
-export type SingleScanConfig = ScanConfig & {
-    isDuplex: boolean;
-    generatePdf: boolean;
-};
+export declare function saveScanFromEvent(selectedScanTarget: SelectedScanTarget, folder: string, tempFolder: string, scanCount: number, deviceCapabilities: DeviceCapabilities, scanConfig: ScanConfig, isDuplex: boolean, isPdf: boolean, pageCountingStrategy: PageCountingStrategy): Promise<ScanContent>;
 export declare function scanFromAdf(scanCount: number, folder: string, tempFolder: string, adfAutoScanConfig: AdfAutoScanConfig, deviceCapabilities: DeviceCapabilities, date: Date): Promise<void>;
+export declare function singleScan(scanCount: number, folder: string, tempFolder: string, scanConfig: SingleScanConfig, deviceCapabilities: DeviceCapabilities, date: Date): Promise<void>;
 export declare function waitAdfLoaded(pollingInterval: number, startScanDelay: number): Promise<void>;

package/dist/scanProcessing.js

@@ -3,45 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.tryGetDestination = tryGetDestination;
+exports.isPdf = isPdf;
 exports.getScanWidth = getScanWidth;
 exports.getScanHeight = getScanHeight;
 exports.saveScanFromEvent = saveScanFromEvent;
 exports.scanFromAdf = scanFromAdf;
+exports.singleScan = singleScan;
 exports.waitAdfLoaded = waitAdfLoaded;
 const HPApi_1 = __importDefault(require("./HPApi"));
-const promises_1 = __importDefault(require("fs/promises"));
-const JpegUtil_1 = __importDefault(require("./JpegUtil"));
-const listening_1 = require("./listening");
-const ScanJobSettings_1 = __importDefault(require("./ScanJobSettings"));
+const ScanJobSettings_1 = __importDefault(require("./hpModels/ScanJobSettings"));
 const delay_1 = require("./delay");
-const PathHelper_1 = __importDefault(require("./PathHelper"));
-const InputSource_1 = require("./InputSource");
+const InputSource_1 = require("./type/InputSource");
 const postProcessing_1 = require("./postProcessing");
-async function waitDeviceUntilItIsReadyToUploadOrCompleted(jobUrl) {
-    let job = null;
-    let isReadyToUpload = false;
-    do {
-        job = await HPApi_1.default.getJob(jobUrl);
-        if (job.jobState === "Canceled") {
-            return job;
-        }
-        else if (job.pageState === "ReadyToUpload" ||
-            job.jobState === "Completed") {
-            isReadyToUpload = true;
-        }
-        else if (job.jobState == "Processing") {
-            isReadyToUpload = false;
-        }
-        else {
-            console.log(`Unknown jobState: ${job.jobState}`);
-        }
-        await (0, delay_1.delay)(300);
-    } while (!isReadyToUpload);
-    return job;
-}
+const scanJobHandlers_1 = require("./scanJobHandlers");
+const KnownShortcut_1 = require("./type/KnownShortcut");
+const pageCountingStrategy_1 = require("./type/pageCountingStrategy");
 async function tryGetDestination(event) {
-    //this code can in some cases be executed before the user actually chooses between Document or Photo
-    //so lets fetch the contentType (Document or Photo) until we get a value
+    // this code can in some cases be executed before the user actually chooses between Document or Photo
+    // so, let's fetch the contentType (Document or Photo) until we get a value
     let destination = null;
     for (let i = 0; i < 20; i++) {
         const destinationURI = event.destinationURI;
@@ -62,139 +42,14 @@ async function tryGetDestination(event) {
     console.log(JSON.stringify(destination));
     return null;
 }
-async function scanProcessing(filePath) {
-    const buffer = await promises_1.default.readFile(filePath);
-    const height = JpegUtil_1.default.fixSizeWithDNL(buffer);
-    if (height != null) {
-        // rewrite the fixed file
-        await promises_1.default.writeFile(filePath, buffer);
-        return height;
-    }
-    return null;
-}
-function createScanPage(job, currentPageNumber, filePath, sizeFixed) {
-    const height = sizeFixed ?? job.imageHeight;
-    return {
-        path: filePath,
-        pageNumber: currentPageNumber,
-        width: job.imageWidth ?? 0,
-        height: height ?? 0,
-        xResolution: job.xResolution ?? 200,
-        yResolution: job.yResolution ?? 200,
-    };
-}
-async function handleScanProcessingState(job, inputSource, folder, scanCount, currentPageNumber, filePattern, date) {
-    if (job.pageState == "ReadyToUpload" &&
-        job.binaryURL != null &&
-        job.currentPageNumber != null) {
-        console.log(`Ready to download page job page ${job.currentPageNumber} at:`, job.binaryURL);
-        const destinationFilePath = PathHelper_1.default.getFileForPage(folder, scanCount, currentPageNumber, filePattern, "jpg", date);
-        const filePath = await HPApi_1.default.downloadPage(job.binaryURL, destinationFilePath);
-        console.log("Page downloaded to:", filePath);
-        let sizeFixed = null;
-        if (inputSource == InputSource_1.InputSource.Adf) {
-            sizeFixed = await scanProcessing(filePath);
-            if (sizeFixed == null) {
-                console.log(`File size has not been fixed, DNF may not have been found and approximate height is: ${job.imageHeight}`);
-            }
-        }
-        return createScanPage(job, currentPageNumber, filePath, sizeFixed);
-    }
-    else {
-        console.log(`Unknown pageState: ${job.pageState}`);
-        await (0, delay_1.delay)(200);
-        return null;
-    }
-}
-async function executeScanJob(scanJobSettings, inputSource, folder, scanCount, scanJobContent, filePattern) {
-    const jobUrl = await HPApi_1.default.postJob(scanJobSettings);
-    console.log("New job created:", jobUrl);
-    let job = await HPApi_1.default.getJob(jobUrl);
-    while (job.jobState !== "Completed") {
-        job = await waitDeviceUntilItIsReadyToUploadOrCompleted(jobUrl);
-        if (job.jobState == "Completed") {
-            continue;
-        }
-        if (job.jobState === "Processing") {
-            const page = await handleScanProcessingState(job, inputSource, folder, scanCount, scanJobContent.elements.length + 1, filePattern, new Date());
-            job = await HPApi_1.default.getJob(jobUrl);
-            if (page != null && job.jobState != "Canceled") {
-                scanJobContent.elements.push(page);
-            }
-        }
-        else if (job.jobState === "Canceled") {
-            console.log("Job cancelled by device");
-            break;
-        }
-        else {
-            console.log(`Unhandled jobState: ${job.jobState}`);
-            await (0, delay_1.delay)(200);
-        }
-    }
-    console.log(`Job state: ${job.jobState}, totalPages: ${scanJobContent.elements.length}:`);
-    return job.jobState;
-}
-async function waitScanNewPageRequest(compEventURI) {
-    let startNewScanJob = false;
-    let wait = true;
-    while (wait) {
-        await new Promise((resolve) => setTimeout(resolve, 1000)); //wait 1s
-        const walkupScanToCompEvent = await HPApi_1.default.getWalkupScanToCompEvent(compEventURI);
-        const message = walkupScanToCompEvent.eventType;
-        if (message === "ScanNewPageRequested") {
-            startNewScanJob = true;
-            wait = false;
-        }
-        else if (message === "ScanPagesComplete") {
-            wait = false;
-        }
-        else if (message === "ScanRequested") {
-            // continue waiting
-        }
-        else {
-            wait = false;
-            console.log(`Unknown eventType: ${message}`);
-        }
-    }
-    return startNewScanJob;
-}
-async function executeScanJobs(scanJobSettings, inputSource, folder, scanCount, scanJobContent, firstEvent, deviceCapabilities, filePattern) {
-    let jobState = await executeScanJob(scanJobSettings, inputSource, folder, scanCount, scanJobContent, filePattern);
-    let lastEvent = firstEvent;
-    if (jobState === "Completed" &&
-        lastEvent.compEventURI &&
-        inputSource !== InputSource_1.InputSource.Adf &&
-        lastEvent.destinationURI &&
-        deviceCapabilities.supportsMultiItemScanFromPlaten) {
-        lastEvent = await (0, listening_1.waitForScanEvent)(lastEvent.destinationURI, lastEvent.agingStamp);
-        if (!lastEvent.compEventURI) {
-            return;
-        }
-        let startNewScanJob = await waitScanNewPageRequest(lastEvent.compEventURI);
-        while (startNewScanJob) {
-            jobState = await executeScanJob(scanJobSettings, inputSource, folder, scanCount, scanJobContent, filePattern);
-            if (jobState !== "Completed") {
-                return;
-            }
-            if (!lastEvent.destinationURI) {
-                break;
-            }
-            lastEvent = await (0, listening_1.waitForScanEvent)(lastEvent.destinationURI, lastEvent.agingStamp);
-            if (!lastEvent.compEventURI) {
-                return;
-            }
-            startNewScanJob = await waitScanNewPageRequest(lastEvent.compEventURI);
-        }
-    }
-}
 function isPdf(destination) {
-    if (destination.shortcut === "SavePDF" ||
-        destination.shortcut === "EmailPDF" ||
-        destination.shortcut == "SaveDocument1") {
+    if (destination.shortcut === KnownShortcut_1.KnownShortcut.SavePDF ||
+        destination.shortcut === KnownShortcut_1.KnownShortcut.EmailPDF ||
+        destination.shortcut == KnownShortcut_1.KnownShortcut.SaveDocument1) {
         return true;
     }
-    else if (destination.shortcut === "SaveJPEG" ||
-        destination.shortcut === "SavePhoto1") {
+    else if (destination.shortcut === KnownShortcut_1.KnownShortcut.SaveJPEG ||
+        destination.shortcut === KnownShortcut_1.KnownShortcut.SavePhoto1) {
         return false;
     }
     else {
@@ -238,35 +93,18 @@ function getScanHeight(scanConfig, inputSource, deviceCapabilities, isDuplex) {
         return maxHeight;
     }
 }
-async function saveScanFromEvent(event, folder, tempFolder, scanCount, deviceCapabilities, scanConfig) {
-    if (event.compEventURI) {
-        const proceedToScan = await (0, listening_1.waitScanRequest)(event.compEventURI);
-        if (!proceedToScan) {
-            return;
-        }
-    }
-    const destination = await tryGetDestination(event);
-    if (!destination) {
-        console.log("No shortcut selected!");
-        return;
-    }
-    console.log("Selected shortcut: " + destination.shortcut);
-    let toPdf;
+async function saveScanFromEvent(selectedScanTarget, folder, tempFolder, scanCount, deviceCapabilities, scanConfig, isDuplex, isPdf, pageCountingStrategy) {
     let destinationFolder;
     let contentType;
-    if (isPdf(destination)) {
-        toPdf = true;
+    if (isPdf) {
         contentType = "Document";
         destinationFolder = tempFolder;
         console.log(`Scan will be converted to pdf, using ${destinationFolder} as temp scan output directory for individual pages`);
     }
     else {
-        toPdf = false;
         contentType = "Photo";
         destinationFolder = folder;
     }
-    const isDuplex = destination.scanPlexMode != null && destination.scanPlexMode != "Simplex";
-    console.log("ScanPlexMode is : " + destination.scanPlexMode);
     const scanStatus = await HPApi_1.default.getScanStatus();
     if (scanStatus.scannerState !== "Idle") {
         console.log("Scanner state is not Idle, aborting scan attempt...!");
@@ -277,10 +115,9 @@ async function saveScanFromEvent(event, folder, tempFolder, scanCount, deviceCap
     const scanHeight = getScanHeight(scanConfig, inputSource, deviceCapabilities, isDuplex);
     const scanJobSettings = new ScanJobSettings_1.default(inputSource, contentType, scanConfig.resolution, scanWidth, scanHeight, isDuplex);
     const scanJobContent = { elements: [] };
-    const scanDate = new Date();
-    await executeScanJobs(scanJobSettings, inputSource, destinationFolder, scanCount, scanJobContent, event, deviceCapabilities, scanConfig.directoryConfig.filePattern);
+    await (0, scanJobHandlers_1.executeScanJobs)(scanJobSettings, inputSource, destinationFolder, scanCount, scanJobContent, selectedScanTarget, deviceCapabilities, scanConfig.directoryConfig.filePattern, pageCountingStrategy);
     console.log(`Scan of page(s) completed totalPages: ${scanJobContent.elements.length}:`);
-    await (0, postProcessing_1.postProcessing)(scanConfig, folder, tempFolder, scanCount, scanJobContent, scanDate, toPdf);
+    return scanJobContent;
 }
 async function scanFromAdf(scanCount, folder, tempFolder, adfAutoScanConfig, deviceCapabilities, date) {
     let destinationFolder;
@@ -298,10 +135,36 @@ async function scanFromAdf(scanCount, folder, tempFolder, adfAutoScanConfig, dev
     const scanHeight = getScanHeight(adfAutoScanConfig, InputSource_1.InputSource.Adf, deviceCapabilities, adfAutoScanConfig.isDuplex);
     const scanJobSettings = new ScanJobSettings_1.default(InputSource_1.InputSource.Adf, contentType, adfAutoScanConfig.resolution, scanWidth, scanHeight, adfAutoScanConfig.isDuplex);
     const scanJobContent = { elements: [] };
-    await executeScanJob(scanJobSettings, InputSource_1.InputSource.Adf, destinationFolder, scanCount, scanJobContent, adfAutoScanConfig.directoryConfig.filePattern);
+    await (0, scanJobHandlers_1.executeScanJob)(scanJobSettings, InputSource_1.InputSource.Adf, destinationFolder, scanCount, scanJobContent, adfAutoScanConfig.directoryConfig.filePattern, pageCountingStrategy_1.PageCountingStrategy.Normal);
     console.log(`Scan of page(s) completed, total pages: ${scanJobContent.elements.length}:`);
     await (0, postProcessing_1.postProcessing)(adfAutoScanConfig, folder, tempFolder, scanCount, scanJobContent, date, adfAutoScanConfig.generatePdf);
 }
+async function singleScan(scanCount, folder, tempFolder, scanConfig, deviceCapabilities, date) {
+    let destinationFolder;
+    let contentType;
+    if (scanConfig.generatePdf) {
+        contentType = "Document";
+        destinationFolder = tempFolder;
+        console.log(`Scan will be converted to pdf, using ${destinationFolder} as temp scan output directory for individual pages`);
+    }
+    else {
+        contentType = "Photo";
+        destinationFolder = folder;
+    }
+    const scanStatus = await HPApi_1.default.getScanStatus();
+    if (scanStatus.scannerState !== "Idle") {
+        console.log("Scanner state is not Idle, aborting scan attempt...!");
+    }
+    console.log("Afd is : " + scanStatus.adfState);
+    const inputSource = scanStatus.getInputSource();
+    const scanWidth = getScanWidth(scanConfig, inputSource, deviceCapabilities, scanConfig.isDuplex);
+    const scanHeight = getScanHeight(scanConfig, inputSource, deviceCapabilities, scanConfig.isDuplex);
+    const scanJobSettings = new ScanJobSettings_1.default(inputSource, contentType, scanConfig.resolution, scanWidth, scanHeight, scanConfig.isDuplex);
+    const scanJobContent = { elements: [] };
+    await (0, scanJobHandlers_1.executeScanJob)(scanJobSettings, inputSource, destinationFolder, scanCount, scanJobContent, scanConfig.directoryConfig.filePattern, pageCountingStrategy_1.PageCountingStrategy.Normal);
+    console.log(`Scan of page(s) completed, total pages: ${scanJobContent.elements.length}:`);
+    await (0, postProcessing_1.postProcessing)(scanConfig, folder, tempFolder, scanCount, scanJobContent, date, scanConfig.generatePdf);
+}
 async function waitAdfLoaded(pollingInterval, startScanDelay) {
     let ready = false;
     while (!ready) {