node-poppler 7.0.0 → 7.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-poppler",
-	"version": "7.0.0",
+	"version": "7.0.2",
 	"description": "Asynchronous node.js wrapper for the Poppler PDF rendering library",
 	"keywords": [
 		"async",

package/src/index.js

@@ -16,9 +16,12 @@ const errorMessages = {
 	4: "Error related to ICC profile",
 	99: "Other error",
 	3221226505: "Internal process error",
-	unk: "Unknown error",
 };
 
+// Cache immutable regex as they are expensive to create and garbage collect
+const popplerVersionRegex = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u;
+const pdfInfoFileSizesRegex = /(File\s+size:\s+)0(\s+)bytes/u;
+
 /**
  * @author Frazer Smith
  * @description Checks each option provided is valid, of the correct type, and can be used by specified
@@ -37,7 +40,7 @@ function parseOptions(acceptedOptions, options, version) {
 	const invalidArgs = [];
 	Object.keys(options).forEach((key) => {
 		if (Object.hasOwn(acceptedOptions, key)) {
-			// eslint-disable-next-line valid-typeof
+			// eslint-disable-next-line valid-typeof -- `type` is a string
 			if (typeof options[key] === acceptedOptions[key].type) {
 				// Skip boolean options if false
 
@@ -223,7 +226,7 @@ class Poppler {
 			);
 
 			// @ts-ignore: parseOptions checks if falsy
-			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
+			const versionInfo = popplerVersionRegex.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
 
@@ -255,11 +258,23 @@ class Poppler {
 					stdErr += data;
 				});
 
-				child.on("close", () => {
+				child.on("close", (code) => {
+					/* istanbul ignore else */
 					if (stdOut !== "") {
 						resolve(stdOut.trim());
+					} else if (code === 0) {
+						resolve(errorMessages[code]);
+					} else if (stdErr !== "") {
+						reject(new Error(stdErr.trim()));
 					} else {
-						reject(new Error(stdErr ? stdErr.trim() : undefined));
+						reject(
+							new Error(
+								errorMessages[code] ||
+									`pdffonts ${args.join(
+										" "
+									)} exited with code ${code}`
+							)
+						);
 					}
 				});
 			});
@@ -316,7 +331,7 @@ class Poppler {
 			);
 
 			// @ts-ignore: parseOptions checks if falsy
-			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
+			const versionInfo = popplerVersionRegex.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
 
@@ -363,7 +378,10 @@ class Poppler {
 					} else {
 						reject(
 							new Error(
-								code ? errorMessages[code] : errorMessages.unk
+								errorMessages[code] ||
+									`pdfimages ${args.join(
+										" "
+									)} exited with code ${code}`
 							)
 						);
 					}
@@ -437,7 +455,7 @@ class Poppler {
 			);
 
 			// @ts-ignore: parseOptions checks if falsy
-			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
+			const versionInfo = popplerVersionRegex.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
 
@@ -477,11 +495,12 @@ class Poppler {
 					stdErr += data;
 				});
 
-				child.on("close", () => {
+				child.on("close", (code) => {
+					/* istanbul ignore else */
 					if (stdOut !== "") {
 						if (fileSize) {
 							stdOut = stdOut.replace(
-								/(File\s+size:\s+)0(\s+)bytes/u,
+								pdfInfoFileSizesRegex,
 								`$1${fileSize}$2bytes`
 							);
 						}
@@ -503,8 +522,19 @@ class Poppler {
 						} else {
 							resolve(stdOut.trim());
 						}
+					} else if (code === 0) {
+						resolve(errorMessages[code]);
+					} else if (stdErr !== "") {
+						reject(new Error(stdErr.trim()));
 					} else {
-						reject(new Error(stdErr ? stdErr.trim() : undefined));
+						reject(
+							new Error(
+								errorMessages[code] ||
+									`pdfinfo ${args.join(
+										" "
+									)} exited with code ${code}`
+							)
+						);
 					}
 				});
 			});
@@ -544,7 +574,7 @@ class Poppler {
 			);
 
 			// @ts-ignore: parseOptions checks if falsy
-			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
+			const versionInfo = popplerVersionRegex.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
 			args.push(file);
@@ -722,7 +752,7 @@ class Poppler {
 			);
 
 			// @ts-ignore: parseOptions checks if falsy
-			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
+			const versionInfo = popplerVersionRegex.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
 
@@ -778,7 +808,10 @@ class Poppler {
 					} else {
 						reject(
 							new Error(
-								code ? errorMessages[code] : errorMessages.unk
+								errorMessages[code] ||
+									`pdftocairo ${args.join(
+										" "
+									)} exited with code ${code}`
 							)
 						);
 					}
@@ -867,7 +900,7 @@ class Poppler {
 			);
 
 			// @ts-ignore: parseOptions checks if falsy
-			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
+			const versionInfo = popplerVersionRegex.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
 
@@ -1072,7 +1105,7 @@ class Poppler {
 			);
 
 			// @ts-ignore: parseOptions checks if falsy
-			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
+			const versionInfo = popplerVersionRegex.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
 
@@ -1110,7 +1143,10 @@ class Poppler {
 					} else {
 						reject(
 							new Error(
-								code ? errorMessages[code] : errorMessages.unk
+								errorMessages[code] ||
+									`pdftoppm ${args.join(
+										" "
+									)} exited with code ${code}`
 							)
 						);
 					}
@@ -1307,7 +1343,7 @@ class Poppler {
 			);
 
 			// @ts-ignore: parseOptions checks if falsy
-			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
+			const versionInfo = popplerVersionRegex.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
 
@@ -1356,7 +1392,10 @@ class Poppler {
 					} else {
 						reject(
 							new Error(
-								code ? errorMessages[code] : errorMessages.unk
+								errorMessages[code] ||
+									`pdftops ${args.join(
+										" "
+									)} exited with code ${code}`
 							)
 						);
 					}
@@ -1461,7 +1500,7 @@ class Poppler {
 			);
 
 			// @ts-ignore: parseOptions checks if falsy
-			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
+			const versionInfo = popplerVersionRegex.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
 
@@ -1510,7 +1549,10 @@ class Poppler {
 					} else {
 						reject(
 							new Error(
-								code ? errorMessages[code] : errorMessages.unk
+								errorMessages[code] ||
+									`pdftotext ${args.join(
+										" "
+									)} exited with code ${code}`
 							)
 						);
 					}
@@ -1544,7 +1586,7 @@ class Poppler {
 			);
 
 			// @ts-ignore: parseOptions checks if falsy
-			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
+			const versionInfo = popplerVersionRegex.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
 			files.forEach((element) => {