enhanced-printer 1.0.2 → 1.0.4

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

@@ -0,0 +1,24 @@
+/**
+ * Job name mapping to track custom names
+ * Maps job ID to custom job name provided by user
+ */
+/**
+ * Store custom job name mapping
+ */
+export declare function storeJobName(printerName: string, jobId: number, customName: string): void;
+/**
+ * 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
+ */
+export declare function clearJobNames(): void;

package/lib/job-name-mapper.js

@@ -0,0 +1,84 @@
+"use strict";
+/**
+ * Job name mapping to track custom names
+ * Maps job ID to custom job name provided by user
+ */
+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();
+// Max age for mappings (24 hours)
+const MAX_MAPPING_AGE = 24 * 60 * 60 * 1000;
+/**
+ * Store custom job name mapping
+ */
+function storeJobName(printerName, jobId, customName) {
+    const key = `${printerName}_${jobId}`;
+    jobNameMap.set(key, {
+        jobId,
+        customName,
+        printerName,
+        timestamp: Date.now()
+    });
+    // Clean old entries
+    cleanOldMappings();
+}
+/**
+ * Get custom job name for a job
+ */
+function getCustomJobName(printerName, jobId) {
+    const key = `${printerName}_${jobId}`;
+    const mapping = jobNameMap.get(key);
+    if (!mapping) {
+        return null;
+    }
+    // Check if mapping is too old
+    if (Date.now() - mapping.timestamp > MAX_MAPPING_AGE) {
+        jobNameMap.delete(key);
+        return null;
+    }
+    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
+ */
+function cleanOldMappings() {
+    const now = Date.now();
+    const keysToDelete = [];
+    jobNameMap.forEach((mapping, key) => {
+        if (now - mapping.timestamp > MAX_MAPPING_AGE) {
+            keysToDelete.push(key);
+        }
+    });
+    keysToDelete.forEach(key => jobNameMap.delete(key));
+}
+/**
+ * Clear all job name mappings
+ */
+function clearJobNames() {
+    jobNameMap.clear();
+}

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,9 +1,11 @@
 "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");
 /**
  * Retrieves job ID by document name using PowerShell
  */
@@ -21,9 +23,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}} |
@@ -36,10 +38,12 @@ async function getJobInfo(printerName, jobId) {
         if (!result || !result.Id) {
             return null;
         }
+        // Get custom job name from mapper
+        const customName = (0, job_name_mapper_1.getCustomJobName)(printerName, result.Id);
         return {
             jobId: result.Id,
             jobName: result.DocumentName || '',
-            customJobName: result.DocumentName || '', // Custom name you provided during print
+            customJobName: customName || result.DocumentName || '',
             printerName: printerName,
             status: result.JobStatus || 'Unknown',
             pages: result.TotalPages || 0,
@@ -52,6 +56,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
  */
@@ -66,17 +82,21 @@ async function getAllJobs(printerName) {
         const result = JSON.parse(output);
         // Handle single result vs array
         const jobs = Array.isArray(result) ? result : (result ? [result] : []);
-        return jobs.map((job) => ({
-            jobId: job.Id,
-            jobName: job.DocumentName || '',
-            customJobName: job.DocumentName || '', // Custom name you provided during print
-            printerName: printerName,
-            status: job.JobStatus || 'Unknown',
-            pages: job.TotalPages || 0,
-            size: job.Size,
-            userName: job.UserName,
-            submittedTime: job.SubmittedTime
-        }));
+        return jobs.map((job) => {
+            // Get custom job name from mapper
+            const customName = (0, job_name_mapper_1.getCustomJobName)(printerName, job.Id);
+            return {
+                jobId: job.Id,
+                jobName: job.DocumentName || '',
+                customJobName: customName || job.DocumentName || '', // Use custom name if available
+                printerName: printerName,
+                status: job.JobStatus || 'Unknown',
+                pages: job.TotalPages || 0,
+                size: job.Size,
+                userName: job.UserName,
+                submittedTime: job.SubmittedTime
+            };
+        });
     }
     catch (error) {
         return [];

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,14 +3,14 @@ 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");
 const uuid_1 = require("uuid");
 const child_process_1 = require("child_process");
 const job_tracker_1 = require("./job-tracker");
+const job_name_mapper_1 = require("./job-name-mapper");
 /**
  * Prints a PDF file with the specified options
  */
@@ -64,11 +64,15 @@ async function print(options) {
             printOptions.subset = options.subset;
         }
         // Set the document name for job tracking
-        printOptions.win32 = ['-print-settings', `${jobName}`];
+        printOptions.win32 = ['-print-settings', `${options.filePath}`];
         // Print the document
         await (0, pdf_to_printer_1.print)(options.filePath, printOptions);
         // Try to retrieve job ID
-        const jobId = await (0, job_tracker_1.getJobIdByName)(options.printerName, jobName);
+        const jobId = await (0, job_tracker_1.getJobIdByName)(options.printerName, options.filePath);
+        // Store custom job name mapping if we got a job ID
+        if (jobId) {
+            (0, job_name_mapper_1.storeJobName)(options.printerName, jobId, jobName);
+        }
         return {
             success: true,
             jobId: jobId || undefined,
@@ -115,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.2",
+  "version": "1.0.4",
   "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",