motion-master-client 0.0.213 → 0.0.215
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 +2 -1
- package/src/lib/firmware.js +5 -2
- package/src/lib/firmware.js.map +1 -1
- package/src/lib/monitoring-config.d.ts +26 -0
- package/src/lib/motion-master-pub-sub-client.js +33 -0
- package/src/lib/motion-master-pub-sub-client.js.map +1 -1
- package/src/lib/online.d.ts +6 -0
- package/src/lib/online.js +26 -0
- package/src/lib/online.js.map +1 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "motion-master-client",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.215",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"description": "A library and CLI program used for communicating with Motion Master.",
|
|
6
6
|
"dependencies": {
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
"debug": "^4.3.5",
|
|
12
12
|
"express": "^4.19.2",
|
|
13
13
|
"fast-deep-equal": "^3.1.3",
|
|
14
|
+
"is-online": "^11.0.0",
|
|
14
15
|
"lodash": "^4.17.21",
|
|
15
16
|
"papaparse": "^5.4.1",
|
|
16
17
|
"protobufjs": "^7.2.3",
|
package/src/lib/firmware.js
CHANGED
|
@@ -47,11 +47,14 @@ function parseNewFirmwarePackageFilename(filename) {
|
|
|
47
47
|
}
|
|
48
48
|
const filenameNoExt = filename.replace(/\.[^/.]+$/, "");
|
|
49
49
|
const [description, hardwareName, firmwareId, firmwareName, firmwareVersion] = filenameNoExt.split('_');
|
|
50
|
+
// Attempt to fix firmware version if it contains spaces instead of a plus sign for build metadata.
|
|
51
|
+
// Matthias reported that some customers encountered issues installing package files due to spaces in the version.
|
|
52
|
+
// The firmware version in the package file name does not conform to the valid SemVer specification.
|
|
53
|
+
const fixedFirmwareVersion = firmwareVersion.replace(' ', '+');
|
|
50
54
|
return Object.assign({ description,
|
|
51
55
|
hardwareName,
|
|
52
56
|
firmwareId,
|
|
53
|
-
firmwareName,
|
|
54
|
-
firmwareVersion }, (parseFirmwareId(firmwareId)));
|
|
57
|
+
firmwareName, firmwareVersion: fixedFirmwareVersion }, (parseFirmwareId(firmwareId)));
|
|
55
58
|
}
|
|
56
59
|
exports.parseNewFirmwarePackageFilename = parseNewFirmwarePackageFilename;
|
|
57
60
|
/**
|
package/src/lib/firmware.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firmware.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/firmware.ts"],"names":[],"mappings":";;;AAAA,iEAAiI;AACjI,mCAAiD;AAepC,QAAA,gBAAgB,GAAG,6BAA6B,CAAC;AACjD,QAAA,gCAAgC,GAAG,kBAAkB,CAAC;AACtD,QAAA,gCAAgC,GAAG,+BAA+B,CAAC;AA8EhF;;;;GAIG;AACH,SAAgB,eAAe,CAAC,IAAY;IAC1C,IAAI,CAAC,wBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,wCAAwC,CAAC,CAAC;KACrF;IACD,MAAM,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACzG,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;AAChE,CAAC;AAND,0CAMC;AAED;;GAEG;AACH,SAAgB,4BAA4B,CAAC,QAAgB;IAC3D,OAAO,wCAAgC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACzD,CAAC;AAFD,oEAEC;AAED;;;;GAIG;AACH,SAAgB,4BAA4B,CAAC,QAAgB;IAC3D,OAAO,wCAAgC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACzD,CAAC;AAFD,oEAEC;AAED;;;;;GAKG;AACH,SAAgB,+BAA+B,CAAC,QAAgB;IAC9D,IAAI,CAAC,4BAA4B,CAAC,QAAQ,CAAC,EAAE;QAC3C,MAAM,IAAI,KAAK,CAAC,0BAA0B,QAAQ,wCAAwC,CAAC,CAAC;KAC7F;IAED,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACxD,MAAM,CAAC,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,eAAe,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"firmware.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/firmware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,22 @@
|
|
|
1
|
+
import { UnitConverters } from "./units";
|
|
2
|
+
/**
|
|
3
|
+
* Configuration interface for unit formatting of a single data point in the monitoring data.
|
|
4
|
+
*/
|
|
5
|
+
export interface MonitoringConfigUnitFormatter {
|
|
6
|
+
/**
|
|
7
|
+
* The ID of the converter to use for formatting the data point.
|
|
8
|
+
*/
|
|
9
|
+
converterId: keyof UnitConverters;
|
|
10
|
+
/**
|
|
11
|
+
* The target unit for the formatted value.
|
|
12
|
+
*/
|
|
13
|
+
unit: string;
|
|
14
|
+
/**
|
|
15
|
+
* Optional additional data required for formatting.
|
|
16
|
+
* This varies depending on the converter type (e.g., an object with resolution and feed for a position converter).
|
|
17
|
+
*/
|
|
18
|
+
data?: any;
|
|
19
|
+
}
|
|
1
20
|
/**
|
|
2
21
|
* Configuration interface for monitoring settings.
|
|
3
22
|
*/
|
|
@@ -30,4 +49,11 @@ export interface MonitoringConfig {
|
|
|
30
49
|
* It should be prefixed with the client ID and context to ensure a unique topic.
|
|
31
50
|
*/
|
|
32
51
|
readonly topic: string;
|
|
52
|
+
/**
|
|
53
|
+
* Optional unit formatters for the monitoring data.
|
|
54
|
+
* The length of this array must match the length of the monitoring data array.
|
|
55
|
+
* Each element corresponds to a unit formatter for the respective monitoring data point.
|
|
56
|
+
* If a formatter is not required for a particular data point, the element can be `undefined` or `null`.
|
|
57
|
+
*/
|
|
58
|
+
readonly unitFormatters?: Array<MonitoringConfigUnitFormatter | undefined | null>;
|
|
33
59
|
}
|
|
@@ -7,6 +7,7 @@ const uuid_1 = require("uuid");
|
|
|
7
7
|
const operators_1 = require("./operators");
|
|
8
8
|
const fast_deep_equal_1 = tslib_1.__importDefault(require("fast-deep-equal"));
|
|
9
9
|
const motion_master_pub_sub_worker_socket_1 = require("./motion-master-pub-sub-worker-socket");
|
|
10
|
+
const units_1 = require("./units");
|
|
10
11
|
class MotionMasterPubSubClient {
|
|
11
12
|
constructor(socket) {
|
|
12
13
|
this.socket = socket;
|
|
@@ -41,6 +42,38 @@ class MotionMasterPubSubClient {
|
|
|
41
42
|
return false;
|
|
42
43
|
}));
|
|
43
44
|
}
|
|
45
|
+
if (config.unitFormatters) {
|
|
46
|
+
observable = observable.pipe((0, rxjs_1.map)((message) => {
|
|
47
|
+
var _a, _b, _c;
|
|
48
|
+
if (config.unitFormatters) {
|
|
49
|
+
const values = (_c = (_b = (_a = message.status) === null || _a === void 0 ? void 0 : _a.monitoringParameterValues) === null || _b === void 0 ? void 0 : _b.deviceParameterValues) === null || _c === void 0 ? void 0 : _c.parameterValues;
|
|
50
|
+
if (values && config.unitFormatters) {
|
|
51
|
+
if (values.length > 0 && values.length !== config.unitFormatters.length) {
|
|
52
|
+
console.warn('The number of unit formatters does not match the number of values. Unit formatting will not be applied.');
|
|
53
|
+
return message;
|
|
54
|
+
}
|
|
55
|
+
for (let i = 0; i < values.length; i++) {
|
|
56
|
+
const formatter = config.unitFormatters[i];
|
|
57
|
+
if (formatter) {
|
|
58
|
+
const converter = units_1.unitConverters[formatter.converterId];
|
|
59
|
+
if (converter) {
|
|
60
|
+
if (values[i].intValue !== undefined) {
|
|
61
|
+
values[i].intValue = parseInt(converter.formatter(formatter.unit, values[i].intValue, formatter.data), 10);
|
|
62
|
+
}
|
|
63
|
+
else if (values[i].uintValue !== undefined) {
|
|
64
|
+
values[i].uintValue = parseInt(converter.formatter(formatter.unit, values[i].uintValue, formatter.data), 10);
|
|
65
|
+
}
|
|
66
|
+
else if (values[i].floatValue !== undefined) {
|
|
67
|
+
values[i].floatValue = parseFloat(converter.formatter(formatter.unit, values[i].floatValue, formatter.data));
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
return message;
|
|
75
|
+
}));
|
|
76
|
+
}
|
|
44
77
|
const subscription = observable.pipe((0, rxjs_1.bufferCount)(bufferSize)).subscribe((data) => {
|
|
45
78
|
this.data$.next([topic, data]);
|
|
46
79
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"motion-master-pub-sub-client.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/motion-master-pub-sub-client.ts"],"names":[],"mappings":";;;;AAAA,+BAA+G;AAC/G,+BAA0B;AAG1B,2CAAqG;AAErG,8EAAoC;AACpC,+FAAuF;
|
|
1
|
+
{"version":3,"file":"motion-master-pub-sub-client.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/motion-master-pub-sub-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.onlineInitPromise = exports.connectionState = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const is_online_1 = tslib_1.__importDefault(require("is-online"));
|
|
6
|
+
exports.connectionState = {
|
|
7
|
+
online: false,
|
|
8
|
+
inited: false,
|
|
9
|
+
intervalId: 0,
|
|
10
|
+
};
|
|
11
|
+
(0, is_online_1.default)({ timeout: 3000 }).then((v) => {
|
|
12
|
+
exports.connectionState.online = v;
|
|
13
|
+
exports.connectionState.inited = true;
|
|
14
|
+
});
|
|
15
|
+
exports.onlineInitPromise = new Promise((resolve, _reject) => {
|
|
16
|
+
const id = setInterval(() => {
|
|
17
|
+
if (exports.connectionState.inited) {
|
|
18
|
+
clearInterval(id);
|
|
19
|
+
exports.connectionState.intervalId = setInterval(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
20
|
+
(0, is_online_1.default)({ timeout: 5000 }).then((v) => exports.connectionState.online = v);
|
|
21
|
+
}), 10000);
|
|
22
|
+
resolve(exports.connectionState.online);
|
|
23
|
+
}
|
|
24
|
+
}, 100);
|
|
25
|
+
});
|
|
26
|
+
//# sourceMappingURL=online.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"online.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/online.ts"],"names":[],"mappings":";;;;AAAA,kEAAiC;AAEpB,QAAA,eAAe,GAAG;IAC7B,MAAM,EAAE,KAAK;IACb,MAAM,EAAE,KAAK;IACb,UAAU,EAAE,CAAQ;CACrB,CAAC;AAEF,IAAA,mBAAQ,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAU,EAAE,EAAE;IAC9C,uBAAe,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3B,uBAAe,CAAC,MAAM,GAAG,IAAI,CAAC;AAChC,CAAC,CAAC,CAAC;AAEU,QAAA,iBAAiB,GAAG,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;IACzE,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,EAAE;QAC1B,IAAI,uBAAe,CAAC,MAAM,EAAE;YAC1B,aAAa,CAAC,EAAE,CAAC,CAAC;YAClB,uBAAe,CAAC,UAAU,GAAG,WAAW,CAAC,GAAS,EAAE;gBAClD,IAAA,mBAAQ,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,uBAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC/E,CAAC,CAAA,EAAE,KAAK,CAAC,CAAC;YACV,OAAO,CAAC,uBAAe,CAAC,MAAM,CAAC,CAAC;SACjC;IACH,CAAC,EAAE,GAAG,CAAC,CAAC;AACV,CAAC,CAAC,CAAC"}
|