enhanced-printer 1.0.3 → 1.0.5

package/lib/index.d.ts

@@ -10,6 +10,5 @@
  * - Automatic use of printer defaults when settings not specified
  * - Query job status and printer information
  */
-export { print, getPrinters, getDefaultPrinter, getJobStatus, getPrinterJobs, getJobs, // New method for getting jobs with custom names
-cancelJob } from './print-manager';
+export { print, getPrinters, getDefaultPrinter, getJobInfo, getJobs, cancelJob } from './print-manager';
 export { PrintOptions, PrintResult, PrinterInfo, JobInfo } from './types';

package/lib/index.js

@@ -12,12 +12,11 @@
  * - Query job status and printer information
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cancelJob = exports.getJobs = exports.getPrinterJobs = exports.getJobStatus = exports.getDefaultPrinter = exports.getPrinters = exports.print = void 0;
+exports.cancelJob = exports.getJobs = exports.getJobInfo = exports.getDefaultPrinter = exports.getPrinters = exports.print = void 0;
 var print_manager_1 = require("./print-manager");
 Object.defineProperty(exports, "print", { enumerable: true, get: function () { return print_manager_1.print; } });
 Object.defineProperty(exports, "getPrinters", { enumerable: true, get: function () { return print_manager_1.getPrinters; } });
 Object.defineProperty(exports, "getDefaultPrinter", { enumerable: true, get: function () { return print_manager_1.getDefaultPrinter; } });
-Object.defineProperty(exports, "getJobStatus", { enumerable: true, get: function () { return print_manager_1.getJobStatus; } });
-Object.defineProperty(exports, "getPrinterJobs", { enumerable: true, get: function () { return print_manager_1.getPrinterJobs; } });
+Object.defineProperty(exports, "getJobInfo", { enumerable: true, get: function () { return print_manager_1.getJobInfo; } });
 Object.defineProperty(exports, "getJobs", { enumerable: true, get: function () { return print_manager_1.getJobs; } });
 Object.defineProperty(exports, "cancelJob", { enumerable: true, get: function () { return print_manager_1.cancelJob; } });

package/lib/job-name-mapper.d.ts

@@ -10,6 +10,14 @@ export declare function storeJobName(printerName: string, jobId: number, customN
  * Get custom job name for a job
  */
 export declare function getCustomJobName(printerName: string, jobId: number): string | null;
+/**
+ * Get system job ID from a custom job name (reverse lookup)
+ * Returns the jobId and printerName if found, null otherwise
+ */
+export declare function getSystemJobId(customJobName: string, printerName?: string): {
+    jobId: number;
+    printerName: string;
+} | null;
 /**
  * Clear all job name mappings
  */

package/lib/job-name-mapper.js

@@ -6,6 +6,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storeJobName = storeJobName;
 exports.getCustomJobName = getCustomJobName;
+exports.getSystemJobId = getSystemJobId;
 exports.clearJobNames = clearJobNames;
 // In-memory storage for job name mappings
 const jobNameMap = new Map();
@@ -41,6 +42,27 @@ function getCustomJobName(printerName, jobId) {
     }
     return mapping.customName;
 }
+/**
+ * Get system job ID from a custom job name (reverse lookup)
+ * Returns the jobId and printerName if found, null otherwise
+ */
+function getSystemJobId(customJobName, printerName) {
+    const now = Date.now();
+    for (const [key, mapping] of jobNameMap.entries()) {
+        // Skip expired mappings
+        if (now - mapping.timestamp > MAX_MAPPING_AGE) {
+            continue;
+        }
+        if (mapping.customName === customJobName) {
+            // If printerName is provided, match it too
+            if (printerName && mapping.printerName !== printerName) {
+                continue;
+            }
+            return { jobId: mapping.jobId, printerName: mapping.printerName };
+        }
+    }
+    return null;
+}
 /**
  * Clean mappings older than MAX_MAPPING_AGE
  */

package/lib/job-tracker.d.ts

@@ -4,9 +4,14 @@ import { JobInfo } from './types';
  */
 export declare function getJobIdByName(printerName: string, jobName: string, maxRetries?: number, retryDelay?: number): Promise<number | null>;
 /**
- * Gets detailed information about a print job
+ * Gets detailed information about a print job using system job ID
  */
-export declare function getJobInfo(printerName: string, jobId: number): Promise<JobInfo | null>;
+export declare function getJobInfoBySystemId(printerName: string, jobId: number): Promise<JobInfo | null>;
+/**
+ * Gets detailed information about a print job using custom job name
+ * Resolves the custom job name to the system job ID, then queries the spooler
+ */
+export declare function getJobInfo(customJobName: string, printerName?: string): Promise<JobInfo | null>;
 /**
  * Gets all print jobs for a printer with enhanced details
  */

package/lib/job-tracker.js

@@ -1,10 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getJobIdByName = getJobIdByName;
+exports.getJobInfoBySystemId = getJobInfoBySystemId;
 exports.getJobInfo = getJobInfo;
 exports.getAllJobs = getAllJobs;
 const child_process_1 = require("child_process");
 const job_name_mapper_1 = require("./job-name-mapper");
+/**
+ * Windows print job status flags (bitmask values)
+ * See: https://learn.microsoft.com/en-us/windows/win32/printdocs/job-info-2
+ */
+const JOB_STATUS_FLAGS = {
+    0x0001: 'Paused',
+    0x0002: 'Error',
+    0x0004: 'Deleting',
+    0x0008: 'Spooling',
+    0x0010: 'Printing',
+    0x0020: 'Offline',
+    0x0040: 'PaperOut',
+    0x0080: 'Printed',
+    0x0100: 'Deleted',
+    0x0200: 'BlockedDeviceQueue',
+    0x0400: 'UserIntervention',
+    0x0800: 'Restart',
+    0x1000: 'Complete',
+    0x2000: 'Retained',
+    0x4000: 'RenderingLocally',
+};
+/**
+ * Decodes a numeric job status bitmask into a human-readable string.
+ * e.g. 8210 (0x2012) => "Error, Printing, Retained"
+ */
+function decodeJobStatus(status) {
+    // If it's already a string, return it as-is
+    if (typeof status === 'string') {
+        return status || 'Unknown';
+    }
+    const numericStatus = Number(status);
+    if (isNaN(numericStatus) || numericStatus === 0) {
+        return 'None';
+    }
+    const flags = [];
+    for (const [bit, name] of Object.entries(JOB_STATUS_FLAGS)) {
+        if (numericStatus & Number(bit)) {
+            flags.push(name);
+        }
+    }
+    return flags.length > 0 ? flags.join(', ') : 'Unknown';
+}
 /**
  * Retrieves job ID by document name using PowerShell
  */
@@ -22,9 +65,9 @@ async function getJobIdByName(printerName, jobName, maxRetries = 3, retryDelay =
     return null;
 }
 /**
- * Gets detailed information about a print job
+ * Gets detailed information about a print job using system job ID
  */
-async function getJobInfo(printerName, jobId) {
+async function getJobInfoBySystemId(printerName, jobId) {
     const script = `
     Get-PrintJob -PrinterName "${escapePowerShellString(printerName)}" |
     Where-Object {$_.Id -eq ${jobId}} |
@@ -42,9 +85,9 @@ async function getJobInfo(printerName, jobId) {
         return {
             jobId: result.Id,
             jobName: result.DocumentName || '',
-            customJobName: customName || result.DocumentName || '', // Use custom name if available
+            customJobName: customName || result.DocumentName || '',
             printerName: printerName,
-            status: result.JobStatus || 'Unknown',
+            status: decodeJobStatus(result.JobStatus),
             pages: result.TotalPages || 0,
             size: result.Size,
             userName: result.UserName,
@@ -55,6 +98,18 @@ async function getJobInfo(printerName, jobId) {
         return null;
     }
 }
+/**
+ * Gets detailed information about a print job using custom job name
+ * Resolves the custom job name to the system job ID, then queries the spooler
+ */
+async function getJobInfo(customJobName, printerName) {
+    // Resolve custom job name to system job ID
+    const mapping = (0, job_name_mapper_1.getSystemJobId)(customJobName, printerName);
+    if (!mapping) {
+        return null;
+    }
+    return getJobInfoBySystemId(mapping.printerName, mapping.jobId);
+}
 /**
  * Gets all print jobs for a printer with enhanced details
  */
@@ -77,7 +132,7 @@ async function getAllJobs(printerName) {
                 jobName: job.DocumentName || '',
                 customJobName: customName || job.DocumentName || '', // Use custom name if available
                 printerName: printerName,
-                status: job.JobStatus || 'Unknown',
+                status: decodeJobStatus(job.JobStatus),
                 pages: job.TotalPages || 0,
                 size: job.Size,
                 userName: job.UserName,

package/lib/print-manager.d.ts

@@ -12,19 +12,14 @@ export declare function getPrinters(): Promise<PrinterInfo[]>;
  */
 export declare function getDefaultPrinter(): Promise<string | null>;
 /**
- * Gets information about a specific print job
+ * Gets detailed information about a print job using custom job name
  */
-export declare function getJobStatus(printerName: string, jobId: number): Promise<JobInfo | null>;
+export declare function getJobInfo(customJobName: string, printerName?: string): Promise<JobInfo | null>;
 /**
  * Gets all print jobs for a specific printer
  */
-export declare function getPrinterJobs(printerName: string): Promise<JobInfo[]>;
-/**
- * Gets all print jobs with custom job names for a specific printer
- * This is an alias for getPrinterJobs with clearer intent
- */
 export declare function getJobs(printerName: string): Promise<JobInfo[]>;
 /**
- * Cancels a print job
+ * Cancels a print job using custom job name
  */
-export declare function cancelJob(printerName: string, jobId: number): Promise<boolean>;
+export declare function cancelJob(customJobName: string, printerName?: string): Promise<boolean>;

package/lib/print-manager.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.print = print;
 exports.getPrinters = getPrinters;
 exports.getDefaultPrinter = getDefaultPrinter;
-exports.getJobStatus = getJobStatus;
-exports.getPrinterJobs = getPrinterJobs;
+exports.getJobInfo = getJobInfo;
 exports.getJobs = getJobs;
 exports.cancelJob = cancelJob;
 const pdf_to_printer_1 = require("pdf-to-printer");
@@ -120,30 +119,28 @@ async function getDefaultPrinter() {
     return defaultPrinter ? defaultPrinter.name : null;
 }
 /**
- * Gets information about a specific print job
+ * Gets detailed information about a print job using custom job name
  */
-async function getJobStatus(printerName, jobId) {
-    return (0, job_tracker_1.getJobInfo)(printerName, jobId);
+async function getJobInfo(customJobName, printerName) {
+    return (0, job_tracker_1.getJobInfo)(customJobName, printerName);
 }
 /**
  * Gets all print jobs for a specific printer
  */
-async function getPrinterJobs(printerName) {
-    return (0, job_tracker_1.getAllJobs)(printerName);
-}
-/**
- * Gets all print jobs with custom job names for a specific printer
- * This is an alias for getPrinterJobs with clearer intent
- */
 async function getJobs(printerName) {
     return (0, job_tracker_1.getAllJobs)(printerName);
 }
 /**
- * Cancels a print job
+ * Cancels a print job using custom job name
  */
-async function cancelJob(printerName, jobId) {
+async function cancelJob(customJobName, printerName) {
+    // Resolve custom job name to system job ID
+    const mapping = (0, job_name_mapper_1.getSystemJobId)(customJobName, printerName);
+    if (!mapping) {
+        return false;
+    }
     const script = `
-    Remove-PrintJob -PrinterName "${escapePowerShellString(printerName)}" -ID ${jobId}
+    Remove-PrintJob -PrinterName "${escapePowerShellString(mapping.printerName)}" -ID ${mapping.jobId}
   `;
     try {
         await executePowerShell(script);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "enhanced-printer",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Advanced PDF printing library with job tracking, custom page sizes, and tray selection for Node.js and Electron",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",