node-hp-scan-to 1.9.0 → 1.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/PathHelper.d.ts +4 -3
- package/dist/PathHelper.js +51 -29
- package/dist/PathHelper.js.map +1 -1
- package/dist/commitInfo.json +1 -1
- package/dist/pdfProcessing.js +1 -1
- package/dist/pdfProcessing.js.map +1 -1
- package/dist/scanJobHandlers.js +2 -2
- package/dist/scanJobHandlers.js.map +1 -1
- package/dist/scanProcessing.js +5 -2
- package/dist/scanProcessing.js.map +1 -1
- package/package.json +3 -1
package/dist/PathHelper.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
export default class PathHelper {
|
|
2
|
-
static getFileForPage(folder: string, scanCount: number, currentPageNumber: number, filePattern: string | undefined, extension: string, date: Date): string
|
|
2
|
+
static getFileForPage(folder: string, scanCount: number, currentPageNumber: number, filePattern: string | undefined, extension: string, date: Date): Promise<string>;
|
|
3
3
|
static getNextScanNumber(folder: string, currentScanCount: number, filePattern: string | undefined): Promise<number>;
|
|
4
|
-
static makeUnique(filePath: string, date: Date): string
|
|
5
|
-
static
|
|
4
|
+
static makeUnique(filePath: string, date: Date): Promise<string>;
|
|
5
|
+
private static tryCreateFile;
|
|
6
|
+
static getFileForScan(folder: string, scanCount: number, filePattern: string | undefined, extension: string, date: Date): Promise<string>;
|
|
6
7
|
static getOutputFolder(folder?: string): Promise<string>;
|
|
7
8
|
private static checkIfFolderIsWritable;
|
|
8
9
|
static getTargetFolder(directory: string | undefined): Promise<string>;
|
package/dist/PathHelper.js
CHANGED
|
@@ -36,22 +36,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
const
|
|
39
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
40
|
+
const node_os_1 = __importDefault(require("node:os"));
|
|
41
|
+
const node_fs_1 = __importStar(require("node:fs"));
|
|
40
42
|
const dateformat_1 = __importDefault(require("dateformat"));
|
|
41
|
-
const
|
|
42
|
-
const
|
|
43
|
+
const nanoid_1 = require("nanoid");
|
|
44
|
+
const nanoid = (0, nanoid_1.customAlphabet)("23456789abcdefghijkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ", 6);
|
|
43
45
|
class PathHelper {
|
|
44
|
-
static getFileForPage(folder, scanCount, currentPageNumber, filePattern, extension, date) {
|
|
46
|
+
static async getFileForPage(folder, scanCount, currentPageNumber, filePattern, extension, date) {
|
|
45
47
|
if (filePattern) {
|
|
46
|
-
return
|
|
48
|
+
return this.makeUnique(node_path_1.default.join(folder, `${(0, dateformat_1.default)(date, filePattern)}.${extension}`), date);
|
|
47
49
|
}
|
|
48
|
-
return this.makeUnique(
|
|
50
|
+
return this.makeUnique(node_path_1.default.join(folder, `scan${scanCount}_page${currentPageNumber}.${extension}`), date);
|
|
49
51
|
}
|
|
50
52
|
static async getNextScanNumber(folder, currentScanCount, filePattern) {
|
|
51
53
|
if (filePattern) {
|
|
52
|
-
return currentScanCount
|
|
54
|
+
return ++currentScanCount;
|
|
53
55
|
}
|
|
54
|
-
const files = await
|
|
56
|
+
const files = await node_fs_1.promises.readdir(folder);
|
|
55
57
|
for (let i = currentScanCount + 1; i < Number.MAX_SAFE_INTEGER; i++) {
|
|
56
58
|
const currentScanCountProbe = `scan${i}`;
|
|
57
59
|
if (!(files.some((x) => x.startsWith(currentScanCountProbe)) &&
|
|
@@ -62,45 +64,65 @@ class PathHelper {
|
|
|
62
64
|
}
|
|
63
65
|
return Promise.reject(new Error(`Unable to find the valid scan number in folder ${folder}`));
|
|
64
66
|
}
|
|
65
|
-
static makeUnique(filePath, date) {
|
|
66
|
-
if (
|
|
67
|
+
static async makeUnique(filePath, date) {
|
|
68
|
+
if (await this.tryCreateFile(filePath)) {
|
|
67
69
|
return filePath;
|
|
68
70
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
if (
|
|
79
|
-
return
|
|
71
|
+
const { dir, name, ext } = node_path_1.default.parse(filePath);
|
|
72
|
+
const dateStamp = (0, dateformat_1.default)(date, "yyyymmdd-HHMMss");
|
|
73
|
+
let baseName;
|
|
74
|
+
if (name.includes(dateStamp)) {
|
|
75
|
+
baseName = name;
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
baseName = `${name}_${dateStamp}`;
|
|
79
|
+
const pathWithDate = node_path_1.default.join(dir, `${baseName}${ext}`);
|
|
80
|
+
if (await this.tryCreateFile(pathWithDate)) {
|
|
81
|
+
return pathWithDate;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
// Retry nanoid a few times (paranoid safety) -- be bit para-nanoid ;-)
|
|
85
|
+
for (let i = 0; i < 3; i++) {
|
|
86
|
+
const finalPath = node_path_1.default.join(dir, `${baseName}_${nanoid()}${ext}`);
|
|
87
|
+
if (await this.tryCreateFile(finalPath)) {
|
|
88
|
+
return finalPath;
|
|
80
89
|
}
|
|
81
|
-
i = String.fromCharCode(i.charCodeAt(0) + 1);
|
|
82
90
|
}
|
|
83
|
-
|
|
91
|
+
// if the world collapses, who knows, who cares?
|
|
92
|
+
throw new Error(`Failed to create unique file: ${filePath}`);
|
|
93
|
+
}
|
|
94
|
+
static async tryCreateFile(filePath) {
|
|
95
|
+
try {
|
|
96
|
+
const fd = await node_fs_1.default.promises.open(filePath, "wx");
|
|
97
|
+
await fd.close();
|
|
98
|
+
return true;
|
|
99
|
+
}
|
|
100
|
+
catch (err) {
|
|
101
|
+
const e = err;
|
|
102
|
+
if (e && e.code === "EEXIST")
|
|
103
|
+
return false;
|
|
104
|
+
throw err;
|
|
105
|
+
}
|
|
84
106
|
}
|
|
85
|
-
static getFileForScan(folder, scanCount, filePattern, extension, date) {
|
|
107
|
+
static async getFileForScan(folder, scanCount, filePattern, extension, date) {
|
|
86
108
|
if (filePattern) {
|
|
87
|
-
return
|
|
109
|
+
return await this.makeUnique(node_path_1.default.join(folder, `${(0, dateformat_1.default)(date, filePattern)}.${extension}`), date);
|
|
88
110
|
}
|
|
89
|
-
return
|
|
111
|
+
return await this.makeUnique(node_path_1.default.join(folder, `scan${scanCount}.${extension}`), date);
|
|
90
112
|
}
|
|
91
113
|
static async getOutputFolder(folder) {
|
|
92
114
|
if (typeof folder !== "string") {
|
|
93
|
-
return
|
|
115
|
+
return node_fs_1.promises.mkdtemp(node_path_1.default.join(node_os_1.default.tmpdir(), "scan-to-pc"));
|
|
94
116
|
}
|
|
95
117
|
if (folder.startsWith("~")) {
|
|
96
|
-
return folder.replace(/^~/,
|
|
118
|
+
return folder.replace(/^~/, node_os_1.default.homedir());
|
|
97
119
|
}
|
|
98
120
|
return folder;
|
|
99
121
|
}
|
|
100
122
|
static async checkIfFolderIsWritable(folder) {
|
|
101
123
|
// Check if the folder exists
|
|
102
124
|
try {
|
|
103
|
-
await
|
|
125
|
+
await node_fs_1.default.promises.access(folder, node_fs_1.default.constants.W_OK);
|
|
104
126
|
return folder; // The folder exists and is writable
|
|
105
127
|
}
|
|
106
128
|
catch {
|
package/dist/PathHelper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PathHelper.js","sourceRoot":"","sources":["../src/PathHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"PathHelper.js","sourceRoot":"","sources":["../src/PathHelper.ts"],"names":[],"mappings":"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"}
|
package/dist/commitInfo.json
CHANGED
package/dist/pdfProcessing.js
CHANGED
|
@@ -12,7 +12,7 @@ const path_1 = __importDefault(require("path"));
|
|
|
12
12
|
const jspdf_1 = require("jspdf");
|
|
13
13
|
async function mergeToPdf(folder, scanCount, scanJobContent, filePattern, date, deleteFiles) {
|
|
14
14
|
if (scanJobContent.elements.length > 0) {
|
|
15
|
-
const pdfFilePath = PathHelper_1.default.getFileForScan(folder, scanCount, filePattern, "pdf", date);
|
|
15
|
+
const pdfFilePath = await PathHelper_1.default.getFileForScan(folder, scanCount, filePattern, "pdf", date);
|
|
16
16
|
await createPdfFrom(scanJobContent, pdfFilePath);
|
|
17
17
|
if (deleteFiles) {
|
|
18
18
|
await Promise.all(scanJobContent.elements.map((e) => promises_1.default.unlink(e.path)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pdfProcessing.js","sourceRoot":"","sources":["../src/pdfProcessing.ts"],"names":[],"mappings":";;;;;AAMA,gCAwBC;AAED,oCAYC;AAED,sCAoBC;AAjED,8DAAsC;AACtC,2DAA6B;AAC7B,gDAAwB;AACxB,iCAA8B;AAEvB,KAAK,UAAU,UAAU,CAC9B,MAAc,EACd,SAAiB,EACjB,cAA2B,EAC3B,WAA+B,EAC/B,IAAU,EACV,WAAoB;IAEpB,IAAI,cAAc,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvC,MAAM,WAAW,GAAW,oBAAU,CAAC,cAAc,
|
|
1
|
+
{"version":3,"file":"pdfProcessing.js","sourceRoot":"","sources":["../src/pdfProcessing.ts"],"names":[],"mappings":";;;;;AAMA,gCAwBC;AAED,oCAYC;AAED,sCAoBC;AAjED,8DAAsC;AACtC,2DAA6B;AAC7B,gDAAwB;AACxB,iCAA8B;AAEvB,KAAK,UAAU,UAAU,CAC9B,MAAc,EACd,SAAiB,EACjB,cAA2B,EAC3B,WAA+B,EAC/B,IAAU,EACV,WAAoB;IAEpB,IAAI,cAAc,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvC,MAAM,WAAW,GAAW,MAAM,oBAAU,CAAC,cAAc,CACzD,MAAM,EACN,SAAS,EACT,WAAW,EACX,KAAK,EACL,IAAI,CACL,CAAC;QACF,MAAM,aAAa,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QACjD,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAE,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3E,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;IACrD,OAAO,IAAI,CAAC;AACd,CAAC;AAEM,KAAK,UAAU,YAAY,CAChC,QAAkB,EAClB,UAAmB;IAEnB,MAAM,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3E,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,QAAQ,MAAM,CAAC,CAAC;IAE9E,MAAM,aAAa,CAAC,EAAE,QAAQ,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;IAC3D,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,kBAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAEM,KAAK,UAAU,aAAa,CACjC,WAAwB,EACxB,WAAmB;IAEnB,IAAI,GAAG,GAAiB,IAAI,CAAC;IAC7B,KAAK,MAAM,OAAO,IAAI,WAAW,CAAC,QAAQ,EAAE,CAAC;QAC3C,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;QAC1D,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;QAC5D,MAAM,MAAM,GAAG,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;QAE/C,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;YAChB,GAAG,GAAG,IAAI,aAAK,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAC7D,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;QAED,MAAM,eAAe,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACxD,GAAG,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;IAC7E,CAAC;IACD,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;AACzB,CAAC"}
|
package/dist/scanJobHandlers.js
CHANGED
|
@@ -65,7 +65,7 @@ async function handleScanProcessingState(job, inputSource, folder, scanCount, cu
|
|
|
65
65
|
job.binaryURL != null &&
|
|
66
66
|
job.currentPageNumber != null) {
|
|
67
67
|
console.log(`Ready to download page job page ${job.currentPageNumber} at:`, job.binaryURL);
|
|
68
|
-
const destinationFilePath = PathHelper_1.default.getFileForPage(folder, scanCount, currentPageNumber, filePattern, "jpg", date);
|
|
68
|
+
const destinationFilePath = await PathHelper_1.default.getFileForPage(folder, scanCount, currentPageNumber, filePattern, "jpg", date);
|
|
69
69
|
const filePath = await HPApi_1.default.downloadPage(job.binaryURL, destinationFilePath);
|
|
70
70
|
console.log("Page downloaded to:", filePath);
|
|
71
71
|
const adfHeight = await getAndFixHeightWHenAdf(inputSource, filePath, job.imageHeight);
|
|
@@ -164,7 +164,7 @@ async function eSCLScanJobHandling(jobUrl, scanJobSettings, pageCountingStrategy
|
|
|
164
164
|
do {
|
|
165
165
|
await (0, delay_1.delay)(1000);
|
|
166
166
|
const pageNumber = getPageNumber(pageCountingStrategy, scanJobContent);
|
|
167
|
-
const destinationFilePath = PathHelper_1.default.getFileForPage(folder, scanCount, pageNumber, filePattern, "jpg", new Date());
|
|
167
|
+
const destinationFilePath = await PathHelper_1.default.getFileForPage(folder, scanCount, pageNumber, filePattern, "jpg", new Date());
|
|
168
168
|
const jobLocation = PathHelper_1.default.getPathFromHttpLocation(jobUrl);
|
|
169
169
|
const filePath = await HPApi_1.default.downloadEsclPage(jobUrl, destinationFilePath);
|
|
170
170
|
const scanImageInfo = await HPApi_1.default.getEsclScanImageInfo(jobLocation);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scanJobHandlers.js","sourceRoot":"","sources":["../src/scanJobHandlers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"scanJobHandlers.js","sourceRoot":"","sources":["../src/scanJobHandlers.ts"],"names":[],"mappings":"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"}
|
package/dist/scanProcessing.js
CHANGED
|
@@ -20,7 +20,7 @@ const KnownShortcut_1 = require("./type/KnownShortcut");
|
|
|
20
20
|
const pageCountingStrategy_1 = require("./type/pageCountingStrategy");
|
|
21
21
|
const ScannerState_1 = require("./hpModels/ScannerState");
|
|
22
22
|
async function tryGetDestination(event) {
|
|
23
|
-
// this code can in some cases be executed before the user actually chooses between Document or Photo
|
|
23
|
+
// this code can in some cases be executed before the user actually chooses between Document or Photo,
|
|
24
24
|
// so, let's fetch the contentType (Document or Photo) until we get a value
|
|
25
25
|
let destination = null;
|
|
26
26
|
for (let i = 0; i < 20; i++) {
|
|
@@ -96,14 +96,17 @@ function getScanHeight(scanConfig, inputSource, deviceCapabilities, isDuplex) {
|
|
|
96
96
|
async function saveScanFromEvent(selectedScanTarget, folder, tempFolder, scanCount, deviceCapabilities, scanConfig, isDuplex, isPdf, pageCountingStrategy) {
|
|
97
97
|
let destinationFolder;
|
|
98
98
|
let contentType;
|
|
99
|
+
let filePattern;
|
|
99
100
|
if (isPdf) {
|
|
100
101
|
contentType = "Document";
|
|
101
102
|
destinationFolder = tempFolder;
|
|
103
|
+
filePattern = undefined;
|
|
102
104
|
console.log(`Scan will be converted to pdf, using ${destinationFolder} as temp scan output directory for individual pages`);
|
|
103
105
|
}
|
|
104
106
|
else {
|
|
105
107
|
contentType = "Photo";
|
|
106
108
|
destinationFolder = folder;
|
|
109
|
+
filePattern = scanConfig.directoryConfig.filePattern;
|
|
107
110
|
}
|
|
108
111
|
const scanStatus = await deviceCapabilities.getScanStatus();
|
|
109
112
|
if (scanStatus.scannerState !== ScannerState_1.ScannerState.Idle) {
|
|
@@ -115,7 +118,7 @@ async function saveScanFromEvent(selectedScanTarget, folder, tempFolder, scanCou
|
|
|
115
118
|
const scanHeight = getScanHeight(scanConfig, inputSource, deviceCapabilities, isDuplex);
|
|
116
119
|
const scanJobSettings = deviceCapabilities.createScanJobSettings(inputSource, contentType, scanConfig.resolution, scanConfig.mode, scanWidth, scanHeight, isDuplex);
|
|
117
120
|
const scanJobContent = { elements: [] };
|
|
118
|
-
await (0, scanJobHandlers_1.executeScanJobs)(scanJobSettings, inputSource, destinationFolder, scanCount, scanJobContent, selectedScanTarget, deviceCapabilities,
|
|
121
|
+
await (0, scanJobHandlers_1.executeScanJobs)(scanJobSettings, inputSource, destinationFolder, scanCount, scanJobContent, selectedScanTarget, deviceCapabilities, filePattern, pageCountingStrategy);
|
|
119
122
|
console.log(`Scan of page(s) completed totalPages: ${scanJobContent.elements.length}:`);
|
|
120
123
|
return scanJobContent;
|
|
121
124
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scanProcessing.js","sourceRoot":"","sources":["../src/scanProcessing.ts"],"names":[],"mappings":";;;;;AA2BA,8CA4BC;AAED,sBAkBC;AAED,oCAsBC;AAED,sCAsBC;AAED,
|
|
1
|
+
{"version":3,"file":"scanProcessing.js","sourceRoot":"","sources":["../src/scanProcessing.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-hp-scan-to",
|
|
3
|
-
"version": "1.9.
|
|
3
|
+
"version": "1.9.1",
|
|
4
4
|
"description": "Scan document to Computer for HP All-in-One Printers",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Officejet",
|
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
"prestart": "node getCommitId.js",
|
|
18
18
|
"start": "ts-node src/index.ts",
|
|
19
19
|
"start:single-scan": "ts-node src/index.ts single-scan",
|
|
20
|
+
"start:clear-registrations": "ts-node src/index.ts clear-registrations",
|
|
20
21
|
"start:adf-autoscan": "ts-node src/index.ts adf-autoscan",
|
|
21
22
|
"start-debug": "ts-node src/index.ts -D",
|
|
22
23
|
"prebuild": "node getCommitId.js",
|
|
@@ -86,6 +87,7 @@
|
|
|
86
87
|
"config": "^4.1.1",
|
|
87
88
|
"dateformat": "^5.0.3",
|
|
88
89
|
"jspdf": "^3.0.2",
|
|
90
|
+
"nanoid": "^5.1.6",
|
|
89
91
|
"xml2js": "^0.6.2",
|
|
90
92
|
"zod": "^4.1.3"
|
|
91
93
|
},
|