@usarral/century-link-ts 0.1.0 → 0.3.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/dist/infrastructure/adapters/cc-v2/CcV2PrinterAdapter.d.ts +1 -0
- package/dist/infrastructure/adapters/cc-v2/CcV2PrinterAdapter.d.ts.map +1 -1
- package/dist/infrastructure/adapters/cc-v2/CcV2PrinterAdapter.js +7 -3
- package/dist/infrastructure/adapters/cc-v2/CcV2PrinterAdapter.js.map +1 -1
- package/dist/infrastructure/adapters/cc-v2/CcV2StatusMapper.d.ts +43 -67
- package/dist/infrastructure/adapters/cc-v2/CcV2StatusMapper.d.ts.map +1 -1
- package/dist/infrastructure/adapters/cc-v2/CcV2StatusMapper.js +174 -100
- package/dist/infrastructure/adapters/cc-v2/CcV2StatusMapper.js.map +1 -1
- package/dist/infrastructure/adapters/cc-v2/CcV2StatusMapper.test.js +48 -22
- package/dist/infrastructure/adapters/cc-v2/CcV2StatusMapper.test.js.map +1 -1
- package/docs/cc2-protocol.md +3 -3
- package/package.json +9 -8
|
@@ -15,6 +15,7 @@ export declare class CcV2PrinterAdapter implements PrinterAdapter {
|
|
|
15
15
|
private connectionHandlers;
|
|
16
16
|
private unsubscribeTransport;
|
|
17
17
|
private unsubscribeConnectionChange;
|
|
18
|
+
private cachedStatus;
|
|
18
19
|
connect(params: ConnectParams): Promise<Result<PrinterInfo>>;
|
|
19
20
|
disconnect(): Promise<void>;
|
|
20
21
|
getStatus(timeoutMs?: number): Promise<Result<PrinterStatusData>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CcV2PrinterAdapter.d.ts","sourceRoot":"","sources":["../../../../src/infrastructure/adapters/cc-v2/CcV2PrinterAdapter.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,yBAAyB,EACzB,WAAW,EACZ,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACjG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,KAAK,EAAE,iBAAiB,EAAmB,MAAM,uCAAuC,CAAC;AAChG,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AA4FpE,qBAAa,kBAAmB,YAAW,cAAc;IACvD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuB;IACjD,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,cAAc,CAAkD;IACxE,OAAO,CAAC,kBAAkB,CAAiD;IAC3E,OAAO,CAAC,kBAAkB,CAA2C;IACrE,OAAO,CAAC,oBAAoB,CAA4B;IACxD,OAAO,CAAC,2BAA2B,CAA4B;
|
|
1
|
+
{"version":3,"file":"CcV2PrinterAdapter.d.ts","sourceRoot":"","sources":["../../../../src/infrastructure/adapters/cc-v2/CcV2PrinterAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { MqttTransport } from "../../transport/mqtt/MqttTransport.js";
|
|
2
2
|
import { encodeRequest, decodeMessage, isStatusPush, isAttributesPush, CC_V2_METHOD, } from "../../transport/mqtt/CcV2Codec.js";
|
|
3
|
-
import { mapStatus } from "./CcV2StatusMapper.js";
|
|
3
|
+
import { mapStatus, mergeStatus } from "./CcV2StatusMapper.js";
|
|
4
4
|
import { ErrorCode } from "../../../domain/types/ErrorCode.js";
|
|
5
5
|
import { PrinterType } from "../../../domain/types/PrinterType.js";
|
|
6
6
|
import { ok, err } from "../../../application/result/Result.js";
|
|
@@ -15,6 +15,7 @@ export class CcV2PrinterAdapter {
|
|
|
15
15
|
connectionHandlers = new Set();
|
|
16
16
|
unsubscribeTransport = null;
|
|
17
17
|
unsubscribeConnectionChange = null;
|
|
18
|
+
cachedStatus = {};
|
|
18
19
|
async connect(params) {
|
|
19
20
|
try {
|
|
20
21
|
await this.transport.connect({
|
|
@@ -59,6 +60,7 @@ export class CcV2PrinterAdapter {
|
|
|
59
60
|
this.unsubscribeTransport?.();
|
|
60
61
|
this.unsubscribeConnectionChange?.();
|
|
61
62
|
await this.transport.disconnect();
|
|
63
|
+
this.cachedStatus = {};
|
|
62
64
|
for (const handler of this.connectionHandlers)
|
|
63
65
|
handler(false);
|
|
64
66
|
}
|
|
@@ -66,7 +68,8 @@ export class CcV2PrinterAdapter {
|
|
|
66
68
|
const result = await this.requestWithTimeout(encodeRequest(CC_V2_METHOD.GET_STATUS), timeoutMs);
|
|
67
69
|
if (!result.ok)
|
|
68
70
|
return result;
|
|
69
|
-
|
|
71
|
+
this.cachedStatus = result.value.result;
|
|
72
|
+
const status = mapStatus(this.printerInfo?.printerId ?? "", this.cachedStatus);
|
|
70
73
|
return ok(status);
|
|
71
74
|
}
|
|
72
75
|
async getAttributes(timeoutMs = REQUEST_TIMEOUT_MS) {
|
|
@@ -320,7 +323,8 @@ export class CcV2PrinterAdapter {
|
|
|
320
323
|
try {
|
|
321
324
|
const msg = decodeMessage(raw);
|
|
322
325
|
if (isStatusPush(msg)) {
|
|
323
|
-
|
|
326
|
+
this.cachedStatus = mergeStatus(this.cachedStatus, msg.result);
|
|
327
|
+
const status = mapStatus(this.printerInfo?.printerId ?? "", this.cachedStatus);
|
|
324
328
|
for (const handler of this.statusHandlers)
|
|
325
329
|
handler(status);
|
|
326
330
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CcV2PrinterAdapter.js","sourceRoot":"","sources":["../../../../src/infrastructure/adapters/cc-v2/CcV2PrinterAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EACL,aAAa,EACb,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,YAAY,GACb,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAsB,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,uCAAuC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AAkGzE,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAQlC,MAAM,OAAO,kBAAkB;IACZ,SAAS,GAAG,IAAI,aAAa,EAAE,CAAC;IACzC,WAAW,GAAuB,IAAI,CAAC;IACvC,OAAO,GAAG,IAAI,GAAG,EAA0B,CAAC;IAC5C,cAAc,GAAG,IAAI,GAAG,EAAuC,CAAC;IAChE,kBAAkB,GAAG,IAAI,GAAG,EAAsC,CAAC;IACnE,kBAAkB,GAAG,IAAI,GAAG,EAAgC,CAAC;IAC7D,oBAAoB,GAAuB,IAAI,CAAC;IAChD,2BAA2B,GAAuB,IAAI,CAAC;IAE/D,KAAK,CAAC,OAAO,CAAC,MAAqB;QACjC,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;gBAC3B,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,SAAS,EAAE,MAAM,CAAC,mBAAmB;gBACrC,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,UAAU;gBAC9C,YAAY,EAAE,MAAM,CAAC,YAAY,IAAI,EAAE;gBACvC,mBAAmB,EAAE,IAAI;aACiB,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,GAAG,CAAC,IAAI,WAAW,CAAC,SAAS,CAAC,wBAAwB,EAAE,wBAAwB,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;QAChH,CAAC;QAED,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QACnF,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,SAAS,EAAE,EAAE;YACjF,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,kBAAkB;gBAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAC/C,aAAa,CAAC,YAAY,CAAC,cAAc,CAAC,CAC3C,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;YACpB,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;YAClC,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,IAAI,CAAC,WAAW,GAAG;YACjB,SAAS,EAAE,cAAc,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,IAAI,EAAE;YAC7D,WAAW,EAAE,WAAW,CAAC,cAAc;YACvC,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,gBAAgB;YACrC,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,eAAe,EAAE,EAAE;YACnB,WAAW,EAAE,MAAM,CAAC,YAAY,IAAI,EAAE;YACtC,YAAY,EAAE,MAAM,CAAC,YAAY,IAAI,EAAE;YACvC,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,EAAE;SAChC,CAAC;QAEF,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,kBAAkB;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7D,OAAO,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,oBAAoB,EAAE,EAAE,CAAC;QAC9B,IAAI,CAAC,2BAA2B,EAAE,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;QAClC,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,kBAAkB;YAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,SAAS,GAAG,kBAAkB;QAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAC1C,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC,EACtC,SAAS,CACV,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,OAAO,MAAM,CAAC;QAC9B,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,IAAI,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACjF,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,SAAS,GAAG,kBAAkB;QAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAC1C,aAAa,CAAC,YAAY,CAAC,cAAc,CAAC,EAC1C,SAAS,CACV,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,OAAO,MAAM,CAAC;QAC9B,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QAChC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC;QAC9B,OAAO,EAAE,CAAC;YACR,SAAS,EAAE,IAAI,EAAE,SAAS,IAAI,EAAE;YAChC,WAAW,EAAE,WAAW,CAAC,cAAc;YACvC,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,GAAG,CAAC,QAAQ,IAAI,IAAI,EAAE,IAAI,IAAI,gBAAgB;YACpD,KAAK,EAAE,GAAG,CAAC,aAAa,IAAI,IAAI,EAAE,KAAK,IAAI,EAAE;YAC7C,eAAe,EAAE,GAAG,CAAC,gBAAgB,EAAE,WAAW,IAAI,EAAE;YACxD,WAAW,EAAE,IAAI,EAAE,WAAW,IAAI,EAAE;YACpC,YAAY,EAAE,GAAG,CAAC,EAAE,IAAI,IAAI,EAAE,YAAY,IAAI,EAAE;YAChD,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE;YACtB,QAAQ,EAAE,CAAC,IAAI,EAAE,QAAQ,IAAI,EAAE,CAA4B;YAC3D,YAAY,EAAE;gBACZ,OAAO,EAAE;oBACP,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE;oBAChC,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE;iBACvC;gBACD,IAAI,EAAE;oBACJ,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE;oBAC5F,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE;oBAC9F,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE;iBAC3F;gBACD,YAAY,EAAE;oBACZ,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,EAAE,cAAc,EAAE,GAAG,EAAE;oBACvG,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,EAAE,cAAc,EAAE,GAAG,EAAE;oBACxG,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE;iBACvG;gBACD,MAAM,EAAE;oBACN,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,EAAE,GAAG,EAAE;iBAC/E;gBACD,cAAc,EAAE,IAAI;gBACpB,iBAAiB,EAAE,IAAI;gBACvB,iBAAiB,EAAE,IAAI;gBACvB,cAAc,EAAE,IAAI;gBACpB,qBAAqB,EAAE,IAAI;gBAC3B,uBAAuB,EAAE,IAAI;gBAC7B,0BAA0B,EAAE,IAAI;gBAChC,uBAAuB,EAAE,IAAI;gBAC7B,kBAAkB,EAAE,IAAI;aACzB;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAS,GAAG,kBAAkB;QAClD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAC1C,aAAa,CAAC,YAAY,CAAC,iBAAiB,CAAC,EAC7C,SAAS,CACV,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,OAAO,MAAM,CAAC;QAC9B,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC;QAC5C,OAAO,EAAE,CAAC;YACR,cAAc,EAAE,GAAG,EAAE,gBAAgB,IAAI,CAAC;YAC1C,YAAY,EAAE,GAAG,EAAE,cAAc,IAAI,CAAC;YACtC,UAAU,EAAE,GAAG,EAAE,WAAW,IAAI,KAAK;YACrC,QAAQ,EAAE,CAAC,GAAG,EAAE,WAAW,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC7C,QAAQ,EAAE,CAAC,CAAC,SAAS,IAAI,CAAC;gBAC1B,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE;gBAClB,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE;gBACpB,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC/B,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACrC,MAAM,EAAE,CAAC,CAAC,OAAO,IAAI,CAAC;oBACtB,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE;oBACpB,YAAY,EAAE,CAAC,CAAC,aAAa,IAAI,EAAE;oBACnC,YAAY,EAAE,CAAC,CAAC,aAAa,IAAI,EAAE;oBACnC,YAAY,EAAE,CAAC,CAAC,aAAa,IAAI,EAAE;oBACnC,aAAa,EAAE,CAAC,CAAC,cAAc,IAAI,EAAE;oBACrC,aAAa,EAAE,CAAC,CAAC,eAAe,IAAI,CAAC;oBACrC,aAAa,EAAE,CAAC,CAAC,eAAe,IAAI,CAAC;oBACrC,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAc;iBACrC,CAAC,CAAC;aACJ,CAAC,CAAC;SACJ,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,MAAe;QACjC,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;IACjF,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,IAAY;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAY;QACzB,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAY,EAAE,UAAkB;QAC7C,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAyC;QAC5D,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,eAAe,EAAE;YACpD,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC;YAC9D,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC;SACnC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAwC;QACxD,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE;YAClD,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;YACzB,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YAC/B,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAAmB;QACrC,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAAI,GAAG,CAAC,EAAE,QAAQ,GAAG,EAAE;QAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAC1C,aAAa,CAAC,YAAY,CAAC,mBAAmB,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAC5F,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,OAAO,MAAM,CAAC;QAC9B,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QAChC,MAAM,KAAK,GAAsB,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5D,MAAM,EAAE,CAAC,CAAC,OAAO,IAAI,EAAE;YACvB,QAAQ,EAAE,CAAC,CAAC,SAAS,IAAI,EAAE;YAC3B,gBAAgB,EAAE,CAAC,CAAC,UAAU,IAAI,CAAC;YACnC,WAAW,EAAE,CAAC,CAAC,WAAW,IAAI,CAAC;YAC/B,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,CAAC;YACzB,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC;YACrB,SAAS,EAAE,CAAC,CAAC,UAAU,IAAI,CAAC;YAC5B,YAAY,EAAE,CAAC,CAAC,aAAa,IAAI,EAAE;SACpC,CAAC,CAAC,CAAC;QACJ,OAAO,EAAE,CAAC;YACR,KAAK;YACL,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;YACrB,IAAI,EAAE,GAAG,CAAC,WAAW,IAAI,IAAI;YAC7B,QAAQ,EAAE,GAAG,CAAC,SAAS,IAAI,QAAQ;SACpC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAA0B;QAC/C,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,EAAE,QAAQ,GAAG,EAAE;QACvC,MAAM,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAC1C,aAAa,CAAC,YAAY,CAAC,aAAa,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAC/F,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,OAAO,MAAM,CAAC;QAC9B,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QAChC,OAAO,EAAE,CAAC;YACR,KAAK,EAAE,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACvC,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,EAAE;gBAC1B,gBAAgB,EAAE,CAAC,CAAC,UAAU,IAAI,CAAC;gBACnC,MAAM,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;gBACpB,aAAa,EAAE,CAAC;gBAChB,YAAY,EAAE,EAAE;gBAChB,SAAS,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;gBACtB,SAAS,EAAE,CAAC,CAAC,WAAW,IAAI,CAAC;gBAC7B,iBAAiB,EAAE,CAAC,CAAC,mBAAmB,IAAI,CAAC;gBAC7C,cAAc,EAAE,CAAC;gBACjB,eAAe,EAAE,CAAC,CAAC,iBAAiB,IAAI,CAAC;gBACzC,WAAW,EAAE,CAAC,CAAC,eAAe,IAAI,CAAC;gBACnC,YAAY,EAAE,EAAE;aACjB,CAAC,CAAC;YACH,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;YACrB,IAAI;YACJ,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,MAAwB;QAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAC1C,aAAa,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CACnG,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,OAAO,MAAM,CAAC;QAC9B,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QAChC,IAAI,CAAC,GAAG,CAAC,QAAQ;YAAE,OAAO,GAAG,CAAC,IAAI,WAAW,CAAC,SAAS,CAAC,cAAc,EAAE,mBAAmB,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC/G,OAAO,EAAE,CAAC;YACR,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,gBAAgB,EAAE,GAAG,CAAC,UAAU,IAAI,CAAC;YACrC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;YACtB,aAAa,EAAE,GAAG,CAAC,YAAY,IAAI,CAAC;YACpC,YAAY,EAAE,GAAG,CAAC,SAAS,IAAI,EAAE;YACjC,SAAS,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC;YACxB,SAAS,EAAE,GAAG,CAAC,WAAW,IAAI,CAAC;YAC/B,iBAAiB,EAAE,GAAG,CAAC,mBAAmB,IAAI,CAAC;YAC/C,cAAc,EAAE,GAAG,CAAC,0BAA0B,IAAI,CAAC;YACnD,eAAe,EAAE,GAAG,CAAC,iBAAiB,IAAI,CAAC;YAC3C,WAAW,EAAE,GAAG,CAAC,eAAe,IAAI,CAAC;YACrC,YAAY,EAAE,CAAC,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAClD,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE;gBACpB,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE;aACnB,CAAC,CAAC;SACJ,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,MAAiC;QACzD,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE;YAClD,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,GAAG,EAAE,MAAM,CAAC,OAAO;YACnB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,MAAc;QACrC,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAwB;QACvC,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,WAAW,EAAE;YAChD,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,gBAAgB,EAAE,MAAM,CAAC,eAAe;YACxC,iBAAiB,EAAE,MAAM,CAAC,eAAe,IAAI,KAAK;YAClD,eAAe,EAAE,MAAM,CAAC,aAAa,IAAI,CAAC;YAC1C,iBAAiB,EAAE,MAAM,CAAC,eAAe,IAAI,KAAK;YAClD,eAAe,EAAE,MAAM,CAAC,aAAa,IAAI,KAAK;YAC9C,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE;SAC3G,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,WAAW;QACf,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,oBAAoB;QACxB,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACpC,IAAI,MAAM,CAAC,EAAE;gBAAE,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,cAAc;oBAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,wBAAwB;QAC5B,KAAK,IAAI,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACxC,IAAI,MAAM,CAAC,EAAE;gBAAE,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,kBAAkB;oBAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,SAAS,GAAG,kBAAkB;QAC/C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAC1C,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC,EACtC,SAAS,CACV,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,OAAO,MAAM,CAAC;QAC9B,OAAO,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,QAAQ,CAAC,OAA4C;QACnD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,YAAY,CAAC,OAA2C;QACtD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACrC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACvD,CAAC;IAED,YAAY,CAAC,OAAqC;QAChD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACrC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACvD,CAAC;IAEO,SAAS,CAAC,GAAY;QAC5B,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO;QACpC,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtB,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,IAAI,EAAE,EAAE,GAAG,CAAC,MAAuB,CAAC,CAAC;gBACzF,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,cAAc;oBAAE,OAAO,CAAC,MAAM,CAAC,CAAC;gBAC3D,OAAO;YACT,CAAC;YACD,IAAI,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1B,MAAM,GAAG,GAAG,GAAG,CAAC,MAA2B,CAAC;gBAC5C,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC;gBAC9B,MAAM,KAAK,GAAG;oBACZ,SAAS,EAAE,IAAI,EAAE,SAAS,IAAI,EAAE;oBAChC,WAAW,EAAE,WAAW,CAAC,cAAc;oBACvC,KAAK,EAAE,QAAQ;oBACf,IAAI,EAAE,GAAG,CAAC,QAAQ,IAAI,IAAI,EAAE,IAAI,IAAI,EAAE;oBACtC,KAAK,EAAE,GAAG,CAAC,aAAa,IAAI,IAAI,EAAE,KAAK,IAAI,EAAE;oBAC7C,eAAe,EAAE,GAAG,CAAC,gBAAgB,EAAE,WAAW,IAAI,IAAI,EAAE,eAAe,IAAI,EAAE;oBACjF,WAAW,EAAE,GAAG,CAAC,EAAE,IAAI,IAAI,EAAE,WAAW,IAAI,EAAE;oBAC9C,YAAY,EAAE,GAAG,CAAC,EAAE,IAAI,IAAI,EAAE,YAAY,IAAI,EAAE;oBAChD,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE;oBACtB,QAAQ,EAAE,CAAC,IAAI,EAAE,QAAQ,IAAI,EAAE,CAA4B;oBAC3D,YAAY,EAAE;wBACZ,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;wBACnF,IAAI,EAAE;4BACJ,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE;4BAC5F,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE;4BAC9F,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE;yBAC3F;wBACD,YAAY,EAAE;4BACZ,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,EAAE,cAAc,EAAE,GAAG,EAAE;4BACvG,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,EAAE,cAAc,EAAE,GAAG,EAAE;4BACxG,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE;yBACvG;wBACD,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,aAAsB,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC;wBACjG,cAAc,EAAE,IAAI;wBACpB,iBAAiB,EAAE,IAAI;wBACvB,iBAAiB,EAAE,IAAI;wBACvB,cAAc,EAAE,IAAI;wBACpB,qBAAqB,EAAE,IAAI;wBAC3B,uBAAuB,EAAE,IAAI;wBAC7B,0BAA0B,EAAE,IAAI;wBAChC,uBAAuB,EAAE,IAAI;wBAC7B,kBAAkB,EAAE,IAAI;qBACzB;iBACF,CAAC;gBACF,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,kBAAkB;oBAAE,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC9D,OAAO;YACT,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACzC,IAAI,OAAO,EAAE,CAAC;gBACZ,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC5B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC5B,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,4BAA4B;QAC9B,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,MAAsD,EAAE,MAAe;QAC/F,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAC1C,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAC9B,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,OAAO,MAAM,CAAC;QAC9B,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACvB,OAAO,GAAG,CAAC,IAAI,WAAW,CAAC,SAAS,CAAC,sBAAsB,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC5F,CAAC;QACD,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAI,OAAuB,EAAE,SAAS,GAAG,kBAAkB;QACzF,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,GAAG,CAAC,IAAI,WAAW,CAAC,SAAS,CAAC,aAAa,EAAE,wBAAwB,EAAE,KAAK,CAAC,CAAC,CAAC;QACxF,CAAC;QAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAChC,OAAO,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,SAAS,CAAC,iBAAiB,EAAE,WAAW,OAAO,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;YAChG,CAAC,EAAE,SAAS,CAAC,CAAC;YAEd,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE;gBAC3B,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,KAAU,CAAC,CAAC;gBAC3C,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,SAAS,CAAC,sBAAsB,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;gBACxG,KAAK;aACN,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"CcV2PrinterAdapter.js","sourceRoot":"","sources":["../../../../src/infrastructure/adapters/cc-v2/CcV2PrinterAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,81 +1,57 @@
|
|
|
1
1
|
import type { PrinterStatusData } from "../../../domain/entities/PrinterStatus.js";
|
|
2
|
-
interface
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
2
|
+
interface RawMachineStatus {
|
|
3
|
+
status?: number;
|
|
4
|
+
sub_status?: number;
|
|
5
|
+
exception_status?: number[];
|
|
6
|
+
progress?: number;
|
|
7
7
|
}
|
|
8
|
-
interface
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
interface RawExtruder {
|
|
9
|
+
temperature?: number;
|
|
10
|
+
target?: number;
|
|
11
11
|
}
|
|
12
|
-
interface
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
filament_type?: string;
|
|
16
|
-
filament_name?: string;
|
|
17
|
-
filament_code?: string;
|
|
18
|
-
filament_color?: string;
|
|
19
|
-
min_nozzle_temp?: number;
|
|
20
|
-
max_nozzle_temp?: number;
|
|
21
|
-
status?: number;
|
|
12
|
+
interface RawHeaterBed {
|
|
13
|
+
temperature?: number;
|
|
14
|
+
target?: number;
|
|
22
15
|
}
|
|
23
|
-
interface
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
connected?: boolean;
|
|
28
|
-
trays?: RawTray[];
|
|
16
|
+
interface RawZSensor {
|
|
17
|
+
temperature?: number;
|
|
18
|
+
measured_max_temperature?: number;
|
|
19
|
+
measured_min_temperature?: number;
|
|
29
20
|
}
|
|
30
|
-
interface
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
auto_refill?: boolean;
|
|
34
|
-
canvases?: RawCanvas[];
|
|
21
|
+
interface RawFanEntry {
|
|
22
|
+
speed?: number;
|
|
23
|
+
rpm?: number;
|
|
35
24
|
}
|
|
36
|
-
interface
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
25
|
+
interface RawExternalDevice {
|
|
26
|
+
camera?: boolean;
|
|
27
|
+
u_disk?: boolean;
|
|
28
|
+
sd_card?: boolean;
|
|
29
|
+
}
|
|
30
|
+
interface RawPrintStatus {
|
|
31
|
+
enable?: boolean;
|
|
32
|
+
filename?: string;
|
|
33
|
+
uuid?: string;
|
|
34
|
+
total_duration?: number;
|
|
35
|
+
print_duration?: number;
|
|
36
|
+
remaining_time_sec?: number;
|
|
42
37
|
total_layer?: number;
|
|
43
38
|
current_layer?: number;
|
|
44
|
-
progress?: number;
|
|
45
|
-
print_speed_mode?: number;
|
|
46
39
|
}
|
|
47
|
-
interface
|
|
48
|
-
|
|
49
|
-
sd_card_connected?: boolean;
|
|
50
|
-
camera_connected?: boolean;
|
|
51
|
-
canvas_connected?: boolean;
|
|
40
|
+
interface RawGcodeMove {
|
|
41
|
+
speed_mode?: number;
|
|
52
42
|
}
|
|
53
43
|
export interface RawCcV2Status {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
brightness?: number;
|
|
66
|
-
color?: number;
|
|
67
|
-
}>;
|
|
68
|
-
storage?: Record<string, {
|
|
69
|
-
connected?: boolean;
|
|
70
|
-
}>;
|
|
71
|
-
canvas_status?: RawCanvasStatus;
|
|
72
|
-
external_devices?: RawExternalDevices;
|
|
73
|
-
exceptions?: Array<{
|
|
74
|
-
code?: string;
|
|
75
|
-
timestamp?: number;
|
|
76
|
-
}>;
|
|
77
|
-
device_assistant_status?: number;
|
|
78
|
-
}
|
|
44
|
+
machine_status?: RawMachineStatus;
|
|
45
|
+
extruder?: RawExtruder;
|
|
46
|
+
heater_bed?: RawHeaterBed;
|
|
47
|
+
ztemperature_sensor?: RawZSensor;
|
|
48
|
+
fans?: Record<string, RawFanEntry>;
|
|
49
|
+
external_device?: RawExternalDevice;
|
|
50
|
+
print_status?: RawPrintStatus;
|
|
51
|
+
gcode_move?: RawGcodeMove;
|
|
52
|
+
error_code?: number;
|
|
53
|
+
}
|
|
54
|
+
export declare function mergeStatus(base: RawCcV2Status, delta: RawCcV2Status): RawCcV2Status;
|
|
79
55
|
export declare function mapStatus(printerId: string, raw: RawCcV2Status): PrinterStatusData;
|
|
80
56
|
export {};
|
|
81
57
|
//# sourceMappingURL=CcV2StatusMapper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CcV2StatusMapper.d.ts","sourceRoot":"","sources":["../../../../src/infrastructure/adapters/cc-v2/CcV2StatusMapper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,iBAAiB,
|
|
1
|
+
{"version":3,"file":"CcV2StatusMapper.d.ts","sourceRoot":"","sources":["../../../../src/infrastructure/adapters/cc-v2/CcV2StatusMapper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,iBAAiB,EAOlB,MAAM,2CAA2C,CAAC;AAInD,UAAU,gBAAgB;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,WAAW;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,YAAY;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,UAAU;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC;AAED,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,UAAU,iBAAiB;IACzB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,UAAU,cAAc;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,cAAc,CAAC,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,UAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,mBAAmB,CAAC,EAAE,UAAU,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACnC,eAAe,CAAC,EAAE,iBAAiB,CAAC;IACpC,YAAY,CAAC,EAAE,cAAc,CAAC;IAC9B,UAAU,CAAC,EAAE,YAAY,CAAC;IAE1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAID,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,aAAa,CAepF;AAiFD,wBAAgB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,GAAG,iBAAiB,CAoGlF"}
|
|
@@ -1,116 +1,190 @@
|
|
|
1
1
|
import { PrinterState } from "../../../domain/types/PrinterState.js";
|
|
2
2
|
import { PrinterSubState } from "../../../domain/types/PrinterSubState.js";
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
}
|
|
19
|
-
function mapCoreStatus(raw) {
|
|
20
|
-
return {
|
|
21
|
-
state: (raw.current_status ?? PrinterState.UNKNOWN),
|
|
22
|
-
subState: (raw.sub_status ?? PrinterSubState.NONE),
|
|
23
|
-
exceptionCodes: raw.exception_codes ?? [],
|
|
24
|
-
progress: raw.progress ?? 0,
|
|
25
|
-
};
|
|
26
|
-
}
|
|
27
|
-
function mapJobStatus(raw) {
|
|
28
|
-
return {
|
|
29
|
-
taskId: raw.task_id ?? "",
|
|
30
|
-
fileName: raw.file_name ?? "",
|
|
31
|
-
totalTimeSeconds: raw.total_time ?? 0,
|
|
32
|
-
elapsedTimeSeconds: raw.current_time ?? 0,
|
|
33
|
-
remainingTimeSeconds: raw.estimated_time ?? 0,
|
|
34
|
-
totalLayers: raw.total_layer ?? 0,
|
|
35
|
-
currentLayer: raw.current_layer ?? 0,
|
|
36
|
-
progress: raw.progress ?? 0,
|
|
37
|
-
speedMode: (raw.print_speed_mode ?? 0),
|
|
38
|
-
};
|
|
39
|
-
}
|
|
40
|
-
function mapTemperatures(raw) {
|
|
41
|
-
const result = {};
|
|
42
|
-
for (const [key, val] of Object.entries(raw)) {
|
|
43
|
-
result[key] = {
|
|
44
|
-
current: val.current_temp ?? 0,
|
|
45
|
-
target: val.target_temp ?? 0,
|
|
46
|
-
highest: val.highest_temp ?? 0,
|
|
47
|
-
lowest: val.lowest_temp ?? 0,
|
|
48
|
-
};
|
|
3
|
+
// ── Deep merge for incremental push updates ────────────────────────────────────
|
|
4
|
+
export function mergeStatus(base, delta) {
|
|
5
|
+
const merged = { ...base };
|
|
6
|
+
for (const key of Object.keys(delta)) {
|
|
7
|
+
const dv = delta[key];
|
|
8
|
+
const bv = base[key];
|
|
9
|
+
if (dv !== null && typeof dv === "object" && !Array.isArray(dv) &&
|
|
10
|
+
bv !== null && typeof bv === "object" && !Array.isArray(bv)) {
|
|
11
|
+
// @ts-expect-error dynamic merge
|
|
12
|
+
merged[key] = { ...bv, ...dv };
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
// @ts-expect-error dynamic assign
|
|
16
|
+
merged[key] = dv;
|
|
17
|
+
}
|
|
49
18
|
}
|
|
50
|
-
return
|
|
19
|
+
return merged;
|
|
51
20
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
21
|
+
// ── State mapping (based on elegoo-link C++ SDK) ───────────────────────────────
|
|
22
|
+
function mapState(status) {
|
|
23
|
+
switch (status) {
|
|
24
|
+
case -1: return PrinterState.OFFLINE;
|
|
25
|
+
case 0: return PrinterState.INITIALIZING;
|
|
26
|
+
case 1: return PrinterState.IDLE;
|
|
27
|
+
case 2: return PrinterState.PRINTING;
|
|
28
|
+
case 3:
|
|
29
|
+
case 4: return PrinterState.FILAMENT_OPERATING;
|
|
30
|
+
case 5: return PrinterState.AUTO_LEVELING;
|
|
31
|
+
case 6: return PrinterState.PID_CALIBRATING;
|
|
32
|
+
case 7: return PrinterState.RESONANCE_TESTING;
|
|
33
|
+
case 8: return PrinterState.SELF_CHECKING;
|
|
34
|
+
case 9: return PrinterState.UPDATING;
|
|
35
|
+
case 10: return PrinterState.HOMING;
|
|
36
|
+
default: return PrinterState.UNKNOWN;
|
|
56
37
|
}
|
|
57
|
-
return result;
|
|
58
38
|
}
|
|
59
|
-
function
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
39
|
+
function mapSubState(mainStatus, subStatus) {
|
|
40
|
+
if (mainStatus === 2) {
|
|
41
|
+
switch (subStatus) {
|
|
42
|
+
case 2075: return PrinterSubState.P_PRINTING;
|
|
43
|
+
case 2077: return PrinterSubState.P_PRINTING_COMPLETED;
|
|
44
|
+
case 2501: return PrinterSubState.P_PAUSING;
|
|
45
|
+
case 2502:
|
|
46
|
+
case 2505: return PrinterSubState.P_PAUSED;
|
|
47
|
+
case 2401: return PrinterSubState.P_RESUMING;
|
|
48
|
+
case 2402: return PrinterSubState.P_RESUMING_COMPLETED;
|
|
49
|
+
case 2503: return PrinterSubState.P_STOPPING;
|
|
50
|
+
case 2504: return PrinterSubState.P_STOPPED;
|
|
51
|
+
case 2801:
|
|
52
|
+
case 2802: return PrinterSubState.P_HOMING;
|
|
53
|
+
case 2901:
|
|
54
|
+
case 2902: return PrinterSubState.P_AUTO_LEVELING;
|
|
55
|
+
case 1045:
|
|
56
|
+
case 1096: return PrinterSubState.P_EXTRUDER_PREHEATING;
|
|
57
|
+
case 1405:
|
|
58
|
+
case 1906: return PrinterSubState.P_HEATED_BED_PREHEATING;
|
|
59
|
+
case 0: return PrinterSubState.NONE;
|
|
60
|
+
default: return PrinterSubState.UNKNOWN;
|
|
61
|
+
}
|
|
63
62
|
}
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
63
|
+
if (mainStatus === 3 || mainStatus === 4) {
|
|
64
|
+
switch (subStatus) {
|
|
65
|
+
case 1133:
|
|
66
|
+
case 1134:
|
|
67
|
+
case 1135: return PrinterSubState.FO_FILAMENT_LOADING;
|
|
68
|
+
case 1136: return PrinterSubState.FO_FILAMENT_LOADING_COMPLETED;
|
|
69
|
+
case 1144: return PrinterSubState.FO_FILAMENT_UNLOADING;
|
|
70
|
+
case 1145: return PrinterSubState.FO_FILAMENT_UNLOADING_COMPLETED;
|
|
71
|
+
case 0: return PrinterSubState.NONE;
|
|
72
|
+
default: return PrinterSubState.UNKNOWN;
|
|
73
|
+
}
|
|
70
74
|
}
|
|
71
|
-
|
|
75
|
+
if (mainStatus === 5) {
|
|
76
|
+
switch (subStatus) {
|
|
77
|
+
case 2901: return PrinterSubState.AL_AUTO_LEVELING;
|
|
78
|
+
case 2902: return PrinterSubState.AL_AUTO_LEVELING_COMPLETED;
|
|
79
|
+
case 0: return PrinterSubState.NONE;
|
|
80
|
+
default: return PrinterSubState.UNKNOWN;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
if (mainStatus === 6) {
|
|
84
|
+
switch (subStatus) {
|
|
85
|
+
case 1503:
|
|
86
|
+
case 1504: return PrinterSubState.PC_PID_CALIBRATING;
|
|
87
|
+
case 1505: return PrinterSubState.PC_PID_CALIBRATING_COMPLETED;
|
|
88
|
+
case 1506: return PrinterSubState.PC_PID_CALIBRATING_FAILED;
|
|
89
|
+
case 0: return PrinterSubState.NONE;
|
|
90
|
+
default: return PrinterSubState.UNKNOWN;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
return subStatus === 0 ? PrinterSubState.NONE : PrinterSubState.UNKNOWN;
|
|
72
94
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
95
|
+
// ── Main mapper ────────────────────────────────────────────────────────────────
|
|
96
|
+
export function mapStatus(printerId, raw) {
|
|
97
|
+
const ms = raw.machine_status;
|
|
98
|
+
const mainStatus = ms?.status ?? -1;
|
|
99
|
+
const subStatus = ms?.sub_status ?? 0;
|
|
100
|
+
const state = mapState(mainStatus);
|
|
101
|
+
const subState = mapSubState(mainStatus, subStatus);
|
|
102
|
+
const core = {
|
|
103
|
+
state,
|
|
104
|
+
subState,
|
|
105
|
+
exceptionCodes: ms?.exception_status ?? [],
|
|
106
|
+
progress: ms?.progress ?? 0,
|
|
79
107
|
};
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
108
|
+
const temperatures = {};
|
|
109
|
+
if (raw.extruder) {
|
|
110
|
+
temperatures.extruder = {
|
|
111
|
+
current: raw.extruder.temperature ?? 0,
|
|
112
|
+
target: raw.extruder.target ?? 0,
|
|
113
|
+
highest: 0,
|
|
114
|
+
lowest: 0,
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
if (raw.heater_bed) {
|
|
118
|
+
temperatures.heatedBed = {
|
|
119
|
+
current: raw.heater_bed.temperature ?? 0,
|
|
120
|
+
target: raw.heater_bed.target ?? 0,
|
|
121
|
+
highest: 0,
|
|
122
|
+
lowest: 0,
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
if (raw.ztemperature_sensor) {
|
|
126
|
+
temperatures.chamber = {
|
|
127
|
+
current: raw.ztemperature_sensor.temperature ?? 0,
|
|
128
|
+
target: 0,
|
|
129
|
+
highest: raw.ztemperature_sensor.measured_max_temperature ?? 0,
|
|
130
|
+
lowest: raw.ztemperature_sensor.measured_min_temperature ?? 0,
|
|
131
|
+
};
|
|
132
|
+
}
|
|
133
|
+
const fans = {};
|
|
134
|
+
const rf = raw.fans ?? {};
|
|
135
|
+
const fanMap = [
|
|
136
|
+
["fan", "model"],
|
|
137
|
+
["heater_fan", "heatsink"],
|
|
138
|
+
["controller_fan", "controller"],
|
|
139
|
+
["box_fan", "chassis"],
|
|
140
|
+
["aux_fan", "aux"],
|
|
141
|
+
];
|
|
142
|
+
for (const [rawKey, mappedKey] of fanMap) {
|
|
143
|
+
if (rf[rawKey]) {
|
|
144
|
+
fans[mappedKey] = { speed: rf[rawKey].speed ?? 0, rpm: rf[rawKey].rpm ?? 0 };
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
const ed = raw.external_device;
|
|
148
|
+
const externalDevices = {
|
|
149
|
+
cameraConnected: ed?.camera ?? false,
|
|
150
|
+
usbConnected: ed?.u_disk ?? false,
|
|
151
|
+
sdCardConnected: ed?.sd_card ?? false,
|
|
152
|
+
canvasConnected: false,
|
|
88
153
|
};
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
154
|
+
let job;
|
|
155
|
+
if (state === PrinterState.PRINTING && raw.print_status) {
|
|
156
|
+
const ps = raw.print_status;
|
|
157
|
+
job = {
|
|
158
|
+
taskId: ps.uuid ?? "",
|
|
159
|
+
fileName: ps.filename ?? "",
|
|
160
|
+
totalTimeSeconds: ps.total_duration ?? 0,
|
|
161
|
+
elapsedTimeSeconds: ps.print_duration ?? 0,
|
|
162
|
+
remainingTimeSeconds: ps.remaining_time_sec ?? 0,
|
|
163
|
+
totalLayers: ps.total_layer ?? 0,
|
|
164
|
+
currentLayer: ps.current_layer ?? 0,
|
|
165
|
+
progress: ms?.progress ?? 0,
|
|
166
|
+
speedMode: (raw.gcode_move?.speed_mode ?? 1),
|
|
167
|
+
};
|
|
168
|
+
}
|
|
169
|
+
const emptyCanvas = {
|
|
170
|
+
activeCanvasId: 0,
|
|
171
|
+
activeTrayId: 0,
|
|
172
|
+
autoRefill: false,
|
|
173
|
+
canvases: [],
|
|
101
174
|
};
|
|
102
|
-
}
|
|
103
|
-
function mapExternalDevices(raw) {
|
|
104
175
|
return {
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
176
|
+
printerId,
|
|
177
|
+
printer: core,
|
|
178
|
+
job,
|
|
179
|
+
temperatures,
|
|
180
|
+
fans,
|
|
181
|
+
axes: [],
|
|
182
|
+
lights: {},
|
|
183
|
+
storage: {},
|
|
184
|
+
canvas: emptyCanvas,
|
|
185
|
+
externalDevices,
|
|
186
|
+
exceptions: [],
|
|
187
|
+
deviceAssistantStatus: 0,
|
|
109
188
|
};
|
|
110
189
|
}
|
|
111
|
-
function mapExceptions(raw) {
|
|
112
|
-
if (!raw)
|
|
113
|
-
return [];
|
|
114
|
-
return raw.map((e) => ({ code: e.code ?? "", timestamp: e.timestamp ?? 0 }));
|
|
115
|
-
}
|
|
116
190
|
//# sourceMappingURL=CcV2StatusMapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CcV2StatusMapper.js","sourceRoot":"","sources":["../../../../src/infrastructure/adapters/cc-v2/CcV2StatusMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"CcV2StatusMapper.js","sourceRoot":"","sources":["../../../../src/infrastructure/adapters/cc-v2/CcV2StatusMapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,14 @@ import { mapStatus } from "./CcV2StatusMapper.js";
|
|
|
3
3
|
import { PrinterState } from "../../../domain/types/PrinterState.js";
|
|
4
4
|
import { PrinterSubState } from "../../../domain/types/PrinterSubState.js";
|
|
5
5
|
describe("CcV2StatusMapper.mapStatus", () => {
|
|
6
|
-
it("maps
|
|
6
|
+
it("maps machine_status fields", () => {
|
|
7
7
|
const result = mapStatus("printer-1", {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
8
|
+
machine_status: {
|
|
9
|
+
status: 2, // PRINTING
|
|
10
|
+
sub_status: 2075, // P_PRINTING
|
|
11
|
+
progress: 42,
|
|
12
|
+
exception_status: [101],
|
|
13
|
+
},
|
|
12
14
|
});
|
|
13
15
|
expect(result.printerId).toBe("printer-1");
|
|
14
16
|
expect(result.printer.state).toBe(PrinterState.PRINTING);
|
|
@@ -16,44 +18,68 @@ describe("CcV2StatusMapper.mapStatus", () => {
|
|
|
16
18
|
expect(result.printer.progress).toBe(42);
|
|
17
19
|
expect(result.printer.exceptionCodes).toEqual([101]);
|
|
18
20
|
});
|
|
21
|
+
it("maps status=1 to IDLE", () => {
|
|
22
|
+
const result = mapStatus("printer-1", {
|
|
23
|
+
machine_status: { status: 1, sub_status: 0 },
|
|
24
|
+
});
|
|
25
|
+
expect(result.printer.state).toBe(PrinterState.IDLE);
|
|
26
|
+
});
|
|
19
27
|
it("maps temperature fields", () => {
|
|
20
28
|
const result = mapStatus("printer-1", {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
},
|
|
29
|
+
extruder: { temperature: 210, target: 215 },
|
|
30
|
+
heater_bed: { temperature: 60, target: 65 },
|
|
31
|
+
ztemperature_sensor: { temperature: 35, measured_max_temperature: 40, measured_min_temperature: 20 },
|
|
24
32
|
});
|
|
25
|
-
|
|
26
|
-
expect(extruder?.
|
|
27
|
-
expect(
|
|
33
|
+
expect(result.temperatures["extruder"]?.current).toBe(210);
|
|
34
|
+
expect(result.temperatures["extruder"]?.target).toBe(215);
|
|
35
|
+
expect(result.temperatures["heatedBed"]?.current).toBe(60);
|
|
36
|
+
expect(result.temperatures["chamber"]?.current).toBe(35);
|
|
37
|
+
expect(result.temperatures["chamber"]?.highest).toBe(40);
|
|
28
38
|
});
|
|
29
|
-
it("maps print job when
|
|
39
|
+
it("maps print job when state is PRINTING", () => {
|
|
30
40
|
const result = mapStatus("printer-1", {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
41
|
+
machine_status: { status: 2, sub_status: 2075, progress: 50 },
|
|
42
|
+
print_status: {
|
|
43
|
+
uuid: "task-abc",
|
|
44
|
+
filename: "model.gcode",
|
|
45
|
+
total_duration: 3600,
|
|
46
|
+
print_duration: 1800,
|
|
47
|
+
remaining_time_sec: 1800,
|
|
36
48
|
total_layer: 100,
|
|
37
49
|
current_layer: 50,
|
|
38
|
-
progress: 50,
|
|
39
|
-
print_speed_mode: 1,
|
|
40
50
|
},
|
|
41
51
|
});
|
|
42
52
|
expect(result.job).toBeDefined();
|
|
43
53
|
expect(result.job?.taskId).toBe("task-abc");
|
|
44
54
|
expect(result.job?.fileName).toBe("model.gcode");
|
|
45
55
|
expect(result.job?.totalLayers).toBe(100);
|
|
56
|
+
expect(result.job?.progress).toBe(50);
|
|
46
57
|
});
|
|
47
|
-
it("sets job to undefined when
|
|
48
|
-
const result = mapStatus("printer-1", {
|
|
58
|
+
it("sets job to undefined when not printing", () => {
|
|
59
|
+
const result = mapStatus("printer-1", {
|
|
60
|
+
machine_status: { status: 1 },
|
|
61
|
+
});
|
|
49
62
|
expect(result.job).toBeUndefined();
|
|
50
63
|
});
|
|
64
|
+
it("maps external device fields", () => {
|
|
65
|
+
const result = mapStatus("printer-1", {
|
|
66
|
+
external_device: { camera: true, u_disk: true },
|
|
67
|
+
});
|
|
68
|
+
expect(result.externalDevices.cameraConnected).toBe(true);
|
|
69
|
+
expect(result.externalDevices.usbConnected).toBe(true);
|
|
70
|
+
});
|
|
51
71
|
it("uses defaults for missing fields", () => {
|
|
52
72
|
const result = mapStatus("printer-1", {});
|
|
53
|
-
expect(result.printer.state).toBe(PrinterState.
|
|
73
|
+
expect(result.printer.state).toBe(PrinterState.OFFLINE);
|
|
54
74
|
expect(result.printer.subState).toBe(PrinterSubState.NONE);
|
|
55
75
|
expect(result.printer.progress).toBe(0);
|
|
56
76
|
expect(result.externalDevices.usbConnected).toBe(false);
|
|
57
77
|
});
|
|
78
|
+
it("maps paused sub-state", () => {
|
|
79
|
+
const result = mapStatus("printer-1", {
|
|
80
|
+
machine_status: { status: 2, sub_status: 2505 },
|
|
81
|
+
});
|
|
82
|
+
expect(result.printer.subState).toBe(PrinterSubState.P_PAUSED);
|
|
83
|
+
});
|
|
58
84
|
});
|
|
59
85
|
//# sourceMappingURL=CcV2StatusMapper.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CcV2StatusMapper.test.js","sourceRoot":"","sources":["../../../../src/infrastructure/adapters/cc-v2/CcV2StatusMapper.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"CcV2StatusMapper.test.js","sourceRoot":"","sources":["../../../../src/infrastructure/adapters/cc-v2/CcV2StatusMapper.test.ts"],"names":[],"mappings":"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"}
|
package/docs/cc2-protocol.md
CHANGED
|
@@ -40,7 +40,7 @@ The format is always 10 characters: `0cli` prefix + 6 hex digits.
|
|
|
40
40
|
| Status push (unsolicited)| `elegoo/{sn}/api_status` | printer |
|
|
41
41
|
| Heartbeat | `elegoo/{sn}/{clientId}/api_heartbeat` | client |
|
|
42
42
|
|
|
43
|
-
`{sn}` is the printer serial number (e.g. `
|
|
43
|
+
`{sn}` is the printer serial number (e.g. `ABCD1234XY5678Z`).
|
|
44
44
|
`{clientId}` is the 10-character client ID generated above.
|
|
45
45
|
|
|
46
46
|
---
|
|
@@ -192,10 +192,10 @@ Published by the client to `elegoo/{sn}/{clientId}/api_heartbeat` every ~30 s to
|
|
|
192
192
|
"error_code": 0,
|
|
193
193
|
"hardware_version": "",
|
|
194
194
|
"hostname": "Elegoo Centauri Carbon 2",
|
|
195
|
-
"ip": "
|
|
195
|
+
"ip": "192.168.1.100",
|
|
196
196
|
"machine_model": "Centauri Carbon 2",
|
|
197
197
|
"protocol_version": "1.0.0",
|
|
198
|
-
"sn": "
|
|
198
|
+
"sn": "ABCD1234XY5678Z",
|
|
199
199
|
"software_version": {
|
|
200
200
|
"mcu_version": "00.00.00.00",
|
|
201
201
|
"ota_version": "02.00.02.00",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@usarral/century-link-ts",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.0",
|
|
4
4
|
"description": "TypeScript library for communicating with Elegoo 3D printers over LAN",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -20,6 +20,12 @@
|
|
|
20
20
|
"engines": {
|
|
21
21
|
"node": ">=18.0.0"
|
|
22
22
|
},
|
|
23
|
+
"scripts": {
|
|
24
|
+
"build": "tsc",
|
|
25
|
+
"typecheck": "tsc --noEmit",
|
|
26
|
+
"test": "vitest run",
|
|
27
|
+
"test:watch": "vitest"
|
|
28
|
+
},
|
|
23
29
|
"keywords": [
|
|
24
30
|
"elegoo",
|
|
25
31
|
"3d-printer",
|
|
@@ -40,6 +46,7 @@
|
|
|
40
46
|
"registry": "https://registry.npmjs.org/",
|
|
41
47
|
"access": "public"
|
|
42
48
|
},
|
|
49
|
+
"packageManager": "pnpm@10.13.1",
|
|
43
50
|
"dependencies": {
|
|
44
51
|
"mqtt": "^5.10.4",
|
|
45
52
|
"ws": "^8.18.2"
|
|
@@ -49,11 +56,5 @@
|
|
|
49
56
|
"@types/ws": "^8.5.14",
|
|
50
57
|
"typescript": "^5.8.3",
|
|
51
58
|
"vitest": "^4.1.8"
|
|
52
|
-
},
|
|
53
|
-
"scripts": {
|
|
54
|
-
"build": "tsc",
|
|
55
|
-
"typecheck": "tsc --noEmit",
|
|
56
|
-
"test": "vitest run",
|
|
57
|
-
"test:watch": "vitest"
|
|
58
59
|
}
|
|
59
|
-
}
|
|
60
|
+
}
|