motion-master-client 0.0.31 → 0.0.32
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
CHANGED
|
@@ -35,7 +35,7 @@ export declare class MotionMasterClient {
|
|
|
35
35
|
* Otherwise, it will wait up to requestTimeout for both sockets to open, or throw an error.
|
|
36
36
|
*/
|
|
37
37
|
whenReady(requestTimeout?: number): Promise<true>;
|
|
38
|
-
startMonitoring(ids: DeviceParameterIds,
|
|
38
|
+
startMonitoring(ids: DeviceParameterIds, monitoringInterval: number, config?: MonitoringConfig, requestTimeout?: number): Observable<ParameterValueType[]>;
|
|
39
39
|
/**
|
|
40
40
|
* TODO: return device parameters instead of just parameters
|
|
41
41
|
* get parameters from ESI uprfront, and then when parameters are received
|
|
@@ -44,10 +44,11 @@ export declare class MotionMasterClient {
|
|
|
44
44
|
* when assembling device parameter, get parameter from device in ESI based on product code, see ESI service
|
|
45
45
|
* this should probably done for other get parameters functions, get ESI file from device or prepared, get data from it
|
|
46
46
|
*/
|
|
47
|
-
startMonitoringDeviceParameters(ids: DeviceParameterIds,
|
|
48
|
-
startMonitoringValue<T extends ParameterValueType = number>(id: string | [DeviceRef, number, number],
|
|
49
|
-
trackTargetReached(deviceRef: DeviceRef,
|
|
50
|
-
waitUntilTargetReached(deviceRef: DeviceRef,
|
|
47
|
+
startMonitoringDeviceParameters(ids: DeviceParameterIds, monitoringInterval: number, config?: MonitoringConfig, requestTimeout?: number): Observable<Parameter[]>;
|
|
48
|
+
startMonitoringValue<T extends ParameterValueType = number>(id: string | [DeviceRef, number, number], monitoringInterval: number, config?: MonitoringConfig, requestTimeout?: number): Observable<T>;
|
|
49
|
+
trackTargetReached(deviceRef: DeviceRef, monitoringInterval?: number): Observable<boolean>;
|
|
50
|
+
waitUntilTargetReached(deviceRef: DeviceRef, monitoringInterval?: number): Observable<true>;
|
|
51
|
+
whenTargetReached(deviceRef: DeviceRef, monitoringInterval?: number): Promise<true>;
|
|
51
52
|
stopMonitoring(messageId: string): void;
|
|
52
53
|
closeSockets(): void;
|
|
53
54
|
reopenSockets(): void;
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MotionMasterClient = exports.createMotionMasterClient = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
4
|
const rxjs_1 = require("rxjs");
|
|
6
5
|
const uuid_1 = require("uuid");
|
|
7
6
|
const motion_master_pub_sub_client_1 = require("./motion-master-pub-sub-client");
|
|
@@ -48,11 +47,9 @@ class MotionMasterClient {
|
|
|
48
47
|
* Otherwise, it will wait up to requestTimeout for both sockets to open, or throw an error.
|
|
49
48
|
*/
|
|
50
49
|
whenReady(requestTimeout = 5000) {
|
|
51
|
-
return
|
|
52
|
-
return (0, rxjs_1.firstValueFrom)(this.ready$.pipe((0, rxjs_1.timeout)(requestTimeout)));
|
|
53
|
-
});
|
|
50
|
+
return (0, rxjs_1.firstValueFrom)(this.ready$.pipe((0, rxjs_1.timeout)(requestTimeout)));
|
|
54
51
|
}
|
|
55
|
-
startMonitoring(ids,
|
|
52
|
+
startMonitoring(ids, monitoringInterval, config, requestTimeout = 5000) {
|
|
56
53
|
return (0, rxjs_1.defer)(() => {
|
|
57
54
|
var _a, _b;
|
|
58
55
|
const topic = (_a = config === null || config === void 0 ? void 0 : config.topic) !== null && _a !== void 0 ? _a : (0, uuid_1.v4)();
|
|
@@ -71,7 +68,7 @@ class MotionMasterClient {
|
|
|
71
68
|
parameters: refs.map(([, index, subindex]) => ({ index, subindex, loadFromCache: false })),
|
|
72
69
|
sendProgress: false,
|
|
73
70
|
},
|
|
74
|
-
interval,
|
|
71
|
+
interval: monitoringInterval,
|
|
75
72
|
topic,
|
|
76
73
|
};
|
|
77
74
|
return this.request.startMonitoringDeviceParameterValues(props, requestTimeout, messageId);
|
|
@@ -95,7 +92,7 @@ class MotionMasterClient {
|
|
|
95
92
|
* when assembling device parameter, get parameter from device in ESI based on product code, see ESI service
|
|
96
93
|
* this should probably done for other get parameters functions, get ESI file from device or prepared, get data from it
|
|
97
94
|
*/
|
|
98
|
-
startMonitoringDeviceParameters(ids,
|
|
95
|
+
startMonitoringDeviceParameters(ids, monitoringInterval, config, requestTimeout = 5000) {
|
|
99
96
|
return (0, rxjs_1.defer)(() => {
|
|
100
97
|
var _a, _b;
|
|
101
98
|
const topic = (_a = config === null || config === void 0 ? void 0 : config.topic) !== null && _a !== void 0 ? _a : (0, uuid_1.v4)();
|
|
@@ -114,7 +111,7 @@ class MotionMasterClient {
|
|
|
114
111
|
parameters: refs.map(([, index, subindex]) => ({ index, subindex, loadFromCache: false })),
|
|
115
112
|
sendProgress: false,
|
|
116
113
|
},
|
|
117
|
-
interval,
|
|
114
|
+
interval: monitoringInterval,
|
|
118
115
|
topic,
|
|
119
116
|
};
|
|
120
117
|
return this.request.startMonitoringDeviceParameterValues(props, requestTimeout, messageId);
|
|
@@ -130,16 +127,19 @@ class MotionMasterClient {
|
|
|
130
127
|
});
|
|
131
128
|
});
|
|
132
129
|
}
|
|
133
|
-
startMonitoringValue(id,
|
|
130
|
+
startMonitoringValue(id, monitoringInterval, config, requestTimeout = 5000) {
|
|
134
131
|
const ids = typeof id === 'string' ? [id] : [id];
|
|
135
|
-
return this.startMonitoring(ids,
|
|
132
|
+
return this.startMonitoring(ids, monitoringInterval, config, requestTimeout).pipe((0, rxjs_1.map)((parameters) => { var _a; return ((_a = parameters[0]) !== null && _a !== void 0 ? _a : 0); }));
|
|
136
133
|
}
|
|
137
|
-
trackTargetReached(deviceRef,
|
|
138
|
-
return this.startMonitoringValue([deviceRef, 0x6041, 0],
|
|
134
|
+
trackTargetReached(deviceRef, monitoringInterval = 20) {
|
|
135
|
+
return this.startMonitoringValue([deviceRef, 0x6041, 0], monitoringInterval).pipe((0, rxjs_1.map)((value) => (value & 0x0400) > 0), // tr = target reached bit
|
|
139
136
|
(0, rxjs_1.distinctUntilChanged)());
|
|
140
137
|
}
|
|
141
|
-
waitUntilTargetReached(deviceRef,
|
|
142
|
-
return this.trackTargetReached(deviceRef,
|
|
138
|
+
waitUntilTargetReached(deviceRef, monitoringInterval = 20) {
|
|
139
|
+
return this.trackTargetReached(deviceRef, monitoringInterval).pipe((0, rxjs_1.filter)(Boolean), (0, rxjs_1.first)());
|
|
140
|
+
}
|
|
141
|
+
whenTargetReached(deviceRef, monitoringInterval = 20) {
|
|
142
|
+
return (0, rxjs_1.firstValueFrom)(this.waitUntilTargetReached(deviceRef, monitoringInterval));
|
|
143
143
|
}
|
|
144
144
|
stopMonitoring(messageId) {
|
|
145
145
|
this.request.stopMonitoringDeviceParameterValues({ startMonitoringRequestId: messageId });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"motion-master-client.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/motion-master-client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"motion-master-client.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/motion-master-client.ts"],"names":[],"mappings":"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"}
|