motion-master-client 0.0.97 → 0.0.99
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/package.json +1 -1
- package/src/lib/cia402.d.ts +11 -1
- package/src/lib/cia402.js +11 -1
- package/src/lib/cia402.js.map +1 -1
- package/src/lib/motion-master-client.d.ts +1 -1
- package/src/lib/motion-master-client.js +2 -2
- package/src/lib/motion-master-client.js.map +1 -1
- package/src/lib/util.d.ts +1 -0
- package/src/lib/util.js +20 -1
- package/src/lib/util.js.map +1 -1
package/package.json
CHANGED
package/src/lib/cia402.d.ts
CHANGED
|
@@ -154,6 +154,11 @@ export declare const cia402Transitions: {
|
|
|
154
154
|
command: ControlwordCommand;
|
|
155
155
|
}[];
|
|
156
156
|
export declare enum ModesOfOperation {
|
|
157
|
+
CYCLIC_SYNC_OUTPUT_TORQUE_MODE = -110,
|
|
158
|
+
CYCLIC_SYNC_OUTPUT_VELOCITY_MODE = -109,
|
|
159
|
+
CYCLIC_SYNC_OUTPUT_POSITION_MODE = -108,
|
|
160
|
+
PROFILE_OUTPUT_VELOCITY_MODE = -103,
|
|
161
|
+
PROFILE_OUTPUT_POSITION_MODE = -101,
|
|
157
162
|
SYSTEM_IDENTIFICATION_MODE = -4,
|
|
158
163
|
OPEN_LOOP_FIELD_MODE = -3,
|
|
159
164
|
DIAGNOSTICS_MODE = -2,
|
|
@@ -168,6 +173,12 @@ export declare enum ModesOfOperation {
|
|
|
168
173
|
CYCLIC_SYNC_TORQUE_MODE = 10
|
|
169
174
|
}
|
|
170
175
|
export declare const modesOfOperationOptions: {
|
|
176
|
+
'Cyclic synchronous output torque mode': ModesOfOperation;
|
|
177
|
+
'Cyclic synchronous output velocity mode': ModesOfOperation;
|
|
178
|
+
'Cyclic synchronous output position mode': ModesOfOperation;
|
|
179
|
+
'Profile output velocity mode': ModesOfOperation;
|
|
180
|
+
'Profile output position mode': ModesOfOperation;
|
|
181
|
+
'System Identification Mode': ModesOfOperation;
|
|
171
182
|
'Open loop field mode': ModesOfOperation;
|
|
172
183
|
'Diagnostics mode': ModesOfOperation;
|
|
173
184
|
'Cogging compensation recording mode': ModesOfOperation;
|
|
@@ -179,6 +190,5 @@ export declare const modesOfOperationOptions: {
|
|
|
179
190
|
'Cyclic synchronous position mode': ModesOfOperation;
|
|
180
191
|
'Cyclic synchronous velocity mode': ModesOfOperation;
|
|
181
192
|
'Cyclic synchronous torque mode': ModesOfOperation;
|
|
182
|
-
'System Identification Mode': ModesOfOperation;
|
|
183
193
|
};
|
|
184
194
|
export declare const supportedDriveModesBits: string[];
|
package/src/lib/cia402.js
CHANGED
|
@@ -346,6 +346,11 @@ exports.cia402Transitions = [
|
|
|
346
346
|
];
|
|
347
347
|
var ModesOfOperation;
|
|
348
348
|
(function (ModesOfOperation) {
|
|
349
|
+
ModesOfOperation[ModesOfOperation["CYCLIC_SYNC_OUTPUT_TORQUE_MODE"] = -110] = "CYCLIC_SYNC_OUTPUT_TORQUE_MODE";
|
|
350
|
+
ModesOfOperation[ModesOfOperation["CYCLIC_SYNC_OUTPUT_VELOCITY_MODE"] = -109] = "CYCLIC_SYNC_OUTPUT_VELOCITY_MODE";
|
|
351
|
+
ModesOfOperation[ModesOfOperation["CYCLIC_SYNC_OUTPUT_POSITION_MODE"] = -108] = "CYCLIC_SYNC_OUTPUT_POSITION_MODE";
|
|
352
|
+
ModesOfOperation[ModesOfOperation["PROFILE_OUTPUT_VELOCITY_MODE"] = -103] = "PROFILE_OUTPUT_VELOCITY_MODE";
|
|
353
|
+
ModesOfOperation[ModesOfOperation["PROFILE_OUTPUT_POSITION_MODE"] = -101] = "PROFILE_OUTPUT_POSITION_MODE";
|
|
349
354
|
ModesOfOperation[ModesOfOperation["SYSTEM_IDENTIFICATION_MODE"] = -4] = "SYSTEM_IDENTIFICATION_MODE";
|
|
350
355
|
ModesOfOperation[ModesOfOperation["OPEN_LOOP_FIELD_MODE"] = -3] = "OPEN_LOOP_FIELD_MODE";
|
|
351
356
|
ModesOfOperation[ModesOfOperation["DIAGNOSTICS_MODE"] = -2] = "DIAGNOSTICS_MODE";
|
|
@@ -360,6 +365,12 @@ var ModesOfOperation;
|
|
|
360
365
|
ModesOfOperation[ModesOfOperation["CYCLIC_SYNC_TORQUE_MODE"] = 10] = "CYCLIC_SYNC_TORQUE_MODE";
|
|
361
366
|
})(ModesOfOperation = exports.ModesOfOperation || (exports.ModesOfOperation = {}));
|
|
362
367
|
exports.modesOfOperationOptions = {
|
|
368
|
+
'Cyclic synchronous output torque mode': ModesOfOperation.CYCLIC_SYNC_OUTPUT_TORQUE_MODE,
|
|
369
|
+
'Cyclic synchronous output velocity mode': ModesOfOperation.CYCLIC_SYNC_OUTPUT_VELOCITY_MODE,
|
|
370
|
+
'Cyclic synchronous output position mode': ModesOfOperation.CYCLIC_SYNC_OUTPUT_POSITION_MODE,
|
|
371
|
+
'Profile output velocity mode': ModesOfOperation.PROFILE_OUTPUT_VELOCITY_MODE,
|
|
372
|
+
'Profile output position mode': ModesOfOperation.PROFILE_OUTPUT_POSITION_MODE,
|
|
373
|
+
'System Identification Mode': ModesOfOperation.SYSTEM_IDENTIFICATION_MODE,
|
|
363
374
|
'Open loop field mode': ModesOfOperation.OPEN_LOOP_FIELD_MODE,
|
|
364
375
|
'Diagnostics mode': ModesOfOperation.DIAGNOSTICS_MODE,
|
|
365
376
|
'Cogging compensation recording mode': ModesOfOperation.COGGING_COMPENSATION_RECORDING_MODE,
|
|
@@ -371,7 +382,6 @@ exports.modesOfOperationOptions = {
|
|
|
371
382
|
'Cyclic synchronous position mode': ModesOfOperation.CYCLIC_SYNC_POSITION_MODE,
|
|
372
383
|
'Cyclic synchronous velocity mode': ModesOfOperation.CYCLIC_SYNC_VELOCITY_MODE,
|
|
373
384
|
'Cyclic synchronous torque mode': ModesOfOperation.CYCLIC_SYNC_TORQUE_MODE,
|
|
374
|
-
'System Identification Mode': ModesOfOperation.SYSTEM_IDENTIFICATION_MODE,
|
|
375
385
|
};
|
|
376
386
|
exports.supportedDriveModesBits = [
|
|
377
387
|
'pp = profile position mode',
|
package/src/lib/cia402.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cia402.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/cia402.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cia402.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/cia402.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { MotionMasterReqResClient } from "./motion-master-req-res-client";
|
|
|
6
6
|
import { MotionMasterReqResSocket } from "./motion-master-req-res-socket";
|
|
7
7
|
import { DeviceParameterIds, DeviceRef, ParameterValueType } from "./types";
|
|
8
8
|
import { DeviceParameter } from "./device-parameter";
|
|
9
|
-
export declare function createMotionMasterClient(hostname: string): MotionMasterClient;
|
|
9
|
+
export declare function createMotionMasterClient(hostname: string, pingSystemInterval?: number, systemAliveTimeout?: number): MotionMasterClient;
|
|
10
10
|
export declare class MotionMasterClient {
|
|
11
11
|
readonly reqResSocket: MotionMasterReqResSocket;
|
|
12
12
|
readonly pubSubSocket: MotionMasterPubSubSocket;
|
|
@@ -9,12 +9,12 @@ const motion_master_req_res_client_1 = require("./motion-master-req-res-client")
|
|
|
9
9
|
const motion_master_req_res_web_socket_1 = require("./motion-master-req-res-web-socket");
|
|
10
10
|
const operators_1 = require("./operators");
|
|
11
11
|
const types_1 = require("./types");
|
|
12
|
-
function createMotionMasterClient(hostname) {
|
|
12
|
+
function createMotionMasterClient(hostname, pingSystemInterval = 250, systemAliveTimeout = 1000) {
|
|
13
13
|
const reqResSocket = new motion_master_req_res_web_socket_1.MotionMasterReqResWebSocket();
|
|
14
14
|
const pubSubSocket = new motion_master_pub_sub_web_socket_1.MotionMasterPubSubWebSocket();
|
|
15
15
|
const client = new MotionMasterClient(reqResSocket, pubSubSocket);
|
|
16
16
|
const clientId = (0, uuid_1.v4)();
|
|
17
|
-
reqResSocket.open(`ws://${hostname}:63524?clientId=${clientId}
|
|
17
|
+
reqResSocket.open(`ws://${hostname}:63524?clientId=${clientId}`, pingSystemInterval, systemAliveTimeout);
|
|
18
18
|
pubSubSocket.open(`ws://${hostname}:63525?clientId=${clientId}`);
|
|
19
19
|
return client;
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"motion-master-client.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/motion-master-client.ts"],"names":[],"mappings":";;;AAAA,+BAAmJ;AACnJ,+BAA0B;AAE1B,iFAA0E;AAE1E,yFAAiF;AACjF,iFAA0E;AAE1E,yFAAiF;AACjF,2CAAwL;AACxL,mCAAiG;AAGjG,SAAgB,wBAAwB,CAAC,QAAgB;
|
|
1
|
+
{"version":3,"file":"motion-master-client.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/motion-master-client.ts"],"names":[],"mappings":";;;AAAA,+BAAmJ;AACnJ,+BAA0B;AAE1B,iFAA0E;AAE1E,yFAAiF;AACjF,iFAA0E;AAE1E,yFAAiF;AACjF,2CAAwL;AACxL,mCAAiG;AAGjG,SAAgB,wBAAwB,CAAC,QAAgB,EAAE,kBAAkB,GAAG,GAAG,EAAE,kBAAkB,GAAG,IAAI;IAC5G,MAAM,YAAY,GAAG,IAAI,8DAA2B,EAAE,CAAC;IACvD,MAAM,YAAY,GAAG,IAAI,8DAA2B,EAAE,CAAC;IAEvD,MAAM,MAAM,GAAG,IAAI,kBAAkB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;IAElE,MAAM,QAAQ,GAAG,IAAA,SAAE,GAAE,CAAC;IACtB,YAAY,CAAC,IAAI,CAAC,QAAQ,QAAQ,mBAAmB,QAAQ,EAAE,EAAE,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;IACzG,YAAY,CAAC,IAAI,CAAC,QAAQ,QAAQ,mBAAmB,QAAQ,EAAE,CAAC,CAAC;IAEjE,OAAO,MAAM,CAAC;AAChB,CAAC;AAXD,4DAWC;AAED,MAAa,kBAAkB;IAO7B,YACW,YAAsC,EACtC,YAAsC;QADtC,iBAAY,GAAZ,YAAY,CAA0B;QACtC,iBAAY,GAAZ,YAAY,CAA0B;QAQjD;;;;WAIG;QACH,mBAAc,GAAG,IAAA,oBAAa,EAAC,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CACzF,IAAA,UAAG,EAAC,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,EAAE,EAAE,CAAC,kBAAkB,IAAI,kBAAkB,CAAC,CAC5F,CAAC;QAEF;;;WAGG;QACH,WAAM,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAC/B,IAAA,aAAM,EAAC,OAAO,CAAC,CAChB,CAAC;QAEF;;;WAGG;QACH,eAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAC3B,IAAA,YAAK,GAAE,CACR,CAAC;QA7BA,IAAI,CAAC,OAAO,GAAG,IAAI,uDAAwB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/D,IAAI,CAAC,OAAO,GAAG,IAAI,uDAAwB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAE/D,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAChC,CAAC;IA2BD;;;;OAIG;IACH,SAAS,CAAC,cAAc,GAAG,IAAI;QAC7B,OAAO,IAAA,qBAAc,EACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,IAAA,cAAO,EAAC,cAAc,CAAC,CACxB,CACF,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,eAAe,CACb,GAAuB,EACvB,kBAA0B,EAC1B,MAAyB,EACzB,cAAc,GAAG,IAAI;QAErB,OAAO,IAAA,YAAK,EAAC,GAAG,EAAE;;YAChB,MAAM,KAAK,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,mCAAI,IAAA,SAAE,GAAE,CAAC;YACpC,MAAM,SAAS,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,mCAAI,IAAA,SAAE,GAAE,CAAC;YAE5C,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;aAC/D;YAED,IAAI,CAAC,OAAO,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC,IAAI,CACjD,IAAA,eAAQ,EAAC,CAAC,IAAI,EAAE,EAAE;gBAChB,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,EAAE;oBACtE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;iBACnE;gBAED,wJAAwJ;gBACxJ,6EAA6E;gBAC7E,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC;gBAEpD,MAAM,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEjC,MAAM,KAAK,GAAsE;oBAC/E,wBAAwB,EAAE;wBACxB,aAAa;wBACb,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;wBAC1F,YAAY,EAAE,KAAK;qBACpB;oBACD,QAAQ,EAAE,kBAAkB;oBAC5B,KAAK;iBACN,CAAC;gBAEF,OAAO,IAAI,CAAC,OAAO,CAAC,oCAAoC,CAAC,KAAK,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;YAC7F,CAAC,CAAC,CACH,CAAC,SAAS,EAAE,CAAC;YAEd,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAE/B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAC5C,IAAA,4CAAgC,EAAC,MAAM,CAAC,KAAK,CAAC,EAC9C,IAAA,sEAA0D,GAAE,CAC7D,CAAC;YAEF,OAAO,IAAI,iBAAU,CAAuB,CAAC,QAAQ,EAAE,EAAE;gBACvD,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE;oBACxD,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;gBACjC,CAAC,CAAC,CAAC;gBACH,OAAO,YAAY,CAAC;YACtB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;OAOG;IACH,+BAA+B,CAC7B,GAAuB,EACvB,kBAA0B,EAC1B,MAAyB,EACzB,cAAc,GAAG,IAAI;QAErB,OAAO,IAAA,YAAK,EAAC,GAAG,EAAE;;YAChB,MAAM,KAAK,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,mCAAI,IAAA,SAAE,GAAE,CAAC;YACpC,MAAM,SAAS,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,mCAAI,IAAA,SAAE,GAAE,CAAC;YAE5C,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;aAC/D;YAED,IAAI,CAAC,OAAO,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC,IAAI,CACjD,IAAA,eAAQ,EAAC,CAAC,IAAI,EAAE,EAAE;gBAChB,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,EAAE;oBACtE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;iBACnE;gBAED,wJAAwJ;gBACxJ,6EAA6E;gBAC7E,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC;gBAEpD,MAAM,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEjC,MAAM,KAAK,GAAsE;oBAC/E,wBAAwB,EAAE;wBACxB,aAAa;wBACb,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;wBAC1F,YAAY,EAAE,KAAK;qBACpB;oBACD,QAAQ,EAAE,kBAAkB;oBAC5B,KAAK;iBACN,CAAC;gBAEF,OAAO,IAAI,CAAC,OAAO,CAAC,oCAAoC,CAAC,KAAK,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;YAC7F,CAAC,CAAC,CACH,CAAC,SAAS,EAAE,CAAC;YAEd,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAE/B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAC5C,IAAA,4CAAgC,EAAC,MAAM,CAAC,KAAK,CAAC,EAC9C,IAAA,uEAA2D,EAAC,IAAI,CAAC,OAAO,CAAC,CAC1E,CAAC;YAEF,OAAO,IAAI,iBAAU,CAAoB,CAAC,QAAQ,EAAE,EAAE;gBACpD,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE;oBACxD,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;gBACjC,CAAC,CAAC,CAAC;gBACH,OAAO,YAAY,CAAC;YACtB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,oBAAoB,CAClB,EAAwC,EACxC,kBAA0B,EAC1B,MAAyB,EACzB,cAAc,GAAG,IAAI;QAErB,MAAM,GAAG,GAAG,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACjD,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,kBAAkB,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,IAAI,CAC/E,IAAA,UAAG,EAAC,CAAC,UAAU,EAAE,EAAE,WAAC,OAAA,CAAC,MAAA,UAAU,CAAC,CAAC,CAAC,mCAAI,CAAC,CAAM,CAAA,EAAA,CAAC,CAC/C,CAAC;IACJ,CAAC;IAED,kBAAkB,CAAC,SAAoB,EAAE,kBAAkB,GAAG,EAAE;QAC9D,OAAO,IAAI,CAAC,oBAAoB,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC,IAAI,CAC/E,IAAA,UAAG,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,0BAA0B;QAChE,IAAA,2BAAoB,GAAE,CACvB,CAAC;IACJ,CAAC;IAED,sBAAsB,CAAC,SAAoB,EAAE,kBAAkB,GAAG,EAAE;QAClE,OAAO,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC,IAAI,CAChE,IAAA,aAAM,EAAC,OAAO,CAAC,EACf,IAAA,YAAK,GAAE,CACR,CAAC;IACJ,CAAC;IAED,iBAAiB,CAAC,SAAoB,EAAE,kBAAkB,GAAG,EAAE;QAC7D,OAAO,IAAA,qBAAc,EAAC,IAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC,CAAC;IACpF,CAAC;IAED,sBAAsB;QACpB,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE;YAC/E,IAAI,WAAW,CAAC,KAAK,KAAK,2BAAmB,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,EAAE;gBACrF,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC;aACxC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,cAAc,CAAC,SAAiB;QAC9B,IAAI,CAAC,OAAO,CAAC,mCAAmC,CAAC,EAAE,wBAAwB,EAAE,SAAS,EAAE,CAAC,CAAC;QAC1F,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;IAED,iBAAiB;QACf,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACvD,CAAC;IAED,YAAY;;QACV,MAAA,IAAI,CAAC,uBAAuB,0CAAE,WAAW,EAAE,CAAC;QAC5C,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC;QAEvC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED,aAAa;QACX,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;QAE3B,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAChC,CAAC;CAEF;AAhQD,gDAgQC"}
|
package/src/lib/util.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { SystemLogLine } from "./system-log-line";
|
|
|
2
2
|
import { IMotionMasterMessage, MotionMasterMessage } from "./types";
|
|
3
3
|
export declare function parseSystemLogLine(line: string): SystemLogLine | undefined;
|
|
4
4
|
export declare function parseSystemLogContent(content: string): SystemLogLine[];
|
|
5
|
+
export declare function diffSystemLogContents(oldContent: string, newContent: string, lineSeparator?: string, lastLineIndex?: number): string;
|
|
5
6
|
export declare function createPlainObjectFromMotionMasterMessage(motionMasterMessage: MotionMasterMessage): {
|
|
6
7
|
[k: string]: any;
|
|
7
8
|
};
|
package/src/lib/util.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.camelCaseToWords = exports.findDuplicates = exports.getMapKeyByValue = exports.emptyAppBase64 = exports.createRandomColor = exports.convertRgbToLedColor = exports.resolveAfter = exports.decodeTextContent = exports.convertMotionMasterMessageToLoggerContext = exports.createPlainObjectFromMotionMasterMessage = exports.parseSystemLogContent = exports.parseSystemLogLine = void 0;
|
|
3
|
+
exports.camelCaseToWords = exports.findDuplicates = exports.getMapKeyByValue = exports.emptyAppBase64 = exports.createRandomColor = exports.convertRgbToLedColor = exports.resolveAfter = exports.decodeTextContent = exports.convertMotionMasterMessageToLoggerContext = exports.createPlainObjectFromMotionMasterMessage = exports.diffSystemLogContents = exports.parseSystemLogContent = exports.parseSystemLogLine = void 0;
|
|
4
4
|
const types_1 = require("./types");
|
|
5
5
|
function parseSystemLogLine(line) {
|
|
6
6
|
const re = /(\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}\.\d{1,3})\s\((.+)\)\s(?:\[(.+)\])?(.+:\d+)(.+?)\|(.*)/s;
|
|
@@ -27,6 +27,25 @@ function parseSystemLogContent(content) {
|
|
|
27
27
|
.filter((l) => l !== undefined);
|
|
28
28
|
}
|
|
29
29
|
exports.parseSystemLogContent = parseSystemLogContent;
|
|
30
|
+
function diffSystemLogContents(oldContent, newContent, lineSeparator = '\n', lastLineIndex = -2) {
|
|
31
|
+
const oldLines = oldContent.split(lineSeparator);
|
|
32
|
+
const oldLastLine = oldLines.at(lastLineIndex);
|
|
33
|
+
if (oldLastLine) {
|
|
34
|
+
const newLines = newContent.split(lineSeparator);
|
|
35
|
+
let i = newLines.length - 1;
|
|
36
|
+
while (i >= 0) {
|
|
37
|
+
if (newLines[i] === oldLastLine) {
|
|
38
|
+
break;
|
|
39
|
+
}
|
|
40
|
+
i--;
|
|
41
|
+
}
|
|
42
|
+
if (i >= 0) {
|
|
43
|
+
return newLines.slice(i + 1).join(lineSeparator);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
return newContent;
|
|
47
|
+
}
|
|
48
|
+
exports.diffSystemLogContents = diffSystemLogContents;
|
|
30
49
|
// Using bytes fixes: ERROR TypeError: Cannot freeze array buffer views with elements in NgRx
|
|
31
50
|
function createPlainObjectFromMotionMasterMessage(motionMasterMessage) {
|
|
32
51
|
return types_1.MotionMasterMessage.toObject(motionMasterMessage, {
|
package/src/lib/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/util.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/util.ts"],"names":[],"mappings":"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"}
|