1
This commit is contained in:
parent
9978ba9c3d
commit
d190c2add6
@ -10,7 +10,7 @@
|
|||||||
"reconnectInterval": 3000
|
"reconnectInterval": 3000
|
||||||
},
|
},
|
||||||
"refreshTokenExpireTime": 0,
|
"refreshTokenExpireTime": 0,
|
||||||
"tokenExpireTime": 1774784976938,
|
"tokenExpireTime": 1779965429409,
|
||||||
"token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjb2RlIjoiNzExYzJjIiwicHJpbnRlciI6Iua1i-ivleaJk-WNsOWPsCIsIndhcmVob3VzZSI6IjEwMDAwMjgiLCJjb21wdXRlcklkIjoxLCJpYXQiOjE3NzQ3ODEzNzYsImV4cCI6MTc3NDc4NDk3Nn0.qJ_DW2YyOZu9BoTCcXEDUbXYMCosa6TK48tNlA8g-lo",
|
"token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ3YXJlaG91c2UiOiIxMDAwMDAiLCJjb21wdXRlcklkIjoiMjgiLCJpYXQiOjE3Nzk5NjE4MjksImV4cCI6MTc3OTk2NTQyOX0.xDzEdZXmynizKOELecYraoWq0rqc5guEExlBz6x3ziI",
|
||||||
"refreshToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjb2RlIjoiNzExYzJjIiwicHJpbnRlciI6Iua1i-ivleaJk-WNsOWPsCIsIndhcmVob3VzZSI6IjEwMDAwMjgiLCJjb21wdXRlcklkIjoxLCJpYXQiOjE3NzI5Nzk2OTIsImV4cCI6NDkyODczOTY5Mn0.1qxGUf1IDco2F2Vfsg-t9mv0s14gtIz56tXvHjIX7ls"
|
"refreshToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ3YXJlaG91c2UiOiIxMDAwMDAiLCJjb21wdXRlcklkIjoiMjgiLCJpYXQiOjE3Nzg2MTAwNDMsImV4cCI6NDkzNDM3MDA0M30.JkOtPdc6VA5IDxy6E6Pqk5nffmE5VagoXtXYr7cNLZc"
|
||||||
}
|
}
|
||||||
12
core/main.js
12
core/main.js
@ -33,20 +33,24 @@ class Main extends EventEmitter {
|
|||||||
this.printerComponentMessageHandler = new PrinterComponentMessageHandler(this, this.printerComponents);
|
this.printerComponentMessageHandler = new PrinterComponentMessageHandler(this, this.printerComponents);
|
||||||
this.printerComponentMessageHandler.init();
|
this.printerComponentMessageHandler.init();
|
||||||
// 监听 WMI 打印机状态变化
|
// 监听 WMI 打印机状态变化
|
||||||
console.log(`ws服务器已启动,监听端口: ${this.config.wsPort}`);
|
//console.log(`ws服务器已启动,监听端口: ${this.config.wsPort}`);
|
||||||
this.init().then(() => {
|
this.init().then(() => {
|
||||||
console.log('框架初始化完成');
|
//console.log('框架初始化完成');
|
||||||
console.log('初始化services完成,当前服务列表:', Object.keys(this.services));
|
//console.log('初始化services完成,当前服务列表:', Object.keys(this.services));
|
||||||
this.wsClient = new WSClient(this.config.remoteWs.url, {
|
this.wsClient = new WSClient(this.config.remoteWs.url, {
|
||||||
reconnectInterval: this.config.remoteWs.reconnectInterval || 3000
|
reconnectInterval: this.config.remoteWs.reconnectInterval || 3000
|
||||||
}, this);
|
}, this);
|
||||||
this.wsServer = new WSServer(this.config.wsPort, this);
|
this.wsServer = new WSServer(this.config.wsPort, this);
|
||||||
this._initWmiPrinterMonitor();
|
this._initWmiPrinterMonitor();
|
||||||
this.app.on('printerWmiStatusChange', (data) => {
|
this.app.on('printerWmiStatusChange', (data) => {
|
||||||
console.log('打印机状态变化事件触发,数据:', data);
|
//console.log('打印机状态变化事件触发,数据:', data);
|
||||||
this.services.printer.getWindowsPrinters();
|
this.services.printer.getWindowsPrinters();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.app.on("kuaishouMessage", (data) => {
|
||||||
|
console.log("收到快手打印组件消息,数据:", data);
|
||||||
|
});
|
||||||
Main.instance = this;
|
Main.instance = this;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -54,7 +54,7 @@ class PrinterComponentCore extends EventEmitter {
|
|||||||
const ws = new WebSocket(url);
|
const ws = new WebSocket(url);
|
||||||
ws.on('open', () => {
|
ws.on('open', () => {
|
||||||
this._updateStatus(name, 'connected');
|
this._updateStatus(name, 'connected');
|
||||||
//console.log(`[${name}] 连接成功: ${url}`);
|
console.log(`[${name}] 连接成功: ${url}`);
|
||||||
});
|
});
|
||||||
ws.on('close', () => {
|
ws.on('close', () => {
|
||||||
this._updateStatus(name, 'disconnected');
|
this._updateStatus(name, 'disconnected');
|
||||||
@ -67,6 +67,7 @@ class PrinterComponentCore extends EventEmitter {
|
|||||||
if (Buffer.isBuffer(msg)) {
|
if (Buffer.isBuffer(msg)) {
|
||||||
msg = msg.toString('utf8');
|
msg = msg.toString('utf8');
|
||||||
}
|
}
|
||||||
|
console.log(`[=======>${name}] 收到消息:`, msg);
|
||||||
switch (name) {
|
switch (name) {
|
||||||
case 'LODOP':
|
case 'LODOP':
|
||||||
this.app.emit('lodopMessage', msg);
|
this.app.emit('lodopMessage', msg);
|
||||||
|
|||||||
@ -47,7 +47,7 @@ class PrinterService extends service {
|
|||||||
console.log("打印服务收到打印请求,数据:", data);
|
console.log("打印服务收到打印请求,数据:", data);
|
||||||
const { printerComponents } = this.app;
|
const { printerComponents } = this.app;
|
||||||
console.log("所有打印组件", printerComponents.components);
|
console.log("所有打印组件", printerComponents.components);
|
||||||
console.log("准备打印,数据:", data);
|
console.log("准备打印,数据:", JSON.stringify(data, null, 2));
|
||||||
// 根据data.type选择不同的打印组件和打印方式
|
// 根据data.type选择不同的打印组件和打印方式
|
||||||
// 每个打印只接收一个组件,在服务端做拆分
|
// 每个打印只接收一个组件,在服务端做拆分
|
||||||
//data的结构示例:
|
//data的结构示例:
|
||||||
@ -67,23 +67,123 @@ class PrinterService extends service {
|
|||||||
// }
|
// }
|
||||||
let component = null;
|
let component = null;
|
||||||
let printData = null;
|
let printData = null;
|
||||||
|
const buildExpressPayload = (input) => {
|
||||||
|
// 兼容两种入参:{ type:'express', data:{...} } 和直接传组件协议对象
|
||||||
|
const payload = (input && typeof input.data === 'object' && input.data)
|
||||||
|
? { ...input.data }
|
||||||
|
: { ...input };
|
||||||
|
|
||||||
|
if (!payload.cmd) {
|
||||||
|
payload.cmd = 'print';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!payload.requestID) {
|
||||||
|
payload.requestID = input?.printId || input?.requestID || input?.task?.taskID || `print-${Date.now()}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!payload.task || typeof payload.task !== 'object') {
|
||||||
|
payload.task = {};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!payload.task.taskID) {
|
||||||
|
payload.task.taskID = payload.requestID;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!payload.task.printer && input?.printer) {
|
||||||
|
payload.task.printer = input.printer;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 快手组件要求 task.preview 必须是 boolean,任何非 boolean 都进行兜底转换
|
||||||
|
if (typeof payload.task.preview !== 'boolean') {
|
||||||
|
const rawPreview = payload.task.preview;
|
||||||
|
if (typeof rawPreview === 'string') {
|
||||||
|
payload.task.preview = rawPreview.toLowerCase() === 'true';
|
||||||
|
} else if (typeof rawPreview === 'number') {
|
||||||
|
payload.task.preview = rawPreview === 1;
|
||||||
|
} else {
|
||||||
|
payload.task.preview = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return payload;
|
||||||
|
};
|
||||||
|
|
||||||
|
const validateExpressPayload = (payload) => {
|
||||||
|
if (!payload || typeof payload !== 'object') return '打印数据为空或格式错误';
|
||||||
|
if (!payload.cmd) return '缺少 cmd 字段';
|
||||||
|
if (!payload.requestID) return '缺少 requestID 字段';
|
||||||
|
if (!payload.task || typeof payload.task !== 'object') return '缺少 task 字段';
|
||||||
|
if (!payload.task.taskID) return '缺少 task.taskID 字段';
|
||||||
|
if (!payload.task.printer) return '缺少 task.printer 字段';
|
||||||
|
if (!Array.isArray(payload.task.documents) || payload.task.documents.length === 0) return '缺少 task.documents 或 documents 为空';
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const normalizeComponentName = (name) => {
|
||||||
|
if (!name) return name;
|
||||||
|
const map = {
|
||||||
|
lodop: 'LODOP',
|
||||||
|
douyin: '抖音',
|
||||||
|
pinduoduo: '拼多多',
|
||||||
|
kuaishou: '快手',
|
||||||
|
jingdong: '京东',
|
||||||
|
cainiao: '菜鸟',
|
||||||
|
shipinhao: '视频号',
|
||||||
|
xiaohongshu: '小红书'
|
||||||
|
};
|
||||||
|
const key = String(name).trim();
|
||||||
|
return map[key.toLowerCase()] || key;
|
||||||
|
};
|
||||||
|
|
||||||
switch (data.type) {
|
switch (data.type) {
|
||||||
case "customize":
|
case "customize":
|
||||||
component = printerComponents.components.get('LODOP');
|
component = printerComponents.components.get('LODOP');
|
||||||
printData = this.renderCustomPrintContent(data);
|
printData = this.renderCustomPrintContent(data);
|
||||||
break;
|
break;
|
||||||
case "express":
|
case "express":
|
||||||
component = printerComponents.components.get(data.component);
|
component = printerComponents.components.get(normalizeComponentName(data.component));
|
||||||
printData = data.data; // 直接使用后端传来的数据
|
printData = buildExpressPayload(data);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const printTaskId = data.printId || data?.data?.requestID || data?.data?.task?.taskID;
|
||||||
this.app.printTasks = this.app.printTasks || new Map();
|
this.app.printTasks = this.app.printTasks || new Map();
|
||||||
this.app.printTasks.set(data.printId, 'pending');
|
this.app.printTasks.set(printTaskId, 'pending');
|
||||||
|
|
||||||
if (component && component.readyState === 1) {
|
if (component && component.readyState === 1) {
|
||||||
//console.log("使用组件打印,组件:", component, "打印数据:", printData);
|
if (data.type === 'express') {
|
||||||
component.send(printData);
|
const validationError = validateExpressPayload(printData);
|
||||||
|
if (validationError) {
|
||||||
|
console.error('快递面单数据校验失败:', validationError, printData);
|
||||||
|
this.app.emit('printError', {
|
||||||
|
message: '快递面单数据校验失败: ' + validationError,
|
||||||
|
printId: printTaskId
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const payload = typeof printData === 'string' ? printData : JSON.stringify(printData);
|
||||||
|
const componentName = normalizeComponentName(data.component) || 'LODOP';
|
||||||
|
console.log(`使用组件打印,组件: ${componentName}, 数据长度: ${payload.length}`);
|
||||||
|
if (data.type === 'express') {
|
||||||
|
console.log(`快递面单关键信息: cmd=${printData.cmd}, requestID=${printData.requestID}, taskID=${printData.task?.taskID}, printer=${printData.task?.printer}`);
|
||||||
|
}
|
||||||
|
component.send(payload, (err) => {
|
||||||
|
if (err) {
|
||||||
|
console.error(`发送打印数据失败,组件: ${componentName}`, err);
|
||||||
|
this.app.emit('printError', { message: '发送打印数据失败: ' + err.message, printId: printTaskId });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
console.log(`打印数据已发送,组件: ${componentName}, requestId: ${printTaskId}`);
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
this.app.emit('printError', { message: '打印组件未连接', printId: data.printId });
|
const componentName = normalizeComponentName(data.component) || 'LODOP';
|
||||||
|
this.app.emit('printError', {
|
||||||
|
message: `打印组件未连接: ${componentName}`,
|
||||||
|
printId: printTaskId
|
||||||
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user