motion-master-client 0.0.16 → 0.0.18
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/motion-master-client.d.ts +4 -0
- package/src/lib/motion-master-client.js +4 -0
- package/src/lib/motion-master-client.js.map +1 -1
- package/src/lib/motion-master-pub-sub-client.d.ts +5 -5
- package/src/lib/motion-master-pub-sub-client.js +3 -3
- package/src/lib/motion-master-pub-sub-client.js.map +1 -1
- package/src/lib/motion-master-pub-sub-socket.d.ts +2 -2
- package/src/lib/motion-master-pub-sub-web-socket.d.ts +2 -2
- package/src/lib/motion-master-pub-sub-web-socket.js +2 -1
- package/src/lib/motion-master-pub-sub-web-socket.js.map +1 -1
- package/src/lib/motion-master-pub-sub-worker-socket.d.ts +2 -2
- package/src/lib/motion-master-pub-sub-worker-socket.js.map +1 -1
- package/src/lib/motion-master-req-res-socket.d.ts +3 -3
- package/src/lib/motion-master-req-res-web-socket.d.ts +3 -4
- package/src/lib/motion-master-req-res-web-socket.js +9 -23
- package/src/lib/motion-master-req-res-web-socket.js.map +1 -1
- package/src/lib/motion-master-req-res-worker-socket.d.ts +3 -3
- package/src/lib/motion-master-req-res-worker-socket.js +8 -5
- package/src/lib/motion-master-req-res-worker-socket.js.map +1 -1
- package/src/lib/operators.d.ts +7 -8
- package/src/lib/operators.js.map +1 -1
- package/src/lib/types.d.ts +1 -0
- package/src/lib/types.js.map +1 -1
- package/src/lib/util.d.ts +11 -2
- package/src/lib/util.js +29 -5
- package/src/lib/util.js.map +1 -1
package/package.json
CHANGED
|
@@ -23,6 +23,10 @@ export declare class MotionMasterClient {
|
|
|
23
23
|
* This observable will emit whenever the sockets opened property changes to true.
|
|
24
24
|
*/
|
|
25
25
|
ready$: Observable<true>;
|
|
26
|
+
/**
|
|
27
|
+
* This observable will emit only once when both req/res and pub/sub sockets are opened.
|
|
28
|
+
*/
|
|
29
|
+
onceReady$: Observable<true>;
|
|
26
30
|
/**
|
|
27
31
|
* Client is ready when both req/res and pub/sub sockets are opened.
|
|
28
32
|
* If both sockets are already opened, this function will immediately resolve to true.
|
|
@@ -34,6 +34,10 @@ class MotionMasterClient {
|
|
|
34
34
|
* This observable will emit whenever the sockets opened property changes to true.
|
|
35
35
|
*/
|
|
36
36
|
this.ready$ = this.socketsOpened$.pipe((0, rxjs_1.filter)(Boolean));
|
|
37
|
+
/**
|
|
38
|
+
* This observable will emit only once when both req/res and pub/sub sockets are opened.
|
|
39
|
+
*/
|
|
40
|
+
this.onceReady$ = this.ready$.pipe((0, rxjs_1.first)());
|
|
37
41
|
this.request = new motion_master_req_res_client_1.MotionMasterReqResClient(this.reqResSocket);
|
|
38
42
|
this.monitor = new motion_master_pub_sub_client_1.MotionMasterPubSubClient(this.pubSubSocket);
|
|
39
43
|
}
|
|
@@ -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,+BAA+G;AAC/G,+BAA0B;AAE1B,iFAA0E;AAE1E,yFAAiF;AACjF,iFAA0E;AAE1E,yFAAiF;AACjF,2CAA2H;AAG3H,SAAgB,wBAAwB,CAAC,QAAgB;IACvD,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,CAAC,CAAC;IACjE,YAAY,CAAC,IAAI,CAAC,QAAQ,QAAQ,mBAAmB,QAAQ,EAAE,CAAC,CAAC;IAEjE,OAAO,MAAM,CAAC;AAChB,CAAC;AAXD,4DAWC;AAED,MAAa,kBAAkB;IAK7B,YACW,YAAsC,EACtC,YAAsC;QADtC,iBAAY,GAAZ,YAAY,CAA0B;QACtC,iBAAY,GAAZ,YAAY,CAA0B;QAMjD;;;;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;
|
|
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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"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { Observable, Subject } from "rxjs";
|
|
2
2
|
import { MonitoringConfig } from "./monitoring-config";
|
|
3
3
|
import { MotionMasterPubSubSocket } from "./motion-master-pub-sub-socket";
|
|
4
|
-
import { MotionMasterMessage } from "./types";
|
|
4
|
+
import { IMotionMasterMessage, MotionMasterMessage } from "./types";
|
|
5
5
|
export declare class MotionMasterPubSubClient {
|
|
6
6
|
readonly socket: MotionMasterPubSubSocket;
|
|
7
|
-
readonly data$: Subject<[string,
|
|
7
|
+
readonly data$: Subject<[string, IMotionMasterMessage[]]>;
|
|
8
8
|
private subscriptions;
|
|
9
|
-
readonly notification$: Observable<
|
|
10
|
-
readonly systemEvent$: Observable<MotionMasterMessage.Status.
|
|
11
|
-
readonly deviceEvent$: Observable<MotionMasterMessage.Status.
|
|
9
|
+
readonly notification$: Observable<IMotionMasterMessage>;
|
|
10
|
+
readonly systemEvent$: Observable<MotionMasterMessage.Status.ISystemEvent>;
|
|
11
|
+
readonly deviceEvent$: Observable<MotionMasterMessage.Status.IDeviceEvent>;
|
|
12
12
|
constructor(socket: MotionMasterPubSubSocket);
|
|
13
13
|
subscribe(config: MonitoringConfig): string;
|
|
14
14
|
unsubscribe(messageId: string): void;
|
|
@@ -4,7 +4,6 @@ exports.MotionMasterPubSubClient = void 0;
|
|
|
4
4
|
const rxjs_1 = require("rxjs");
|
|
5
5
|
const uuid_1 = require("uuid");
|
|
6
6
|
const operators_1 = require("./operators");
|
|
7
|
-
const types_1 = require("./types");
|
|
8
7
|
const equal = require("fast-deep-equal");
|
|
9
8
|
const motion_master_pub_sub_worker_socket_1 = require("./motion-master-pub-sub-worker-socket");
|
|
10
9
|
class MotionMasterPubSubClient {
|
|
@@ -29,8 +28,9 @@ class MotionMasterPubSubClient {
|
|
|
29
28
|
if (distinct) {
|
|
30
29
|
observable = observable.pipe((0, rxjs_1.distinctUntilChanged)((prev, curr) => {
|
|
31
30
|
var _a, _b, _c, _d, _e, _f;
|
|
32
|
-
if (prev
|
|
33
|
-
|
|
31
|
+
if (((_c = (_b = (_a = prev === null || prev === void 0 ? void 0 : prev.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)
|
|
32
|
+
&& ((_f = (_e = (_d = curr === null || curr === void 0 ? void 0 : curr.status) === null || _d === void 0 ? void 0 : _d.monitoringParameterValues) === null || _e === void 0 ? void 0 : _e.deviceParameterValues) === null || _f === void 0 ? void 0 : _f.parameterValues)) {
|
|
33
|
+
return equal(prev.status.monitoringParameterValues.deviceParameterValues.parameterValues, curr.status.monitoringParameterValues.deviceParameterValues.parameterValues);
|
|
34
34
|
}
|
|
35
35
|
return false;
|
|
36
36
|
}));
|
|
@@ -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,+BAAyG;AACzG,+BAA0B;AAG1B,2CAAqG;
|
|
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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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { BehaviorSubject, Observable } from "rxjs";
|
|
2
|
-
import {
|
|
2
|
+
import { IMotionMasterMessage } from "./types";
|
|
3
3
|
export interface MotionMasterPubSubSocket {
|
|
4
4
|
/**
|
|
5
5
|
* Emits a boolean value when socket gets opened or closed.
|
|
@@ -8,7 +8,7 @@ export interface MotionMasterPubSubSocket {
|
|
|
8
8
|
/**
|
|
9
9
|
* Incoming data is a tuple of topic and decoded message.
|
|
10
10
|
*/
|
|
11
|
-
readonly data$: Observable<[string,
|
|
11
|
+
readonly data$: Observable<[string, IMotionMasterMessage]>;
|
|
12
12
|
/**
|
|
13
13
|
* URL set in call to open.
|
|
14
14
|
*/
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { BehaviorSubject, Subject } from "rxjs";
|
|
2
2
|
import { MotionMasterPubSubSocket } from "./motion-master-pub-sub-socket";
|
|
3
|
-
import {
|
|
3
|
+
import { IMotionMasterMessage } from "./types";
|
|
4
4
|
export declare class MotionMasterPubSubWebSocket implements MotionMasterPubSubSocket {
|
|
5
5
|
readonly opened$: BehaviorSubject<boolean>;
|
|
6
|
-
readonly data$: Subject<[string,
|
|
6
|
+
readonly data$: Subject<[string, IMotionMasterMessage]>;
|
|
7
7
|
private webSocket$?;
|
|
8
8
|
private _url?;
|
|
9
9
|
get url(): string | undefined;
|
|
@@ -5,6 +5,7 @@ const rxjs_1 = require("rxjs");
|
|
|
5
5
|
const webSocket_1 = require("rxjs/webSocket");
|
|
6
6
|
const logger_1 = require("./logger");
|
|
7
7
|
const types_1 = require("./types");
|
|
8
|
+
const util_1 = require("./util");
|
|
8
9
|
class MotionMasterPubSubWebSocket {
|
|
9
10
|
constructor() {
|
|
10
11
|
this.opened$ = new rxjs_1.BehaviorSubject(false);
|
|
@@ -49,7 +50,7 @@ class MotionMasterPubSubWebSocket {
|
|
|
49
50
|
const end = new Uint8Array(e.data, 0, 1)[0] + 1;
|
|
50
51
|
const topic = decoder.decode(e.data.slice(1, end)); // topic starts from the 2nd byte
|
|
51
52
|
const message = types_1.MotionMasterMessage.decode(new Uint8Array(e.data.slice(end)));
|
|
52
|
-
return [topic, message];
|
|
53
|
+
return [topic, (0, util_1.createPlainObjectFromMotionMasterMessage)(message)];
|
|
53
54
|
},
|
|
54
55
|
openObserver: {
|
|
55
56
|
next: () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"motion-master-pub-sub-web-socket.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/motion-master-pub-sub-web-socket.ts"],"names":[],"mappings":";;;AAAA,+BAAgD;AAChD,8CAAqF;AACrF,qCAAkC;AAElC,
|
|
1
|
+
{"version":3,"file":"motion-master-pub-sub-web-socket.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/motion-master-pub-sub-web-socket.ts"],"names":[],"mappings":";;;AAAA,+BAAgD;AAChD,8CAAqF;AACrF,qCAAkC;AAElC,mCAAoE;AACpE,iCAAkE;AAElE,MAAa,2BAA2B;IAAxC;QAEW,YAAO,GAAG,IAAI,sBAAe,CAAU,KAAK,CAAC,CAAC;QAE9C,UAAK,GAAG,IAAI,cAAO,EAAkC,CAAC;IAkEjE,CAAC;IA5DC,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,GAAW;QACd,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YACpC,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;SACnE;QAED,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAEhB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAE5C,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;YACxB,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;YACvC,KAAK,EAAE,GAAG,EAAE;gBACV,SAAS;YACX,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK;;QACH,MAAA,IAAI,CAAC,UAAU,0CAAE,WAAW,EAAE,CAAC;IACjC,CAAC;IAED,MAAM;QACJ,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,KAAK,KAAK,EAAE;YAC5C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACrB;IACH,CAAC;IAEO,eAAe,CAAC,GAAW;QACjC,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;QAEzC,MAAM,eAAe,GAA2D;YAC9E,UAAU,EAAE,aAAa;YACzB,aAAa,EAAE;gBACb,IAAI,EAAE,GAAG,EAAE;oBACT,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACzB,eAAM,CAAC,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;gBAC1C,CAAC;aACF;YACD,YAAY,EAAE,CAAC,CAA4B,EAAkC,EAAE;gBAC7E,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAChD,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,iCAAiC;gBACrF,MAAM,OAAO,GAAG,2BAAmB,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC9E,OAAO,CAAC,KAAK,EAAE,IAAA,+CAAwC,EAAC,OAAO,CAAC,CAAC,CAAC;YACpE,CAAC;YACD,YAAY,EAAE;gBACZ,IAAI,EAAE,GAAG,EAAE;oBACT,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACxB,eAAM,CAAC,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;gBAC1C,CAAC;aACF;YACD,GAAG;SACJ,CAAC;QAEF,OAAO,IAAA,qBAAS,EAAC,eAAe,CAAC,CAAC;IACpC,CAAC;CAEF;AAtED,kEAsEC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { BehaviorSubject, Subject } from "rxjs";
|
|
2
2
|
import { MotionMasterPubSubSocket } from "./motion-master-pub-sub-socket";
|
|
3
|
-
import {
|
|
3
|
+
import { IMotionMasterMessage } from "./types";
|
|
4
4
|
export declare class MotionMasterPubSubWorkerSocket implements MotionMasterPubSubSocket {
|
|
5
5
|
readonly worker: Worker;
|
|
6
6
|
opened$: BehaviorSubject<boolean>;
|
|
7
|
-
data$: Subject<[string,
|
|
7
|
+
data$: Subject<[string, IMotionMasterMessage]>;
|
|
8
8
|
private _url?;
|
|
9
9
|
constructor(worker: Worker);
|
|
10
10
|
get url(): string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"motion-master-pub-sub-worker-socket.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/motion-master-pub-sub-worker-socket.ts"],"names":[],"mappings":";;;AAAA,+BAAgD;
|
|
1
|
+
{"version":3,"file":"motion-master-pub-sub-worker-socket.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/motion-master-pub-sub-worker-socket.ts"],"names":[],"mappings":";;;AAAA,+BAAgD;AAGhD,qCAAkC;AAElC,MAAa,8BAA8B;IAQzC,YACkB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAPhC,YAAO,GAAG,IAAI,sBAAe,CAAC,KAAK,CAAC,CAAC;QAErC,UAAK,GAAG,IAAI,cAAO,EAAkC,CAAC;IAMlD,CAAC;IAEL,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,GAAW;QACd,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAEhB,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;YACnC,IAAI,QAAQ,IAAI,IAAI,EAAE;gBACpB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;gBACxB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC1B,eAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;aAC/E;iBAAM,IAAI,OAAO,IAAI,IAAI,EAAE;gBAC1B,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAwD,IAAI,CAAC;gBACtF,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;aAClE;QACH,CAAC,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;YACtB,IAAI,EAAE,EAAE,GAAG,EAAE;SACd,CAAC,CAAC;IACL,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAC1C,CAAC;IAED,MAAM;QACJ,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,KAAK,KAAK,EAAE;YAC5C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACrB;IACH,CAAC;CAEF;AA7CD,wEA6CC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { BehaviorSubject, Observable } from "rxjs";
|
|
2
|
-
import {
|
|
2
|
+
import { IMotionMasterMessage } from "./types";
|
|
3
3
|
export interface MotionMasterReqResSocket {
|
|
4
4
|
/**
|
|
5
5
|
* Emits a boolean value when socket gets opened or closed.
|
|
@@ -12,7 +12,7 @@ export interface MotionMasterReqResSocket {
|
|
|
12
12
|
/**
|
|
13
13
|
* Decoded message instances coming from Motion Master.
|
|
14
14
|
*/
|
|
15
|
-
readonly message$: Observable<
|
|
15
|
+
readonly message$: Observable<IMotionMasterMessage>;
|
|
16
16
|
/**
|
|
17
17
|
* URL set in call to open.
|
|
18
18
|
*/
|
|
@@ -48,5 +48,5 @@ export interface MotionMasterReqResSocket {
|
|
|
48
48
|
*
|
|
49
49
|
* Subscribe to the message$ observable in order to receive the response messages.
|
|
50
50
|
*/
|
|
51
|
-
send(message:
|
|
51
|
+
send(message: IMotionMasterMessage): void;
|
|
52
52
|
}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import { BehaviorSubject, Subject } from "rxjs";
|
|
2
2
|
import { MotionMasterReqResSocket } from "./motion-master-req-res-socket";
|
|
3
|
-
import {
|
|
3
|
+
import { IMotionMasterMessage } from "./types";
|
|
4
4
|
export declare class MotionMasterReqResWebSocket implements MotionMasterReqResSocket {
|
|
5
5
|
readonly opened$: BehaviorSubject<boolean>;
|
|
6
6
|
readonly alive$: BehaviorSubject<boolean>;
|
|
7
|
-
readonly message$: Subject<
|
|
7
|
+
readonly message$: Subject<IMotionMasterMessage>;
|
|
8
8
|
private aliveTimeoutId;
|
|
9
|
-
private pingSystem;
|
|
10
9
|
private pingSystemObserver;
|
|
11
10
|
private pingSystemSubscription;
|
|
12
11
|
private webSocket$?;
|
|
@@ -19,7 +18,7 @@ export declare class MotionMasterReqResWebSocket implements MotionMasterReqResSo
|
|
|
19
18
|
open(url: string, pingSystemInterval?: number, systemAliveTimeout?: number): void;
|
|
20
19
|
close(): void;
|
|
21
20
|
reopen(): void;
|
|
22
|
-
send(message:
|
|
21
|
+
send(message: IMotionMasterMessage): void;
|
|
23
22
|
private createWebSocket;
|
|
24
23
|
private keepalive;
|
|
25
24
|
}
|
|
@@ -5,16 +5,14 @@ const rxjs_1 = require("rxjs");
|
|
|
5
5
|
const webSocket_1 = require("rxjs/webSocket");
|
|
6
6
|
const logger_1 = require("./logger");
|
|
7
7
|
const types_1 = require("./types");
|
|
8
|
+
const util_1 = require("./util");
|
|
8
9
|
class MotionMasterReqResWebSocket {
|
|
9
10
|
constructor() {
|
|
10
11
|
this.opened$ = new rxjs_1.BehaviorSubject(false);
|
|
11
12
|
this.alive$ = new rxjs_1.BehaviorSubject(false);
|
|
12
13
|
this.message$ = new rxjs_1.Subject();
|
|
13
14
|
this.aliveTimeoutId = 0;
|
|
14
|
-
this.
|
|
15
|
-
request: { pingSystem: types_1.MotionMasterMessage.Request.PingSystem.create() }
|
|
16
|
-
});
|
|
17
|
-
this.pingSystemObserver = { next: () => this.send(this.pingSystem) };
|
|
15
|
+
this.pingSystemObserver = { next: () => this.send({ request: { pingSystem: {} } }) };
|
|
18
16
|
this.pingSystemSubscription = new rxjs_1.Subscription();
|
|
19
17
|
}
|
|
20
18
|
get url() {
|
|
@@ -35,16 +33,10 @@ class MotionMasterReqResWebSocket {
|
|
|
35
33
|
this._pingSystemInterval = pingSystemInterval;
|
|
36
34
|
this._systemAliveTimeout = systemAliveTimeout;
|
|
37
35
|
this.webSocket$ = this.createWebSocket(url, pingSystemInterval);
|
|
38
|
-
(_a = this.webSocket$) === null || _a === void 0 ? void 0 : _a.pipe((0, rxjs_1.map)((data) => types_1.MotionMasterMessage.decode(data)), (0, rxjs_1.tap)(() => this.keepalive(systemAliveTimeout)), (0, rxjs_1.filter)((message) => { var _a; return !((_a = message.status) === null || _a === void 0 ? void 0 : _a.systemPong); }), (0, rxjs_1.tap)((message) => {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
logger_1.logger.info({
|
|
43
|
-
namespace: 'reqResMessage',
|
|
44
|
-
motionMasterMessage,
|
|
45
|
-
type: message.type,
|
|
46
|
-
}, `Received ${keys}`);
|
|
47
|
-
}
|
|
36
|
+
(_a = this.webSocket$) === null || _a === void 0 ? void 0 : _a.pipe((0, rxjs_1.map)((data) => types_1.MotionMasterMessage.decode(data)), (0, rxjs_1.tap)(() => this.keepalive(systemAliveTimeout)), (0, rxjs_1.filter)((message) => { var _a; return !((_a = message.status) === null || _a === void 0 ? void 0 : _a.systemPong); }), (0, rxjs_1.map)(message => (0, util_1.createPlainObjectFromMotionMasterMessage)(message)), (0, rxjs_1.tap)((message) => {
|
|
37
|
+
const context = (0, util_1.convertMotionMasterMessageToLoggerContext)(message);
|
|
38
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
39
|
+
logger_1.logger.info(context, `Received ${context.name}`);
|
|
48
40
|
})).subscribe({
|
|
49
41
|
next: (message) => this.message$.next(message),
|
|
50
42
|
error: (err) => {
|
|
@@ -66,15 +58,9 @@ class MotionMasterReqResWebSocket {
|
|
|
66
58
|
send(message) {
|
|
67
59
|
var _a, _b;
|
|
68
60
|
if (!((_a = message.request) === null || _a === void 0 ? void 0 : _a.pingSystem)) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
logger_1.logger.info({
|
|
73
|
-
namespace: 'reqResMessage',
|
|
74
|
-
motionMasterMessage,
|
|
75
|
-
type: message.type,
|
|
76
|
-
}, `Send ${keys}`);
|
|
77
|
-
}
|
|
61
|
+
const context = (0, util_1.convertMotionMasterMessageToLoggerContext)(message);
|
|
62
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
63
|
+
logger_1.logger.info(context, `Send ${context.name}`);
|
|
78
64
|
}
|
|
79
65
|
(_b = this.webSocket$) === null || _b === void 0 ? void 0 : _b.next(types_1.MotionMasterMessage.encode(message).finish());
|
|
80
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"motion-master-req-res-web-socket.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/motion-master-req-res-web-socket.ts"],"names":[],"mappings":";;;AAAA,+BAA0F;AAC1F,8CAAqF;AACrF,qCAAkC;AAElC,
|
|
1
|
+
{"version":3,"file":"motion-master-req-res-web-socket.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/motion-master-req-res-web-socket.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { BehaviorSubject, Subject } from "rxjs";
|
|
2
2
|
import { MotionMasterReqResSocket } from "./motion-master-req-res-socket";
|
|
3
|
-
import {
|
|
3
|
+
import { IMotionMasterMessage } from "./types";
|
|
4
4
|
export declare class MotionMasterReqResWorkerSocket implements MotionMasterReqResSocket {
|
|
5
5
|
readonly worker: Worker;
|
|
6
6
|
readonly opened$: BehaviorSubject<boolean>;
|
|
7
7
|
readonly alive$: BehaviorSubject<boolean>;
|
|
8
|
-
readonly message$: Subject<
|
|
8
|
+
readonly message$: Subject<IMotionMasterMessage>;
|
|
9
9
|
private _url?;
|
|
10
10
|
private _pingSystemInterval?;
|
|
11
11
|
private _systemAliveTimeout?;
|
|
@@ -16,5 +16,5 @@ export declare class MotionMasterReqResWorkerSocket implements MotionMasterReqRe
|
|
|
16
16
|
open(url: string, pingSystemInterval?: number, systemAliveTimeout?: number): void;
|
|
17
17
|
reopen(): void;
|
|
18
18
|
close(): void;
|
|
19
|
-
send(message:
|
|
19
|
+
send(message: IMotionMasterMessage): void;
|
|
20
20
|
}
|
|
@@ -39,9 +39,11 @@ class MotionMasterReqResWorkerSocket {
|
|
|
39
39
|
logger_1.logger.info(alive ? `System is alive 💓` : 'System is as dead as 🦤');
|
|
40
40
|
}
|
|
41
41
|
else if ('message' in data) {
|
|
42
|
-
const { message
|
|
43
|
-
|
|
44
|
-
|
|
42
|
+
const { message } = data;
|
|
43
|
+
const context = (0, util_1.convertMotionMasterMessageToLoggerContext)(message);
|
|
44
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
45
|
+
logger_1.logger.info(context, `Received ${context.name}`);
|
|
46
|
+
this.message$.next(message);
|
|
45
47
|
}
|
|
46
48
|
};
|
|
47
49
|
this.worker.postMessage({
|
|
@@ -57,8 +59,9 @@ class MotionMasterReqResWorkerSocket {
|
|
|
57
59
|
this.worker.postMessage({ close: true });
|
|
58
60
|
}
|
|
59
61
|
send(message) {
|
|
60
|
-
const
|
|
61
|
-
|
|
62
|
+
const context = (0, util_1.convertMotionMasterMessageToLoggerContext)(message);
|
|
63
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
64
|
+
logger_1.logger.info(context, `Send ${context.name}`);
|
|
62
65
|
this.worker.postMessage({ message });
|
|
63
66
|
}
|
|
64
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"motion-master-req-res-worker-socket.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/motion-master-req-res-worker-socket.ts"],"names":[],"mappings":";;;AAAA,+BAAgD;AAChD,qCAAkC;AAGlC,
|
|
1
|
+
{"version":3,"file":"motion-master-req-res-worker-socket.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/motion-master-req-res-worker-socket.ts"],"names":[],"mappings":"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"}
|
package/src/lib/operators.d.ts
CHANGED
|
@@ -1,17 +1,16 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
export declare function selectMotionMasterMessageStatusByMessageId<T>(key: StatusKey, id?: string): import("rxjs").UnaryFunction<Observable<MotionMasterMessage>, Observable<T>>;
|
|
1
|
+
import { IMotionMasterMessage, MotionMasterMessage, ParameterValueType, StatusKey } from './types';
|
|
2
|
+
export declare function selectMotionMasterMessageStatusByMessageId<T>(key: StatusKey, id?: string): import("rxjs").UnaryFunction<import("rxjs").Observable<IMotionMasterMessage>, import("rxjs").Observable<T>>;
|
|
4
3
|
export declare function extendStatus<T>(data: {
|
|
5
4
|
statusKey: StatusKey;
|
|
6
5
|
messageId: string;
|
|
7
|
-
}): import("rxjs").UnaryFunction<Observable<T>, Observable<T & {
|
|
6
|
+
}): import("rxjs").UnaryFunction<import("rxjs").Observable<T>, import("rxjs").Observable<T & {
|
|
8
7
|
messageId: string;
|
|
9
8
|
request: import("./types").RequestStatus;
|
|
10
9
|
}>>;
|
|
11
|
-
export declare function transformMotionMasterMessageToStatus<T>(statusKey: StatusKey, requestTimeout: number, messageId: string): import("rxjs").UnaryFunction<Observable<
|
|
10
|
+
export declare function transformMotionMasterMessageToStatus<T>(statusKey: StatusKey, requestTimeout: number, messageId: string): import("rxjs").UnaryFunction<import("rxjs").Observable<IMotionMasterMessage>, import("rxjs").Observable<T & {
|
|
12
11
|
messageId: string;
|
|
13
12
|
request: import("./types").RequestStatus;
|
|
14
13
|
}>>;
|
|
15
|
-
export declare function selectMotionMasterMessageByTopic<T>(topic: string): import("rxjs").UnaryFunction<Observable<[string, T]>, Observable<T>>;
|
|
16
|
-
export declare function selectMotionMasterMessageStatusByKey<T>(key: keyof MotionMasterMessage.IStatus): import("rxjs").UnaryFunction<Observable<
|
|
17
|
-
export declare function mapMonitoringParameterValuesStatusMessageToParameterValues(): import("rxjs").UnaryFunction<Observable<
|
|
14
|
+
export declare function selectMotionMasterMessageByTopic<T>(topic: string): import("rxjs").UnaryFunction<import("rxjs").Observable<[string, T]>, import("rxjs").Observable<T>>;
|
|
15
|
+
export declare function selectMotionMasterMessageStatusByKey<T>(key: keyof MotionMasterMessage.IStatus): import("rxjs").UnaryFunction<import("rxjs").Observable<IMotionMasterMessage>, import("rxjs").Observable<T>>;
|
|
16
|
+
export declare function mapMonitoringParameterValuesStatusMessageToParameterValues(): import("rxjs").UnaryFunction<import("rxjs").Observable<IMotionMasterMessage>, import("rxjs").Observable<ParameterValueType[]>>;
|
package/src/lib/operators.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operators.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/operators.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"operators.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/operators.ts"],"names":[],"mappings":"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"}
|
package/src/lib/types.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Long } from "protobufjs";
|
|
2
2
|
import { motionmaster } from "./motion-master.proto";
|
|
3
3
|
export import MotionMasterMessage = motionmaster.MotionMasterMessage;
|
|
4
|
+
export import IMotionMasterMessage = motionmaster.IMotionMasterMessage;
|
|
4
5
|
export declare type StatusKey = keyof MotionMasterMessage.IStatus;
|
|
5
6
|
export declare type RequestStatus = 'succeeded' | 'failed' | 'running';
|
|
6
7
|
export declare class RequestError extends Error {
|
package/src/lib/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/types.ts"],"names":[],"mappings":";;;AACA,+DAAqD;AAEvC,QAAA,mBAAmB,GAAG,kCAAY,CAAC,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/types.ts"],"names":[],"mappings":";;;AACA,+DAAqD;AAEvC,QAAA,mBAAmB,GAAG,kCAAY,CAAC,mBAAmB,CAAC;AAWrE,MAAa,YAAa,SAAQ,KAAK;CAAI;AAA3C,oCAA2C;AAoB3C,6DAA6D;AAC/C,QAAA,oBAAoB,GAAG,2BAAmB,CAAC,OAAO,CAAC,uBAAuB,CAAC,KAAK,CAAC;AAE/F,6DAA6D;AAC/C,QAAA,cAAc,GAAG,2BAAmB,CAAC,OAAO,CAAC,sBAAsB,CAAC,cAAc,CAAC;AA8EjG,6DAA6D;AAC/C,QAAA,SAAS,GAAG,2BAAmB,CAAC,MAAM,CAAC,mBAAmB,CAAC,SAAS,CAAC,SAAS,CAAC;AAE7F,SAAgB,4BAA4B,CAAC,GAA6C;IACxF,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;AACtD,CAAC;AAFD,oEAEC;AAED,SAAgB,oCAAoC,CAAC,GAAwF;IAC3I,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAFD,oFAEC;AAED,IAAY,4BAGX;AAHD,WAAY,4BAA4B;IACtC,mIAAkC,CAAA;IAClC,qJAA2C,CAAA;AAC7C,CAAC,EAHW,4BAA4B,GAA5B,oCAA4B,KAA5B,oCAA4B,QAGvC"}
|
package/src/lib/util.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { DeviceLogLine } from "./device-log-line";
|
|
2
2
|
import { Parameter, ParameterIndexSubindex } from "./parameter";
|
|
3
3
|
import { SystemLogLine } from "./system-log-line";
|
|
4
|
-
import { DeviceRef, DeviceRefObj, MotionMasterMessage, ParameterAddressValue, ParameterTypeValue, ParameterTypeValueKey, ParameterValueType, ValueType } from "./types";
|
|
4
|
+
import { DeviceRef, DeviceRefObj, IMotionMasterMessage, MotionMasterMessage, ParameterAddressValue, ParameterTypeValue, ParameterTypeValueKey, ParameterValueType, ValueType } from "./types";
|
|
5
5
|
export declare function getParameterTypeValueDefault(key: ParameterTypeValueKey): 0 | Uint8Array | "";
|
|
6
6
|
export declare function getParameterTypeValue(parameter: MotionMasterMessage.Status.DeviceParameterValues.IParameterValue): ParameterTypeValueKey | undefined;
|
|
7
7
|
export declare function getParameterValue(parameter: MotionMasterMessage.Status.DeviceParameterValues.IParameterValue): ParameterValueType;
|
|
@@ -11,7 +11,15 @@ export declare function parseSystemLogContent(content: string): SystemLogLine[];
|
|
|
11
11
|
export declare function parseDeviceLog(line: string): DeviceLogLine | undefined;
|
|
12
12
|
export declare function parseDeviceLogContent(content: string): DeviceLogLine[];
|
|
13
13
|
export declare function mapParameterTypeValueToObject(type: keyof ParameterTypeValue, value: number | string): ParameterTypeValue;
|
|
14
|
-
export declare function createPlainObjectFromMotionMasterMessage(motionMasterMessage: MotionMasterMessage):
|
|
14
|
+
export declare function createPlainObjectFromMotionMasterMessage(motionMasterMessage: MotionMasterMessage): {
|
|
15
|
+
[k: string]: any;
|
|
16
|
+
};
|
|
17
|
+
export declare function convertMotionMasterMessageToLoggerContext(motionMasterMessage: IMotionMasterMessage, namespace?: string): {
|
|
18
|
+
namespace: string;
|
|
19
|
+
motionMasterMessage: IMotionMasterMessage;
|
|
20
|
+
type: string | undefined;
|
|
21
|
+
name: string | undefined;
|
|
22
|
+
};
|
|
15
23
|
export declare function decodeTextContent(content: Uint8Array): string;
|
|
16
24
|
export declare function isRxPdoIndex(index: number): boolean;
|
|
17
25
|
export declare function isTxPdoIndex(index: number): boolean;
|
|
@@ -29,3 +37,4 @@ export declare function createPdoParameterValues(parameters: Array<{
|
|
|
29
37
|
}>, values: Array<ParameterValueType>): ParameterAddressValue[];
|
|
30
38
|
export declare function resolveAfter(ms: number, value?: unknown): Promise<unknown>;
|
|
31
39
|
export declare function convertRgbToLedColor(value: number): number;
|
|
40
|
+
export declare function createRandomColor(brightness: number): string;
|
package/src/lib/util.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.convertRgbToLedColor = exports.resolveAfter = exports.createPdoParameterValues = exports.isValidDeviceRefObj = exports.valueTypeToParameterTypeValueKeyMap = exports.mapValueTypeToBitSize = exports.mapParameterToPdoSubItemValue = exports.fillPdoParametersWithMappingEntries = exports.filterTxPdoParameters = exports.filterRxPdoParameters = exports.isTxPdoIndex = exports.isRxPdoIndex = exports.decodeTextContent = exports.createPlainObjectFromMotionMasterMessage = exports.mapParameterTypeValueToObject = exports.parseDeviceLogContent = exports.parseDeviceLog = exports.parseSystemLogContent = exports.parseSystemLogLine = exports.makeDeviceRefObj = exports.getParameterValue = exports.getParameterTypeValue = exports.getParameterTypeValueDefault = void 0;
|
|
3
|
+
exports.createRandomColor = exports.convertRgbToLedColor = exports.resolveAfter = exports.createPdoParameterValues = exports.isValidDeviceRefObj = exports.valueTypeToParameterTypeValueKeyMap = exports.mapValueTypeToBitSize = exports.mapParameterToPdoSubItemValue = exports.fillPdoParametersWithMappingEntries = exports.filterTxPdoParameters = exports.filterRxPdoParameters = exports.isTxPdoIndex = exports.isRxPdoIndex = exports.decodeTextContent = exports.convertMotionMasterMessageToLoggerContext = exports.createPlainObjectFromMotionMasterMessage = exports.mapParameterTypeValueToObject = exports.parseDeviceLogContent = exports.parseDeviceLog = exports.parseSystemLogContent = exports.parseSystemLogLine = exports.makeDeviceRefObj = exports.getParameterValue = exports.getParameterTypeValue = exports.getParameterTypeValueDefault = void 0;
|
|
4
4
|
const lodash_1 = require("lodash");
|
|
5
5
|
const types_1 = require("./types");
|
|
6
6
|
function getParameterTypeValueDefault(key) {
|
|
@@ -125,17 +125,31 @@ function mapParameterTypeValueToObject(type, value) {
|
|
|
125
125
|
}
|
|
126
126
|
exports.mapParameterTypeValueToObject = mapParameterTypeValueToObject;
|
|
127
127
|
// Using bytes fixes: ERROR TypeError: Cannot freeze array buffer views with elements in NgRx
|
|
128
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
129
128
|
function createPlainObjectFromMotionMasterMessage(motionMasterMessage) {
|
|
130
129
|
return types_1.MotionMasterMessage.toObject(motionMasterMessage, {
|
|
131
|
-
arrays: true,
|
|
132
130
|
bytes: Array,
|
|
133
131
|
defaults: true,
|
|
132
|
+
arrays: true,
|
|
134
133
|
objects: true,
|
|
135
|
-
oneofs:
|
|
134
|
+
oneofs: false,
|
|
135
|
+
json: true, // Performs additional JSON compatibility conversions, i.e. NaN and Infinity to strings
|
|
136
136
|
});
|
|
137
137
|
}
|
|
138
138
|
exports.createPlainObjectFromMotionMasterMessage = createPlainObjectFromMotionMasterMessage;
|
|
139
|
+
function convertMotionMasterMessageToLoggerContext(motionMasterMessage, namespace = 'reqResMessage') {
|
|
140
|
+
let type;
|
|
141
|
+
let name;
|
|
142
|
+
if (motionMasterMessage.request) {
|
|
143
|
+
type = 'request';
|
|
144
|
+
name = Object.keys(motionMasterMessage.request).join();
|
|
145
|
+
}
|
|
146
|
+
else if (motionMasterMessage.status) {
|
|
147
|
+
type = 'status';
|
|
148
|
+
name = Object.keys(motionMasterMessage.status).join();
|
|
149
|
+
}
|
|
150
|
+
return { namespace, motionMasterMessage, type, name };
|
|
151
|
+
}
|
|
152
|
+
exports.convertMotionMasterMessageToLoggerContext = convertMotionMasterMessageToLoggerContext;
|
|
139
153
|
function decodeTextContent(content) {
|
|
140
154
|
const decoder = new TextDecoder();
|
|
141
155
|
const buffer = Uint8Array.from(content);
|
|
@@ -261,7 +275,7 @@ function createPdoParameterValues(parameters, values) {
|
|
|
261
275
|
let j = i + 1;
|
|
262
276
|
let [, subindex2, value2] = output[j];
|
|
263
277
|
while (subindex2 > subindex1 && output[j]) {
|
|
264
|
-
if (value2 > 0) {
|
|
278
|
+
if (typeof value2 === 'number' && value2 > 0) {
|
|
265
279
|
output[i][2] = value2;
|
|
266
280
|
output[j][2] = 0;
|
|
267
281
|
break;
|
|
@@ -289,4 +303,14 @@ function convertRgbToLedColor(value) {
|
|
|
289
303
|
return ledColorValue;
|
|
290
304
|
}
|
|
291
305
|
exports.convertRgbToLedColor = convertRgbToLedColor;
|
|
306
|
+
function createRandomColor(brightness) {
|
|
307
|
+
function randomChannel(brightness) {
|
|
308
|
+
const r = 255 - brightness;
|
|
309
|
+
const n = 0 | ((Math.random() * r) + brightness);
|
|
310
|
+
const s = n.toString(16);
|
|
311
|
+
return (s.length == 1) ? '0' + s : s;
|
|
312
|
+
}
|
|
313
|
+
return '#' + randomChannel(brightness) + randomChannel(brightness) + randomChannel(brightness);
|
|
314
|
+
}
|
|
315
|
+
exports.createRandomColor = createRandomColor;
|
|
292
316
|
//# sourceMappingURL=util.js.map
|
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":";;;AAAA,mCAAiC;AAIjC,mCAAwK;AAExK,SAAgB,4BAA4B,CAAC,GAA0B;IACrE,IAAI,GAAG,KAAK,YAAY,IAAI,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,WAAW,EAAE;QACrE,OAAO,CAAC,CAAC;KACV;SAAM,IAAI,GAAG,KAAK,UAAU,EAAE;QAC7B,OAAO,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KAC5B;SAAM,IAAI,GAAG,KAAK,aAAa,EAAE;QAChC,OAAO,EAAE,CAAC;KACX;SAAM;QACL,OAAO,CAAC,CAAC;KACV;AACH,CAAC;AAVD,oEAUC;AAED,SAAgB,qBAAqB,CAAC,SAA2E;IAC/G,OAAO,CAAC,2BAAmB,CAAC,MAAM,CAAC,qBAAqB,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;AACvG,CAAC;AAFD,sDAEC;AAED,SAAgB,iBAAiB,CAAC,SAA2E;;IAC3G,MAAM,GAAG,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;IAC7C,IAAI,GAAG,IAAI,GAAG,IAAI,SAAS,EAAE;QAC3B,OAAO,MAAA,SAAS,CAAC,GAAG,CAAC,mCAAI,4BAA4B,CAAC,GAAG,CAAC,CAAC;KAC5D;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAND,8CAMC;AAED,SAAgB,gBAAgB,CAAC,SAAoB;IACnD,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;QACjC,IAAI,SAAS,IAAI,MAAM,EAAE;YACvB,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC;SACtC;aAAM;YACL,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC;SACrC;KACF;SAAM;QACL,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,CAAC;KAC1C;AACH,CAAC;AAVD,4CAUC;AAED,0BAA0B;AAC1B,SAAgB,kBAAkB,CAAC,IAAY;IAC7C,MAAM,EAAE,GAAG,yFAAyF,CAAC;IACrG,MAAM,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,IAAI,MAAM,EAAE;QACV,OAAO;YACL,IAAI;YACJ,IAAI,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACzB,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;YACxB,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;YACpB,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;YACtB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;YACvB,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;SACnB,CAAC;KACH;IACD,OAAO;AACT,CAAC;AAfD,gDAeC;AAED,0BAA0B;AAC1B,SAAgB,qBAAqB,CAAC,OAAe;IACnD,MAAM,EAAE,GAAG,yGAAyG,CAAC;IACrH,OAAO,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;SACrB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;SACvB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;SACjC,MAAM,CAAC,CAAC,CAAC,EAAsB,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;AACxD,CAAC;AAND,sDAMC;AAED,SAAgB,cAAc,CAAC,IAAY;IACzC,MAAM,EAAE,GAAG,0CAA0C,CAAC;IACtD,MAAM,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,IAAI,MAAM,EAAE;QACV,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;YACtB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;YACvB,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;SAC1B,CAAC;KACH;IACD,OAAO;AACT,CAAC;AAXD,wCAWC;AAED,SAAgB,qBAAqB,CAAC,OAAe;IACnD,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;SACvB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;SAC7B,MAAM,CAAC,CAAC,CAAC,EAAsB,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;AACxD,CAAC;AAJD,sDAIC;AAED,SAAgB,6BAA6B,CAAC,IAA8B,EAAE,KAAsB;;IAClG,MAAM,CAAC,GAAuB,EAAE,CAAC;IACjC,IAAI,IAAI,KAAK,YAAY,EAAE;QACzB,CAAC,CAAC,YAAY,CAAC,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;KACzE;SAAM,IAAI,IAAI,KAAK,UAAU,EAAE;QAC9B,CAAC,CAAC,UAAU,CAAC,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;KACzE;SAAM,IAAI,IAAI,KAAK,UAAU,EAAE;QAC9B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,CAAC,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;SAC1C;aAAM;YACL,IAAI,KAAK,GAAa,EAAE,CAAC;YACzB,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;gBAC1B,KAAK,GAAG,MAAA,MAAA,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,mCAAI,EAAE,CAAC;aAC5E;iBAAM;gBACL,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;aAC3E;YACD,CAAC,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACxC;KACF;SAAM,IAAI,IAAI,KAAK,aAAa,EAAE;QACjC,CAAC,CAAC,aAAa,CAAC,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;KACzE;SAAM,IAAI,IAAI,KAAK,WAAW,EAAE;QAC/B,CAAC,CAAC,WAAW,CAAC,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;KAC1E;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAxBD,sEAwBC;AAED,6FAA6F;AAC7F,8DAA8D;AAC9D,SAAgB,wCAAwC,CAAC,mBAAwC;IAC/F,OAAO,2BAAmB,CAAC,QAAQ,CAAC,mBAAmB,EAAE;QACvD,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,KAAK;QACZ,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,IAAI,EAAE,gEAAgE;KAC/E,CAAC,CAAC;AACL,CAAC;AARD,4FAQC;AAED,SAAgB,iBAAiB,CAAC,OAAmB;IACnD,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxC,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAChC,CAAC;AAJD,8CAIC;AAED,SAAgB,YAAY,CAAC,KAAa;IACxC,OAAO,IAAA,gBAAO,EAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AACxC,CAAC;AAFD,oCAEC;AAED,SAAgB,YAAY,CAAC,KAAa;IACxC,OAAO,IAAA,gBAAO,EAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AACxC,CAAC;AAFD,oCAEC;AAED,SAAgB,qBAAqB,CAAmC,UAAe,EAAE,kBAAkB,GAAG,KAAK;IACjH,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,sCAAsC;AAChJ,CAAC;AAFD,sDAEC;AAED,SAAgB,qBAAqB,CAAmC,UAAe,EAAE,kBAAkB,GAAG,KAAK;IACjH,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,sCAAsC;AAChJ,CAAC;AAFD,sDAEC;AAED,SAAgB,mCAAmC,CAAC,UAAuB,EAAE,aAAa,GAAG,EAAE;IAC7F,MAAM,MAAM,GAAgB,EAAE,CAAC;IAC/B,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE;QAC5B,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,EAAE;YAChC,IAAI,CAAC,GAAG,CAAC,CAAC;YACV,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;gBACrE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC3B,CAAC,EAAE,CAAC;aACL;YACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACd,OAAO,CAAC,IAAI,aAAa,EAAE;gBACzB,MAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK;oBAC1B,QAAQ,EAAE,CAAC;oBACX,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI;oBACxB,SAAS,EAAE,CAAC;oBACZ,KAAK,EAAE,CAAC;oBACR,SAAS,EAAE,iBAAS,CAAC,UAAU;oBAC/B,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK;oBAC1B,SAAS,EAAE,WAAW;oBACtB,UAAU,EAAE,IAAI;oBAChB,WAAW,EAAE,IAAI;iBAClB,CAAC,CAAC;gBACH,CAAC,EAAE,CAAC;aACL;YACD,CAAC,GAAG,CAAC,CAAC;SACP;aAAM;YACL,CAAC,EAAE,CAAC;SACL;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAhCD,kFAgCC;AAED,SAAgB,6BAA6B,CAAC,SAAoB;IAChE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IACtC,IAAI,SAAS,CAAC,SAAS,IAAI,SAAS,CAAC,SAAS,GAAG,iBAAS,CAAC,cAAc,EAAE;QACzE,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,OAAO,GAAG,qBAAqB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC3B,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;KAC1B;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAZD,sEAYC;AAED,SAAgB,qBAAqB,CAAC,SAAoB;IACxD,QAAQ,SAAS,EAAE;QACjB,KAAK,iBAAS,CAAC,WAAW;YACxB,OAAO,CAAC,CAAC;QACX,KAAK,iBAAS,CAAC,OAAO;YACpB,OAAO,CAAC,CAAC;QACX,KAAK,iBAAS,CAAC,QAAQ,CAAC;QACxB,KAAK,iBAAS,CAAC,SAAS;YACtB,OAAO,CAAC,CAAC;QACX,KAAK,iBAAS,CAAC,SAAS,CAAC;QACzB,KAAK,iBAAS,CAAC,UAAU;YACvB,OAAO,EAAE,CAAC;QACZ,KAAK,iBAAS,CAAC,SAAS,CAAC;QACzB,KAAK,iBAAS,CAAC,UAAU,CAAC;QAC1B,KAAK,iBAAS,CAAC,MAAM;YACnB,OAAO,EAAE,CAAC;KACb;IACD,MAAM,IAAI,KAAK,CAAC,2BAA2B,SAAS,4GAA4G,CAAC,CAAC;AACpK,CAAC;AAlBD,sDAkBC;AAEY,QAAA,mCAAmC,GAAG,IAAI,GAAG,CAAgD;IACxG,CAAC,iBAAS,CAAC,OAAO,EAAE,WAAW,CAAC;IAChC,CAAC,iBAAS,CAAC,QAAQ,EAAE,UAAU,CAAC;IAChC,CAAC,iBAAS,CAAC,SAAS,EAAE,UAAU,CAAC;IACjC,CAAC,iBAAS,CAAC,SAAS,EAAE,UAAU,CAAC;IACjC,CAAC,iBAAS,CAAC,SAAS,EAAE,WAAW,CAAC;IAClC,CAAC,iBAAS,CAAC,UAAU,EAAE,WAAW,CAAC;IACnC,CAAC,iBAAS,CAAC,UAAU,EAAE,WAAW,CAAC;IACnC,CAAC,iBAAS,CAAC,MAAM,EAAE,YAAY,CAAC;IAChC,CAAC,iBAAS,CAAC,cAAc,EAAE,aAAa,CAAC;IACzC,CAAC,iBAAS,CAAC,YAAY,EAAE,aAAa,CAAC;IACvC,CAAC,iBAAS,CAAC,cAAc,EAAE,aAAa,CAAC;CAC1C,CAAC,CAAC;AAEH,SAAgB,mBAAmB,CAAC,GAAiB;IACnD,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;WAC5C,CAAC,OAAO,GAAG,CAAC,cAAc,KAAK,QAAQ,IAAI,GAAG,CAAC,cAAc,IAAI,CAAC,CAAC;WACnE,OAAO,GAAG,CAAC,kBAAkB,KAAK,QAAQ,CAAC;AAClD,CAAC;AAJD,kDAIC;AAED,SAAgB,wBAAwB,CAAC,UAAyF,EAAE,MAAiC;IACnK,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE;QAClD,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,SAAS,CAAC;QACjD,IAAI,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,QAAQ,KAAK,CAAC,EAAE;YAClB,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,IAAI,CAAC,CAAC,QAAQ,GAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SACpG;QACD,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;IAC7C,CAAC,CAA4B,CAAC;IAE9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QAC1C,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxC,IAAI,SAAS,GAAG,CAAC,IAAI,MAAM,KAAK,CAAC,EAAE;YACjC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACd,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACtC,OAAO,SAAS,GAAG,SAAS,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE;gBACzC,IAAI,MAAM,GAAG,CAAC,EAAE;oBACd,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;oBACtB,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;oBACjB,MAAM;iBACP;gBACD,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE;oBACf,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;iBACnC;aACF;SACF;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AA7BD,4DA6BC;AAED,SAAgB,YAAY,CAAC,EAAU,EAAE,KAAe;IACtD,OAAO,IAAI,OAAO,CAAC,UAAU,OAAO;QAClC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACL,CAAC;AAJD,oCAIC;AAED,SAAgB,oBAAoB,CAAC,KAAa;IAChD,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;IAC/B,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;IAC9B,MAAM,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC;IACvB,MAAM,aAAa,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAC/C,OAAO,aAAa,CAAC;AACvB,CAAC;AAND,oDAMC"}
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/util.ts"],"names":[],"mappings":"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"}
|