@ecobridge.xyz/devicemanager 3.0.2 → 3.1.1

package/ts/features/feature.print.ts

@@ -4,7 +4,7 @@
  */
 
 import { Feature, type TDeviceReference } from './feature.abstract.js';
-import { IppProtocol } from '../protocols/index.js';
+import { IppProtocol, type IIppPrinterCapabilities, type IIppJob } from '../protocols/index.js';
 import type {
   TPrintProtocol,
   TPrintSides,
@@ -16,7 +16,6 @@ import type {
   IPrintFeatureInfo,
   IFeatureOptions,
 } from '../interfaces/feature.interfaces.js';
-import type { IPrinterCapabilities } from '../interfaces/index.js';
 
 /**
  * Options for creating a PrintFeature
@@ -101,7 +100,7 @@ export class PrintFeature extends Feature {
 
       this.ippClient = new IppProtocol(address, port, path);
       // Verify connection by getting printer attributes
-      const attrs = await this.ippClient.getAttributes();
+      const attrs = await this.ippClient.getPrinterAttributes();
       this.updateCapabilitiesFromIpp(attrs);
     }
     // JetDirect and LPD don't need connection verification
@@ -154,7 +153,8 @@ export class PrintFeature extends Feature {
       throw new Error('Print feature not connected');
     }
 
-    return this.ippClient.getJobs();
+    const jobs = await this.ippClient.getJobs();
+    return jobs.map(job => this.mapIppJobToInternal(job));
   }
 
   /**
@@ -165,7 +165,8 @@ export class PrintFeature extends Feature {
       throw new Error('Print feature not connected');
     }
 
-    return this.ippClient.getJobInfo(jobId);
+    const job = await this.ippClient.getJobAttributes(jobId);
+    return this.mapIppJobToInternal(job);
   }
 
   /**
@@ -191,9 +192,17 @@ export class PrintFeature extends Feature {
 
     this.emit('print:started', options);
 
-    // IppProtocol.print() accepts IPrintOptions and returns IPrintJob
-    const job = await this.ippClient.print(data, options);
+    // Use smartPrint for auto format detection and conversion
+    const ippJob = await this.ippClient.smartPrint(data, {
+      jobName: options?.jobName,
+      copies: options?.copies,
+      media: options?.mediaSize,
+      sides: options?.sides,
+      printQuality: options?.quality,
+      colorMode: options?.colorMode,
+    });
 
+    const job = this.mapIppJobToInternal(ippJob);
     this.emit('print:submitted', job);
     return job;
   }
@@ -202,58 +211,57 @@ export class PrintFeature extends Feature {
   // Helper Methods
   // ============================================================================
 
-  private updateCapabilitiesFromIpp(caps: IPrinterCapabilities): void {
+  private updateCapabilitiesFromIpp(caps: IIppPrinterCapabilities): void {
     this.supportsColor = caps.colorSupported;
-    this.supportsDuplex = caps.duplexSupported;
-    this.maxCopies = caps.maxCopies;
-
-    if (caps.mediaSizes && caps.mediaSizes.length > 0) {
-      this.supportedMediaSizes = caps.mediaSizes;
+    // Derive duplexSupported from sidesSupported
+    this.supportsDuplex = caps.sidesSupported?.some(s =>
+      s.includes('two-sided')
+    ) ?? false;
+    // Get max copies from range
+    this.maxCopies = caps.copiesSupported?.upper ?? 99;
+
+    if (caps.mediaSizeSupported && caps.mediaSizeSupported.length > 0) {
+      this.supportedMediaSizes = caps.mediaSizeSupported;
     }
-    if (caps.mediaTypes && caps.mediaTypes.length > 0) {
-      this.supportedMediaTypes = caps.mediaTypes;
+    if (caps.mediaTypeSupported && caps.mediaTypeSupported.length > 0) {
+      this.supportedMediaTypes = caps.mediaTypeSupported;
     }
     if (caps.sidesSupported && caps.sidesSupported.length > 0) {
       this.supportedSides = caps.sidesSupported.filter((s): s is TPrintSides =>
         ['one-sided', 'two-sided-long-edge', 'two-sided-short-edge'].includes(s)
       );
     }
-    if (caps.qualitySupported && caps.qualitySupported.length > 0) {
-      this.supportedQualities = caps.qualitySupported.filter((q): q is TPrintQuality =>
-        ['draft', 'normal', 'high'].includes(q)
-      );
-    }
-  }
-
-  private qualityToIpp(quality: TPrintQuality): number {
-    switch (quality) {
-      case 'draft': return 3;
-      case 'normal': return 4;
-      case 'high': return 5;
-      default: return 4;
+    // Map IPP quality values (3=draft, 4=normal, 5=high) to strings
+    if (caps.printQualitySupported && caps.printQualitySupported.length > 0) {
+      const qualityMap: Record<number, TPrintQuality> = { 3: 'draft', 4: 'normal', 5: 'high' };
+      this.supportedQualities = caps.printQualitySupported
+        .map(q => qualityMap[q])
+        .filter((q): q is TPrintQuality => q !== undefined);
     }
   }
 
-  private mapIppJob(job: Record<string, unknown>): IPrintJob {
-    const stateMap: Record<number, IPrintJob['state']> = {
-      3: 'pending',
-      4: 'pending',
-      5: 'processing',
-      6: 'processing',
-      7: 'canceled',
-      8: 'aborted',
-      9: 'completed',
+  /**
+   * Map IIppJob to IPrintJob, normalizing extended states
+   */
+  private mapIppJobToInternal(job: IIppJob): IPrintJob {
+    // Map extended IPP states to simpler internal states
+    const stateMap: Record<IIppJob['state'], IPrintJob['state']> = {
+      'pending': 'pending',
+      'pending-held': 'pending',
+      'processing': 'processing',
+      'processing-stopped': 'processing',
+      'canceled': 'canceled',
+      'aborted': 'aborted',
+      'completed': 'completed',
     };
 
     return {
-      id: job['job-id'] as number,
-      name: job['job-name'] as string ?? 'Unknown',
-      state: stateMap[(job['job-state'] as number) ?? 3] ?? 'pending',
-      stateReason: (job['job-state-reasons'] as string[])?.[0],
-      createdAt: new Date((job['time-at-creation'] as number) * 1000),
-      completedAt: job['time-at-completed']
-        ? new Date((job['time-at-completed'] as number) * 1000)
-        : undefined,
+      id: job.id,
+      name: job.name,
+      state: stateMap[job.state],
+      stateReason: job.stateReasons?.[0],
+      createdAt: job.createdAt,
+      completedAt: job.completedAt,
     };
   }
 

package/ts/index.ts

@@ -160,6 +160,7 @@ export * from './interfaces/index.js';
 export type {
   ISsdpDevice,
   ISsdpDeviceDescription,
+  ISsdpDiscoveryDependencies,
   ISsdpService,
   ISsdpIcon,
 } from './discovery/discovery.classes.ssdp.js';

package/ts/interfaces/feature.interfaces.ts

@@ -168,7 +168,7 @@ export interface IPrintJob {
   name: string;
   state: 'pending' | 'processing' | 'completed' | 'canceled' | 'aborted';
   stateReason?: string;
-  createdAt: Date;
+  createdAt?: Date;
   completedAt?: Date;
   pagesPrinted?: number;
   pagesTotal?: number;

package/ts/interfaces/index.ts

@@ -154,7 +154,7 @@ export interface IPrintJob {
   name: string;
   state: 'pending' | 'processing' | 'completed' | 'canceled' | 'aborted';
   stateReason?: string;
-  createdAt: Date;
+  createdAt?: Date;
   completedAt?: Date;
   pagesPrinted?: number;
   pagesTotal?: number;

package/ts/plugins.ts

@@ -1,41 +1,21 @@
 // native scope
 import * as path from 'path';
 import * as net from 'net';
-import * as dgram from 'dgram';
+import * as dgram from 'node:dgram';
+import * as os from 'node:os';
 import * as events from 'events';
 
-export { path, net, dgram, events };
+export { path, net, dgram, os, events };
 
 // @push.rocks scope
 import * as smartpath from '@push.rocks/smartpath';
-import * as smartpromise from '@push.rocks/smartpromise';
 import * as smartdelay from '@push.rocks/smartdelay';
-import * as smartnetwork from '@push.rocks/smartnetwork';
 
-// Re-export SmartRequest for HTTP
-import { SmartRequest } from '@push.rocks/smartrequest';
-export { SmartRequest };
-
-export {
-  smartpath,
-  smartpromise,
-  smartdelay,
-  smartnetwork,
-};
+export { smartpath, smartdelay };
 
 // third party
 import * as bonjourService from 'bonjour-service';
-import ipp from 'ipp';
-import nodeSsdpModule from 'node-ssdp';
 import * as netSnmp from 'net-snmp';
-import * as sonos from 'sonos';
-import * as castv2Client from 'castv2-client';
 import WebSocket from 'ws';
 
-// node-ssdp exports Client/Server under default in ESM
-const nodeSsdp = {
-  Client: nodeSsdpModule.Client,
-  Server: nodeSsdpModule.Server,
-};
-
-export { bonjourService, ipp, nodeSsdp, netSnmp, sonos, castv2Client, WebSocket };
+export { bonjourService, netSnmp, WebSocket };

package/ts/protocols/index.ts

@@ -10,7 +10,12 @@ export { EsclProtocol } from './protocol.escl.js';
 export { SaneProtocol } from './protocol.sane.js';
 
 // IPP printer protocol
-export { IppProtocol } from './protocol.ipp.js';
+export {
+  IppProtocol,
+  type IIppPrinterCapabilities,
+  type IIppJob,
+  type IIppPrintOptions,
+} from './protocol.ipp.js';
 
 // SNMP query protocol
 export {

package/ts/protocols/protocol.escl.ts

@@ -118,7 +118,7 @@ export class EsclProtocol {
   public async submitScanJob(options: IScanOptions): Promise<string> {
     const scanSettings = this.buildScanSettings(options);
 
-    // Use fetch for POST with body since SmartRequest API may not support raw body
+    // Use fetch for the raw XML request body.
     const response = await fetch(`${this.baseUrl}/ScanJobs`, {
       method: 'POST',
       headers: {