motion-master-client 0.0.76 → 0.0.85

package/src/lib/motion-master-client.d.ts

@@ -1,77 +1,77 @@
-import { Observable } from "rxjs";
-import { MonitoringConfig } from "./monitoring-config";
-import { MotionMasterPubSubClient } from "./motion-master-pub-sub-client";
-import { MotionMasterPubSubSocket } from "./motion-master-pub-sub-socket";
-import { MotionMasterReqResClient } from "./motion-master-req-res-client";
-import { MotionMasterReqResSocket } from "./motion-master-req-res-socket";
-import { DeviceParameterIds, DeviceRef, ParameterValueType } from "./types";
-import { DeviceParameter } from "./device-parameter";
-export declare function createMotionMasterClient(hostname: string): MotionMasterClient;
-export declare class MotionMasterClient {
-    readonly reqResSocket: MotionMasterReqResSocket;
-    readonly pubSubSocket: MotionMasterPubSubSocket;
-    readonly request: MotionMasterReqResClient;
-    readonly monitor: MotionMasterPubSubClient;
-    private systemEventSubscription?;
-    constructor(reqResSocket: MotionMasterReqResSocket, pubSubSocket: MotionMasterPubSubSocket);
-    /**
-     * This observable will emit true when both req/res and pub/sub sockets are opened.
-     * If any socket gets closed, this observable will emit false.
-     * This is a hot observable that will on subscription emit the last value of sockets opened.
-     */
-    socketsOpened$: Observable<boolean>;
-    /**
-     * Client is ready when both req/res and pub/sub sockets are opened.
-     * This observable will emit whenever the sockets opened property changes to true.
-     */
-    ready$: Observable<true>;
-    /**
-     * This observable will emit only once when both req/res and pub/sub sockets are opened.
-     * NOTE: This observable might never emit and it doesn't timeout.
-     */
-    onceReady$: Observable<true>;
-    /**
-     * Client is ready when both req/res and pub/sub sockets are opened.
-     * If both sockets are already opened, this function will immediately resolve to true.
-     * Otherwise, it will wait up to requestTimeout for both sockets to open, or throw an error.
-     */
-    whenReady(requestTimeout?: number): Promise<true>;
-    /**
-     * Start monitoring.
-     *
-     * Note that the returned observable will never complete on its own.
-     *
-     * If you unsubscribe from it, the teardown code will send a request to the master to stop the monitoring.
-     * That means you will end up with an observable that is not complete, but it won't emit any values.
-     * This is fine when you want to use the monitoring observable directly in the template with async pipe,
-     * which will unsubscribe automatically and stop the monitoring when you leave the component.
-     *
-     * If you need to complete the observable so that, for example, the toArray() operator works as expected, then use the {@link DataMonitoring} class,
-     * which has a stop method. It can optionally buffer data for exporting as CSV or performing statistics on it.
-     *
-     * @param ids Device parameter IDs to monitor.
-     * @param monitoringInterval At what interval should the master application send values.
-     * @param config Configure the topic, buffer size, distinct.
-     * @param requestTimeout How long will the client wait for the master to confirm that monitoring has started.
-     * @returns An observable of an array of parameter values.
-     */
-    startMonitoring(ids: DeviceParameterIds, monitoringInterval: number, config?: MonitoringConfig, requestTimeout?: number): Observable<ParameterValueType[]>;
-    /**
-     * TODO: return device parameters instead of just parameters
-     * get parameters from ESI uprfront, and then when parameters are received
-     * from motion master just concatenate (spread operator) props from ESI and props from parameter
-     * assign device parameter id like 0x1018:00.12345
-     * when assembling device parameter, get parameter from device in ESI based on product code, see ESI service
-     * this should probably done for other get parameters functions, get ESI file from device or prepared, get data from it
-     */
-    startMonitoringDeviceParameters(ids: DeviceParameterIds, monitoringInterval: number, config?: MonitoringConfig, requestTimeout?: number): Observable<DeviceParameter[]>;
-    startMonitoringValue<T extends ParameterValueType = number>(id: string | [DeviceRef, number, number], monitoringInterval: number, config?: MonitoringConfig, requestTimeout?: number): Observable<T>;
-    trackTargetReached(deviceRef: DeviceRef, monitoringInterval?: number): Observable<boolean>;
-    waitUntilTargetReached(deviceRef: DeviceRef, monitoringInterval?: number): Observable<true>;
-    whenTargetReached(deviceRef: DeviceRef, monitoringInterval?: number): Promise<true>;
-    subscribeToSystemEvent(): void;
-    stopMonitoring(messageId: string): void;
-    stopMonitoringAll(): void;
-    closeSockets(): void;
-    reopenSockets(): void;
-}
+import { Observable } from "rxjs";
+import { MonitoringConfig } from "./monitoring-config";
+import { MotionMasterPubSubClient } from "./motion-master-pub-sub-client";
+import { MotionMasterPubSubSocket } from "./motion-master-pub-sub-socket";
+import { MotionMasterReqResClient } from "./motion-master-req-res-client";
+import { MotionMasterReqResSocket } from "./motion-master-req-res-socket";
+import { DeviceParameterIds, DeviceRef, ParameterValueType } from "./types";
+import { DeviceParameter } from "./device-parameter";
+export declare function createMotionMasterClient(hostname: string): MotionMasterClient;
+export declare class MotionMasterClient {
+    readonly reqResSocket: MotionMasterReqResSocket;
+    readonly pubSubSocket: MotionMasterPubSubSocket;
+    readonly request: MotionMasterReqResClient;
+    readonly monitor: MotionMasterPubSubClient;
+    private systemEventSubscription?;
+    constructor(reqResSocket: MotionMasterReqResSocket, pubSubSocket: MotionMasterPubSubSocket);
+    /**
+     * This observable will emit true when both req/res and pub/sub sockets are opened.
+     * If any socket gets closed, this observable will emit false.
+     * This is a hot observable that will on subscription emit the last value of sockets opened.
+     */
+    socketsOpened$: Observable<boolean>;
+    /**
+     * Client is ready when both req/res and pub/sub sockets are opened.
+     * This observable will emit whenever the sockets opened property changes to true.
+     */
+    ready$: Observable<true>;
+    /**
+     * This observable will emit only once when both req/res and pub/sub sockets are opened.
+     * NOTE: This observable might never emit and it doesn't timeout.
+     */
+    onceReady$: Observable<true>;
+    /**
+     * Client is ready when both req/res and pub/sub sockets are opened.
+     * If both sockets are already opened, this function will immediately resolve to true.
+     * Otherwise, it will wait up to requestTimeout for both sockets to open, or throw an error.
+     */
+    whenReady(requestTimeout?: number): Promise<true>;
+    /**
+     * Start monitoring.
+     *
+     * Note that the returned observable will never complete on its own.
+     *
+     * If you unsubscribe from it, the teardown code will send a request to the master to stop the monitoring.
+     * That means you will end up with an observable that is not complete, but it won't emit any values.
+     * This is fine when you want to use the monitoring observable directly in the template with async pipe,
+     * which will unsubscribe automatically and stop the monitoring when you leave the component.
+     *
+     * If you need to complete the observable so that, for example, the toArray() operator works as expected, then use the {@link DataMonitoring} class,
+     * which has a stop method. It can optionally buffer data for exporting as CSV or performing statistics on it.
+     *
+     * @param ids Device parameter IDs to monitor.
+     * @param monitoringInterval At what interval should the master application send values.
+     * @param config Configure the topic, buffer size, distinct.
+     * @param requestTimeout How long will the client wait for the master to confirm that monitoring has started.
+     * @returns An observable of an array of parameter values.
+     */
+    startMonitoring(ids: DeviceParameterIds, monitoringInterval: number, config?: MonitoringConfig, requestTimeout?: number): Observable<ParameterValueType[]>;
+    /**
+     * TODO: return device parameters instead of just parameters
+     * get parameters from ESI uprfront, and then when parameters are received
+     * from motion master just concatenate (spread operator) props from ESI and props from parameter
+     * assign device parameter id like 0x1018:00.12345
+     * when assembling device parameter, get parameter from device in ESI based on product code, see ESI service
+     * this should probably done for other get parameters functions, get ESI file from device or prepared, get data from it
+     */
+    startMonitoringDeviceParameters(ids: DeviceParameterIds, monitoringInterval: number, config?: MonitoringConfig, requestTimeout?: number): Observable<DeviceParameter[]>;
+    startMonitoringValue<T extends ParameterValueType = number>(id: string | [DeviceRef, number, number], monitoringInterval: number, config?: MonitoringConfig, requestTimeout?: number): Observable<T>;
+    trackTargetReached(deviceRef: DeviceRef, monitoringInterval?: number): Observable<boolean>;
+    waitUntilTargetReached(deviceRef: DeviceRef, monitoringInterval?: number): Observable<true>;
+    whenTargetReached(deviceRef: DeviceRef, monitoringInterval?: number): Promise<true>;
+    subscribeToSystemEvent(): void;
+    stopMonitoring(messageId: string): void;
+    stopMonitoringAll(): void;
+    closeSockets(): void;
+    reopenSockets(): void;
+}

package/src/lib/motion-master-client.js

@@ -1,197 +1,197 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MotionMasterClient = exports.createMotionMasterClient = void 0;
-const rxjs_1 = require("rxjs");
-const uuid_1 = require("uuid");
-const motion_master_pub_sub_client_1 = require("./motion-master-pub-sub-client");
-const motion_master_pub_sub_web_socket_1 = require("./motion-master-pub-sub-web-socket");
-const motion_master_req_res_client_1 = require("./motion-master-req-res-client");
-const motion_master_req_res_web_socket_1 = require("./motion-master-req-res-web-socket");
-const operators_1 = require("./operators");
-const types_1 = require("./types");
-function createMotionMasterClient(hostname) {
-    const reqResSocket = new motion_master_req_res_web_socket_1.MotionMasterReqResWebSocket();
-    const pubSubSocket = new motion_master_pub_sub_web_socket_1.MotionMasterPubSubWebSocket();
-    const client = new MotionMasterClient(reqResSocket, pubSubSocket);
-    const clientId = (0, uuid_1.v4)();
-    reqResSocket.open(`ws://${hostname}:63524?clientId=${clientId}`);
-    pubSubSocket.open(`ws://${hostname}:63525?clientId=${clientId}`);
-    return client;
-}
-exports.createMotionMasterClient = createMotionMasterClient;
-class MotionMasterClient {
-    constructor(reqResSocket, pubSubSocket) {
-        this.reqResSocket = reqResSocket;
-        this.pubSubSocket = pubSubSocket;
-        /**
-         * This observable will emit true when both req/res and pub/sub sockets are opened.
-         * If any socket gets closed, this observable will emit false.
-         * This is a hot observable that will on subscription emit the last value of sockets opened.
-         */
-        this.socketsOpened$ = (0, rxjs_1.combineLatest)([this.reqResSocket.opened$, this.pubSubSocket.opened$]).pipe((0, rxjs_1.map)(([reqResSocketOpened, pubSubSocketOpened]) => reqResSocketOpened && pubSubSocketOpened));
-        /**
-         * Client is ready when both req/res and pub/sub sockets are opened.
-         * This observable will emit whenever the sockets opened property changes to true.
-         */
-        this.ready$ = this.socketsOpened$.pipe((0, rxjs_1.filter)(Boolean));
-        /**
-         * This observable will emit only once when both req/res and pub/sub sockets are opened.
-         * NOTE: This observable might never emit and it doesn't timeout.
-         */
-        this.onceReady$ = this.ready$.pipe((0, rxjs_1.first)());
-        this.request = new motion_master_req_res_client_1.MotionMasterReqResClient(this.reqResSocket);
-        this.monitor = new motion_master_pub_sub_client_1.MotionMasterPubSubClient(this.pubSubSocket);
-        this.subscribeToSystemEvent();
-    }
-    /**
-     * Client is ready when both req/res and pub/sub sockets are opened.
-     * If both sockets are already opened, this function will immediately resolve to true.
-     * Otherwise, it will wait up to requestTimeout for both sockets to open, or throw an error.
-     */
-    whenReady(requestTimeout = 5000) {
-        return (0, rxjs_1.firstValueFrom)(this.ready$.pipe((0, rxjs_1.timeout)(requestTimeout)));
-    }
-    /**
-     * Start monitoring.
-     *
-     * Note that the returned observable will never complete on its own.
-     *
-     * If you unsubscribe from it, the teardown code will send a request to the master to stop the monitoring.
-     * That means you will end up with an observable that is not complete, but it won't emit any values.
-     * This is fine when you want to use the monitoring observable directly in the template with async pipe,
-     * which will unsubscribe automatically and stop the monitoring when you leave the component.
-     *
-     * If you need to complete the observable so that, for example, the toArray() operator works as expected, then use the {@link DataMonitoring} class,
-     * which has a stop method. It can optionally buffer data for exporting as CSV or performing statistics on it.
-     *
-     * @param ids Device parameter IDs to monitor.
-     * @param monitoringInterval At what interval should the master application send values.
-     * @param config Configure the topic, buffer size, distinct.
-     * @param requestTimeout How long will the client wait for the master to confirm that monitoring has started.
-     * @returns An observable of an array of parameter values.
-     */
-    startMonitoring(ids, monitoringInterval, config, requestTimeout = 5000) {
-        return (0, rxjs_1.defer)(() => {
-            var _a, _b;
-            const topic = (_a = config === null || config === void 0 ? void 0 : config.topic) !== null && _a !== void 0 ? _a : (0, uuid_1.v4)();
-            const messageId = (_b = config === null || config === void 0 ? void 0 : config.messageId) !== null && _b !== void 0 ? _b : (0, uuid_1.v4)();
-            if (!config) {
-                config = { messageId, topic, bufferSize: 1, distinct: false };
-            }
-            this.request.resolveGetParameterValuesIds(ids).pipe((0, rxjs_1.mergeMap)((refs) => {
-                if ((new Set(refs.map(([deviceAddress]) => deviceAddress))).size !== 1) {
-                    throw new Error('Start monitoring only supports a single device');
-                }
-                // Skipping write-only (wo) parameters is necessary because Motion Master does not initiate monitoring when the requested list contains such parameters.
-                // For now, this serves as a temporary solution until Motion Master is fixed.
-                refs = refs.filter(([, index]) => index !== 0x1024);
-                const deviceAddress = refs[0][0];
-                const props = {
-                    getDeviceParameterValues: {
-                        deviceAddress,
-                        parameters: refs.map(([, index, subindex]) => ({ index, subindex, loadFromCache: false })),
-                        sendProgress: false,
-                    },
-                    interval: monitoringInterval,
-                    topic,
-                };
-                return this.request.startMonitoringDeviceParameterValues(props, requestTimeout, messageId);
-            })).subscribe();
-            this.monitor.subscribe(config);
-            const values$ = this.monitor.socket.data$.pipe((0, operators_1.selectMotionMasterMessageByTopic)(config.topic), (0, operators_1.mapMonitoringParameterValuesStatusMessageToParameterValues)());
-            return new rxjs_1.Observable((observer) => {
-                const subscription = values$.subscribe(observer).add(() => {
-                    this.stopMonitoring(messageId);
-                });
-                return subscription;
-            });
-        });
-    }
-    /**
-     * TODO: return device parameters instead of just parameters
-     * get parameters from ESI uprfront, and then when parameters are received
-     * from motion master just concatenate (spread operator) props from ESI and props from parameter
-     * assign device parameter id like 0x1018:00.12345
-     * when assembling device parameter, get parameter from device in ESI based on product code, see ESI service
-     * this should probably done for other get parameters functions, get ESI file from device or prepared, get data from it
-     */
-    startMonitoringDeviceParameters(ids, monitoringInterval, config, requestTimeout = 5000) {
-        return (0, rxjs_1.defer)(() => {
-            var _a, _b;
-            const topic = (_a = config === null || config === void 0 ? void 0 : config.topic) !== null && _a !== void 0 ? _a : (0, uuid_1.v4)();
-            const messageId = (_b = config === null || config === void 0 ? void 0 : config.messageId) !== null && _b !== void 0 ? _b : (0, uuid_1.v4)();
-            if (!config) {
-                config = { messageId, topic, bufferSize: 1, distinct: false };
-            }
-            this.request.resolveGetParameterValuesIds(ids).pipe((0, rxjs_1.mergeMap)((refs) => {
-                if ((new Set(refs.map(([deviceAddress]) => deviceAddress))).size !== 1) {
-                    throw new Error('Start monitoring only supports a single device');
-                }
-                // Skipping write-only (wo) parameters is necessary because Motion Master does not initiate monitoring when the requested list contains such parameters.
-                // For now, this serves as a temporary solution until Motion Master is fixed.
-                refs = refs.filter(([, index]) => index !== 0x1024);
-                const deviceAddress = refs[0][0];
-                const props = {
-                    getDeviceParameterValues: {
-                        deviceAddress,
-                        parameters: refs.map(([, index, subindex]) => ({ index, subindex, loadFromCache: false })),
-                        sendProgress: false,
-                    },
-                    interval: monitoringInterval,
-                    topic,
-                };
-                return this.request.startMonitoringDeviceParameterValues(props, requestTimeout, messageId);
-            })).subscribe();
-            this.monitor.subscribe(config);
-            const values$ = this.monitor.socket.data$.pipe((0, operators_1.selectMotionMasterMessageByTopic)(config.topic), (0, operators_1.mapMonitoringParameterValuesStatusMessageToDeviceParameters)(this.request));
-            return new rxjs_1.Observable((observer) => {
-                const subscription = values$.subscribe(observer).add(() => {
-                    this.stopMonitoring(messageId);
-                });
-                return subscription;
-            });
-        });
-    }
-    startMonitoringValue(id, monitoringInterval, config, requestTimeout = 5000) {
-        const ids = typeof id === 'string' ? [id] : [id];
-        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); }));
-    }
-    trackTargetReached(deviceRef, monitoringInterval = 20) {
-        return this.startMonitoringValue([deviceRef, 0x6041, 0], monitoringInterval).pipe((0, rxjs_1.map)((value) => (value & 0x0400) > 0), // tr = target reached bit
-        (0, rxjs_1.distinctUntilChanged)());
-    }
-    waitUntilTargetReached(deviceRef, monitoringInterval = 20) {
-        return this.trackTargetReached(deviceRef, monitoringInterval).pipe((0, rxjs_1.filter)(Boolean), (0, rxjs_1.first)());
-    }
-    whenTargetReached(deviceRef, monitoringInterval = 20) {
-        return (0, rxjs_1.firstValueFrom)(this.waitUntilTargetReached(deviceRef, monitoringInterval));
-    }
-    subscribeToSystemEvent() {
-        this.systemEventSubscription = this.monitor.systemEvent$.subscribe(systemEvent => {
-            if (systemEvent.state === types_1.MotionMasterMessage.Status.SystemEvent.State.DEINITIALIZING) {
-                this.request.clearDevicesInformation();
-            }
-        });
-    }
-    stopMonitoring(messageId) {
-        this.request.stopMonitoringDeviceParameterValues({ startMonitoringRequestId: messageId });
-        this.monitor.unsubscribe(messageId);
-    }
-    stopMonitoringAll() {
-        this.monitor.messageIds.forEach(this.stopMonitoring);
-    }
-    closeSockets() {
-        var _a;
-        (_a = this.systemEventSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
-        this.request.clearDevicesInformation();
-        this.reqResSocket.close();
-        this.pubSubSocket.close();
-    }
-    reopenSockets() {
-        this.reqResSocket.reopen();
-        this.pubSubSocket.reopen();
-        this.subscribeToSystemEvent();
-    }
-}
-exports.MotionMasterClient = MotionMasterClient;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MotionMasterClient = exports.createMotionMasterClient = void 0;
+const rxjs_1 = require("rxjs");
+const uuid_1 = require("uuid");
+const motion_master_pub_sub_client_1 = require("./motion-master-pub-sub-client");
+const motion_master_pub_sub_web_socket_1 = require("./motion-master-pub-sub-web-socket");
+const motion_master_req_res_client_1 = require("./motion-master-req-res-client");
+const motion_master_req_res_web_socket_1 = require("./motion-master-req-res-web-socket");
+const operators_1 = require("./operators");
+const types_1 = require("./types");
+function createMotionMasterClient(hostname) {
+    const reqResSocket = new motion_master_req_res_web_socket_1.MotionMasterReqResWebSocket();
+    const pubSubSocket = new motion_master_pub_sub_web_socket_1.MotionMasterPubSubWebSocket();
+    const client = new MotionMasterClient(reqResSocket, pubSubSocket);
+    const clientId = (0, uuid_1.v4)();
+    reqResSocket.open(`ws://${hostname}:63524?clientId=${clientId}`);
+    pubSubSocket.open(`ws://${hostname}:63525?clientId=${clientId}`);
+    return client;
+}
+exports.createMotionMasterClient = createMotionMasterClient;
+class MotionMasterClient {
+    constructor(reqResSocket, pubSubSocket) {
+        this.reqResSocket = reqResSocket;
+        this.pubSubSocket = pubSubSocket;
+        /**
+         * This observable will emit true when both req/res and pub/sub sockets are opened.
+         * If any socket gets closed, this observable will emit false.
+         * This is a hot observable that will on subscription emit the last value of sockets opened.
+         */
+        this.socketsOpened$ = (0, rxjs_1.combineLatest)([this.reqResSocket.opened$, this.pubSubSocket.opened$]).pipe((0, rxjs_1.map)(([reqResSocketOpened, pubSubSocketOpened]) => reqResSocketOpened && pubSubSocketOpened));
+        /**
+         * Client is ready when both req/res and pub/sub sockets are opened.
+         * This observable will emit whenever the sockets opened property changes to true.
+         */
+        this.ready$ = this.socketsOpened$.pipe((0, rxjs_1.filter)(Boolean));
+        /**
+         * This observable will emit only once when both req/res and pub/sub sockets are opened.
+         * NOTE: This observable might never emit and it doesn't timeout.
+         */
+        this.onceReady$ = this.ready$.pipe((0, rxjs_1.first)());
+        this.request = new motion_master_req_res_client_1.MotionMasterReqResClient(this.reqResSocket);
+        this.monitor = new motion_master_pub_sub_client_1.MotionMasterPubSubClient(this.pubSubSocket);
+        this.subscribeToSystemEvent();
+    }
+    /**
+     * Client is ready when both req/res and pub/sub sockets are opened.
+     * If both sockets are already opened, this function will immediately resolve to true.
+     * Otherwise, it will wait up to requestTimeout for both sockets to open, or throw an error.
+     */
+    whenReady(requestTimeout = 5000) {
+        return (0, rxjs_1.firstValueFrom)(this.ready$.pipe((0, rxjs_1.timeout)(requestTimeout)));
+    }
+    /**
+     * Start monitoring.
+     *
+     * Note that the returned observable will never complete on its own.
+     *
+     * If you unsubscribe from it, the teardown code will send a request to the master to stop the monitoring.
+     * That means you will end up with an observable that is not complete, but it won't emit any values.
+     * This is fine when you want to use the monitoring observable directly in the template with async pipe,
+     * which will unsubscribe automatically and stop the monitoring when you leave the component.
+     *
+     * If you need to complete the observable so that, for example, the toArray() operator works as expected, then use the {@link DataMonitoring} class,
+     * which has a stop method. It can optionally buffer data for exporting as CSV or performing statistics on it.
+     *
+     * @param ids Device parameter IDs to monitor.
+     * @param monitoringInterval At what interval should the master application send values.
+     * @param config Configure the topic, buffer size, distinct.
+     * @param requestTimeout How long will the client wait for the master to confirm that monitoring has started.
+     * @returns An observable of an array of parameter values.
+     */
+    startMonitoring(ids, monitoringInterval, config, requestTimeout = 5000) {
+        return (0, rxjs_1.defer)(() => {
+            var _a, _b;
+            const topic = (_a = config === null || config === void 0 ? void 0 : config.topic) !== null && _a !== void 0 ? _a : (0, uuid_1.v4)();
+            const messageId = (_b = config === null || config === void 0 ? void 0 : config.messageId) !== null && _b !== void 0 ? _b : (0, uuid_1.v4)();
+            if (!config) {
+                config = { messageId, topic, bufferSize: 1, distinct: false };
+            }
+            this.request.resolveGetParameterValuesIds(ids).pipe((0, rxjs_1.mergeMap)((refs) => {
+                if ((new Set(refs.map(([deviceAddress]) => deviceAddress))).size !== 1) {
+                    throw new Error('Start monitoring only supports a single device');
+                }
+                // Skipping write-only (wo) parameters is necessary because Motion Master does not initiate monitoring when the requested list contains such parameters.
+                // For now, this serves as a temporary solution until Motion Master is fixed.
+                refs = refs.filter(([, index]) => index !== 0x1024);
+                const deviceAddress = refs[0][0];
+                const props = {
+                    getDeviceParameterValues: {
+                        deviceAddress,
+                        parameters: refs.map(([, index, subindex]) => ({ index, subindex, loadFromCache: false })),
+                        sendProgress: false,
+                    },
+                    interval: monitoringInterval,
+                    topic,
+                };
+                return this.request.startMonitoringDeviceParameterValues(props, requestTimeout, messageId);
+            })).subscribe();
+            this.monitor.subscribe(config);
+            const values$ = this.monitor.socket.data$.pipe((0, operators_1.selectMotionMasterMessageByTopic)(config.topic), (0, operators_1.mapMonitoringParameterValuesStatusMessageToParameterValues)());
+            return new rxjs_1.Observable((observer) => {
+                const subscription = values$.subscribe(observer).add(() => {
+                    this.stopMonitoring(messageId);
+                });
+                return subscription;
+            });
+        });
+    }
+    /**
+     * TODO: return device parameters instead of just parameters
+     * get parameters from ESI uprfront, and then when parameters are received
+     * from motion master just concatenate (spread operator) props from ESI and props from parameter
+     * assign device parameter id like 0x1018:00.12345
+     * when assembling device parameter, get parameter from device in ESI based on product code, see ESI service
+     * this should probably done for other get parameters functions, get ESI file from device or prepared, get data from it
+     */
+    startMonitoringDeviceParameters(ids, monitoringInterval, config, requestTimeout = 5000) {
+        return (0, rxjs_1.defer)(() => {
+            var _a, _b;
+            const topic = (_a = config === null || config === void 0 ? void 0 : config.topic) !== null && _a !== void 0 ? _a : (0, uuid_1.v4)();
+            const messageId = (_b = config === null || config === void 0 ? void 0 : config.messageId) !== null && _b !== void 0 ? _b : (0, uuid_1.v4)();
+            if (!config) {
+                config = { messageId, topic, bufferSize: 1, distinct: false };
+            }
+            this.request.resolveGetParameterValuesIds(ids).pipe((0, rxjs_1.mergeMap)((refs) => {
+                if ((new Set(refs.map(([deviceAddress]) => deviceAddress))).size !== 1) {
+                    throw new Error('Start monitoring only supports a single device');
+                }
+                // Skipping write-only (wo) parameters is necessary because Motion Master does not initiate monitoring when the requested list contains such parameters.
+                // For now, this serves as a temporary solution until Motion Master is fixed.
+                refs = refs.filter(([, index]) => index !== 0x1024);
+                const deviceAddress = refs[0][0];
+                const props = {
+                    getDeviceParameterValues: {
+                        deviceAddress,
+                        parameters: refs.map(([, index, subindex]) => ({ index, subindex, loadFromCache: false })),
+                        sendProgress: false,
+                    },
+                    interval: monitoringInterval,
+                    topic,
+                };
+                return this.request.startMonitoringDeviceParameterValues(props, requestTimeout, messageId);
+            })).subscribe();
+            this.monitor.subscribe(config);
+            const values$ = this.monitor.socket.data$.pipe((0, operators_1.selectMotionMasterMessageByTopic)(config.topic), (0, operators_1.mapMonitoringParameterValuesStatusMessageToDeviceParameters)(this.request));
+            return new rxjs_1.Observable((observer) => {
+                const subscription = values$.subscribe(observer).add(() => {
+                    this.stopMonitoring(messageId);
+                });
+                return subscription;
+            });
+        });
+    }
+    startMonitoringValue(id, monitoringInterval, config, requestTimeout = 5000) {
+        const ids = typeof id === 'string' ? [id] : [id];
+        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); }));
+    }
+    trackTargetReached(deviceRef, monitoringInterval = 20) {
+        return this.startMonitoringValue([deviceRef, 0x6041, 0], monitoringInterval).pipe((0, rxjs_1.map)((value) => (value & 0x0400) > 0), // tr = target reached bit
+        (0, rxjs_1.distinctUntilChanged)());
+    }
+    waitUntilTargetReached(deviceRef, monitoringInterval = 20) {
+        return this.trackTargetReached(deviceRef, monitoringInterval).pipe((0, rxjs_1.filter)(Boolean), (0, rxjs_1.first)());
+    }
+    whenTargetReached(deviceRef, monitoringInterval = 20) {
+        return (0, rxjs_1.firstValueFrom)(this.waitUntilTargetReached(deviceRef, monitoringInterval));
+    }
+    subscribeToSystemEvent() {
+        this.systemEventSubscription = this.monitor.systemEvent$.subscribe(systemEvent => {
+            if (systemEvent.state === types_1.MotionMasterMessage.Status.SystemEvent.State.DEINITIALIZING) {
+                this.request.clearDevicesInformation();
+            }
+        });
+    }
+    stopMonitoring(messageId) {
+        this.request.stopMonitoringDeviceParameterValues({ startMonitoringRequestId: messageId });
+        this.monitor.unsubscribe(messageId);
+    }
+    stopMonitoringAll() {
+        this.monitor.messageIds.forEach(this.stopMonitoring);
+    }
+    closeSockets() {
+        var _a;
+        (_a = this.systemEventSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+        this.request.clearDevicesInformation();
+        this.reqResSocket.close();
+        this.pubSubSocket.close();
+    }
+    reopenSockets() {
+        this.reqResSocket.reopen();
+        this.pubSubSocket.reopen();
+        this.subscribeToSystemEvent();
+    }
+}
+exports.MotionMasterClient = MotionMasterClient;
 //# sourceMappingURL=motion-master-client.js.map

package/src/lib/motion-master-pub-sub-client.d.ts

@@ -1,17 +1,17 @@
-import { Observable, Subject } from "rxjs";
-import { MonitoringConfig } from "./monitoring-config";
-import { MotionMasterPubSubSocket } from "./motion-master-pub-sub-socket";
-import { IMotionMasterMessage, MotionMasterMessage } from "./types";
-export declare class MotionMasterPubSubClient {
-    readonly socket: MotionMasterPubSubSocket;
-    readonly data$: Subject<[string, IMotionMasterMessage[]]>;
-    private subscriptions;
-    readonly notification$: Observable<IMotionMasterMessage>;
-    readonly systemEvent$: Observable<MotionMasterMessage.Status.ISystemEvent>;
-    readonly deviceEvent$: Observable<MotionMasterMessage.Status.IDeviceEvent>;
-    constructor(socket: MotionMasterPubSubSocket);
-    get messageIds(): string[];
-    subscribe(config: MonitoringConfig): string;
-    unsubscribe(messageId: string): void;
-    unsubscribeAll(): void;
-}
+import { Observable, Subject } from "rxjs";
+import { MonitoringConfig } from "./monitoring-config";
+import { MotionMasterPubSubSocket } from "./motion-master-pub-sub-socket";
+import { IMotionMasterMessage, MotionMasterMessage } from "./types";
+export declare class MotionMasterPubSubClient {
+    readonly socket: MotionMasterPubSubSocket;
+    readonly data$: Subject<[string, IMotionMasterMessage[]]>;
+    private subscriptions;
+    readonly notification$: Observable<IMotionMasterMessage>;
+    readonly systemEvent$: Observable<MotionMasterMessage.Status.ISystemEvent>;
+    readonly deviceEvent$: Observable<MotionMasterMessage.Status.IDeviceEvent>;
+    constructor(socket: MotionMasterPubSubSocket);
+    get messageIds(): string[];
+    subscribe(config: MonitoringConfig): string;
+    unsubscribe(messageId: string): void;
+    unsubscribeAll(): void;
+}