jooby-codec 2.0.0 → 2.1.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 (68) hide show
  1. package/dist/analog/CommandBinaryBuffer.d.ts +2 -2
  2. package/dist/analog/CommandBinaryBuffer.js +5 -5
  3. package/dist/analog/CommandBinaryBuffer.js.map +1 -1
  4. package/dist/analog/commands/downlink/GetArchiveDaysMC.d.ts +1 -1
  5. package/dist/analog/commands/downlink/GetArchiveDaysMC.js +5 -5
  6. package/dist/analog/commands/downlink/GetArchiveDaysMC.js.map +1 -1
  7. package/dist/analog/commands/downlink/GetArchiveEvents.d.ts +1 -1
  8. package/dist/analog/commands/downlink/GetArchiveEvents.js +5 -5
  9. package/dist/analog/commands/downlink/GetArchiveEvents.js.map +1 -1
  10. package/dist/analog/commands/downlink/GetArchiveHoursMC.d.ts +1 -1
  11. package/dist/analog/commands/downlink/GetArchiveHoursMC.js +5 -5
  12. package/dist/analog/commands/downlink/GetArchiveHoursMC.js.map +1 -1
  13. package/dist/analog/commands/downlink/GetExAbsArchiveDaysMC.d.ts +1 -1
  14. package/dist/analog/commands/downlink/GetExAbsArchiveDaysMC.js +5 -5
  15. package/dist/analog/commands/downlink/GetExAbsArchiveDaysMC.js.map +1 -1
  16. package/dist/analog/commands/downlink/GetExAbsArchiveHoursMC.d.ts +1 -1
  17. package/dist/analog/commands/downlink/GetExAbsArchiveHoursMC.js +5 -5
  18. package/dist/analog/commands/downlink/GetExAbsArchiveHoursMC.js.map +1 -1
  19. package/dist/analog/commands/uplink/DayMC.d.ts +1 -1
  20. package/dist/analog/commands/uplink/DayMC.js +6 -6
  21. package/dist/analog/commands/uplink/DayMC.js.map +1 -1
  22. package/dist/analog/commands/uplink/ExAbsDayMC.d.ts +1 -1
  23. package/dist/analog/commands/uplink/ExAbsDayMC.js +5 -5
  24. package/dist/analog/commands/uplink/ExAbsDayMC.js.map +1 -1
  25. package/dist/analog/commands/uplink/ExAbsHourMC.d.ts +1 -1
  26. package/dist/analog/commands/uplink/ExAbsHourMC.js +6 -6
  27. package/dist/analog/commands/uplink/ExAbsHourMC.js.map +1 -1
  28. package/dist/analog/commands/uplink/GetArchiveDaysMCResponse.d.ts +1 -1
  29. package/dist/analog/commands/uplink/GetArchiveDaysMCResponse.js +5 -5
  30. package/dist/analog/commands/uplink/GetArchiveDaysMCResponse.js.map +1 -1
  31. package/dist/analog/commands/uplink/GetArchiveEventsResponse.d.ts +1 -1
  32. package/dist/analog/commands/uplink/GetArchiveEventsResponse.js +7 -7
  33. package/dist/analog/commands/uplink/GetArchiveEventsResponse.js.map +1 -1
  34. package/dist/analog/commands/uplink/GetArchiveHoursMCResponse.d.ts +1 -1
  35. package/dist/analog/commands/uplink/GetArchiveHoursMCResponse.js +3 -3
  36. package/dist/analog/commands/uplink/GetArchiveHoursMCResponse.js.map +1 -1
  37. package/dist/analog/commands/uplink/GetExAbsArchiveDaysMCResponse.d.ts +1 -1
  38. package/dist/analog/commands/uplink/GetExAbsArchiveDaysMCResponse.js +5 -5
  39. package/dist/analog/commands/uplink/GetExAbsArchiveDaysMCResponse.js.map +1 -1
  40. package/dist/analog/commands/uplink/GetExAbsArchiveHoursMCResponse.d.ts +1 -1
  41. package/dist/analog/commands/uplink/GetExAbsArchiveHoursMCResponse.js +5 -5
  42. package/dist/analog/commands/uplink/GetExAbsArchiveHoursMCResponse.js.map +1 -1
  43. package/dist/analog/commands/uplink/HourMC.d.ts +1 -1
  44. package/dist/analog/commands/uplink/HourMC.js +5 -5
  45. package/dist/analog/commands/uplink/HourMC.js.map +1 -1
  46. package/dist/analog/commands/uplink/NewEvent.d.ts +1 -1
  47. package/dist/analog/commands/uplink/NewEvent.js +6 -6
  48. package/dist/analog/commands/uplink/NewEvent.js.map +1 -1
  49. package/dist/analog/commands/uplink/Time2000.d.ts +1 -1
  50. package/dist/analog/commands/uplink/Time2000.js +4 -4
  51. package/dist/analog/commands/uplink/Time2000.js.map +1 -1
  52. package/dist/obis-observer/commands/downlink/ReadArchive.d.ts +2 -1
  53. package/dist/obis-observer/commands/downlink/ReadArchive.js +5 -5
  54. package/dist/obis-observer/commands/downlink/ReadArchive.js.map +1 -1
  55. package/dist/obis-observer/commands/uplink/ObservationReport.d.ts +2 -1
  56. package/dist/obis-observer/commands/uplink/ObservationReport.js +5 -5
  57. package/dist/obis-observer/commands/uplink/ObservationReport.js.map +1 -1
  58. package/dist/obis-observer/commands/uplink/ObservationReportString.d.ts +2 -1
  59. package/dist/obis-observer/commands/uplink/ObservationReportString.js +5 -5
  60. package/dist/obis-observer/commands/uplink/ObservationReportString.js.map +1 -1
  61. package/dist/obis-observer/commands/uplink/ReadArchiveResponse.d.ts +2 -1
  62. package/dist/obis-observer/commands/uplink/ReadArchiveResponse.js +5 -5
  63. package/dist/obis-observer/commands/uplink/ReadArchiveResponse.js.map +1 -1
  64. package/dist/utils/time.d.ts +2 -2
  65. package/dist/utils/time.js +2 -2
  66. package/dist/utils/time.js.map +1 -1
  67. package/package.json +1 -1
  68. package/readme.md +1 -1
package/dist/obis-observer/commands/uplink/ObservationReport.js CHANGED
@@ -6,7 +6,7 @@ const examples = [
6
6
  {
7
7
  name: 'get observation report from 2023.12.23 00:00:00 GMT',
8
8
  parameters: {
9
- time: 756604800,
9
+ time2000: 756604800,
10
10
  shortNameList: [
11
11
  { code: 50, content: 34.33 },
12
12
  { code: 56, content: 45.33 }
@@ -28,23 +28,23 @@ class ObservationReport extends Command {
28
28
  static fromBytes(data) {
29
29
  const buffer = new CommandBinaryBuffer(data);
30
30
  let size = buffer.getUint8() - DATE_TIME_SIZE;
31
- const time = buffer.getUint32();
31
+ const time2000 = buffer.getUint32();
32
32
  const shortNameList = [];
33
33
  while (size > 0) {
34
34
  const shortName = buffer.getShortNameFloat();
35
35
  size -= CommandBinaryBuffer.getShortNameContentSize(shortName);
36
36
  shortNameList.push(shortName);
37
37
  }
38
- return new ObservationReport({ time, shortNameList });
38
+ return new ObservationReport({ time2000, shortNameList });
39
39
  }
40
40
  toBytes() {
41
41
  if (typeof this.size !== 'number') {
42
42
  throw new Error('unknown or invalid size');
43
43
  }
44
44
  const buffer = new CommandBinaryBuffer(this.size);
45
- const { time, shortNameList } = this.parameters;
45
+ const { time2000, shortNameList } = this.parameters;
46
46
  buffer.setUint8(this.size - 1);
47
- buffer.setUint32(time);
47
+ buffer.setUint32(time2000);
48
48
  shortNameList.forEach(shortName => buffer.setShortNameFloat(shortName));
49
49
  return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
50
50
  }
package/dist/obis-observer/commands/uplink/ObservationReport.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ObservationReport.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ObservationReport.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,cAAc,EAAkB,MAAM,8BAA8B,CAAC;AAClG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAarD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,qDAAqD;QAC3D,UAAU,EAAE;YACR,IAAI,EAAE,SAAS;YACf,aAAa,EAAE;gBACX,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;gBAC1B,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;aAC7B;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,8CAA8C,EAAC;KAC5E;CACJ,CAAC;AA0BF,MAAM,iBAAkB,SAAQ,OAAO;IACnC,YAAqB,UAAwC;QACzD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA8B;QAIzD,IAAI,IAAI,GAAG,CAAC,GAAG,cAAc,CAAC;QAE9B,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC9C,IAAI,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,IAAI,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,cAAc,CAAC;QAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAChC,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,OAAQ,IAAI,GAAG,CAAC,EAAG;YACf,MAAM,SAAS,GAAG,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAE7C,IAAI,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;YAC/D,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,iBAAiB,CAAC,EAAC,IAAI,EAAE,aAAa,EAAC,CAAC,CAAC;IACxD,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,IAAI,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAG9C,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACvB,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;QAExE,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA1Ce,oBAAE,GAAG,UAAU,CAAC;AAEhB,+BAAa,GAAG,MAAM,CAAC;AAEvB,0BAAQ,GAAG,QAAQ,CAAC;AAEpB,+BAAa,GAAG,IAAI,CAAC;AAwCzC,eAAe,iBAAiB,CAAC"}
1
+ {"version":3,"file":"ObservationReport.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ObservationReport.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,cAAc,EAAkB,MAAM,8BAA8B,CAAC;AAClG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAcrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,qDAAqD;QAC3D,UAAU,EAAE;YACR,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE;gBACX,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;gBAC1B,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;aAC7B;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,8CAA8C,EAAC;KAC5E;CACJ,CAAC;AA0BF,MAAM,iBAAkB,SAAQ,OAAO;IACnC,YAAqB,UAAwC;QACzD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA8B;QAIzD,IAAI,IAAI,GAAG,CAAC,GAAG,cAAc,CAAC;QAE9B,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC9C,IAAI,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,IAAI,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,cAAc,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,OAAQ,IAAI,GAAG,CAAC,EAAG;YACf,MAAM,SAAS,GAAG,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAE7C,IAAI,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;YAC/D,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,iBAAiB,CAAC,EAAC,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC;IAC5D,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,QAAQ,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAGlD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC3B,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;QAExE,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA1Ce,oBAAE,GAAG,UAAU,CAAC;AAEhB,+BAAa,GAAG,MAAM,CAAC;AAEvB,0BAAQ,GAAG,QAAQ,CAAC;AAEpB,+BAAa,GAAG,IAAI,CAAC;AAwCzC,eAAe,iBAAiB,CAAC"}
package/dist/obis-observer/commands/uplink/ObservationReportString.d.ts CHANGED
@@ -1,7 +1,8 @@
1
1
  import Command, { TCommandExampleList } from '../../Command.js';
2
2
  import { IShortNameString } from '../../CommandBinaryBuffer.js';
3
+ import { TTime2000 } from '../../../utils/time.js';
3
4
  interface IObservationReportStringParameters {
4
- time: number;
5
+ time2000: TTime2000;
5
6
  shortNameList: Array<IShortNameString>;
6
7
  }
7
8
  declare class ObservationReportString extends Command {
package/dist/obis-observer/commands/uplink/ObservationReportString.js CHANGED
@@ -6,7 +6,7 @@ const examples = [
6
6
  {
7
7
  name: 'get observation report from 2023.12.23 00:00:00 GMT',
8
8
  parameters: {
9
- time: 756604800,
9
+ time2000: 756604800,
10
10
  shortNameList: [
11
11
  { code: 50, content: 'reactive power QI, average' },
12
12
  { code: 56, content: 'reactive power QI, total' }
@@ -33,23 +33,23 @@ class ObservationReportString extends Command {
33
33
  static fromBytes(data) {
34
34
  const buffer = new CommandBinaryBuffer(data);
35
35
  let size = buffer.getUint8() - DATE_TIME_SIZE;
36
- const time = buffer.getUint32();
36
+ const time2000 = buffer.getUint32();
37
37
  const shortNameList = [];
38
38
  while (size > 0) {
39
39
  const shortName = buffer.getShortNameString();
40
40
  size -= CommandBinaryBuffer.getShortNameContentSize(shortName);
41
41
  shortNameList.push(shortName);
42
42
  }
43
- return new ObservationReportString({ time, shortNameList });
43
+ return new ObservationReportString({ time2000, shortNameList });
44
44
  }
45
45
  toBytes() {
46
46
  if (typeof this.size !== 'number') {
47
47
  throw new Error('unknown or invalid size');
48
48
  }
49
49
  const buffer = new CommandBinaryBuffer(this.size);
50
- const { time, shortNameList } = this.parameters;
50
+ const { time2000, shortNameList } = this.parameters;
51
51
  buffer.setUint8(this.size - 1);
52
- buffer.setUint32(time);
52
+ buffer.setUint32(time2000);
53
53
  shortNameList.forEach(shortName => buffer.setShortNameString(shortName));
54
54
  return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
55
55
  }
package/dist/obis-observer/commands/uplink/ObservationReportString.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ObservationReportString.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ObservationReportString.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAmB,cAAc,EAAC,MAAM,8BAA8B,CAAC;AACnG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAarD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,qDAAqD;QAC3D,UAAU,EAAE;YACR,IAAI,EAAE,SAAS;YACf,aAAa,EAAE;gBACX,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,4BAA4B,EAAC;gBACjD,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,0BAA0B,EAAC;aAClD;SACJ;QACD,GAAG,EAAE;YACD,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,6DAA6D;kBAC7D,oEAAoE;kBACpE,qDAAqD;SAC9D;KACJ;CACJ,CAAC;AAgCF,MAAM,uBAAwB,SAAQ,OAAO;IACzC,YAAqB,UAA8C;QAC/D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAoC;QAI/D,IAAI,IAAI,GAAG,CAAC,GAAG,cAAc,CAAC;QAE9B,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC9C,IAAI,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,IAAI,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,cAAc,CAAC;QAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAChC,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,OAAQ,IAAI,GAAG,CAAC,EAAG;YACf,MAAM,SAAS,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAE9C,IAAI,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;YAC/D,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,uBAAuB,CAAC,EAAC,IAAI,EAAE,aAAa,EAAC,CAAC,CAAC;IAC9D,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,IAAI,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAG9C,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACvB,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;QAEzE,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA1Ce,0BAAE,GAAG,UAAU,CAAC;AAEhB,qCAAa,GAAG,MAAM,CAAC;AAEvB,gCAAQ,GAAG,QAAQ,CAAC;AAEpB,qCAAa,GAAG,IAAI,CAAC;AAwCzC,eAAe,uBAAuB,CAAC"}
1
+ {"version":3,"file":"ObservationReportString.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ObservationReportString.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAmB,cAAc,EAAC,MAAM,8BAA8B,CAAC;AACnG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAcrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,qDAAqD;QAC3D,UAAU,EAAE;YACR,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE;gBACX,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,4BAA4B,EAAC;gBACjD,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,0BAA0B,EAAC;aAClD;SACJ;QACD,GAAG,EAAE;YACD,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,6DAA6D;kBAC7D,oEAAoE;kBACpE,qDAAqD;SAC9D;KACJ;CACJ,CAAC;AAgCF,MAAM,uBAAwB,SAAQ,OAAO;IACzC,YAAqB,UAA8C;QAC/D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAoC;QAI/D,IAAI,IAAI,GAAG,CAAC,GAAG,cAAc,CAAC;QAE9B,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC9C,IAAI,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,IAAI,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,cAAc,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,OAAQ,IAAI,GAAG,CAAC,EAAG;YACf,MAAM,SAAS,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAE9C,IAAI,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;YAC/D,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,uBAAuB,CAAC,EAAC,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC;IAClE,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,QAAQ,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAGlD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC3B,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;QAEzE,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA1Ce,0BAAE,GAAG,UAAU,CAAC;AAEhB,qCAAa,GAAG,MAAM,CAAC;AAEvB,gCAAQ,GAAG,QAAQ,CAAC;AAEpB,qCAAa,GAAG,IAAI,CAAC;AAwCzC,eAAe,uBAAuB,CAAC"}
package/dist/obis-observer/commands/uplink/ReadArchiveResponse.d.ts CHANGED
@@ -1,7 +1,8 @@
1
1
  import Command, { TCommandExampleList } from '../../Command.js';
2
2
  import { ICommandParameters, IShortNameFloat } from '../../CommandBinaryBuffer.js';
3
+ import { TTime2000 } from '../../../utils/time.js';
3
4
  interface IReadArchiveResponseParameters extends ICommandParameters {
4
- time: number;
5
+ time2000: TTime2000;
5
6
  shortNameList: Array<IShortNameFloat>;
6
7
  }
7
8
  declare class ReadArchiveResponse extends Command {
package/dist/obis-observer/commands/uplink/ReadArchiveResponse.js CHANGED
@@ -8,7 +8,7 @@ const examples = [
8
8
  name: 'summary archive from 2023-12-23 04:00:00 GMT',
9
9
  parameters: {
10
10
  requestId: 34,
11
- time: 756619200,
11
+ time2000: 756619200,
12
12
  shortNameList: [
13
13
  { code: 50, content: 22.27 },
14
14
  { code: 56, content: 89.33 }
@@ -31,24 +31,24 @@ class ReadArchiveResponse extends Command {
31
31
  const buffer = new CommandBinaryBuffer(data);
32
32
  let size = buffer.getUint8() - COMMAND_HEADER_SIZE;
33
33
  const requestId = buffer.getUint8();
34
- const time = buffer.getUint32();
34
+ const time2000 = buffer.getUint32();
35
35
  const shortNameList = [];
36
36
  while (size) {
37
37
  const shortName = buffer.getShortNameFloat();
38
38
  size -= CommandBinaryBuffer.getShortNameContentSize(shortName);
39
39
  shortNameList.push(shortName);
40
40
  }
41
- return new ReadArchiveResponse({ requestId, time, shortNameList });
41
+ return new ReadArchiveResponse({ requestId, time2000, shortNameList });
42
42
  }
43
43
  toBytes() {
44
44
  if (typeof this.size !== 'number') {
45
45
  throw new Error('unknown or invalid size');
46
46
  }
47
47
  const buffer = new CommandBinaryBuffer(this.size);
48
- const { requestId, time, shortNameList } = this.parameters;
48
+ const { requestId, time2000, shortNameList } = this.parameters;
49
49
  buffer.setUint8(this.size - 1);
50
50
  buffer.setUint8(requestId);
51
- buffer.setUint32(time);
51
+ buffer.setUint32(time2000);
52
52
  shortNameList.forEach(shortName => buffer.setShortNameFloat(shortName));
53
53
  return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
54
54
  }
package/dist/obis-observer/commands/uplink/ReadArchiveResponse.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ReadArchiveResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ReadArchiveResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAuC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AACvI,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAWrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,mBAAmB,GAAG,eAAe,GAAG,cAAc,CAAC;AAE7D,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,8CAA8C;QACpD,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;YACb,IAAI,EAAE,SAAS;YACf,aAAa,EAAE;gBACX,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;gBAC1B,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;aAC7B;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,iDAAiD,EAAC;KAC/E;CACJ,CAAC;AA8BF,MAAM,mBAAoB,SAAQ,OAAO;IACrC,YAAqB,UAA0C;QAC3D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAgC;QAI3D,IAAI,IAAI,GAAG,CAAC,GAAG,mBAAmB,CAAC;QAGnC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC9C,IAAI,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,IAAI,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,mBAAmB,CAAC;QACnD,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAChC,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,OAAQ,IAAI,EAAG;YACX,MAAM,SAAS,GAAG,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAE7C,IAAI,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;YAC/D,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,mBAAmB,CAAC,EAAC,SAAS,EAAE,IAAI,EAAE,aAAa,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,IAAI,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAGzD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACvB,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;QAExE,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA5Ce,sBAAE,GAAG,UAAU,CAAC;AAEhB,iCAAa,GAAG,MAAM,CAAC;AAEvB,4BAAQ,GAAG,QAAQ,CAAC;AAEpB,iCAAa,GAAG,IAAI,CAAC;AA0CzC,eAAe,mBAAmB,CAAC"}
1
+ {"version":3,"file":"ReadArchiveResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ReadArchiveResponse.ts"],"names":[],"mappings":"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"}
package/dist/utils/time.d.ts CHANGED
@@ -2,6 +2,6 @@ type BrandType<K, T> = K & {
2
2
  info?: T;
3
3
  };
4
4
  export type TTime2000 = BrandType<number, 'seconds'>;
5
- export declare const getDateFromSeconds: (time: TTime2000) => Date;
6
- export declare const getSecondsFromDate: (date: Date) => TTime2000;
5
+ export declare const getDateFromTime2000: (time2000: TTime2000) => Date;
6
+ export declare const getTime2000FromDate: (date: Date) => TTime2000;
7
7
  export {};
package/dist/utils/time.js CHANGED
@@ -1,5 +1,5 @@
1
1
  const INITIAL_YEAR_TIMESTAMP = 946684800000;
2
2
  const MILLISECONDS_IN_SECONDS = 1000;
3
- export const getDateFromSeconds = (time) => new Date(INITIAL_YEAR_TIMESTAMP + (time * MILLISECONDS_IN_SECONDS));
4
- export const getSecondsFromDate = (date) => (date.getTime() - INITIAL_YEAR_TIMESTAMP) / MILLISECONDS_IN_SECONDS;
3
+ export const getDateFromTime2000 = (time2000) => new Date(INITIAL_YEAR_TIMESTAMP + (time2000 * MILLISECONDS_IN_SECONDS));
4
+ export const getTime2000FromDate = (date) => (date.getTime() - INITIAL_YEAR_TIMESTAMP) / MILLISECONDS_IN_SECONDS;
5
5
  //# sourceMappingURL=time.js.map
package/dist/utils/time.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"time.js","sourceRoot":"","sources":["../../src/utils/time.ts"],"names":[],"mappings":"AAiBA,MAAM,sBAAsB,GAAG,YAAY,CAAC;AAC5C,MAAM,uBAAuB,GAAG,IAAI,CAAC;AASrC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAE,IAAe,EAAS,EAAE,CAAC,IAAI,IAAI,CAAC,sBAAsB,GAAG,CAAC,IAAI,GAAG,uBAAuB,CAAC,CAAC,CAAC;AAQnI,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAE,IAAU,EAAc,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,sBAAsB,CAAC,GAAG,uBAAuB,CAAC"}
1
+ {"version":3,"file":"time.js","sourceRoot":"","sources":["../../src/utils/time.ts"],"names":[],"mappings":"AAiBA,MAAM,sBAAsB,GAAG,YAAY,CAAC;AAC5C,MAAM,uBAAuB,GAAG,IAAI,CAAC;AASrC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAE,QAAmB,EAAS,EAAE,CAAC,IAAI,IAAI,CAAC,sBAAsB,GAAG,CAAC,QAAQ,GAAG,uBAAuB,CAAC,CAAC,CAAC;AAQ5I,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAE,IAAU,EAAc,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,sBAAsB,CAAC,GAAG,uBAAuB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jooby-codec",
3
- "version": "2.0.0",
3
+ "version": "2.1.0",
4
4
  "description": "Jooby message encoders/decoders",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
package/readme.md CHANGED
@@ -154,7 +154,7 @@ const commandInstancesArray = [
154
154
  hardwareTypes.GASI3
155
155
  ),
156
156
  new DayMC({
157
- startTime: 756604800,
157
+ startTime2000: 756604800,
158
158
  channelList: [
159
159
  {value: 131, index: 3},
160
160
  {value: 8, index: 5},