@zimo-elektronik/zcan 1.0.2 → 1.0.4
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/@types/models.d.ts +3 -0
- package/dist/zcan/lanDataGroup.d.ts +1 -1
- package/dist/zcan/lanDataGroup.js +1 -1
- package/dist/zcan/lanDataGroup.js.map +1 -1
- package/dist/zcan/networkGroup.d.ts +4 -0
- package/dist/zcan/networkGroup.js +27 -9
- package/dist/zcan/networkGroup.js.map +1 -1
- package/package.json +1 -1
- package/src/@types/models.ts +4 -0
- package/src/zcan/lanDataGroup.ts +1 -1
- package/src/zcan/networkGroup.ts +37 -15
package/dist/@types/models.d.ts
CHANGED
|
@@ -13,7 +13,7 @@ export default class LanDataGroup {
|
|
|
13
13
|
locoGuiMXExtended(NID: number): void;
|
|
14
14
|
dataValueExtended(NID: number): void;
|
|
15
15
|
locoSpeedTapExtended(NID: number): void;
|
|
16
|
-
mxUpdateFnIcons(destructuredBuffer: ZcanDataArray):
|
|
16
|
+
mxUpdateFnIcons(destructuredBuffer: ZcanDataArray): void;
|
|
17
17
|
parse(size: number, command: number, mode: number, nid: number, buffer: Buffer): void;
|
|
18
18
|
private parseDataValueExtended;
|
|
19
19
|
private parseLocoGuiExtended;
|
|
@@ -41,7 +41,7 @@ export default class LanDataGroup {
|
|
|
41
41
|
{ value: 0, length: 1 },
|
|
42
42
|
], 0b00);
|
|
43
43
|
}
|
|
44
|
-
|
|
44
|
+
mxUpdateFnIcons(destructuredBuffer) {
|
|
45
45
|
this.mx10.sendData(0x17, 0x28, destructuredBuffer, 0b01);
|
|
46
46
|
}
|
|
47
47
|
parse(size, command, mode, nid, buffer) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lanDataGroup.js","sourceRoot":"","sources":["../../src/zcan/lanDataGroup.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AAU5E,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAClD,OAAO,aAAa,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,WAAW,EAAE,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAOjE,MAAM,CAAC,OAAO,OAAO,YAAY;IACf,iBAAiB,GAAG,IAAI,OAAO,EAAS,CAAC;IACzC,mBAAmB,GAAG,IAAI,OAAO,EAAqB,CAAC;IACvD,mBAAmB,GAAG,IAAI,OAAO,EAAyB,CAAC;IAC3D,sBAAsB,GAAG,IAAI,OAAO,EAAwB,CAAC;IAErE,IAAI,CAAO;IAEnB,YAAY,IAAU;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,eAAe,CAAC,GAAW;QACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAChB,IAAI,EACJ,IAAI,EACJ;YACE,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAC;YACrC,EAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAC;YACvB,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;SACtB,EACD,IAAI,CACL,CAAC;IACJ,CAAC;IAED,iBAAiB,CAAC,GAAW;QAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAChB,IAAI,EACJ,IAAI,EACJ;YACE,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAC;YACrC,EAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAC;YACvB,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;SACtB,EACD,IAAI,CACL,CAAC;IACJ,CAAC;IAED,iBAAiB,CAAC,GAAW;QAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAChB,IAAI,EACJ,IAAI,EACJ;YACE,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAC;YACrC,EAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAC;YACvB,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;SACtB,EACD,IAAI,CACL,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,GAAW;QAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAChB,IAAI,EACJ,IAAI,EACJ;YACE,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAC;YACrC,EAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAC;YACvB,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;YACrB,EAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC;SACtB,EACD,IAAI,CACL,CAAC;IACJ,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"lanDataGroup.js","sourceRoot":"","sources":["../../src/zcan/lanDataGroup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
|
+
import { Subject } from 'rxjs';
|
|
1
2
|
import MX10 from '../MX10';
|
|
2
3
|
import { Buffer } from 'buffer';
|
|
4
|
+
import { PingResponseExtended } from 'src/@types/models';
|
|
3
5
|
export default class NetworkGroup {
|
|
6
|
+
readonly onPingResponse: Subject<PingResponseExtended>;
|
|
4
7
|
private mx10;
|
|
8
|
+
pingTimeout: NodeJS.Timeout | null;
|
|
5
9
|
constructor(mx10: MX10);
|
|
6
10
|
ping(mode?: number): void;
|
|
7
11
|
portClose(): void;
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
+
import { Subject } from 'rxjs';
|
|
1
2
|
export default class NetworkGroup {
|
|
3
|
+
onPingResponse = new Subject();
|
|
2
4
|
mx10;
|
|
5
|
+
pingTimeout = null;
|
|
3
6
|
constructor(mx10) {
|
|
4
7
|
this.mx10 = mx10;
|
|
5
8
|
}
|
|
@@ -22,16 +25,31 @@ export default class NetworkGroup {
|
|
|
22
25
|
}
|
|
23
26
|
}
|
|
24
27
|
pingResponse(size, mode, nid, _buffer) {
|
|
25
|
-
if (
|
|
26
|
-
if (
|
|
27
|
-
this.mx10.mx10NID
|
|
28
|
+
if (this.onPingResponse.observed) {
|
|
29
|
+
if (size === 8) {
|
|
30
|
+
if (!this.mx10.mx10NID) {
|
|
31
|
+
this.mx10.mx10NID = nid;
|
|
32
|
+
}
|
|
33
|
+
this.mx10.connected = true;
|
|
34
|
+
this.mx10.reconnectLogic();
|
|
35
|
+
if (this.pingTimeout) {
|
|
36
|
+
clearTimeout(this.pingTimeout);
|
|
37
|
+
}
|
|
38
|
+
this.pingTimeout = setTimeout(() => {
|
|
39
|
+
this.mx10.connected = false;
|
|
40
|
+
this.onPingResponse.next({
|
|
41
|
+
connected: this.mx10.connected,
|
|
42
|
+
});
|
|
43
|
+
console.log('No ping for 5 seconds, disconnected');
|
|
44
|
+
}, 5000);
|
|
28
45
|
}
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
46
|
+
else {
|
|
47
|
+
throw new Error('LENGTH ERROR: readCmdGrp_0x0A-0x0A, read length as: ' +
|
|
48
|
+
size.toString());
|
|
49
|
+
}
|
|
50
|
+
this.onPingResponse.next({
|
|
51
|
+
connected: this.mx10.connected,
|
|
52
|
+
});
|
|
35
53
|
}
|
|
36
54
|
}
|
|
37
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networkGroup.js","sourceRoot":"","sources":["../../src/zcan/networkGroup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"networkGroup.js","sourceRoot":"","sources":["../../src/zcan/networkGroup.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAS7B,MAAM,CAAC,OAAO,OAAO,YAAY;IACf,cAAc,GAAG,IAAI,OAAO,EAAwB,CAAC;IAE7D,IAAI,CAAO;IACnB,WAAW,GAA0B,IAAI,CAAC;IAE1C,YAAY,IAAU;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,IAAI,GAAG,IAAI;QACd,IAAI,CAAC,IAAI,CAAC,QAAQ,CAChB,IAAI,EACJ,IAAI,EACJ;YACE;gBACE,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;gBACxB,MAAM,EAAE,CAAC;aACV;SACF,EACD,IAAI,CACL,CAAC;IACJ,CAAC;IAED,SAAS;QACP,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,EAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CACH,IAAY,EACZ,OAAe,EACf,IAAY,EACZ,GAAW,EACX,MAAc;QAEd,QAAQ,OAAO,EAAE,CAAC;YAChB,KAAK,IAAI;gBACP,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBAC3C,MAAM;QACV,CAAC;IACH,CAAC;IAGD,YAAY,CAAC,IAAY,EAAE,IAAY,EAAE,GAAW,EAAE,OAAe;QACnE,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;YACjC,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBAGf,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBACvB,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC;gBAC1B,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;gBAK3B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;gBAE3B,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;oBACrB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACjC,CAAC;gBAED,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;oBACjC,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;oBAC5B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;wBACvB,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;qBAC/B,CAAC,CAAC;oBAEH,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;gBACrD,CAAC,EAAE,IAAI,CAAC,CAAC;YACX,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CACb,sDAAsD;oBACpD,IAAI,CAAC,QAAQ,EAAE,CAClB,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;gBACvB,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;aAC/B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"repository": "https://github.com/ZIMO-Elektronik/zcan",
|
|
8
|
-
"version": "1.0.
|
|
8
|
+
"version": "1.0.4",
|
|
9
9
|
"scripts": {
|
|
10
10
|
"start": "node dist/main.js",
|
|
11
11
|
"start:dev": "nodemon --ext js,ts,json,env --exec \"node --experimental-specifier-resolution=node --loader ts-node/esm\" src/main.ts",
|
package/src/@types/models.ts
CHANGED
package/src/zcan/lanDataGroup.ts
CHANGED
package/src/zcan/networkGroup.ts
CHANGED
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
// 0x0A
|
|
2
|
+
import {Subject} from 'rxjs';
|
|
2
3
|
import MX10 from '../MX10';
|
|
3
4
|
import {Buffer} from 'buffer';
|
|
5
|
+
import {PingResponseExtended} from 'src/@types/models';
|
|
4
6
|
|
|
5
7
|
/**
|
|
6
8
|
*
|
|
7
9
|
* @category Groups
|
|
8
10
|
*/
|
|
9
11
|
export default class NetworkGroup {
|
|
12
|
+
public readonly onPingResponse = new Subject<PingResponseExtended>();
|
|
13
|
+
|
|
10
14
|
private mx10: MX10;
|
|
15
|
+
pingTimeout: NodeJS.Timeout | null = null;
|
|
11
16
|
|
|
12
17
|
constructor(mx10: MX10) {
|
|
13
18
|
this.mx10 = mx10;
|
|
@@ -47,25 +52,42 @@ export default class NetworkGroup {
|
|
|
47
52
|
|
|
48
53
|
// 0x0A.0x00
|
|
49
54
|
pingResponse(size: number, mode: number, nid: number, _buffer: Buffer) {
|
|
50
|
-
if (
|
|
51
|
-
|
|
55
|
+
if (this.onPingResponse.observed) {
|
|
56
|
+
if (size === 8) {
|
|
57
|
+
// TODO IMPLEMENT DETAIL READOUT
|
|
52
58
|
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
59
|
+
if (!this.mx10.mx10NID) {
|
|
60
|
+
this.mx10.mx10NID = nid;
|
|
61
|
+
}
|
|
62
|
+
this.mx10.connected = true;
|
|
63
|
+
|
|
64
|
+
// TODO reconnect when uuid has changed
|
|
65
|
+
// const uuid = buffer.readUInt32LE(0);
|
|
57
66
|
|
|
58
|
-
|
|
59
|
-
// const uuid = buffer.readUInt32LE(0);
|
|
67
|
+
this.mx10.reconnectLogic();
|
|
60
68
|
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
69
|
+
if (this.pingTimeout) {
|
|
70
|
+
clearTimeout(this.pingTimeout);
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
this.pingTimeout = setTimeout(() => {
|
|
74
|
+
this.mx10.connected = false;
|
|
75
|
+
this.onPingResponse.next({
|
|
76
|
+
connected: this.mx10.connected,
|
|
77
|
+
});
|
|
78
|
+
// eslint-disable-next-line no-console
|
|
79
|
+
console.log('No ping for 5 seconds, disconnected');
|
|
80
|
+
}, 5000);
|
|
81
|
+
} else {
|
|
82
|
+
throw new Error(
|
|
83
|
+
'LENGTH ERROR: readCmdGrp_0x0A-0x0A, read length as: ' +
|
|
84
|
+
size.toString(),
|
|
85
|
+
);
|
|
86
|
+
}
|
|
64
87
|
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
);
|
|
88
|
+
this.onPingResponse.next({
|
|
89
|
+
connected: this.mx10.connected,
|
|
90
|
+
});
|
|
69
91
|
}
|
|
70
92
|
}
|
|
71
93
|
}
|