jooby-codec 3.6.0 → 3.7.0

package/dist/obis-observer/commands/downlink/GetArchiveState.js

@@ -1,8 +1,7 @@
 import Command from '../../Command.js';
-import { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import CommandBinaryBuffer, { REQUEST_ID_SIZE, METER_ID_SIZE } from '../../CommandBinaryBuffer.js';
 import { DOWNLINK } from '../../../constants/directions.js';
 const COMMAND_ID = 0x0f;
-const COMMAND_SIZE = REQUEST_ID_SIZE + 2;
 const examples = [
     {
         name: 'get archive state',
@@ -19,26 +18,32 @@ const examples = [
             archiveType: 1,
             meterId: 3
         },
-        hex: { header: '0f 03', body: '05 01 03' }
+        hex: { header: '0f 06', body: '05 01 00 00 00 03' }
     }
 ];
 class GetArchiveState extends Command {
     constructor(parameters) {
         super();
         this.parameters = parameters;
-        this.size = COMMAND_SIZE;
+        this.size = REQUEST_ID_SIZE + 1 + (parameters.meterId ? METER_ID_SIZE : 0);
     }
-    static fromBytes([requestId, archiveType, meterId]) {
-        return meterId
-            ? new GetArchiveState({ requestId, archiveType, meterId })
-            : new GetArchiveState({ requestId, archiveType });
+    static fromBytes(data) {
+        const buffer = new CommandBinaryBuffer(data);
+        const requestId = buffer.getUint8();
+        const archiveType = buffer.getUint8();
+        return buffer.isEmpty
+            ? new GetArchiveState({ requestId, archiveType })
+            : new GetArchiveState({ requestId, archiveType, meterId: buffer.getUint32() });
     }
     toBytes() {
         const { requestId, archiveType, meterId } = this.parameters;
-        const content = meterId
-            ? [requestId, archiveType, meterId]
-            : [requestId, archiveType];
-        return Command.toBytes(COMMAND_ID, new Uint8Array(content));
+        const buffer = new CommandBinaryBuffer(this.size);
+        buffer.setUint8(requestId);
+        buffer.setUint8(archiveType);
+        if (meterId) {
+            buffer.setUint32(meterId);
+        }
+        return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }
 GetArchiveState.id = COMMAND_ID;

package/dist/obis-observer/commands/downlink/GetArchiveState.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetArchiveState.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/GetArchiveState.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAY1D,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;AAEzC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,mBAAmB;QACzB,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;SACjB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAC;KACxC;IACD;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;YACd,OAAO,EAAE,CAAC;SACb;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAC;KAC3C;CACJ,CAAC;AAwBF,MAAM,eAAgB,SAAQ,OAAO;IACjC,YAAqB,UAAsC;QACvD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA4B;QAGvD,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC7B,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,CAAC,SAAS,EAAE,WAAW,EAAE,OAAO,CAAa;QAC5D,OAAO,OAAO;YACV,CAAC,CAAC,IAAI,eAAe,CAAC,EAAC,SAAS,EAAE,WAAW,EAAE,OAAO,EAAC,CAAC;YACxD,CAAC,CAAC,IAAI,eAAe,CAAC,EAAC,SAAS,EAAE,WAAW,EAAC,CAAC,CAAC;IACxD,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,SAAS,EAAE,WAAW,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAC1D,MAAM,OAAO,GAAG,OAAO;YACnB,CAAC,CAAC,CAAC,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC;YACnC,CAAC,CAAC,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAG/B,OAAO,OAAO,CAAC,OAAO,CAClB,UAAU,EACV,IAAI,UAAU,CAAC,OAAO,CAAC,CAC1B,CAAC;IACN,CAAC;;AA5Be,kBAAE,GAAG,UAAU,CAAC;AAEhB,6BAAa,GAAG,QAAQ,CAAC;AAEzB,wBAAQ,GAAG,QAAQ,CAAC;AAEpB,6BAAa,GAAG,IAAI,CAAC;AA0BzC,eAAe,eAAe,CAAC"}
+{"version":3,"file":"GetArchiveState.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/GetArchiveState.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAE,aAAa,EAAqB,MAAM,8BAA8B,CAAC;AACrH,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAY1D,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,mBAAmB;QACzB,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;SACjB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAC;KACxC;IACD;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;YACd,OAAO,EAAE,CAAC;SACb;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAC;KACpD;CACJ,CAAC;AAwBF,MAAM,eAAgB,SAAQ,OAAO;IACjC,YAAqB,UAAsC;QACvD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA4B;QAGvD,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/E,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,QAAQ,EAAE,CAAC;QAEtC,OAAO,MAAM,CAAC,OAAO;YACjB,CAAC,CAAC,IAAI,eAAe,CAAC,EAAC,SAAS,EAAE,WAAW,EAAC,CAAC;YAC/C,CAAC,CAAC,IAAI,eAAe,CAAC,EAAC,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE,EAAC,CAAC,CAAC;IACrF,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,SAAS,EAAE,WAAW,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAC1D,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAE5D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC7B,IAAK,OAAO,EAAG,CAAC;YACZ,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAjCe,kBAAE,GAAG,UAAU,CAAC;AAEhB,6BAAa,GAAG,QAAQ,CAAC;AAEzB,wBAAQ,GAAG,QAAQ,CAAC;AAEpB,6BAAa,GAAG,IAAI,CAAC;AA+BzC,eAAe,eAAe,CAAC"}

package/dist/obis-observer/commands/downlink/GetMeterDate.d.ts

@@ -10,7 +10,7 @@ declare class GetMeterDate extends Command {
     static readonly directionType = 1;
     static readonly examples: TCommandExampleList;
     static readonly hasParameters = true;
-    static fromBytes([requestId, meterId]: Uint8Array): GetMeterDate;
+    static fromBytes(data: Uint8Array): GetMeterDate;
     toBytes(): Uint8Array;
 }
 export default GetMeterDate;

package/dist/obis-observer/commands/downlink/GetMeterDate.js

@@ -1,5 +1,5 @@
 import Command from '../../Command.js';
-import { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import CommandBinaryBuffer, { REQUEST_ID_SIZE, METER_ID_SIZE } from '../../CommandBinaryBuffer.js';
 import { DOWNLINK } from '../../../constants/directions.js';
 const COMMAND_ID = 0x7a;
 const examples = [
@@ -9,21 +9,28 @@ const examples = [
             requestId: 4,
             meterId: 3
         },
-        hex: { header: '7a 02', body: '04 03' }
+        hex: { header: '7a 05', body: '04 00 00 00 03' }
     }
 ];
 class GetMeterDate extends Command {
     constructor(parameters) {
         super();
         this.parameters = parameters;
-        this.size = REQUEST_ID_SIZE + 1;
+        this.size = REQUEST_ID_SIZE + METER_ID_SIZE;
     }
-    static fromBytes([requestId, meterId]) {
-        return new GetMeterDate({ requestId, meterId });
+    static fromBytes(data) {
+        const buffer = new CommandBinaryBuffer(data);
+        return new GetMeterDate({
+            requestId: buffer.getUint8(),
+            meterId: buffer.getUint32()
+        });
     }
     toBytes() {
-        const { parameters } = this;
-        return Command.toBytes(COMMAND_ID, new Uint8Array([parameters.requestId, parameters.meterId]));
+        const { requestId, meterId } = this.parameters;
+        const buffer = new CommandBinaryBuffer(this.size);
+        buffer.setUint8(requestId);
+        buffer.setUint32(meterId);
+        return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }
 GetMeterDate.id = COMMAND_ID;

package/dist/obis-observer/commands/downlink/GetMeterDate.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetMeterDate.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/GetMeterDate.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAqB,eAAe,EAAC,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAW1D,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,sBAAsB;QAC5B,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;SACb;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAC;KACxC;CACJ,CAAC;AAuBF,MAAM,YAAa,SAAQ,OAAO;IAC9B,YAAqB,UAAmC;QACpD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAyB;QAGpD,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,CAAC;IACpC,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,CAAC,SAAS,EAAE,OAAO,CAAa;QAC/C,OAAO,IAAI,YAAY,CAAC,EAAC,SAAS,EAAE,OAAO,EAAC,CAAC,CAAC;IAClD,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,UAAU,EAAC,GAAG,IAAI,CAAC;QAE1B,OAAO,OAAO,CAAC,OAAO,CAClB,UAAU,EACV,IAAI,UAAU,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAC7D,CAAC;IACN,CAAC;;AAtBe,eAAE,GAAG,UAAU,CAAC;AAEhB,0BAAa,GAAG,QAAQ,CAAC;AAEzB,qBAAQ,GAAG,QAAQ,CAAC;AAEpB,0BAAa,GAAG,IAAI,CAAC;AAoBzC,eAAe,YAAY,CAAC"}
+{"version":3,"file":"GetMeterDate.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/GetMeterDate.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAqB,eAAe,EAAE,aAAa,EAAC,MAAM,8BAA8B,CAAC;AACrH,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAW1D,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,sBAAsB;QAC5B,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;SACb;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAC;KACjD;CACJ,CAAC;AAuBF,MAAM,YAAa,SAAQ,OAAO;IAC9B,YAAqB,UAAmC;QACpD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAyB;QAGpD,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,aAAa,CAAC;IAChD,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,YAAY,CAAC;YACpB,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE;SAC9B,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,SAAS,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAC7C,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAE5D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE1B,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA5Be,eAAE,GAAG,UAAU,CAAC;AAEhB,0BAAa,GAAG,QAAQ,CAAC;AAEzB,qBAAQ,GAAG,QAAQ,CAAC;AAEpB,0BAAa,GAAG,IAAI,CAAC;AA0BzC,eAAe,YAAY,CAAC"}

package/dist/obis-observer/commands/downlink/GetMeterInfo.d.ts

@@ -10,7 +10,7 @@ declare class GetMeterInfo extends Command {
     static readonly directionType = 1;
     static readonly examples: TCommandExampleList;
     static readonly hasParameters = true;
-    static fromBytes([requestId, meterId]: Uint8Array): GetMeterInfo;
+    static fromBytes(data: Uint8Array): GetMeterInfo;
     toBytes(): Uint8Array;
 }
 export default GetMeterInfo;

package/dist/obis-observer/commands/downlink/GetMeterInfo.js

@@ -1,5 +1,5 @@
 import Command from '../../Command.js';
-import { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import CommandBinaryBuffer, { REQUEST_ID_SIZE, METER_ID_SIZE } from '../../CommandBinaryBuffer.js';
 import { DOWNLINK } from '../../../constants/directions.js';
 const COMMAND_ID = 0x78;
 const examples = [
@@ -9,21 +9,28 @@ const examples = [
             requestId: 8,
             meterId: 1
         },
-        hex: { header: '78 02', body: '08 01' }
+        hex: { header: '78 05', body: '08 00 00 00 01' }
     }
 ];
 class GetMeterInfo extends Command {
     constructor(parameters) {
         super();
         this.parameters = parameters;
-        this.size = REQUEST_ID_SIZE + 1;
+        this.size = REQUEST_ID_SIZE + METER_ID_SIZE;
     }
-    static fromBytes([requestId, meterId]) {
-        return new GetMeterInfo({ requestId, meterId });
+    static fromBytes(data) {
+        const buffer = new CommandBinaryBuffer(data);
+        return new GetMeterInfo({
+            requestId: buffer.getUint8(),
+            meterId: buffer.getUint32()
+        });
     }
     toBytes() {
-        const { parameters } = this;
-        return Command.toBytes(COMMAND_ID, new Uint8Array([parameters.requestId, parameters.meterId]));
+        const { requestId, meterId } = this.parameters;
+        const buffer = new CommandBinaryBuffer(this.size);
+        buffer.setUint8(requestId);
+        buffer.setUint32(meterId);
+        return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }
 GetMeterInfo.id = COMMAND_ID;

package/dist/obis-observer/commands/downlink/GetMeterInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetMeterInfo.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/GetMeterInfo.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAqB,eAAe,EAAC,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAW1D,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,4BAA4B;QAClC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;SACb;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAC;KACxC;CACJ,CAAC;AAuBF,MAAM,YAAa,SAAQ,OAAO;IAC9B,YAAqB,UAAmC;QACpD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAyB;QAGpD,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,CAAC;IACpC,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,CAAC,SAAS,EAAE,OAAO,CAAa;QAC/C,OAAO,IAAI,YAAY,CAAC,EAAC,SAAS,EAAE,OAAO,EAAC,CAAC,CAAC;IAClD,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,UAAU,EAAC,GAAG,IAAI,CAAC;QAE1B,OAAO,OAAO,CAAC,OAAO,CAClB,UAAU,EACV,IAAI,UAAU,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAC7D,CAAC;IACN,CAAC;;AAtBe,eAAE,GAAG,UAAU,CAAC;AAEhB,0BAAa,GAAG,QAAQ,CAAC;AAEzB,qBAAQ,GAAG,QAAQ,CAAC;AAEpB,0BAAa,GAAG,IAAI,CAAC;AAoBzC,eAAe,YAAY,CAAC"}
+{"version":3,"file":"GetMeterInfo.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/GetMeterInfo.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAqB,eAAe,EAAE,aAAa,EAAC,MAAM,8BAA8B,CAAC;AACrH,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAW1D,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,4BAA4B;QAClC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;SACb;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAC;KACjD;CACJ,CAAC;AAuBF,MAAM,YAAa,SAAQ,OAAO;IAC9B,YAAqB,UAAmC;QACpD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAyB;QAGpD,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,aAAa,CAAC;IAChD,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,YAAY,CAAC;YACpB,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE;SAC9B,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,SAAS,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAC7C,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAE5D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE1B,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA5Be,eAAE,GAAG,UAAU,CAAC;AAEhB,0BAAa,GAAG,QAAQ,CAAC;AAEzB,qBAAQ,GAAG,QAAQ,CAAC;AAEpB,0BAAa,GAAG,IAAI,CAAC;AA0BzC,eAAe,YAAY,CAAC"}

package/dist/obis-observer/commands/downlink/GetMeterReadoutState.d.ts

@@ -10,7 +10,7 @@ declare class GetMeterReadoutState extends Command {
     static readonly directionType = 1;
     static readonly examples: TCommandExampleList;
     static readonly hasParameters = true;
-    static fromBytes([requestId, meterId]: Uint8Array): GetMeterReadoutState;
+    static fromBytes(data: Uint8Array): GetMeterReadoutState;
     toBytes(): Uint8Array;
 }
 export default GetMeterReadoutState;

package/dist/obis-observer/commands/downlink/GetMeterReadoutState.js

@@ -1,5 +1,5 @@
 import Command from '../../Command.js';
-import { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import CommandBinaryBuffer, { REQUEST_ID_SIZE, METER_ID_SIZE } from '../../CommandBinaryBuffer.js';
 import { DOWNLINK } from '../../../constants/directions.js';
 const COMMAND_ID = 0x81;
 const examples = [
@@ -9,21 +9,28 @@ const examples = [
             requestId: 9,
             meterId: 3
         },
-        hex: { header: '81 02', body: '09 03' }
+        hex: { header: '81 05', body: '09 00 00 00 03' }
     }
 ];
 class GetMeterReadoutState extends Command {
     constructor(parameters) {
         super();
         this.parameters = parameters;
-        this.size = REQUEST_ID_SIZE + (parameters.meterId ? 1 : 0);
+        this.size = REQUEST_ID_SIZE + METER_ID_SIZE;
     }
-    static fromBytes([requestId, meterId]) {
-        return new GetMeterReadoutState({ requestId, meterId });
+    static fromBytes(data) {
+        const buffer = new CommandBinaryBuffer(data);
+        return new GetMeterReadoutState({
+            requestId: buffer.getUint8(),
+            meterId: buffer.getUint32()
+        });
     }
     toBytes() {
-        const { parameters } = this;
-        return Command.toBytes(COMMAND_ID, new Uint8Array([parameters.requestId, parameters.meterId]));
+        const { requestId, meterId } = this.parameters;
+        const buffer = new CommandBinaryBuffer(this.size);
+        buffer.setUint8(requestId);
+        buffer.setUint32(meterId);
+        return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }
 GetMeterReadoutState.id = COMMAND_ID;

package/dist/obis-observer/commands/downlink/GetMeterReadoutState.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetMeterReadoutState.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/GetMeterReadoutState.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAqB,eAAe,EAAC,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAW1D,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;SACb;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAC;KACxC;CACJ,CAAC;AAuBF,MAAM,oBAAqB,SAAQ,OAAO;IACtC,YAAqB,UAA2C;QAC5D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAiC;QAG5D,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,CAAC,SAAS,EAAE,OAAO,CAAa;QAC/C,OAAO,IAAI,oBAAoB,CAAC,EAAC,SAAS,EAAE,OAAO,EAAC,CAAC,CAAC;IAC1D,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,UAAU,EAAC,GAAG,IAAI,CAAC;QAE1B,OAAO,OAAO,CAAC,OAAO,CAClB,UAAU,EACV,IAAI,UAAU,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAC7D,CAAC;IACN,CAAC;;AAtBe,uBAAE,GAAG,UAAU,CAAC;AAEhB,kCAAa,GAAG,QAAQ,CAAC;AAEzB,6BAAQ,GAAG,QAAQ,CAAC;AAEpB,kCAAa,GAAG,IAAI,CAAC;AAoBzC,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"GetMeterReadoutState.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/GetMeterReadoutState.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAqB,eAAe,EAAE,aAAa,EAAC,MAAM,8BAA8B,CAAC;AACrH,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAW1D,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;SACb;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAC;KACjD;CACJ,CAAC;AAuBF,MAAM,oBAAqB,SAAQ,OAAO;IACtC,YAAqB,UAA2C;QAC5D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAiC;QAG5D,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,aAAa,CAAC;IAChD,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,oBAAoB,CAAC;YAC5B,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE;SAC9B,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,SAAS,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAC7C,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAE5D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE1B,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA5Be,uBAAE,GAAG,UAAU,CAAC;AAEhB,kCAAa,GAAG,QAAQ,CAAC;AAEzB,6BAAQ,GAAG,QAAQ,CAAC;AAEpB,kCAAa,GAAG,IAAI,CAAC;AA0BzC,eAAe,oBAAoB,CAAC"}

package/dist/obis-observer/commands/downlink/GetObisContent.js

@@ -1,5 +1,5 @@
 import Command from '../../Command.js';
-import CommandBinaryBuffer, { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import CommandBinaryBuffer, { REQUEST_ID_SIZE, METER_ID_SIZE } from '../../CommandBinaryBuffer.js';
 import { DOWNLINK } from '../../../constants/directions.js';
 const COMMAND_ID = 0x4e;
 const examples = [
@@ -14,20 +14,20 @@ const examples = [
                 e: 1
             }
         },
-        hex: { header: '4e 06', body: '03 08 02 00 09 01' }
+        hex: { header: '4e 09', body: '03 00 00 00 08 02 00 09 01' }
     }
 ];
 class GetContentByObis extends Command {
     constructor(parameters) {
         super();
         this.parameters = parameters;
-        this.size = REQUEST_ID_SIZE + 1 + CommandBinaryBuffer.getObisSize(parameters.obis);
+        this.size = REQUEST_ID_SIZE + METER_ID_SIZE + CommandBinaryBuffer.getObisSize(parameters.obis);
     }
     static fromBytes(data) {
         const buffer = new CommandBinaryBuffer(data);
         return new GetContentByObis({
             requestId: buffer.getUint8(),
-            meterId: buffer.getUint8(),
+            meterId: buffer.getUint32(),
             obis: buffer.getObis()
         });
     }
@@ -35,7 +35,7 @@ class GetContentByObis extends Command {
         const { requestId, meterId, obis } = this.parameters;
         const buffer = new CommandBinaryBuffer(this.size);
         buffer.setUint8(requestId);
-        buffer.setUint8(meterId);
+        buffer.setUint32(meterId);
         buffer.setObis(obis);
         return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }

package/dist/obis-observer/commands/downlink/GetObisContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetObisContent.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/GetObisContent.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAA4B,MAAM,8BAA8B,CAAC;AAC7G,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAY1D,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,0DAA0D;QAChE,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;YACV,IAAI,EAAE;gBACF,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,CAAC;aACP;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAC;KACpD;CACJ,CAAC;AA4BF,MAAM,gBAAiB,SAAQ,OAAO;IAClC,YAAqB,UAAuC;QACxD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA6B;QAGxD,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,GAAG,mBAAmB,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACvF,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,gBAAgB,CAAC;YACxB,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC1B,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE;SACzB,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QACnD,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAE5D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACzB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAErB,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA9Be,mBAAE,GAAG,UAAU,CAAC;AAEhB,8BAAa,GAAG,QAAQ,CAAC;AAEzB,yBAAQ,GAAG,QAAQ,CAAC;AAEpB,8BAAa,GAAG,IAAI,CAAC;AA4BzC,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"GetObisContent.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/GetObisContent.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAE,aAAa,EAA4B,MAAM,8BAA8B,CAAC;AAC5H,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAY1D,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,0DAA0D;QAChE,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;YACV,IAAI,EAAE;gBACF,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,CAAC;aACP;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,4BAA4B,EAAC;KAC7D;CACJ,CAAC;AA4BF,MAAM,gBAAiB,SAAQ,OAAO;IAClC,YAAqB,UAAuC;QACxD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA6B;QAGxD,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,aAAa,GAAG,mBAAmB,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACnG,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,gBAAgB,CAAC;YACxB,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE;YAC3B,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE;SACzB,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QACnD,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAE5D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC1B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAErB,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA9Be,mBAAE,GAAG,UAAU,CAAC;AAEhB,8BAAa,GAAG,QAAQ,CAAC;AAEzB,yBAAQ,GAAG,QAAQ,CAAC;AAEpB,8BAAa,GAAG,IAAI,CAAC;AA4BzC,eAAe,gBAAgB,CAAC"}

package/dist/obis-observer/commands/downlink/GetObisContentById.d.ts

@@ -11,7 +11,7 @@ declare class GetObisContentById extends Command {
     static readonly directionType = 1;
     static readonly examples: TCommandExampleList;
     static readonly hasParameters = true;
-    static fromBytes([requestId, meterId, obisId]: Uint8Array): GetObisContentById;
+    static fromBytes(data: Uint8Array): GetObisContentById;
     toBytes(): Uint8Array;
 }
 export default GetObisContentById;

package/dist/obis-observer/commands/downlink/GetObisContentById.js

@@ -1,5 +1,5 @@
 import Command from '../../Command.js';
-import { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import CommandBinaryBuffer, { REQUEST_ID_SIZE, METER_ID_SIZE } from '../../CommandBinaryBuffer.js';
 import { DOWNLINK } from '../../../constants/directions.js';
 const COMMAND_ID = 0x50;
 const examples = [
@@ -10,21 +10,30 @@ const examples = [
             meterId: 4,
             obisId: 50
         },
-        hex: { header: '50 03', body: '79 04 32' }
+        hex: { header: '50 06', body: '79 00 00 00 04 32' }
     }
 ];
 class GetObisContentById extends Command {
     constructor(parameters) {
         super();
         this.parameters = parameters;
-        this.size = REQUEST_ID_SIZE + 2;
+        this.size = REQUEST_ID_SIZE + METER_ID_SIZE + 1;
     }
-    static fromBytes([requestId, meterId, obisId]) {
-        return new GetObisContentById({ requestId, meterId, obisId });
+    static fromBytes(data) {
+        const buffer = new CommandBinaryBuffer(data);
+        return new GetObisContentById({
+            requestId: buffer.getUint8(),
+            meterId: buffer.getUint32(),
+            obisId: buffer.getUint8()
+        });
     }
     toBytes() {
-        const { parameters } = this;
-        return Command.toBytes(COMMAND_ID, new Uint8Array([parameters.requestId, parameters.meterId, parameters.obisId]));
+        const { requestId, meterId, obisId } = this.parameters;
+        const buffer = new CommandBinaryBuffer(this.size);
+        buffer.setUint8(requestId);
+        buffer.setUint32(meterId);
+        buffer.setUint8(obisId);
+        return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }
 GetObisContentById.id = COMMAND_ID;

package/dist/obis-observer/commands/downlink/GetObisContentById.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetObisContentById.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/GetObisContentById.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAqB,eAAe,EAAC,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAY1D,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,uCAAuC;QAC7C,UAAU,EAAE;YACR,SAAS,EAAE,GAAG;YACd,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,EAAE;SACb;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAC;KAC3C;CACJ,CAAC;AAwBF,MAAM,kBAAmB,SAAQ,OAAO;IACpC,YAAqB,UAAyC;QAC1D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA+B;QAI1D,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,CAAC;IACpC,CAAC;IAWD,MAAM,CAAC,SAAS,CAAG,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAa;QACvD,OAAO,IAAI,kBAAkB,CAAC,EAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAC,CAAC,CAAC;IAChE,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,UAAU,EAAC,GAAG,IAAI,CAAC;QAE1B,OAAO,OAAO,CAAC,OAAO,CAClB,UAAU,EACV,IAAI,UAAU,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAChF,CAAC;IACN,CAAC;;AArBe,qBAAE,GAAG,UAAU,CAAC;AAEhB,gCAAa,GAAG,QAAQ,CAAC;AAEzB,2BAAQ,GAAG,QAAQ,CAAC;AAEpB,gCAAa,GAAG,IAAI,CAAC;AAmBzC,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"GetObisContentById.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/GetObisContentById.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAqB,eAAe,EAAE,aAAa,EAAC,MAAM,8BAA8B,CAAC;AACrH,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAY1D,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,uCAAuC;QAC7C,UAAU,EAAE;YACR,SAAS,EAAE,GAAG;YACd,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,EAAE;SACb;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAC;KACpD;CACJ,CAAC;AAwBF,MAAM,kBAAmB,SAAQ,OAAO;IACpC,YAAqB,UAAyC;QAC1D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA+B;QAI1D,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,aAAa,GAAG,CAAC,CAAC;IACpD,CAAC;IAWD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,kBAAkB,CAAC;YAC1B,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE;YAC3B,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE;SAC5B,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QACrD,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAE5D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC1B,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAExB,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA7Be,qBAAE,GAAG,UAAU,CAAC;AAEhB,gCAAa,GAAG,QAAQ,CAAC;AAEzB,2BAAQ,GAAG,QAAQ,CAAC;AAEpB,gCAAa,GAAG,IAAI,CAAC;AA2BzC,eAAe,kBAAkB,CAAC"}

package/dist/obis-observer/commands/downlink/GetSerialPort.d.ts

@@ -0,0 +1,13 @@
+import Command, { TCommandExampleList } from '../../Command.js';
+import { ICommandParameters } from '../../CommandBinaryBuffer.js';
+declare class GetSerialPort extends Command {
+    parameters: ICommandParameters;
+    constructor(parameters: ICommandParameters);
+    static readonly id = 7;
+    static readonly directionType = 1;
+    static readonly examples: TCommandExampleList;
+    static readonly hasParameters = true;
+    static fromBytes([requestId]: Uint8Array): GetSerialPort;
+    toBytes(): Uint8Array;
+}
+export default GetSerialPort;

package/dist/obis-observer/commands/downlink/GetSerialPort.js

@@ -0,0 +1,32 @@
+import Command from '../../Command.js';
+import { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import { DOWNLINK } from '../../../constants/directions.js';
+const COMMAND_ID = 0x07;
+const examples = [
+    {
+        name: 'simple request',
+        parameters: {
+            requestId: 7
+        },
+        hex: { header: '07 01', body: '07' }
+    }
+];
+class GetSerialPort extends Command {
+    constructor(parameters) {
+        super();
+        this.parameters = parameters;
+        this.size = REQUEST_ID_SIZE;
+    }
+    static fromBytes([requestId]) {
+        return new GetSerialPort({ requestId });
+    }
+    toBytes() {
+        return Command.toBytes(COMMAND_ID, new Uint8Array([this.parameters.requestId]));
+    }
+}
+GetSerialPort.id = COMMAND_ID;
+GetSerialPort.directionType = DOWNLINK;
+GetSerialPort.examples = examples;
+GetSerialPort.hasParameters = true;
+export default GetSerialPort;
+//# sourceMappingURL=GetSerialPort.js.map

package/dist/obis-observer/commands/downlink/GetSerialPort.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GetSerialPort.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/GetSerialPort.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAqB,eAAe,EAAC,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAG1D,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,gBAAgB;QACtB,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;SACf;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAC;KACrC;CACJ,CAAC;AAsBF,MAAM,aAAc,SAAQ,OAAO;IAC/B,YAAqB,UAA8B;QAC/C,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAoB;QAG/C,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC;IAChC,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,CAAC,SAAS,CAAa;QACtC,OAAO,IAAI,aAAa,CAAC,EAAC,SAAS,EAAC,CAAC,CAAC;IAC1C,CAAC;IAGD,OAAO;QACH,OAAO,OAAO,CAAC,OAAO,CAClB,UAAU,EACV,IAAI,UAAU,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAC9C,CAAC;IACN,CAAC;;AApBe,gBAAE,GAAG,UAAU,CAAC;AAEhB,2BAAa,GAAG,QAAQ,CAAC;AAEzB,sBAAQ,GAAG,QAAQ,CAAC;AAEpB,2BAAa,GAAG,IAAI,CAAC;AAkBzC,eAAe,aAAa,CAAC"}

package/dist/obis-observer/commands/downlink/ReadMeterArchive.js

@@ -1,8 +1,8 @@
 import Command from '../../Command.js';
-import CommandBinaryBuffer, { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import CommandBinaryBuffer, { REQUEST_ID_SIZE, METER_ID_SIZE } from '../../CommandBinaryBuffer.js';
 import { DOWNLINK } from '../../../constants/directions.js';
 const COMMAND_ID = 0x11;
-const COMMAND_SIZE = REQUEST_ID_SIZE + 6;
+const COMMAND_SIZE = REQUEST_ID_SIZE + METER_ID_SIZE + 5;
 const examples = [
     {
         name: 'request to read all archive 1 for the meter 2 starts with index 4',
@@ -12,7 +12,7 @@ const examples = [
             index: 4,
             meterId: 2
         },
-        hex: { header: '11 07', body: '03 01 00 00 00 04 02' }
+        hex: { header: '11 0a', body: '03 01 00 00 00 04 00 00 00 02' }
     }
 ];
 class ReadMeterArchive extends Command {
@@ -27,7 +27,7 @@ class ReadMeterArchive extends Command {
             requestId: buffer.getUint8(),
             archiveType: buffer.getUint8(),
             index: buffer.getUint32(),
-            meterId: buffer.getUint8()
+            meterId: buffer.getUint32()
         });
     }
     toBytes() {
@@ -36,7 +36,7 @@ class ReadMeterArchive extends Command {
         buffer.setUint8(requestId);
         buffer.setUint8(archiveType);
         buffer.setUint32(index);
-        buffer.setUint8(meterId);
+        buffer.setUint32(meterId);
         return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }

package/dist/obis-observer/commands/downlink/ReadMeterArchive.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReadMeterArchive.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/ReadMeterArchive.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,kCAAkC,CAAC;AAa1D,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;AAEzC,MAAM,QAAQ,GAAwB;IAElC;QACI,IAAI,EAAE,mEAAmE;QACzE,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;YACd,KAAK,EAAE,CAAC;YACR,OAAO,EAAE,CAAC;SACb;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,sBAAsB,EAAC;KACvD;CACJ,CAAC;AAyBF,MAAM,gBAAiB,SAAQ,OAAO;IAClC,YAAqB,UAAuC;QACxD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA6B;QAGxD,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,gBAAgB,CAAC;YACxB,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC9B,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE;YACzB,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE;SAC7B,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,SAAS,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QACjE,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAE5D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC7B,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACxB,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAEzB,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAhCe,mBAAE,GAAG,UAAU,CAAC;AAEhB,8BAAa,GAAG,QAAQ,CAAC;AAEzB,yBAAQ,GAAG,QAAQ,CAAC;AAEpB,8BAAa,GAAG,IAAI,CAAC;AA8BzC,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"ReadMeterArchive.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/ReadMeterArchive.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAE,aAAa,EAAqB,MAAM,8BAA8B,CAAC;AACrH,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAa1D,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,aAAa,GAAG,CAAC,CAAC;AAEzD,MAAM,QAAQ,GAAwB;IAElC;QACI,IAAI,EAAE,mEAAmE;QACzE,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;YACd,KAAK,EAAE,CAAC;YACR,OAAO,EAAE,CAAC;SACb;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,+BAA+B,EAAC;KAChE;CACJ,CAAC;AAyBF,MAAM,gBAAiB,SAAQ,OAAO;IAClC,YAAqB,UAAuC;QACxD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA6B;QAGxD,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,gBAAgB,CAAC;YACxB,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC9B,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE;YACzB,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE;SAC9B,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,SAAS,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QACjE,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAE5D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC7B,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACxB,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE1B,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAhCe,mBAAE,GAAG,UAAU,CAAC;AAEhB,8BAAa,GAAG,QAAQ,CAAC;AAEzB,yBAAQ,GAAG,QAAQ,CAAC;AAEpB,8BAAa,GAAG,IAAI,CAAC;AA8BzC,eAAe,gBAAgB,CAAC"}

package/dist/obis-observer/commands/downlink/ReadMeterArchiveWithDate.js

@@ -1,8 +1,8 @@
 import Command from '../../Command.js';
-import CommandBinaryBuffer, { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import CommandBinaryBuffer, { REQUEST_ID_SIZE, METER_ID_SIZE } from '../../CommandBinaryBuffer.js';
 import { DOWNLINK } from '../../../constants/directions.js';
 const COMMAND_ID = 0x13;
-const COMMAND_SIZE = REQUEST_ID_SIZE + 10;
+const COMMAND_SIZE = REQUEST_ID_SIZE + METER_ID_SIZE + 9;
 const examples = [
     {
         name: 'request to read all archive 2 for the meter 1 starts with index 0 for the date 15-09-23 14:24:22',
@@ -13,7 +13,7 @@ const examples = [
             meterId: 1,
             time2000: 496333462
         },
-        hex: { header: '13 0b', body: '03 02 00 00 00 00 01 1d 95 72 96' }
+        hex: { header: '13 0e', body: '03 02 00 00 00 00 00 00 00 01 1d 95 72 96' }
     }
 ];
 class ReadMeterArchiveWithDate extends Command {
@@ -28,7 +28,7 @@ class ReadMeterArchiveWithDate extends Command {
             requestId: buffer.getUint8(),
             archiveType: buffer.getUint8(),
             index: buffer.getUint32(),
-            meterId: buffer.getUint8(),
+            meterId: buffer.getUint32(),
             time2000: buffer.getUint32()
         });
     }
@@ -38,7 +38,7 @@ class ReadMeterArchiveWithDate extends Command {
         buffer.setUint8(requestId);
         buffer.setUint8(archiveType);
         buffer.setUint32(index);
-        buffer.setUint8(meterId);
+        buffer.setUint32(meterId);
         buffer.setUint32(time2000);
         return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }

package/dist/obis-observer/commands/downlink/ReadMeterArchiveWithDate.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReadMeterArchiveWithDate.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/ReadMeterArchiveWithDate.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,kCAAkC,CAAC;AAe1D,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,EAAE,CAAC;AAE1C,MAAM,QAAQ,GAAwB;IAElC;QACI,IAAI,EAAE,kGAAkG;QACxG,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;YACd,KAAK,EAAE,CAAC;YACR,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE,SAAS;SACtB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,kCAAkC,EAAC;KACnE;CACJ,CAAC;AA0BF,MAAM,wBAAyB,SAAQ,OAAO;IAC1C,YAAqB,UAA+C;QAChE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAqC;QAGhE,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,wBAAwB,CAAC;YAChC,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC9B,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE;YACzB,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC1B,QAAQ,EAAE,MAAM,CAAC,SAAS,EAAE;SAC/B,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,SAAS,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAC3E,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAE5D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC7B,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACxB,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACzB,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAE3B,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAlCe,2BAAE,GAAG,UAAU,CAAC;AAEhB,sCAAa,GAAG,QAAQ,CAAC;AAEzB,iCAAQ,GAAG,QAAQ,CAAC;AAEpB,sCAAa,GAAG,IAAI,CAAC;AAgCzC,eAAe,wBAAwB,CAAC"}
+{"version":3,"file":"ReadMeterArchiveWithDate.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/ReadMeterArchiveWithDate.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAE,aAAa,EAAqB,MAAM,8BAA8B,CAAC;AACrH,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAe1D,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,aAAa,GAAG,CAAC,CAAC;AAEzD,MAAM,QAAQ,GAAwB;IAElC;QACI,IAAI,EAAE,kGAAkG;QACxG,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;YACd,KAAK,EAAE,CAAC;YACR,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE,SAAS;SACtB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,2CAA2C,EAAC;KAC5E;CACJ,CAAC;AA0BF,MAAM,wBAAyB,SAAQ,OAAO;IAC1C,YAAqB,UAA+C;QAChE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAqC;QAGhE,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,wBAAwB,CAAC;YAChC,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC9B,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE;YACzB,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE;YAC3B,QAAQ,EAAE,MAAM,CAAC,SAAS,EAAE;SAC/B,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,SAAS,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAC3E,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAE5D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC7B,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACxB,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC1B,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAE3B,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAlCe,2BAAE,GAAG,UAAU,CAAC;AAEhB,sCAAa,GAAG,QAAQ,CAAC;AAEzB,iCAAQ,GAAG,QAAQ,CAAC;AAEpB,sCAAa,GAAG,IAAI,CAAC;AAgCzC,eAAe,wBAAwB,CAAC"}

package/dist/obis-observer/commands/downlink/RemoveMeter.d.ts

@@ -10,7 +10,7 @@ declare class RemoveMeter extends Command {
     static readonly directionType = 1;
     static readonly examples: TCommandExampleList;
     static readonly hasParameters = true;
-    static fromBytes([requestId, meterId]: Uint8Array): RemoveMeter;
+    static fromBytes(data: Uint8Array): RemoveMeter;
     toBytes(): Uint8Array;
 }
 export default RemoveMeter;

package/dist/obis-observer/commands/downlink/RemoveMeter.js

@@ -1,8 +1,8 @@
 import Command from '../../Command.js';
-import { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import CommandBinaryBuffer, { REQUEST_ID_SIZE, METER_ID_SIZE } from '../../CommandBinaryBuffer.js';
 import { DOWNLINK } from '../../../constants/directions.js';
 const COMMAND_ID = 0x72;
-const COMMAND_SIZE = REQUEST_ID_SIZE + 1;
+const COMMAND_SIZE = REQUEST_ID_SIZE + METER_ID_SIZE;
 const examples = [
     {
         name: 'remove meter 17',
@@ -10,7 +10,7 @@ const examples = [
             requestId: 3,
             meterId: 17
         },
-        hex: { header: '72 02', body: '03 11' }
+        hex: { header: '72 05', body: '03 00 00 00 11' }
     }
 ];
 class RemoveMeter extends Command {
@@ -19,12 +19,19 @@ class RemoveMeter extends Command {
         this.parameters = parameters;
         this.size = COMMAND_SIZE;
     }
-    static fromBytes([requestId, meterId]) {
-        return new RemoveMeter({ requestId, meterId });
+    static fromBytes(data) {
+        const buffer = new CommandBinaryBuffer(data);
+        return new RemoveMeter({
+            requestId: buffer.getUint8(),
+            meterId: buffer.getUint32()
+        });
     }
     toBytes() {
-        const { parameters } = this;
-        return Command.toBytes(COMMAND_ID, new Uint8Array([parameters.requestId, parameters.meterId]));
+        const { requestId, meterId } = this.parameters;
+        const buffer = new CommandBinaryBuffer(this.size);
+        buffer.setUint8(requestId);
+        buffer.setUint32(meterId);
+        return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }
 RemoveMeter.id = COMMAND_ID;

package/dist/obis-observer/commands/downlink/RemoveMeter.js.map

@@ -1 +1 @@
-{"version":3,"file":"RemoveMeter.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/RemoveMeter.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAW1D,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;AAEzC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,iBAAiB;QACvB,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,EAAE;SACd;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAC;KACxC;CACJ,CAAC;AAuBF,MAAM,WAAY,SAAQ,OAAO;IAC7B,YAAqB,UAAkC;QACnD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAwB;QAGnD,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC7B,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,CAAC,SAAS,EAAE,OAAO,CAAa;QAC/C,OAAO,IAAI,WAAW,CAAC,EAAC,SAAS,EAAE,OAAO,EAAC,CAAC,CAAC;IACjD,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,UAAU,EAAC,GAAG,IAAI,CAAC;QAE1B,OAAO,OAAO,CAAC,OAAO,CAClB,UAAU,EACV,IAAI,UAAU,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAC7D,CAAC;IACN,CAAC;;AAtBe,cAAE,GAAG,UAAU,CAAC;AAEhB,yBAAa,GAAG,QAAQ,CAAC;AAEzB,oBAAQ,GAAG,QAAQ,CAAC;AAEpB,yBAAa,GAAG,IAAI,CAAC;AAoBzC,eAAe,WAAW,CAAC"}
+{"version":3,"file":"RemoveMeter.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/RemoveMeter.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAE,aAAa,EAAqB,MAAM,8BAA8B,CAAC;AACrH,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAW1D,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,aAAa,CAAC;AAErD,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,iBAAiB;QACvB,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,EAAE;SACd;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAC;KACjD;CACJ,CAAC;AAuBF,MAAM,WAAY,SAAQ,OAAO;IAC7B,YAAqB,UAAkC;QACnD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAwB;QAGnD,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,WAAW,CAAC;YACnB,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,OAAO,EAAE,MAAM,CAAC,SAAS,EAAE;SAC9B,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,SAAS,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAC7C,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAE5D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE1B,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA5Be,cAAE,GAAG,UAAU,CAAC;AAEhB,yBAAa,GAAG,QAAQ,CAAC;AAEzB,oBAAQ,GAAG,QAAQ,CAAC;AAEpB,yBAAa,GAAG,IAAI,CAAC;AA0BzC,eAAe,WAAW,CAAC"}

package/dist/obis-observer/commands/downlink/SetSerialPort.d.ts

@@ -1,14 +1,8 @@
 import Command, { TCommandExampleList } from '../../Command.js';
-import { ICommandParameters } from '../../CommandBinaryBuffer.js';
-interface ISetSerialPortParameters extends ICommandParameters {
-    baudRate: number;
-    dataBits: number;
-    parity: number;
-    fixed: boolean;
-}
+import { ISerialPortParameters, ICommandParameters } from '../../CommandBinaryBuffer.js';
 declare class SetSerialPort extends Command {
-    parameters: ISetSerialPortParameters;
-    constructor(parameters: ISetSerialPortParameters);
+    parameters: ISerialPortParameters & ICommandParameters;
+    constructor(parameters: ISerialPortParameters & ICommandParameters);
     static readonly id = 9;
     static readonly directionType = 1;
     static readonly examples: TCommandExampleList;