jooby-codec 2.10.0 → 2.11.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/obis-observer/commands/downlink/GetMeterId.js +0 -3
- package/dist/obis-observer/commands/downlink/GetMeterId.js.map +1 -1
- package/dist/obis-observer/commands/downlink/GetObisContent.js +0 -3
- package/dist/obis-observer/commands/downlink/GetObisContent.js.map +1 -1
- package/dist/obis-observer/commands/downlink/GetObisIdList.js +0 -3
- package/dist/obis-observer/commands/downlink/GetObisIdList.js.map +1 -1
- package/dist/obis-observer/commands/downlink/ReadMeterArchive.js +0 -3
- package/dist/obis-observer/commands/downlink/ReadMeterArchive.js.map +1 -1
- package/dist/obis-observer/commands/downlink/SetObisId.js +0 -3
- package/dist/obis-observer/commands/downlink/SetObisId.js.map +1 -1
- package/dist/obis-observer/commands/downlink/SetupMeter.js +0 -3
- package/dist/obis-observer/commands/downlink/SetupMeter.js.map +1 -1
- package/dist/obis-observer/commands/downlink/UpdateImageWrite.js +0 -3
- package/dist/obis-observer/commands/downlink/UpdateImageWrite.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetLorawanInfoResponse.js +0 -3
- package/dist/obis-observer/commands/uplink/GetLorawanInfoResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetMeterArchiveProfileResponse.d.ts +4 -4
- package/dist/obis-observer/commands/uplink/GetMeterArchiveProfileResponse.js +31 -12
- package/dist/obis-observer/commands/uplink/GetMeterArchiveProfileResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetMeterArchiveStateResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetMeterDateResponse.d.ts +1 -2
- package/dist/obis-observer/commands/uplink/GetMeterDateResponse.js +18 -15
- package/dist/obis-observer/commands/uplink/GetMeterDateResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetMeterIdListResponse.js +0 -3
- package/dist/obis-observer/commands/uplink/GetMeterIdListResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetMeterIdResponse.d.ts +2 -2
- package/dist/obis-observer/commands/uplink/GetMeterIdResponse.js +16 -5
- package/dist/obis-observer/commands/uplink/GetMeterIdResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetMeterInfoResponse.js +0 -3
- package/dist/obis-observer/commands/uplink/GetMeterInfoResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetMeterProfileIdListResponse.js +0 -3
- package/dist/obis-observer/commands/uplink/GetMeterProfileIdListResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetMeterReadoutStateResponse.d.ts +2 -2
- package/dist/obis-observer/commands/uplink/GetMeterReadoutStateResponse.js +46 -19
- package/dist/obis-observer/commands/uplink/GetMeterReadoutStateResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetObisContentByIdResponse.d.ts +1 -1
- package/dist/obis-observer/commands/uplink/GetObisContentByIdResponse.js +14 -7
- package/dist/obis-observer/commands/uplink/GetObisContentByIdResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetObisContentByIdStringResponse.js +0 -3
- package/dist/obis-observer/commands/uplink/GetObisContentByIdStringResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetObisContentResponse.js +0 -3
- package/dist/obis-observer/commands/uplink/GetObisContentResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetObisIdListResponse.js +0 -3
- package/dist/obis-observer/commands/uplink/GetObisIdListResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetObisInfoResponse.js +31 -19
- package/dist/obis-observer/commands/uplink/GetObisInfoResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetObisProfileResponse.d.ts +1 -1
- package/dist/obis-observer/commands/uplink/GetObisProfileResponse.js +14 -7
- package/dist/obis-observer/commands/uplink/GetObisProfileResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetObserverInfoResponse.js +0 -3
- package/dist/obis-observer/commands/uplink/GetObserverInfoResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/GetObserverUptimeResponse.js +0 -3
- package/dist/obis-observer/commands/uplink/GetObserverUptimeResponse.js.map +1 -1
- package/dist/obis-observer/commands/uplink/ObservationReport.js +0 -3
- package/dist/obis-observer/commands/uplink/ObservationReport.js.map +1 -1
- package/dist/obis-observer/commands/uplink/ObservationReportString.js +0 -3
- package/dist/obis-observer/commands/uplink/ObservationReportString.js.map +1 -1
- package/dist/obis-observer/commands/uplink/ReadMeterArchiveResponse.d.ts +2 -2
- package/dist/obis-observer/commands/uplink/ReadMeterArchiveResponse.js +30 -11
- package/dist/obis-observer/commands/uplink/ReadMeterArchiveResponse.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,6 +2,7 @@ import Command from '../../Command.js';
|
|
|
2
2
|
import CommandBinaryBuffer, { REQUEST_ID_SIZE } from '../../CommandBinaryBuffer.js';
|
|
3
3
|
import { UPLINK } from '../../constants/directions.js';
|
|
4
4
|
const COMMAND_ID = 0x82;
|
|
5
|
+
const COMMAND_SIZE = REQUEST_ID_SIZE + 4 + 4 + 2 + 2 + 2 + 7;
|
|
5
6
|
const examples = [
|
|
6
7
|
{
|
|
7
8
|
name: 'response to GetMeterReadoutState',
|
|
@@ -21,38 +22,64 @@ const examples = [
|
|
|
21
22
|
overrunErrors: 0
|
|
22
23
|
},
|
|
23
24
|
hex: { header: '82 16', body: '03 00 00 00 7f 00 00 00 c1 00 0e 00 0c 00 02 00 00 00 00 00 00 00' }
|
|
25
|
+
},
|
|
26
|
+
{
|
|
27
|
+
name: 'response to GetMeterReadoutState without data',
|
|
28
|
+
parameters: {
|
|
29
|
+
requestId: 3
|
|
30
|
+
},
|
|
31
|
+
hex: { header: '82 01', body: '03' }
|
|
24
32
|
}
|
|
25
33
|
];
|
|
34
|
+
const isValidParameterSet = (parameters) => {
|
|
35
|
+
const { requestId, lastSuccessfulTime, lastFailedTime, readoutAttempts, successfulReadoutAttempts, readoutRepetitions, waitNextSymbolErrors, waitIdErrors, waitNextStateErrors, wrongBccErrors, parityErrors, frameErrors, overrunErrors } = parameters;
|
|
36
|
+
return requestId !== undefined
|
|
37
|
+
&& lastSuccessfulTime !== undefined
|
|
38
|
+
&& lastFailedTime !== undefined
|
|
39
|
+
&& readoutAttempts !== undefined
|
|
40
|
+
&& successfulReadoutAttempts !== undefined
|
|
41
|
+
&& readoutRepetitions !== undefined
|
|
42
|
+
&& waitNextSymbolErrors !== undefined
|
|
43
|
+
&& waitIdErrors !== undefined
|
|
44
|
+
&& waitNextStateErrors !== undefined
|
|
45
|
+
&& wrongBccErrors !== undefined
|
|
46
|
+
&& parityErrors !== undefined
|
|
47
|
+
&& frameErrors !== undefined
|
|
48
|
+
&& overrunErrors !== undefined;
|
|
49
|
+
};
|
|
26
50
|
class GetMeterReadoutStateResponse extends Command {
|
|
27
51
|
constructor(parameters) {
|
|
28
52
|
super();
|
|
29
53
|
this.parameters = parameters;
|
|
30
|
-
this.size =
|
|
54
|
+
this.size = isValidParameterSet(parameters) ? COMMAND_SIZE : REQUEST_ID_SIZE;
|
|
31
55
|
}
|
|
32
56
|
static fromBytes(data) {
|
|
33
57
|
const buffer = new CommandBinaryBuffer(data);
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
58
|
+
const requestId = buffer.getUint8();
|
|
59
|
+
return buffer.isEmpty
|
|
60
|
+
? new GetMeterReadoutStateResponse({ requestId })
|
|
61
|
+
: new GetMeterReadoutStateResponse({
|
|
62
|
+
requestId,
|
|
63
|
+
lastSuccessfulTime: buffer.getUint32(),
|
|
64
|
+
lastFailedTime: buffer.getUint32(),
|
|
65
|
+
readoutAttempts: buffer.getUint16(),
|
|
66
|
+
successfulReadoutAttempts: buffer.getUint16(),
|
|
67
|
+
readoutRepetitions: buffer.getUint16(),
|
|
68
|
+
waitNextSymbolErrors: buffer.getUint8(),
|
|
69
|
+
waitIdErrors: buffer.getUint8(),
|
|
70
|
+
waitNextStateErrors: buffer.getUint8(),
|
|
71
|
+
wrongBccErrors: buffer.getUint8(),
|
|
72
|
+
parityErrors: buffer.getUint8(),
|
|
73
|
+
frameErrors: buffer.getUint8(),
|
|
74
|
+
overrunErrors: buffer.getUint8()
|
|
75
|
+
});
|
|
49
76
|
}
|
|
50
77
|
toBytes() {
|
|
51
|
-
if (
|
|
52
|
-
|
|
78
|
+
if (!isValidParameterSet(this.parameters)) {
|
|
79
|
+
return Command.toBytes(COMMAND_ID, new Uint8Array([this.parameters.requestId]));
|
|
53
80
|
}
|
|
54
81
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
55
|
-
const
|
|
82
|
+
const parameters = this.parameters;
|
|
56
83
|
buffer.setUint8(parameters.requestId);
|
|
57
84
|
buffer.setUint32(parameters.lastSuccessfulTime);
|
|
58
85
|
buffer.setUint32(parameters.lastFailedTime);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetMeterReadoutStateResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetMeterReadoutStateResponse.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;AAkCrD,MAAM,UAAU,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"GetMeterReadoutStateResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetMeterReadoutStateResponse.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import Command, { TCommandExampleList } from '../../Command.js';
|
|
2
2
|
import { ICommandParameters } from '../../CommandBinaryBuffer.js';
|
|
3
3
|
interface IGetObisContentByIdResponseParameters extends ICommandParameters {
|
|
4
|
-
content
|
|
4
|
+
content?: number;
|
|
5
5
|
}
|
|
6
6
|
declare class GetObisContentByIdResponse extends Command {
|
|
7
7
|
parameters: IGetObisContentByIdResponseParameters;
|
|
@@ -11,28 +11,35 @@ const examples = [
|
|
|
11
11
|
content: 344.23
|
|
12
12
|
},
|
|
13
13
|
hex: { header: '4e 05', body: '79 43 ac 1d 71' }
|
|
14
|
+
},
|
|
15
|
+
{
|
|
16
|
+
name: 'response to GetObisContentById without content',
|
|
17
|
+
parameters: {
|
|
18
|
+
requestId: 122
|
|
19
|
+
},
|
|
20
|
+
hex: { header: '4e 01', body: '7a' }
|
|
14
21
|
}
|
|
15
22
|
];
|
|
16
23
|
class GetObisContentByIdResponse extends Command {
|
|
17
24
|
constructor(parameters) {
|
|
18
25
|
super();
|
|
19
26
|
this.parameters = parameters;
|
|
20
|
-
this.size = REQUEST_ID_SIZE + 4;
|
|
27
|
+
this.size = REQUEST_ID_SIZE + (parameters.content ? 4 : 0);
|
|
21
28
|
}
|
|
22
29
|
static fromBytes(data) {
|
|
23
30
|
const buffer = new CommandBinaryBuffer(data);
|
|
24
31
|
const requestId = buffer.getUint8();
|
|
25
|
-
|
|
26
|
-
|
|
32
|
+
return buffer.isEmpty
|
|
33
|
+
? new GetObisContentByIdResponse({ requestId })
|
|
34
|
+
: new GetObisContentByIdResponse({ requestId, content: roundNumber(buffer.getFloat32()) });
|
|
27
35
|
}
|
|
28
36
|
toBytes() {
|
|
29
|
-
if (typeof this.size !== 'number') {
|
|
30
|
-
throw new Error('unknown or invalid size');
|
|
31
|
-
}
|
|
32
37
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
33
38
|
const { requestId, content } = this.parameters;
|
|
34
39
|
buffer.setUint8(requestId);
|
|
35
|
-
|
|
40
|
+
if (content) {
|
|
41
|
+
buffer.setFloat32(roundNumber(content));
|
|
42
|
+
}
|
|
36
43
|
return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
|
|
37
44
|
}
|
|
38
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetObisContentByIdResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObisContentByIdResponse.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,+BAA+B,CAAC;AACxD,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACtG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAWrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,gCAAgC;QACtC,UAAU,EAAE;YACR,SAAS,EAAE,GAAG;YACd,OAAO,EAAE,MAAM;SAClB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAC;KACjD;CACJ,CAAC;AAuBF,MAAM,0BAA2B,SAAQ,OAAO;IAC5C,YAAqB,UAAiD;QAClE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAuC;QAIlE,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"GetObisContentByIdResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObisContentByIdResponse.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,+BAA+B,CAAC;AACxD,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACtG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAWrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,gCAAgC;QACtC,UAAU,EAAE;YACR,SAAS,EAAE,GAAG;YACd,OAAO,EAAE,MAAM;SAClB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAC;KACjD;IACD;QACI,IAAI,EAAE,gDAAgD;QACtD,UAAU,EAAE;YACR,SAAS,EAAE,GAAG;SACjB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAC;KACrC;CACJ,CAAC;AAuBF,MAAM,0BAA2B,SAAQ,OAAO;IAC5C,YAAqB,UAAiD;QAClE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAuC;QAIlE,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;IAYD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAEpC,OAAO,MAAM,CAAC,OAAO;YACjB,CAAC,CAAC,IAAI,0BAA0B,CAAC,EAAC,SAAS,EAAC,CAAC;YAC7C,CAAC,CAAC,IAAI,0BAA0B,CAAC,EAAC,SAAS,EAAE,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,EAAC,CAAC,CAAC;IACjG,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,SAAS,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAE7C,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAE3B,IAAK,OAAO,EAAG;YACX,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;SAC3C;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA/Be,6BAAE,GAAG,UAAU,CAAC;AAEhB,wCAAa,GAAG,MAAM,CAAC;AAEvB,mCAAQ,GAAG,QAAQ,CAAC;AAEpB,wCAAa,GAAG,IAAI,CAAC;AA6BzC,eAAe,0BAA0B,CAAC"}
|
|
@@ -25,9 +25,6 @@ class GetObisContentByIdStringResponse extends Command {
|
|
|
25
25
|
return new GetObisContentByIdStringResponse({ requestId, content });
|
|
26
26
|
}
|
|
27
27
|
toBytes() {
|
|
28
|
-
if (typeof this.size !== 'number') {
|
|
29
|
-
throw new Error('unknown or invalid size');
|
|
30
|
-
}
|
|
31
28
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
32
29
|
const { requestId, content } = this.parameters;
|
|
33
30
|
buffer.setUint8(requestId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetObisContentByIdStringResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObisContentByIdStringResponse.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;AAWrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,mDAAmD;QACzD,UAAU,EAAE;YACR,SAAS,EAAE,GAAG;YACd,OAAO,EAAE,cAAc;SAC1B;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,2CAA2C,EAAC;KAC5E;CACJ,CAAC;AAuBF,MAAM,gCAAiC,SAAQ,OAAO;IAClD,YAAqB,UAAuD;QACxE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA6C;QAIxE,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IACrE,CAAC;IAYD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAEnC,OAAO,IAAI,gCAAgC,CAAC,EAAC,SAAS,EAAE,OAAO,EAAC,CAAC,CAAC;IACtE,CAAC;IAGD,OAAO;QACH,
|
|
1
|
+
{"version":3,"file":"GetObisContentByIdStringResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObisContentByIdStringResponse.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;AAWrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,mDAAmD;QACzD,UAAU,EAAE;YACR,SAAS,EAAE,GAAG;YACd,OAAO,EAAE,cAAc;SAC1B;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,2CAA2C,EAAC;KAC5E;CACJ,CAAC;AAuBF,MAAM,gCAAiC,SAAQ,OAAO;IAClD,YAAqB,UAAuD;QACxE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA6C;QAIxE,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IACrE,CAAC;IAYD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAEnC,OAAO,IAAI,gCAAgC,CAAC,EAAC,SAAS,EAAE,OAAO,EAAC,CAAC,CAAC;IACtE,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,SAAS,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAE7C,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE1B,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA3Be,mCAAE,GAAG,UAAU,CAAC;AAEhB,8CAAa,GAAG,MAAM,CAAC;AAEvB,yCAAQ,GAAG,QAAQ,CAAC;AAEpB,8CAAa,GAAG,IAAI,CAAC;AAyBzC,eAAe,gCAAgC,CAAC"}
|
|
@@ -25,9 +25,6 @@ class GetContentByObisResponse extends Command {
|
|
|
25
25
|
return new GetContentByObisResponse({ requestId, content });
|
|
26
26
|
}
|
|
27
27
|
toBytes() {
|
|
28
|
-
if (typeof this.size !== 'number') {
|
|
29
|
-
throw new Error('unknown or invalid size');
|
|
30
|
-
}
|
|
31
28
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
32
29
|
const { requestId, content } = this.parameters;
|
|
33
30
|
buffer.setUint8(requestId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetObisContentResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObisContentResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAqB,eAAe,EAAC,MAAM,8BAA8B,CAAC;AACtG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAWrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,4BAA4B;QAClC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,UAAU;SACtB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,+BAA+B,EAAC;KAChE;CACJ,CAAC;AAuBF,MAAM,wBAAyB,SAAQ,OAAO;IAC1C,YAAqB,UAA+C;QAChE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAqC;QAIhE,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC;IACrE,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAEnC,OAAO,IAAI,wBAAwB,CAAC,EAAC,SAAS,EAAE,OAAO,EAAC,CAAC,CAAC;IAC9D,CAAC;IAGD,OAAO;QACH,
|
|
1
|
+
{"version":3,"file":"GetObisContentResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObisContentResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAqB,eAAe,EAAC,MAAM,8BAA8B,CAAC;AACtG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAWrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,4BAA4B;QAClC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,UAAU;SACtB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,+BAA+B,EAAC;KAChE;CACJ,CAAC;AAuBF,MAAM,wBAAyB,SAAQ,OAAO;IAC1C,YAAqB,UAA+C;QAChE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAqC;QAIhE,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC;IACrE,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAEnC,OAAO,IAAI,wBAAwB,CAAC,EAAC,SAAS,EAAE,OAAO,EAAC,CAAC,CAAC;IAC9D,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,SAAS,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAE7C,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE1B,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA3Be,2BAAE,GAAG,UAAU,CAAC;AAEhB,sCAAa,GAAG,MAAM,CAAC;AAEvB,iCAAQ,GAAG,QAAQ,CAAC;AAEpB,sCAAa,GAAG,IAAI,CAAC;AAyBzC,eAAe,wBAAwB,CAAC"}
|
|
@@ -25,9 +25,6 @@ class GetObisIdListResponse extends Command {
|
|
|
25
25
|
return new GetObisIdListResponse({ requestId, obisIdList });
|
|
26
26
|
}
|
|
27
27
|
toBytes() {
|
|
28
|
-
if (typeof this.size !== 'number') {
|
|
29
|
-
throw new Error('unknown or invalid size');
|
|
30
|
-
}
|
|
31
28
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
32
29
|
const { requestId, obisIdList } = this.parameters;
|
|
33
30
|
buffer.setUint8(requestId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetObisIdListResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObisIdListResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACtG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAUrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,4CAA4C;QAClD,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;SACzB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAC;KAC3C;CACJ,CAAC;AAuBF,MAAM,qBAAsB,SAAQ,OAAO;IACvC,YAAqB,UAA4C;QAC7D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAkC;QAI7D,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC;IAC/D,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;QAEpC,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE9F,OAAO,IAAI,qBAAqB,CAAC,EAAC,SAAS,EAAE,UAAU,EAAC,CAAC,CAAC;IAC9D,CAAC;IAGD,OAAO;QACH,
|
|
1
|
+
{"version":3,"file":"GetObisIdListResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObisIdListResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACtG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAUrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,4CAA4C;QAClD,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;SACzB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAC;KAC3C;CACJ,CAAC;AAuBF,MAAM,qBAAsB,SAAQ,OAAO;IACvC,YAAqB,UAA4C;QAC7D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAkC;QAI7D,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC;IAC/D,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;QAEpC,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE9F,OAAO,IAAI,qBAAqB,CAAC,EAAC,SAAS,EAAE,UAAU,EAAC,CAAC,CAAC;IAC9D,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,SAAS,EAAE,UAAU,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAEhD,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAEtD,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA7Be,wBAAE,GAAG,UAAU,CAAC;AAEhB,mCAAa,GAAG,MAAM,CAAC;AAEvB,8BAAQ,GAAG,QAAQ,CAAC;AAEpB,mCAAa,GAAG,IAAI,CAAC;AA2BzC,eAAe,qBAAqB,CAAC"}
|
|
@@ -26,6 +26,25 @@ const examples = [
|
|
|
26
26
|
}
|
|
27
27
|
},
|
|
28
28
|
hex: { header: '4b 0b', body: '03 02 00 09 01 01 58 02 14 3d 15' }
|
|
29
|
+
},
|
|
30
|
+
{
|
|
31
|
+
name: 'response to GetObisInfo with obis code 0.9.1 without obis profile',
|
|
32
|
+
parameters: {
|
|
33
|
+
requestId: 3,
|
|
34
|
+
obis: {
|
|
35
|
+
c: 0,
|
|
36
|
+
d: 9,
|
|
37
|
+
e: 1
|
|
38
|
+
}
|
|
39
|
+
},
|
|
40
|
+
hex: { header: '4b 05', body: '03 02 00 09 01' }
|
|
41
|
+
},
|
|
42
|
+
{
|
|
43
|
+
name: 'response to GetObisInfo without data',
|
|
44
|
+
parameters: {
|
|
45
|
+
requestId: 3
|
|
46
|
+
},
|
|
47
|
+
hex: { header: '4b 01', body: '03' }
|
|
29
48
|
}
|
|
30
49
|
];
|
|
31
50
|
class GetObisInfoResponse extends Command {
|
|
@@ -35,39 +54,32 @@ class GetObisInfoResponse extends Command {
|
|
|
35
54
|
let size = REQUEST_ID_SIZE;
|
|
36
55
|
if (parameters.obis) {
|
|
37
56
|
size += CommandBinaryBuffer.getObisSize(parameters.obis);
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
57
|
+
if (parameters.obisProfile) {
|
|
58
|
+
size += OBIS_PROFILE_SIZE;
|
|
59
|
+
}
|
|
41
60
|
}
|
|
42
61
|
this.size = size;
|
|
43
62
|
}
|
|
44
63
|
static fromBytes(data) {
|
|
45
64
|
const buffer = new CommandBinaryBuffer(data);
|
|
46
|
-
let size = data.length - REQUEST_ID_SIZE;
|
|
47
65
|
const requestId = buffer.getUint8();
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
if (size > 0) {
|
|
51
|
-
obis = buffer.getObis();
|
|
52
|
-
size -= CommandBinaryBuffer.getObisSize(obis);
|
|
66
|
+
if (buffer.isEmpty) {
|
|
67
|
+
return new GetObisInfoResponse({ requestId });
|
|
53
68
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
69
|
+
const obis = buffer.getObis();
|
|
70
|
+
return buffer.isEmpty
|
|
71
|
+
? new GetObisInfoResponse({ requestId, obis })
|
|
72
|
+
: new GetObisInfoResponse({ requestId, obis, obisProfile: buffer.getObisProfile() });
|
|
58
73
|
}
|
|
59
74
|
toBytes() {
|
|
60
|
-
if (typeof this.size !== 'number') {
|
|
61
|
-
throw new Error('unknown or invalid size');
|
|
62
|
-
}
|
|
63
75
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
64
76
|
const { requestId, obis, obisProfile } = this.parameters;
|
|
65
77
|
buffer.setUint8(requestId);
|
|
66
78
|
if (obis) {
|
|
67
79
|
buffer.setObis(obis);
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
80
|
+
if (obisProfile) {
|
|
81
|
+
buffer.setObisProfile(obisProfile);
|
|
82
|
+
}
|
|
71
83
|
}
|
|
72
84
|
return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
|
|
73
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetObisInfoResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObisInfoResponse.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,EAAC,MAAM,0BAA0B,CAAC;AAWtD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,+DAA+D;QACrE,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,YAAY,EAAE,IAAI;oBAClB,eAAe,EAAE,IAAI;oBACrB,eAAe,EAAE,KAAK;iBACzB;aACJ;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,kCAAkC,EAAC;KACnE;CACJ,CAAC;AAsCF,MAAM,mBAAoB,SAAQ,OAAO;IACrC,YAAqB,UAA0C;QAC3D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAgC;QAG3D,IAAI,IAAI,GAAG,eAAe,CAAC;QAE3B,IAAK,UAAU,CAAC,IAAI,EAAG;YACnB,IAAI,IAAI,mBAAmB,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"GetObisInfoResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObisInfoResponse.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import Command, { TCommandExampleList } from '../../Command.js';
|
|
2
2
|
import { ICommandParameters, IObisProfile } from '../../CommandBinaryBuffer.js';
|
|
3
3
|
interface IGetObisProfileResponseParameters extends ICommandParameters {
|
|
4
|
-
obisProfile
|
|
4
|
+
obisProfile?: IObisProfile;
|
|
5
5
|
}
|
|
6
6
|
declare class GetObisProfileResponse extends Command {
|
|
7
7
|
parameters: IGetObisProfileResponseParameters;
|
|
@@ -22,28 +22,35 @@ const examples = [
|
|
|
22
22
|
}
|
|
23
23
|
},
|
|
24
24
|
hex: { header: '49 07', body: '03 01 58 02 14 3d 13' }
|
|
25
|
+
},
|
|
26
|
+
{
|
|
27
|
+
name: 'response to GetObisProfile without data',
|
|
28
|
+
parameters: {
|
|
29
|
+
requestId: 3
|
|
30
|
+
},
|
|
31
|
+
hex: { header: '49 01', body: '03' }
|
|
25
32
|
}
|
|
26
33
|
];
|
|
27
34
|
class GetObisProfileResponse extends Command {
|
|
28
35
|
constructor(parameters) {
|
|
29
36
|
super();
|
|
30
37
|
this.parameters = parameters;
|
|
31
|
-
this.size = COMMAND_SIZE;
|
|
38
|
+
this.size = parameters.obisProfile ? COMMAND_SIZE : REQUEST_ID_SIZE;
|
|
32
39
|
}
|
|
33
40
|
static fromBytes(data) {
|
|
34
41
|
const buffer = new CommandBinaryBuffer(data);
|
|
35
42
|
const requestId = buffer.getUint8();
|
|
36
|
-
|
|
37
|
-
|
|
43
|
+
return buffer.isEmpty
|
|
44
|
+
? new GetObisProfileResponse({ requestId })
|
|
45
|
+
: new GetObisProfileResponse({ requestId, obisProfile: buffer.getObisProfile() });
|
|
38
46
|
}
|
|
39
47
|
toBytes() {
|
|
40
|
-
if (typeof this.size !== 'number') {
|
|
41
|
-
throw new Error('unknown or invalid size');
|
|
42
|
-
}
|
|
43
48
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
44
49
|
const { requestId, obisProfile } = this.parameters;
|
|
45
50
|
buffer.setUint8(requestId);
|
|
46
|
-
|
|
51
|
+
if (obisProfile) {
|
|
52
|
+
buffer.setObisProfile(obisProfile);
|
|
53
|
+
}
|
|
47
54
|
return Command.toBytes(COMMAND_ID, buffer.toUint8Array());
|
|
48
55
|
}
|
|
49
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetObisProfileResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObisProfileResponse.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,OAAO,EAAE,IAAI,EAAE,sBAAsB,EAAC;KACvD;CACJ,CAAC;AAiCF,MAAM,sBAAuB,SAAQ,OAAO;IACxC,YAAqB,UAA6C;QAC9D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAmC;QAG9D,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"GetObisProfileResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObisProfileResponse.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,OAAO,EAAE,IAAI,EAAE,sBAAsB,EAAC;KACvD;IACD;QACI,IAAI,EAAE,yCAAyC;QAC/C,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;SACf;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAC;KACrC;CACJ,CAAC;AAiCF,MAAM,sBAAuB,SAAQ,OAAO;IACxC,YAAqB,UAA6C;QAC9D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAmC;QAG9D,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC;IACxE,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAEpC,OAAO,MAAM,CAAC,OAAO;YACjB,CAAC,CAAC,IAAI,sBAAsB,CAAC,EAAC,SAAS,EAAC,CAAC;YACzC,CAAC,CAAC,IAAI,sBAAsB,CAAC,EAAC,SAAS,EAAE,WAAW,EAAE,MAAM,CAAC,cAAc,EAAE,EAAC,CAAC,CAAC;IACxF,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,SAAS,EAAE,WAAW,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAEjD,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAE3B,IAAK,WAAW,EAAG;YACf,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;SACtC;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA/Be,yBAAE,GAAG,UAAU,CAAC;AAEhB,oCAAa,GAAG,MAAM,CAAC;AAEvB,+BAAQ,GAAG,QAAQ,CAAC;AAEpB,oCAAa,GAAG,IAAI,CAAC;AA6BzC,eAAe,sBAAsB,CAAC"}
|
|
@@ -38,9 +38,6 @@ class GetObserverInfoResponse extends Command {
|
|
|
38
38
|
return new GetObserverInfoResponse({ requestId, softwareVersion, hardwareVersion, deviceName });
|
|
39
39
|
}
|
|
40
40
|
toBytes() {
|
|
41
|
-
if (typeof this.size !== 'number') {
|
|
42
|
-
throw new Error('unknown or invalid size');
|
|
43
|
-
}
|
|
44
41
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
45
42
|
const { requestId, softwareVersion, hardwareVersion, deviceName } = this.parameters;
|
|
46
43
|
buffer.setUint8(requestId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetObserverInfoResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObserverInfoResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAA+B,MAAM,8BAA8B,CAAC;AAChH,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAarD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,kFAAkF;QACxF,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,eAAe,EAAE;gBACb,KAAK,EAAE,CAAC;gBACR,KAAK,EAAE,CAAC;aACX;YACD,eAAe,EAAE;gBACb,KAAK,EAAE,CAAC;gBACR,KAAK,EAAE,CAAC;aACX;YACD,UAAU,EAAE,mCAAmC;SAClD;QACD,GAAG,EAAE;YACD,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,sHAAsH;SAC/H;KACJ;CACJ,CAAC;AAqCF,MAAM,uBAAwB,SAAQ,OAAO;IACzC,YAAqB,UAA8C;QAC/D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAoC;QAI/D,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC;IAC3E,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAC5C,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAE5C,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAEtC,OAAO,IAAI,uBAAuB,CAAC,EAAC,SAAS,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAC,CAAC,CAAC;IAClG,CAAC;IAGD,OAAO;QACH,
|
|
1
|
+
{"version":3,"file":"GetObserverInfoResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObserverInfoResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAA+B,MAAM,8BAA8B,CAAC;AAChH,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAarD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,kFAAkF;QACxF,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,eAAe,EAAE;gBACb,KAAK,EAAE,CAAC;gBACR,KAAK,EAAE,CAAC;aACX;YACD,eAAe,EAAE;gBACb,KAAK,EAAE,CAAC;gBACR,KAAK,EAAE,CAAC;aACX;YACD,UAAU,EAAE,mCAAmC;SAClD;QACD,GAAG,EAAE;YACD,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,sHAAsH;SAC/H;KACJ;CACJ,CAAC;AAqCF,MAAM,uBAAwB,SAAQ,OAAO;IACzC,YAAqB,UAA8C;QAC/D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAoC;QAI/D,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC;IAC3E,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAC5C,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAE5C,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAEtC,OAAO,IAAI,uBAAuB,CAAC,EAAC,SAAS,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAC,CAAC,CAAC;IAClG,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,SAAS,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAElF,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QACnC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QACnC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAE7B,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AAhCe,0BAAE,GAAG,UAAU,CAAC;AAEhB,qCAAa,GAAG,MAAM,CAAC;AAEvB,gCAAQ,GAAG,QAAQ,CAAC;AAEpB,qCAAa,GAAG,IAAI,CAAC;AA8BzC,eAAe,uBAAuB,CAAC"}
|
|
@@ -26,9 +26,6 @@ class GetObserverUptimeResponse extends Command {
|
|
|
26
26
|
});
|
|
27
27
|
}
|
|
28
28
|
toBytes() {
|
|
29
|
-
if (typeof this.size !== 'number') {
|
|
30
|
-
throw new Error('unknown or invalid size');
|
|
31
|
-
}
|
|
32
29
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
33
30
|
const { requestId, uptime } = this.parameters;
|
|
34
31
|
buffer.setUint8(requestId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetObserverUptimeResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObserverUptimeResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACtG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAUrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,IAAI;SACf;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAC;KACjD;CACJ,CAAC;AAyBF,MAAM,yBAA0B,SAAQ,OAAO;IAC3C,YAAqB,UAAgD;QACjE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAsC;QAGjE,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,CAAC;IACpC,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,yBAAyB,CAAC;YACjC,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE;SAC7B,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,
|
|
1
|
+
{"version":3,"file":"GetObserverUptimeResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/GetObserverUptimeResponse.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,eAAe,EAAqB,MAAM,8BAA8B,CAAC;AACtG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAUrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,+BAA+B;QACrC,UAAU,EAAE;YACR,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,IAAI;SACf;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAC;KACjD;CACJ,CAAC;AAyBF,MAAM,yBAA0B,SAAQ,OAAO;IAC3C,YAAqB,UAAgD;QACjE,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAsC;QAGjE,IAAI,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,CAAC;IACpC,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO,IAAI,yBAAyB,CAAC;YACjC,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC5B,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE;SAC7B,CAAC,CAAC;IACP,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,SAAS,EAAE,MAAM,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAE5C,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEzB,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AA5Be,4BAAE,GAAG,UAAU,CAAC;AAEhB,uCAAa,GAAG,MAAM,CAAC;AAEvB,kCAAQ,GAAG,QAAQ,CAAC;AAEpB,uCAAa,GAAG,IAAI,CAAC;AA0BzC,eAAe,yBAAyB,CAAC"}
|
|
@@ -38,9 +38,6 @@ class ObservationReport extends Command {
|
|
|
38
38
|
return new ObservationReport({ time2000, obisValueList });
|
|
39
39
|
}
|
|
40
40
|
toBytes() {
|
|
41
|
-
if (typeof this.size !== 'number') {
|
|
42
|
-
throw new Error('unknown or invalid size');
|
|
43
|
-
}
|
|
44
41
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
45
42
|
const { time2000, obisValueList } = this.parameters;
|
|
46
43
|
buffer.setUint32(time2000);
|
|
@@ -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;AAcrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,iDAAiD;QACvD,UAAU,EAAE;YACR,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE;gBACX,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;gBAC1B,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;aAC7B;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,2CAA2C,EAAC;KAC5E;CACJ,CAAC;AA0BF,MAAM,iBAAkB,SAAQ,OAAO;IACnC,YAAqB,UAAwC;QACzD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA8B;QAGzD,IAAI,IAAI,GAAG,cAAc,CAAC;QAE1B,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC9C,IAAI,IAAI,mBAAmB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC;QACxC,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,OAAQ,IAAI,GAAG,CAAC,EAAG;YACf,MAAM,SAAS,GAAG,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAE7C,IAAI,IAAI,mBAAmB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;YAC1D,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,iBAAiB,CAAC,EAAC,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC;IAC5D,CAAC;IAGD,OAAO;QACH,
|
|
1
|
+
{"version":3,"file":"ObservationReport.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ObservationReport.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAC,cAAc,EAAkB,MAAM,8BAA8B,CAAC;AAClG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAcrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,iDAAiD;QACvD,UAAU,EAAE;YACR,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE;gBACX,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;gBAC1B,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;aAC7B;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,2CAA2C,EAAC;KAC5E;CACJ,CAAC;AA0BF,MAAM,iBAAkB,SAAQ,OAAO;IACnC,YAAqB,UAAwC;QACzD,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA8B;QAGzD,IAAI,IAAI,GAAG,cAAc,CAAC;QAE1B,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC9C,IAAI,IAAI,mBAAmB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC;QACxC,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,OAAQ,IAAI,GAAG,CAAC,EAAG;YACf,MAAM,SAAS,GAAG,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAE7C,IAAI,IAAI,mBAAmB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;YAC1D,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,iBAAiB,CAAC,EAAC,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC;IAC5D,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,QAAQ,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAElD,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC3B,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;QAExE,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AApCe,oBAAE,GAAG,UAAU,CAAC;AAEhB,+BAAa,GAAG,MAAM,CAAC;AAEvB,0BAAQ,GAAG,QAAQ,CAAC;AAEpB,+BAAa,GAAG,IAAI,CAAC;AAkCzC,eAAe,iBAAiB,CAAC"}
|
|
@@ -43,9 +43,6 @@ class ObservationReportString extends Command {
|
|
|
43
43
|
return new ObservationReportString({ time2000, obisValueList });
|
|
44
44
|
}
|
|
45
45
|
toBytes() {
|
|
46
|
-
if (typeof this.size !== 'number') {
|
|
47
|
-
throw new Error('unknown or invalid size');
|
|
48
|
-
}
|
|
49
46
|
const buffer = new CommandBinaryBuffer(this.size);
|
|
50
47
|
const { time2000, obisValueList } = this.parameters;
|
|
51
48
|
buffer.setUint32(time2000);
|
|
@@ -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;AAcrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,iDAAiD;QACvD,UAAU,EAAE;YACR,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE;gBACX,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,4BAA4B,EAAC;gBACjD,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,0BAA0B,EAAC;aAClD;SACJ;QACD,GAAG,EAAE;YACD,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,0DAA0D;kBAC1D,oEAAoE;kBACpE,qDAAqD;SAC9D;KACJ;CACJ,CAAC;AAgCF,MAAM,uBAAwB,SAAQ,OAAO;IACzC,YAAqB,UAA8C;QAC/D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAoC;QAG/D,IAAI,IAAI,GAAG,cAAc,CAAC;QAE1B,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC9C,IAAI,IAAI,mBAAmB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC;QACxC,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,OAAQ,IAAI,GAAG,CAAC,EAAG;YACf,MAAM,SAAS,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAE9C,IAAI,IAAI,mBAAmB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;YAC1D,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,uBAAuB,CAAC,EAAC,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC;IAClE,CAAC;IAGD,OAAO;QACH,
|
|
1
|
+
{"version":3,"file":"ObservationReportString.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ObservationReportString.ts"],"names":[],"mappings":"AAAA,OAAO,OAA8B,MAAM,kBAAkB,CAAC;AAC9D,OAAO,mBAAmB,EAAE,EAAmB,cAAc,EAAC,MAAM,8BAA8B,CAAC;AACnG,OAAO,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAcrD,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,iDAAiD;QACvD,UAAU,EAAE;YACR,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE;gBACX,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,4BAA4B,EAAC;gBACjD,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,0BAA0B,EAAC;aAClD;SACJ;QACD,GAAG,EAAE;YACD,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,0DAA0D;kBAC1D,oEAAoE;kBACpE,qDAAqD;SAC9D;KACJ;CACJ,CAAC;AAgCF,MAAM,uBAAwB,SAAQ,OAAO;IACzC,YAAqB,UAA8C;QAC/D,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAAoC;QAG/D,IAAI,IAAI,GAAG,cAAc,CAAC;QAE1B,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC9C,IAAI,IAAI,mBAAmB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7C,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC;QACxC,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,OAAQ,IAAI,GAAG,CAAC,EAAG;YACf,MAAM,SAAS,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAE9C,IAAI,IAAI,mBAAmB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;YAC1D,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,uBAAuB,CAAC,EAAC,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC;IAClE,CAAC;IAGD,OAAO;QACH,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC5D,MAAM,EAAC,QAAQ,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAElD,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC3B,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;QAEzE,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;;AApCe,0BAAE,GAAG,UAAU,CAAC;AAEhB,qCAAa,GAAG,MAAM,CAAC;AAEvB,gCAAQ,GAAG,QAAQ,CAAC;AAEpB,qCAAa,GAAG,IAAI,CAAC;AAkCzC,eAAe,uBAAuB,CAAC"}
|
|
@@ -6,8 +6,8 @@ interface IReadMeterArchiveResponseParameters extends ICommandParameters {
|
|
|
6
6
|
obisValueList: Array<IObisValueFloat>;
|
|
7
7
|
}
|
|
8
8
|
declare class ReadMeterArchiveResponse extends Command {
|
|
9
|
-
parameters: IReadMeterArchiveResponseParameters;
|
|
10
|
-
constructor(parameters: IReadMeterArchiveResponseParameters);
|
|
9
|
+
parameters: IReadMeterArchiveResponseParameters | ICommandParameters;
|
|
10
|
+
constructor(parameters: IReadMeterArchiveResponseParameters | ICommandParameters);
|
|
11
11
|
static readonly id = 128;
|
|
12
12
|
static readonly directionType = 2;
|
|
13
13
|
static readonly examples: TCommandExampleList;
|
|
@@ -15,37 +15,56 @@ const examples = [
|
|
|
15
15
|
]
|
|
16
16
|
},
|
|
17
17
|
hex: { header: '80 0f', body: '22 2d 19 17 c0 32 41 b2 28 f6 38 42 b2 a8 f6' }
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
name: 'response to ReadMeterArchive without data',
|
|
21
|
+
parameters: {
|
|
22
|
+
requestId: 34
|
|
23
|
+
},
|
|
24
|
+
hex: { header: '80 01', body: '22' }
|
|
18
25
|
}
|
|
19
26
|
];
|
|
27
|
+
const isValidParameterSet = (parameters) => {
|
|
28
|
+
const { requestId, time2000, obisValueList } = parameters;
|
|
29
|
+
return requestId !== undefined
|
|
30
|
+
&& time2000 !== undefined
|
|
31
|
+
&& obisValueList !== undefined;
|
|
32
|
+
};
|
|
33
|
+
const commandSize = (parameters) => {
|
|
34
|
+
let size = COMMAND_HEADER_SIZE;
|
|
35
|
+
parameters.obisValueList.forEach(obisId => {
|
|
36
|
+
size += CommandBinaryBuffer.getObisContentSize(obisId);
|
|
37
|
+
});
|
|
38
|
+
return size;
|
|
39
|
+
};
|
|
20
40
|
class ReadMeterArchiveResponse extends Command {
|
|
21
41
|
constructor(parameters) {
|
|
22
42
|
super();
|
|
23
43
|
this.parameters = parameters;
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
});
|
|
28
|
-
this.size = size;
|
|
44
|
+
this.size = isValidParameterSet(parameters)
|
|
45
|
+
? commandSize(parameters)
|
|
46
|
+
: REQUEST_ID_SIZE;
|
|
29
47
|
}
|
|
30
48
|
static fromBytes(data) {
|
|
31
49
|
const buffer = new CommandBinaryBuffer(data);
|
|
32
|
-
let size = data.length - COMMAND_HEADER_SIZE;
|
|
33
50
|
const requestId = buffer.getUint8();
|
|
51
|
+
if (buffer.isEmpty) {
|
|
52
|
+
return new ReadMeterArchiveResponse({ requestId });
|
|
53
|
+
}
|
|
34
54
|
const time2000 = buffer.getUint32();
|
|
35
55
|
const obisValueList = [];
|
|
36
|
-
while (
|
|
56
|
+
while (!buffer.isEmpty) {
|
|
37
57
|
const obisValue = buffer.getObisValueFloat();
|
|
38
|
-
size -= CommandBinaryBuffer.getObisContentSize(obisValue);
|
|
39
58
|
obisValueList.push(obisValue);
|
|
40
59
|
}
|
|
41
60
|
return new ReadMeterArchiveResponse({ requestId, time2000, obisValueList });
|
|
42
61
|
}
|
|
43
62
|
toBytes() {
|
|
44
|
-
if (
|
|
45
|
-
|
|
63
|
+
if (!isValidParameterSet(this.parameters)) {
|
|
64
|
+
return Command.toBytes(COMMAND_ID, new Uint8Array([this.parameters.requestId]));
|
|
46
65
|
}
|
|
47
|
-
const buffer = new CommandBinaryBuffer(this.size);
|
|
48
66
|
const { requestId, time2000, obisValueList } = this.parameters;
|
|
67
|
+
const buffer = new CommandBinaryBuffer(this.size);
|
|
49
68
|
buffer.setUint8(requestId);
|
|
50
69
|
buffer.setUint32(time2000);
|
|
51
70
|
obisValueList.forEach(obisValue => buffer.setObisValueFloat(obisValue));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReadMeterArchiveResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ReadMeterArchiveResponse.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;AAGxB,MAAM,mBAAmB,GAAG,eAAe,GAAG,cAAc,CAAC;AAE7D,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,2DAA2D;QACjE,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;YACb,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE;gBACX,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;gBAC1B,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;aAC7B;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,8CAA8C,EAAC;KAC/E;
|
|
1
|
+
{"version":3,"file":"ReadMeterArchiveResponse.js","sourceRoot":"","sources":["../../../../src/obis-observer/commands/uplink/ReadMeterArchiveResponse.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;AAGxB,MAAM,mBAAmB,GAAG,eAAe,GAAG,cAAc,CAAC;AAE7D,MAAM,QAAQ,GAAwB;IAClC;QACI,IAAI,EAAE,2DAA2D;QACjE,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;YACb,QAAQ,EAAE,SAAS;YACnB,aAAa,EAAE;gBACX,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;gBAC1B,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAC;aAC7B;SACJ;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,8CAA8C,EAAC;KAC/E;IACD;QACI,IAAI,EAAE,2CAA2C;QACjD,UAAU,EAAE;YACR,SAAS,EAAE,EAAE;SAChB;QACD,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAC;KACrC;CAEJ,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAE,UAAoE,EAAY,EAAE;IAC5G,MAAM,EAAC,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAC,GAAG,UAAiD,CAAC;IAE/F,OAAO,SAAS,KAAK,SAAS;WACvB,QAAQ,KAAK,SAAS;WACtB,aAAa,KAAK,SAAS,CAAC;AACvC,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAE,UAA+C,EAAW,EAAE;IAC9E,IAAI,IAAI,GAAG,mBAAmB,CAAC;IAG/B,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACtC,IAAI,IAAI,mBAAmB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AA6BF,MAAM,wBAAyB,SAAQ,OAAO;IAC1C,YAAqB,UAAoE;QACrF,KAAK,EAAE,CAAC;QADS,eAAU,GAAV,UAAU,CAA0D;QAGrF,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC,UAAU,CAAC;YACvC,CAAC,CAAC,WAAW,CAAC,UAAiD,CAAC;YAChE,CAAC,CAAC,eAAe,CAAC;IAC1B,CAAC;IAaD,MAAM,CAAC,SAAS,CAAG,IAAgB;QAC/B,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAEpC,IAAK,MAAM,CAAC,OAAO,EAAE;YACjB,OAAO,IAAI,wBAAwB,CAAC,EAAC,SAAS,EAAC,CAAC,CAAC;SACpD;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,EAAE,CAAC;QAEzB,OAAQ,CAAC,MAAM,CAAC,OAAO,EAAG;YACtB,MAAM,SAAS,GAAG,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAE7C,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,wBAAwB,CAAC,EAAC,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC;IAC9E,CAAC;IAGD,OAAO;QACH,IAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAG;YACzC,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,UAAU,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SACnF;QAED,MAAM,EAAC,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC,UAAiD,CAAC;QACpG,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAE5D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC3B,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;;AA5Ce,2BAAE,GAAG,UAAU,CAAC;AAEhB,sCAAa,GAAG,MAAM,CAAC;AAEvB,iCAAQ,GAAG,QAAQ,CAAC;AAEpB,sCAAa,GAAG,IAAI,CAAC;AA0CzC,eAAe,wBAAwB,CAAC"}
|