@ecobridge.xyz/devicemanager 3.0.2 → 3.1.0
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/changelog.md +10 -0
- package/dist_ts/features/feature.print.d.ts +4 -2
- package/dist_ts/features/feature.print.js +48 -38
- package/dist_ts/protocols/index.d.ts +1 -1
- package/dist_ts/protocols/index.js +2 -2
- package/dist_ts/protocols/protocol.ipp.d.ts +144 -33
- package/dist_ts/protocols/protocol.ipp.js +942 -239
- package/dist_ts/protocols/protocol.ipp.old.d.ts +45 -0
- package/dist_ts/protocols/protocol.ipp.old.js +284 -0
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/features/feature.print.ts +53 -45
- package/ts/protocols/index.ts +6 -1
- package/ts/protocols/protocol.ipp.ts +1183 -260
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import type { IPrinterCapabilities, IPrintOptions, IPrintJob } from '../interfaces/index.js';
|
|
2
|
+
/**
|
|
3
|
+
* IPP protocol wrapper using the ipp npm package
|
|
4
|
+
*/
|
|
5
|
+
export declare class IppProtocol {
|
|
6
|
+
private printerUrl;
|
|
7
|
+
private printer;
|
|
8
|
+
constructor(address: string, port: number, path?: string);
|
|
9
|
+
/**
|
|
10
|
+
* Get printer attributes/capabilities
|
|
11
|
+
*/
|
|
12
|
+
getAttributes(): Promise<IPrinterCapabilities>;
|
|
13
|
+
/**
|
|
14
|
+
* Print a document
|
|
15
|
+
*/
|
|
16
|
+
print(data: Buffer, options?: IPrintOptions): Promise<IPrintJob>;
|
|
17
|
+
/**
|
|
18
|
+
* Get all jobs
|
|
19
|
+
*/
|
|
20
|
+
getJobs(): Promise<IPrintJob[]>;
|
|
21
|
+
/**
|
|
22
|
+
* Get specific job info
|
|
23
|
+
*/
|
|
24
|
+
getJobInfo(jobId: number): Promise<IPrintJob>;
|
|
25
|
+
/**
|
|
26
|
+
* Cancel a job
|
|
27
|
+
*/
|
|
28
|
+
cancelJob(jobId: number): Promise<void>;
|
|
29
|
+
/**
|
|
30
|
+
* Check if printer is available
|
|
31
|
+
*/
|
|
32
|
+
checkAvailability(): Promise<boolean>;
|
|
33
|
+
/**
|
|
34
|
+
* Build IPP print message from options
|
|
35
|
+
*/
|
|
36
|
+
private buildPrintMessage;
|
|
37
|
+
/**
|
|
38
|
+
* Parse printer capabilities from attributes
|
|
39
|
+
*/
|
|
40
|
+
private parseCapabilities;
|
|
41
|
+
/**
|
|
42
|
+
* Parse job info from attributes
|
|
43
|
+
*/
|
|
44
|
+
private parseJobInfo;
|
|
45
|
+
}
|
|
@@ -0,0 +1,284 @@
|
|
|
1
|
+
import * as plugins from '../plugins.js';
|
|
2
|
+
/**
|
|
3
|
+
* IPP protocol wrapper using the ipp npm package
|
|
4
|
+
*/
|
|
5
|
+
export class IppProtocol {
|
|
6
|
+
printerUrl;
|
|
7
|
+
printer;
|
|
8
|
+
constructor(address, port, path = '/ipp/print') {
|
|
9
|
+
this.printerUrl = `ipp://${address}:${port}${path}`;
|
|
10
|
+
this.printer = plugins.ipp.Printer(this.printerUrl);
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Get printer attributes/capabilities
|
|
14
|
+
*/
|
|
15
|
+
async getAttributes() {
|
|
16
|
+
return new Promise((resolve, reject) => {
|
|
17
|
+
this.printer.execute('Get-Printer-Attributes', null, (err, res) => {
|
|
18
|
+
if (err) {
|
|
19
|
+
reject(err);
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
try {
|
|
23
|
+
const attrs = res['printer-attributes-tag'] || {};
|
|
24
|
+
resolve(this.parseCapabilities(attrs));
|
|
25
|
+
}
|
|
26
|
+
catch (parseErr) {
|
|
27
|
+
reject(parseErr);
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Print a document
|
|
34
|
+
*/
|
|
35
|
+
async print(data, options) {
|
|
36
|
+
const msg = this.buildPrintMessage(options);
|
|
37
|
+
return new Promise((resolve, reject) => {
|
|
38
|
+
this.printer.execute('Print-Job', { ...msg, data }, (err, res) => {
|
|
39
|
+
if (err) {
|
|
40
|
+
reject(err);
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
try {
|
|
44
|
+
const jobAttrs = res['job-attributes-tag'] || {};
|
|
45
|
+
resolve(this.parseJobInfo(jobAttrs));
|
|
46
|
+
}
|
|
47
|
+
catch (parseErr) {
|
|
48
|
+
reject(parseErr);
|
|
49
|
+
}
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* Get all jobs
|
|
55
|
+
*/
|
|
56
|
+
async getJobs() {
|
|
57
|
+
return new Promise((resolve, reject) => {
|
|
58
|
+
this.printer.execute('Get-Jobs', {
|
|
59
|
+
'operation-attributes-tag': {
|
|
60
|
+
'requesting-user-name': 'devicemanager',
|
|
61
|
+
'which-jobs': 'not-completed',
|
|
62
|
+
},
|
|
63
|
+
}, (err, res) => {
|
|
64
|
+
if (err) {
|
|
65
|
+
reject(err);
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
try {
|
|
69
|
+
const jobs = [];
|
|
70
|
+
const jobTags = res['job-attributes-tag'];
|
|
71
|
+
if (Array.isArray(jobTags)) {
|
|
72
|
+
for (const jobAttrs of jobTags) {
|
|
73
|
+
jobs.push(this.parseJobInfo(jobAttrs));
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
else if (jobTags && typeof jobTags === 'object') {
|
|
77
|
+
jobs.push(this.parseJobInfo(jobTags));
|
|
78
|
+
}
|
|
79
|
+
resolve(jobs);
|
|
80
|
+
}
|
|
81
|
+
catch (parseErr) {
|
|
82
|
+
reject(parseErr);
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* Get specific job info
|
|
89
|
+
*/
|
|
90
|
+
async getJobInfo(jobId) {
|
|
91
|
+
return new Promise((resolve, reject) => {
|
|
92
|
+
this.printer.execute('Get-Job-Attributes', {
|
|
93
|
+
'operation-attributes-tag': {
|
|
94
|
+
'job-id': jobId,
|
|
95
|
+
},
|
|
96
|
+
}, (err, res) => {
|
|
97
|
+
if (err) {
|
|
98
|
+
reject(err);
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
101
|
+
try {
|
|
102
|
+
const jobAttrs = res['job-attributes-tag'] || {};
|
|
103
|
+
resolve(this.parseJobInfo(jobAttrs));
|
|
104
|
+
}
|
|
105
|
+
catch (parseErr) {
|
|
106
|
+
reject(parseErr);
|
|
107
|
+
}
|
|
108
|
+
});
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* Cancel a job
|
|
113
|
+
*/
|
|
114
|
+
async cancelJob(jobId) {
|
|
115
|
+
return new Promise((resolve, reject) => {
|
|
116
|
+
this.printer.execute('Cancel-Job', {
|
|
117
|
+
'operation-attributes-tag': {
|
|
118
|
+
'job-id': jobId,
|
|
119
|
+
},
|
|
120
|
+
}, (err, _res) => {
|
|
121
|
+
if (err) {
|
|
122
|
+
reject(err);
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
resolve();
|
|
126
|
+
});
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
/**
|
|
130
|
+
* Check if printer is available
|
|
131
|
+
*/
|
|
132
|
+
async checkAvailability() {
|
|
133
|
+
try {
|
|
134
|
+
await this.getAttributes();
|
|
135
|
+
return true;
|
|
136
|
+
}
|
|
137
|
+
catch {
|
|
138
|
+
return false;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
/**
|
|
142
|
+
* Build IPP print message from options
|
|
143
|
+
*/
|
|
144
|
+
buildPrintMessage(options) {
|
|
145
|
+
const operationAttrs = {
|
|
146
|
+
'requesting-user-name': 'devicemanager',
|
|
147
|
+
'job-name': options?.jobName ?? 'Print Job',
|
|
148
|
+
'document-format': 'application/octet-stream',
|
|
149
|
+
};
|
|
150
|
+
const jobAttrs = {};
|
|
151
|
+
if (options?.copies && options.copies > 1) {
|
|
152
|
+
jobAttrs['copies'] = options.copies;
|
|
153
|
+
}
|
|
154
|
+
if (options?.mediaSize) {
|
|
155
|
+
jobAttrs['media'] = options.mediaSize;
|
|
156
|
+
}
|
|
157
|
+
if (options?.mediaType) {
|
|
158
|
+
jobAttrs['media-type'] = options.mediaType;
|
|
159
|
+
}
|
|
160
|
+
if (options?.sides) {
|
|
161
|
+
jobAttrs['sides'] = options.sides;
|
|
162
|
+
}
|
|
163
|
+
if (options?.quality) {
|
|
164
|
+
const qualityMap = {
|
|
165
|
+
draft: 3,
|
|
166
|
+
normal: 4,
|
|
167
|
+
high: 5,
|
|
168
|
+
};
|
|
169
|
+
jobAttrs['print-quality'] = qualityMap[options.quality] ?? 4;
|
|
170
|
+
}
|
|
171
|
+
if (options?.colorMode) {
|
|
172
|
+
jobAttrs['print-color-mode'] = options.colorMode;
|
|
173
|
+
}
|
|
174
|
+
const msg = {
|
|
175
|
+
'operation-attributes-tag': operationAttrs,
|
|
176
|
+
};
|
|
177
|
+
if (Object.keys(jobAttrs).length > 0) {
|
|
178
|
+
msg['job-attributes-tag'] = jobAttrs;
|
|
179
|
+
}
|
|
180
|
+
return msg;
|
|
181
|
+
}
|
|
182
|
+
/**
|
|
183
|
+
* Parse printer capabilities from attributes
|
|
184
|
+
*/
|
|
185
|
+
parseCapabilities(attrs) {
|
|
186
|
+
const getArray = (key) => {
|
|
187
|
+
const value = attrs[key];
|
|
188
|
+
if (Array.isArray(value))
|
|
189
|
+
return value.map(String);
|
|
190
|
+
if (value !== undefined)
|
|
191
|
+
return [String(value)];
|
|
192
|
+
return [];
|
|
193
|
+
};
|
|
194
|
+
const getNumber = (key, defaultVal) => {
|
|
195
|
+
const value = attrs[key];
|
|
196
|
+
if (typeof value === 'number')
|
|
197
|
+
return value;
|
|
198
|
+
if (typeof value === 'string')
|
|
199
|
+
return parseInt(value) || defaultVal;
|
|
200
|
+
return defaultVal;
|
|
201
|
+
};
|
|
202
|
+
const getBool = (key, defaultVal) => {
|
|
203
|
+
const value = attrs[key];
|
|
204
|
+
if (typeof value === 'boolean')
|
|
205
|
+
return value;
|
|
206
|
+
if (value === 'true' || value === 1)
|
|
207
|
+
return true;
|
|
208
|
+
if (value === 'false' || value === 0)
|
|
209
|
+
return false;
|
|
210
|
+
return defaultVal;
|
|
211
|
+
};
|
|
212
|
+
// Parse resolutions
|
|
213
|
+
const resolutions = [];
|
|
214
|
+
const resSupported = attrs['printer-resolution-supported'];
|
|
215
|
+
if (Array.isArray(resSupported)) {
|
|
216
|
+
for (const res of resSupported) {
|
|
217
|
+
if (typeof res === 'object' && res !== null && 'x' in res) {
|
|
218
|
+
resolutions.push(res.x);
|
|
219
|
+
}
|
|
220
|
+
else if (typeof res === 'number') {
|
|
221
|
+
resolutions.push(res);
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
if (resolutions.length === 0) {
|
|
226
|
+
resolutions.push(300, 600);
|
|
227
|
+
}
|
|
228
|
+
return {
|
|
229
|
+
colorSupported: getBool('color-supported', false),
|
|
230
|
+
duplexSupported: getArray('sides-supported').some((s) => s.includes('two-sided')),
|
|
231
|
+
mediaSizes: getArray('media-supported'),
|
|
232
|
+
mediaTypes: getArray('media-type-supported'),
|
|
233
|
+
resolutions: [...new Set(resolutions)],
|
|
234
|
+
maxCopies: getNumber('copies-supported', 99),
|
|
235
|
+
sidesSupported: getArray('sides-supported'),
|
|
236
|
+
qualitySupported: getArray('print-quality-supported').map(String),
|
|
237
|
+
};
|
|
238
|
+
}
|
|
239
|
+
/**
|
|
240
|
+
* Parse job info from attributes
|
|
241
|
+
*/
|
|
242
|
+
parseJobInfo(attrs) {
|
|
243
|
+
const getString = (key, defaultVal) => {
|
|
244
|
+
const value = attrs[key];
|
|
245
|
+
if (typeof value === 'string')
|
|
246
|
+
return value;
|
|
247
|
+
if (value !== undefined)
|
|
248
|
+
return String(value);
|
|
249
|
+
return defaultVal;
|
|
250
|
+
};
|
|
251
|
+
const getNumber = (key, defaultVal) => {
|
|
252
|
+
const value = attrs[key];
|
|
253
|
+
if (typeof value === 'number')
|
|
254
|
+
return value;
|
|
255
|
+
if (typeof value === 'string')
|
|
256
|
+
return parseInt(value) || defaultVal;
|
|
257
|
+
return defaultVal;
|
|
258
|
+
};
|
|
259
|
+
// Map IPP job state to our state
|
|
260
|
+
const ippState = getNumber('job-state', 3);
|
|
261
|
+
const stateMap = {
|
|
262
|
+
3: 'pending', // pending
|
|
263
|
+
4: 'pending', // pending-held
|
|
264
|
+
5: 'processing', // processing
|
|
265
|
+
6: 'processing', // processing-stopped
|
|
266
|
+
7: 'canceled', // canceled
|
|
267
|
+
8: 'aborted', // aborted
|
|
268
|
+
9: 'completed', // completed
|
|
269
|
+
};
|
|
270
|
+
const createdTime = attrs['time-at-creation'];
|
|
271
|
+
const completedTime = attrs['time-at-completed'];
|
|
272
|
+
return {
|
|
273
|
+
id: getNumber('job-id', 0),
|
|
274
|
+
name: getString('job-name', 'Unknown Job'),
|
|
275
|
+
state: stateMap[ippState] ?? 'pending',
|
|
276
|
+
stateReason: getString('job-state-reasons', undefined),
|
|
277
|
+
createdAt: createdTime ? new Date(createdTime * 1000) : new Date(),
|
|
278
|
+
completedAt: completedTime ? new Date(completedTime * 1000) : undefined,
|
|
279
|
+
pagesPrinted: getNumber('job-media-sheets-completed', undefined),
|
|
280
|
+
pagesTotal: getNumber('job-media-sheets', undefined),
|
|
281
|
+
};
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"protocol.ipp.old.js","sourceRoot":"","sources":["../../ts/protocols/protocol.ipp.old.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
import { Feature, type TDeviceReference } from './feature.abstract.js';
|
|
7
|
-
import { IppProtocol } from '../protocols/index.js';
|
|
7
|
+
import { IppProtocol, type IIppPrinterCapabilities, type IIppJob } from '../protocols/index.js';
|
|
8
8
|
import type {
|
|
9
9
|
TPrintProtocol,
|
|
10
10
|
TPrintSides,
|
|
@@ -16,7 +16,6 @@ import type {
|
|
|
16
16
|
IPrintFeatureInfo,
|
|
17
17
|
IFeatureOptions,
|
|
18
18
|
} from '../interfaces/feature.interfaces.js';
|
|
19
|
-
import type { IPrinterCapabilities } from '../interfaces/index.js';
|
|
20
19
|
|
|
21
20
|
/**
|
|
22
21
|
* Options for creating a PrintFeature
|
|
@@ -101,7 +100,7 @@ export class PrintFeature extends Feature {
|
|
|
101
100
|
|
|
102
101
|
this.ippClient = new IppProtocol(address, port, path);
|
|
103
102
|
// Verify connection by getting printer attributes
|
|
104
|
-
const attrs = await this.ippClient.
|
|
103
|
+
const attrs = await this.ippClient.getPrinterAttributes();
|
|
105
104
|
this.updateCapabilitiesFromIpp(attrs);
|
|
106
105
|
}
|
|
107
106
|
// JetDirect and LPD don't need connection verification
|
|
@@ -154,7 +153,8 @@ export class PrintFeature extends Feature {
|
|
|
154
153
|
throw new Error('Print feature not connected');
|
|
155
154
|
}
|
|
156
155
|
|
|
157
|
-
|
|
156
|
+
const jobs = await this.ippClient.getJobs();
|
|
157
|
+
return jobs.map(job => this.mapIppJobToInternal(job));
|
|
158
158
|
}
|
|
159
159
|
|
|
160
160
|
/**
|
|
@@ -165,7 +165,8 @@ export class PrintFeature extends Feature {
|
|
|
165
165
|
throw new Error('Print feature not connected');
|
|
166
166
|
}
|
|
167
167
|
|
|
168
|
-
|
|
168
|
+
const job = await this.ippClient.getJobAttributes(jobId);
|
|
169
|
+
return this.mapIppJobToInternal(job);
|
|
169
170
|
}
|
|
170
171
|
|
|
171
172
|
/**
|
|
@@ -191,9 +192,17 @@ export class PrintFeature extends Feature {
|
|
|
191
192
|
|
|
192
193
|
this.emit('print:started', options);
|
|
193
194
|
|
|
194
|
-
//
|
|
195
|
-
const
|
|
195
|
+
// Use smartPrint for auto format detection and conversion
|
|
196
|
+
const ippJob = await this.ippClient.smartPrint(data, {
|
|
197
|
+
jobName: options?.jobName,
|
|
198
|
+
copies: options?.copies,
|
|
199
|
+
media: options?.mediaSize,
|
|
200
|
+
sides: options?.sides,
|
|
201
|
+
printQuality: options?.quality,
|
|
202
|
+
colorMode: options?.colorMode,
|
|
203
|
+
});
|
|
196
204
|
|
|
205
|
+
const job = this.mapIppJobToInternal(ippJob);
|
|
197
206
|
this.emit('print:submitted', job);
|
|
198
207
|
return job;
|
|
199
208
|
}
|
|
@@ -202,58 +211,57 @@ export class PrintFeature extends Feature {
|
|
|
202
211
|
// Helper Methods
|
|
203
212
|
// ============================================================================
|
|
204
213
|
|
|
205
|
-
private updateCapabilitiesFromIpp(caps:
|
|
214
|
+
private updateCapabilitiesFromIpp(caps: IIppPrinterCapabilities): void {
|
|
206
215
|
this.supportsColor = caps.colorSupported;
|
|
207
|
-
|
|
208
|
-
this.
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
216
|
+
// Derive duplexSupported from sidesSupported
|
|
217
|
+
this.supportsDuplex = caps.sidesSupported?.some(s =>
|
|
218
|
+
s.includes('two-sided')
|
|
219
|
+
) ?? false;
|
|
220
|
+
// Get max copies from range
|
|
221
|
+
this.maxCopies = caps.copiesSupported?.upper ?? 99;
|
|
222
|
+
|
|
223
|
+
if (caps.mediaSizeSupported && caps.mediaSizeSupported.length > 0) {
|
|
224
|
+
this.supportedMediaSizes = caps.mediaSizeSupported;
|
|
212
225
|
}
|
|
213
|
-
if (caps.
|
|
214
|
-
this.supportedMediaTypes = caps.
|
|
226
|
+
if (caps.mediaTypeSupported && caps.mediaTypeSupported.length > 0) {
|
|
227
|
+
this.supportedMediaTypes = caps.mediaTypeSupported;
|
|
215
228
|
}
|
|
216
229
|
if (caps.sidesSupported && caps.sidesSupported.length > 0) {
|
|
217
230
|
this.supportedSides = caps.sidesSupported.filter((s): s is TPrintSides =>
|
|
218
231
|
['one-sided', 'two-sided-long-edge', 'two-sided-short-edge'].includes(s)
|
|
219
232
|
);
|
|
220
233
|
}
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
private qualityToIpp(quality: TPrintQuality): number {
|
|
229
|
-
switch (quality) {
|
|
230
|
-
case 'draft': return 3;
|
|
231
|
-
case 'normal': return 4;
|
|
232
|
-
case 'high': return 5;
|
|
233
|
-
default: return 4;
|
|
234
|
+
// Map IPP quality values (3=draft, 4=normal, 5=high) to strings
|
|
235
|
+
if (caps.printQualitySupported && caps.printQualitySupported.length > 0) {
|
|
236
|
+
const qualityMap: Record<number, TPrintQuality> = { 3: 'draft', 4: 'normal', 5: 'high' };
|
|
237
|
+
this.supportedQualities = caps.printQualitySupported
|
|
238
|
+
.map(q => qualityMap[q])
|
|
239
|
+
.filter((q): q is TPrintQuality => q !== undefined);
|
|
234
240
|
}
|
|
235
241
|
}
|
|
236
242
|
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
243
|
+
/**
|
|
244
|
+
* Map IIppJob to IPrintJob, normalizing extended states
|
|
245
|
+
*/
|
|
246
|
+
private mapIppJobToInternal(job: IIppJob): IPrintJob {
|
|
247
|
+
// Map extended IPP states to simpler internal states
|
|
248
|
+
const stateMap: Record<IIppJob['state'], IPrintJob['state']> = {
|
|
249
|
+
'pending': 'pending',
|
|
250
|
+
'pending-held': 'pending',
|
|
251
|
+
'processing': 'processing',
|
|
252
|
+
'processing-stopped': 'processing',
|
|
253
|
+
'canceled': 'canceled',
|
|
254
|
+
'aborted': 'aborted',
|
|
255
|
+
'completed': 'completed',
|
|
246
256
|
};
|
|
247
257
|
|
|
248
258
|
return {
|
|
249
|
-
id: job
|
|
250
|
-
name: job
|
|
251
|
-
state: stateMap[
|
|
252
|
-
stateReason:
|
|
253
|
-
createdAt:
|
|
254
|
-
completedAt: job
|
|
255
|
-
? new Date((job['time-at-completed'] as number) * 1000)
|
|
256
|
-
: undefined,
|
|
259
|
+
id: job.id,
|
|
260
|
+
name: job.name,
|
|
261
|
+
state: stateMap[job.state],
|
|
262
|
+
stateReason: job.stateReasons?.[0],
|
|
263
|
+
createdAt: job.createdAt,
|
|
264
|
+
completedAt: job.completedAt,
|
|
257
265
|
};
|
|
258
266
|
}
|
|
259
267
|
|
package/ts/protocols/index.ts
CHANGED
|
@@ -10,7 +10,12 @@ export { EsclProtocol } from './protocol.escl.js';
|
|
|
10
10
|
export { SaneProtocol } from './protocol.sane.js';
|
|
11
11
|
|
|
12
12
|
// IPP printer protocol
|
|
13
|
-
export {
|
|
13
|
+
export {
|
|
14
|
+
IppProtocol,
|
|
15
|
+
type IIppPrinterCapabilities,
|
|
16
|
+
type IIppJob,
|
|
17
|
+
type IIppPrintOptions,
|
|
18
|
+
} from './protocol.ipp.js';
|
|
14
19
|
|
|
15
20
|
// SNMP query protocol
|
|
16
21
|
export {
|