mclimate-payload-helper 1.0.8 → 1.0.9

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.
Files changed (25) hide show
  1. package/dist/decoders/payloadParsers/index.d.ts +1 -0
  2. package/dist/decoders/payloadParsers/index.d.ts.map +1 -1
  3. package/dist/decoders/payloadParsers/index.js +1 -0
  4. package/dist/decoders/payloadParsers/index.js.map +1 -1
  5. package/dist/decoders/payloadParsers/relay16PayloadParser.d.ts +2 -0
  6. package/dist/decoders/payloadParsers/relay16PayloadParser.d.ts.map +1 -0
  7. package/dist/decoders/payloadParsers/relay16PayloadParser.js +68 -0
  8. package/dist/decoders/payloadParsers/relay16PayloadParser.js.map +1 -0
  9. package/dist/decoders/payloadParsers/types/index.d.ts +1 -0
  10. package/dist/decoders/payloadParsers/types/index.d.ts.map +1 -1
  11. package/dist/decoders/payloadParsers/types/index.js +1 -0
  12. package/dist/decoders/payloadParsers/types/index.js.map +1 -1
  13. package/dist/decoders/payloadParsers/types/relay.d.ts +9 -0
  14. package/dist/decoders/payloadParsers/types/relay.d.ts.map +1 -0
  15. package/dist/decoders/payloadParsers/types/relay.js +3 -0
  16. package/dist/decoders/payloadParsers/types/relay.js.map +1 -0
  17. package/dist/decoders/payloadParsers/uplinkPayloadParser.d.ts.map +1 -1
  18. package/dist/decoders/payloadParsers/uplinkPayloadParser.js +2 -2
  19. package/dist/decoders/payloadParsers/uplinkPayloadParser.js.map +1 -1
  20. package/package.json +1 -1
  21. package/src/decoders/payloadParsers/index.ts +1 -0
  22. package/src/decoders/payloadParsers/relay16PayloadParser.ts +70 -0
  23. package/src/decoders/payloadParsers/types/index.ts +1 -0
  24. package/src/decoders/payloadParsers/types/relay.ts +8 -0
  25. package/src/decoders/payloadParsers/uplinkPayloadParser.ts +3 -2
@@ -14,4 +14,5 @@ export * from './htSensorPayloadParser';
14
14
  export * from './openCloseSensorPayloadParser';
15
15
  export * from './tFloodPayloadParser';
16
16
  export * from './tValvePayloadParser';
17
+ export * from './relay16PayloadParser';
17
18
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,0BAA0B,CAAA;AACxC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,2BAA2B,CAAA;AACzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,kCAAkC,CAAA;AAChD,cAAc,2BAA2B,CAAA;AACzC,cAAc,mCAAmC,CAAA;AACjD,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,yBAAyB,CAAA;AACvC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,0BAA0B,CAAA;AACxC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,2BAA2B,CAAA;AACzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,kCAAkC,CAAA;AAChD,cAAc,2BAA2B,CAAA;AACzC,cAAc,mCAAmC,CAAA;AACjD,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,yBAAyB,CAAA;AACvC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,wBAAwB,CAAA"}
@@ -30,4 +30,5 @@ __exportStar(require("./htSensorPayloadParser"), exports);
30
30
  __exportStar(require("./openCloseSensorPayloadParser"), exports);
31
31
  __exportStar(require("./tFloodPayloadParser"), exports);
32
32
  __exportStar(require("./tValvePayloadParser"), exports);
33
+ __exportStar(require("./relay16PayloadParser"), exports);
33
34
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAqC;AACrC,uDAAoC;AACpC,2DAAwC;AACxC,gEAA6C;AAC7C,4DAAyC;AACzC,2DAAwC;AACxC,mEAAgD;AAChD,4DAAyC;AACzC,oEAAiD;AACjD,wDAAqC;AACrC,2DAAwC;AACxC,+DAA4C;AAC5C,0DAAuC;AACvC,iEAA8C;AAC9C,wDAAqC;AACrC,wDAAqC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAqC;AACrC,uDAAoC;AACpC,2DAAwC;AACxC,gEAA6C;AAC7C,4DAAyC;AACzC,2DAAwC;AACxC,mEAAgD;AAChD,4DAAyC;AACzC,oEAAiD;AACjD,wDAAqC;AACrC,2DAAwC;AACxC,+DAA4C;AAC5C,0DAAuC;AACvC,iEAA8C;AAC9C,wDAAqC;AACrC,wDAAqC;AACrC,yDAAsC"}
@@ -0,0 +1,2 @@
1
+ export declare const relay16PayloadParser: (hexData: string) => {} | undefined;
2
+ //# sourceMappingURL=relay16PayloadParser.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"relay16PayloadParser.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/relay16PayloadParser.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,oBAAoB,YAAa,MAAM,mBAgEnD,CAAA"}
@@ -0,0 +1,68 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.relay16PayloadParser = void 0;
4
+ const commandsReadingHelper_1 = require("../../decoders/commandsReadingHelper");
5
+ const types_1 = require("../../decoders/payloadParsers/types");
6
+ const helpers_1 = require("../../helpers");
7
+ const utils_1 = require("../../utils");
8
+ const relay16PayloadParser = (hexData) => {
9
+ let deviceData = {};
10
+ try {
11
+ const handleKeepAliveData = (bytes) => {
12
+ let keepaliveData = {};
13
+ // Internal temperature sensor
14
+ keepaliveData.internalTemperature = bytes[1];
15
+ // Energy data
16
+ keepaliveData.energy = ((bytes[2] << 24) | (bytes[3] << 16) | (bytes[4] << 8) | bytes[5]) / 1000;
17
+ // Power data
18
+ keepaliveData.power = (bytes[6] << 8) | bytes[7];
19
+ // AC voltage
20
+ keepaliveData.acVoltage = bytes[8];
21
+ // AC current data
22
+ keepaliveData.acCurrent = (bytes[9] << 8) | bytes[10];
23
+ // Relay state
24
+ keepaliveData.relayState = bytes[11] === 0x01;
25
+ Object.assign(deviceData, Object.assign({}, deviceData), Object.assign({}, keepaliveData));
26
+ };
27
+ if (hexData) {
28
+ let byteArray = (0, helpers_1.byteArrayParser)(hexData);
29
+ if (!byteArray)
30
+ return;
31
+ if (byteArray[0] == 1) {
32
+ // its a keeapalive
33
+ handleKeepAliveData(byteArray);
34
+ }
35
+ else {
36
+ // parse command answers
37
+ let data = (0, commandsReadingHelper_1.commandsReadingHelper)(hexData, 24, types_1.DeviceType.Relay16);
38
+ if (!data)
39
+ return;
40
+ const shouldKeepAlive = data.hasOwnProperty('decodeKeepalive') ? true : false;
41
+ if ('decodeKeepalive' in data) {
42
+ delete data.decodeKeepalive;
43
+ }
44
+ Object.assign(deviceData, Object.assign({}, deviceData), Object.assign({}, data));
45
+ // get only keepalive from device response
46
+ if (shouldKeepAlive) {
47
+ let keepaliveData = hexData.slice(-24);
48
+ let dataToPass = (0, helpers_1.byteArrayParser)(keepaliveData);
49
+ if (!dataToPass)
50
+ return;
51
+ handleKeepAliveData(dataToPass);
52
+ }
53
+ }
54
+ // console.log(deviceData)
55
+ return deviceData;
56
+ }
57
+ }
58
+ catch (e) {
59
+ throw new utils_1.CustomError({
60
+ message: `Unhandled data`,
61
+ hexData: hexData,
62
+ deviceType: 'relay_16',
63
+ originalError: e,
64
+ });
65
+ }
66
+ };
67
+ exports.relay16PayloadParser = relay16PayloadParser;
68
+ //# sourceMappingURL=relay16PayloadParser.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"relay16PayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/relay16PayloadParser.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
1
  export * from './vicki';
2
2
  export * from './allDevices';
3
+ export * from './relay';
3
4
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/decoders/payloadParsers/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,cAAc,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/decoders/payloadParsers/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,cAAc,CAAA;AAC5B,cAAc,SAAS,CAAA"}
@@ -16,4 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./vicki"), exports);
18
18
  __exportStar(require("./allDevices"), exports);
19
+ __exportStar(require("./relay"), exports);
19
20
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/decoders/payloadParsers/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAuB;AACvB,+CAA4B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/decoders/payloadParsers/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAuB;AACvB,+CAA4B;AAC5B,0CAAuB"}
@@ -0,0 +1,9 @@
1
+ export type RelayKeepAliveData = {
2
+ internalTemperature?: number;
3
+ energy?: number;
4
+ power?: number;
5
+ acVoltage?: number;
6
+ acCurrent?: number;
7
+ relayState?: boolean;
8
+ };
9
+ //# sourceMappingURL=relay.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"relay.d.ts","sourceRoot":"","sources":["../../../../src/decoders/payloadParsers/types/relay.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,kBAAkB,GAAG;IAChC,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA"}
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=relay.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"relay.js","sourceRoot":"","sources":["../../../../src/decoders/payloadParsers/types/relay.ts"],"names":[],"mappings":""}
@@ -1 +1 @@
1
- {"version":3,"file":"uplinkPayloadParser.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/uplinkPayloadParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAmB5D,eAAO,MAAM,mBAAmB,YAAa,MAAM,cAAc,UAAU,mBAsC1E,CAAA"}
1
+ {"version":3,"file":"uplinkPayloadParser.d.ts","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/uplinkPayloadParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAoB5D,eAAO,MAAM,mBAAmB,YAAa,MAAM,cAAc,UAAU,mBAsC1E,CAAA"}
@@ -35,8 +35,8 @@ const uplinkPayloadParser = (hexData, deviceType) => {
35
35
  return (0, payloadParsers_1.CO2DisplayLitePayloadParser)(hexData);
36
36
  case types_1.DeviceType.HTDisplayLite:
37
37
  return (0, payloadParsers_1.htDisplayLitePayloadParser)(hexData);
38
- // case DeviceType.Relay16:
39
- // return relay16PayloadParser(hexData)
38
+ case types_1.DeviceType.Relay16:
39
+ return (0, payloadParsers_1.relay16PayloadParser)(hexData);
40
40
  default:
41
41
  // Q: is this OK?
42
42
  return (0, payloadParsers_1.vickiPayloadParser)(hexData); // Default case if deviceType is not recognized
@@ -1 +1 @@
1
- {"version":3,"file":"uplinkPayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/uplinkPayloadParser.ts"],"names":[],"mappings":";;;AAAA,2DAA4D;AAC5D,8DAgBkC;AAE3B,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAE,UAAsB,EAAE,EAAE;IAC9E,QAAQ,UAAU,EAAE,CAAC;QACpB,KAAK,kBAAU,CAAC,KAAK;YACpB,OAAO,IAAA,mCAAkB,EAAC,OAAO,CAAC,CAAA;QACnC,KAAK,kBAAU,CAAC,QAAQ;YACvB,OAAO,IAAA,sCAAqB,EAAC,OAAO,CAAC,CAAA;QACtC,KAAK,kBAAU,CAAC,MAAM;YACrB,OAAO,IAAA,oCAAmB,EAAC,OAAO,CAAC,CAAA;QACpC,KAAK,kBAAU,CAAC,SAAS;YACxB,OAAO,IAAA,uCAAsB,EAAC,OAAO,CAAC,CAAA;QACvC,KAAK,kBAAU,CAAC,MAAM;YACrB,OAAO,IAAA,oCAAmB,EAAC,OAAO,CAAC,CAAA;QACpC,KAAK,kBAAU,CAAC,SAAS;YACxB,OAAO,IAAA,uCAAsB,EAAC,OAAO,CAAC,CAAA;QACvC,KAAK,kBAAU,CAAC,UAAU;YACzB,OAAO,IAAA,wCAAuB,EAAC,OAAO,CAAC,CAAA;QACxC,KAAK,kBAAU,CAAC,QAAQ;YACvB,OAAO,IAAA,oCAAmB,EAAC,OAAO,CAAC,CAAA;QACpC,KAAK,kBAAU,CAAC,eAAe;YAC9B,OAAO,IAAA,6CAA4B,EAAC,OAAO,CAAC,CAAA;QAC7C,KAAK,kBAAU,CAAC,SAAS;YACxB,OAAO,IAAA,uCAAsB,EAAC,OAAO,CAAC,CAAA;QACvC,KAAK,kBAAU,CAAC,kBAAkB;YACjC,OAAO,IAAA,gDAA+B,EAAC,OAAO,CAAC,CAAA;QAChD,KAAK,kBAAU,CAAC,UAAU;YACzB,OAAO,IAAA,wCAAuB,EAAC,OAAO,CAAC,CAAA;QACxC,KAAK,kBAAU,CAAC,iBAAiB;YAChC,OAAO,IAAA,+CAA8B,EAAC,OAAO,CAAC,CAAA;QAC/C,KAAK,kBAAU,CAAC,cAAc;YAC7B,OAAO,IAAA,4CAA2B,EAAC,OAAO,CAAC,CAAA;QAC5C,KAAK,kBAAU,CAAC,aAAa;YAC5B,OAAO,IAAA,2CAA0B,EAAC,OAAO,CAAC,CAAA;QAC3C,2BAA2B;QAC3B,wCAAwC;QACxC;YACC,iBAAiB;YACjB,OAAO,IAAA,mCAAkB,EAAC,OAAO,CAAC,CAAA,CAAC,+CAA+C;IACpF,CAAC;AACF,CAAC,CAAA;AAtCY,QAAA,mBAAmB,uBAsC/B"}
1
+ {"version":3,"file":"uplinkPayloadParser.js","sourceRoot":"","sources":["../../../src/decoders/payloadParsers/uplinkPayloadParser.ts"],"names":[],"mappings":";;;AAAA,2DAA4D;AAC5D,8DAiBkC;AAE3B,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAE,UAAsB,EAAE,EAAE;IAC9E,QAAQ,UAAU,EAAE,CAAC;QACpB,KAAK,kBAAU,CAAC,KAAK;YACpB,OAAO,IAAA,mCAAkB,EAAC,OAAO,CAAC,CAAA;QACnC,KAAK,kBAAU,CAAC,QAAQ;YACvB,OAAO,IAAA,sCAAqB,EAAC,OAAO,CAAC,CAAA;QACtC,KAAK,kBAAU,CAAC,MAAM;YACrB,OAAO,IAAA,oCAAmB,EAAC,OAAO,CAAC,CAAA;QACpC,KAAK,kBAAU,CAAC,SAAS;YACxB,OAAO,IAAA,uCAAsB,EAAC,OAAO,CAAC,CAAA;QACvC,KAAK,kBAAU,CAAC,MAAM;YACrB,OAAO,IAAA,oCAAmB,EAAC,OAAO,CAAC,CAAA;QACpC,KAAK,kBAAU,CAAC,SAAS;YACxB,OAAO,IAAA,uCAAsB,EAAC,OAAO,CAAC,CAAA;QACvC,KAAK,kBAAU,CAAC,UAAU;YACzB,OAAO,IAAA,wCAAuB,EAAC,OAAO,CAAC,CAAA;QACxC,KAAK,kBAAU,CAAC,QAAQ;YACvB,OAAO,IAAA,oCAAmB,EAAC,OAAO,CAAC,CAAA;QACpC,KAAK,kBAAU,CAAC,eAAe;YAC9B,OAAO,IAAA,6CAA4B,EAAC,OAAO,CAAC,CAAA;QAC7C,KAAK,kBAAU,CAAC,SAAS;YACxB,OAAO,IAAA,uCAAsB,EAAC,OAAO,CAAC,CAAA;QACvC,KAAK,kBAAU,CAAC,kBAAkB;YACjC,OAAO,IAAA,gDAA+B,EAAC,OAAO,CAAC,CAAA;QAChD,KAAK,kBAAU,CAAC,UAAU;YACzB,OAAO,IAAA,wCAAuB,EAAC,OAAO,CAAC,CAAA;QACxC,KAAK,kBAAU,CAAC,iBAAiB;YAChC,OAAO,IAAA,+CAA8B,EAAC,OAAO,CAAC,CAAA;QAC/C,KAAK,kBAAU,CAAC,cAAc;YAC7B,OAAO,IAAA,4CAA2B,EAAC,OAAO,CAAC,CAAA;QAC5C,KAAK,kBAAU,CAAC,aAAa;YAC5B,OAAO,IAAA,2CAA0B,EAAC,OAAO,CAAC,CAAA;QAC3C,KAAK,kBAAU,CAAC,OAAO;YACtB,OAAO,IAAA,qCAAoB,EAAC,OAAO,CAAC,CAAA;QACrC;YACC,iBAAiB;YACjB,OAAO,IAAA,mCAAkB,EAAC,OAAO,CAAC,CAAA,CAAC,+CAA+C;IACpF,CAAC;AACF,CAAC,CAAA;AAtCY,QAAA,mBAAmB,uBAsC/B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mclimate-payload-helper",
3
- "version": "1.0.8",
3
+ "version": "1.0.9",
4
4
  "description": "Mclimate payload helper",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -14,3 +14,4 @@ export * from './htSensorPayloadParser'
14
14
  export * from './openCloseSensorPayloadParser'
15
15
  export * from './tFloodPayloadParser'
16
16
  export * from './tValvePayloadParser'
17
+ export * from './relay16PayloadParser'
@@ -0,0 +1,70 @@
1
+ import { commandsReadingHelper } from '@/decoders/commandsReadingHelper'
2
+ import { DeviceType, RelayKeepAliveData } from '@/decoders/payloadParsers/types'
3
+ import { byteArrayParser } from '@/helpers'
4
+ import { CustomError } from '@/utils'
5
+
6
+ export const relay16PayloadParser = (hexData: string) => {
7
+ let deviceData = {}
8
+
9
+ try {
10
+ const handleKeepAliveData = (bytes: number[]) => {
11
+ let keepaliveData: RelayKeepAliveData = {}
12
+
13
+ // Internal temperature sensor
14
+ keepaliveData.internalTemperature = bytes[1]
15
+
16
+ // Energy data
17
+ keepaliveData.energy = ((bytes[2] << 24) | (bytes[3] << 16) | (bytes[4] << 8) | bytes[5]) / 1000
18
+
19
+ // Power data
20
+ keepaliveData.power = (bytes[6] << 8) | bytes[7]
21
+
22
+ // AC voltage
23
+ keepaliveData.acVoltage = bytes[8]
24
+
25
+ // AC current data
26
+ keepaliveData.acCurrent = (bytes[9] << 8) | bytes[10]
27
+
28
+ // Relay state
29
+ keepaliveData.relayState = bytes[11] === 0x01
30
+
31
+ Object.assign(deviceData, { ...deviceData }, { ...keepaliveData })
32
+ }
33
+
34
+ if (hexData) {
35
+ let byteArray = byteArrayParser(hexData)
36
+ if (!byteArray) return
37
+ if (byteArray[0] == 1) {
38
+ // its a keeapalive
39
+ handleKeepAliveData(byteArray)
40
+ } else {
41
+ // parse command answers
42
+ let data = commandsReadingHelper(hexData, 24, DeviceType.Relay16)
43
+ if (!data) return
44
+ const shouldKeepAlive = data.hasOwnProperty('decodeKeepalive') ? true : false
45
+ if ('decodeKeepalive' in data) {
46
+ delete data.decodeKeepalive
47
+ }
48
+
49
+ Object.assign(deviceData, { ...deviceData }, { ...data })
50
+
51
+ // get only keepalive from device response
52
+ if (shouldKeepAlive) {
53
+ let keepaliveData = hexData.slice(-24)
54
+ let dataToPass = byteArrayParser(keepaliveData)
55
+ if (!dataToPass) return
56
+ handleKeepAliveData(dataToPass)
57
+ }
58
+ }
59
+ // console.log(deviceData)
60
+ return deviceData
61
+ }
62
+ } catch (e) {
63
+ throw new CustomError({
64
+ message: `Unhandled data`,
65
+ hexData: hexData,
66
+ deviceType: 'relay_16',
67
+ originalError: e as Error,
68
+ })
69
+ }
70
+ }
@@ -1,2 +1,3 @@
1
1
  export * from './vicki'
2
2
  export * from './allDevices'
3
+ export * from './relay'
@@ -0,0 +1,8 @@
1
+ export type RelayKeepAliveData = {
2
+ internalTemperature?: number
3
+ energy?: number
4
+ power?: number
5
+ acVoltage?: number
6
+ acCurrent?: number
7
+ relayState?: boolean
8
+ }
@@ -15,6 +15,7 @@ import {
15
15
  openCloseSensorPayloadParser,
16
16
  tFloodPayloadParser,
17
17
  tValvePayloadParser,
18
+ relay16PayloadParser,
18
19
  } from '@/decoders/payloadParsers'
19
20
 
20
21
  export const uplinkPayloadParser = (hexData: string, deviceType: DeviceType) => {
@@ -49,8 +50,8 @@ export const uplinkPayloadParser = (hexData: string, deviceType: DeviceType) =>
49
50
  return CO2DisplayLitePayloadParser(hexData)
50
51
  case DeviceType.HTDisplayLite:
51
52
  return htDisplayLitePayloadParser(hexData)
52
- // case DeviceType.Relay16:
53
- // return relay16PayloadParser(hexData)
53
+ case DeviceType.Relay16:
54
+ return relay16PayloadParser(hexData)
54
55
  default:
55
56
  // Q: is this OK?
56
57
  return vickiPayloadParser(hexData) // Default case if deviceType is not recognized