jooby-codec 2.0.0 → 2.2.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 +2 -2
- package/dist/analog/CommandBinaryBuffer.js +5 -5
- package/dist/analog/CommandBinaryBuffer.js.map +1 -1
- package/dist/analog/commands/downlink/GetArchiveDaysMC.d.ts +1 -1
- package/dist/analog/commands/downlink/GetArchiveDaysMC.js +5 -5
- package/dist/analog/commands/downlink/GetArchiveDaysMC.js.map +1 -1
- package/dist/analog/commands/downlink/GetArchiveEvents.d.ts +1 -1
- package/dist/analog/commands/downlink/GetArchiveEvents.js +5 -5
- package/dist/analog/commands/downlink/GetArchiveEvents.js.map +1 -1
- package/dist/analog/commands/downlink/GetArchiveHoursMC.d.ts +1 -1
- package/dist/analog/commands/downlink/GetArchiveHoursMC.js +5 -5
- package/dist/analog/commands/downlink/GetArchiveHoursMC.js.map +1 -1
- package/dist/analog/commands/downlink/GetExAbsArchiveDaysMC.d.ts +1 -1
- package/dist/analog/commands/downlink/GetExAbsArchiveDaysMC.js +5 -5
- package/dist/analog/commands/downlink/GetExAbsArchiveDaysMC.js.map +1 -1
- package/dist/analog/commands/downlink/GetExAbsArchiveHoursMC.d.ts +1 -1
- package/dist/analog/commands/downlink/GetExAbsArchiveHoursMC.js +5 -5
- package/dist/analog/commands/downlink/GetExAbsArchiveHoursMC.js.map +1 -1
- package/dist/analog/commands/uplink/DayMC.d.ts +1 -1
- package/dist/analog/commands/uplink/DayMC.js +6 -6
- package/dist/analog/commands/uplink/DayMC.js.map +1 -1
- package/dist/analog/commands/uplink/ExAbsDayMC.d.ts +1 -1
- package/dist/analog/commands/uplink/ExAbsDayMC.js +5 -5
- package/dist/analog/commands/uplink/ExAbsDayMC.js.map +1 -1
- package/dist/analog/commands/uplink/ExAbsHourMC.d.ts +1 -1
- package/dist/analog/commands/uplink/ExAbsHourMC.js +6 -6
- package/dist/analog/commands/uplink/ExAbsHourMC.js.map +1 -1
- package/dist/analog/commands/uplink/GetArchiveDaysMCResponse.d.ts +1 -1
- package/dist/analog/commands/uplink/GetArchiveDaysMCResponse.js +5 -5
- package/dist/analog/commands/uplink/GetArchiveDaysMCResponse.js.map +1 -1
- package/dist/analog/commands/uplink/GetArchiveEventsResponse.d.ts +1 -1
- package/dist/analog/commands/uplink/GetArchiveEventsResponse.js +7 -7
- package/dist/analog/commands/uplink/GetArchiveEventsResponse.js.map +1 -1
- package/dist/analog/commands/uplink/GetArchiveHoursMCResponse.d.ts +1 -1
- package/dist/analog/commands/uplink/GetArchiveHoursMCResponse.js +3 -3
- package/dist/analog/commands/uplink/GetArchiveHoursMCResponse.js.map +1 -1
- package/dist/analog/commands/uplink/GetExAbsArchiveDaysMCResponse.d.ts +1 -1
- package/dist/analog/commands/uplink/GetExAbsArchiveDaysMCResponse.js +5 -5
- package/dist/analog/commands/uplink/GetExAbsArchiveDaysMCResponse.js.map +1 -1
- package/dist/analog/commands/uplink/GetExAbsArchiveHoursMCResponse.d.ts +1 -1
- package/dist/analog/commands/uplink/GetExAbsArchiveHoursMCResponse.js +5 -5
- package/dist/analog/commands/uplink/GetExAbsArchiveHoursMCResponse.js.map +1 -1
- package/dist/analog/commands/uplink/HourMC.d.ts +1 -1
- package/dist/analog/commands/uplink/HourMC.js +5 -5
- package/dist/analog/commands/uplink/HourMC.js.map +1 -1
- package/dist/analog/commands/uplink/NewEvent.d.ts +1 -1
- package/dist/analog/commands/uplink/NewEvent.js +6 -6
- package/dist/analog/commands/uplink/NewEvent.js.map +1 -1
- package/dist/analog/commands/uplink/Time2000.d.ts +1 -1
- package/dist/analog/commands/uplink/Time2000.js +4 -4
- package/dist/analog/commands/uplink/Time2000.js.map +1 -1
- package/dist/analog/message.js +16 -17
- package/dist/analog/message.js.map +1 -1
- package/dist/obis-observer/CommandBinaryBuffer.d.ts +3 -3
- package/dist/obis-observer/CommandBinaryBuffer.js +5 -5
- package/dist/obis-observer/CommandBinaryBuffer.js.map +1 -1
- package/dist/obis-observer/commands/downlink/AddShortNameProfile.js +1 -1
- package/dist/obis-observer/commands/downlink/AddShortNameProfile.js.map +1 -1
- package/dist/obis-observer/commands/downlink/ReadArchive.d.ts +2 -1
- package/dist/obis-observer/commands/downlink/ReadArchive.js +5 -5
- package/dist/obis-observer/commands/downlink/ReadArchive.js.map +1 -1
- package/dist/obis-observer/commands/downlink/SetSerialPort.d.ts +1 -1
- package/dist/obis-observer/commands/downlink/SetSerialPort.js +2 -2
- package/dist/obis-observer/commands/downlink/SetSerialPort.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetShortNameInfoResponse.js +10 -4
- package/dist/obis-observer/commands/uplink/GetShortNameInfoResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetShortNameProfileResponse.js +1 -1
- package/dist/obis-observer/commands/uplink/GetShortNameProfileResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/ObservationReport.d.ts +2 -1
- package/dist/obis-observer/commands/uplink/ObservationReport.js +5 -5
- package/dist/obis-observer/commands/uplink/ObservationReport.js.map +1 -1
- package/dist/obis-observer/commands/uplink/ObservationReportString.d.ts +2 -1
- package/dist/obis-observer/commands/uplink/ObservationReportString.js +5 -5
- package/dist/obis-observer/commands/uplink/ObservationReportString.js.map +1 -1
- package/dist/obis-observer/commands/uplink/ReadArchiveResponse.d.ts +2 -1
- package/dist/obis-observer/commands/uplink/ReadArchiveResponse.js +5 -5
- package/dist/obis-observer/commands/uplink/ReadArchiveResponse.js.map +1 -1
- package/dist/obis-observer/constants/commandRelations.d.ts +2 -0
- package/dist/obis-observer/constants/commandRelations.js +21 -0
- package/dist/obis-observer/constants/commandRelations.js.map +1 -0
- package/dist/obis-observer/constants/shortNames.d.ts +34 -0
- package/dist/obis-observer/constants/shortNames.js +228 -0
- package/dist/obis-observer/constants/shortNames.js.map +1 -0
- package/dist/obis-observer/index.d.ts +2 -1
- package/dist/obis-observer/index.js +2 -1
- package/dist/obis-observer/index.js.map +1 -1
- package/dist/obis-observer/utils/index.d.ts +1 -0
- package/dist/obis-observer/utils/index.js +2 -0
- package/dist/obis-observer/utils/index.js.map +1 -0
- package/dist/obis-observer/utils/obis.d.ts +3 -0
- package/dist/obis-observer/utils/obis.js +68 -0
- package/dist/obis-observer/utils/obis.js.map +1 -0
- package/dist/utils/invertObject.d.ts +3 -0
- package/dist/utils/invertObject.js +4 -0
- package/dist/utils/invertObject.js.map +1 -0
- package/dist/utils/time.d.ts +2 -2
- package/dist/utils/time.js +2 -2
- package/dist/utils/time.js.map +1 -1
- package/package.json +1 -1
- package/readme.md +3 -1
|
@@ -84,14 +84,14 @@ class CommandBinaryBuffer extends BinaryBuffer {
|
|
|
84
84
|
sendingCounter: this.getUint8(),
|
|
85
85
|
flags: {
|
|
86
86
|
contentType: 0,
|
|
87
|
-
sendOnlyOnChange:
|
|
87
|
+
sendOnlyOnChange: false,
|
|
88
88
|
archiveType: 0
|
|
89
89
|
}
|
|
90
90
|
};
|
|
91
91
|
const flags = this.getUint8();
|
|
92
92
|
const { contentTypeBitsNumber, contentTypeBitStartIndex, sendingOnlyIfChangeBitsNumber, sendingOnlyIfChangeBitStartIndex, archiveTypeBitsNumber, archiveTypeBitStartIndex } = obisProfileFlags;
|
|
93
93
|
profile.flags.contentType = bitSet.extractBits(flags, contentTypeBitsNumber, contentTypeBitStartIndex);
|
|
94
|
-
profile.flags.sendOnlyOnChange = bitSet.extractBits(flags, sendingOnlyIfChangeBitsNumber, sendingOnlyIfChangeBitStartIndex);
|
|
94
|
+
profile.flags.sendOnlyOnChange = !!bitSet.extractBits(flags, sendingOnlyIfChangeBitsNumber, sendingOnlyIfChangeBitStartIndex);
|
|
95
95
|
profile.flags.archiveType = bitSet.extractBits(flags, archiveTypeBitsNumber, archiveTypeBitStartIndex);
|
|
96
96
|
return profile;
|
|
97
97
|
}
|
|
@@ -102,7 +102,7 @@ class CommandBinaryBuffer extends BinaryBuffer {
|
|
|
102
102
|
const { contentTypeBitsNumber, contentTypeBitStartIndex, sendingOnlyIfChangeBitsNumber, sendingOnlyIfChangeBitStartIndex, archiveTypeBitsNumber, archiveTypeBitStartIndex } = obisProfileFlags;
|
|
103
103
|
let flags = 0;
|
|
104
104
|
flags = bitSet.fillBits(flags, contentTypeBitsNumber, contentTypeBitStartIndex, profile.flags.contentType);
|
|
105
|
-
flags = bitSet.fillBits(flags, sendingOnlyIfChangeBitsNumber, sendingOnlyIfChangeBitStartIndex, profile.flags.sendOnlyOnChange);
|
|
105
|
+
flags = bitSet.fillBits(flags, sendingOnlyIfChangeBitsNumber, sendingOnlyIfChangeBitStartIndex, +profile.flags.sendOnlyOnChange);
|
|
106
106
|
flags = bitSet.fillBits(flags, archiveTypeBitsNumber, archiveTypeBitStartIndex, profile.flags.archiveType);
|
|
107
107
|
this.setUint8(flags);
|
|
108
108
|
}
|
|
@@ -123,13 +123,13 @@ class CommandBinaryBuffer extends BinaryBuffer {
|
|
|
123
123
|
getSerialPortFlags() {
|
|
124
124
|
const flags = this.getUint8();
|
|
125
125
|
return {
|
|
126
|
-
fixed: bitSet.extractBits(flags, 1, 3),
|
|
126
|
+
fixed: !!bitSet.extractBits(flags, 1, 3),
|
|
127
127
|
parity: bitSet.extractBits(flags, 2, 1)
|
|
128
128
|
};
|
|
129
129
|
}
|
|
130
130
|
setSerialPortFlags({ fixed, parity }) {
|
|
131
131
|
let flags = 0;
|
|
132
|
-
flags = bitSet.fillBits(flags, 1, 3, fixed);
|
|
132
|
+
flags = bitSet.fillBits(flags, 1, 3, +fixed);
|
|
133
133
|
flags = bitSet.fillBits(flags, 2, 1, parity);
|
|
134
134
|
this.setUint8(flags);
|
|
135
135
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandBinaryBuffer.js","sourceRoot":"","sources":["../../src/obis-observer/CommandBinaryBuffer.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAC;AAC7C,OAAO,WAAW,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"CommandBinaryBuffer.js","sourceRoot":"","sources":["../../src/obis-observer/CommandBinaryBuffer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddShortNameProfile.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/AddShortNameProfile.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAmC,MAAM,8BAA8B,CAAC;AACpH,OAAO,EAAC,QAAQ,EAAC,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAYpE,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,CAAC,GAAG,eAAe,CAAC;AAEzC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,EAAE;YACb,WAAW,EAAE;gBACT,aAAa,EAAE,GAAG;gBAClB,aAAa,EAAE,GAAG;gBAClB,cAAc,EAAE,EAAE;gBAClB,KAAK,EAAE;oBACH,WAAW,EAAE,YAAY,CAAC,IAAI;oBAC9B,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"AddShortNameProfile.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/AddShortNameProfile.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAmC,MAAM,8BAA8B,CAAC;AACpH,OAAO,EAAC,QAAQ,EAAC,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAYpE,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,CAAC,GAAG,eAAe,CAAC;AAEzC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,EAAE;YACb,WAAW,EAAE;gBACT,aAAa,EAAE,GAAG;gBAClB,aAAa,EAAE,GAAG;gBAClB,cAAc,EAAE,EAAE;gBAClB,KAAK,EAAE;oBACH,WAAW,EAAE,YAAY,CAAC,IAAI;oBAC9B,gBAAgB,EAAE,IAAI;oBACtB,WAAW,EAAE,YAAY,CAAC,IAAI;iBACjC;aACJ;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,yBAAyB,EAAC;KACvD;CACJ,CAAC;AAgCF,MAAM,mBAAoB,SAAQ,OAAO;IACrC,YAAqB,UAA0C;QAC3D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAgC;QAG3D,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,mBAAmB,CAAC;YAC3B,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,WAAW,EAAE,MAAM,CAAC,cAAc,EAAE;SACvC,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,EAAC,SAAS,EAAE,SAAS,EAAE,WAAW,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAE5D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,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;;AA9Be,sBAAE,GAAG,UAAU,CAAC;AAEhB,iCAAa,GAAG,QAAQ,CAAC;AAEzB,4BAAQ,GAAG,QAAQ,CAAC;AAEpB,iCAAa,GAAG,IAAI,CAAC;AA4BzC,eAAe,mBAAmB,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import Command, { TCommandExampleList } from '../../Command.js';
|
|
2
2
|
import { ICommandParameters } from '../../CommandBinaryBuffer.js';
|
|
3
|
+
import { TTime2000 } from '../../../utils/time.js';
|
|
3
4
|
interface IReadArchiveParameters extends ICommandParameters {
|
|
4
5
|
archiveType: number;
|
|
5
|
-
|
|
6
|
+
time2000: TTime2000;
|
|
6
7
|
}
|
|
7
8
|
declare class ReadArchive extends Command {
|
|
8
9
|
parameters: IReadArchiveParameters;
|
|
@@ -10,7 +10,7 @@ const examples = [
|
|
|
10
10
|
parameters: {
|
|
11
11
|
requestId: 33,
|
|
12
12
|
archiveType: archiveTypes.DETAILED,
|
|
13
|
-
|
|
13
|
+
time2000: 756604800
|
|
14
14
|
},
|
|
15
15
|
hex: { header: '11', body: '21 01 2d 18 df 80' }
|
|
16
16
|
},
|
|
@@ -19,7 +19,7 @@ const examples = [
|
|
|
19
19
|
parameters: {
|
|
20
20
|
requestId: 34,
|
|
21
21
|
archiveType: archiveTypes.SUMMARY,
|
|
22
|
-
|
|
22
|
+
time2000: 756619200
|
|
23
23
|
},
|
|
24
24
|
hex: { header: '11', body: '22 02 2d 19 17 c0' }
|
|
25
25
|
}
|
|
@@ -35,18 +35,18 @@ class ReadArchive extends Command {
|
|
|
35
35
|
return new ReadArchive({
|
|
36
36
|
requestId: buffer.getUint8(),
|
|
37
37
|
archiveType: buffer.getUint8(),
|
|
38
|
-
|
|
38
|
+
time2000: buffer.getUint32()
|
|
39
39
|
});
|
|
40
40
|
}
|
|
41
41
|
toBytes() {
|
|
42
42
|
if (typeof this.size !== 'number') {
|
|
43
43
|
throw new Error('unknown or invalid size');
|
|
44
44
|
}
|
|
45
|
-
const { requestId, archiveType,
|
|
45
|
+
const { requestId, archiveType, time2000 } = this.parameters;
|
|
46
46
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
47
47
|
buffer.setUint8(requestId);
|
|
48
48
|
buffer.setUint8(archiveType);
|
|
49
|
-
buffer.setUint32(
|
|
49
|
+
buffer.setUint32(time2000);
|
|
50
50
|
return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
|
|
51
51
|
}
|
|
52
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReadArchive.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/ReadArchive.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;AACvD,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"ReadArchive.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/ReadArchive.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;AACvD,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAatD,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;AAEzC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,uDAAuD;QAC7D,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;YACb,WAAW,EAAE,YAAY,CAAC,QAAQ;YAClC,QAAQ,EAAE,SAAS;SACtB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,mBAAmB,EAAC;KACjD;IACD;QACI,IAAI,EAAE,sDAAsD;QAC5D,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;YACb,WAAW,EAAE,YAAY,CAAC,OAAO;YACjC,QAAQ,EAAE,SAAS;SACtB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,mBAAmB,EAAC;KACjD;CACJ,CAAC;AAyBF,MAAM,WAAY,SAAQ,OAAO;IAC7B,YAAqB,UAAkC;QACnD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAwB;QAGnD,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC7B,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,WAAW,CAAC;YACnB,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC9B,QAAQ,EAAE,MAAM,CAAC,SAAS,EAAE;SAC/B,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,EAAC,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAC3D,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAElD,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC7B,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAE3B,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAlCe,cAAE,GAAG,UAAU,CAAC;AAEhB,yBAAa,GAAG,QAAQ,CAAC;AAEzB,oBAAQ,GAAG,QAAQ,CAAC;AAEpB,yBAAa,GAAG,IAAI,CAAC;AAgCzC,eAAe,WAAW,CAAC"}
|
|
@@ -12,7 +12,7 @@ const examples = [
|
|
|
12
12
|
baudRate: 5,
|
|
13
13
|
dataBits: 8,
|
|
14
14
|
parity: parityTypes.ODD,
|
|
15
|
-
fixed:
|
|
15
|
+
fixed: true
|
|
16
16
|
},
|
|
17
17
|
hex: { header: '13', body: '34 05 08 05' }
|
|
18
18
|
},
|
|
@@ -23,7 +23,7 @@ const examples = [
|
|
|
23
23
|
baudRate: 12,
|
|
24
24
|
dataBits: 7,
|
|
25
25
|
parity: parityTypes.NONE,
|
|
26
|
-
fixed:
|
|
26
|
+
fixed: false
|
|
27
27
|
},
|
|
28
28
|
hex: { header: '13', body: '34 0c 07 00' }
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SetSerialPort.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/SetSerialPort.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;AACvD,OAAO,KAAK,WAAW,MAAM,gCAAgC,CAAC;AAc9D,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;AAEzC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,kCAAkC;QACxC,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;YACb,QAAQ,EAAE,CAAC;YACX,QAAQ,EAAE,CAAC;YACX,MAAM,EAAE,WAAW,CAAC,GAAG;YACvB,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"SetSerialPort.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/downlink/SetSerialPort.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;AACvD,OAAO,KAAK,WAAW,MAAM,gCAAgC,CAAC;AAc9D,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;AAEzC,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,kCAAkC;QACxC,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;YACb,QAAQ,EAAE,CAAC;YACX,QAAQ,EAAE,CAAC;YACX,MAAM,EAAE,WAAW,CAAC,GAAG;YACvB,KAAK,EAAE,IAAI;SACd;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAC;KAC3C;IACD;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;YACb,QAAQ,EAAE,EAAE;YACZ,QAAQ,EAAE,CAAC;YACX,MAAM,EAAE,WAAW,CAAC,IAAI;YACxB,KAAK,EAAE,KAAK;SACf;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAC;KAC3C;CACJ,CAAC;AA0BF,MAAM,aAAc,SAAQ,OAAO;IAC/B,YAAqB,UAAoC;QACrD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA0B;QAGrD,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,aAAa,CAAC;YACrB,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC3B,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;YAE3B,GAAG,MAAM,CAAC,kBAAkB,EAAE;SACjC,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,EACF,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,KAAK,EACR,GAAG,IAAI,CAAC,UAAU,CAAC;QAEpB,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC1B,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC1B,MAAM,CAAC,kBAAkB,CAAC,EAAC,MAAM,EAAE,KAAK,EAAC,CAAC,CAAC;QAE3C,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAvCe,gBAAE,GAAG,UAAU,CAAC;AAEhB,2BAAa,GAAG,QAAQ,CAAC;AAEzB,sBAAQ,GAAG,QAAQ,CAAC;AAEpB,2BAAa,GAAG,IAAI,CAAC;AAqCzC,eAAe,aAAa,CAAC"}
|
|
@@ -19,7 +19,7 @@ const examples = [
|
|
|
19
19
|
sendingCounter: 61,
|
|
20
20
|
flags: {
|
|
21
21
|
contentType: contentTypes.STRING,
|
|
22
|
-
sendOnlyOnChange:
|
|
22
|
+
sendOnlyOnChange: false,
|
|
23
23
|
archiveType: archiveTypes.DETAILED
|
|
24
24
|
}
|
|
25
25
|
}
|
|
@@ -33,18 +33,24 @@ class GetShortNameInfoResponse extends Command {
|
|
|
33
33
|
this.parameters = parameters;
|
|
34
34
|
let size = 1 + REQUEST_ID_SIZE;
|
|
35
35
|
if (parameters.obis) {
|
|
36
|
-
size += CommandBinaryBuffer.getObisSize(parameters.obis)
|
|
36
|
+
size += CommandBinaryBuffer.getObisSize(parameters.obis);
|
|
37
|
+
}
|
|
38
|
+
if (parameters.obisProfile) {
|
|
39
|
+
size += OBIS_PROFILE_SIZE;
|
|
37
40
|
}
|
|
38
41
|
this.size = size;
|
|
39
42
|
}
|
|
40
43
|
static fromBytes(data) {
|
|
41
44
|
const buffer = new CommandBinaryBuffer(data);
|
|
42
|
-
|
|
45
|
+
let size = buffer.getUint8() - REQUEST_ID_SIZE;
|
|
43
46
|
const requestId = buffer.getUint8();
|
|
44
47
|
let obis;
|
|
45
48
|
let obisProfile;
|
|
46
|
-
if (size >
|
|
49
|
+
if (size > 0) {
|
|
47
50
|
obis = buffer.getObis();
|
|
51
|
+
size -= CommandBinaryBuffer.getObisSize(obis);
|
|
52
|
+
}
|
|
53
|
+
if (size > 0) {
|
|
48
54
|
obisProfile = buffer.getObisProfile();
|
|
49
55
|
}
|
|
50
56
|
return new GetShortNameInfoResponse({ requestId, obis, obisProfile });
|
|
@@ -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,EAAE,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAWpE,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,uDAAuD;QAC7D,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,IAAI,EAAE;gBACF,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,CAAC;aACP;YACD,WAAW,EAAE;gBACT,aAAa,EAAE,GAAG;gBAClB,aAAa,EAAE,GAAG;gBAClB,cAAc,EAAE,EAAE;gBAClB,KAAK,EAAE;oBACH,WAAW,EAAE,YAAY,CAAC,MAAM;oBAChC,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"GetShortNameInfoResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetShortNameInfoResponse.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,EAAE,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAUpE,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,gBAAgB,EAAE,
|
|
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,EAAE,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAUpE,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,gBAAgB,EAAE,KAAK;oBACvB,WAAW,EAAE,YAAY,CAAC,QAAQ;iBACrC;aACJ;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,sBAAsB,EAAC;KACpD;CACJ,CAAC;AAgCF,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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import Command, { TCommandExampleList } from '../../Command.js';
|
|
2
2
|
import { IShortNameFloat } from '../../CommandBinaryBuffer.js';
|
|
3
|
+
import { TTime2000 } from '../../../utils/time.js';
|
|
3
4
|
interface IObservationReportParameters {
|
|
4
|
-
|
|
5
|
+
time2000: TTime2000;
|
|
5
6
|
shortNameList: Array<IShortNameFloat>;
|
|
6
7
|
}
|
|
7
8
|
declare class ObservationReport extends Command {
|
|
@@ -6,7 +6,7 @@ const examples = [
|
|
|
6
6
|
{
|
|
7
7
|
name: 'get observation report from 2023.12.23 00:00:00 GMT',
|
|
8
8
|
parameters: {
|
|
9
|
-
|
|
9
|
+
time2000: 756604800,
|
|
10
10
|
shortNameList: [
|
|
11
11
|
{ code: 50, content: 34.33 },
|
|
12
12
|
{ code: 56, content: 45.33 }
|
|
@@ -28,23 +28,23 @@ class ObservationReport extends Command {
|
|
|
28
28
|
static fromBytes(data) {
|
|
29
29
|
const buffer = new CommandBinaryBuffer(data);
|
|
30
30
|
let size = buffer.getUint8() - DATE_TIME_SIZE;
|
|
31
|
-
const
|
|
31
|
+
const time2000 = buffer.getUint32();
|
|
32
32
|
const shortNameList = [];
|
|
33
33
|
while (size > 0) {
|
|
34
34
|
const shortName = buffer.getShortNameFloat();
|
|
35
35
|
size -= CommandBinaryBuffer.getShortNameContentSize(shortName);
|
|
36
36
|
shortNameList.push(shortName);
|
|
37
37
|
}
|
|
38
|
-
return new ObservationReport({
|
|
38
|
+
return new ObservationReport({ time2000, shortNameList });
|
|
39
39
|
}
|
|
40
40
|
toBytes() {
|
|
41
41
|
if (typeof this.size !== 'number') {
|
|
42
42
|
throw new Error('unknown or invalid size');
|
|
43
43
|
}
|
|
44
44
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
45
|
-
const {
|
|
45
|
+
const { time2000, shortNameList } = this.parameters;
|
|
46
46
|
buffer.setUint8(this.size - 1);
|
|
47
|
-
buffer.setUint32(
|
|
47
|
+
buffer.setUint32(time2000);
|
|
48
48
|
shortNameList.forEach(shortName => buffer.setShortNameFloat(shortName));
|
|
49
49
|
return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
|
|
50
50
|
}
|
|
@@ -1 +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;
|
|
1
|
+
{"version":3,"file":"ObservationReport.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ObservationReport.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,cAAc,EAAkB,MAAM,8BAA8B,CAAC;AAClG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAcrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,qDAAqD;QAC3D,UAAU,EAAE;YACR,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE;gBACX,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;gBAC1B,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;aAC7B;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,8CAA8C,EAAC;KAC5E;CACJ,CAAC;AA0BF,MAAM,iBAAkB,SAAQ,OAAO;IACnC,YAAqB,UAAwC;QACzD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA8B;QAIzD,IAAI,IAAI,GAAG,CAAC,GAAG,cAAc,CAAC;QAE9B,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC9C,IAAI,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,IAAI,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,cAAc,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,OAAQ,IAAI,GAAG,CAAC,EAAG;YACf,MAAM,SAAS,GAAG,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAE7C,IAAI,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;YAC/D,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,iBAAiB,CAAC,EAAC,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC;IAC5D,CAAC;IAGD,OAAO;QACH,IAAK,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAG;YACjC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC9C;QAED,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,EAAC,QAAQ,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAGlD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC3B,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;QAExE,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA1Ce,oBAAE,GAAG,UAAU,CAAC;AAEhB,+BAAa,GAAG,MAAM,CAAC;AAEvB,0BAAQ,GAAG,QAAQ,CAAC;AAEpB,+BAAa,GAAG,IAAI,CAAC;AAwCzC,eAAe,iBAAiB,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import Command, { TCommandExampleList } from '../../Command.js';
|
|
2
2
|
import { IShortNameString } from '../../CommandBinaryBuffer.js';
|
|
3
|
+
import { TTime2000 } from '../../../utils/time.js';
|
|
3
4
|
interface IObservationReportStringParameters {
|
|
4
|
-
|
|
5
|
+
time2000: TTime2000;
|
|
5
6
|
shortNameList: Array<IShortNameString>;
|
|
6
7
|
}
|
|
7
8
|
declare class ObservationReportString extends Command {
|
|
@@ -6,7 +6,7 @@ const examples = [
|
|
|
6
6
|
{
|
|
7
7
|
name: 'get observation report from 2023.12.23 00:00:00 GMT',
|
|
8
8
|
parameters: {
|
|
9
|
-
|
|
9
|
+
time2000: 756604800,
|
|
10
10
|
shortNameList: [
|
|
11
11
|
{ code: 50, content: 'reactive power QI, average' },
|
|
12
12
|
{ code: 56, content: 'reactive power QI, total' }
|
|
@@ -33,23 +33,23 @@ class ObservationReportString extends Command {
|
|
|
33
33
|
static fromBytes(data) {
|
|
34
34
|
const buffer = new CommandBinaryBuffer(data);
|
|
35
35
|
let size = buffer.getUint8() - DATE_TIME_SIZE;
|
|
36
|
-
const
|
|
36
|
+
const time2000 = buffer.getUint32();
|
|
37
37
|
const shortNameList = [];
|
|
38
38
|
while (size > 0) {
|
|
39
39
|
const shortName = buffer.getShortNameString();
|
|
40
40
|
size -= CommandBinaryBuffer.getShortNameContentSize(shortName);
|
|
41
41
|
shortNameList.push(shortName);
|
|
42
42
|
}
|
|
43
|
-
return new ObservationReportString({
|
|
43
|
+
return new ObservationReportString({ time2000, shortNameList });
|
|
44
44
|
}
|
|
45
45
|
toBytes() {
|
|
46
46
|
if (typeof this.size !== 'number') {
|
|
47
47
|
throw new Error('unknown or invalid size');
|
|
48
48
|
}
|
|
49
49
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
50
|
-
const {
|
|
50
|
+
const { time2000, shortNameList } = this.parameters;
|
|
51
51
|
buffer.setUint8(this.size - 1);
|
|
52
|
-
buffer.setUint32(
|
|
52
|
+
buffer.setUint32(time2000);
|
|
53
53
|
shortNameList.forEach(shortName => buffer.setShortNameString(shortName));
|
|
54
54
|
return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
|
|
55
55
|
}
|
|
@@ -1 +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;
|
|
1
|
+
{"version":3,"file":"ObservationReportString.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ObservationReportString.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAmB,cAAc,EAAC,MAAM,8BAA8B,CAAC;AACnG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAcrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,qDAAqD;QAC3D,UAAU,EAAE;YACR,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE;gBACX,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,4BAA4B,EAAC;gBACjD,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,0BAA0B,EAAC;aAClD;SACJ;QACD,GAAG,EAAE;YACD,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,6DAA6D;kBAC7D,oEAAoE;kBACpE,qDAAqD;SAC9D;KACJ;CACJ,CAAC;AAgCF,MAAM,uBAAwB,SAAQ,OAAO;IACzC,YAAqB,UAA8C;QAC/D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAoC;QAI/D,IAAI,IAAI,GAAG,CAAC,GAAG,cAAc,CAAC;QAE9B,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC9C,IAAI,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,IAAI,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,cAAc,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,OAAQ,IAAI,GAAG,CAAC,EAAG;YACf,MAAM,SAAS,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAE9C,IAAI,IAAI,mBAAmB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;YAC/D,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,uBAAuB,CAAC,EAAC,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC;IAClE,CAAC;IAGD,OAAO;QACH,IAAK,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAG;YACjC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC9C;QAED,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,EAAC,QAAQ,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAGlD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC3B,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;QAEzE,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA1Ce,0BAAE,GAAG,UAAU,CAAC;AAEhB,qCAAa,GAAG,MAAM,CAAC;AAEvB,gCAAQ,GAAG,QAAQ,CAAC;AAEpB,qCAAa,GAAG,IAAI,CAAC;AAwCzC,eAAe,uBAAuB,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import Command, { TCommandExampleList } from '../../Command.js';
|
|
2
2
|
import { ICommandParameters, IShortNameFloat } from '../../CommandBinaryBuffer.js';
|
|
3
|
+
import { TTime2000 } from '../../../utils/time.js';
|
|
3
4
|
interface IReadArchiveResponseParameters extends ICommandParameters {
|
|
4
|
-
|
|
5
|
+
time2000: TTime2000;
|
|
5
6
|
shortNameList: Array<IShortNameFloat>;
|
|
6
7
|
}
|
|
7
8
|
declare class ReadArchiveResponse extends Command {
|
|
@@ -8,7 +8,7 @@ const examples = [
|
|
|
8
8
|
name: 'summary archive from 2023-12-23 04:00:00 GMT',
|
|
9
9
|
parameters: {
|
|
10
10
|
requestId: 34,
|
|
11
|
-
|
|
11
|
+
time2000: 756619200,
|
|
12
12
|
shortNameList: [
|
|
13
13
|
{ code: 50, content: 22.27 },
|
|
14
14
|
{ code: 56, content: 89.33 }
|
|
@@ -31,24 +31,24 @@ class ReadArchiveResponse extends Command {
|
|
|
31
31
|
const buffer = new CommandBinaryBuffer(data);
|
|
32
32
|
let size = buffer.getUint8() - COMMAND_HEADER_SIZE;
|
|
33
33
|
const requestId = buffer.getUint8();
|
|
34
|
-
const
|
|
34
|
+
const time2000 = buffer.getUint32();
|
|
35
35
|
const shortNameList = [];
|
|
36
36
|
while (size) {
|
|
37
37
|
const shortName = buffer.getShortNameFloat();
|
|
38
38
|
size -= CommandBinaryBuffer.getShortNameContentSize(shortName);
|
|
39
39
|
shortNameList.push(shortName);
|
|
40
40
|
}
|
|
41
|
-
return new ReadArchiveResponse({ requestId,
|
|
41
|
+
return new ReadArchiveResponse({ requestId, time2000, shortNameList });
|
|
42
42
|
}
|
|
43
43
|
toBytes() {
|
|
44
44
|
if (typeof this.size !== 'number') {
|
|
45
45
|
throw new Error('unknown or invalid size');
|
|
46
46
|
}
|
|
47
47
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
48
|
-
const { requestId,
|
|
48
|
+
const { requestId, time2000, shortNameList } = this.parameters;
|
|
49
49
|
buffer.setUint8(this.size - 1);
|
|
50
50
|
buffer.setUint8(requestId);
|
|
51
|
-
buffer.setUint32(
|
|
51
|
+
buffer.setUint32(time2000);
|
|
52
52
|
shortNameList.forEach(shortName => buffer.setShortNameFloat(shortName));
|
|
53
53
|
return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
|
|
54
54
|
}
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"ReadArchiveResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ReadArchiveResponse.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import * as downlinkCommands from '../commands/downlink/index.js';
|
|
2
|
+
import * as uplinkCommands from '../commands/uplink/index.js';
|
|
3
|
+
export const requestByResponse = new Map();
|
|
4
|
+
export const responseByRequest = new Map();
|
|
5
|
+
requestByResponse.set(uplinkCommands.AddShortNameProfileResponse, downlinkCommands.AddShortNameProfile);
|
|
6
|
+
requestByResponse.set(uplinkCommands.GetArchiveProfileResponse, downlinkCommands.GetArchiveProfile);
|
|
7
|
+
requestByResponse.set(uplinkCommands.GetContentByObisResponse, downlinkCommands.GetContentByObis);
|
|
8
|
+
requestByResponse.set(uplinkCommands.GetContentByShortNameResponse, downlinkCommands.GetContentByShortName);
|
|
9
|
+
requestByResponse.set(uplinkCommands.GetShortNameInfoResponse, downlinkCommands.GetShortNameInfo);
|
|
10
|
+
requestByResponse.set(uplinkCommands.GetShortNameProfileResponse, downlinkCommands.GetShortNameProfile);
|
|
11
|
+
requestByResponse.set(uplinkCommands.GetShortNamesResponse, downlinkCommands.GetShortNames);
|
|
12
|
+
requestByResponse.set(uplinkCommands.ReadArchiveResponse, downlinkCommands.ReadArchive);
|
|
13
|
+
requestByResponse.set(uplinkCommands.RebootResponse, downlinkCommands.Reboot);
|
|
14
|
+
requestByResponse.set(uplinkCommands.RemoveShortNameProfileResponse, downlinkCommands.RemoveShortNameProfile);
|
|
15
|
+
requestByResponse.set(uplinkCommands.SetArchiveProfileResponse, downlinkCommands.SetArchiveProfile);
|
|
16
|
+
requestByResponse.set(uplinkCommands.SetSerialPortResponse, downlinkCommands.SetSerialPort);
|
|
17
|
+
requestByResponse.set(uplinkCommands.SetShortNameResponse, downlinkCommands.SetShortName);
|
|
18
|
+
for (const [key, value] of requestByResponse.entries()) {
|
|
19
|
+
responseByRequest.set(value, key);
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=commandRelations.js.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
declare const _default: ({
|
|
2
|
+
shortName: number;
|
|
3
|
+
obisCode: string;
|
|
4
|
+
isStatic: boolean;
|
|
5
|
+
isGeneral: boolean;
|
|
6
|
+
description: string;
|
|
7
|
+
isInstantaneous?: undefined;
|
|
8
|
+
isAbstract?: undefined;
|
|
9
|
+
} | {
|
|
10
|
+
shortName: number;
|
|
11
|
+
obisCode: string;
|
|
12
|
+
isStatic: boolean;
|
|
13
|
+
isInstantaneous: boolean;
|
|
14
|
+
description: string;
|
|
15
|
+
isGeneral?: undefined;
|
|
16
|
+
isAbstract?: undefined;
|
|
17
|
+
} | {
|
|
18
|
+
shortName: number;
|
|
19
|
+
obisCode: string;
|
|
20
|
+
isStatic: boolean;
|
|
21
|
+
isAbstract: boolean;
|
|
22
|
+
description: string;
|
|
23
|
+
isGeneral?: undefined;
|
|
24
|
+
isInstantaneous?: undefined;
|
|
25
|
+
} | {
|
|
26
|
+
shortName: number;
|
|
27
|
+
obisCode: string;
|
|
28
|
+
isStatic: boolean;
|
|
29
|
+
description: string;
|
|
30
|
+
isGeneral?: undefined;
|
|
31
|
+
isInstantaneous?: undefined;
|
|
32
|
+
isAbstract?: undefined;
|
|
33
|
+
})[];
|
|
34
|
+
export default _default;
|