jooby-codec 3.11.0 → 3.12.0

package/dist/mtxLora/commands/uplink/GetDayEnergies.js

@@ -1,5 +1,5 @@
-import Command, { COMMAND_HEADER_SIZE } from '../../Command.js';
-import CommandBinaryBuffer from '../../CommandBinaryBuffer.js';
+import Command, { COMMAND_HEADER_SIZE, defaultDlmsJsonOptions } from '../../Command.js';
+import CommandBinaryBuffer, { TARIFF_NUMBER } from '../../CommandBinaryBuffer.js';
 import { UPLINK } from '../../../constants/directions.js';
 const COMMAND_ID = 0x78;
 const DATE_SIZE = 3;
@@ -27,6 +27,32 @@ const examples = [
         }
     }
 ];
+const energiesToObis = {
+    'A+': '1.8.x',
+    'A+R+': '3.8.x',
+    'A+R-': '4.8.x',
+    'A-': '2.8.x',
+    'A-R+': '7.8.x',
+    'A-R-': '8.8.x'
+};
+const convertEnergyToObis = (energy, tariff = 0) => {
+    const obis = energiesToObis[energy];
+    return obis ? obis.replace('x', tariff.toString(10)) : '';
+};
+const convertTariffsEnergiesToDlms = (energies) => {
+    const dlms = {};
+    for (let tariff = 0; tariff < TARIFF_NUMBER; tariff++) {
+        const tariffEnergies = energies[tariff];
+        if (tariffEnergies) {
+            for (const [energy, value] of Object.entries(tariffEnergies)) {
+                if (value || value === 0) {
+                    dlms[convertEnergyToObis(energy, tariff + 1)] = value;
+                }
+            }
+        }
+    }
+    return dlms;
+};
 class GetDayEnergies extends Command {
     constructor(parameters) {
         super();
@@ -50,6 +76,17 @@ class GetDayEnergies extends Command {
             ...buffer.getBytesToOffset()
         ]);
     }
+    toJson({ dlms } = defaultDlmsJsonOptions) {
+        const { parameters } = this;
+        const { date, energies } = parameters;
+        const result = dlms
+            ? {
+                date,
+                ...convertTariffsEnergiesToDlms(energies)
+            }
+            : parameters;
+        return JSON.stringify(result);
+    }
 }
 GetDayEnergies.id = COMMAND_ID;
 GetDayEnergies.directionType = UPLINK;

package/dist/mtxLora/commands/uplink/GetDayEnergies.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetDayEnergies.js","sourceRoot":"","sources":["../../../../src/mtxLora/commands/uplink/GetDayEnergies.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAsB,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AACnF,OAAO,mBAA8C,MAAM,8BAA8B,CAAC;AAC1F,OAAO,EAAC,MAAM,EAAC,MAAM,kCAAkC,CAAC;AASxD,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,SAAS,GAAG,CAAC,CAAC;AACpB,MAAM,yBAAyB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAC5C,MAAM,gBAAgB,GAAG,SAAS,GAAG,yBAAyB,CAAC;AAE/D,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,kBAAkB;QACxB,UAAU,EAAE;YACR,IAAI,EAAE;gBACF,IAAI,EAAE,EAAE;gBACR,KAAK,EAAE,CAAC;gBACR,GAAG,EAAE,CAAC;aACT;YACD,QAAQ,EAAE;gBACN;oBACI,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,MAAM;iBACjB;aACJ;SACJ;QACD,GAAG,EAAE;YACD,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,qCAAqC;SAC9C;KACJ;CACJ,CAAC;AA8BF,MAAM,cAAe,SAAQ,OAAO;IAChC,YAAqB,UAA2B;QAC5C,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAiB;IAEhD,CAAC;IAeD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,cAAc,CAAC;YACtB,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE;YACtB,QAAQ,EAAE,MAAM,CAAC,kBAAkB,EAAE;SACxC,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,UAAU,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,EAAC,GAAG,IAAI,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,mBAAmB,GAAG,gBAAgB,CAAC,CAAC;QAG/E,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrB,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAEpC,OAAO,IAAI,UAAU,CAAC;YAClB,UAAU;YACV,MAAM,CAAC,QAAQ;YACf,GAAG,MAAM,CAAC,gBAAgB,EAAE;SAC/B,CAAC,CAAC;IACP,CAAC;;AAnCe,iBAAE,GAAG,UAAU,CAAC;AAEhB,4BAAa,GAAG,MAAM,CAAC;AAEvB,uBAAQ,GAAG,QAAQ,CAAC;AAEpB,4BAAa,GAAG,IAAI,CAAC;AAErB,sBAAO,GAAG,GAAG,CAAC;AA+BlC,eAAe,cAAc,CAAC"}
+{"version":3,"file":"GetDayEnergies.js","sourceRoot":"","sources":["../../../../src/mtxLora/commands/uplink/GetDayEnergies.ts"],"names":[],"mappings":"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"}

package/dist/mtxLora/commands/uplink/GetDayMaxPower.d.ts

@@ -1,4 +1,4 @@
-import Command, { TCommandExampleList } from '../../Command.js';
+import Command, { TCommandExampleList, IDlmsJsonOptions } from '../../Command.js';
 import { IDate, TTariffsPowerMax } from '../../CommandBinaryBuffer.js';
 interface IGetDayMaxPower {
     date: IDate;
@@ -14,5 +14,6 @@ declare class GetDayMaxPower extends Command {
     static readonly maxSize = 148;
     static fromBytes(data: Uint8Array): GetDayMaxPower;
     toBytes(): Uint8Array;
+    toJson({ dlms }?: IDlmsJsonOptions): string;
 }
 export default GetDayMaxPower;

package/dist/mtxLora/commands/uplink/GetDayMaxPower.js

@@ -1,5 +1,5 @@
-import Command, { COMMAND_HEADER_SIZE } from '../../Command.js';
-import CommandBinaryBuffer from '../../CommandBinaryBuffer.js';
+import Command, { COMMAND_HEADER_SIZE, defaultDlmsJsonOptions } from '../../Command.js';
+import CommandBinaryBuffer, { TARIFF_NUMBER } from '../../CommandBinaryBuffer.js';
 import { UPLINK } from '../../../constants/directions.js';
 const COMMAND_ID = 0x79;
 const DATE_SIZE = 3;
@@ -35,6 +35,32 @@ const examples = [
         }
     }
 ];
+const energiesToObis = {
+    'A+': '1.6.x',
+    'A+R+': '3.6.x',
+    'A+R-': '4.6.x',
+    'A-': '2.6.x',
+    'A-R+': '7.6.x',
+    'A-R-': '8.6.x'
+};
+const convertEnergyToObis = (energy, tariff = 0) => {
+    const obis = energiesToObis[energy];
+    return obis ? obis.replace('x', tariff.toString(10)) : '';
+};
+const convertTariffsPowerMaxToDlms = (energies) => {
+    const dlms = {};
+    for (let tariff = 0; tariff < TARIFF_NUMBER; tariff++) {
+        const tariffEnergies = energies[tariff];
+        if (tariffEnergies) {
+            for (const [energy, value] of Object.entries(tariffEnergies)) {
+                if (value || value === 0) {
+                    dlms[convertEnergyToObis(energy, tariff + 1)] = value;
+                }
+            }
+        }
+    }
+    return dlms;
+};
 class GetDayMaxPower extends Command {
     constructor(parameters) {
         super();
@@ -58,6 +84,17 @@ class GetDayMaxPower extends Command {
             ...buffer.getBytesToOffset()
         ]);
     }
+    toJson({ dlms } = defaultDlmsJsonOptions) {
+        const { parameters } = this;
+        const { date, tariffs } = parameters;
+        const result = dlms
+            ? {
+                date,
+                ...convertTariffsPowerMaxToDlms(tariffs)
+            }
+            : parameters;
+        return JSON.stringify(result);
+    }
 }
 GetDayMaxPower.id = COMMAND_ID;
 GetDayMaxPower.directionType = UPLINK;

package/dist/mtxLora/commands/uplink/GetDayMaxPower.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetDayMaxPower.js","sourceRoot":"","sources":["../../../../src/mtxLora/commands/uplink/GetDayMaxPower.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAsB,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AACnF,OAAO,mBAA8C,MAAM,8BAA8B,CAAC;AAC1F,OAAO,EAAC,MAAM,EAAC,MAAM,kCAAkC,CAAC;AASxD,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,SAAS,GAAG,CAAC,CAAC;AACpB,MAAM,yBAAyB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;AACtD,MAAM,gBAAgB,GAAG,SAAS,GAAG,yBAAyB,CAAC;AAE/D,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,mBAAmB;QACzB,UAAU,EAAE;YACR,IAAI,EAAE;gBACF,IAAI,EAAE,EAAE;gBACR,KAAK,EAAE,CAAC;gBACR,GAAG,EAAE,CAAC;aACT;YACD,OAAO,EAAE;gBACL;oBACI,IAAI,EAAE;wBACF,KAAK,EAAE,CAAC;wBACR,OAAO,EAAE,CAAC;wBACV,KAAK,EAAE,MAAM;qBAChB;oBACD,MAAM,EAAE;wBACJ,KAAK,EAAE,CAAC;wBACR,OAAO,EAAE,CAAC;wBACV,KAAK,EAAE,MAAM;qBAChB;iBACJ;aACJ;SACJ;QACD,GAAG,EAAE;YACD,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,iDAAiD;SAC1D;KACJ;CACJ,CAAC;AA8BF,MAAM,cAAe,SAAQ,OAAO;IAChC,YAAqB,UAA2B;QAC5C,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAiB;IAEhD,CAAC;IAeD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,cAAc,CAAC;YACtB,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE;YACtB,OAAO,EAAE,MAAM,CAAC,kBAAkB,EAAE;SACvC,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,UAAU,EAAE,EAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAC,EAAC,GAAG,IAAI,CAAC;QACnD,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,mBAAmB,GAAG,gBAAgB,CAAC,CAAC;QAG/E,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrB,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAElC,OAAO,IAAI,UAAU,CAAC;YAClB,UAAU;YACV,MAAM,CAAC,QAAQ;YACf,GAAG,MAAM,CAAC,gBAAgB,EAAE;SAC/B,CAAC,CAAC;IACP,CAAC;;AAnCe,iBAAE,GAAG,UAAU,CAAC;AAEhB,4BAAa,GAAG,MAAM,CAAC;AAEvB,uBAAQ,GAAG,QAAQ,CAAC;AAEpB,4BAAa,GAAG,IAAI,CAAC;AAErB,sBAAO,GAAG,GAAG,CAAC;AA8BlC,eAAe,cAAc,CAAC"}
+{"version":3,"file":"GetDayMaxPower.js","sourceRoot":"","sources":["../../../../src/mtxLora/commands/uplink/GetDayMaxPower.ts"],"names":[],"mappings":"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"}

package/dist/mtxLora/commands/uplink/GetHalfhoursEnergies.d.ts

@@ -1,4 +1,4 @@
-import Command, { TCommandExampleList } from '../../Command.js';
+import Command, { TCommandExampleList, IDlmsJsonOptions } from '../../Command.js';
 import { IDate, THalfhoursEnergies } from '../../CommandBinaryBuffer.js';
 interface IGetHalfhoursEnergies {
     date: IDate;
@@ -9,12 +9,13 @@ interface IGetHalfhoursEnergies {
 declare class GetHalfhoursEnergies extends Command {
     parameters: IGetHalfhoursEnergies;
     constructor(parameters: IGetHalfhoursEnergies);
-    static readonly id = 105;
+    static readonly id = 111;
     static readonly directionType = 2;
     static readonly examples: TCommandExampleList;
     static readonly hasParameters = true;
     static readonly maxSize = 256;
     static fromBytes(data: Uint8Array): GetHalfhoursEnergies;
     toBytes(): Uint8Array;
+    toJson({ dlms }?: IDlmsJsonOptions): string;
 }
 export default GetHalfhoursEnergies;

package/dist/mtxLora/commands/uplink/GetHalfhoursEnergies.js

@@ -1,7 +1,7 @@
-import Command, { COMMAND_HEADER_SIZE } from '../../Command.js';
-import CommandBinaryBuffer from '../../CommandBinaryBuffer.js';
+import Command, { COMMAND_HEADER_SIZE, defaultDlmsJsonOptions } from '../../Command.js';
+import CommandBinaryBuffer, { TARIFF_NUMBER } from '../../CommandBinaryBuffer.js';
 import { UPLINK } from '../../../constants/directions.js';
-const COMMAND_ID = 0x69;
+const COMMAND_ID = 0x6f;
 const DATE_SIZE = 3;
 const MAX_HALFHOURS_ENERGY_SIZE = 5 * 3 * 4;
 const COMMAND_MAX_SIZE = DATE_SIZE + MAX_HALFHOURS_ENERGY_SIZE;
@@ -22,11 +22,35 @@ const examples = [
             }
         },
         hex: {
-            header: '69 15',
+            header: '6f 15',
             body: '2a 43 11 01 02 00 00 10 00 00 00 20 00 00 00 30 00 00 00 40 00'
         }
     }
 ];
+const energiesToObis = {
+    'A+': '1.5.x',
+    'A+R+': '3.5.x',
+    'A+R-': '4.5.x',
+    'A-': '2.5.x',
+    'A-R+': '6.5.x',
+    'A-R-': '7.5.x'
+};
+const convertEnergyToObis = (energy, tariff = 0) => {
+    const obis = energiesToObis[energy];
+    return obis ? obis.replace('x', tariff.toString(10)) : '';
+};
+const convertHalfhoursEnergiesToDlms = (energies) => {
+    const dlms = {};
+    for (const [energy, values] of Object.entries(energies)) {
+        for (let tariff = 0; tariff < TARIFF_NUMBER; tariff++) {
+            const value = values[tariff];
+            if (value || value === 0) {
+                dlms[convertEnergyToObis(energy, tariff + 1)] = value;
+            }
+        }
+    }
+    return dlms;
+};
 class GetHalfhoursEnergies extends Command {
     constructor(parameters) {
         super();
@@ -59,6 +83,19 @@ class GetHalfhoursEnergies extends Command {
             ...buffer.getBytesToOffset()
         ]);
     }
+    toJson({ dlms } = defaultDlmsJsonOptions) {
+        const { parameters } = this;
+        const { date, firstHalfhour, halfhoursNumber, energies } = parameters;
+        const result = dlms
+            ? {
+                date,
+                firstHalfhour,
+                halfhoursNumber,
+                ...convertHalfhoursEnergiesToDlms(energies)
+            }
+            : parameters;
+        return JSON.stringify(result);
+    }
 }
 GetHalfhoursEnergies.id = COMMAND_ID;
 GetHalfhoursEnergies.directionType = UPLINK;

package/dist/mtxLora/commands/uplink/GetHalfhoursEnergies.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetHalfhoursEnergies.js","sourceRoot":"","sources":["../../../../src/mtxLora/commands/uplink/GetHalfhoursEnergies.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAsB,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AACnF,OAAO,mBAAgD,MAAM,8BAA8B,CAAC;AAC5F,OAAO,EAAC,MAAM,EAAC,MAAM,kCAAkC,CAAC;AAWxD,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,SAAS,GAAG,CAAC,CAAC;AACpB,MAAM,yBAAyB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAC5C,MAAM,gBAAgB,GAAG,SAAS,GAAG,yBAAyB,CAAC;AAE/D,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,wBAAwB;QAC9B,UAAU,EAAE;YACR,IAAI,EAAE;gBACF,IAAI,EAAE,EAAE;gBACR,KAAK,EAAE,CAAC;gBACR,GAAG,EAAE,CAAC;aACT;YACD,aAAa,EAAE,CAAC;YAChB,eAAe,EAAE,CAAC;YAClB,QAAQ,EAAE;gBACN,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;gBACtB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;aAC3B;SACJ;QACD,GAAG,EAAE;YACD,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,gEAAgE;SACzE;KACJ;CACJ,CAAC;AA8BF,MAAM,oBAAqB,SAAQ,OAAO;IACtC,YAAqB,UAAiC;QAClD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAuB;IAEtD,CAAC;IAeD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAC9B,MAAM,aAAa,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAChD,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACxC,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAE1C,OAAO,IAAI,oBAAoB,CAAC;YAC5B,IAAI;YACJ,aAAa;YACb,eAAe;YACf,QAAQ,EAAE,MAAM,CAAC,oBAAoB,CAAC,aAAa,EAAE,eAAe,CAAC;SACxE,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,UAAU,EAAE,EAAC,IAAI,EAAE,aAAa,EAAE,eAAe,EAAE,QAAQ,EAAC,EAAC,GAAG,IAAI,CAAC;QAC5E,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,mBAAmB,GAAG,gBAAgB,CAAC,CAAC;QAG/E,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrB,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAClC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAC/B,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QACjC,MAAM,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAEtC,OAAO,IAAI,UAAU,CAAC;YAClB,UAAU;YACV,MAAM,CAAC,QAAQ;YACf,GAAG,MAAM,CAAC,gBAAgB,EAAE;SAC/B,CAAC,CAAC;IACP,CAAC;;AA5Ce,uBAAE,GAAG,UAAU,CAAC;AAEhB,kCAAa,GAAG,MAAM,CAAC;AAEvB,6BAAQ,GAAG,QAAQ,CAAC;AAEpB,kCAAa,GAAG,IAAI,CAAC;AAErB,4BAAO,GAAG,GAAG,CAAC;AAwClC,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"GetHalfhoursEnergies.js","sourceRoot":"","sources":["../../../../src/mtxLora/commands/uplink/GetHalfhoursEnergies.ts"],"names":[],"mappings":"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"}

package/dist/mtxLora/message.js

@@ -1,3 +1,4 @@
+import { COMMAND_HEADER_SIZE } from './Command.js';
 import UnknownCommand from './UnknownCommand.js';
 import { requestById as mtxLoraRequestById, responseById as mtxLoraResponseById } from './constants/commandRelations.js';
 import { requestById as mtxRequestById, responseById as mtxResponseById } from '../mtx/constants/commandRelations.js';
@@ -12,7 +13,6 @@ import * as directionTypes from '../constants/directions.js';
 import { AUTO, DOWNLINK, UPLINK } from '../constants/directions.js';
 import { UNENCRYPTED } from '../mtx/constants/accessLevels.js';
 const ACCESS_LEVEL_MASK = 0x03;
-const COMMAND_HEADER_SIZE = 2;
 const PROTOCOL_VERSION = 0x10;
 const BLOCK_SIZE = 16;
 const directionTypeIds = new Set(Object.values(directionTypes));

package/dist/mtxLora/message.js.map

@@ -1 +1 @@
-{"version":3,"file":"message.js","sourceRoot":"","sources":["../../src/mtxLora/message.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"message.js","sourceRoot":"","sources":["../../src/mtxLora/message.ts"],"names":[],"mappings":"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"}

package/dist/obis-observer/Command.d.ts

@@ -1,28 +1,6 @@
-import { IHexFormatOptions } from '../config.js';
-export interface ICommandExample {
-    name: string;
-    parameters?: object;
-    hardwareType?: number;
-    hex: {
-        header: string;
-        body: string;
-    };
-}
-export type TCommandExampleList = Array<ICommandExample>;
-declare abstract class Command {
-    static id: number;
-    static directionType: unknown;
-    static title: string;
-    static examples: TCommandExampleList;
-    static hasParameters: boolean;
-    parameters: unknown;
-    size: number;
-    static getId(): string;
+import BaseCommand from '../Command.js';
+export { ICommandExample, TCommandExampleList, TJsonOptions, defaultJsonOptions } from '../Command.js';
+declare abstract class Command extends BaseCommand {
     static toBytes(id: number, commandData?: Uint8Array): Uint8Array;
-    getParameters(): unknown;
-    toBytes(): Uint8Array;
-    toHex(options?: IHexFormatOptions): string;
-    toBase64(): string;
-    toJson(): string;
 }
 export default Command;

package/dist/obis-observer/Command.js

@@ -1,14 +1,7 @@
-import getHexFromBytes from '../utils/getHexFromBytes.js';
-import getHexFromNumber from '../utils/getHexFromNumber.js';
-import getBase64FromBytes from '../utils/getBase64FromBytes.js';
+import BaseCommand from '../Command.js';
 import mergeUint8Arrays from '../utils/mergeUint8Arrays.js';
-class Command {
-    constructor() {
-        this.size = 0;
-    }
-    static getId() {
-        return getHexFromNumber(this.id);
-    }
+export { defaultJsonOptions } from '../Command.js';
+class Command extends BaseCommand {
     static toBytes(id, commandData) {
         const commandLength = commandData?.length ?? 0;
         const headerData = new Uint8Array([id, commandLength]);
@@ -17,22 +10,6 @@ class Command {
         }
         return headerData;
     }
-    getParameters() {
-        return this.parameters;
-    }
-    toBytes() {
-        throw new Error('not implemented!');
-    }
-    toHex(options = {}) {
-        return getHexFromBytes(this.toBytes(), options);
-    }
-    toBase64() {
-        return getBase64FromBytes(this.toBytes());
-    }
-    toJson() {
-        return JSON.stringify(this.getParameters());
-    }
 }
-Command.hasParameters = false;
 export default Command;
 //# sourceMappingURL=Command.js.map

package/dist/obis-observer/Command.js.map

@@ -1 +1 @@
-{"version":3,"file":"Command.js","sourceRoot":"","sources":["../../src/obis-observer/Command.ts"],"names":[],"mappings":"AACA,OAAO,eAAe,MAAM,6BAA6B,CAAC;AAC1D,OAAO,gBAAgB,MAAM,8BAA8B,CAAC;AAC5D,OAAO,kBAAkB,MAAM,gCAAgC,CAAC;AAChE,OAAO,gBAAgB,MAAM,8BAA8B,CAAC;AAmB5D,MAAe,OAAO;IAAtB;QAeI,SAAI,GAAW,CAAC,CAAC;IA2FrB,CAAC;IAvFG,MAAM,CAAC,KAAK;QACR,OAAO,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;IA+CD,MAAM,CAAC,OAAO,CAAG,EAAU,EAAE,WAAwB;QACjD,MAAM,aAAa,GAAG,WAAW,EAAE,MAAM,IAAI,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC;QAEvD,IAAK,WAAW,IAAI,aAAa,EAAG,CAAC;YACjC,OAAO,gBAAgB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QACrD,CAAC;QAGD,OAAO,UAAU,CAAC;IACtB,CAAC;IAGD,aAAa;QACT,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAGD,OAAO;QACH,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAG,UAA6B,EAAE;QACnC,OAAO,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,QAAQ;QACJ,OAAO,kBAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAC9C,CAAC;IAOD,MAAM;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;IAChD,CAAC;;AAhGM,qBAAa,GAAG,KAAK,AAAR,CAAS;AAoGjC,eAAe,OAAO,CAAC"}
+{"version":3,"file":"Command.js","sourceRoot":"","sources":["../../src/obis-observer/Command.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,gBAAgB,MAAM,8BAA8B,CAAC;AAG5D,OAAO,EAAqD,kBAAkB,EAAC,MAAM,eAAe,CAAC;AAMrG,MAAe,OAAQ,SAAQ,WAAW;IAQtC,MAAM,CAAC,OAAO,CAAG,EAAU,EAAE,WAAwB;QACjD,MAAM,aAAa,GAAG,WAAW,EAAE,MAAM,IAAI,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC;QAEvD,IAAK,WAAW,IAAI,aAAa,EAAG,CAAC;YACjC,OAAO,gBAAgB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QACrD,CAAC;QAGD,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ;AAGD,eAAe,OAAO,CAAC"}

package/dist/obis-observer/UnknownCommand.d.ts

@@ -1,5 +1,4 @@
-import Command from './Command.js';
-import { TBytesConversionFormatOptions } from '../utils/bytesConversion.js';
+import Command, { TJsonOptions } from './Command.js';
 interface IUnknownCommandParameters {
     id: number;
     data: Uint8Array;
@@ -9,6 +8,6 @@ declare class UnknownCommand extends Command {
     constructor(parameters: IUnknownCommandParameters);
     static fromBytes(data: Uint8Array, id: number): UnknownCommand;
     toBytes(): Uint8Array;
-    toJson(bytesConversionFormat?: number, bytesConversionFormatOptions?: TBytesConversionFormatOptions): string;
+    toJson(options?: TJsonOptions): string;
 }
 export default UnknownCommand;

package/dist/obis-observer/UnknownCommand.js

@@ -1,5 +1,4 @@
-import Command from './Command.js';
-import { HEX } from '../constants/bytesConversionFormats.js';
+import Command, { defaultJsonOptions } from './Command.js';
 import { getStringFromBytes } from '../utils/bytesConversion.js';
 class UnknownCommand extends Command {
     constructor(parameters) {
@@ -14,11 +13,11 @@ class UnknownCommand extends Command {
         const { id, data } = this.parameters;
         return Command.toBytes(id, data);
     }
-    toJson(bytesConversionFormat = HEX, bytesConversionFormatOptions = {}) {
+    toJson(options = defaultJsonOptions) {
         const { id, data } = this.parameters;
         return JSON.stringify({
             id,
-            data: getStringFromBytes(data, bytesConversionFormat, bytesConversionFormatOptions)
+            data: getStringFromBytes(data, options)
         });
     }
 }

package/dist/obis-observer/UnknownCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"UnknownCommand.js","sourceRoot":"","sources":["../../src/obis-observer/UnknownCommand.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAC,GAAG,EAAC,MAAM,wCAAwC,CAAC;AAC3D,OAAO,EAAgC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AAiB9F,MAAM,cAAe,SAAQ,OAAO;IAChC,YAAqB,UAAqC;QACtD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA2B;IAE1D,CAAC;IAGD,MAAM,CAAC,SAAS,CAAG,IAAgB,EAAE,EAAU;QAC3C,MAAM,UAAU,GAA8B,EAAC,EAAE,EAAE,IAAI,EAAC,CAAC;QAEzD,OAAO,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IAC1C,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,EAAE,EAAE,IAAI,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAEnC,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,CAAG,wBAAgC,GAAG,EAAE,+BAA8D,EAAE;QAC1G,MAAM,EAAC,EAAE,EAAE,IAAI,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAEnC,OAAO,IAAI,CAAC,SAAS,CAAC;YAClB,EAAE;YACF,IAAI,EAAE,kBAAkB,CAAC,IAAI,EAAE,qBAAqB,EAAE,4BAA4B,CAAC;SACtF,CAAC,CAAC;IACP,CAAC;CACJ;AAGD,eAAe,cAAc,CAAC"}
+{"version":3,"file":"UnknownCommand.js","sourceRoot":"","sources":["../../src/obis-observer/UnknownCommand.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAe,kBAAkB,EAAC,MAAM,cAAc,CAAC;AACvE,OAAO,EAAC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AAiB/D,MAAM,cAAe,SAAQ,OAAO;IAChC,YAAqB,UAAqC;QACtD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA2B;IAE1D,CAAC;IAGD,MAAM,CAAC,SAAS,CAAG,IAAgB,EAAE,EAAU;QAC3C,MAAM,UAAU,GAA8B,EAAC,EAAE,EAAE,IAAI,EAAC,CAAC;QAEzD,OAAO,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IAC1C,CAAC;IAGD,OAAO;QACH,MAAM,EAAC,EAAE,EAAE,IAAI,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAEnC,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,CAAG,UAAwB,kBAAkB;QAC/C,MAAM,EAAC,EAAE,EAAE,IAAI,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAEnC,OAAO,IAAI,CAAC,SAAS,CAAC;YAClB,EAAE;YACF,IAAI,EAAE,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC;SAC1C,CAAC,CAAC;IACP,CAAC;CACJ;AAGD,eAAe,cAAc,CAAC"}

package/dist/utils/bytesConversion.d.ts

@@ -2,6 +2,11 @@ import { IHexFormatOptions } from '../config.js';
 interface IBase64FormatOptions {
 }
 export type TBytesConversionFormatOptions = IHexFormatOptions | IBase64FormatOptions;
-export declare const getStringFromBytes: (bytes: Uint8Array, bytesConversionFormat?: number, bytesConversionFormatOptions?: TBytesConversionFormatOptions) => string;
+export interface IBytesConversionFormatOptions {
+    bytesConversionFormat: number;
+    bytesConversionFormatOptions: TBytesConversionFormatOptions;
+}
+export declare const defaultFormatOptions: IBytesConversionFormatOptions;
+export declare const getStringFromBytes: (bytes: Uint8Array, options?: IBytesConversionFormatOptions) => string;
 export declare const getBytesFromString: (data: string, bytesConversionFormat?: number) => Uint8Array;
 export {};

package/dist/utils/bytesConversion.js

@@ -3,8 +3,15 @@ import getBase64FromBytes from './getBase64FromBytes.js';
 import getBytesFromBase64 from './getBytesFromBase64.js';
 import getBytesFromHex from './getBytesFromHex.js';
 import getHexFromBytes from './getHexFromBytes.js';
-export const getStringFromBytes = (bytes, bytesConversionFormat = HEX, bytesConversionFormatOptions = {}) => (bytesConversionFormat === HEX
-    ? getHexFromBytes(bytes, bytesConversionFormatOptions)
-    : getBase64FromBytes(bytes));
+export const defaultFormatOptions = {
+    bytesConversionFormat: HEX,
+    bytesConversionFormatOptions: {}
+};
+export const getStringFromBytes = (bytes, options = defaultFormatOptions) => {
+    const { bytesConversionFormat = defaultFormatOptions.bytesConversionFormat, bytesConversionFormatOptions = defaultFormatOptions.bytesConversionFormatOptions } = options;
+    return bytesConversionFormat === HEX
+        ? getHexFromBytes(bytes, bytesConversionFormatOptions)
+        : getBase64FromBytes(bytes);
+};
 export const getBytesFromString = (data, bytesConversionFormat = HEX) => (bytesConversionFormat === HEX ? getBytesFromHex(data) : getBytesFromBase64(data));
 //# sourceMappingURL=bytesConversion.js.map

package/dist/utils/bytesConversion.js.map

@@ -1 +1 @@
-{"version":3,"file":"bytesConversion.js","sourceRoot":"","sources":["../../src/utils/bytesConversion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,wCAAwC,CAAC;AAC3D,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AACzD,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AACzD,OAAO,eAAe,MAAM,sBAAsB,CAAC;AACnD,OAAO,eAAe,MAAM,sBAAsB,CAAC;AASnD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAC9B,KAAiB,EACjB,wBAAgC,GAAG,EACnC,+BAA8D,EAAE,EAClE,EAAE,CAAC,CACD,qBAAqB,KAAK,GAAG;IACzB,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE,4BAA4B,CAAC;IACtD,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAClC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAE,IAAY,EAAE,wBAAgC,GAAG,EAAG,EAAE,CAAC,CACvF,qBAAqB,KAAK,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CACnF,CAAC"}
+{"version":3,"file":"bytesConversion.js","sourceRoot":"","sources":["../../src/utils/bytesConversion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,wCAAwC,CAAC;AAC3D,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AACzD,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AACzD,OAAO,eAAe,MAAM,sBAAsB,CAAC;AACnD,OAAO,eAAe,MAAM,sBAAsB,CAAC;AAcnD,MAAM,CAAC,MAAM,oBAAoB,GAAkC;IAC/D,qBAAqB,EAAE,GAAG;IAC1B,4BAA4B,EAAE,EAAE;CACnC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAC9B,KAAiB,EACjB,UAAyC,oBAAoB,EAC/D,EAAE;IACA,MAAM,EACF,qBAAqB,GAAG,oBAAoB,CAAC,qBAAqB,EAClE,4BAA4B,GAAG,oBAAoB,CAAC,4BAA4B,EACnF,GAAG,OAAO,CAAC;IAEZ,OAAO,qBAAqB,KAAK,GAAG;QAChC,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE,4BAA4B,CAAC;QACtD,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;AACpC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAE,IAAY,EAAE,wBAAgC,GAAG,EAAG,EAAE,CAAC,CACvF,qBAAqB,KAAK,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CACnF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jooby-codec",
-  "version": "3.11.0",
+  "version": "3.12.0",
   "description": "Jooby message encoders/decoders",
   "type": "module",
   "main": "./dist/index.js",