jooby-codec 2.1.0 → 2.2.0

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 (34) hide show
  1. package/dist/analog/message.js +16 -17
  2. package/dist/analog/message.js.map +1 -1
  3. package/dist/obis-observer/CommandBinaryBuffer.d.ts +3 -3
  4. package/dist/obis-observer/CommandBinaryBuffer.js +5 -5
  5. package/dist/obis-observer/CommandBinaryBuffer.js.map +1 -1
  6. package/dist/obis-observer/commands/downlink/AddShortNameProfile.js +1 -1
  7. package/dist/obis-observer/commands/downlink/AddShortNameProfile.js.map +1 -1
  8. package/dist/obis-observer/commands/downlink/SetSerialPort.d.ts +1 -1
  9. package/dist/obis-observer/commands/downlink/SetSerialPort.js +2 -2
  10. package/dist/obis-observer/commands/downlink/SetSerialPort.js.map +1 -1
  11. package/dist/obis-observer/commands/uplink/GetShortNameInfoResponse.js +10 -4
  12. package/dist/obis-observer/commands/uplink/GetShortNameInfoResponse.js.map +1 -1
  13. package/dist/obis-observer/commands/uplink/GetShortNameProfileResponse.js +1 -1
  14. package/dist/obis-observer/commands/uplink/GetShortNameProfileResponse.js.map +1 -1
  15. package/dist/obis-observer/constants/commandRelations.d.ts +2 -0
  16. package/dist/obis-observer/constants/commandRelations.js +21 -0
  17. package/dist/obis-observer/constants/commandRelations.js.map +1 -0
  18. package/dist/obis-observer/constants/shortNames.d.ts +34 -0
  19. package/dist/obis-observer/constants/shortNames.js +228 -0
  20. package/dist/obis-observer/constants/shortNames.js.map +1 -0
  21. package/dist/obis-observer/index.d.ts +2 -1
  22. package/dist/obis-observer/index.js +2 -1
  23. package/dist/obis-observer/index.js.map +1 -1
  24. package/dist/obis-observer/utils/index.d.ts +1 -0
  25. package/dist/obis-observer/utils/index.js +2 -0
  26. package/dist/obis-observer/utils/index.js.map +1 -0
  27. package/dist/obis-observer/utils/obis.d.ts +3 -0
  28. package/dist/obis-observer/utils/obis.js +68 -0
  29. package/dist/obis-observer/utils/obis.js.map +1 -0
  30. package/dist/utils/invertObject.d.ts +3 -0
  31. package/dist/utils/invertObject.js +4 -0
  32. package/dist/utils/invertObject.js.map +1 -0
  33. package/package.json +1 -1
  34. package/readme.md +2 -0
package/dist/analog/message.js CHANGED
@@ -42,40 +42,39 @@ const getCommand = (id, data, direction = AUTO, hardwareType) => {
42
42
  export const fromBytes = (data, config) => {
43
43
  const direction = config?.direction ?? AUTO;
44
44
  const hardwareType = config?.hardwareType;
45
- const commandsData = data.slice(0, -1);
46
45
  const commands = [];
47
46
  const result = {
48
47
  commands,
49
48
  lrc: { expected: undefined, actual: 0 },
50
49
  isValid: false
51
50
  };
52
- let expectedLrc = data.at(-1);
53
- let actualLrc = calculateLrc(commandsData);
54
- let position = 0;
51
+ let processedBytes = 0;
52
+ let expectedLrc;
53
+ let actualLrc;
55
54
  do {
56
- const headerInfo = header.fromBytes(commandsData.slice(position, position + HEADER_MAX_SIZE));
57
- const headerData = commandsData.slice(position, position + headerInfo.headerSize);
58
- const bodyData = commandsData.slice(position + headerInfo.headerSize, position + headerInfo.headerSize + headerInfo.commandSize);
55
+ const headerInfo = header.fromBytes(data.slice(processedBytes, processedBytes + HEADER_MAX_SIZE));
56
+ const headerData = data.slice(processedBytes, processedBytes + headerInfo.headerSize);
57
+ const bodyData = data.slice(processedBytes + headerInfo.headerSize, processedBytes + headerInfo.headerSize + headerInfo.commandSize);
59
58
  let command;
60
- position = position + headerInfo.headerSize + headerInfo.commandSize;
59
+ processedBytes = processedBytes + headerInfo.headerSize + headerInfo.commandSize;
61
60
  try {
62
61
  command = getCommand(headerInfo.commandId, bodyData, direction, hardwareType);
63
62
  }
64
63
  catch (error) {
65
- if (position >= commandsData.length) {
66
- command = getCommand(headerInfo.commandId, new Uint8Array([...bodyData, ...data.slice(-1)]), direction, hardwareType);
67
- actualLrc = calculateLrc(data);
68
- expectedLrc = undefined;
69
- }
70
- else {
71
- throw error;
72
- }
64
+ command = UnknownCommand.fromBytes(bodyData, headerInfo.commandId);
73
65
  }
74
66
  commands.push({
75
67
  data: { header: headerData, body: bodyData },
76
68
  command
77
69
  });
78
- } while (position < commandsData.length);
70
+ } while (processedBytes < data.length - 1);
71
+ if (data.length - processedBytes === 1) {
72
+ expectedLrc = data.at(-1);
73
+ actualLrc = calculateLrc(data.slice(0, -1));
74
+ }
75
+ else {
76
+ actualLrc = calculateLrc(data);
77
+ }
79
78
  result.lrc.actual = actualLrc;
80
79
  result.lrc.expected = expectedLrc;
81
80
  result.isValid = expectedLrc === actualLrc;
package/dist/analog/message.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"message.js","sourceRoot":"","sources":["../../src/analog/message.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"message.js","sourceRoot":"","sources":["../../src/analog/message.ts"],"names":[],"mappings":"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"}
package/dist/obis-observer/CommandBinaryBuffer.d.ts CHANGED
@@ -12,7 +12,7 @@ export interface IObis {
12
12
  }
13
13
  export interface IObisProfileFlags {
14
14
  contentType: number;
15
- sendOnlyOnChange: number;
15
+ sendOnlyOnChange: boolean;
16
16
  archiveType: number;
17
17
  }
18
18
  export interface IObisProfile {
@@ -45,11 +45,11 @@ declare class CommandBinaryBuffer extends BinaryBuffer {
45
45
  getShortNameFloat(): IShortNameFloat;
46
46
  setShortNameFloat(shortName: IShortNameFloat): void;
47
47
  getSerialPortFlags(): {
48
- fixed: number;
48
+ fixed: boolean;
49
49
  parity: number;
50
50
  };
51
51
  setSerialPortFlags({ fixed, parity }: {
52
- fixed: number;
52
+ fixed: boolean;
53
53
  parity: number;
54
54
  }): void;
55
55
  }
package/dist/obis-observer/CommandBinaryBuffer.js CHANGED
@@ -84,14 +84,14 @@ class CommandBinaryBuffer extends BinaryBuffer {
84
84
  sendingCounter: this.getUint8(),
85
85
  flags: {
86
86
  contentType: 0,
87
- sendOnlyOnChange: 0,
87
+ sendOnlyOnChange: false,
88
88
  archiveType: 0
89
89
  }
90
90
  };
91
91
  const flags = this.getUint8();
92
92
  const { contentTypeBitsNumber, contentTypeBitStartIndex, sendingOnlyIfChangeBitsNumber, sendingOnlyIfChangeBitStartIndex, archiveTypeBitsNumber, archiveTypeBitStartIndex } = obisProfileFlags;
93
93
  profile.flags.contentType = bitSet.extractBits(flags, contentTypeBitsNumber, contentTypeBitStartIndex);
94
- profile.flags.sendOnlyOnChange = bitSet.extractBits(flags, sendingOnlyIfChangeBitsNumber, sendingOnlyIfChangeBitStartIndex);
94
+ profile.flags.sendOnlyOnChange = !!bitSet.extractBits(flags, sendingOnlyIfChangeBitsNumber, sendingOnlyIfChangeBitStartIndex);
95
95
  profile.flags.archiveType = bitSet.extractBits(flags, archiveTypeBitsNumber, archiveTypeBitStartIndex);
96
96
  return profile;
97
97
  }
@@ -102,7 +102,7 @@ class CommandBinaryBuffer extends BinaryBuffer {
102
102
  const { contentTypeBitsNumber, contentTypeBitStartIndex, sendingOnlyIfChangeBitsNumber, sendingOnlyIfChangeBitStartIndex, archiveTypeBitsNumber, archiveTypeBitStartIndex } = obisProfileFlags;
103
103
  let flags = 0;
104
104
  flags = bitSet.fillBits(flags, contentTypeBitsNumber, contentTypeBitStartIndex, profile.flags.contentType);
105
- flags = bitSet.fillBits(flags, sendingOnlyIfChangeBitsNumber, sendingOnlyIfChangeBitStartIndex, profile.flags.sendOnlyOnChange);
105
+ flags = bitSet.fillBits(flags, sendingOnlyIfChangeBitsNumber, sendingOnlyIfChangeBitStartIndex, +profile.flags.sendOnlyOnChange);
106
106
  flags = bitSet.fillBits(flags, archiveTypeBitsNumber, archiveTypeBitStartIndex, profile.flags.archiveType);
107
107
  this.setUint8(flags);
108
108
  }
@@ -123,13 +123,13 @@ class CommandBinaryBuffer extends BinaryBuffer {
123
123
  getSerialPortFlags() {
124
124
  const flags = this.getUint8();
125
125
  return {
126
- fixed: bitSet.extractBits(flags, 1, 3),
126
+ fixed: !!bitSet.extractBits(flags, 1, 3),
127
127
  parity: bitSet.extractBits(flags, 2, 1)
128
128
  };
129
129
  }
130
130
  setSerialPortFlags({ fixed, parity }) {
131
131
  let flags = 0;
132
- flags = bitSet.fillBits(flags, 1, 3, fixed);
132
+ flags = bitSet.fillBits(flags, 1, 3, +fixed);
133
133
  flags = bitSet.fillBits(flags, 2, 1, parity);
134
134
  this.setUint8(flags);
135
135
  }
package/dist/obis-observer/CommandBinaryBuffer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CommandBinaryBuffer.js","sourceRoot":"","sources":["../../src/obis-observer/CommandBinaryBuffer.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAC;AAC7C,OAAO,WAAW,MAAM,yBAAyB,CAAC;AA2ClD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC;AACjC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AACnC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC;AAGhC,MAAM,WAAW,GAAG;IAChB,CAAC,EAAE,CAAC,IAAI,CAAC;IACT,CAAC,EAAE,CAAC,IAAI,CAAC;IACT,CAAC,EAAE,CAAC,IAAI,CAAC;IACT,CAAC,EAAE,CAAC,IAAI,CAAC;CACZ,CAAC;AAEF,MAAM,gBAAgB,GAAG;IACrB,qBAAqB,EAAE,CAAC;IACxB,wBAAwB,EAAE,CAAC;IAC3B,6BAA6B,EAAE,CAAC;IAChC,gCAAgC,EAAE,CAAC;IACnC,qBAAqB,EAAE,CAAC;IACxB,wBAAwB,EAAE,CAAC;CAC9B,CAAC;AAMF,MAAM,mBAAoB,SAAQ,YAAY;IAC1C,YAAc,YAA0C;QAEpD,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,WAAW,CAAG,IAAW;QAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAuB,CAAC;QAErD,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAAC,uBAAuB,CAAG,SAA6C;QAC1E,IAAK,OAAO,SAAS,CAAC,OAAO,KAAK,QAAQ,EAAG;YAEzC,OAAO,CAAC,CAAC;SACZ;QAGD,OAAO,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO;QACH,MAAM,IAAI,GAAG;YACT,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;SACE,CAAC;QAEX,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE5D,IAAK,KAAK,CAAC,CAAC,EAAG;YACX,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;SAC5B;QAED,IAAK,KAAK,CAAC,CAAC,EAAG;YACX,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;SAC5B;QAED,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACzB,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEzB,IAAK,KAAK,CAAC,CAAC,EAAG;YACX,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;SAC5B;QAED,IAAK,KAAK,CAAC,CAAC,EAAG;YACX,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;SAC5B;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,CAAG,IAAW;QACjB,MAAM,KAAK,GAAG;YACV,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,SAAS;YACvB,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,SAAS;YACvB,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,SAAS;YACvB,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,SAAS;SAC1B,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;QAErD,IAAK,IAAI,CAAC,CAAC,EAAG;YACV,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACzB;QAED,IAAK,IAAI,CAAC,CAAC,EAAG;YACV,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACzB;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEtB,IAAK,IAAI,CAAC,CAAC,EAAG;YACV,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACzB;QAED,IAAK,IAAI,CAAC,CAAC,EAAG;YACV,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACzB;IACL,CAAC;IAED,cAAc;QACV,MAAM,OAAO,GAAG;YACZ,aAAa,EAAE,IAAI,CAAC,SAAS,EAAE;YAC/B,aAAa,EAAE,IAAI,CAAC,SAAS,EAAE;YAC/B,cAAc,EAAE,IAAI,CAAC,QAAQ,EAAE;YAC/B,KAAK,EAAE;gBACH,WAAW,EAAE,CAAC;gBACd,gBAAgB,EAAE,CAAC;gBACnB,WAAW,EAAE,CAAC;aACjB;SACY,CAAC;QAElB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAE9B,MAAM,EACF,qBAAqB,EACrB,wBAAwB,EACxB,6BAA6B,EAC7B,gCAAgC,EAChC,qBAAqB,EACrB,wBAAwB,EAC3B,GAAG,gBAAgB,CAAC;QAErB,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,qBAAqB,EAAE,wBAAwB,CAAC,CAAC;QACvG,OAAO,CAAC,KAAK,CAAC,gBAAgB,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,6BAA6B,EAAE,gCAAgC,CAAC,CAAC;QAC5H,OAAO,CAAC,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,qBAAqB,EAAE,wBAAwB,CAAC,CAAC;QAEvG,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,cAAc,CAAG,OAAqB;QAClC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QACtC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAEtC,MAAM,EACF,qBAAqB,EACrB,wBAAwB,EACxB,6BAA6B,EAC7B,gCAAgC,EAChC,qBAAqB,EACrB,wBAAwB,EAC3B,GAAG,gBAAgB,CAAC;QAErB,IAAI,KAAK,GAAG,CAAC,CAAC;QAEd,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW,CAAE,CAAC;QAC5G,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,6BAA6B,EAAE,gCAAgC,EAAE,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAChI,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAE3G,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAED,kBAAkB;QACd,OAAO,EAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,EAAC,CAAC;IAC9D,CAAC;IAED,kBAAkB,CAAG,SAA2B;QAC5C,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,iBAAiB;QACb,OAAO,EAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,EAAC,CAAC;IAC5E,CAAC;IAED,iBAAiB,CAAG,SAA0B;QAC1C,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,kBAAkB;QACd,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAE9B,OAAO;YACH,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YACtC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;SAC1C,CAAC;IACN,CAAC;IAED,kBAAkB,CAAG,EAAC,KAAK,EAAE,MAAM,EAAkC;QACjE,IAAI,KAAK,GAAG,CAAC,CAAC;QAEd,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;QAC5C,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAE7C,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;CACJ;AAGD,eAAe,mBAAmB,CAAC"}
1
+ {"version":3,"file":"CommandBinaryBuffer.js","sourceRoot":"","sources":["../../src/obis-observer/CommandBinaryBuffer.ts"],"names":[],"mappings":"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"}
package/dist/obis-observer/commands/downlink/AddShortNameProfile.js CHANGED
@@ -16,7 +16,7 @@ const examples = [
16
16
  sendingCounter: 38,
17
17
  flags: {
18
18
  contentType: contentTypes.AUTO,
19
- sendOnlyOnChange: 1,
19
+ sendOnlyOnChange: true,
20
20
  archiveType: archiveTypes.NONE
21
21
  }
22
22
  }
package/dist/obis-observer/commands/downlink/AddShortNameProfile.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AddShortNameProfile.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/AddShortNameProfile.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAmC,MAAM,8BAA8B,CAAC;AACpH,OAAO,EAAC,QAAQ,EAAC,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAYpE,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,CAAC,GAAG,eAAe,CAAC;AAEzC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,EAAE;YACb,WAAW,EAAE;gBACT,aAAa,EAAE,GAAG;gBAClB,aAAa,EAAE,GAAG;gBAClB,cAAc,EAAE,EAAE;gBAClB,KAAK,EAAE;oBACH,WAAW,EAAE,YAAY,CAAC,IAAI;oBAC9B,gBAAgB,EAAE,CAAC;oBACnB,WAAW,EAAE,YAAY,CAAC,IAAI;iBACjC;aACJ;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,yBAAyB,EAAC;KACvD;CACJ,CAAC;AAgCF,MAAM,mBAAoB,SAAQ,OAAO;IACrC,YAAqB,UAA0C;QAC3D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAgC;QAG3D,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC7B,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,mBAAmB,CAAC;YAC3B,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,WAAW,EAAE,MAAM,CAAC,cAAc,EAAE;SACvC,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,EAAC,SAAS,EAAE,SAAS,EAAE,WAAW,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAE5D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAEnC,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA9Be,sBAAE,GAAG,UAAU,CAAC;AAEhB,iCAAa,GAAG,QAAQ,CAAC;AAEzB,4BAAQ,GAAG,QAAQ,CAAC;AAEpB,iCAAa,GAAG,IAAI,CAAC;AA4BzC,eAAe,mBAAmB,CAAC"}
1
+ {"version":3,"file":"AddShortNameProfile.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/AddShortNameProfile.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAmC,MAAM,8BAA8B,CAAC;AACpH,OAAO,EAAC,QAAQ,EAAC,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAYpE,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,CAAC,GAAG,eAAe,CAAC;AAEzC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,EAAE;YACb,WAAW,EAAE;gBACT,aAAa,EAAE,GAAG;gBAClB,aAAa,EAAE,GAAG;gBAClB,cAAc,EAAE,EAAE;gBAClB,KAAK,EAAE;oBACH,WAAW,EAAE,YAAY,CAAC,IAAI;oBAC9B,gBAAgB,EAAE,IAAI;oBACtB,WAAW,EAAE,YAAY,CAAC,IAAI;iBACjC;aACJ;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,yBAAyB,EAAC;KACvD;CACJ,CAAC;AAgCF,MAAM,mBAAoB,SAAQ,OAAO;IACrC,YAAqB,UAA0C;QAC3D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAgC;QAG3D,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC7B,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,mBAAmB,CAAC;YAC3B,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,WAAW,EAAE,MAAM,CAAC,cAAc,EAAE;SACvC,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,EAAC,SAAS,EAAE,SAAS,EAAE,WAAW,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAE5D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAEnC,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA9Be,sBAAE,GAAG,UAAU,CAAC;AAEhB,iCAAa,GAAG,QAAQ,CAAC;AAEzB,4BAAQ,GAAG,QAAQ,CAAC;AAEpB,iCAAa,GAAG,IAAI,CAAC;AA4BzC,eAAe,mBAAmB,CAAC"}
package/dist/obis-observer/commands/downlink/SetSerialPort.d.ts CHANGED
@@ -4,7 +4,7 @@ interface ISetSerialPortParameters extends ICommandParameters {
4
4
  baudRate: number;
5
5
  dataBits: number;
6
6
  parity: number;
7
- fixed: number;
7
+ fixed: boolean;
8
8
  }
9
9
  declare class SetSerialPort extends Command {
10
10
  parameters: ISetSerialPortParameters;
package/dist/obis-observer/commands/downlink/SetSerialPort.js CHANGED
@@ -12,7 +12,7 @@ const examples = [
12
12
  baudRate: 5,
13
13
  dataBits: 8,
14
14
  parity: parityTypes.ODD,
15
- fixed: 1
15
+ fixed: true
16
16
  },
17
17
  hex: { header: '13', body: '34 05 08 05' }
18
18
  },
@@ -23,7 +23,7 @@ const examples = [
23
23
  baudRate: 12,
24
24
  dataBits: 7,
25
25
  parity: parityTypes.NONE,
26
- fixed: 0
26
+ fixed: false
27
27
  },
28
28
  hex: { header: '13', body: '34 0c 07 00' }
29
29
  }
package/dist/obis-observer/commands/downlink/SetSerialPort.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SetSerialPort.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/SetSerialPort.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACtG,OAAO,EAAC,QAAQ,EAAC,MAAM,+BAA+B,CAAC;AACvD,OAAO,KAAK,WAAW,MAAM,gCAAgC,CAAC;AAc9D,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;AAEzC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,kCAAkC;QACxC,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;YACb,QAAQ,EAAE,CAAC;YACX,QAAQ,EAAE,CAAC;YACX,MAAM,EAAE,WAAW,CAAC,GAAG;YACvB,KAAK,EAAE,CAAC;SACX;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAC;KAC3C;IACD;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;YACb,QAAQ,EAAE,EAAE;YACZ,QAAQ,EAAE,CAAC;YACX,MAAM,EAAE,WAAW,CAAC,IAAI;YACxB,KAAK,EAAE,CAAC;SACX;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAC;KAC3C;CACJ,CAAC;AA0BF,MAAM,aAAc,SAAQ,OAAO;IAC/B,YAAqB,UAAoC;QACrD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA0B;QAGrD,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC7B,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,aAAa,CAAC;YACrB,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC3B,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;YAE3B,GAAG,MAAM,CAAC,kBAAkB,EAAE;SACjC,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,EACF,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,KAAK,EACR,GAAG,IAAI,CAAC,UAAU,CAAC;QAEpB,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC1B,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC1B,MAAM,CAAC,kBAAkB,CAAC,EAAC,MAAM,EAAE,KAAK,EAAC,CAAC,CAAC;QAE3C,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAvCe,gBAAE,GAAG,UAAU,CAAC;AAEhB,2BAAa,GAAG,QAAQ,CAAC;AAEzB,sBAAQ,GAAG,QAAQ,CAAC;AAEpB,2BAAa,GAAG,IAAI,CAAC;AAqCzC,eAAe,aAAa,CAAC"}
1
+ {"version":3,"file":"SetSerialPort.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/SetSerialPort.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACtG,OAAO,EAAC,QAAQ,EAAC,MAAM,+BAA+B,CAAC;AACvD,OAAO,KAAK,WAAW,MAAM,gCAAgC,CAAC;AAc9D,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;AAEzC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,kCAAkC;QACxC,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;YACb,QAAQ,EAAE,CAAC;YACX,QAAQ,EAAE,CAAC;YACX,MAAM,EAAE,WAAW,CAAC,GAAG;YACvB,KAAK,EAAE,IAAI;SACd;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAC;KAC3C;IACD;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;YACb,QAAQ,EAAE,EAAE;YACZ,QAAQ,EAAE,CAAC;YACX,MAAM,EAAE,WAAW,CAAC,IAAI;YACxB,KAAK,EAAE,KAAK;SACf;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAC;KAC3C;CACJ,CAAC;AA0BF,MAAM,aAAc,SAAQ,OAAO;IAC/B,YAAqB,UAAoC;QACrD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA0B;QAGrD,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC7B,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,aAAa,CAAC;YACrB,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC3B,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;YAE3B,GAAG,MAAM,CAAC,kBAAkB,EAAE;SACjC,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,EACF,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,KAAK,EACR,GAAG,IAAI,CAAC,UAAU,CAAC;QAEpB,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC1B,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC1B,MAAM,CAAC,kBAAkB,CAAC,EAAC,MAAM,EAAE,KAAK,EAAC,CAAC,CAAC;QAE3C,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAvCe,gBAAE,GAAG,UAAU,CAAC;AAEhB,2BAAa,GAAG,QAAQ,CAAC;AAEzB,sBAAQ,GAAG,QAAQ,CAAC;AAEpB,2BAAa,GAAG,IAAI,CAAC;AAqCzC,eAAe,aAAa,CAAC"}
package/dist/obis-observer/commands/uplink/GetShortNameInfoResponse.js CHANGED
@@ -19,7 +19,7 @@ const examples = [
19
19
  sendingCounter: 61,
20
20
  flags: {
21
21
  contentType: contentTypes.STRING,
22
- sendOnlyOnChange: 0,
22
+ sendOnlyOnChange: false,
23
23
  archiveType: archiveTypes.DETAILED
24
24
  }
25
25
  }
@@ -33,18 +33,24 @@ class GetShortNameInfoResponse extends Command {
33
33
  this.parameters = parameters;
34
34
  let size = 1 + REQUEST_ID_SIZE;
35
35
  if (parameters.obis) {
36
- size += CommandBinaryBuffer.getObisSize(parameters.obis) + OBIS_PROFILE_SIZE;
36
+ size += CommandBinaryBuffer.getObisSize(parameters.obis);
37
+ }
38
+ if (parameters.obisProfile) {
39
+ size += OBIS_PROFILE_SIZE;
37
40
  }
38
41
  this.size = size;
39
42
  }
40
43
  static fromBytes(data) {
41
44
  const buffer = new CommandBinaryBuffer(data);
42
- const size = buffer.getUint8();
45
+ let size = buffer.getUint8() - REQUEST_ID_SIZE;
43
46
  const requestId = buffer.getUint8();
44
47
  let obis;
45
48
  let obisProfile;
46
- if (size > REQUEST_ID_SIZE) {
49
+ if (size > 0) {
47
50
  obis = buffer.getObis();
51
+ size -= CommandBinaryBuffer.getObisSize(obis);
52
+ }
53
+ if (size > 0) {
48
54
  obisProfile = buffer.getObisProfile();
49
55
  }
50
56
  return new GetShortNameInfoResponse({ requestId, obis, obisProfile });
package/dist/obis-observer/commands/uplink/GetShortNameInfoResponse.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GetShortNameInfoResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetShortNameInfoResponse.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GetShortNameInfoResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetShortNameInfoResponse.ts"],"names":[],"mappings":"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"}
package/dist/obis-observer/commands/uplink/GetShortNameProfileResponse.js CHANGED
@@ -15,7 +15,7 @@ const examples = [
15
15
  sendingCounter: 61,
16
16
  flags: {
17
17
  contentType: contentTypes.STRING,
18
- sendOnlyOnChange: 0,
18
+ sendOnlyOnChange: false,
19
19
  archiveType: archiveTypes.DETAILED
20
20
  }
21
21
  }
package/dist/obis-observer/commands/uplink/GetShortNameProfileResponse.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GetShortNameProfileResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetShortNameProfileResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAE,iBAAiB,EAAmC,MAAM,8BAA8B,CAAC;AACvI,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAUpE,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,iBAAiB,CAAC;AAEzD,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,4BAA4B;QAClC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE;gBACT,aAAa,EAAE,GAAG;gBAClB,aAAa,EAAE,GAAG;gBAClB,cAAc,EAAE,EAAE;gBAClB,KAAK,EAAE;oBACH,WAAW,EAAE,YAAY,CAAC,MAAM;oBAChC,gBAAgB,EAAE,CAAC;oBACnB,WAAW,EAAE,YAAY,CAAC,QAAQ;iBACrC;aACJ;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,sBAAsB,EAAC;KACpD;CACJ,CAAC;AAgCF,MAAM,2BAA4B,SAAQ,OAAO;IAC7C,YAAqB,UAAkD;QACnE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAwC;QAGnE,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC7B,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,CAAC;QAE5C,OAAO,IAAI,2BAA2B,CAAC,EAAC,SAAS,EAAE,WAAW,EAAC,CAAC,CAAC;IACrE,CAAC;IAGD,OAAO;QACH,IAAK,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAG;YACjC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC9C;QAED,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,EAAC,SAAS,EAAE,WAAW,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAEjD,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAEnC,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAhCe,8BAAE,GAAG,UAAU,CAAC;AAEhB,yCAAa,GAAG,MAAM,CAAC;AAEvB,oCAAQ,GAAG,QAAQ,CAAC;AAEpB,yCAAa,GAAG,IAAI,CAAC;AA8BzC,eAAe,2BAA2B,CAAC"}
1
+ {"version":3,"file":"GetShortNameProfileResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetShortNameProfileResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAE,iBAAiB,EAAmC,MAAM,8BAA8B,CAAC;AACvI,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAUpE,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,iBAAiB,CAAC;AAEzD,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,4BAA4B;QAClC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE;gBACT,aAAa,EAAE,GAAG;gBAClB,aAAa,EAAE,GAAG;gBAClB,cAAc,EAAE,EAAE;gBAClB,KAAK,EAAE;oBACH,WAAW,EAAE,YAAY,CAAC,MAAM;oBAChC,gBAAgB,EAAE,KAAK;oBACvB,WAAW,EAAE,YAAY,CAAC,QAAQ;iBACrC;aACJ;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,sBAAsB,EAAC;KACpD;CACJ,CAAC;AAgCF,MAAM,2BAA4B,SAAQ,OAAO;IAC7C,YAAqB,UAAkD;QACnE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAwC;QAGnE,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC7B,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,CAAC;QAE5C,OAAO,IAAI,2BAA2B,CAAC,EAAC,SAAS,EAAE,WAAW,EAAC,CAAC,CAAC;IACrE,CAAC;IAGD,OAAO;QACH,IAAK,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAG;YACjC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC9C;QAED,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,EAAC,SAAS,EAAE,WAAW,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAEjD,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAEnC,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAhCe,8BAAE,GAAG,UAAU,CAAC;AAEhB,yCAAa,GAAG,MAAM,CAAC;AAEvB,oCAAQ,GAAG,QAAQ,CAAC;AAEpB,yCAAa,GAAG,IAAI,CAAC;AA8BzC,eAAe,2BAA2B,CAAC"}
package/dist/obis-observer/constants/commandRelations.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ export declare const requestByResponse: Map<any, any>;
2
+ export declare const responseByRequest: Map<any, any>;
package/dist/obis-observer/constants/commandRelations.js ADDED
@@ -0,0 +1,21 @@
1
+ import * as downlinkCommands from '../commands/downlink/index.js';
2
+ import * as uplinkCommands from '../commands/uplink/index.js';
3
+ export const requestByResponse = new Map();
4
+ export const responseByRequest = new Map();
5
+ requestByResponse.set(uplinkCommands.AddShortNameProfileResponse, downlinkCommands.AddShortNameProfile);
6
+ requestByResponse.set(uplinkCommands.GetArchiveProfileResponse, downlinkCommands.GetArchiveProfile);
7
+ requestByResponse.set(uplinkCommands.GetContentByObisResponse, downlinkCommands.GetContentByObis);
8
+ requestByResponse.set(uplinkCommands.GetContentByShortNameResponse, downlinkCommands.GetContentByShortName);
9
+ requestByResponse.set(uplinkCommands.GetShortNameInfoResponse, downlinkCommands.GetShortNameInfo);
10
+ requestByResponse.set(uplinkCommands.GetShortNameProfileResponse, downlinkCommands.GetShortNameProfile);
11
+ requestByResponse.set(uplinkCommands.GetShortNamesResponse, downlinkCommands.GetShortNames);
12
+ requestByResponse.set(uplinkCommands.ReadArchiveResponse, downlinkCommands.ReadArchive);
13
+ requestByResponse.set(uplinkCommands.RebootResponse, downlinkCommands.Reboot);
14
+ requestByResponse.set(uplinkCommands.RemoveShortNameProfileResponse, downlinkCommands.RemoveShortNameProfile);
15
+ requestByResponse.set(uplinkCommands.SetArchiveProfileResponse, downlinkCommands.SetArchiveProfile);
16
+ requestByResponse.set(uplinkCommands.SetSerialPortResponse, downlinkCommands.SetSerialPort);
17
+ requestByResponse.set(uplinkCommands.SetShortNameResponse, downlinkCommands.SetShortName);
18
+ for (const [key, value] of requestByResponse.entries()) {
19
+ responseByRequest.set(value, key);
20
+ }
21
+ //# sourceMappingURL=commandRelations.js.map
package/dist/obis-observer/constants/commandRelations.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"commandRelations.js","sourceRoot":"","sources":["../../../src/obis-observer/constants/commandRelations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,gBAAgB,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,cAAc,MAAM,6BAA6B,CAAC;AAG9D,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAC;AAC3C,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAC;AAG3C,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,2BAA2B,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;AACxG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,yBAAyB,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;AACpG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,wBAAwB,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;AAClG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,6BAA6B,EAAE,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;AAC5G,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,wBAAwB,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;AAClG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,2BAA2B,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;AACxG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;AAC5F,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;AACxF,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAC9E,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,8BAA8B,EAAE,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;AAC9G,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,yBAAyB,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;AACpG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;AAC5F,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;AAG1F,KAAM,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,iBAAiB,CAAC,OAAO,EAAE,EAAG;IACtD,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;CACrC"}
package/dist/obis-observer/constants/shortNames.d.ts ADDED
@@ -0,0 +1,34 @@
1
+ declare const _default: ({
2
+ shortName: number;
3
+ obisCode: string;
4
+ isStatic: boolean;
5
+ isGeneral: boolean;
6
+ description: string;
7
+ isInstantaneous?: undefined;
8
+ isAbstract?: undefined;
9
+ } | {
10
+ shortName: number;
11
+ obisCode: string;
12
+ isStatic: boolean;
13
+ isInstantaneous: boolean;
14
+ description: string;
15
+ isGeneral?: undefined;
16
+ isAbstract?: undefined;
17
+ } | {
18
+ shortName: number;
19
+ obisCode: string;
20
+ isStatic: boolean;
21
+ isAbstract: boolean;
22
+ description: string;
23
+ isGeneral?: undefined;
24
+ isInstantaneous?: undefined;
25
+ } | {
26
+ shortName: number;
27
+ obisCode: string;
28
+ isStatic: boolean;
29
+ description: string;
30
+ isGeneral?: undefined;
31
+ isInstantaneous?: undefined;
32
+ isAbstract?: undefined;
33
+ })[];
34
+ export default _default;
package/dist/obis-observer/constants/shortNames.js ADDED
@@ -0,0 +1,228 @@
1
+ export default [
2
+ { shortName: 1, obisCode: '1.4.0', isStatic: true, isGeneral: true, description: 'active power+ (QI+QIV), current avg. 1' },
3
+ { shortName: 2, obisCode: '1.5.0', isStatic: true, isGeneral: true, description: 'active power+ (QI+QIV), average' },
4
+ { shortName: 3, obisCode: '1.6.0', isStatic: true, isGeneral: true, description: 'active power+ (QI+QIV), maximum, total' },
5
+ { shortName: 4, obisCode: '1.6.1', isStatic: true, isGeneral: true, description: 'active power+ (QI+QIV), maximum, tariff T1' },
6
+ { shortName: 5, obisCode: '1.6.2', isStatic: true, isGeneral: true, description: 'active power+ (QI+QIV), maximum, tariff T2' },
7
+ { shortName: 6, obisCode: '1.6.3', isStatic: true, isGeneral: true, description: 'active power+ (QI+QIV), maximum, tariff T3' },
8
+ { shortName: 7, obisCode: '1.6.4', isStatic: true, isGeneral: true, description: 'active power+ (QI+QIV), maximum, tariff T4' },
9
+ { shortName: 8, obisCode: '1.8.0', isStatic: true, isGeneral: true, description: 'active power+ (QI+QIV), total' },
10
+ { shortName: 9, obisCode: '1.8.1', isStatic: true, isGeneral: true, description: 'active power+ (QI+QIV), tariff T1' },
11
+ { shortName: 10, obisCode: '1.8.2', isStatic: true, isGeneral: true, description: 'active power+ (QI+QIV), tariff T2' },
12
+ { shortName: 11, obisCode: '1.8.3', isStatic: true, isGeneral: true, description: 'active power+ (QI+QIV), tariff T3' },
13
+ { shortName: 12, obisCode: '1.8.4', isStatic: true, isGeneral: true, description: 'active power+ (QI+QIV), tariff T4' },
14
+ { shortName: 13, obisCode: '2.4.0', isStatic: true, isGeneral: true, description: 'active power- (QII+QIII), current avg. 1' },
15
+ { shortName: 14, obisCode: '2.5.0', isStatic: true, isGeneral: true, description: 'active power- (QII+QIII), average' },
16
+ { shortName: 15, obisCode: '2.6.0', isStatic: true, isGeneral: true, description: 'active power- (QII+QIII), maximum, total' },
17
+ { shortName: 16, obisCode: '2.6.1', isStatic: true, isGeneral: true, description: 'active power- (QII+QIII), maximum, tariff T1' },
18
+ { shortName: 17, obisCode: '2.6.2', isStatic: true, isGeneral: true, description: 'active power- (QII+QIII), maximum, tariff T2' },
19
+ { shortName: 18, obisCode: '2.6.3', isStatic: true, isGeneral: true, description: 'active power- (QII+QIII), maximum, tariff T3' },
20
+ { shortName: 19, obisCode: '2.6.4', isStatic: true, isGeneral: true, description: 'active power- (QII+QIII), maximum, tariff T4' },
21
+ { shortName: 20, obisCode: '2.8.0', isStatic: true, isGeneral: true, description: 'active power- (QII+QIII), total' },
22
+ { shortName: 21, obisCode: '2.8.1', isStatic: true, isGeneral: true, description: 'active power- (QII+QIII), tariff T1' },
23
+ { shortName: 22, obisCode: '2.8.2', isStatic: true, isGeneral: true, description: 'active power- (QII+QIII), tariff T2' },
24
+ { shortName: 23, obisCode: '2.8.3', isStatic: true, isGeneral: true, description: 'active power- (QII+QIII), tariff T3' },
25
+ { shortName: 24, obisCode: '2.8.4', isStatic: true, isGeneral: true, description: 'active power- (QII+QIII), tariff T4' },
26
+ { shortName: 25, obisCode: '3.4.0', isStatic: true, isGeneral: true, description: 'reactive power+ (QI+QII), current avg. 1' },
27
+ { shortName: 26, obisCode: '3.5.0', isStatic: true, isGeneral: true, description: 'reactive power+ (QI+QII), average' },
28
+ { shortName: 27, obisCode: '3.6.0', isStatic: true, isGeneral: true, description: 'reactive power+ (QI+QII), maximum, total' },
29
+ { shortName: 28, obisCode: '3.6.1', isStatic: true, isGeneral: true, description: 'reactive power+ (QI+QII), maximum, tariff T1' },
30
+ { shortName: 39, obisCode: '3.6.2', isStatic: true, isGeneral: true, description: 'reactive power+ (QI+QII), maximum, tariff T2' },
31
+ { shortName: 30, obisCode: '3.6.3', isStatic: true, isGeneral: true, description: 'reactive power+ (QI+QII), maximum, tariff T3' },
32
+ { shortName: 31, obisCode: '3.6.4', isStatic: true, isGeneral: true, description: 'reactive power+ (QI+QII), maximum, tariff T4' },
33
+ { shortName: 32, obisCode: '3.8.0', isStatic: true, isGeneral: true, description: 'reactive power+ (QI+QII), total' },
34
+ { shortName: 33, obisCode: '3.8.1', isStatic: true, isGeneral: true, description: 'reactive power+ (QI+QII), tariff T1' },
35
+ { shortName: 34, obisCode: '3.8.2', isStatic: true, isGeneral: true, description: 'reactive power+ (QI+QII), tariff T2' },
36
+ { shortName: 35, obisCode: '3.8.3', isStatic: true, isGeneral: true, description: 'reactive power+ (QI+QII), tariff T3' },
37
+ { shortName: 36, obisCode: '3.8.4', isStatic: true, isGeneral: true, description: 'reactive power+ (QI+QII), tariff T4' },
38
+ { shortName: 37, obisCode: '4.4.0', isStatic: true, isGeneral: true, description: 'reactive power- (QIII+QIV), current avg. 1' },
39
+ { shortName: 38, obisCode: '4.5.0', isStatic: true, isGeneral: true, description: 'reactive power- (QIII+QIV), average' },
40
+ { shortName: 39, obisCode: '4.6.0', isStatic: true, isGeneral: true, description: 'reactive power- (QIII+QIV), maximum, total' },
41
+ { shortName: 40, obisCode: '4.6.1', isStatic: true, isGeneral: true, description: 'reactive power- (QIII+QIV), maximum, tariff T1' },
42
+ { shortName: 41, obisCode: '4.6.2', isStatic: true, isGeneral: true, description: 'reactive power- (QIII+QIV), maximum, tariff T2' },
43
+ { shortName: 42, obisCode: '4.6.3', isStatic: true, isGeneral: true, description: 'reactive power- (QIII+QIV), maximum, tariff T3' },
44
+ { shortName: 43, obisCode: '4.6.4', isStatic: true, isGeneral: true, description: 'reactive power- (QIII+QIV), maximum, tariff T4' },
45
+ { shortName: 44, obisCode: '4.8.0', isStatic: true, isGeneral: true, description: 'reactive power- (QIII+QIV), total' },
46
+ { shortName: 45, obisCode: '4.8.1', isStatic: true, isGeneral: true, description: 'reactive power- (QIII+QIV), tariff T1' },
47
+ { shortName: 46, obisCode: '4.8.2', isStatic: true, isGeneral: true, description: 'reactive power- (QIII+QIV), tariff T2' },
48
+ { shortName: 47, obisCode: '4.8.3', isStatic: true, isGeneral: true, description: 'reactive power- (QIII+QIV), tariff T3' },
49
+ { shortName: 48, obisCode: '4.8.4', isStatic: true, isGeneral: true, description: 'reactive power- (QIII+QIV), tariff T4' },
50
+ { shortName: 49, obisCode: '5.4.0', isStatic: true, isGeneral: true, description: 'reactive power QI, current avg. 1' },
51
+ { shortName: 50, obisCode: '5.5.0', isStatic: true, isGeneral: true, description: 'reactive power QI, average' },
52
+ { shortName: 51, obisCode: '5.6.0', isStatic: true, isGeneral: true, description: 'reactive power QI, maximum, total' },
53
+ { shortName: 52, obisCode: '5.6.1', isStatic: true, isGeneral: true, description: 'reactive power QI, maximum, tariff T1' },
54
+ { shortName: 53, obisCode: '5.6.2', isStatic: true, isGeneral: true, description: 'reactive power QI, maximum, tariff T2' },
55
+ { shortName: 54, obisCode: '5.6.3', isStatic: true, isGeneral: true, description: 'reactive power QI, maximum, tariff T3' },
56
+ { shortName: 55, obisCode: '5.6.4', isStatic: true, isGeneral: true, description: 'reactive power QI, maximum, tariff T4' },
57
+ { shortName: 56, obisCode: '5.8.0', isStatic: true, isGeneral: true, description: 'reactive power QI, total' },
58
+ { shortName: 57, obisCode: '5.8.1', isStatic: true, isGeneral: true, description: 'reactive power QI, tariff T1' },
59
+ { shortName: 58, obisCode: '5.8.2', isStatic: true, isGeneral: true, description: 'reactive power QI, tariff T2' },
60
+ { shortName: 59, obisCode: '5.8.3', isStatic: true, isGeneral: true, description: 'reactive power QI, tariff T3' },
61
+ { shortName: 60, obisCode: '5.8.4', isStatic: true, isGeneral: true, description: 'reactive power QI, tariff T4' },
62
+ { shortName: 61, obisCode: '6.4.0', isStatic: true, isGeneral: true, description: 'reactive power QII, current avg. 1' },
63
+ { shortName: 62, obisCode: '6.5.0', isStatic: true, isGeneral: true, description: 'reactive power QII, average' },
64
+ { shortName: 63, obisCode: '6.6.0', isStatic: true, isGeneral: true, description: 'reactive power QII, maximum, total' },
65
+ { shortName: 64, obisCode: '6.6.1', isStatic: true, isGeneral: true, description: 'reactive power QII, maximum, tariff T1' },
66
+ { shortName: 65, obisCode: '6.6.2', isStatic: true, isGeneral: true, description: 'reactive power QII, maximum, tariff T2' },
67
+ { shortName: 66, obisCode: '6.6.3', isStatic: true, isGeneral: true, description: 'reactive power QII, maximum, tariff T3' },
68
+ { shortName: 67, obisCode: '6.6.4', isStatic: true, isGeneral: true, description: 'reactive power QII, maximum, tariff T4' },
69
+ { shortName: 68, obisCode: '6.8.0', isStatic: true, isGeneral: true, description: 'reactive power QII, total' },
70
+ { shortName: 69, obisCode: '6.8.1', isStatic: true, isGeneral: true, description: 'reactive power QII, tariff T1' },
71
+ { shortName: 70, obisCode: '6.8.2', isStatic: true, isGeneral: true, description: 'reactive power QII, tariff T2' },
72
+ { shortName: 71, obisCode: '6.8.3', isStatic: true, isGeneral: true, description: 'reactive power QII, tariff T3' },
73
+ { shortName: 72, obisCode: '6.8.4', isStatic: true, isGeneral: true, description: 'reactive power QII, tariff T4' },
74
+ { shortName: 73, obisCode: '7.4.0', isStatic: true, isGeneral: true, description: 'reactive power QIII, current avg. 1' },
75
+ { shortName: 74, obisCode: '7.5.0', isStatic: true, isGeneral: true, description: 'reactive power QIII, average' },
76
+ { shortName: 75, obisCode: '7.6.0', isStatic: true, isGeneral: true, description: 'reactive power QIII, maximum, total' },
77
+ { shortName: 76, obisCode: '7.6.1', isStatic: true, isGeneral: true, description: 'reactive power QIII, maximum, tariff T1' },
78
+ { shortName: 77, obisCode: '7.6.2', isStatic: true, isGeneral: true, description: 'reactive power QIII, maximum, tariff T2' },
79
+ { shortName: 78, obisCode: '7.6.3', isStatic: true, isGeneral: true, description: 'reactive power QIII, maximum, tariff T3' },
80
+ { shortName: 79, obisCode: '7.6.4', isStatic: true, isGeneral: true, description: 'reactive power QIII, maximum, tariff T4' },
81
+ { shortName: 80, obisCode: '7.8.0', isStatic: true, isGeneral: true, description: 'reactive power QIII, total' },
82
+ { shortName: 81, obisCode: '7.8.1', isStatic: true, isGeneral: true, description: 'reactive power QIII, tariff T1' },
83
+ { shortName: 82, obisCode: '7.8.2', isStatic: true, isGeneral: true, description: 'reactive power QIII, tariff T2' },
84
+ { shortName: 83, obisCode: '7.8.3', isStatic: true, isGeneral: true, description: 'reactive power QIII, tariff T3' },
85
+ { shortName: 84, obisCode: '7.8.4', isStatic: true, isGeneral: true, description: 'reactive power QIII, tariff T4' },
86
+ { shortName: 85, obisCode: '8.4.0', isStatic: true, isGeneral: true, description: 'reactive power QIV, current avg. 1' },
87
+ { shortName: 86, obisCode: '8.5.0', isStatic: true, isGeneral: true, description: 'reactive power QIV, average' },
88
+ { shortName: 87, obisCode: '8.6.0', isStatic: true, isGeneral: true, description: 'reactive power QIV, maximum, total' },
89
+ { shortName: 88, obisCode: '8.6.1', isStatic: true, isGeneral: true, description: 'reactive power QIV, maximum, tariff T1' },
90
+ { shortName: 89, obisCode: '8.6.2', isStatic: true, isGeneral: true, description: 'reactive power QIV, maximum, tariff T2' },
91
+ { shortName: 90, obisCode: '8.6.3', isStatic: true, isGeneral: true, description: 'reactive power QIV, maximum, tariff T3' },
92
+ { shortName: 91, obisCode: '8.6.4', isStatic: true, isGeneral: true, description: 'reactive power QIV, maximum, tariff T4' },
93
+ { shortName: 92, obisCode: '8.8.0', isStatic: true, isGeneral: true, description: 'reactive power QIV, total' },
94
+ { shortName: 93, obisCode: '8.8.1', isStatic: true, isGeneral: true, description: 'reactive power QIV, tariff T1' },
95
+ { shortName: 94, obisCode: '8.8.2', isStatic: true, isGeneral: true, description: 'reactive power QIV, tariff T2' },
96
+ { shortName: 95, obisCode: '8.8.3', isStatic: true, isGeneral: true, description: 'reactive power QIV, tariff T3' },
97
+ { shortName: 96, obisCode: '8.8.4', isStatic: true, isGeneral: true, description: 'reactive power QIV, tariff T4' },
98
+ { shortName: 97, obisCode: '9.5.0', isStatic: true, isGeneral: true, description: 'apparent power+ (QI+QIV), average' },
99
+ { shortName: 98, obisCode: '9.8.0', isStatic: true, isGeneral: true, description: 'apparent power+ (QI+QIV), total' },
100
+ { shortName: 99, obisCode: '10.5.0', isStatic: true, isGeneral: true, description: 'apparent power- (QII+QIII), average' },
101
+ { shortName: 100, obisCode: '10.8.0', isStatic: true, isGeneral: true, description: 'apparent power- (QII+QIII), total' },
102
+ { shortName: 101, obisCode: '15.4.0', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)+(abs(QII+QIII)), current avg. 1' },
103
+ { shortName: 102, obisCode: '15.5.0', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)+(abs(QII+QIII)), average' },
104
+ { shortName: 103, obisCode: '15.6.0', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)+(abs(QII+QIII)), maximum, total' },
105
+ { shortName: 104, obisCode: '15.6.1', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)+(abs(QII+QIII)), maximum, tariff T1' },
106
+ { shortName: 105, obisCode: '15.6.2', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)+(abs(QII+QIII)), maximum, tariff T2' },
107
+ { shortName: 106, obisCode: '15.6.3', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)+(abs(QII+QIII)), maximum, tariff T3' },
108
+ { shortName: 107, obisCode: '15.6.4', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)+(abs(QII+QIII)), maximum, tariff T4' },
109
+ { shortName: 108, obisCode: '15.8.0', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)+(abs(QII+QIII)), total' },
110
+ { shortName: 109, obisCode: '15.8.1', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)+(abs(QII+QIII)), tariff T1' },
111
+ { shortName: 110, obisCode: '15.8.2', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)+(abs(QII+QIII)), tariff T2' },
112
+ { shortName: 111, obisCode: '15.8.3', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)+(abs(QII+QIII)), tariff T3' },
113
+ { shortName: 112, obisCode: '15.8.4', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)+(abs(QII+QIII)), tariff T4' },
114
+ { shortName: 113, obisCode: '16.4.0', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)-abs(QII+QIII)), current avg. 1' },
115
+ { shortName: 114, obisCode: '16.5.0', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)-abs(QII+QIII)), average' },
116
+ { shortName: 115, obisCode: '16.6.0', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)-abs(QII+QIII)), maximum, total' },
117
+ { shortName: 116, obisCode: '16.6.1', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)-abs(QII+QIII)), maximum, tariff T1' },
118
+ { shortName: 117, obisCode: '16.6.2', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)-abs(QII+QIII)), maximum, tariff T2' },
119
+ { shortName: 118, obisCode: '16.6.3', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)-abs(QII+QIII)), maximum, tariff T3' },
120
+ { shortName: 119, obisCode: '16.6.4', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)-abs(QII+QIII)), maximum, tariff T4' },
121
+ { shortName: 120, obisCode: '16.8.0', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)-abs(QII+QIII)), total' },
122
+ { shortName: 121, obisCode: '16.8.1', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)-abs(QII+QIII)), tariff T1' },
123
+ { shortName: 122, obisCode: '16.8.2', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)-abs(QII+QIII)), tariff T2' },
124
+ { shortName: 123, obisCode: '16.8.3', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)-abs(QII+QIII)), tariff T3' },
125
+ { shortName: 124, obisCode: '16.8.4', isStatic: true, isGeneral: true, description: 'active power (abs(QI+QIV)-abs(QII+QIII)), tariff T4' },
126
+ { shortName: 125, obisCode: '11.5.0', isStatic: true, isGeneral: true, description: 'current phase L1 average' },
127
+ { shortName: 126, obisCode: '31.5.0', isStatic: true, isGeneral: true, description: 'current phase L1 average' },
128
+ { shortName: 127, obisCode: '51.5.0', isStatic: true, isGeneral: true, description: 'current phase L2 average' },
129
+ { shortName: 128, obisCode: '71.5.0', isStatic: true, isGeneral: true, description: 'current phase L3 average' },
130
+ { shortName: 129, obisCode: '91.5.0', isStatic: true, isGeneral: true, description: 'current neutral average' },
131
+ { shortName: 130, obisCode: '12.5.0', isStatic: true, isGeneral: true, description: 'voltage average' },
132
+ { shortName: 131, obisCode: '32.5.0', isStatic: true, isGeneral: true, description: 'voltage phase L1 average' },
133
+ { shortName: 132, obisCode: '52.5.0', isStatic: true, isGeneral: true, description: 'voltage phase L2 average' },
134
+ { shortName: 133, obisCode: '72.5.0', isStatic: true, isGeneral: true, description: 'voltage phase L3 average' },
135
+ { shortName: 134, obisCode: '1.7.0', isStatic: true, isInstantaneous: true, description: 'active power+ (QI+QIV)' },
136
+ { shortName: 135, obisCode: '21.7.0', isStatic: true, isInstantaneous: true, description: 'active power+ (QI+QIV), L1' },
137
+ { shortName: 136, obisCode: '41.7.0', isStatic: true, isInstantaneous: true, description: 'active power+ (QI+QIV), L2' },
138
+ { shortName: 137, obisCode: '61.7.0', isStatic: true, isInstantaneous: true, description: 'active power+ (QI+QIV), L3' },
139
+ { shortName: 138, obisCode: '2.7.0', isStatic: true, isInstantaneous: true, description: 'active power- (QII+QIII)' },
140
+ { shortName: 139, obisCode: '22.7.0', isStatic: true, isInstantaneous: true, description: 'active power- (QII+QIII), L1' },
141
+ { shortName: 140, obisCode: '42.7.0', isStatic: true, isInstantaneous: true, description: 'active power- (QII+QIII), L2' },
142
+ { shortName: 141, obisCode: '62.7.0', isStatic: true, isInstantaneous: true, description: 'active power- (QII+QIII), L3' },
143
+ { shortName: 142, obisCode: '3.7.0', isStatic: true, isInstantaneous: true, description: 'reactive power+ (QI+QII)' },
144
+ { shortName: 143, obisCode: '23.7.0', isStatic: true, isInstantaneous: true, description: 'reactive power+ (QI+QII), L1' },
145
+ { shortName: 144, obisCode: '43.7.0', isStatic: true, isInstantaneous: true, description: 'reactive power+ (QI+QII), L2' },
146
+ { shortName: 145, obisCode: '63.7.0', isStatic: true, isInstantaneous: true, description: 'reactive power+ (QI+QII), L3' },
147
+ { shortName: 146, obisCode: '4.7.0', isStatic: true, isInstantaneous: true, description: 'reactive power- (QIII+QIV)' },
148
+ { shortName: 147, obisCode: '24.7.0', isStatic: true, isInstantaneous: true, description: 'reactive power- (QIII+QIV), L1' },
149
+ { shortName: 148, obisCode: '44.7.0', isStatic: true, isInstantaneous: true, description: 'reactive power- (QIII+QIV), L2' },
150
+ { shortName: 149, obisCode: '64.7.0', isStatic: true, isInstantaneous: true, description: 'reactive power- (QIII+QIV), L3' },
151
+ { shortName: 150, obisCode: '11.7.0', isStatic: true, isInstantaneous: true, description: 'current' },
152
+ { shortName: 151, obisCode: '31.7.0', isStatic: true, isInstantaneous: true, description: 'current, L1' },
153
+ { shortName: 152, obisCode: '51.7.0', isStatic: true, isInstantaneous: true, description: 'current, L2' },
154
+ { shortName: 153, obisCode: '71.7.0', isStatic: true, isInstantaneous: true, description: 'current, L3' },
155
+ { shortName: 154, obisCode: '12.7.0', isStatic: true, isInstantaneous: true, description: 'voltage' },
156
+ { shortName: 155, obisCode: '32.7.0', isStatic: true, isInstantaneous: true, description: 'voltage, L1' },
157
+ { shortName: 156, obisCode: '52.7.0', isStatic: true, isInstantaneous: true, description: 'voltage, L2' },
158
+ { shortName: 157, obisCode: '72.7.0', isStatic: true, isInstantaneous: true, description: 'voltage, L3' },
159
+ { shortName: 158, obisCode: '13.7.0', isStatic: true, isInstantaneous: true, description: 'sum Li Power factor' },
160
+ { shortName: 159, obisCode: '33.7.0', isStatic: true, isInstantaneous: true, description: 'power factor, L1' },
161
+ { shortName: 160, obisCode: '53.7.0', isStatic: true, isInstantaneous: true, description: 'power factor, L2' },
162
+ { shortName: 161, obisCode: '73.7.0', isStatic: true, isInstantaneous: true, description: 'power factor, L3' },
163
+ { shortName: 162, obisCode: '14.7.0', isStatic: true, isInstantaneous: true, description: 'sum supply frequency' },
164
+ { shortName: 163, obisCode: '34.7.0', isStatic: true, isInstantaneous: true, description: 'supply frequency, L1' },
165
+ { shortName: 164, obisCode: '54.7.0', isStatic: true, isInstantaneous: true, description: 'supply frequency, L2' },
166
+ { shortName: 165, obisCode: '74.7.0', isStatic: true, isInstantaneous: true, description: 'supply frequency, L3' },
167
+ { shortName: 166, obisCode: '15.7.0', isStatic: true, isInstantaneous: true, description: 'active power (abs(QI+QIV)+(abs(QII+QIII))' },
168
+ { shortName: 167, obisCode: '35.7.0', isStatic: true, isInstantaneous: true, description: 'active power (abs(QI+QIV)+(abs(QII+QIII)), L1' },
169
+ { shortName: 168, obisCode: '55.7.0', isStatic: true, isInstantaneous: true, description: 'active power (abs(QI+QIV)+(abs(QII+QIII)), L2' },
170
+ { shortName: 169, obisCode: '75.7.0', isStatic: true, isInstantaneous: true, description: 'active power (abs(QI+QIV)+(abs(QII+QIII)), L3' },
171
+ { shortName: 170, obisCode: '16.7.0', isStatic: true, isInstantaneous: true, description: 'active power (abs(QI+QIV)-abs(QII+QIII))' },
172
+ { shortName: 171, obisCode: '36.7.0', isStatic: true, isInstantaneous: true, description: 'active power (abs(QI+QIV)-abs(QII+QIII)), L1' },
173
+ { shortName: 172, obisCode: '56.7.0', isStatic: true, isInstantaneous: true, description: 'active power (abs(QI+QIV)-abs(QII+QIII)), L2' },
174
+ { shortName: 173, obisCode: '76.7.0', isStatic: true, isInstantaneous: true, description: 'active power (abs(QI+QIV)-abs(QII+QIII)), L3' },
175
+ { shortName: 174, obisCode: '17.7.0', isStatic: true, isInstantaneous: true, description: 'active power QI' },
176
+ { shortName: 175, obisCode: '37.7.0', isStatic: true, isInstantaneous: true, description: 'active power QI, L1' },
177
+ { shortName: 176, obisCode: '57.7.0', isStatic: true, isInstantaneous: true, description: 'active power QI, L2' },
178
+ { shortName: 177, obisCode: '77.7.0', isStatic: true, isInstantaneous: true, description: 'active power QI, L3' },
179
+ { shortName: 178, obisCode: '18.7.0', isStatic: true, isInstantaneous: true, description: 'active power QII' },
180
+ { shortName: 179, obisCode: '38.7.0', isStatic: true, isInstantaneous: true, description: 'active power QII, L1' },
181
+ { shortName: 180, obisCode: '58.7.0', isStatic: true, isInstantaneous: true, description: 'active power QII, L2' },
182
+ { shortName: 181, obisCode: '78.7.0', isStatic: true, isInstantaneous: true, description: 'active power QII, L3' },
183
+ { shortName: 182, obisCode: '19.7.0', isStatic: true, isInstantaneous: true, description: 'active power QIII' },
184
+ { shortName: 183, obisCode: '39.7.0', isStatic: true, isInstantaneous: true, description: 'active power QIII, L1' },
185
+ { shortName: 184, obisCode: '59.7.0', isStatic: true, isInstantaneous: true, description: 'active power QIII, L2' },
186
+ { shortName: 185, obisCode: '79.7.0', isStatic: true, isInstantaneous: true, description: 'active power QIII, L3' },
187
+ { shortName: 186, obisCode: '20.7.0', isStatic: true, isInstantaneous: true, description: 'active power QIV' },
188
+ { shortName: 187, obisCode: '40.7.0', isStatic: true, isInstantaneous: true, description: 'active power QIV, L1' },
189
+ { shortName: 188, obisCode: '60.7.0', isStatic: true, isInstantaneous: true, description: 'active power QIV, L2' },
190
+ { shortName: 189, obisCode: '80.7.0', isStatic: true, isInstantaneous: true, description: 'active power QIV, L3' },
191
+ { shortName: 190, obisCode: '81.7.1', isStatic: true, isInstantaneous: true, description: 'angle of U(L2) - U(L1)' },
192
+ { shortName: 191, obisCode: '81.7.2', isStatic: true, isInstantaneous: true, description: 'angle of U(L3) - U(L2)' },
193
+ { shortName: 192, obisCode: '91.7.0', isStatic: true, isInstantaneous: true, description: 'L0 current (neutral)' },
194
+ { shortName: 193, obisCode: '0.0.0', isStatic: true, isAbstract: true, description: 'device ID' },
195
+ { shortName: 194, obisCode: '0.2.0', isStatic: true, isAbstract: true, description: 'active firmware identifier' },
196
+ { shortName: 195, obisCode: '0.2.1', isStatic: true, isAbstract: true, description: 'active firmware version' },
197
+ { shortName: 196, obisCode: '0.2.8', isStatic: true, isAbstract: true, description: 'active firmware signature' },
198
+ { shortName: 197, obisCode: '0.9.1', isStatic: true, isAbstract: true, description: 'local time' },
199
+ { shortName: 198, obisCode: '0.9.2', isStatic: true, isAbstract: true, description: 'local date' },
200
+ { shortName: 199, obisCode: 'F.F.0*255', isStatic: true, isAbstract: true, description: 'fatal error meter status' },
201
+ { shortName: 210, obisCode: 'C.5.0', isStatic: false, description: 'internal operating status, global' },
202
+ { shortName: 211, obisCode: 'C.5.1', isStatic: false, description: 'internal operating status (status word 1)' },
203
+ { shortName: 212, obisCode: 'C.5.2', isStatic: false, description: 'internal operating status (status word 2)' },
204
+ { shortName: 213, obisCode: 'C.5.3', isStatic: false, description: 'internal operating status (status word 3)' },
205
+ { shortName: 214, obisCode: 'C.5.4', isStatic: false, description: 'internal operating status (status word 4)' },
206
+ { shortName: 215, obisCode: 'C.5.5', isStatic: false, description: 'meter started status flag' },
207
+ { shortName: 216, obisCode: 'C.7.0', isStatic: false, description: 'number of power failures' },
208
+ { shortName: 217, obisCode: 'C.7.5', isStatic: false, description: 'number of long power failures' },
209
+ { shortName: 218, obisCode: 'C.10.0', isStatic: false, description: 'status information missing voltage' },
210
+ { shortName: 219, obisCode: 'C.10.1', isStatic: false, description: 'status information missing current' },
211
+ { shortName: 220, obisCode: 'C.10.2', isStatic: false, description: 'status information current without voltage' },
212
+ { shortName: 221, obisCode: 'C.10.3', isStatic: false, description: 'status information auxiliary power supply' },
213
+ { shortName: 222, obisCode: 'C.20.0', isStatic: false, description: 'meter open event counter' },
214
+ { shortName: 223, obisCode: 'C.20.1', isStatic: false, description: 'meter open event, time stamp of current event occurrence' },
215
+ { shortName: 224, obisCode: 'C.20.5', isStatic: false, description: 'terminal cover open event counter' },
216
+ { shortName: 225, obisCode: 'C.20.6', isStatic: false, description: 'terminal cover open event, time stamp of current event occurrence' },
217
+ { shortName: 226, obisCode: 'C.20.10', isStatic: false, description: 'tilt event counter' },
218
+ { shortName: 227, obisCode: 'C.20.11', isStatic: false, description: 'tilt event, time stamp of current event occurrence' },
219
+ { shortName: 228, obisCode: 'C.20.15', isStatic: false, description: 'strong DC magnetic field event counter' },
220
+ { shortName: 229, obisCode: 'C.20.16', isStatic: false, description: 'strong DC magnetic field event, time stamp of current event occurrence' },
221
+ { shortName: 230, obisCode: 'C.20.20', isStatic: false, description: 'supply control switch / valve tamper event counter' },
222
+ { shortName: 231, obisCode: 'C.20.21', isStatic: false, description: 'supply control switch / valve tamper event, time stamp of current event occurrence' },
223
+ { shortName: 232, obisCode: 'C.20.25', isStatic: false, description: 'metrology tamper event counter' },
224
+ { shortName: 233, obisCode: 'C.20.26', isStatic: false, description: 'metrology tamper event, time stamp of current event occurrence' },
225
+ { shortName: 234, obisCode: 'C.20.30', isStatic: false, description: 'communication tamper event counter' },
226
+ { shortName: 235, obisCode: 'C.20.31', isStatic: false, description: 'communication tamper event, time stamp of current event occurrence' }
227
+ ];
228
+ //# sourceMappingURL=shortNames.js.map
package/dist/obis-observer/constants/shortNames.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"shortNames.js","sourceRoot":"","sources":["../../../src/obis-observer/constants/shortNames.ts"],"names":[],"mappings":"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"}
package/dist/obis-observer/index.d.ts CHANGED
@@ -1,3 +1,4 @@
1
1
  export * as commands from './commands/index.js';
2
- export * as message from './message.js';
3
2
  export * as constants from './constants/index.js';
3
+ export * as message from './message.js';
4
+ export * as utils from './utils/index.js';
package/dist/obis-observer/index.js CHANGED
@@ -1,4 +1,5 @@
1
1
  export * as commands from './commands/index.js';
2
- export * as message from './message.js';
3
2
  export * as constants from './constants/index.js';
3
+ export * as message from './message.js';
4
+ export * as utils from './utils/index.js';
4
5
  //# sourceMappingURL=index.js.map
package/dist/obis-observer/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/obis-observer/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,SAAS,MAAM,sBAAsB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/obis-observer/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,SAAS,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC"}
package/dist/obis-observer/utils/index.d.ts ADDED
@@ -0,0 +1 @@
1
+ export * as obis from './obis.js';
package/dist/obis-observer/utils/index.js ADDED
@@ -0,0 +1,2 @@
1
+ export * as obis from './obis.js';
2
+ //# sourceMappingURL=index.js.map
package/dist/obis-observer/utils/index.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/obis-observer/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC"}
package/dist/obis-observer/utils/obis.d.ts ADDED
@@ -0,0 +1,3 @@
1
+ import { IObis } from '../CommandBinaryBuffer.js';
2
+ export declare const toString: (obis: IObis) => string;
3
+ export declare const fromString: (obisString: string) => IObis;
package/dist/obis-observer/utils/obis.js ADDED
@@ -0,0 +1,68 @@
1
+ import invertObject from '../../utils/invertObject.js';
2
+ const letterCodes = {
3
+ C: 96,
4
+ F: 97,
5
+ L: 98,
6
+ P: 99
7
+ };
8
+ const codeLetters = invertObject(letterCodes);
9
+ export const toString = (obis) => {
10
+ if (!obis || typeof obis !== 'object' || Object.keys(obis).length === 0) {
11
+ throw new Error('Must be an object with properties.');
12
+ }
13
+ const { a, b, c, d, e, f } = obis;
14
+ if (c === null || c === undefined || d === null || d === undefined) {
15
+ throw new Error('Properties "c" and "d" are mandatory.');
16
+ }
17
+ let result = '';
18
+ if (a && b) {
19
+ result += `${a}-${b}:`;
20
+ }
21
+ result += `${(codeLetters[c] ?? c)}.${(codeLetters[d] ?? d)}`;
22
+ if (e && f) {
23
+ result += `.${e}*${f}`;
24
+ }
25
+ else if (e) {
26
+ result += `.${e}`;
27
+ }
28
+ return result;
29
+ };
30
+ export const fromString = (obisString) => {
31
+ const result = {};
32
+ let unprocessed = obisString;
33
+ let parts;
34
+ parts = unprocessed.split('-');
35
+ if (parts.length > 1) {
36
+ [result.a, unprocessed] = parts;
37
+ }
38
+ parts = unprocessed.split(':');
39
+ if (parts.length > 1) {
40
+ [result.b, unprocessed] = parts;
41
+ }
42
+ parts = unprocessed.split('*');
43
+ if (parts.length > 1) {
44
+ [unprocessed, result.f] = parts;
45
+ }
46
+ parts = unprocessed.split('.');
47
+ if (parts.length > 1) {
48
+ [result.c, result.d, result.e] = parts;
49
+ }
50
+ Object.keys(result).forEach(groupName => {
51
+ const groupValue = result[groupName];
52
+ if (groupValue) {
53
+ const intValue = parseInt(letterCodes[groupValue] || groupValue, 10);
54
+ if (intValue < 0 || intValue > 255) {
55
+ throw new Error(`Value for group "${groupName}" should be in range [0..255].`);
56
+ }
57
+ result[groupName] = intValue;
58
+ }
59
+ else {
60
+ throw new Error(`Value for group "${groupName}" can't be empty.`);
61
+ }
62
+ });
63
+ if (!('c' in result && 'd' in result)) {
64
+ throw new Error('Properties "c" and "d" are mandatory.');
65
+ }
66
+ return result;
67
+ };
68
+ //# sourceMappingURL=obis.js.map
package/dist/obis-observer/utils/obis.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"obis.js","sourceRoot":"","sources":["../../../src/obis-observer/utils/obis.ts"],"names":[],"mappings":"AACA,OAAO,YAA0B,MAAM,6BAA6B,CAAC;AAKrE,MAAM,WAAW,GAAe;IAC5B,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;CACR,CAAC;AAEF,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;AAU9C,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAE,IAAW,EAAW,EAAE;IAC9C,IAAK,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAG;QACvE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;KACzD;IAGD,MAAM,EAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAC,GAAG,IAAI,CAAC;IAEhC,IAAK,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS,EAAG;QAClE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;KAC5D;IAED,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,IAAK,CAAC,IAAI,CAAC,EAAG;QACV,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;KAC1B;IAID,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAW,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAW,EAAE,CAAC;IAElF,IAAK,CAAC,IAAI,CAAC,EAAG;QACV,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;KAC1B;SAAM,IAAK,CAAC,EAAG;QACZ,MAAM,IAAI,IAAI,CAAC,EAAE,CAAC;KACrB;IAED,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAQF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAE,UAAkB,EAAU,EAAE;IACtD,MAAM,MAAM,GAAe,EAAE,CAAC;IAC9B,IAAI,WAAW,GAAG,UAAU,CAAC;IAC7B,IAAI,KAAK,CAAC;IAEV,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAK,KAAK,CAAC,MAAM,GAAG,CAAC,EAAG;QACpB,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC;KACnC;IAED,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAK,KAAK,CAAC,MAAM,GAAG,CAAC,EAAG;QACpB,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC;KACnC;IAED,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAK,KAAK,CAAC,MAAM,GAAG,CAAC,EAAG;QACpB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;KACnC;IAED,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAK,KAAK,CAAC,MAAM,GAAG,CAAC,EAAG;QACpB,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;KAC1C;IAID,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QACpC,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAW,CAAC;QAE/C,IAAK,UAAU,EAAG;YACd,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAW,IAAI,UAAU,EAAE,EAAE,CAAC,CAAC;YAE/E,IAAK,QAAQ,GAAG,CAAC,IAAI,QAAQ,GAAG,GAAG,EAAG;gBAClC,MAAM,IAAI,KAAK,CAAC,oBAAoB,SAAS,gCAAgC,CAAC,CAAC;aAClF;YAED,MAAM,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC;SAChC;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,oBAAoB,SAAS,mBAAmB,CAAC,CAAC;SACrE;IACL,CAAC,CAAC,CAAC;IAEH,IAAK,CAAC,CAAC,GAAG,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,CAAC,EAAG;QACrC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;KAC5D;IAED,OAAO,MAA0B,CAAC;AACtC,CAAC,CAAC"}
package/dist/utils/invertObject.d.ts ADDED
@@ -0,0 +1,3 @@
1
+ export type THashTable = Record<string, unknown>;
2
+ declare const _default: (source: THashTable) => THashTable;
3
+ export default _default;
package/dist/utils/invertObject.js ADDED
@@ -0,0 +1,4 @@
1
+ export default (source) => Object.fromEntries(Object
2
+ .entries(source)
3
+ .map(([key, value]) => [value, key]));
4
+ //# sourceMappingURL=invertObject.js.map
package/dist/utils/invertObject.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"invertObject.js","sourceRoot":"","sources":["../../src/utils/invertObject.ts"],"names":[],"mappings":"AASA,eAAe,CAAE,MAAkB,EAAe,EAAE,CAAC,MAAM,CAAC,WAAW,CACnE,MAAM;KACD,OAAO,CAAC,MAAM,CAAC;KACf,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAC3C,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jooby-codec",
3
- "version": "2.1.0",
3
+ "version": "2.2.0",
4
4
  "description": "Jooby message encoders/decoders",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
package/readme.md CHANGED
@@ -99,6 +99,8 @@ const messageData = message.fromHex(
99
99
  It's possible to parse message with autodetect direction:
100
100
 
101
101
  ```js
102
+ // It is highly recommended to use a specific direction.
103
+ // AUTO is used here just for example.
102
104
  const messageData = message.fromHex(
103
105
  '02 01 01 18 06 0f 83 01 08 0a 0c 16 08 2f 97 0f 83 01 08 0a 0c ef',
104
106
  directions.AUTO