motion-master-client 0.0.1 → 0.0.2

package/src/lib/types.ts

@@ -0,0 +1,58 @@
+import { motionmaster } from "./motion-master.proto";
+
+export import MotionMasterMessage = motionmaster.MotionMasterMessage;
+
+export type StatusKey = keyof MotionMasterMessage.IStatus;
+
+export type RequestStatus =
+  | 'succeeded'
+  | 'failed'
+  | 'running';
+
+export class RequestError extends Error { }
+
+export type ParameterAddress = [number, number]; // index, subindex
+export type ParameterAddressValue = [number, number, number, ParameterTypeValueKey?]; // index, subindex, value, typeValue
+export type ParameterTypeValue = Omit<MotionMasterMessage.Request.SetDeviceParameterValues.IParameterValue, 'index' | 'subindex'>;
+export type ParameterTypeValueKey = keyof ParameterTypeValue;
+export type ParameterValueType = number | string | Uint8Array;
+
+export type DeviceRefObj = {
+  deviceAddress?: (number | null); // alredy defined in proto request messages
+  deviceSerialNumber?: (string | null);
+  devicePosition?: (number | null);
+};
+
+export type ParameterInfoAndValue = MotionMasterMessage.Status.DeviceParameterInfo.IParameter
+  & MotionMasterMessage.Status.DeviceParameterValues.IParameterValue;
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export import EthercatNetworkState = MotionMasterMessage.Request.SetEthercatNetworkState.State;
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export import ControllerType = MotionMasterMessage.Request.EnableMotionController.ControllerType;
+
+export type ClientStatusProps = { request: RequestStatus, messageId?: string };
+
+export type SystemVersionStatus = MotionMasterMessage.Status.ISystemVersion & ClientStatusProps;
+export type SystemLogStatus = MotionMasterMessage.Status.ISystemLog & ClientStatusProps;
+export type DeviceInfoStatus = MotionMasterMessage.Status.IDeviceInfo & ClientStatusProps;
+export type DeviceParameterInfoStatus = MotionMasterMessage.Status.IDeviceParameterInfo & ClientStatusProps;
+export type DeviceParameterValuesStatus = MotionMasterMessage.Status.IDeviceParameterValues & ClientStatusProps;
+export type DeviceFileStatus = MotionMasterMessage.Status.IDeviceFile & ClientStatusProps;
+export type DeviceFileListStatus = MotionMasterMessage.Status.IDeviceFileList & ClientStatusProps;
+export type DeviceStopStatus = MotionMasterMessage.Status.IDeviceStop & ClientStatusProps;
+export type DeviceFaultResetStatus = MotionMasterMessage.Status.IDeviceFaultReset & ClientStatusProps;
+export type EthercatNetworkStateStatus = MotionMasterMessage.Status.IEthercatNetworkState & ClientStatusProps;
+export type CoggingTorqueRecordingStatus = MotionMasterMessage.Status.ICoggingTorqueRecording & ClientStatusProps;
+export type DeviceLogStatus = MotionMasterMessage.Status.IDeviceLog & ClientStatusProps;
+export type MonitoringParameterValuesStatus = MotionMasterMessage.Status.IMonitoringParameterValues & ClientStatusProps;
+export type CoggingTorqueDataStatus = MotionMasterMessage.Status.ICoggingTorqueData & ClientStatusProps;
+export type OffsetDetectionStatus = MotionMasterMessage.Status.IOffsetDetection & ClientStatusProps;
+export type SystemIdentificationStatus = MotionMasterMessage.Status.ISystemIdentification & ClientStatusProps;
+export type CirculoEncoderMagnetDistanceStatus = MotionMasterMessage.Status.ICirculoEncoderMagnetDistance & ClientStatusProps;
+export type DeviceFirmwareInstallationStatus = MotionMasterMessage.Status.IDeviceFirmwareInstallation & ClientStatusProps;
+export type ComputeAutoTuningGainsStatus = MotionMasterMessage.Status.IAutoTuning & ClientStatusProps;
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export import ValueType = MotionMasterMessage.Status.DeviceParameterInfo.Parameter.ValueType;

package/src/lib/{urls.js → urls.ts}

@@ -1,6 +1,6 @@
 export const firmwarePackageBaseUrl = 'https://synapticon.s3.amazonaws.com/somanet-software/releases/';
 export const listFirmwarePackagesUrl = 'https://pc27e3jixd.execute-api.us-east-1.amazonaws.com/default/listFirmwarePackages';
-export function getFirmwarePackageUrl(filename) {
-    return firmwarePackageBaseUrl + filename;
+
+export function getFirmwarePackageUrl(filename: string) {
+  return firmwarePackageBaseUrl + filename;
 }
-//# sourceMappingURL=urls.js.map

package/src/lib/util.ts

@@ -0,0 +1,261 @@
+import { inRange } from "lodash";
+import { DeviceLogLine } from "./device-log-line";
+import { Parameter, ParameterIndexSubindex } from "./parameter";
+import { SystemLogLine } from "./system-log-line";
+import { DeviceRefObj, MotionMasterMessage, ParameterAddressValue, ParameterTypeValue, ParameterTypeValueKey, ParameterValueType, ValueType } from "./types";
+
+export function getParameterTypeValueDefault(key: ParameterTypeValueKey) {
+  if (key === 'floatValue' || key === 'intValue' || key === 'uintValue') {
+    return 0;
+  } else if (key === 'rawValue') {
+    return Uint8Array.from([]);
+  } else if (key === 'stringValue') {
+    return '';
+  } else {
+    return 0;
+  }
+}
+
+export function getParameterTypeValue(parameter: MotionMasterMessage.Status.DeviceParameterValues.IParameterValue): ParameterTypeValueKey | undefined {
+  return (MotionMasterMessage.Status.DeviceParameterValues.ParameterValue.create(parameter)).typeValue;
+}
+
+export function getParameterValue(parameter: MotionMasterMessage.Status.DeviceParameterValues.IParameterValue): ParameterValueType {
+  const key = getParameterTypeValue(parameter);
+  if (key && key in parameter) {
+    return parameter[key] ?? getParameterTypeValueDefault(key);
+  }
+  return 0;
+}
+
+export function makeDeviceRefObj(deviceRef: number | string): DeviceRefObj {
+  if (typeof deviceRef === 'number') {
+    if (deviceRef <= 0xFFFF) {
+      return { devicePosition: deviceRef };
+    } else {
+      return { deviceAddress: deviceRef };
+    }
+  } else {
+    return { deviceSerialNumber: deviceRef };
+  }
+}
+
+export function parseSystemLogLine(line: string): SystemLogLine | undefined {
+  const re = /(\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}\.\d+)\s\((.*)\)\s\[(.*)\]\s(.*:\d+)\s(.*)\|(.*)$/gm;
+  const result = re.exec(line);
+  if (result) {
+    return {
+      date: new Date(result[1]),
+      uptime: result[2].trim(),
+      id: result[3].trim(),
+      file: result[4].trim(),
+      level: result[5].trim(),
+      message: result[6].trim(),
+    };
+  }
+  return;
+}
+
+export function parseSystemLogContent(content: string): SystemLogLine[] {
+  return content.split('\n')
+    .map((v) => parseSystemLogLine(v))
+    .filter((l): l is SystemLogLine => l !== undefined);
+}
+
+export function parseDeviceLog(line: string): DeviceLogLine | undefined {
+  const re = /^(\d{2}:\d{2}:\d{2}\.\d+)\s(.*)\|(.*)$/gm;
+  const result = re.exec(line);
+  if (result) {
+    return {
+      time: result[1].trim(),
+      level: result[2].trim(),
+      message: result[3].trim(),
+    };
+  }
+  return;
+}
+
+export function parseDeviceLogContent(content: string): DeviceLogLine[] {
+  return content.split('\n')
+    .map((v) => parseDeviceLog(v))
+    .filter((l): l is DeviceLogLine => l !== undefined);
+}
+
+export function mapParameterTypeValueToObject(type: keyof ParameterTypeValue, value: number | string): ParameterTypeValue {
+  const p: ParameterTypeValue = {};
+  if (type === 'floatValue') {
+    p['floatValue'] = typeof value === 'number' ? value : parseFloat(value);
+  } else if (type === 'intValue') {
+    p['intValue'] = typeof value === 'number' ? value : parseInt(value, 10);
+  } else if (type === 'rawValue') {
+    if (typeof value === 'number') {
+      p['rawValue'] = Uint8Array.from([value]);
+    } else {
+      let bytes: number[] = [];
+      if (value.startsWith('0x')) {
+        bytes = value.slice(2).match(/.{1,2}/g)?.map((h) => parseInt(h, 16)) ?? [];
+      } else {
+        bytes = value.split(',').map((c) => c.trim()).map((c) => parseInt(c, 10));
+      }
+      p['rawValue'] = Uint8Array.from(bytes);
+    }
+  } else if (type === 'stringValue') {
+    p['stringValue'] = typeof value === 'string' ? value : value.toString();
+  } else if (type === 'uintValue') {
+    p['uintValue'] = typeof value === 'number' ? value : parseInt(value, 10);
+  }
+  return p;
+}
+
+// Using bytes fixes: ERROR TypeError: Cannot freeze array buffer views with elements in NgRx
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function createPlainObjectFromMotionMasterMessage(motionMasterMessage: MotionMasterMessage): any {
+  return MotionMasterMessage.toObject(motionMasterMessage, {
+    arrays: true, // populates empty arrays (repeated fields) even if defaults=false
+    bytes: Array, // bytes as array of numbers
+    defaults: true, // includes default values
+    objects: true, // populates empty objects (map fields) even if defaults=false
+    oneofs: true, // includes virtual oneof fields set to the present field's name
+  });
+}
+
+export function decodeTextContent(content: Uint8Array): string {
+  const decoder = new TextDecoder();
+  const buffer = Uint8Array.from(content);
+  return decoder.decode(buffer);
+}
+
+export function isRxPdoIndex(index: number): boolean {
+  return inRange(index, 0x1600, 0x1800);
+}
+
+export function isTxPdoIndex(index: number): boolean {
+  return inRange(index, 0x1A00, 0x1C00);
+}
+
+export function filterRxPdoParameters<T extends ParameterIndexSubindex>(parameters: T[], excludeSubIndex000 = false): T[] {
+  return parameters.filter((p) => isRxPdoIndex(p.index) && (excludeSubIndex000 ? p.subindex > 0 : true)); // RxPDOs: Index area 0x1600 to 0x17FF
+}
+
+export function filterTxPdoParameters<T extends ParameterIndexSubindex>(parameters: T[], excludeSubIndex000 = false): T[] {
+  return parameters.filter((p) => isTxPdoIndex(p.index) && (excludeSubIndex000 ? p.subindex > 0 : true)); // TxPDOs: Index area 0x1A00 to 0x1BFF
+}
+
+export function fillPdoParametersWithMappingEntries(parameters: Parameter[], entriesPerPdo = 10): Parameter[] {
+  const output: Parameter[] = [];
+  let i = 0;
+  while (i < parameters.length) {
+    if (parameters[i].subindex === 0) {
+      let j = i;
+      while (parameters[j] && (parameters[j].index === parameters[i].index)) {
+        output.push(parameters[j]);
+        j++;
+      }
+      let d = j - i;
+      while (d <= entriesPerPdo) {
+        output.push({
+          index: parameters[i].index,
+          subindex: d,
+          name: parameters[i].name,
+          uintValue: 0,
+          value: 0,
+          valueType: ValueType.UNSIGNED32,
+          group: parameters[i].group,
+          typeValue: "uintValue",
+          readAccess: true,
+          writeAccess: true,
+        });
+        d++;
+      }
+      i = j;
+    } else {
+      i++;
+    }
+  }
+  return output;
+}
+
+export function mapParameterToPdoSubItemValue(parameter: Parameter): number {
+  const { index, subindex } = parameter;
+  if (parameter.valueType && parameter.valueType < ValueType.VISIBLE_STRING) {
+    const buffer = new ArrayBuffer(4);
+    const view = new DataView(buffer);
+    const bitSize = mapValueTypeToBitSize(parameter.valueType);
+    view.setUint16(0, index);
+    view.setUint8(2, subindex);
+    view.setUint8(3, bitSize);
+    return view.getUint32(0);
+  }
+  return 0;
+}
+
+export function mapValueTypeToBitSize(valueType: ValueType): number {
+  switch (valueType) {
+    case ValueType.UNSPECIFIED:
+      return 0;
+    case ValueType.BOOLEAN:
+      return 1;
+    case ValueType.INTEGER8:
+    case ValueType.UNSIGNED8:
+      return 8;
+    case ValueType.INTEGER16:
+    case ValueType.UNSIGNED16:
+      return 16;
+    case ValueType.INTEGER32:
+    case ValueType.UNSIGNED32:
+    case ValueType.REAL32:
+      return 32;
+  }
+  throw new Error(`Non-numeric value type "${valueType}" (data types with variable length) cannot be mapped to bit size. You will have to get this info from ESI.`);
+}
+
+export const valueTypeToParameterTypeValueKeyMap = new Map<ValueType, keyof Required<ParameterTypeValue>>([
+  [ValueType.BOOLEAN, 'uintValue'],
+  [ValueType.INTEGER8, 'intValue'],
+  [ValueType.INTEGER16, 'intValue'],
+  [ValueType.INTEGER32, 'intValue'],
+  [ValueType.UNSIGNED8, 'uintValue'],
+  [ValueType.UNSIGNED16, 'uintValue'],
+  [ValueType.UNSIGNED32, 'uintValue'],
+  [ValueType.REAL32, 'floatValue'],
+  [ValueType.VISIBLE_STRING, 'stringValue'],
+  [ValueType.OCTET_STRING, 'stringValue'],
+  [ValueType.UNICODE_STRING, 'stringValue'],
+]);
+
+export function createPdoParameterValues(parameters: Array<{ index: number, subindex: number, typeValue?: ParameterTypeValueKey }>, values: Array<ParameterValueType>) {
+  const output = parameters.map((parameter, i, arr) => {
+    const { index, subindex, typeValue } = parameter;
+    let value = values[i];
+    if (subindex === 0) {
+      value = arr.reduce((n, p, j) => (p.index === index && p.subindex > 0 && values[j]) ? n + 1 : n, 0);
+    }
+    return [index, subindex, value, typeValue];
+  }) as ParameterAddressValue[];
+
+  for (let i = 0; i < output.length - 1; i++) {
+    const [, subindex1, value1] = output[i];
+    if (subindex1 > 0 && value1 === 0) {
+      let j = i + 1;
+      let [, subindex2, value2] = output[j];
+      while (subindex2 > subindex1 && output[j]) {
+        if (value2 > 0) {
+          output[i][2] = value2;
+          output[j][2] = 0;
+          break;
+        }
+        if (output[++j]) {
+          [, subindex2, value2] = output[j];
+        }
+      }
+    }
+  }
+
+  return output;
+}
+
+export function resolveAfter(ms: number, value?: unknown) {
+  return new Promise(function (resolve) {
+    setTimeout(resolve.bind(null, value), ms);
+  });
+}

package/tsconfig.json

@@ -0,0 +1,22 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ],
+  "compilerOptions": {
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "allowJs": true
+  }
+}

package/tsconfig.lib.json

@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "declaration": true,
+    "types": []
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.ts", "**/*.spec.ts", "jest.config.ts"]
+}

package/tsconfig.spec.json

@@ -0,0 +1,20 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "**/*.test.ts",
+    "**/*.spec.ts",
+    "**/*.test.tsx",
+    "**/*.spec.tsx",
+    "**/*.test.js",
+    "**/*.spec.js",
+    "**/*.test.jsx",
+    "**/*.spec.jsx",
+    "**/*.d.ts",
+    "jest.config.ts"
+  ]
+}

package/typedoc.json

@@ -0,0 +1,10 @@
+{
+  "entryPoints": [
+    "./src/index.ts"
+  ],
+  "out": "../../docs/motion-master-client",
+  "tsconfig": "./tsconfig.json",
+  "exclude": [
+    "**/*+(.spec|.e2e).ts"
+  ]
+}

package/src/index.js

@@ -1,22 +0,0 @@
-export * from './lib/device-log-line';
-export * from './lib/hardware-description';
-export * from './lib/monitoring-config';
-export * from './lib/monitoring-entry';
-export * from './lib/motion-master-client';
-export * from './lib/motion-master-pub-sub-client';
-export * from './lib/motion-master-pub-sub-socket';
-export * from './lib/motion-master-pub-sub-web-socket';
-export * from './lib/motion-master-pub-sub-worker-socket';
-export * from './lib/motion-master-req-res-client';
-export * from './lib/motion-master-req-res-socket';
-export * from './lib/motion-master-req-res-web-socket';
-export * from './lib/motion-master-req-res-worker-socket';
-export * from './lib/operators';
-export * from './lib/options';
-export * from './lib/parameter';
-export * from './lib/request-status-resolver';
-export * from './lib/system-log-line';
-export * from './lib/types';
-export * from './lib/urls';
-export * from './lib/util';
-//# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/motion-master-client/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oCAAoC,CAAC;AACnD,cAAc,oCAAoC,CAAC;AACnD,cAAc,wCAAwC,CAAC;AACvD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,oCAAoC,CAAC;AACnD,cAAc,oCAAoC,CAAC;AACnD,cAAc,wCAAwC,CAAC;AACvD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,uBAAuB,CAAC;AACtC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}

package/src/lib/device-log-line.d.ts

@@ -1,5 +0,0 @@
-export interface DeviceLogLine {
-    time: string;
-    level: string;
-    message: string;
-}

package/src/lib/device-log-line.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=device-log-line.js.map

package/src/lib/device-log-line.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"device-log-line.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/device-log-line.ts"],"names":[],"mappings":""}

package/src/lib/hardware-description.d.ts

@@ -1,36 +0,0 @@
-export interface HardwareComponent {
-    name: string;
-    version: string;
-    serialNumber: string;
-}
-export declare type AssemblyComponent = HardwareComponent;
-export declare type DeviceComponent = HardwareComponent;
-export interface Assembly {
-    name: string;
-    id: string;
-    version: string;
-    serialNumber: string;
-    components: AssemblyComponent[];
-}
-export interface HardwareDevice {
-    name: string;
-    id: string;
-    version: string;
-    serialNumber: string;
-    macAddress: string;
-    components: DeviceComponent[];
-}
-/**
- * @link https://docs.google.com/document/d/1N00-ZjxHkjoWNIsnoTtza9CUHrxm8-e54298DXLuD94
- */
-export interface HardwareDescription {
-    fileVersion: string;
-    assembly?: Assembly;
-    device: HardwareDevice;
-}
-export declare function getIdFromHardwareDescription(hardwareDescription: HardwareDescription): string;
-export declare function getApiIdentifierFromHardwareDescription(hardwareDescription: HardwareDescription): string;
-export declare function getNameFromHardwareDescription(hardwareDescription: HardwareDescription): string;
-export declare function getSerialNumberFromHardwareDescription(hardwareDescription: HardwareDescription): string;
-export declare function getAllComponentsFromHardwareDescription(hardwareDescription: HardwareDescription): HardwareComponent[];
-export declare function hardwareComponentsMatch(a: HardwareComponent[], b: HardwareComponent[]): boolean;

package/src/lib/hardware-description.js

@@ -1,38 +0,0 @@
-import { isEqual } from 'lodash';
-export function getIdFromHardwareDescription(hardwareDescription) {
-    return hardwareDescription.assembly
-        ? hardwareDescription.assembly.id
-        : hardwareDescription.device.id;
-}
-export function getApiIdentifierFromHardwareDescription(hardwareDescription) {
-    return hardwareDescription.assembly
-        ? `${hardwareDescription.assembly.id}-${hardwareDescription.assembly.version}`
-        : `${hardwareDescription.device.id}-${hardwareDescription.device.version}`;
-}
-export function getNameFromHardwareDescription(hardwareDescription) {
-    return hardwareDescription.assembly
-        ? hardwareDescription.assembly.name
-        : hardwareDescription.device.name;
-}
-export function getSerialNumberFromHardwareDescription(hardwareDescription) {
-    return hardwareDescription.assembly
-        ? hardwareDescription.assembly.serialNumber
-        : hardwareDescription.device.serialNumber;
-}
-export function getAllComponentsFromHardwareDescription(hardwareDescription) {
-    if (hardwareDescription.assembly) {
-        return [...hardwareDescription.assembly.components, ...hardwareDescription.device.components];
-    }
-    else {
-        return hardwareDescription.device.components;
-    }
-}
-export function hardwareComponentsMatch(a, b) {
-    if (a.length === 0 && b.length === 0) {
-        return false; // edge case: when both components are empty they don't match since there are no components to compare
-    }
-    const ac = a.map((c) => `${c.name}-${c.version[0]}`.replace(/\s/g, '').toLocaleLowerCase()).sort();
-    const bc = b.map((c) => `${c.name}-${c.version[0]}`.replace(/\s/g, '').toLocaleLowerCase()).sort();
-    return isEqual(ac, bc);
-}
-//# sourceMappingURL=hardware-description.js.map

package/src/lib/hardware-description.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"hardware-description.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/hardware-description.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAqCjC,MAAM,UAAU,4BAA4B,CAAC,mBAAwC;IACnF,OAAO,mBAAmB,CAAC,QAAQ;QACjC,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAC,EAAE;QACjC,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,uCAAuC,CAAC,mBAAwC;IAC9F,OAAO,mBAAmB,CAAC,QAAQ;QACjC,CAAC,CAAC,GAAG,mBAAmB,CAAC,QAAQ,CAAC,EAAE,IAAI,mBAAmB,CAAC,QAAQ,CAAC,OAAO,EAAE;QAC9E,CAAC,CAAC,GAAG,mBAAmB,CAAC,MAAM,CAAC,EAAE,IAAI,mBAAmB,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;AAC/E,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,mBAAwC;IACrF,OAAO,mBAAmB,CAAC,QAAQ;QACjC,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI;QACnC,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,sCAAsC,CAAC,mBAAwC;IAC7F,OAAO,mBAAmB,CAAC,QAAQ;QACjC,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAC,YAAY;QAC3C,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,uCAAuC,CAAC,mBAAwC;IAC9F,IAAI,mBAAmB,CAAC,QAAQ,EAAE;QAChC,OAAO,CAAC,GAAG,mBAAmB,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,mBAAmB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;KAC/F;SAAM;QACL,OAAO,mBAAmB,CAAC,MAAM,CAAC,UAAU,CAAC;KAC9C;AACH,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,CAAsB,EAAE,CAAsB;IACpF,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACpC,OAAO,KAAK,CAAC,CAAC,sGAAsG;KACrH;IAED,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACnG,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAEnG,OAAO,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACzB,CAAC"}

package/src/lib/logger.d.ts

@@ -1 +0,0 @@
-export declare const logger: import("roarr").Logger<import("roarr/dist/src/types").JsonObject>;

package/src/lib/logger.js

@@ -1,5 +0,0 @@
-import { Roarr } from 'roarr';
-export const logger = Roarr.child({
-    package: '@synapticon/motion-master-client'
-});
-//# sourceMappingURL=logger.js.map

package/src/lib/logger.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC;IAChC,OAAO,EAAE,kCAAkC;CAC5C,CAAC,CAAC"}

package/src/lib/monitoring-config.d.ts

@@ -1,6 +0,0 @@
-export interface MonitoringConfig {
-    readonly bufferSize?: number;
-    readonly distinct?: boolean;
-    readonly messageId: string;
-    readonly topic: string;
-}

package/src/lib/monitoring-config.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=monitoring-config.js.map

package/src/lib/monitoring-config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"monitoring-config.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/monitoring-config.ts"],"names":[],"mappings":""}

package/src/lib/monitoring-entry.d.ts

@@ -1,10 +0,0 @@
-import { Observable } from "rxjs";
-import { MonitoringConfig } from "./monitoring-config";
-import { MotionMasterMessage, ParameterValueType } from "./types";
-export interface MonitoringEntry {
-    config: MonitoringConfig;
-    interval: number;
-    message$: Observable<MotionMasterMessage>;
-    values$: Observable<ParameterValueType[]>;
-    parameters: MotionMasterMessage.Request.GetDeviceParameterValues.IParameter[];
-}

package/src/lib/monitoring-entry.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=monitoring-entry.js.map

package/src/lib/monitoring-entry.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"monitoring-entry.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/monitoring-entry.ts"],"names":[],"mappings":""}

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

@@ -1,18 +0,0 @@
-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 { MotionMasterMessage, ParameterAddress } from "./types";
-export declare class MotionMasterClient {
-    private readonly reqResSocket;
-    private readonly pubSubSocket;
-    readonly request: MotionMasterReqResClient;
-    readonly monitor: MotionMasterPubSubClient;
-    constructor(reqResSocket: MotionMasterReqResSocket, pubSubSocket: MotionMasterPubSubSocket);
-    startMonitoringDeviceParameterValues(deviceAddress: number, parameters: MotionMasterMessage.Request.GetDeviceParameterValues.IParameter[], interval: number, config: MonitoringConfig, requestTimeout?: number): [string, Observable<MotionMasterMessage>];
-    startMonitoringValues<T = number[]>(deviceAddress: number, parameterAddresses: ParameterAddress[], interval: number, config?: MonitoringConfig, requestTimeout?: number): [string, Observable<T>];
-    startMonitoring<T = number[]>(deviceAddress: number, parameterAddresses: [number, number][], interval: number, config?: MonitoringConfig, requestTimeout?: number): Observable<T>;
-    stopMonitoring(messageId: string): void;
-}

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

@@ -1,48 +0,0 @@
-import { Observable } from "rxjs";
-import { v4 } from "uuid";
-import { MotionMasterPubSubClient } from "./motion-master-pub-sub-client";
-import { MotionMasterReqResClient } from "./motion-master-req-res-client";
-import { mapStatusMessageToParameterValues, selectMotionMasterMessageByTopic } from "./operators";
-export class MotionMasterClient {
-    constructor(reqResSocket, pubSubSocket) {
-        this.reqResSocket = reqResSocket;
-        this.pubSubSocket = pubSubSocket;
-        this.request = new MotionMasterReqResClient(this.reqResSocket);
-        this.monitor = new MotionMasterPubSubClient(this.pubSubSocket);
-    }
-    startMonitoringDeviceParameterValues(deviceAddress, parameters, interval, config, requestTimeout = 5000) {
-        const props = {
-            interval,
-            topic: config.topic,
-            getDeviceParameterValues: { deviceAddress, parameters },
-        };
-        this.monitor.subscribe(config);
-        this.request.startMonitoringDeviceParameterValues(props, requestTimeout, config.messageId);
-        const message$ = this.monitor.socket.data$.pipe(selectMotionMasterMessageByTopic(config.topic));
-        return [config.messageId, message$];
-    }
-    startMonitoringValues(deviceAddress, parameterAddresses, interval, config, requestTimeout = 5000) {
-        const parameters = parameterAddresses.map((addr) => ({ index: addr[0], subindex: addr[1], loadFromCache: false }));
-        if (!config) {
-            config = { messageId: v4(), topic: v4(), bufferSize: 1, distinct: false };
-        }
-        const [messageId, message$] = this.startMonitoringDeviceParameterValues(deviceAddress, parameters, interval, config, requestTimeout);
-        const values$ = message$.pipe(mapStatusMessageToParameterValues());
-        return [messageId, values$];
-    }
-    startMonitoring(deviceAddress, parameterAddresses, interval, config, requestTimeout = 5000) {
-        return new Observable((subscriber) => {
-            const [messageId, values$] = this.startMonitoringValues(deviceAddress, parameterAddresses, interval, config, requestTimeout);
-            const subscription = values$.subscribe(subscriber);
-            return () => {
-                subscription.unsubscribe();
-                this.stopMonitoring(messageId);
-            };
-        });
-    }
-    stopMonitoring(messageId) {
-        this.request.stopMonitoringDeviceParameterValues({ startMonitoringRequestId: messageId });
-        this.monitor.unsubscribe(messageId);
-    }
-}
-//# sourceMappingURL=motion-master-client.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"motion-master-client.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/motion-master-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAE1B,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,OAAO,EAAE,iCAAiC,EAAE,gCAAgC,EAAE,MAAM,aAAa,CAAC;AAGlG,MAAM,OAAO,kBAAkB;IAK7B,YACmB,YAAsC,EACtC,YAAsC;QADtC,iBAAY,GAAZ,YAAY,CAA0B;QACtC,iBAAY,GAAZ,YAAY,CAA0B;QAEvD,IAAI,CAAC,OAAO,GAAG,IAAI,wBAAwB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/D,IAAI,CAAC,OAAO,GAAG,IAAI,wBAAwB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACjE,CAAC;IAED,oCAAoC,CAClC,aAAqB,EACrB,UAA6E,EAC7E,QAAgB,EAChB,MAAwB,EACxB,cAAc,GAAG,IAAI;QAErB,MAAM,KAAK,GAAsE;YAC/E,QAAQ;YACR,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,wBAAwB,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE;SACxD,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAE/B,IAAI,CAAC,OAAO,CAAC,oCAAoC,CAAC,KAAK,EAAE,cAAc,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;QAE3F,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAC7C,gCAAgC,CAAC,MAAM,CAAC,KAAK,CAAC,CAC/C,CAAC;QAEF,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,qBAAqB,CACnB,aAAqB,EACrB,kBAAsC,EACtC,QAAgB,EAChB,MAAyB,EACzB,cAAc,GAAG,IAAI;QAErB,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QAEnH,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;SAC3E;QAED,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,oCAAoC,CAAC,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAErI,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAC3B,iCAAiC,EAAE,CACR,CAAC;QAE9B,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC9B,CAAC;IAED,eAAe,CACb,aAAqB,EACrB,kBAAsC,EACtC,QAAgB,EAChB,MAAyB,EACzB,cAAc,GAAG,IAAI;QAErB,OAAO,IAAI,UAAU,CAAI,CAAC,UAAU,EAAE,EAAE;YACtC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAI,aAAa,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;YAEhI,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAEnD,OAAO,GAAG,EAAE;gBACV,YAAY,CAAC,WAAW,EAAE,CAAC;gBAC3B,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YACjC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,cAAc,CAAC,SAAiB;QAC9B,IAAI,CAAC,OAAO,CAAC,mCAAmC,CAAC,EAAE,wBAAwB,EAAE,SAAS,EAAE,CAAC,CAAC;QAC1F,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;CAEF"}