jooby-codec 2.10.0 → 2.12.0

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

@@ -1,10 +1,10 @@
 import Command from '../../Command.js';
-import { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import CommandBinaryBuffer, { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
 import { UPLINK } from '../../constants/directions.js';
-const COMMAND_ID = 0x16;
+const COMMAND_ID = 0x25;
 const examples = [
     {
-        name: 'response to GetLorawanState',
+        name: 'simple response',
         parameters: {
             requestId: 8,
             downlinkQuality: 1,
@@ -15,7 +15,7 @@ const examples = [
             resetFlag: 0,
             senderCollision: 0
         },
-        hex: { header: '16 08', body: '08 01 c1 05 06 00 00 00' }
+        hex: { header: '25', body: '08 01 c1 05 06 00 00 00' }
     }
 ];
 class GetLorawanStateResponse extends Command {
@@ -25,30 +25,33 @@ class GetLorawanStateResponse extends Command {
         this.size = REQUEST_ID_SIZE + 7;
     }
     static fromBytes(data) {
-        const [requestId, downlinkQuality, rssi, snr, deviceMargin, gateMargin, resetFlag, senderCollision] = data;
+        const buffer = new CommandBinaryBuffer(data);
         return new GetLorawanStateResponse({
-            requestId,
-            downlinkQuality,
-            rssi,
-            snr,
-            deviceMargin,
-            gateMargin,
-            resetFlag,
-            senderCollision
+            requestId: buffer.getUint8(),
+            downlinkQuality: buffer.getUint8(),
+            rssi: buffer.getUint8(),
+            snr: buffer.getUint8(),
+            deviceMargin: buffer.getUint8(),
+            gateMargin: buffer.getUint8(),
+            resetFlag: buffer.getUint8(),
+            senderCollision: buffer.getUint8()
         });
     }
     toBytes() {
+        if (typeof this.size !== 'number') {
+            throw new Error('unknown or invalid size');
+        }
+        const buffer = new CommandBinaryBuffer(this.size);
         const { parameters } = this;
-        return Command.toBytes(COMMAND_ID, new Uint8Array([
-            parameters.requestId,
-            parameters.downlinkQuality,
-            parameters.rssi,
-            parameters.snr,
-            parameters.deviceMargin,
-            parameters.gateMargin,
-            parameters.resetFlag,
-            parameters.senderCollision
-        ]));
+        buffer.setUint8(parameters.requestId);
+        buffer.setUint8(parameters.downlinkQuality);
+        buffer.setUint8(parameters.rssi);
+        buffer.setUint8(parameters.snr);
+        buffer.setUint8(parameters.deviceMargin);
+        buffer.setUint8(parameters.gateMargin);
+        buffer.setUint8(parameters.resetFlag);
+        buffer.setUint8(parameters.senderCollision);
+        return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }
 GetLorawanStateResponse.id = COMMAND_ID;

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

@@ -1 +1 @@
-{"version":3,"file":"GetLorawanStateResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetLorawanStateResponse.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;AAoBrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,6BAA6B;QACnC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,eAAe,EAAE,CAAC;YAClB,IAAI,EAAE,GAAG;YACT,GAAG,EAAE,CAAC;YACN,YAAY,EAAE,CAAC;YACf,UAAU,EAAE,CAAC;YACb,SAAS,EAAE,CAAC;YACZ,eAAe,EAAE,CAAC;SACrB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,yBAAyB,EAAC;KAC1D;CACJ,CAAC;AA+BF,MAAM,uBAAwB,SAAQ,OAAO;IACzC,YAAqB,UAA8C;QAC/D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAoC;QAI/D,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,CAAC;IACpC,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,CACF,SAAS,EACT,eAAe,EACf,IAAI,EACJ,GAAG,EACH,YAAY,EACZ,UAAU,EACV,SAAS,EACT,eAAe,CAClB,GAAG,IAAI,CAAC;QAET,OAAO,IAAI,uBAAuB,CAAC;YAC/B,SAAS;YACT,eAAe;YACf,IAAI;YACJ,GAAG;YACH,YAAY;YACZ,UAAU;YACV,SAAS;YACT,eAAe;SAClB,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,UAAU,EAAC,GAAG,IAAI,CAAC;QAE1B,OAAO,OAAO,CAAC,OAAO,CAClB,UAAU,EACV,IAAI,UAAU,CAAC;YACX,UAAU,CAAC,SAAS;YACpB,UAAU,CAAC,eAAe;YAC1B,UAAU,CAAC,IAAI;YACf,UAAU,CAAC,GAAG;YACd,UAAU,CAAC,YAAY;YACvB,UAAU,CAAC,UAAU;YACrB,UAAU,CAAC,SAAS;YACpB,UAAU,CAAC,eAAe;SAC7B,CAAC,CACL,CAAC;IACN,CAAC;;AAnDe,0BAAE,GAAG,UAAU,CAAC;AAEhB,qCAAa,GAAG,MAAM,CAAC;AAEvB,gCAAQ,GAAG,QAAQ,CAAC;AAEpB,qCAAa,GAAG,IAAI,CAAC;AAiDzC,eAAe,uBAAuB,CAAC"}
+{"version":3,"file":"GetLorawanStateResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetLorawanStateResponse.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;AAoBrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,iBAAiB;QACvB,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,eAAe,EAAE,CAAC;YAClB,IAAI,EAAE,GAAG;YACT,GAAG,EAAE,CAAC;YACN,YAAY,EAAE,CAAC;YACf,UAAU,EAAE,CAAC;YACb,SAAS,EAAE,CAAC;YACZ,eAAe,EAAE,CAAC;SACrB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,yBAAyB,EAAC;KACvD;CACJ,CAAC;AA+BF,MAAM,uBAAwB,SAAQ,OAAO;IACzC,YAAqB,UAA8C;QAC/D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAoC;QAI/D,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,uBAAuB,CAAC;YAC/B,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,eAAe,EAAE,MAAM,CAAC,QAAQ,EAAE;YAClC,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE;YACvB,GAAG,EAAE,MAAM,CAAC,QAAQ,EAAE;YACtB,YAAY,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC/B,UAAU,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC7B,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,eAAe,EAAE,MAAM,CAAC,QAAQ,EAAE;SACrC,CAAC,CAAC;IACP,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,UAAU,EAAC,GAAG,IAAI,CAAC;QAE1B,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAC5C,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAChC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QACzC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACvC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAE5C,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA5Ce,0BAAE,GAAG,UAAU,CAAC;AAEhB,qCAAa,GAAG,MAAM,CAAC;AAEvB,gCAAQ,GAAG,QAAQ,CAAC;AAEpB,qCAAa,GAAG,IAAI,CAAC;AA0CzC,eAAe,uBAAuB,CAAC"}

package/dist/obis-observer/commands/uplink/{GetMeterReadoutStateResponse.d.ts → GetReadoutStateResponse.d.ts}

@@ -1,6 +1,6 @@
 import Command, { TCommandExampleList } from '../../Command.js';
 import { ICommandParameters } from '../../CommandBinaryBuffer.js';
-interface IGetMeterReadoutStateResponseParameters extends ICommandParameters {
+interface IGetReadoutStateResponseParameters extends ICommandParameters {
     lastSuccessfulTime: number;
     lastFailedTime: number;
     readoutAttempts: number;
@@ -14,14 +14,14 @@ interface IGetMeterReadoutStateResponseParameters extends ICommandParameters {
     frameErrors: number;
     overrunErrors: number;
 }
-declare class GetMeterReadoutStateResponse extends Command {
-    parameters: IGetMeterReadoutStateResponseParameters;
-    constructor(parameters: IGetMeterReadoutStateResponseParameters);
-    static readonly id = 130;
+declare class GetReadoutStateResponse extends Command {
+    parameters: IGetReadoutStateResponseParameters;
+    constructor(parameters: IGetReadoutStateResponseParameters);
+    static readonly id = 39;
     static readonly directionType = 2;
     static readonly examples: TCommandExampleList;
     static readonly hasParameters = true;
-    static fromBytes(data: Uint8Array): GetMeterReadoutStateResponse;
+    static fromBytes(data: Uint8Array): GetReadoutStateResponse;
     toBytes(): Uint8Array;
 }
-export default GetMeterReadoutStateResponse;
+export default GetReadoutStateResponse;

package/dist/obis-observer/commands/uplink/{GetMeterReadoutStateResponse.js → GetReadoutStateResponse.js}

@@ -1,10 +1,10 @@
 import Command from '../../Command.js';
 import CommandBinaryBuffer, { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
 import { UPLINK } from '../../constants/directions.js';
-const COMMAND_ID = 0x82;
+const COMMAND_ID = 0x27;
 const examples = [
     {
-        name: 'response to GetMeterReadoutState',
+        name: 'simple response',
         parameters: {
             requestId: 3,
             lastSuccessfulTime: 127,
@@ -20,10 +20,10 @@ const examples = [
             frameErrors: 0,
             overrunErrors: 0
         },
-        hex: { header: '82 16', body: '03 00 00 00 7f 00 00 00 c1 00 0e 00 0c 00 02 00 00 00 00 00 00 00' }
+        hex: { header: '27', body: '03 00 00 00 7f 00 00 00 c1 00 0e 00 0c 00 02 00 00 00 00 00 00 00' }
     }
 ];
-class GetMeterReadoutStateResponse extends Command {
+class GetReadoutStateResponse extends Command {
     constructor(parameters) {
         super();
         this.parameters = parameters;
@@ -31,7 +31,7 @@ class GetMeterReadoutStateResponse extends Command {
     }
     static fromBytes(data) {
         const buffer = new CommandBinaryBuffer(data);
-        return new GetMeterReadoutStateResponse({
+        return new GetReadoutStateResponse({
             requestId: buffer.getUint8(),
             lastSuccessfulTime: buffer.getUint32(),
             lastFailedTime: buffer.getUint32(),
@@ -69,9 +69,9 @@ class GetMeterReadoutStateResponse extends Command {
         return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }
-GetMeterReadoutStateResponse.id = COMMAND_ID;
-GetMeterReadoutStateResponse.directionType = UPLINK;
-GetMeterReadoutStateResponse.examples = examples;
-GetMeterReadoutStateResponse.hasParameters = true;
-export default GetMeterReadoutStateResponse;
-//# sourceMappingURL=GetMeterReadoutStateResponse.js.map
+GetReadoutStateResponse.id = COMMAND_ID;
+GetReadoutStateResponse.directionType = UPLINK;
+GetReadoutStateResponse.examples = examples;
+GetReadoutStateResponse.hasParameters = true;
+export default GetReadoutStateResponse;
+//# sourceMappingURL=GetReadoutStateResponse.js.map

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

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

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

@@ -0,0 +1,17 @@
+import Command, { TCommandExampleList } from '../../Command.js';
+import { ICommandParameters, IObisProfile, IObis } from '../../CommandBinaryBuffer.js';
+interface IGetShortNameInfoResponseParameters extends ICommandParameters {
+    obis?: IObis;
+    obisProfile?: IObisProfile;
+}
+declare class GetShortNameInfoResponse extends Command {
+    parameters: IGetShortNameInfoResponseParameters;
+    constructor(parameters: IGetShortNameInfoResponseParameters);
+    static readonly id = 12;
+    static readonly directionType = 2;
+    static readonly examples: TCommandExampleList;
+    static readonly hasParameters = true;
+    static fromBytes(data: Uint8Array): GetShortNameInfoResponse;
+    toBytes(): Uint8Array;
+}
+export default GetShortNameInfoResponse;

package/dist/obis-observer/commands/uplink/{GetObisInfoResponse.js → GetShortNameInfoResponse.js}

@@ -2,10 +2,10 @@ import Command from '../../Command.js';
 import CommandBinaryBuffer, { REQUEST_ID_SIZE, OBIS_PROFILE_SIZE } from '../../CommandBinaryBuffer.js';
 import { UPLINK } from '../../constants/directions.js';
 import { contentTypes } from '../../constants/index.js';
-const COMMAND_ID = 0x4b;
+const COMMAND_ID = 0x0c;
 const examples = [
     {
-        name: 'response to GetObisInfo with obis code 0.9.1 and obis profile',
+        name: 'short name info with obis code 0.9.1 and obis profile',
         parameters: {
             requestId: 3,
             obis: {
@@ -25,14 +25,14 @@ const examples = [
                 }
             }
         },
-        hex: { header: '4b 0b', body: '03 02 00 09 01 01 58 02 14 3d 15' }
+        hex: { header: '0c', body: '0b 03 02 00 09 01 01 58 02 14 3d 15' }
     }
 ];
-class GetObisInfoResponse extends Command {
+class GetShortNameInfoResponse extends Command {
     constructor(parameters) {
         super();
         this.parameters = parameters;
-        let size = REQUEST_ID_SIZE;
+        let size = 1 + REQUEST_ID_SIZE;
         if (parameters.obis) {
             size += CommandBinaryBuffer.getObisSize(parameters.obis);
         }
@@ -43,7 +43,7 @@ class GetObisInfoResponse extends Command {
     }
     static fromBytes(data) {
         const buffer = new CommandBinaryBuffer(data);
-        let size = data.length - REQUEST_ID_SIZE;
+        let size = buffer.getUint8() - REQUEST_ID_SIZE;
         const requestId = buffer.getUint8();
         let obis;
         let obisProfile;
@@ -54,7 +54,7 @@ class GetObisInfoResponse extends Command {
         if (size > 0) {
             obisProfile = buffer.getObisProfile();
         }
-        return new GetObisInfoResponse({ requestId, obis, obisProfile });
+        return new GetShortNameInfoResponse({ requestId, obis, obisProfile });
     }
     toBytes() {
         if (typeof this.size !== 'number') {
@@ -62,6 +62,7 @@ class GetObisInfoResponse extends Command {
         }
         const buffer = new CommandBinaryBuffer(this.size);
         const { requestId, obis, obisProfile } = this.parameters;
+        buffer.setUint8(this.size - 1);
         buffer.setUint8(requestId);
         if (obis) {
             buffer.setObis(obis);
@@ -72,9 +73,9 @@ class GetObisInfoResponse extends Command {
         return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }
-GetObisInfoResponse.id = COMMAND_ID;
-GetObisInfoResponse.directionType = UPLINK;
-GetObisInfoResponse.examples = examples;
-GetObisInfoResponse.hasParameters = true;
-export default GetObisInfoResponse;
-//# sourceMappingURL=GetObisInfoResponse.js.map
+GetShortNameInfoResponse.id = COMMAND_ID;
+GetShortNameInfoResponse.directionType = UPLINK;
+GetShortNameInfoResponse.examples = examples;
+GetShortNameInfoResponse.hasParameters = true;
+export default GetShortNameInfoResponse;
+//# sourceMappingURL=GetShortNameInfoResponse.js.map

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

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

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

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

package/dist/obis-observer/commands/uplink/{GetObisProfileResponse.js → GetShortNameProfileResponse.js}

@@ -2,11 +2,11 @@ import Command from '../../Command.js';
 import CommandBinaryBuffer, { REQUEST_ID_SIZE, OBIS_PROFILE_SIZE } from '../../CommandBinaryBuffer.js';
 import { UPLINK } from '../../constants/directions.js';
 import { contentTypes } from '../../constants/index.js';
-const COMMAND_ID = 0x49;
+const COMMAND_ID = 0x0a;
 const COMMAND_SIZE = REQUEST_ID_SIZE + OBIS_PROFILE_SIZE;
 const examples = [
     {
-        name: 'response to GetObisProfile',
+        name: 'profile for short name 121',
         parameters: {
             requestId: 3,
             obisProfile: {
@@ -21,10 +21,10 @@ const examples = [
                 }
             }
         },
-        hex: { header: '49 07', body: '03 01 58 02 14 3d 13' }
+        hex: { header: '0a', body: '03 01 58 02 14 3d 13' }
     }
 ];
-class GetObisProfileResponse extends Command {
+class GetShortNameProfileResponse extends Command {
     constructor(parameters) {
         super();
         this.parameters = parameters;
@@ -34,7 +34,7 @@ class GetObisProfileResponse extends Command {
         const buffer = new CommandBinaryBuffer(data);
         const requestId = buffer.getUint8();
         const obisProfile = buffer.getObisProfile();
-        return new GetObisProfileResponse({ requestId, obisProfile });
+        return new GetShortNameProfileResponse({ requestId, obisProfile });
     }
     toBytes() {
         if (typeof this.size !== 'number') {
@@ -47,9 +47,9 @@ class GetObisProfileResponse extends Command {
         return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
     }
 }
-GetObisProfileResponse.id = COMMAND_ID;
-GetObisProfileResponse.directionType = UPLINK;
-GetObisProfileResponse.examples = examples;
-GetObisProfileResponse.hasParameters = true;
-export default GetObisProfileResponse;
-//# sourceMappingURL=GetObisProfileResponse.js.map
+GetShortNameProfileResponse.id = COMMAND_ID;
+GetShortNameProfileResponse.directionType = UPLINK;
+GetShortNameProfileResponse.examples = examples;
+GetShortNameProfileResponse.hasParameters = true;
+export default GetShortNameProfileResponse;
+//# sourceMappingURL=GetShortNameProfileResponse.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"GetShortNameProfileResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetShortNameProfileResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAE,iBAAiB,EAAmC,MAAM,8BAA8B,CAAC;AACvI,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAUtD,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,iBAAiB,CAAC;AAEzD,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,4BAA4B;QAClC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE;gBACT,aAAa,EAAE,GAAG;gBAClB,aAAa,EAAE,GAAG;gBAClB,cAAc,EAAE,EAAE;gBAClB,KAAK,EAAE;oBACH,WAAW,EAAE,YAAY,CAAC,MAAM;oBAChC,YAAY,EAAE,KAAK;oBACnB,eAAe,EAAE,IAAI;oBACrB,eAAe,EAAE,IAAI;iBACxB;aACJ;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,sBAAsB,EAAC;KACpD;CACJ,CAAC;AAiCF,MAAM,2BAA4B,SAAQ,OAAO;IAC7C,YAAqB,UAAkD;QACnE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAwC;QAGnE,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC7B,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,CAAC;QAE5C,OAAO,IAAI,2BAA2B,CAAC,EAAC,SAAS,EAAE,WAAW,EAAC,CAAC,CAAC;IACrE,CAAC;IAGD,OAAO;QACH,IAAK,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAG;YACjC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC9C;QAED,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,EAAC,SAAS,EAAE,WAAW,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAEjD,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAEnC,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAhCe,8BAAE,GAAG,UAAU,CAAC;AAEhB,yCAAa,GAAG,MAAM,CAAC;AAEvB,oCAAQ,GAAG,QAAQ,CAAC;AAEpB,yCAAa,GAAG,IAAI,CAAC;AA8BzC,eAAe,2BAA2B,CAAC"}

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

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

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

@@ -0,0 +1,45 @@
+import Command from '../../Command.js';
+import CommandBinaryBuffer, { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
+import { UPLINK } from '../../constants/directions.js';
+const COMMAND_ID = 0x02;
+const examples = [
+    {
+        name: 'two short names for OBIS code 0.9.1 - local time',
+        parameters: {
+            requestId: 3,
+            shortNameList: [197, 198]
+        },
+        hex: { header: '02', body: '03 03 c5 c6' }
+    }
+];
+class GetShortNamesResponse extends Command {
+    constructor(parameters) {
+        super();
+        this.parameters = parameters;
+        this.size = 1 + REQUEST_ID_SIZE + parameters.shortNameList.length;
+    }
+    static fromBytes(data) {
+        const buffer = new CommandBinaryBuffer(data);
+        const size = buffer.getUint8();
+        const requestId = buffer.getUint8();
+        const shortNameList = [...new Array(size - REQUEST_ID_SIZE)].map(() => buffer.getUint8());
+        return new GetShortNamesResponse({ requestId, shortNameList });
+    }
+    toBytes() {
+        if (typeof this.size !== 'number') {
+            throw new Error('unknown or invalid size');
+        }
+        const buffer = new CommandBinaryBuffer(this.size);
+        const { requestId, shortNameList } = this.parameters;
+        buffer.setUint8(this.size - 1);
+        buffer.setUint8(requestId);
+        shortNameList.forEach(shortName => buffer.setUint8(shortName));
+        return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
+    }
+}
+GetShortNamesResponse.id = COMMAND_ID;
+GetShortNamesResponse.directionType = UPLINK;
+GetShortNamesResponse.examples = examples;
+GetShortNamesResponse.hasParameters = true;
+export default GetShortNamesResponse;
+//# sourceMappingURL=GetShortNamesResponse.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"GetShortNamesResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetShortNamesResponse.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,kDAAkD;QACxD,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,aAAa,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;SAC5B;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAC;KAC3C;CACJ,CAAC;AAuBF,MAAM,qBAAsB,SAAQ,OAAO;IACvC,YAAqB,UAA4C;QAC7D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAkC;QAI7D,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,eAAe,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC;IACtE,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAEpC,MAAM,aAAa,GAAG,CAAC,GAAG,IAAI,KAAK,CAAC,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE1F,OAAO,IAAI,qBAAqB,CAAC,EAAC,SAAS,EAAE,aAAa,EAAC,CAAC,CAAC;IACjE,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,aAAa,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAGnD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;QAE/D,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AApCe,wBAAE,GAAG,UAAU,CAAC;AAEhB,mCAAa,GAAG,MAAM,CAAC;AAEvB,8BAAQ,GAAG,QAAQ,CAAC;AAEpB,mCAAa,GAAG,IAAI,CAAC;AAkCzC,eAAe,qBAAqB,CAAC"}

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

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

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

@@ -1,50 +1,51 @@
 import Command from '../../Command.js';
 import CommandBinaryBuffer, { DATE_TIME_SIZE } from '../../CommandBinaryBuffer.js';
 import { UPLINK } from '../../constants/directions.js';
-const COMMAND_ID = 0x51;
+const COMMAND_ID = 0x1a;
 const examples = [
     {
-        name: 'observation report from 2023.12.23 00:00:00 GMT',
+        name: 'get observation report from 2023.12.23 00:00:00 GMT',
         parameters: {
             time2000: 756604800,
-            obisValueList: [
+            shortNameList: [
                 { code: 50, content: 34.33 },
                 { code: 56, content: 45.33 }
             ]
         },
-        hex: { header: '51 0e', body: '2d 18 df 80 32 42 09 51 ec 38 42 35 51 ec' }
+        hex: { header: '1a', body: '0e 2d 18 df 80 32 42 09 51 ec 38 42 35 51 ec' }
     }
 ];
 class ObservationReport extends Command {
     constructor(parameters) {
         super();
         this.parameters = parameters;
-        let size = DATE_TIME_SIZE;
-        this.parameters.obisValueList.forEach(obisValue => {
-            size += CommandBinaryBuffer.getObisContentSize(obisValue);
+        let size = 1 + DATE_TIME_SIZE;
+        this.parameters.shortNameList.forEach(shortName => {
+            size += CommandBinaryBuffer.getShortNameContentSize(shortName);
         });
         this.size = size;
     }
     static fromBytes(data) {
         const buffer = new CommandBinaryBuffer(data);
-        let size = data.length - DATE_TIME_SIZE;
+        let size = buffer.getUint8() - DATE_TIME_SIZE;
         const time2000 = buffer.getUint32();
-        const obisValueList = [];
+        const shortNameList = [];
         while (size > 0) {
-            const obisValue = buffer.getObisValueFloat();
-            size -= CommandBinaryBuffer.getObisContentSize(obisValue);
-            obisValueList.push(obisValue);
+            const shortName = buffer.getShortNameFloat();
+            size -= CommandBinaryBuffer.getShortNameContentSize(shortName);
+            shortNameList.push(shortName);
         }
-        return new ObservationReport({ time2000, obisValueList });
+        return new ObservationReport({ time2000, shortNameList });
     }
     toBytes() {
         if (typeof this.size !== 'number') {
             throw new Error('unknown or invalid size');
         }
         const buffer = new CommandBinaryBuffer(this.size);
-        const { time2000, obisValueList } = this.parameters;
+        const { time2000, shortNameList } = this.parameters;
+        buffer.setUint8(this.size - 1);
         buffer.setUint32(time2000);
-        obisValueList.forEach(obisValue => buffer.setObisValueFloat(obisValue));
+        shortNameList.forEach(shortName => buffer.setShortNameFloat(shortName));
         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,iDAAiD;QACvD,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,OAAO,EAAE,IAAI,EAAE,2CAA2C,EAAC;KAC5E;CACJ,CAAC;AA0BF,MAAM,iBAAkB,SAAQ,OAAO;IACnC,YAAqB,UAAwC;QACzD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA8B;QAGzD,IAAI,IAAI,GAAG,cAAc,CAAC;QAE1B,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;QAE7C,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC;QACxC,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,kBAAkB,CAAC,SAAS,CAAC,CAAC;YAC1D,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;QAElD,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;;AAxCe,oBAAE,GAAG,UAAU,CAAC;AAEhB,+BAAa,GAAG,MAAM,CAAC;AAEvB,0BAAQ,GAAG,QAAQ,CAAC;AAEpB,+BAAa,GAAG,IAAI,CAAC;AAsCzC,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;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

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

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

@@ -1,20 +1,20 @@
 import Command from '../../Command.js';
 import CommandBinaryBuffer, { DATE_TIME_SIZE } from '../../CommandBinaryBuffer.js';
 import { UPLINK } from '../../constants/directions.js';
-const COMMAND_ID = 0x52;
+const COMMAND_ID = 0x1b;
 const examples = [
     {
-        name: 'observation report from 2023.12.23 00:00:00 GMT',
+        name: 'get observation report from 2023.12.23 00:00:00 GMT',
         parameters: {
             time2000: 756604800,
-            obisValueList: [
+            shortNameList: [
                 { code: 50, content: 'reactive power QI, average' },
                 { code: 56, content: 'reactive power QI, total' }
             ]
         },
         hex: {
-            header: '52 3a',
-            body: '2d 18 df 80 32 1a 72 65 61 63 74 69 76 65 20 70 6f 77 65'
+            header: '1b',
+            body: '3a 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'
         }
@@ -24,32 +24,33 @@ class ObservationReportString extends Command {
     constructor(parameters) {
         super();
         this.parameters = parameters;
-        let size = DATE_TIME_SIZE;
-        this.parameters.obisValueList.forEach(obisValue => {
-            size += CommandBinaryBuffer.getObisContentSize(obisValue);
+        let size = 1 + DATE_TIME_SIZE;
+        this.parameters.shortNameList.forEach(shortName => {
+            size += CommandBinaryBuffer.getShortNameContentSize(shortName);
         });
         this.size = size;
     }
     static fromBytes(data) {
         const buffer = new CommandBinaryBuffer(data);
-        let size = data.length - DATE_TIME_SIZE;
+        let size = buffer.getUint8() - DATE_TIME_SIZE;
         const time2000 = buffer.getUint32();
-        const obisValueList = [];
+        const shortNameList = [];
         while (size > 0) {
-            const obisValue = buffer.getObisValueString();
-            size -= CommandBinaryBuffer.getObisContentSize(obisValue);
-            obisValueList.push(obisValue);
+            const shortName = buffer.getShortNameString();
+            size -= CommandBinaryBuffer.getShortNameContentSize(shortName);
+            shortNameList.push(shortName);
         }
-        return new ObservationReportString({ time2000, obisValueList });
+        return new ObservationReportString({ time2000, shortNameList });
     }
     toBytes() {
         if (typeof this.size !== 'number') {
             throw new Error('unknown or invalid size');
         }
         const buffer = new CommandBinaryBuffer(this.size);
-        const { time2000, obisValueList } = this.parameters;
+        const { time2000, shortNameList } = this.parameters;
+        buffer.setUint8(this.size - 1);
         buffer.setUint32(time2000);
-        obisValueList.forEach(obisValue => buffer.setObisValueString(obisValue));
+        shortNameList.forEach(shortName => buffer.setShortNameString(shortName));
         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,iDAAiD;QACvD,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,OAAO;YACf,IAAI,EAAE,0DAA0D;kBAC1D,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,CAAC;QAE1B,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;QAE7C,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC;QACxC,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,kBAAkB,CAAC,SAAS,CAAC,CAAC;YAC1D,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;QAElD,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;;AAxCe,0BAAE,GAAG,UAAU,CAAC;AAEhB,qCAAa,GAAG,MAAM,CAAC;AAEvB,gCAAQ,GAAG,QAAQ,CAAC;AAEpB,qCAAa,GAAG,IAAI,CAAC;AAsCzC,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;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"}