jooby-codec 2.3.0 → 2.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/analog/CommandBinaryBuffer.d.ts +25 -5
- package/dist/analog/CommandBinaryBuffer.js +85 -17
- package/dist/analog/CommandBinaryBuffer.js.map +1 -1
- package/dist/analog/commands/downlink/GetArchiveDays.d.ts +17 -0
- package/dist/analog/commands/downlink/GetArchiveDays.js +45 -0
- package/dist/analog/commands/downlink/GetArchiveDays.js.map +1 -0
- package/dist/analog/commands/downlink/GetArchiveDaysMC.js.map +1 -1
- package/dist/analog/commands/downlink/GetArchiveHours.d.ts +17 -0
- package/dist/analog/commands/downlink/GetArchiveHours.js +49 -0
- package/dist/analog/commands/downlink/GetArchiveHours.js.map +1 -0
- package/dist/analog/commands/downlink/GetArchiveHoursMC.js.map +1 -1
- package/dist/analog/commands/downlink/GetCurrent.d.ts +10 -0
- package/dist/analog/commands/downlink/GetCurrent.js +23 -0
- package/dist/analog/commands/downlink/GetCurrent.js.map +1 -0
- package/dist/analog/commands/downlink/GetExAbsArchiveDaysMC.js.map +1 -1
- package/dist/analog/commands/downlink/GetExAbsArchiveHoursMC.js.map +1 -1
- package/dist/analog/commands/downlink/index.d.ts +3 -0
- package/dist/analog/commands/downlink/index.js +3 -0
- package/dist/analog/commands/downlink/index.js.map +1 -1
- package/dist/analog/commands/uplink/Current.d.ts +13 -0
- package/dist/analog/commands/uplink/Current.js +33 -0
- package/dist/analog/commands/uplink/Current.js.map +1 -0
- package/dist/analog/commands/uplink/Day.d.ts +18 -0
- package/dist/analog/commands/uplink/Day.js +53 -0
- package/dist/analog/commands/uplink/Day.js.map +1 -0
- package/dist/analog/commands/uplink/GetArchiveDaysMCResponse.js.map +1 -1
- package/dist/analog/commands/uplink/GetArchiveDaysResponse.d.ts +18 -0
- package/dist/analog/commands/uplink/GetArchiveDaysResponse.js +47 -0
- package/dist/analog/commands/uplink/GetArchiveDaysResponse.js.map +1 -0
- package/dist/analog/commands/uplink/GetArchiveHoursResponse.d.ts +13 -0
- package/dist/analog/commands/uplink/GetArchiveHoursResponse.js +38 -0
- package/dist/analog/commands/uplink/GetArchiveHoursResponse.js.map +1 -0
- package/dist/analog/commands/uplink/Hour.d.ts +13 -0
- package/dist/analog/commands/uplink/Hour.js +38 -0
- package/dist/analog/commands/uplink/Hour.js.map +1 -0
- package/dist/analog/commands/uplink/index.d.ts +5 -0
- package/dist/analog/commands/uplink/index.js +5 -0
- package/dist/analog/commands/uplink/index.js.map +1 -1
- package/dist/obis-observer/CommandBinaryBuffer.d.ts +3 -2
- package/dist/obis-observer/CommandBinaryBuffer.js +16 -16
- package/dist/obis-observer/CommandBinaryBuffer.js.map +1 -1
- package/dist/obis-observer/commands/downlink/AddShortNameProfile.js +4 -3
- package/dist/obis-observer/commands/downlink/AddShortNameProfile.js.map +1 -1
- package/dist/obis-observer/commands/downlink/ReadArchive.d.ts +1 -1
- package/dist/obis-observer/commands/downlink/ReadArchive.js +7 -8
- package/dist/obis-observer/commands/downlink/ReadArchive.js.map +1 -1
- package/dist/obis-observer/commands/downlink/SetArchiveProfile.d.ts +2 -2
- package/dist/obis-observer/commands/downlink/SetArchiveProfile.js +7 -7
- package/dist/obis-observer/commands/downlink/SetArchiveProfile.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetArchiveProfileResponse.d.ts +2 -2
- package/dist/obis-observer/commands/uplink/GetArchiveProfileResponse.js +7 -7
- package/dist/obis-observer/commands/uplink/GetArchiveProfileResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetLorawanInfoResponse.d.ts +1 -0
- package/dist/obis-observer/commands/uplink/GetLorawanInfoResponse.js +8 -4
- package/dist/obis-observer/commands/uplink/GetLorawanInfoResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetShortNameInfoResponse.js +5 -4
- package/dist/obis-observer/commands/uplink/GetShortNameInfoResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetShortNameProfileResponse.js +5 -4
- package/dist/obis-observer/commands/uplink/GetShortNameProfileResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/ReadArchiveResponse.js +1 -1
- package/dist/obis-observer/commands/uplink/ReadArchiveResponse.js.map +1 -1
- package/dist/obis-observer/constants/commandRelations.js +2 -0
- package/dist/obis-observer/constants/commandRelations.js.map +1 -1
- package/dist/obis-observer/constants/deviceClasses.d.ts +4 -0
- package/dist/obis-observer/constants/deviceClasses.js +5 -0
- package/dist/obis-observer/constants/deviceClasses.js.map +1 -0
- package/dist/obis-observer/constants/index.d.ts +1 -1
- package/dist/obis-observer/constants/index.js +1 -1
- package/dist/obis-observer/constants/index.js.map +1 -1
- package/dist/obis-observer/utils/obis.js +8 -4
- package/dist/obis-observer/utils/obis.js.map +1 -1
- package/package.json +1 -13
- package/dist/obis-observer/constants/archiveTypes.d.ts +0 -3
- package/dist/obis-observer/constants/archiveTypes.js +0 -4
- package/dist/obis-observer/constants/archiveTypes.js.map +0 -1
|
@@ -8,8 +8,8 @@ const examples = [
|
|
|
8
8
|
name: 'set double default parameters',
|
|
9
9
|
parameters: {
|
|
10
10
|
requestId: 68,
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
archiveProfile1Period: 2880,
|
|
12
|
+
archiveProfile2Period: 30
|
|
13
13
|
},
|
|
14
14
|
hex: { header: '0f', body: '44 0b 40 00 1e' }
|
|
15
15
|
}
|
|
@@ -24,16 +24,16 @@ class SetArchiveProfile extends Command {
|
|
|
24
24
|
const buffer = new CommandBinaryBuffer(data);
|
|
25
25
|
return new SetArchiveProfile({
|
|
26
26
|
requestId: buffer.getUint8(),
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
archiveProfile1Period: buffer.getUint16(),
|
|
28
|
+
archiveProfile2Period: buffer.getUint16()
|
|
29
29
|
});
|
|
30
30
|
}
|
|
31
31
|
toBytes() {
|
|
32
32
|
const buffer = new CommandBinaryBuffer(COMMAND_SIZE);
|
|
33
|
-
const { requestId,
|
|
33
|
+
const { requestId, archiveProfile1Period, archiveProfile2Period } = this.parameters;
|
|
34
34
|
buffer.setUint8(requestId);
|
|
35
|
-
buffer.setUint16(
|
|
36
|
-
buffer.setUint16(
|
|
35
|
+
buffer.setUint16(archiveProfile1Period);
|
|
36
|
+
buffer.setUint16(archiveProfile2Period);
|
|
37
37
|
return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
|
|
38
38
|
}
|
|
39
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SetArchiveProfile.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/SetArchiveProfile.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,+BAA+B,CAAC;AAYvD,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;AAEzC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;YACb,
|
|
1
|
+
{"version":3,"file":"SetArchiveProfile.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/SetArchiveProfile.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,+BAA+B,CAAC;AAYvD,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;AAEzC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;YACb,qBAAqB,EAAE,IAAI;YAC3B,qBAAqB,EAAE,EAAE;SAC5B;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAC;KAC9C;CACJ,CAAC;AAuBF,MAAM,iBAAkB,SAAQ,OAAO;IACnC,YAAqB,UAAwC;QACzD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA8B;QAGzD,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,iBAAiB,CAAC;YACzB,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,qBAAqB,EAAE,MAAM,CAAC,SAAS,EAAE;YACzC,qBAAqB,EAAE,MAAM,CAAC,SAAS,EAAE;SAC5C,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,EAAC,SAAS,EAAE,qBAAqB,EAAE,qBAAqB,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAElF,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;QACxC,MAAM,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;QAExC,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA9Be,oBAAE,GAAG,UAAU,CAAC;AAEhB,+BAAa,GAAG,QAAQ,CAAC;AAEzB,0BAAQ,GAAG,QAAQ,CAAC;AAEpB,+BAAa,GAAG,IAAI,CAAC;AA4BzC,eAAe,iBAAiB,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import Command, { TCommandExampleList } from '../../Command.js';
|
|
2
2
|
import { ICommandParameters } from '../../CommandBinaryBuffer.js';
|
|
3
3
|
interface IGetArchiveProfileResponseParameters extends ICommandParameters {
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
archiveProfile1Period?: number;
|
|
5
|
+
archiveProfile2Period?: number;
|
|
6
6
|
}
|
|
7
7
|
declare class GetArchiveProfileResponse extends Command {
|
|
8
8
|
parameters: IGetArchiveProfileResponseParameters;
|
|
@@ -8,8 +8,8 @@ const examples = [
|
|
|
8
8
|
name: 'default periods',
|
|
9
9
|
parameters: {
|
|
10
10
|
requestId: 3,
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
archiveProfile1Period: 600,
|
|
12
|
+
archiveProfile2Period: 45
|
|
13
13
|
},
|
|
14
14
|
hex: { header: '0e', body: '03 02 58 00 2d' }
|
|
15
15
|
}
|
|
@@ -24,16 +24,16 @@ class GetArchiveProfileResponse extends Command {
|
|
|
24
24
|
const buffer = new CommandBinaryBuffer(data);
|
|
25
25
|
return new GetArchiveProfileResponse({
|
|
26
26
|
requestId: buffer.getUint8(),
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
archiveProfile1Period: buffer.getUint16(),
|
|
28
|
+
archiveProfile2Period: buffer.getUint16()
|
|
29
29
|
});
|
|
30
30
|
}
|
|
31
31
|
toBytes() {
|
|
32
32
|
const buffer = new CommandBinaryBuffer(COMMAND_SIZE);
|
|
33
|
-
const { requestId,
|
|
33
|
+
const { requestId, archiveProfile1Period, archiveProfile2Period } = this.parameters;
|
|
34
34
|
buffer.setUint8(requestId);
|
|
35
|
-
buffer.setUint16(
|
|
36
|
-
buffer.setUint16(
|
|
35
|
+
buffer.setUint16(archiveProfile1Period ?? 0);
|
|
36
|
+
buffer.setUint16(archiveProfile2Period ?? 0);
|
|
37
37
|
return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
|
|
38
38
|
}
|
|
39
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetArchiveProfileResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetArchiveProfileResponse.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;AAYrD,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,
|
|
1
|
+
{"version":3,"file":"GetArchiveProfileResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetArchiveProfileResponse.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;AAYrD,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,qBAAqB,EAAE,GAAG;YAC1B,qBAAqB,EAAE,EAAE;SAC5B;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAC;KAC9C;CACJ,CAAC;AAwBF,MAAM,yBAA0B,SAAQ,OAAO;IAC3C,YAAqB,UAAgD;QACjE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAsC;QAGjE,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,yBAAyB,CAAC;YACjC,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,qBAAqB,EAAE,MAAM,CAAC,SAAS,EAAE;YACzC,qBAAqB,EAAE,MAAM,CAAC,SAAS,EAAE;SAC5C,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,EAAC,SAAS,EAAE,qBAAqB,EAAE,qBAAqB,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAElF,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,SAAS,CAAC,qBAAqB,IAAI,CAAC,CAAC,CAAC;QAC7C,MAAM,CAAC,SAAS,CAAC,qBAAqB,IAAI,CAAC,CAAC,CAAC;QAE7C,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA9Be,4BAAE,GAAG,UAAU,CAAC;AAEhB,uCAAa,GAAG,MAAM,CAAC;AAEvB,kCAAQ,GAAG,QAAQ,CAAC;AAEpB,uCAAa,GAAG,IAAI,CAAC;AA4BzC,eAAe,yBAAyB,CAAC"}
|
|
@@ -3,6 +3,7 @@ import { ICommandParameters } from '../../CommandBinaryBuffer.js';
|
|
|
3
3
|
interface IGetLorawanInfoResponseParameters extends ICommandParameters {
|
|
4
4
|
deviceEUI: string;
|
|
5
5
|
applicationEUI: string;
|
|
6
|
+
deviceClass: number;
|
|
6
7
|
activationMethod: number;
|
|
7
8
|
}
|
|
8
9
|
declare class GetLorawanInfoResponse extends Command {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import Command from '../../Command.js';
|
|
2
2
|
import CommandBinaryBuffer, { REQUEST_ID_SIZE, EUI_SIZE } from '../../CommandBinaryBuffer.js';
|
|
3
3
|
import { UPLINK } from '../../constants/directions.js';
|
|
4
|
+
import * as deviceClasses from '../../constants/deviceClasses.js';
|
|
4
5
|
const COMMAND_ID = 0x1f;
|
|
5
6
|
const examples = [
|
|
6
7
|
{
|
|
@@ -9,34 +10,37 @@ const examples = [
|
|
|
9
10
|
requestId: 8,
|
|
10
11
|
deviceEUI: '00 1a 79 88 16 aa 55 61',
|
|
11
12
|
applicationEUI: '00 11 22 33 44 55 66 77',
|
|
13
|
+
deviceClass: deviceClasses.C,
|
|
12
14
|
activationMethod: 1
|
|
13
15
|
},
|
|
14
|
-
hex: { header: '1f', body: '08 00 1a 79 88 16 aa 55 61 00 11 22 33 44 55 66 77 01' }
|
|
16
|
+
hex: { header: '1f', body: '08 00 1a 79 88 16 aa 55 61 00 11 22 33 44 55 66 77 02 01' }
|
|
15
17
|
}
|
|
16
18
|
];
|
|
17
19
|
class GetLorawanInfoResponse extends Command {
|
|
18
20
|
constructor(parameters) {
|
|
19
21
|
super();
|
|
20
22
|
this.parameters = parameters;
|
|
21
|
-
this.size = REQUEST_ID_SIZE + (EUI_SIZE * 2) + 1;
|
|
23
|
+
this.size = REQUEST_ID_SIZE + (EUI_SIZE * 2) + 1 + 1;
|
|
22
24
|
}
|
|
23
25
|
static fromBytes(data) {
|
|
24
26
|
const buffer = new CommandBinaryBuffer(data);
|
|
25
27
|
const requestId = buffer.getUint8();
|
|
26
28
|
const deviceEUI = buffer.getEUI();
|
|
27
29
|
const applicationEUI = buffer.getEUI();
|
|
30
|
+
const deviceClass = buffer.getUint8();
|
|
28
31
|
const activationMethod = buffer.getUint8();
|
|
29
|
-
return new GetLorawanInfoResponse({ requestId, deviceEUI, applicationEUI, activationMethod });
|
|
32
|
+
return new GetLorawanInfoResponse({ requestId, deviceEUI, applicationEUI, deviceClass, activationMethod });
|
|
30
33
|
}
|
|
31
34
|
toBytes() {
|
|
32
35
|
if (typeof this.size !== 'number') {
|
|
33
36
|
throw new Error('unknown or invalid size');
|
|
34
37
|
}
|
|
35
38
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
36
|
-
const { requestId, deviceEUI, applicationEUI, activationMethod } = this.parameters;
|
|
39
|
+
const { requestId, deviceEUI, applicationEUI, deviceClass, activationMethod } = this.parameters;
|
|
37
40
|
buffer.setUint8(requestId);
|
|
38
41
|
buffer.setEUI(deviceEUI);
|
|
39
42
|
buffer.setEUI(applicationEUI);
|
|
43
|
+
buffer.setUint8(deviceClass);
|
|
40
44
|
buffer.setUint8(activationMethod);
|
|
41
45
|
return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
|
|
42
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetLorawanInfoResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetLorawanInfoResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAE,QAAQ,EAAqB,MAAM,8BAA8B,CAAC;AAChH,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"GetLorawanInfoResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetLorawanInfoResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAE,QAAQ,EAAqB,MAAM,8BAA8B,CAAC;AAChH,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AACrD,OAAO,KAAK,aAAa,MAAM,kCAAkC,CAAC;AAoBlE,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,yCAAyC;QAC/C,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,yBAAyB;YACpC,cAAc,EAAE,yBAAyB;YACzC,WAAW,EAAE,aAAa,CAAC,CAAC;YAC5B,gBAAgB,EAAE,CAAC;SACtB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,0DAA0D,EAAC;KACxF;CACJ,CAAC;AA6BF,MAAM,sBAAuB,SAAQ,OAAO;IACxC,YAAqB,UAA6C;QAC9D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAmC;QAI9D,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzD,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,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QAClC,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QACvC,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,gBAAgB,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAE3C,OAAO,IAAI,sBAAsB,CAAC,EAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,WAAW,EAAE,gBAAgB,EAAC,CAAC,CAAC;IAC7G,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,SAAS,EAAE,cAAc,EAAE,WAAW,EAAE,gBAAgB,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAE9F,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACzB,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAC9B,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC7B,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAElC,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAtCe,yBAAE,GAAG,UAAU,CAAC;AAEhB,oCAAa,GAAG,MAAM,CAAC;AAEvB,+BAAQ,GAAG,QAAQ,CAAC;AAEpB,oCAAa,GAAG,IAAI,CAAC;AAoCzC,eAAe,sBAAsB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import Command from '../../Command.js';
|
|
2
2
|
import CommandBinaryBuffer, { REQUEST_ID_SIZE, OBIS_PROFILE_SIZE } from '../../CommandBinaryBuffer.js';
|
|
3
3
|
import { UPLINK } from '../../constants/directions.js';
|
|
4
|
-
import {
|
|
4
|
+
import { contentTypes } from '../../constants/index.js';
|
|
5
5
|
const COMMAND_ID = 0x0c;
|
|
6
6
|
const examples = [
|
|
7
7
|
{
|
|
@@ -19,12 +19,13 @@ const examples = [
|
|
|
19
19
|
sendingCounter: 61,
|
|
20
20
|
flags: {
|
|
21
21
|
contentType: contentTypes.STRING,
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
sendOnChange: true,
|
|
23
|
+
archiveProfile1: true,
|
|
24
|
+
archiveProfile2: false
|
|
24
25
|
}
|
|
25
26
|
}
|
|
26
27
|
},
|
|
27
|
-
hex: { header: '0c', body: '0b 03 02 00 09 01 01 58 02 14 3d
|
|
28
|
+
hex: { header: '0c', body: '0b 03 02 00 09 01 01 58 02 14 3d 15' }
|
|
28
29
|
}
|
|
29
30
|
];
|
|
30
31
|
class GetShortNameInfoResponse extends Command {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetShortNameInfoResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetShortNameInfoResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAE,iBAAiB,EAA0C,MAAM,8BAA8B,CAAC;AAC9I,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"GetShortNameInfoResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetShortNameInfoResponse.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import Command from '../../Command.js';
|
|
2
2
|
import CommandBinaryBuffer, { REQUEST_ID_SIZE, OBIS_PROFILE_SIZE } from '../../CommandBinaryBuffer.js';
|
|
3
3
|
import { UPLINK } from '../../constants/directions.js';
|
|
4
|
-
import {
|
|
4
|
+
import { contentTypes } from '../../constants/index.js';
|
|
5
5
|
const COMMAND_ID = 0x0a;
|
|
6
6
|
const COMMAND_SIZE = REQUEST_ID_SIZE + OBIS_PROFILE_SIZE;
|
|
7
7
|
const examples = [
|
|
@@ -15,12 +15,13 @@ const examples = [
|
|
|
15
15
|
sendingCounter: 61,
|
|
16
16
|
flags: {
|
|
17
17
|
contentType: contentTypes.STRING,
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
sendOnChange: false,
|
|
19
|
+
archiveProfile1: true,
|
|
20
|
+
archiveProfile2: true
|
|
20
21
|
}
|
|
21
22
|
}
|
|
22
23
|
},
|
|
23
|
-
hex: { header: '0a', body: '03 01 58 02 14 3d
|
|
24
|
+
hex: { header: '0a', body: '03 01 58 02 14 3d 13' }
|
|
24
25
|
}
|
|
25
26
|
];
|
|
26
27
|
class GetShortNameProfileResponse extends Command {
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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"}
|
|
@@ -5,7 +5,7 @@ const COMMAND_ID = 0x12;
|
|
|
5
5
|
const COMMAND_HEADER_SIZE = REQUEST_ID_SIZE + DATE_TIME_SIZE;
|
|
6
6
|
const examples = [
|
|
7
7
|
{
|
|
8
|
-
name: '
|
|
8
|
+
name: 'archive from 2023-12-23 04:00:00 GMT',
|
|
9
9
|
parameters: {
|
|
10
10
|
requestId: 34,
|
|
11
11
|
time2000: 756619200,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReadArchiveResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ReadArchiveResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAuC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AACvI,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAYrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,mBAAmB,GAAG,eAAe,GAAG,cAAc,CAAC;AAE7D,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"ReadArchiveResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ReadArchiveResponse.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,8 @@ requestByResponse.set(uplinkCommands.AddShortNameProfileResponse, downlinkComman
|
|
|
6
6
|
requestByResponse.set(uplinkCommands.GetArchiveProfileResponse, downlinkCommands.GetArchiveProfile);
|
|
7
7
|
requestByResponse.set(uplinkCommands.GetContentByObisResponse, downlinkCommands.GetContentByObis);
|
|
8
8
|
requestByResponse.set(uplinkCommands.GetContentByShortNameResponse, downlinkCommands.GetContentByShortName);
|
|
9
|
+
requestByResponse.set(uplinkCommands.GetDeviceInfoResponse, downlinkCommands.GetDeviceInfo);
|
|
10
|
+
requestByResponse.set(uplinkCommands.GetLorawanInfoResponse, downlinkCommands.GetLorawanInfo);
|
|
9
11
|
requestByResponse.set(uplinkCommands.GetShortNameInfoResponse, downlinkCommands.GetShortNameInfo);
|
|
10
12
|
requestByResponse.set(uplinkCommands.GetShortNameProfileResponse, downlinkCommands.GetShortNameProfile);
|
|
11
13
|
requestByResponse.set(uplinkCommands.GetShortNamesResponse, downlinkCommands.GetShortNames);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandRelations.js","sourceRoot":"","sources":["../../../src/obis-observer/constants/commandRelations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,gBAAgB,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,cAAc,MAAM,6BAA6B,CAAC;AAG9D,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAC;AAC3C,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAC;AAG3C,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,2BAA2B,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;AACxG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,yBAAyB,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;AACpG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,wBAAwB,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;AAClG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,6BAA6B,EAAE,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;AAC5G,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,wBAAwB,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;AAClG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,2BAA2B,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;AACxG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;AAC5F,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;AACxF,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAC9E,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,8BAA8B,EAAE,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;AAC9G,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,yBAAyB,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;AACpG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;AAC5F,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;AAG1F,KAAM,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,iBAAiB,CAAC,OAAO,EAAE,EAAG;IACtD,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;CACrC"}
|
|
1
|
+
{"version":3,"file":"commandRelations.js","sourceRoot":"","sources":["../../../src/obis-observer/constants/commandRelations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,gBAAgB,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,cAAc,MAAM,6BAA6B,CAAC;AAG9D,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAC;AAC3C,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAC;AAG3C,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,2BAA2B,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;AACxG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,yBAAyB,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;AACpG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,wBAAwB,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;AAClG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,6BAA6B,EAAE,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;AAC5G,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;AAC5F,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC;AAC9F,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,wBAAwB,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;AAClG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,2BAA2B,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;AACxG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;AAC5F,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;AACxF,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAC9E,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,8BAA8B,EAAE,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;AAC9G,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,yBAAyB,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;AACpG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;AAC5F,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;AAG1F,KAAM,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,iBAAiB,CAAC,OAAO,EAAE,EAAG;IACtD,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;CACrC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deviceClasses.js","sourceRoot":"","sources":["../../../src/obis-observer/constants/deviceClasses.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACnB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACnB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACnB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export * as archiveTypes from './archiveTypes.js';
|
|
2
1
|
export * as baudRates from './baudRates.js';
|
|
3
2
|
export * as contentTypes from './contentTypes.js';
|
|
3
|
+
export * as deviceClasses from './deviceClasses.js';
|
|
4
4
|
export * as directions from './directions.js';
|
|
5
5
|
export * as parityTypes from './parityTypes.js';
|
|
6
6
|
export * as resultCodes from './resultCodes.js';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export * as archiveTypes from './archiveTypes.js';
|
|
2
1
|
export * as baudRates from './baudRates.js';
|
|
3
2
|
export * as contentTypes from './contentTypes.js';
|
|
3
|
+
export * as deviceClasses from './deviceClasses.js';
|
|
4
4
|
export * as directions from './directions.js';
|
|
5
5
|
export * as parityTypes from './parityTypes.js';
|
|
6
6
|
export * as resultCodes from './resultCodes.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/obis-observer/constants/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/obis-observer/constants/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAChD,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC"}
|
|
@@ -15,20 +15,21 @@ export const toString = (obis) => {
|
|
|
15
15
|
throw new Error('Properties "c" and "d" are mandatory.');
|
|
16
16
|
}
|
|
17
17
|
let result = '';
|
|
18
|
-
if (a && b) {
|
|
18
|
+
if ((a !== null && a !== undefined) && (b !== null && b !== undefined)) {
|
|
19
19
|
result += `${a}-${b}:`;
|
|
20
20
|
}
|
|
21
21
|
result += `${(codeLetters[c] ?? c)}.${(codeLetters[d] ?? d)}`;
|
|
22
|
-
if (e && f) {
|
|
22
|
+
if ((e !== null && e !== undefined) && (f !== null && f !== undefined)) {
|
|
23
23
|
result += `.${e}*${f}`;
|
|
24
24
|
}
|
|
25
|
-
else if (e) {
|
|
25
|
+
else if (e !== null && e !== undefined) {
|
|
26
26
|
result += `.${e}`;
|
|
27
27
|
}
|
|
28
28
|
return result;
|
|
29
29
|
};
|
|
30
30
|
export const fromString = (obisString) => {
|
|
31
31
|
const result = {};
|
|
32
|
+
const sortedResult = {};
|
|
32
33
|
let unprocessed = obisString;
|
|
33
34
|
let parts;
|
|
34
35
|
let eValue;
|
|
@@ -67,6 +68,9 @@ export const fromString = (obisString) => {
|
|
|
67
68
|
if (!('c' in result && 'd' in result)) {
|
|
68
69
|
throw new Error('Properties "c" and "d" are mandatory.');
|
|
69
70
|
}
|
|
70
|
-
|
|
71
|
+
Object.keys(result).sort().forEach(keyName => {
|
|
72
|
+
sortedResult[keyName] = result[keyName];
|
|
73
|
+
});
|
|
74
|
+
return sortedResult;
|
|
71
75
|
};
|
|
72
76
|
//# sourceMappingURL=obis.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"obis.js","sourceRoot":"","sources":["../../../src/obis-observer/utils/obis.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"obis.js","sourceRoot":"","sources":["../../../src/obis-observer/utils/obis.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "jooby-codec",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.5.0",
|
|
4
4
|
"description": "Jooby message encoders/decoders",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -23,18 +23,6 @@
|
|
|
23
23
|
"./*": "./dist/*"
|
|
24
24
|
},
|
|
25
25
|
"types": "./dist/index.d.ts",
|
|
26
|
-
"typesVersions": {
|
|
27
|
-
"*": {
|
|
28
|
-
"*": [
|
|
29
|
-
"./dist/index.d.ts",
|
|
30
|
-
"./dist/utils/*.d.ts",
|
|
31
|
-
"./dist/*/index.d.ts"
|
|
32
|
-
],
|
|
33
|
-
"./utils/*": [
|
|
34
|
-
"./dist/utils/*.d.ts"
|
|
35
|
-
]
|
|
36
|
-
}
|
|
37
|
-
},
|
|
38
26
|
"files": [
|
|
39
27
|
"/dist"
|
|
40
28
|
],
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"archiveTypes.js","sourceRoot":"","sources":["../../../src/obis-observer/constants/archiveTypes.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC;AACtB,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAC;AAC1B,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAC"}
|