jooby-codec 2.14.1 → 3.0.0

package/dist/obis-observer/commands/uplink/{GetDeviceInfoResponse.js → GetObserverInfoResponse.js}

@@ -1,16 +1,20 @@
 import Command from '../../Command.js';
 import CommandBinaryBuffer, { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
 import { UPLINK } from '../../constants/directions.js';
-const COMMAND_ID = 0x21;
+const COMMAND_ID = 0x02;
 const examples = [
     {
-        name: 'response from device "Jooby Electra RM LoraWan 1D485 EU"',
+        name: 'response to GetObserverInfo with device name "Jooby Electra RM LoraWan 1D485 EU"',
         parameters: {
             requestId: 7,
             softwareVersion: {
                 major: 0,
                 minor: 1
             },
+            protocolVersion: {
+                major: 0,
+                minor: 1
+            },
             hardwareVersion: {
                 major: 1,
                 minor: 1
@@ -18,43 +22,40 @@ const examples = [
             deviceName: 'Jooby Electra RM LoraWan 1D485 EU'
         },
         hex: {
-            header: '21',
-            body: '27 07 00 01 01 01 21 4a 6f 6f 62 79 20 45 6c 65 63 74 72 61 20 52 4d 20 4c 6f 72 61 57 61 6e 20 31 44 34 38 35 20 45 55'
+            header: '02 29',
+            body: '07 00 01 00 01 01 01 21 4a 6f 6f 62 79 20 45 6c 65 63 74 72 61 20 52 4d 20 4c 6f 72 61 57 61 6e 20 31 44 34 38 35 20 45 55'
         }
     }
 ];
-class GetDeviceInfoResponse extends Command {
+class GetObserverInfoResponse extends Command {
     constructor(parameters) {
         super();
         this.parameters = parameters;
-        this.size = 1 + REQUEST_ID_SIZE + 2 + 2 + 1 + parameters.deviceName.length;
+        this.size = REQUEST_ID_SIZE + 2 + 2 + 2 + 1 + parameters.deviceName.length;
     }
     static fromBytes(data) {
         const buffer = new CommandBinaryBuffer(data);
-        buffer.seek(buffer.offset + 1);
         const requestId = buffer.getUint8();
         const softwareVersion = buffer.getVersion();
+        const protocolVersion = buffer.getVersion();
         const hardwareVersion = buffer.getVersion();
         const deviceName = buffer.getString();
-        return new GetDeviceInfoResponse({ requestId, softwareVersion, hardwareVersion, deviceName });
+        return new GetObserverInfoResponse({ requestId, softwareVersion, protocolVersion, hardwareVersion, deviceName });
     }
     toBytes() {
-        if (typeof this.size !== 'number') {
-            throw new Error('unknown or invalid size');
-        }
         const buffer = new CommandBinaryBuffer(this.size);
-        const { requestId, softwareVersion, hardwareVersion, deviceName } = this.parameters;
-        buffer.setUint8(this.size - 1);
+        const { requestId, softwareVersion, protocolVersion, hardwareVersion, deviceName } = this.parameters;
         buffer.setUint8(requestId);
         buffer.setVersion(softwareVersion);
+        buffer.setVersion(protocolVersion);
         buffer.setVersion(hardwareVersion);
         buffer.setString(deviceName);
         return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }
-GetDeviceInfoResponse.id = COMMAND_ID;
-GetDeviceInfoResponse.directionType = UPLINK;
-GetDeviceInfoResponse.examples = examples;
-GetDeviceInfoResponse.hasParameters = true;
-export default GetDeviceInfoResponse;
-//# sourceMappingURL=GetDeviceInfoResponse.js.map
+GetObserverInfoResponse.id = COMMAND_ID;
+GetObserverInfoResponse.directionType = UPLINK;
+GetObserverInfoResponse.examples = examples;
+GetObserverInfoResponse.hasParameters = true;
+export default GetObserverInfoResponse;
+//# sourceMappingURL=GetObserverInfoResponse.js.map

package/dist/obis-observer/commands/uplink/GetObserverInfoResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GetObserverInfoResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObserverInfoResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAA+B,MAAM,8BAA8B,CAAC;AAChH,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAcrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,kFAAkF;QACxF,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,eAAe,EAAE;gBACb,KAAK,EAAE,CAAC;gBACR,KAAK,EAAE,CAAC;aACX;YACD,eAAe,EAAE;gBACb,KAAK,EAAE,CAAC;gBACR,KAAK,EAAE,CAAC;aACX;YACD,eAAe,EAAE;gBACb,KAAK,EAAE,CAAC;gBACR,KAAK,EAAE,CAAC;aACX;YACD,UAAU,EAAE,mCAAmC;SAClD;QACD,GAAG,EAAE;YACD,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,4HAA4H;SACrI;KACJ;CACJ,CAAC;AA0CF,MAAM,uBAAwB,SAAQ,OAAO;IACzC,YAAqB,UAA8C;QAC/D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAoC;QAK/D,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC;IAC/E,CAAC;IAYD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAC5C,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAC5C,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAE5C,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAEtC,OAAO,IAAI,uBAAuB,CAAC,EAAC,SAAS,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAC,CAAC,CAAC;IACnH,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,SAAS,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAEnG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QACnC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QACnC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QACnC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAE7B,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAlCe,0BAAE,GAAG,UAAU,CAAC;AAEhB,qCAAa,GAAG,MAAM,CAAC;AAEvB,gCAAQ,GAAG,QAAQ,CAAC;AAEpB,qCAAa,GAAG,IAAI,CAAC;AAgCzC,eAAe,uBAAuB,CAAC"}

package/dist/obis-observer/commands/uplink/GetObserverSingleModeResponse.d.ts

@@ -0,0 +1,16 @@
+import Command, { TCommandExampleList } from '../../Command.js';
+import { ICommandParameters } from '../../CommandBinaryBuffer.js';
+interface IGetObserverSingleModeResponseParameters extends ICommandParameters {
+    isSingleMode: boolean;
+}
+declare class GetObserverSingleModeResponse extends Command {
+    parameters: IGetObserverSingleModeResponseParameters;
+    constructor(parameters: IGetObserverSingleModeResponseParameters);
+    static readonly id = 14;
+    static readonly directionType = 2;
+    static readonly examples: TCommandExampleList;
+    static readonly hasParameters = true;
+    static fromBytes([requestId, isSingleMode]: Uint8Array): GetObserverSingleModeResponse;
+    toBytes(): Uint8Array;
+}
+export default GetObserverSingleModeResponse;

package/dist/obis-observer/commands/uplink/GetObserverSingleModeResponse.js

@@ -0,0 +1,33 @@
+import Command from '../../Command.js';
+import { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import { UPLINK } from '../../constants/directions.js';
+const COMMAND_ID = 0x0e;
+const examples = [
+    {
+        name: 'response to GetObserverSingleMode',
+        parameters: {
+            requestId: 7,
+            isSingleMode: true
+        },
+        hex: { header: '0e 02', body: '07 01' }
+    }
+];
+class GetObserverSingleModeResponse extends Command {
+    constructor(parameters) {
+        super();
+        this.parameters = parameters;
+        this.size = REQUEST_ID_SIZE + 4;
+    }
+    static fromBytes([requestId, isSingleMode]) {
+        return new GetObserverSingleModeResponse({ requestId, isSingleMode: isSingleMode !== 0 });
+    }
+    toBytes() {
+        return Command.toBytes(COMMAND_ID, new Uint8Array([this.parameters.requestId, this.parameters.isSingleMode ? 1 : 0]));
+    }
+}
+GetObserverSingleModeResponse.id = COMMAND_ID;
+GetObserverSingleModeResponse.directionType = UPLINK;
+GetObserverSingleModeResponse.examples = examples;
+GetObserverSingleModeResponse.hasParameters = true;
+export default GetObserverSingleModeResponse;
+//# sourceMappingURL=GetObserverSingleModeResponse.js.map

package/dist/obis-observer/commands/uplink/GetObserverSingleModeResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GetObserverSingleModeResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObserverSingleModeResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAUrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,mCAAmC;QACzC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,YAAY,EAAE,IAAI;SACrB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAC;KACxC;CACJ,CAAC;AAyBF,MAAM,6BAA8B,SAAQ,OAAO;IAC/C,YAAqB,UAAoD;QACrE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA0C;QAGrE,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,CAAC;IACpC,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,CAAC,SAAS,EAAE,YAAY,CAAa;QACpD,OAAO,IAAI,6BAA6B,CAAC,EAAC,SAAS,EAAE,YAAY,EAAE,YAAY,KAAK,CAAC,EAAC,CAAC,CAAC;IAC5F,CAAC;IAGD,OAAO;QACH,OAAO,OAAO,CAAC,OAAO,CAClB,UAAU,EACV,IAAI,UAAU,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACpF,CAAC;IACN,CAAC;;AApBe,gCAAE,GAAG,UAAU,CAAC;AAEhB,2CAAa,GAAG,MAAM,CAAC;AAEvB,sCAAQ,GAAG,QAAQ,CAAC;AAEpB,2CAAa,GAAG,IAAI,CAAC;AAkBzC,eAAe,6BAA6B,CAAC"}

package/dist/obis-observer/commands/uplink/GetObserverUptimeResponse.d.ts

@@ -0,0 +1,16 @@
+import Command, { TCommandExampleList } from '../../Command.js';
+import { ICommandParameters } from '../../CommandBinaryBuffer.js';
+interface IGetObserverUptimeResponseParameters extends ICommandParameters {
+    uptime: number;
+}
+declare class GetObserverUptimeResponse extends Command {
+    parameters: IGetObserverUptimeResponseParameters;
+    constructor(parameters: IGetObserverUptimeResponseParameters);
+    static readonly id = 6;
+    static readonly directionType = 2;
+    static readonly examples: TCommandExampleList;
+    static readonly hasParameters = true;
+    static fromBytes(data: Uint8Array): GetObserverUptimeResponse;
+    toBytes(): Uint8Array;
+}
+export default GetObserverUptimeResponse;

package/dist/obis-observer/commands/uplink/GetObserverUptimeResponse.js

@@ -0,0 +1,41 @@
+import Command from '../../Command.js';
+import CommandBinaryBuffer, { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import { UPLINK } from '../../constants/directions.js';
+const COMMAND_ID = 0x06;
+const examples = [
+    {
+        name: 'response to GetObserverUptime',
+        parameters: {
+            requestId: 7,
+            uptime: 4016
+        },
+        hex: { header: '06 05', body: '07 00 00 0f b0' }
+    }
+];
+class GetObserverUptimeResponse extends Command {
+    constructor(parameters) {
+        super();
+        this.parameters = parameters;
+        this.size = REQUEST_ID_SIZE + 4;
+    }
+    static fromBytes(data) {
+        const buffer = new CommandBinaryBuffer(data);
+        return new GetObserverUptimeResponse({
+            requestId: buffer.getUint8(),
+            uptime: buffer.getUint32()
+        });
+    }
+    toBytes() {
+        const buffer = new CommandBinaryBuffer(this.size);
+        const { requestId, uptime } = this.parameters;
+        buffer.setUint8(requestId);
+        buffer.setUint32(uptime);
+        return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
+    }
+}
+GetObserverUptimeResponse.id = COMMAND_ID;
+GetObserverUptimeResponse.directionType = UPLINK;
+GetObserverUptimeResponse.examples = examples;
+GetObserverUptimeResponse.hasParameters = true;
+export default GetObserverUptimeResponse;
+//# sourceMappingURL=GetObserverUptimeResponse.js.map

package/dist/obis-observer/commands/uplink/GetObserverUptimeResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GetObserverUptimeResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObserverUptimeResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACtG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAUrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,IAAI;SACf;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAC;KACjD;CACJ,CAAC;AAyBF,MAAM,yBAA0B,SAAQ,OAAO;IAC3C,YAAqB,UAAgD;QACjE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAsC;QAGjE,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,CAAC;IACpC,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,yBAAyB,CAAC;YACjC,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE;SAC7B,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,SAAS,EAAE,MAAM,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAE5C,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEzB,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA5Be,4BAAE,GAAG,UAAU,CAAC;AAEhB,uCAAa,GAAG,MAAM,CAAC;AAEvB,kCAAQ,GAAG,QAAQ,CAAC;AAEpB,uCAAa,GAAG,IAAI,CAAC;AA0BzC,eAAe,yBAAyB,CAAC"}

package/dist/obis-observer/commands/uplink/ObservationReport.d.ts

@@ -1,14 +1,15 @@
 import Command, { TCommandExampleList } from '../../Command.js';
-import { IShortNameFloat } from '../../CommandBinaryBuffer.js';
+import { IObisValueFloat } from '../../CommandBinaryBuffer.js';
 import { TTime2000 } from '../../../utils/time.js';
 interface IObservationReportParameters {
+    meterId: number;
     time2000: TTime2000;
-    shortNameList: Array<IShortNameFloat>;
+    obisValueList: Array<IObisValueFloat>;
 }
 declare class ObservationReport extends Command {
     parameters: IObservationReportParameters;
     constructor(parameters: IObservationReportParameters);
-    static readonly id = 26;
+    static readonly id = 83;
     static readonly directionType = 2;
     static readonly examples: TCommandExampleList;
     static readonly hasParameters = true;

package/dist/obis-observer/commands/uplink/ObservationReport.js

@@ -1,18 +1,19 @@
 import Command from '../../Command.js';
 import CommandBinaryBuffer, { DATE_TIME_SIZE } from '../../CommandBinaryBuffer.js';
 import { UPLINK } from '../../constants/directions.js';
-const COMMAND_ID = 0x1a;
+const COMMAND_ID = 0x53;
 const examples = [
     {
-        name: 'get observation report from 2023.12.23 00:00:00 GMT',
+        name: 'observation report from 2023.12.23 00:00:00 GMT',
         parameters: {
+            meterId: 2,
             time2000: 756604800,
-            shortNameList: [
+            obisValueList: [
                 { code: 50, content: 34.33 },
                 { code: 56, content: 45.33 }
             ]
         },
-        hex: { header: '1a', body: '0e 2d 18 df 80 32 42 09 51 ec 38 42 35 51 ec' }
+        hex: { header: '53 0f', body: '02 2d 18 df 80 32 42 09 51 ec 38 42 35 51 ec' }
     }
 ];
 class ObservationReport extends Command {
@@ -20,32 +21,28 @@ class ObservationReport extends Command {
         super();
         this.parameters = parameters;
         let size = 1 + DATE_TIME_SIZE;
-        this.parameters.shortNameList.forEach(shortName => {
-            size += CommandBinaryBuffer.getShortNameContentSize(shortName);
+        this.parameters.obisValueList.forEach(obisValue => {
+            size += CommandBinaryBuffer.getObisContentSize(obisValue);
         });
         this.size = size;
     }
     static fromBytes(data) {
         const buffer = new CommandBinaryBuffer(data);
-        let size = buffer.getUint8() - DATE_TIME_SIZE;
+        const meterId = buffer.getUint8();
         const time2000 = buffer.getUint32();
-        const shortNameList = [];
-        while (size > 0) {
-            const shortName = buffer.getShortNameFloat();
-            size -= CommandBinaryBuffer.getShortNameContentSize(shortName);
-            shortNameList.push(shortName);
+        const obisValueList = [];
+        while (!buffer.isEmpty) {
+            const obisValue = buffer.getObisValueFloat();
+            obisValueList.push(obisValue);
         }
-        return new ObservationReport({ time2000, shortNameList });
+        return new ObservationReport({ meterId, time2000, obisValueList });
     }
     toBytes() {
-        if (typeof this.size !== 'number') {
-            throw new Error('unknown or invalid size');
-        }
         const buffer = new CommandBinaryBuffer(this.size);
-        const { time2000, shortNameList } = this.parameters;
-        buffer.setUint8(this.size - 1);
+        const { meterId, time2000, obisValueList } = this.parameters;
+        buffer.setUint8(meterId);
         buffer.setUint32(time2000);
-        shortNameList.forEach(shortName => buffer.setShortNameFloat(shortName));
+        obisValueList.forEach(obisValue => buffer.setObisValueFloat(obisValue));
         return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }

package/dist/obis-observer/commands/uplink/ObservationReport.js.map

@@ -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;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"}
+{"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;AAerD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,iDAAiD;QACvD,UAAU,EAAE;YACR,OAAO,EAAE,CAAC;YACV,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,OAAO,EAAE,IAAI,EAAE,8CAA8C,EAAC;KAC/E;CACJ,CAAC;AA2BF,MAAM,iBAAkB,SAAQ,OAAO;IACnC,YAAqB,UAAwC;QACzD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA8B;QAGzD,IAAI,IAAI,GAAG,CAAC,GAAG,cAAc,CAAC;QAE9B,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC9C,IAAI,IAAI,mBAAmB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC9D,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;QAC7C,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,OAAQ,CAAC,MAAM,CAAC,OAAO,EAAG;YACtB,MAAM,SAAS,GAAG,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAE7C,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,iBAAiB,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC;IACrE,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAE3D,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACzB,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;;AAnCe,oBAAE,GAAG,UAAU,CAAC;AAEhB,+BAAa,GAAG,MAAM,CAAC;AAEvB,0BAAQ,GAAG,QAAQ,CAAC;AAEpB,+BAAa,GAAG,IAAI,CAAC;AAiCzC,eAAe,iBAAiB,CAAC"}

package/dist/obis-observer/commands/uplink/ObservationReportString.d.ts

@@ -1,14 +1,15 @@
 import Command, { TCommandExampleList } from '../../Command.js';
-import { IShortNameString } from '../../CommandBinaryBuffer.js';
+import { IObisValueString } from '../../CommandBinaryBuffer.js';
 import { TTime2000 } from '../../../utils/time.js';
 interface IObservationReportStringParameters {
+    meterId: number;
     time2000: TTime2000;
-    shortNameList: Array<IShortNameString>;
+    obisValueList: Array<IObisValueString>;
 }
 declare class ObservationReportString extends Command {
     parameters: IObservationReportStringParameters;
     constructor(parameters: IObservationReportStringParameters);
-    static readonly id = 27;
+    static readonly id = 84;
     static readonly directionType = 2;
     static readonly examples: TCommandExampleList;
     static readonly hasParameters = true;

package/dist/obis-observer/commands/uplink/ObservationReportString.js

@@ -1,20 +1,21 @@
 import Command from '../../Command.js';
 import CommandBinaryBuffer, { DATE_TIME_SIZE } from '../../CommandBinaryBuffer.js';
 import { UPLINK } from '../../constants/directions.js';
-const COMMAND_ID = 0x1b;
+const COMMAND_ID = 0x54;
 const examples = [
     {
-        name: 'get observation report from 2023.12.23 00:00:00 GMT',
+        name: 'observation report from 2023.12.23 00:00:00 GMT',
         parameters: {
+            meterId: 2,
             time2000: 756604800,
-            shortNameList: [
+            obisValueList: [
                 { code: 50, content: 'reactive power QI, average' },
                 { code: 56, content: 'reactive power QI, total' }
             ]
         },
         hex: {
-            header: '1b',
-            body: '3a 2d 18 df 80 32 1a 72 65 61 63 74 69 76 65 20 70 6f 77 65'
+            header: '54 3b',
+            body: '02 2d 18 df 80 32 1a 72 65 61 63 74 69 76 65 20 70 6f 77 65'
                 + ' 72 20 51 49 2c 20 61 76 65 72 61 67 65 38 18 72 65 61 63 74 69 76'
                 + ' 65 20 70 6f 77 65 72 20 51 49 2c 20 74 6f 74 61 6c'
         }
@@ -25,32 +26,28 @@ class ObservationReportString extends Command {
         super();
         this.parameters = parameters;
         let size = 1 + DATE_TIME_SIZE;
-        this.parameters.shortNameList.forEach(shortName => {
-            size += CommandBinaryBuffer.getShortNameContentSize(shortName);
+        this.parameters.obisValueList.forEach(obisValue => {
+            size += CommandBinaryBuffer.getObisContentSize(obisValue);
         });
         this.size = size;
     }
     static fromBytes(data) {
         const buffer = new CommandBinaryBuffer(data);
-        let size = buffer.getUint8() - DATE_TIME_SIZE;
+        const meterId = buffer.getUint8();
         const time2000 = buffer.getUint32();
-        const shortNameList = [];
-        while (size > 0) {
-            const shortName = buffer.getShortNameString();
-            size -= CommandBinaryBuffer.getShortNameContentSize(shortName);
-            shortNameList.push(shortName);
+        const obisValueList = [];
+        while (!buffer.isEmpty) {
+            const obisValue = buffer.getObisValueString();
+            obisValueList.push(obisValue);
         }
-        return new ObservationReportString({ time2000, shortNameList });
+        return new ObservationReportString({ meterId, time2000, obisValueList });
     }
     toBytes() {
-        if (typeof this.size !== 'number') {
-            throw new Error('unknown or invalid size');
-        }
         const buffer = new CommandBinaryBuffer(this.size);
-        const { time2000, shortNameList } = this.parameters;
-        buffer.setUint8(this.size - 1);
+        const { meterId, time2000, obisValueList } = this.parameters;
+        buffer.setUint8(meterId);
         buffer.setUint32(time2000);
-        shortNameList.forEach(shortName => buffer.setShortNameString(shortName));
+        obisValueList.forEach(obisValue => buffer.setObisValueString(obisValue));
         return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }

package/dist/obis-observer/commands/uplink/ObservationReportString.js.map

@@ -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;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"}
+{"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;AAerD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,iDAAiD;QACvD,UAAU,EAAE;YACR,OAAO,EAAE,CAAC;YACV,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,OAAO;YACf,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;QAG/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,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC9D,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;QAC7C,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,OAAQ,CAAC,MAAM,CAAC,OAAO,EAAG;YACtB,MAAM,SAAS,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAE9C,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,uBAAuB,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC;IAC3E,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAE3D,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACzB,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;;AAnCe,0BAAE,GAAG,UAAU,CAAC;AAEhB,qCAAa,GAAG,MAAM,CAAC;AAEvB,gCAAQ,GAAG,QAAQ,CAAC;AAEpB,qCAAa,GAAG,IAAI,CAAC;AAiCzC,eAAe,uBAAuB,CAAC"}

package/dist/obis-observer/commands/uplink/ReadMeterArchiveResponse.d.ts

@@ -0,0 +1,22 @@
+import Command, { TCommandExampleList } from '../../Command.js';
+import { ICommandParameters, IObisValueFloat } from '../../CommandBinaryBuffer.js';
+import { TTime2000 } from '../../../utils/time.js';
+interface IArchiveContentPerDate {
+    time2000: TTime2000;
+    obisValueList: Array<IObisValueFloat>;
+}
+interface IReadMeterArchiveResponseParameters extends ICommandParameters {
+    isCompleted: boolean;
+    content: Array<IArchiveContentPerDate>;
+}
+declare class ReadMeterArchiveResponse extends Command {
+    parameters: IReadMeterArchiveResponseParameters;
+    constructor(parameters: IReadMeterArchiveResponseParameters);
+    static readonly id = 18;
+    static readonly directionType = 2;
+    static readonly examples: TCommandExampleList;
+    static readonly hasParameters = true;
+    static fromBytes(data: Uint8Array): ReadMeterArchiveResponse;
+    toBytes(): Uint8Array;
+}
+export default ReadMeterArchiveResponse;

package/dist/obis-observer/commands/uplink/ReadMeterArchiveResponse.js

@@ -0,0 +1,102 @@
+import Command from '../../Command.js';
+import CommandBinaryBuffer, { REQUEST_ID_SIZE, DATE_TIME_SIZE } from '../../CommandBinaryBuffer.js';
+import { UPLINK } from '../../constants/directions.js';
+import roundNumber from '../../../utils/roundNumber.js';
+const COMMAND_ID = 0x12;
+const COMMAND_HEADER_SIZE = REQUEST_ID_SIZE + 1;
+const examples = [
+    {
+        name: 'response to ReadMeterArchive from 2023-12-23 04:00:00 GMT for meter 4',
+        parameters: {
+            requestId: 12,
+            isCompleted: true,
+            content: [
+                {
+                    time2000: 464784480,
+                    obisValueList: [{ code: 8, content: 0.40 }]
+                },
+                {
+                    time2000: 464784416,
+                    obisValueList: [{ code: 8, content: 0.20 }]
+                }
+            ]
+        },
+        hex: { header: '12 15', body: '0c 01 1b b4 0c 60 08 3e cc cc cd 00 1b b4 0c 20 08 3e 4c cc cd' }
+    },
+    {
+        name: 'response to ReadMeterArchive without data',
+        parameters: {
+            requestId: 34,
+            isCompleted: true,
+            content: []
+        },
+        hex: { header: '12 02', body: '22 01' }
+    }
+];
+const commandSize = (parameters) => {
+    let size = COMMAND_HEADER_SIZE;
+    let datesInContent = 0;
+    for (let it = 0; it < parameters.content.length; ++it) {
+        const obisValues = parameters.content[it].obisValueList;
+        if (obisValues.length !== 0) {
+            size += DATE_TIME_SIZE;
+            size += (1 + 4) * obisValues.length;
+            datesInContent++;
+        }
+    }
+    if (datesInContent !== 0) {
+        size += datesInContent - 1;
+    }
+    return size;
+};
+class ReadMeterArchiveResponse extends Command {
+    constructor(parameters) {
+        super();
+        this.parameters = parameters;
+        this.size = commandSize(parameters);
+    }
+    static fromBytes(data) {
+        const buffer = new CommandBinaryBuffer(data);
+        const requestId = buffer.getUint8();
+        const isCompleted = buffer.isEmpty ? true : buffer.getUint8() !== 0;
+        const content = [];
+        if (buffer.isEmpty) {
+            return new ReadMeterArchiveResponse({ requestId, isCompleted, content });
+        }
+        while (!buffer.isEmpty) {
+            const dateContent = {
+                time2000: buffer.getUint32(),
+                obisValueList: []
+            };
+            while (!buffer.isEmpty) {
+                const code = buffer.getUint8();
+                if (code === 0) {
+                    break;
+                }
+                dateContent.obisValueList.push({ code, content: roundNumber(buffer.getFloat32()) });
+            }
+            content.push(dateContent);
+        }
+        return new ReadMeterArchiveResponse({ requestId, isCompleted, content });
+    }
+    toBytes() {
+        const { requestId, isCompleted, content } = this.parameters;
+        const buffer = new CommandBinaryBuffer(this.size);
+        buffer.setUint8(requestId);
+        buffer.setUint8(isCompleted ? 1 : 0);
+        for (let it = 0; it < content.length; ++it) {
+            if (it !== 0) {
+                buffer.setUint8(0);
+            }
+            buffer.setUint32(content[it].time2000);
+            content[it].obisValueList.forEach(obisValue => buffer.setObisValueFloat(obisValue));
+        }
+        return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
+    }
+}
+ReadMeterArchiveResponse.id = COMMAND_ID;
+ReadMeterArchiveResponse.directionType = UPLINK;
+ReadMeterArchiveResponse.examples = examples;
+ReadMeterArchiveResponse.hasParameters = true;
+export default ReadMeterArchiveResponse;
+//# sourceMappingURL=ReadMeterArchiveResponse.js.map

package/dist/obis-observer/commands/uplink/ReadMeterArchiveResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ReadMeterArchiveResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ReadMeterArchiveResponse.ts"],"names":[],"mappings":"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"}

package/dist/obis-observer/commands/uplink/ReadMeterArchiveWithDateResponse.d.ts

@@ -0,0 +1,17 @@
+import Command, { TCommandExampleList } from '../../Command.js';
+import { ICommandParameters, IObisValueFloat } from '../../CommandBinaryBuffer.js';
+interface IReadMeterArchiveWithDateResponseParameters extends ICommandParameters {
+    isCompleted: boolean;
+    obisValueList: Array<IObisValueFloat>;
+}
+declare class ReadMeterArchiveWithDateResponse extends Command {
+    parameters: IReadMeterArchiveWithDateResponseParameters;
+    constructor(parameters: IReadMeterArchiveWithDateResponseParameters);
+    static readonly id = 20;
+    static readonly directionType = 2;
+    static readonly examples: TCommandExampleList;
+    static readonly hasParameters = true;
+    static fromBytes(data: Uint8Array): ReadMeterArchiveWithDateResponse;
+    toBytes(): Uint8Array;
+}
+export default ReadMeterArchiveWithDateResponse;

package/dist/obis-observer/commands/uplink/ReadMeterArchiveWithDateResponse.js

@@ -0,0 +1,69 @@
+import Command from '../../Command.js';
+import CommandBinaryBuffer, { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import { UPLINK } from '../../constants/directions.js';
+const COMMAND_ID = 0x14;
+const COMMAND_HEADER_SIZE = REQUEST_ID_SIZE + 1;
+const examples = [
+    {
+        name: 'response to ReadMeterArchiveWithDate from 2023-12-23 04:00:00 GMT for meter 4',
+        parameters: {
+            requestId: 12,
+            isCompleted: true,
+            obisValueList: [{
+                    code: 8,
+                    content: 3.60
+                }]
+        },
+        hex: { header: '14 07', body: '0c 01 08 40 66 66 66' }
+    },
+    {
+        name: 'response to ReadMeterArchiveWithDate without data',
+        parameters: {
+            requestId: 34,
+            isCompleted: true,
+            obisValueList: []
+        },
+        hex: { header: '14 02', body: '22 01' }
+    }
+];
+const commandSize = (parameters) => {
+    let size = COMMAND_HEADER_SIZE;
+    parameters.obisValueList.forEach(obisId => {
+        size += CommandBinaryBuffer.getObisContentSize(obisId);
+    });
+    return size;
+};
+class ReadMeterArchiveWithDateResponse extends Command {
+    constructor(parameters) {
+        super();
+        this.parameters = parameters;
+        this.size = commandSize(parameters);
+    }
+    static fromBytes(data) {
+        const buffer = new CommandBinaryBuffer(data);
+        const requestId = buffer.getUint8();
+        const isCompleted = buffer.isEmpty ? true : buffer.getUint8() !== 0;
+        const obisValueList = [];
+        if (buffer.isEmpty) {
+            return new ReadMeterArchiveWithDateResponse({ requestId, isCompleted, obisValueList });
+        }
+        while (!buffer.isEmpty) {
+            obisValueList.push(buffer.getObisValueFloat());
+        }
+        return new ReadMeterArchiveWithDateResponse({ requestId, isCompleted, obisValueList });
+    }
+    toBytes() {
+        const { requestId, isCompleted, obisValueList } = this.parameters;
+        const buffer = new CommandBinaryBuffer(this.size);
+        buffer.setUint8(requestId);
+        buffer.setUint8(isCompleted ? 1 : 0);
+        obisValueList.forEach(obisValue => buffer.setObisValueFloat(obisValue));
+        return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
+    }
+}
+ReadMeterArchiveWithDateResponse.id = COMMAND_ID;
+ReadMeterArchiveWithDateResponse.directionType = UPLINK;
+ReadMeterArchiveWithDateResponse.examples = examples;
+ReadMeterArchiveWithDateResponse.hasParameters = true;
+export default ReadMeterArchiveWithDateResponse;
+//# sourceMappingURL=ReadMeterArchiveWithDateResponse.js.map

package/dist/obis-observer/commands/uplink/ReadMeterArchiveWithDateResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ReadMeterArchiveWithDateResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ReadMeterArchiveWithDateResponse.ts"],"names":[],"mappings":"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"}