@seriousme/opifex 1.9.3 → 1.10.1
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/README.md +37 -26
- package/bin/conformanceServer.ts +3 -2
- package/bin/demoServer.ts +3 -2
- package/bin/mqtt.ts +126 -117
- package/client/client.ts +35 -15
- package/client/context.ts +42 -22
- package/client/deps.ts +5 -0
- package/client/handlers/handleConnack.ts +17 -5
- package/client/handlers/handlePublish.ts +4 -1
- package/client/handlers/handlePubrec.ts +3 -1
- package/client/handlers/handlePubrel.ts +3 -1
- package/client/handlers/handleSuback.ts +3 -1
- package/client/mod.ts +8 -1
- package/client/store/memoryStore.ts +2 -1
- package/dev_utils/dummyConn.ts +17 -2
- package/dist/bin/conformanceServer.js +3 -2
- package/dist/bin/conformanceServer.js.map +1 -1
- package/dist/bin/demoServer.js +3 -2
- package/dist/bin/demoServer.js.map +1 -1
- package/dist/bin/mqtt.d.ts +29 -0
- package/dist/bin/mqtt.d.ts.map +1 -1
- package/dist/bin/mqtt.js +101 -96
- package/dist/bin/mqtt.js.map +1 -1
- package/dist/client/client.d.ts +7 -4
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +17 -9
- package/dist/client/client.js.map +1 -1
- package/dist/client/context.d.ts +3 -1
- package/dist/client/context.d.ts.map +1 -1
- package/dist/client/context.js +27 -13
- package/dist/client/context.js.map +1 -1
- package/dist/client/deps.d.ts +3 -2
- package/dist/client/deps.d.ts.map +1 -1
- package/dist/client/deps.js +2 -1
- package/dist/client/deps.js.map +1 -1
- package/dist/client/handlers/handleConnack.d.ts +1 -1
- package/dist/client/handlers/handleConnack.d.ts.map +1 -1
- package/dist/client/handlers/handleConnack.js +14 -5
- package/dist/client/handlers/handleConnack.js.map +1 -1
- package/dist/client/handlers/handlePublish.d.ts +1 -1
- package/dist/client/handlers/handlePublish.d.ts.map +1 -1
- package/dist/client/handlers/handlePublish.js +2 -0
- package/dist/client/handlers/handlePublish.js.map +1 -1
- package/dist/client/handlers/handlePubrec.d.ts +1 -1
- package/dist/client/handlers/handlePubrec.d.ts.map +1 -1
- package/dist/client/handlers/handlePubrec.js +1 -0
- package/dist/client/handlers/handlePubrec.js.map +1 -1
- package/dist/client/handlers/handlePubrel.d.ts +1 -1
- package/dist/client/handlers/handlePubrel.d.ts.map +1 -1
- package/dist/client/handlers/handlePubrel.js +1 -0
- package/dist/client/handlers/handlePubrel.js.map +1 -1
- package/dist/client/handlers/handleSuback.d.ts.map +1 -1
- package/dist/client/handlers/handleSuback.js +3 -1
- package/dist/client/handlers/handleSuback.js.map +1 -1
- package/dist/client/mod.d.ts +3 -1
- package/dist/client/mod.d.ts.map +1 -1
- package/dist/client/mod.js +2 -1
- package/dist/client/mod.js.map +1 -1
- package/dist/client/store/memoryStore.d.ts +1 -1
- package/dist/client/store/memoryStore.d.ts.map +1 -1
- package/dist/client/store/memoryStore.js.map +1 -1
- package/dist/mqttConn/mqttConn.d.ts +13 -8
- package/dist/mqttConn/mqttConn.d.ts.map +1 -1
- package/dist/mqttConn/mqttConn.js +27 -12
- package/dist/mqttConn/mqttConn.js.map +1 -1
- package/dist/mqttPacket/PacketType.d.ts +1 -0
- package/dist/mqttPacket/PacketType.d.ts.map +1 -1
- package/dist/mqttPacket/PacketType.js +1 -0
- package/dist/mqttPacket/PacketType.js.map +1 -1
- package/dist/mqttPacket/Properties.d.ts +157 -0
- package/dist/mqttPacket/Properties.d.ts.map +1 -0
- package/dist/mqttPacket/Properties.js +177 -0
- package/dist/mqttPacket/Properties.js.map +1 -0
- package/dist/mqttPacket/ReasonCode.d.ts +74 -0
- package/dist/mqttPacket/ReasonCode.d.ts.map +1 -0
- package/dist/mqttPacket/ReasonCode.js +230 -0
- package/dist/mqttPacket/ReasonCode.js.map +1 -0
- package/dist/mqttPacket/RetainHandling.d.ts +12 -0
- package/dist/mqttPacket/RetainHandling.d.ts.map +1 -0
- package/dist/mqttPacket/RetainHandling.js +12 -0
- package/dist/mqttPacket/RetainHandling.js.map +1 -0
- package/dist/mqttPacket/auth.d.ts +21 -0
- package/dist/mqttPacket/auth.d.ts.map +1 -0
- package/dist/mqttPacket/auth.js +34 -0
- package/dist/mqttPacket/auth.js.map +1 -0
- package/dist/mqttPacket/connack.d.ts +15 -7
- package/dist/mqttPacket/connack.d.ts.map +1 -1
- package/dist/mqttPacket/connack.js +43 -15
- package/dist/mqttPacket/connack.js.map +1 -1
- package/dist/mqttPacket/connect.d.ts +27 -8
- package/dist/mqttPacket/connect.d.ts.map +1 -1
- package/dist/mqttPacket/connect.js +106 -30
- package/dist/mqttPacket/connect.js.map +1 -1
- package/dist/mqttPacket/decoder.d.ts +42 -3
- package/dist/mqttPacket/decoder.d.ts.map +1 -1
- package/dist/mqttPacket/decoder.js +135 -4
- package/dist/mqttPacket/decoder.js.map +1 -1
- package/dist/mqttPacket/disconnect.d.ts +13 -7
- package/dist/mqttPacket/disconnect.d.ts.map +1 -1
- package/dist/mqttPacket/disconnect.js +45 -6
- package/dist/mqttPacket/disconnect.js.map +1 -1
- package/dist/mqttPacket/encoder.d.ts +57 -8
- package/dist/mqttPacket/encoder.d.ts.map +1 -1
- package/dist/mqttPacket/encoder.js +185 -13
- package/dist/mqttPacket/encoder.js.map +1 -1
- package/dist/mqttPacket/length.d.ts.map +1 -1
- package/dist/mqttPacket/length.js +3 -2
- package/dist/mqttPacket/length.js.map +1 -1
- package/dist/mqttPacket/mod.d.ts +56 -91
- package/dist/mqttPacket/mod.d.ts.map +1 -1
- package/dist/mqttPacket/mod.js +22 -22
- package/dist/mqttPacket/mod.js.map +1 -1
- package/dist/mqttPacket/pingreq.d.ts +4 -6
- package/dist/mqttPacket/pingreq.d.ts.map +1 -1
- package/dist/mqttPacket/pingreq.js +5 -4
- package/dist/mqttPacket/pingreq.js.map +1 -1
- package/dist/mqttPacket/pingres.d.ts +4 -6
- package/dist/mqttPacket/pingres.d.ts.map +1 -1
- package/dist/mqttPacket/pingres.js +7 -5
- package/dist/mqttPacket/pingres.js.map +1 -1
- package/dist/mqttPacket/protocolLevels.d.ts +11 -0
- package/dist/mqttPacket/protocolLevels.d.ts.map +1 -0
- package/dist/mqttPacket/protocolLevels.js +11 -0
- package/dist/mqttPacket/protocolLevels.js.map +1 -0
- package/dist/mqttPacket/pubblishAcks.d.ts +35 -0
- package/dist/mqttPacket/pubblishAcks.d.ts.map +1 -0
- package/dist/mqttPacket/pubblishAcks.js +56 -0
- package/dist/mqttPacket/pubblishAcks.js.map +1 -0
- package/dist/mqttPacket/publish.d.ts +19 -8
- package/dist/mqttPacket/publish.d.ts.map +1 -1
- package/dist/mqttPacket/publish.js +26 -7
- package/dist/mqttPacket/publish.js.map +1 -1
- package/dist/mqttPacket/suback.d.ts +14 -7
- package/dist/mqttPacket/suback.d.ts.map +1 -1
- package/dist/mqttPacket/suback.js +41 -20
- package/dist/mqttPacket/suback.js.map +1 -1
- package/dist/mqttPacket/subscribe.d.ts +24 -9
- package/dist/mqttPacket/subscribe.d.ts.map +1 -1
- package/dist/mqttPacket/subscribe.js +71 -15
- package/dist/mqttPacket/subscribe.js.map +1 -1
- package/dist/mqttPacket/types.d.ts +33 -0
- package/dist/mqttPacket/types.d.ts.map +1 -1
- package/dist/mqttPacket/unsuback.d.ts +14 -7
- package/dist/mqttPacket/unsuback.d.ts.map +1 -1
- package/dist/mqttPacket/unsuback.js +29 -6
- package/dist/mqttPacket/unsuback.js.map +1 -1
- package/dist/mqttPacket/unsubscribe.d.ts +14 -7
- package/dist/mqttPacket/unsubscribe.d.ts.map +1 -1
- package/dist/mqttPacket/unsubscribe.js +24 -8
- package/dist/mqttPacket/unsubscribe.js.map +1 -1
- package/dist/node/wrapNodeSocket.d.ts.map +1 -1
- package/dist/node/wrapNodeSocket.js.map +1 -1
- package/dist/persistence/deps.d.ts +1 -1
- package/dist/persistence/deps.d.ts.map +1 -1
- package/dist/persistence/deps.js +1 -1
- package/dist/persistence/deps.js.map +1 -1
- package/dist/server/context.d.ts +3 -1
- package/dist/server/context.d.ts.map +1 -1
- package/dist/server/context.js +8 -2
- package/dist/server/context.js.map +1 -1
- package/dist/server/deps.d.ts +2 -2
- package/dist/server/deps.d.ts.map +1 -1
- package/dist/server/deps.js +1 -1
- package/dist/server/deps.js.map +1 -1
- package/dist/server/handlers/handleConnect.d.ts +1 -1
- package/dist/server/handlers/handleConnect.d.ts.map +1 -1
- package/dist/server/handlers/handleConnect.js +9 -1
- package/dist/server/handlers/handleConnect.js.map +1 -1
- package/dist/server/handlers/handlePacket.d.ts +1 -1
- package/dist/server/handlers/handlePacket.d.ts.map +1 -1
- package/dist/server/handlers/handlePacket.js +1 -1
- package/dist/server/handlers/handlePacket.js.map +1 -1
- package/dist/server/handlers/handlePingreq.d.ts.map +1 -1
- package/dist/server/handlers/handlePingreq.js +1 -0
- package/dist/server/handlers/handlePingreq.js.map +1 -1
- package/dist/server/handlers/handlePublish.d.ts +2 -2
- package/dist/server/handlers/handlePublish.d.ts.map +1 -1
- package/dist/server/handlers/handlePublish.js +2 -0
- package/dist/server/handlers/handlePublish.js.map +1 -1
- package/dist/server/handlers/handlePubrec.d.ts +1 -1
- package/dist/server/handlers/handlePubrec.d.ts.map +1 -1
- package/dist/server/handlers/handlePubrec.js +1 -0
- package/dist/server/handlers/handlePubrec.js.map +1 -1
- package/dist/server/handlers/handlePubrel.d.ts +1 -1
- package/dist/server/handlers/handlePubrel.d.ts.map +1 -1
- package/dist/server/handlers/handlePubrel.js +1 -0
- package/dist/server/handlers/handlePubrel.js.map +1 -1
- package/dist/server/handlers/handleSubscribe.d.ts +1 -1
- package/dist/server/handlers/handleSubscribe.d.ts.map +1 -1
- package/dist/server/handlers/handleSubscribe.js +2 -1
- package/dist/server/handlers/handleSubscribe.js.map +1 -1
- package/dist/server/handlers/handleUnsubscribe.d.ts +1 -1
- package/dist/server/handlers/handleUnsubscribe.d.ts.map +1 -1
- package/dist/server/handlers/handleUnsubscribe.js +1 -0
- package/dist/server/handlers/handleUnsubscribe.js.map +1 -1
- package/dist/server/server.d.ts +2 -2
- package/dist/server/server.d.ts.map +1 -1
- package/dist/server/server.js +5 -3
- package/dist/server/server.js.map +1 -1
- package/dist/socket/socket.d.ts.map +1 -1
- package/dist/socket/socket.js +6 -1
- package/dist/socket/socket.js.map +1 -1
- package/dist/utils/assert.d.ts +0 -3
- package/dist/utils/assert.d.ts.map +1 -1
- package/dist/utils/assert.js +0 -7
- package/dist/utils/assert.js.map +1 -1
- package/dist/utils/mod.d.ts +0 -3
- package/dist/utils/mod.d.ts.map +1 -1
- package/dist/utils/mod.js +0 -2
- package/dist/utils/mod.js.map +1 -1
- package/mqttConn/mqttConn.test.ts +27 -12
- package/mqttConn/mqttConn.ts +45 -14
- package/mqttPacket/PacketType.ts +1 -0
- package/mqttPacket/Properties.ts +276 -0
- package/mqttPacket/ReasonCode.test.ts +22 -0
- package/mqttPacket/ReasonCode.ts +256 -0
- package/mqttPacket/RetainHandling.ts +11 -0
- package/mqttPacket/auth.test.ts +112 -0
- package/mqttPacket/auth.ts +72 -0
- package/mqttPacket/connack.test.ts +84 -64
- package/mqttPacket/connack.ts +84 -20
- package/mqttPacket/connect.test.ts +497 -18
- package/mqttPacket/connect.ts +167 -36
- package/mqttPacket/decoder.test.ts +33 -16
- package/mqttPacket/decoder.ts +173 -5
- package/mqttPacket/disconnect.test.ts +97 -18
- package/mqttPacket/disconnect.ts +82 -10
- package/mqttPacket/encoder.test.ts +32 -8
- package/mqttPacket/encoder.ts +236 -11
- package/mqttPacket/length.ts +3 -2
- package/mqttPacket/mod.ts +75 -32
- package/mqttPacket/pingreq.test.ts +52 -4
- package/mqttPacket/pingreq.ts +20 -7
- package/mqttPacket/pingres.test.ts +52 -4
- package/mqttPacket/pingres.ts +22 -8
- package/mqttPacket/properties.test.ts +193 -0
- package/mqttPacket/protocolLevels.ts +13 -0
- package/mqttPacket/pubblishAcks.ts +117 -0
- package/mqttPacket/publish.test.ts +212 -133
- package/mqttPacket/publish.ts +69 -14
- package/mqttPacket/publishAcks.test.ts +128 -0
- package/mqttPacket/suback.test.ts +71 -27
- package/mqttPacket/suback.ts +78 -26
- package/mqttPacket/subscribe.test.ts +132 -43
- package/mqttPacket/subscribe.ts +125 -22
- package/mqttPacket/types.ts +40 -0
- package/mqttPacket/unsuback.test.ts +80 -30
- package/mqttPacket/unsuback.ts +65 -10
- package/mqttPacket/unsubscribe.test.ts +59 -34
- package/mqttPacket/unsubscribe.ts +61 -14
- package/node/wrapNodeSocket.ts +2 -1
- package/package.json +2 -2
- package/persistence/deps.ts +1 -1
- package/persistence/memory/memoryPersistence.test.ts +5 -1
- package/server/context.ts +23 -10
- package/server/deps.ts +2 -0
- package/server/handlers/handleConnect.ts +12 -9
- package/server/handlers/handlePacket.ts +10 -11
- package/server/handlers/handlePingreq.ts +1 -0
- package/server/handlers/handlePublish.ts +6 -2
- package/server/handlers/handlePubrec.ts +3 -1
- package/server/handlers/handlePubrel.ts +3 -1
- package/server/handlers/handleSubscribe.ts +3 -6
- package/server/handlers/handleUnsubscribe.ts +3 -1
- package/server/server.ts +8 -12
- package/server/test/handleConnect.test.ts +2 -1
- package/server/test/test-handlers.ts +2 -1
- package/socket/socket.ts +5 -1
- package/utils/assert.ts +0 -18
- package/utils/mod.ts +0 -3
- package/dist/mqttPacket/puback.d.ts +0 -16
- package/dist/mqttPacket/puback.d.ts.map +0 -1
- package/dist/mqttPacket/puback.js +0 -21
- package/dist/mqttPacket/puback.js.map +0 -1
- package/dist/mqttPacket/pubcomp.d.ts +0 -17
- package/dist/mqttPacket/pubcomp.d.ts.map +0 -1
- package/dist/mqttPacket/pubcomp.js +0 -21
- package/dist/mqttPacket/pubcomp.js.map +0 -1
- package/dist/mqttPacket/pubrec.d.ts +0 -17
- package/dist/mqttPacket/pubrec.d.ts.map +0 -1
- package/dist/mqttPacket/pubrec.js +0 -21
- package/dist/mqttPacket/pubrec.js.map +0 -1
- package/dist/mqttPacket/pubrel.d.ts +0 -17
- package/dist/mqttPacket/pubrel.d.ts.map +0 -1
- package/dist/mqttPacket/pubrel.js +0 -21
- package/dist/mqttPacket/pubrel.js.map +0 -1
- package/dist/utils/args.d.ts +0 -28
- package/dist/utils/args.d.ts.map +0 -1
- package/dist/utils/args.js +0 -76
- package/dist/utils/args.js.map +0 -1
- package/dist/utils/platform.d.ts +0 -5
- package/dist/utils/platform.d.ts.map +0 -1
- package/dist/utils/platform.js +0 -8
- package/dist/utils/platform.js.map +0 -1
- package/mqttPacket/puback.test.ts +0 -55
- package/mqttPacket/puback.ts +0 -34
- package/mqttPacket/pubcomp.test.ts +0 -55
- package/mqttPacket/pubcomp.ts +0 -35
- package/mqttPacket/pubrec.test.ts +0 -55
- package/mqttPacket/pubrec.ts +0 -35
- package/mqttPacket/pubrel.test.ts +0 -55
- package/mqttPacket/pubrel.ts +0 -35
- package/utils/args.ts +0 -103
- package/utils/platform.ts +0 -8
|
@@ -3,50 +3,106 @@ import { BitMask } from "./BitMask.js";
|
|
|
3
3
|
import { Encoder } from "./encoder.js";
|
|
4
4
|
import { booleanFlag, Decoder, DecoderError } from "./decoder.js";
|
|
5
5
|
export const subscribe = {
|
|
6
|
-
encode(packet) {
|
|
6
|
+
encode(packet, codecOpts) {
|
|
7
7
|
// Bits 3,2,1 and 0 of the fixed header of the SUBSCRIBE Control Packet are reserved and
|
|
8
8
|
// MUST be set to 0,0,1 and 0 respectively. The Server MUST treat any other value as
|
|
9
9
|
// malformed and close the Network Connection [MQTT-3.8.1-1].
|
|
10
10
|
const flags = 0b0010;
|
|
11
|
-
const encoder = new Encoder();
|
|
11
|
+
const encoder = new Encoder(packet.type);
|
|
12
12
|
encoder.setInt16(packet.id);
|
|
13
|
+
if (packet.protocolLevel === 5) {
|
|
14
|
+
encoder.setProperties(packet.properties || {}, packet.type, codecOpts.maxOutgoingPacketSize);
|
|
15
|
+
}
|
|
13
16
|
for (const sub of packet.subscriptions) {
|
|
14
|
-
encoder.
|
|
15
|
-
|
|
17
|
+
encoder.setTopicFilter(sub.topicFilter);
|
|
18
|
+
if (packet.protocolLevel === 5) {
|
|
19
|
+
const { qos, noLocal = false, retainAsPublished = false, retainHandling = 0, } = sub;
|
|
20
|
+
const option = (qos & 1 ? BitMask.bit0 : 0) +
|
|
21
|
+
(qos & 2 ? BitMask.bit1 : 0) +
|
|
22
|
+
(noLocal ? BitMask.bit2 : 0) +
|
|
23
|
+
(retainAsPublished ? BitMask.bit3 : 0) +
|
|
24
|
+
(retainHandling & 1 ? BitMask.bit4 : 0) +
|
|
25
|
+
(retainHandling & 2 ? BitMask.bit5 : 0);
|
|
26
|
+
encoder.setByte(option);
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
encoder.setByte(sub.qos);
|
|
30
|
+
}
|
|
16
31
|
}
|
|
17
|
-
return
|
|
32
|
+
return encoder.done(flags);
|
|
18
33
|
},
|
|
19
|
-
decode(buffer, flags) {
|
|
34
|
+
decode(buffer, flags, codecOpts, packetType) {
|
|
20
35
|
// Bits 3,2,1 and 0 of the fixed header of the SUBSCRIBE Control Packet are reserved and
|
|
21
36
|
// MUST be set to 0,0,1 and 0 respectively. The Server MUST treat any other value as
|
|
22
37
|
// malformed and close the Network Connection [MQTT-3.8.1-1].
|
|
23
|
-
if (
|
|
38
|
+
if (flags !== 0b0010) {
|
|
24
39
|
throw new DecoderError("Invalid header");
|
|
25
40
|
}
|
|
26
|
-
const decoder = new Decoder(buffer);
|
|
41
|
+
const decoder = new Decoder(packetType, buffer);
|
|
27
42
|
const id = decoder.getInt16();
|
|
43
|
+
let properties = {};
|
|
44
|
+
if (codecOpts.protocolLevel === 5) {
|
|
45
|
+
properties = decoder.getProperties(PacketType.subscribe);
|
|
46
|
+
}
|
|
28
47
|
const subscriptions = [];
|
|
29
|
-
// The payload of a SUBSCRIBE packet MUST contain at least one Topic Filter /
|
|
48
|
+
// The payload of a SUBSCRIBE packet MUST contain at least one Topic Filter / Option pair.
|
|
30
49
|
// A SUBSCRIBE packet with no payload is a protocol violation [MQTT-3.8.3-3].
|
|
31
50
|
do {
|
|
32
51
|
const topicFilter = decoder.getTopicFilter();
|
|
33
|
-
const
|
|
52
|
+
const option = decoder.getByte();
|
|
53
|
+
const qos = option & 0b11;
|
|
34
54
|
if (qos !== 0 && qos !== 1 && qos !== 2) {
|
|
35
55
|
throw new DecoderError("Invalid qos");
|
|
36
56
|
}
|
|
37
57
|
if (qos > 0 && id === 0) {
|
|
38
58
|
throw new DecoderError("Invalid packet identifier");
|
|
39
59
|
}
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
60
|
+
if (codecOpts.protocolLevel !== 5) {
|
|
61
|
+
if (option !== qos) {
|
|
62
|
+
throw new DecoderError("Invalid qos");
|
|
63
|
+
}
|
|
64
|
+
subscriptions.push({
|
|
65
|
+
topicFilter: topicFilter,
|
|
66
|
+
qos,
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
// Bits 6 and 7 of the Subscription Options byte are reserved for future use.
|
|
71
|
+
// The Server MUST treat a SUBSCRIBE packet as malformed if any of
|
|
72
|
+
// Reserved bits in the Payload are non-zero [MQTT-3.8.3-5].
|
|
73
|
+
if (option > 0b111111) {
|
|
74
|
+
throw new DecoderError("Invalid subscription options");
|
|
75
|
+
}
|
|
76
|
+
const noLocal = booleanFlag(option, BitMask.bit2);
|
|
77
|
+
const retainAsPublished = booleanFlag(option, BitMask.bit3);
|
|
78
|
+
const retainHandling = (option & 0b110000) >> 4;
|
|
79
|
+
if (retainHandling !== 0 && retainHandling !== 1 && retainHandling !== 2) {
|
|
80
|
+
throw new DecoderError("Invalid retain handling");
|
|
81
|
+
}
|
|
82
|
+
subscriptions.push({
|
|
83
|
+
topicFilter: topicFilter,
|
|
84
|
+
qos,
|
|
85
|
+
noLocal,
|
|
86
|
+
retainAsPublished,
|
|
87
|
+
retainHandling,
|
|
88
|
+
});
|
|
89
|
+
}
|
|
44
90
|
} while (!decoder.atEnd());
|
|
45
91
|
decoder.done();
|
|
92
|
+
if (codecOpts.protocolLevel !== 5) {
|
|
93
|
+
return {
|
|
94
|
+
type: PacketType.subscribe,
|
|
95
|
+
protocolLevel: codecOpts.protocolLevel,
|
|
96
|
+
id,
|
|
97
|
+
subscriptions: subscriptions,
|
|
98
|
+
};
|
|
99
|
+
}
|
|
46
100
|
return {
|
|
47
101
|
type: PacketType.subscribe,
|
|
102
|
+
protocolLevel: 5,
|
|
48
103
|
id,
|
|
49
|
-
|
|
104
|
+
properties,
|
|
105
|
+
subscriptions: subscriptions,
|
|
50
106
|
};
|
|
51
107
|
},
|
|
52
108
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../mqttPacket/subscribe.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../mqttPacket/subscribe.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { BitMask } from "./BitMask.ts";
|
|
2
2
|
import type { PacketType } from "./PacketType.ts";
|
|
3
|
+
import type { RetainHandling } from "./RetainHandling.ts";
|
|
3
4
|
import type { AuthenticationResult } from "./AuthenticationResult.ts";
|
|
5
|
+
import type { ReasonCode } from "./ReasonCode.ts";
|
|
4
6
|
/**
|
|
5
7
|
* Type to limit bit mask to valid values
|
|
6
8
|
*/
|
|
@@ -13,6 +15,18 @@ export type TPacketType = typeof PacketType[keyof typeof PacketType];
|
|
|
13
15
|
* Type to limit authentication result to valid values
|
|
14
16
|
*/
|
|
15
17
|
export type TAuthenticationResult = typeof AuthenticationResult[keyof typeof AuthenticationResult];
|
|
18
|
+
/**
|
|
19
|
+
* Type to limit reason code to valid values
|
|
20
|
+
*/
|
|
21
|
+
export type TReasonCode = typeof ReasonCode[keyof typeof ReasonCode];
|
|
22
|
+
/**
|
|
23
|
+
* Protocol version
|
|
24
|
+
* 3.1 = 3
|
|
25
|
+
* 3.1.1 = 4
|
|
26
|
+
* 5.0 = 5
|
|
27
|
+
*/
|
|
28
|
+
export type ProtocolLevel = 3 | 4 | 5 | undefined;
|
|
29
|
+
export type ProtocolLevelNoV5 = Exclude<ProtocolLevel, 5>;
|
|
16
30
|
/**
|
|
17
31
|
* Quality of Service level
|
|
18
32
|
*/
|
|
@@ -45,4 +59,23 @@ export type ReturnCodes = number[];
|
|
|
45
59
|
* Client identifier that uniquely identifies a client
|
|
46
60
|
*/
|
|
47
61
|
export type ClientId = string;
|
|
62
|
+
export type TRetainHandling = typeof RetainHandling[keyof typeof RetainHandling];
|
|
63
|
+
/**
|
|
64
|
+
* UTF8 string pair (for v5)
|
|
65
|
+
*/
|
|
66
|
+
export type UTF8StringPair = [string, string];
|
|
67
|
+
/**
|
|
68
|
+
* Options for the codec
|
|
69
|
+
*/
|
|
70
|
+
export type CodecOpts = {
|
|
71
|
+
protocolLevel: ProtocolLevel;
|
|
72
|
+
maxIncomingPacketSize: number;
|
|
73
|
+
maxOutgoingPacketSize: number;
|
|
74
|
+
};
|
|
75
|
+
/**
|
|
76
|
+
* Typescript helper to create an inverted record type
|
|
77
|
+
*/
|
|
78
|
+
export type InvertRecord<R extends Record<string, number>> = {
|
|
79
|
+
[K in keyof R as R[K]]: K;
|
|
80
|
+
};
|
|
48
81
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../mqttPacket/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../mqttPacket/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,OAAO,CAAC,MAAM,OAAO,OAAO,CAAC,CAAC;AAC5D;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,OAAO,UAAU,CAAC,MAAM,OAAO,UAAU,CAAC,CAAC;AAErE;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAC/B,OAAO,oBAAoB,CAAC,MAAM,OAAO,oBAAoB,CAAC,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,OAAO,UAAU,CAAC,MAAM,OAAO,UAAU,CAAC,CAAC;AAErE;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;AAClD,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;AAE1D;;GAEG;AACH,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAE5B;;GAEG;AACH,MAAM,MAAM,OAAO,GAAG,UAAU,CAAC;AAEjC;;GAEG;AACH,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC;AAE3B;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC;AAEjC;;GAEG;AACH,MAAM,MAAM,GAAG,GAAG,OAAO,CAAC;AAE1B;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE9B;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC;AAEnC;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE9B,MAAM,MAAM,eAAe,GACzB,OAAO,cAAc,CAAC,MAAM,OAAO,cAAc,CAAC,CAAC;AAErD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAE9C;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB,aAAa,EAAE,aAAa,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,qBAAqB,EAAE,MAAM,CAAC;CAC/B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI;KAC1D,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;CAC1B,CAAC"}
|
|
@@ -1,17 +1,24 @@
|
|
|
1
|
-
import type { PacketId, TPacketType } from "./types.ts";
|
|
1
|
+
import type { CodecOpts, PacketId, ProtocolLevelNoV5, TPacketType, TReasonCode } from "./types.ts";
|
|
2
|
+
import type { UnsubackProperties } from "./Properties.ts";
|
|
2
3
|
/**
|
|
3
4
|
* UnsubackPacket is sent by the server to the client to confirm receipt
|
|
4
5
|
* of an UnsubscribePacket.
|
|
5
6
|
*/
|
|
6
|
-
export type
|
|
7
|
+
export type UnsubackPacketV4 = {
|
|
7
8
|
type: TPacketType;
|
|
9
|
+
protocolLevel: ProtocolLevelNoV5;
|
|
8
10
|
id: PacketId;
|
|
9
11
|
};
|
|
12
|
+
export type UnsubackPacketV5 = {
|
|
13
|
+
type: TPacketType;
|
|
14
|
+
protocolLevel: 5;
|
|
15
|
+
id: PacketId;
|
|
16
|
+
properties: UnsubackProperties;
|
|
17
|
+
reasonCodes: Array<TReasonCode>;
|
|
18
|
+
};
|
|
19
|
+
export type UnsubackPacket = UnsubackPacketV4 | UnsubackPacketV5;
|
|
10
20
|
export declare const unsuback: {
|
|
11
|
-
encode(packet: UnsubackPacket):
|
|
12
|
-
|
|
13
|
-
bytes: number[];
|
|
14
|
-
};
|
|
15
|
-
decode(buffer: Uint8Array): UnsubackPacket;
|
|
21
|
+
encode(packet: UnsubackPacket, codecOpts: CodecOpts): Uint8Array;
|
|
22
|
+
decode(buffer: Uint8Array, flags: number, codecOpts: CodecOpts, packetType: TPacketType): UnsubackPacket;
|
|
16
23
|
};
|
|
17
24
|
//# sourceMappingURL=unsuback.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unsuback.d.ts","sourceRoot":"","sources":["../../mqttPacket/unsuback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"unsuback.d.ts","sourceRoot":"","sources":["../../mqttPacket/unsuback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,QAAQ,EACR,iBAAiB,EACjB,WAAW,EACX,WAAW,EACZ,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAK1D;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,WAAW,CAAC;IAClB,aAAa,EAAE,iBAAiB,CAAC;IACjC,EAAE,EAAE,QAAQ,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,WAAW,CAAC;IAClB,aAAa,EAAE,CAAC,CAAC;IACjB,EAAE,EAAE,QAAQ,CAAC;IACb,UAAU,EAAE,kBAAkB,CAAC;IAC/B,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,gBAAgB,GAAG,gBAAgB,CAAC;AAEjE,eAAO,MAAM,QAAQ,EAAE;IACrB,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IACjE,MAAM,CACJ,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,WAAW,GACtB,cAAc,CAAC;CAkDnB,CAAC"}
|
|
@@ -1,19 +1,42 @@
|
|
|
1
1
|
import { PacketType } from "./PacketType.js";
|
|
2
|
-
import { Decoder } from "./decoder.js";
|
|
2
|
+
import { Decoder, hasEmptyFlags } from "./decoder.js";
|
|
3
3
|
import { Encoder } from "./encoder.js";
|
|
4
4
|
export const unsuback = {
|
|
5
|
-
encode(packet) {
|
|
5
|
+
encode(packet, codecOpts) {
|
|
6
6
|
const flags = 0;
|
|
7
|
-
const encoder = new Encoder();
|
|
7
|
+
const encoder = new Encoder(packet.type);
|
|
8
8
|
encoder.setInt16(packet.id);
|
|
9
|
-
|
|
9
|
+
if (packet.protocolLevel === 5) {
|
|
10
|
+
encoder.setProperties(packet.properties || {}, PacketType.unsuback, codecOpts.maxOutgoingPacketSize);
|
|
11
|
+
for (const reasonCode of packet.reasonCodes) {
|
|
12
|
+
encoder.setByte(reasonCode);
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
return encoder.done(flags);
|
|
10
16
|
},
|
|
11
|
-
decode(buffer) {
|
|
12
|
-
|
|
17
|
+
decode(buffer, flags, codecOpts, packetType) {
|
|
18
|
+
hasEmptyFlags(flags);
|
|
19
|
+
const decoder = new Decoder(packetType, buffer);
|
|
13
20
|
const id = decoder.getInt16();
|
|
21
|
+
if (codecOpts.protocolLevel === 5) {
|
|
22
|
+
const properties = decoder.getProperties(PacketType.unsuback);
|
|
23
|
+
const reasonCodes = [];
|
|
24
|
+
while (!decoder.atEnd()) {
|
|
25
|
+
const reasonCode = decoder.getReasonCode();
|
|
26
|
+
reasonCodes.push(reasonCode);
|
|
27
|
+
}
|
|
28
|
+
return {
|
|
29
|
+
type: PacketType.unsuback,
|
|
30
|
+
protocolLevel: 5,
|
|
31
|
+
id,
|
|
32
|
+
properties,
|
|
33
|
+
reasonCodes: reasonCodes,
|
|
34
|
+
};
|
|
35
|
+
}
|
|
14
36
|
decoder.done();
|
|
15
37
|
return {
|
|
16
38
|
type: PacketType.unsuback,
|
|
39
|
+
protocolLevel: codecOpts.protocolLevel,
|
|
17
40
|
id,
|
|
18
41
|
};
|
|
19
42
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unsuback.js","sourceRoot":"","sources":["../../mqttPacket/unsuback.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"unsuback.js","sourceRoot":"","sources":["../../mqttPacket/unsuback.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAsBvC,MAAM,CAAC,MAAM,QAAQ,GAQjB;IACF,MAAM,CAAC,MAAsB,EAAE,SAAoB;QACjD,MAAM,KAAK,GAAG,CAAC,CAAC;QAChB,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC5B,IAAI,MAAM,CAAC,aAAa,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,aAAa,CACnB,MAAM,CAAC,UAAU,IAAI,EAAE,EACvB,UAAU,CAAC,QAAQ,EACnB,SAAS,CAAC,qBAAqB,CAChC,CAAC;YACF,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;gBAC5C,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CACJ,MAAkB,EAClB,KAAa,EACb,SAAoB,EACpB,UAAuB;QAEvB,aAAa,CAAC,KAAK,CAAC,CAAC;QACrB,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAChD,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC9B,IAAI,SAAS,CAAC,aAAa,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC9D,MAAM,WAAW,GAAG,EAAE,CAAC;YACvB,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;gBACxB,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;gBAC3C,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC/B,CAAC;YACD,OAAO;gBACL,IAAI,EAAE,UAAU,CAAC,QAAQ;gBACzB,aAAa,EAAE,CAAC;gBAChB,EAAE;gBACF,UAAU;gBACV,WAAW,EAAE,WAAiC;aAC/C,CAAC;QACJ,CAAC;QACD,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,OAAO;YACL,IAAI,EAAE,UAAU,CAAC,QAAQ;YACzB,aAAa,EAAE,SAAS,CAAC,aAAa;YACtC,EAAE;SACH,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -1,17 +1,24 @@
|
|
|
1
|
-
import type { PacketId, TopicFilter, TPacketType } from "./types.ts";
|
|
1
|
+
import type { CodecOpts, PacketId, ProtocolLevelNoV5, TopicFilter, TPacketType } from "./types.ts";
|
|
2
|
+
import type { UnsubscribeProperties } from "./Properties.ts";
|
|
2
3
|
/**
|
|
3
4
|
* UnsubscribePacket is sent from client to server to unsubscribe from topics
|
|
4
5
|
*/
|
|
5
|
-
export type
|
|
6
|
+
export type UnsubscribePacketV4 = {
|
|
6
7
|
type: TPacketType;
|
|
8
|
+
protocolLevel: ProtocolLevelNoV5;
|
|
7
9
|
id: PacketId;
|
|
8
10
|
topicFilters: TopicFilter[];
|
|
9
11
|
};
|
|
12
|
+
export type UnsubscribePacketV5 = {
|
|
13
|
+
type: TPacketType;
|
|
14
|
+
protocolLevel: 5;
|
|
15
|
+
id: PacketId;
|
|
16
|
+
properties?: UnsubscribeProperties;
|
|
17
|
+
topicFilters: TopicFilter[];
|
|
18
|
+
};
|
|
19
|
+
export type UnsubscribePacket = UnsubscribePacketV4 | UnsubscribePacketV5;
|
|
10
20
|
export declare const unsubscribe: {
|
|
11
|
-
encode(packet: UnsubscribePacket):
|
|
12
|
-
|
|
13
|
-
bytes: number[];
|
|
14
|
-
};
|
|
15
|
-
decode(buffer: Uint8Array, flags: number): UnsubscribePacket;
|
|
21
|
+
encode(packet: UnsubscribePacket, codecOpts: CodecOpts): Uint8Array;
|
|
22
|
+
decode(buffer: Uint8Array, flags: number, codecOpts: CodecOpts, packetType: TPacketType): UnsubscribePacket;
|
|
16
23
|
};
|
|
17
24
|
//# sourceMappingURL=unsubscribe.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unsubscribe.d.ts","sourceRoot":"","sources":["../../mqttPacket/unsubscribe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"unsubscribe.d.ts","sourceRoot":"","sources":["../../mqttPacket/unsubscribe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,QAAQ,EACR,iBAAiB,EAEjB,WAAW,EACX,WAAW,EACZ,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAK7D;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,WAAW,CAAC;IAClB,aAAa,EAAE,iBAAiB,CAAC;IACjC,EAAE,EAAE,QAAQ,CAAC;IACb,YAAY,EAAE,WAAW,EAAE,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,WAAW,CAAC;IAClB,aAAa,EAAE,CAAC,CAAC;IACjB,EAAE,EAAE,QAAQ,CAAC;IACb,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,YAAY,EAAE,WAAW,EAAE,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,GAAG,mBAAmB,CAAC;AAE1E,eAAO,MAAM,WAAW,EAAE;IACxB,MAAM,CAAC,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IACpE,MAAM,CACJ,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,WAAW,GACtB,iBAAiB,CAAC;CA4DtB,CAAC"}
|
|
@@ -1,35 +1,51 @@
|
|
|
1
1
|
import { PacketType } from "./PacketType.js";
|
|
2
|
-
import { BitMask } from "./BitMask.js";
|
|
3
2
|
import { Encoder } from "./encoder.js";
|
|
4
|
-
import {
|
|
3
|
+
import { Decoder, DecoderError } from "./decoder.js";
|
|
5
4
|
export const unsubscribe = {
|
|
6
|
-
encode(packet) {
|
|
5
|
+
encode(packet, codecOpts) {
|
|
7
6
|
// Bits 3,2,1 and 0 of the fixed header of the UNSUBSCRIBE Control Packet are reserved and
|
|
8
7
|
// MUST be set to 0,0,1 and 0 respectively. The Server MUST treat any other value as
|
|
9
8
|
// malformed and close the Network Connection [MQTT-3.10.1-1].
|
|
10
9
|
const flags = 0b0010;
|
|
11
|
-
const encoder = new Encoder();
|
|
10
|
+
const encoder = new Encoder(packet.type);
|
|
12
11
|
encoder.setInt16(packet.id);
|
|
12
|
+
if (packet.protocolLevel === 5) {
|
|
13
|
+
encoder.setProperties(packet.properties || {}, PacketType.unsubscribe, codecOpts.maxOutgoingPacketSize);
|
|
14
|
+
}
|
|
13
15
|
for (const topicFilter of packet.topicFilters) {
|
|
14
16
|
encoder.setTopicFilter(topicFilter);
|
|
15
17
|
}
|
|
16
|
-
return
|
|
18
|
+
return encoder.done(flags);
|
|
17
19
|
},
|
|
18
|
-
decode(buffer, flags) {
|
|
19
|
-
if (
|
|
20
|
+
decode(buffer, flags, codecOpts, packetType) {
|
|
21
|
+
if (flags !== 0b0010) {
|
|
20
22
|
throw new DecoderError("Invalid header");
|
|
21
23
|
}
|
|
22
|
-
const decoder = new Decoder(buffer);
|
|
24
|
+
const decoder = new Decoder(packetType, buffer);
|
|
23
25
|
const id = decoder.getInt16();
|
|
26
|
+
let properties = {};
|
|
27
|
+
if (codecOpts.protocolLevel === 5) {
|
|
28
|
+
properties = decoder.getProperties(PacketType.unsubscribe);
|
|
29
|
+
}
|
|
24
30
|
const topicFilters = [];
|
|
25
31
|
do {
|
|
26
32
|
const topicFilter = decoder.getTopicFilter();
|
|
27
33
|
topicFilters.push(topicFilter);
|
|
28
34
|
} while (!decoder.atEnd());
|
|
29
35
|
decoder.done();
|
|
36
|
+
if (codecOpts.protocolLevel !== 5) {
|
|
37
|
+
return {
|
|
38
|
+
type: PacketType.unsubscribe,
|
|
39
|
+
protocolLevel: codecOpts.protocolLevel,
|
|
40
|
+
id,
|
|
41
|
+
topicFilters,
|
|
42
|
+
};
|
|
43
|
+
}
|
|
30
44
|
return {
|
|
31
45
|
type: PacketType.unsubscribe,
|
|
46
|
+
protocolLevel: 5,
|
|
32
47
|
id,
|
|
48
|
+
properties,
|
|
33
49
|
topicFilters,
|
|
34
50
|
};
|
|
35
51
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unsubscribe.js","sourceRoot":"","sources":["../../mqttPacket/unsubscribe.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"unsubscribe.js","sourceRoot":"","sources":["../../mqttPacket/unsubscribe.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAsBrD,MAAM,CAAC,MAAM,WAAW,GAQpB;IACF,MAAM,CAAC,MAAyB,EAAE,SAAoB;QACpD,0FAA0F;QAC1F,oFAAoF;QACpF,8DAA8D;QAC9D,MAAM,KAAK,GAAG,MAAM,CAAC;QAErB,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC5B,IAAI,MAAM,CAAC,aAAa,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,aAAa,CACnB,MAAM,CAAC,UAAU,IAAI,EAAE,EACvB,UAAU,CAAC,WAAW,EACtB,SAAS,CAAC,qBAAqB,CAChC,CAAC;QACJ,CAAC;QACD,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YAC9C,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CACJ,MAAkB,EAClB,KAAa,EACb,SAAoB,EACpB,UAAuB;QAEvB,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;YACrB,MAAM,IAAI,YAAY,CAAC,gBAAgB,CAAC,CAAC;QAC3C,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAChD,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC9B,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,SAAS,CAAC,aAAa,KAAK,CAAC,EAAE,CAAC;YAClC,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAC7D,CAAC;QACD,MAAM,YAAY,GAAY,EAAE,CAAC;QACjC,GAAG,CAAC;YACF,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;YAC7C,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACjC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE;QAC3B,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,IAAI,SAAS,CAAC,aAAa,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO;gBACL,IAAI,EAAE,UAAU,CAAC,WAAW;gBAC5B,aAAa,EAAE,SAAS,CAAC,aAAa;gBACtC,EAAE;gBACF,YAAY;aACb,CAAC;QACJ,CAAC;QACD,OAAO;YACL,IAAI,EAAE,UAAU,CAAC,WAAW;YAC5B,aAAa,EAAE,CAAC;YAChB,EAAE;YACF,UAAU;YACV,YAAY;SACb,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapNodeSocket.d.ts","sourceRoot":"","sources":["../../node/wrapNodeSocket.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,KAAK,EAAW,QAAQ,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"wrapNodeSocket.d.ts","sourceRoot":"","sources":["../../node/wrapNodeSocket.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,KAAK,EAAW,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAY7D;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CA4CvD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapNodeSocket.js","sourceRoot":"","sources":["../../node/wrapNodeSocket.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"wrapNodeSocket.js","sourceRoot":"","sources":["../../node/wrapNodeSocket.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC;;;GAGG;AACH,SAAS,MAAM,CAAC,IAAY;IAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,IAAI,CAAC,GAAG,EAAE,CAAC;IACb,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,MAAM,QAAQ,GAAG,IAAI,cAAc,CACjC;QACE,IAAI,EAAE,OAAO;QACb,KAAK,CAAC,UAAU;YACd,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAA6B,EAAE,EAAE;gBAClD,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACzB,MAAM,WAAW,GAAG,UAAU,CAAC,WAAW,IAAI,CAAC,CAAC;gBAChD,IAAI,WAAW,IAAI,CAAC,EAAE,CAAC;oBACrB,2CAA2C;oBAC3C,oDAAoD;oBACpD,MAAM,CAAC,KAAK,EAAE,CAAC;gBACjB,CAAC;YACH,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAY,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5D,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACpB,uBAAuB;gBACvB,UAAU,CAAC,KAAK,EAAE,CAAC;gBACnB,wCAAwC;gBACxC,UAAU,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE,GAAG,EAAE;YACT,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,CAAC;QACD,MAAM,EAAE,GAAG,EAAE;YACX,MAAM,CAAC,GAAG,EAAE,CAAC;QACf,CAAC;KACF,CACF,CAAC;IACF,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,UAAU,GAAY;QAC1B,QAAQ,EAAE,MAAM,CAAC,aAAa,IAAI,EAAE;QACpC,IAAI,EAAE,MAAM,CAAC,UAAU,IAAI,CAAC;QAC5B,SAAS,EAAE,KAAK;KACjB,CAAC;IAEF,MAAM,IAAI,GAAa;QACrB,QAAQ,EAAE,QAAsC;QAChD,QAAQ,EAAE,QAAsC;QAChD,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;QAC3B,UAAU;KACX,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export type { ClientId, PacketId, PublishPacket, QoS, Subscription, Topic, TopicFilter, } from "../mqttPacket/mod.ts";
|
|
2
|
-
export { PacketType } from "../mqttPacket/mod.ts";
|
|
2
|
+
export { MQTTLevel, PacketType } from "../mqttPacket/mod.ts";
|
|
3
3
|
export { Trie } from "../trie/trie.ts";
|
|
4
4
|
export { logger } from "../utils/mod.ts";
|
|
5
5
|
//# sourceMappingURL=deps.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deps.d.ts","sourceRoot":"","sources":["../../persistence/deps.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,QAAQ,EACR,QAAQ,EACR,aAAa,EACb,GAAG,EACH,YAAY,EACZ,KAAK,EACL,WAAW,GACZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"deps.d.ts","sourceRoot":"","sources":["../../persistence/deps.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,QAAQ,EACR,QAAQ,EACR,aAAa,EACb,GAAG,EACH,YAAY,EACZ,KAAK,EACL,WAAW,GACZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC"}
|
package/dist/persistence/deps.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deps.js","sourceRoot":"","sources":["../../persistence/deps.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"deps.js","sourceRoot":"","sources":["../../persistence/deps.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC"}
|
package/dist/server/context.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { MqttConn } from "./deps.ts";
|
|
2
|
+
import type { AnyPacket, IPersistence, IStore, ProtocolLevel, PublishPacket, SockConn, TAuthenticationResult, Timer, Topic } from "./deps.ts";
|
|
2
3
|
export type ClientId = string;
|
|
3
4
|
export declare const SysPrefix = "$";
|
|
4
5
|
export declare const utf8Encoder: TextEncoder;
|
|
@@ -25,6 +26,7 @@ export type Handlers = {
|
|
|
25
26
|
*/
|
|
26
27
|
export declare class Context {
|
|
27
28
|
connected: boolean;
|
|
29
|
+
protocolLevel: ProtocolLevel;
|
|
28
30
|
conn: SockConn;
|
|
29
31
|
mqttConn: MqttConn;
|
|
30
32
|
persistence: IPersistence;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../server/context.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../server/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAIT,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EACZ,MAAM,EACN,aAAa,EACb,aAAa,EACb,QAAQ,EACR,qBAAqB,EACrB,KAAK,EACL,KAAK,EACN,MAAM,WAAW,CAAC;AAEnB,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE9B,eAAO,MAAM,SAAS,MAAM,CAAC;AAE7B,eAAO,MAAM,WAAW,aAAoB,CAAC;AAE7C;;;;;;;GAOG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB,eAAe,CAAC,CACd,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,UAAU,GACnB,qBAAqB,CAAC;IACzB,qBAAqB,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC;IAC5D,uBAAuB,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC;CAC/D,CAAC;AAEF;;;;;;;GAOG;AAEH,qBAAa,OAAO;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,aAAa,CAAC;IAC7B,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,YAAY,CAAC;IAC1B,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAa;IACtD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC;gBAEF,WAAW,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ;IASnE,IAAI,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAM5C,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAiB/C,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IActC,KAAK,CAAC,QAAQ,EAAE,MAAM;IAItB,KAAK,CAAC,WAAW,UAAO,GAAG,IAAI;IA6B/B,OAAO,CAAC,UAAU;IAYlB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAQ,GAAG,IAAI;CAa/D"}
|
package/dist/server/context.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { logger, MqttConn, PacketNameByType, PacketType, } from "./deps.js";
|
|
1
|
+
import { logger, MqttConn, MQTTLevel, PacketNameByType, PacketType, } from "./deps.js";
|
|
2
2
|
export const SysPrefix = "$";
|
|
3
3
|
export const utf8Encoder = new TextEncoder();
|
|
4
4
|
/**
|
|
@@ -11,6 +11,7 @@ export const utf8Encoder = new TextEncoder();
|
|
|
11
11
|
*/
|
|
12
12
|
export class Context {
|
|
13
13
|
connected;
|
|
14
|
+
protocolLevel;
|
|
14
15
|
conn;
|
|
15
16
|
mqttConn;
|
|
16
17
|
persistence;
|
|
@@ -25,6 +26,7 @@ export class Context {
|
|
|
25
26
|
this.conn = conn;
|
|
26
27
|
this.mqttConn = new MqttConn({ conn });
|
|
27
28
|
this.handlers = handlers;
|
|
29
|
+
this.protocolLevel = MQTTLevel.unknown;
|
|
28
30
|
}
|
|
29
31
|
async send(packet) {
|
|
30
32
|
logger.debug("Sending", PacketNameByType[packet.type]);
|
|
@@ -60,7 +62,7 @@ export class Context {
|
|
|
60
62
|
}
|
|
61
63
|
close(executewill = true) {
|
|
62
64
|
if (this.connected) {
|
|
63
|
-
logger.
|
|
65
|
+
logger.info(`Closing ${this.store?.clientId} while mqttConn is ${this.mqttConn.isClosed ? "" : "not "}closed because of "${this.mqttConn.reason || "normal disconnect"}"`);
|
|
64
66
|
this.connected = false;
|
|
65
67
|
if (typeof this.timer === "object") {
|
|
66
68
|
this.timer.clear();
|
|
@@ -72,6 +74,9 @@ export class Context {
|
|
|
72
74
|
this.handleWill();
|
|
73
75
|
}
|
|
74
76
|
}
|
|
77
|
+
else {
|
|
78
|
+
logger.info(`closing connection from ${this.mqttConn.remoteAddress} because of "${this.mqttConn.reason || "normal disconnect"}"`);
|
|
79
|
+
}
|
|
75
80
|
if (!this.mqttConn.isClosed) {
|
|
76
81
|
this.mqttConn.close();
|
|
77
82
|
}
|
|
@@ -88,6 +93,7 @@ export class Context {
|
|
|
88
93
|
broadcast(topic, payload, retain = false) {
|
|
89
94
|
const packet = {
|
|
90
95
|
type: PacketType.publish,
|
|
96
|
+
protocolLevel: this.protocolLevel,
|
|
91
97
|
topic,
|
|
92
98
|
retain,
|
|
93
99
|
payload: utf8Encoder.encode(payload),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../server/context.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../server/context.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,QAAQ,EACR,SAAS,EACT,gBAAgB,EAChB,UAAU,GACX,MAAM,WAAW,CAAC;AAenB,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAAC;AAE7B,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AAqB7C;;;;;;;GAOG;AAEH,MAAM,OAAO,OAAO;IAClB,SAAS,CAAU;IACnB,aAAa,CAAgB;IAC7B,IAAI,CAAW;IACf,QAAQ,CAAW;IACnB,WAAW,CAAe;IAC1B,QAAQ,CAAW;IACnB,MAAM,CAAC,UAAU,GAA2B,IAAI,GAAG,EAAE,CAAC;IACtD,KAAK,CAAU;IACf,IAAI,CAAiB;IACrB,KAAK,CAAS;IAEd,YAAY,WAAyB,EAAE,IAAc,EAAE,QAAkB;QACvE,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,IAAI,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAiB;QAC1B,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QACvD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,CAAC,QAAgB,EAAE,KAAc;QACtC,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACrC,MAAM,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,eAAe,EAAE,CAAC;YACpB,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAC1C,QAAQ,EACR,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EACzB,KAAK,CACN,CAAC;QAEF,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,SAAS,CAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,SAAS,CAAC,MAAqB;QAC7B,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;QAC5B,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;YACd,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;YACd,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,OAAO;QACT,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAClD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAgB;QACpB,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,WAAW,GAAG,IAAI;QACtB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,MAAM,CAAC,IAAI,CACT,WAAW,IAAI,CAAC,KAAK,EAAE,QAAQ,sBAC7B,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAChC,sBAAsB,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,mBAAmB,GAAG,CACrE,CAAC;YACF,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACnC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;YACD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,SAAS,CAAC,yBAAyB,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACjE,CAAC;YACD,IAAI,WAAW,EAAE,CAAC;gBAChB,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CACT,2BAA2B,IAAI,CAAC,QAAQ,CAAC,aAAa,gBACpD,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,mBAC1B,GAAG,CACJ,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;YAC5B,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACxB,CAAC;IACH,CAAC;IAEO,UAAU;QAChB,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,IACE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC;gBACtC,IAAI,CAAC,QAAQ,CAAC,qBAAqB;gBACnC,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAC1D,CAAC;gBACD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;IACH,CAAC;IAED,SAAS,CAAC,KAAY,EAAE,OAAe,EAAE,MAAM,GAAG,KAAK;QACrD,MAAM,MAAM,GAAkB;YAC5B,IAAI,EAAE,UAAU,CAAC,OAAO;YACxB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,KAAK;YACL,MAAM;YACN,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC;SACrC,CAAC;QACF,IAAI,MAAM,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YAC3B,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACtD,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC"}
|
package/dist/server/deps.d.ts
CHANGED
|
@@ -3,8 +3,8 @@ export { MqttConn } from "../mqttConn/mqttConn.ts";
|
|
|
3
3
|
export type { IPersistence } from "../persistence/persistence.ts";
|
|
4
4
|
export type { IStore } from "../persistence/store.ts";
|
|
5
5
|
export { MemoryPersistence } from "../persistence/memory/memoryPersistence.ts";
|
|
6
|
-
export type { AnyPacket, ClientId, ConnackPacket, ConnectPacket, DisconnectPacket, PacketId, PingreqPacket, PingresPacket, PubackPacket, PubcompPacket, PublishPacket, PubrecPacket, PubrelPacket, QoS, SubackPacket, SubscribePacket, Subscription, TAuthenticationResult, Topic, TopicFilter, UnsubackPacket, UnsubscribePacket, } from "../mqttPacket/mod.ts";
|
|
7
|
-
export { AuthenticationResult, PacketNameByType, PacketType, } from "../mqttPacket/mod.ts";
|
|
6
|
+
export type { AnyPacket, ClientId, ConnackPacket, ConnectPacket, DisconnectPacket, PacketId, PingreqPacket, PingresPacket, ProtocolLevel, PubackPacket, PubcompPacket, PublishPacket, PubrecPacket, PubrelPacket, QoS, SubackPacket, SubscribePacket, Subscription, TAuthenticationResult, Topic, TopicFilter, UnsubackPacket, UnsubscribePacket, } from "../mqttPacket/mod.ts";
|
|
7
|
+
export { AuthenticationResult, MQTTLevel, PacketNameByType, PacketType, } from "../mqttPacket/mod.ts";
|
|
8
8
|
export { Timer } from "../timer/timer.ts";
|
|
9
9
|
export { logger } from "../utils/mod.ts";
|
|
10
10
|
//# sourceMappingURL=deps.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deps.d.ts","sourceRoot":"","sources":["../../server/deps.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,YAAY,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,YAAY,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,YAAY,EACV,SAAS,EACT,QAAQ,EACR,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,QAAQ,EACR,aAAa,EACb,aAAa,EACb,YAAY,EACZ,aAAa,EACb,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,GAAG,EACH,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,qBAAqB,EACrB,KAAK,EACL,WAAW,EACX,cAAc,EACd,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,UAAU,GACX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"deps.d.ts","sourceRoot":"","sources":["../../server/deps.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,YAAY,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,YAAY,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,YAAY,EACV,SAAS,EACT,QAAQ,EACR,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,QAAQ,EACR,aAAa,EACb,aAAa,EACb,aAAa,EACb,YAAY,EACZ,aAAa,EACb,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,GAAG,EACH,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,qBAAqB,EACrB,KAAK,EACL,WAAW,EACX,cAAc,EACd,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,oBAAoB,EACpB,SAAS,EACT,gBAAgB,EAChB,UAAU,GACX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC"}
|
package/dist/server/deps.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { MqttConn } from "../mqttConn/mqttConn.js";
|
|
2
2
|
export { MemoryPersistence } from "../persistence/memory/memoryPersistence.js";
|
|
3
|
-
export { AuthenticationResult, PacketNameByType, PacketType, } from "../mqttPacket/mod.js";
|
|
3
|
+
export { AuthenticationResult, MQTTLevel, PacketNameByType, PacketType, } from "../mqttPacket/mod.js";
|
|
4
4
|
export { Timer } from "../timer/timer.js";
|
|
5
5
|
export { logger } from "../utils/mod.js";
|
|
6
6
|
//# sourceMappingURL=deps.js.map
|
package/dist/server/deps.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deps.js","sourceRoot":"","sources":["../../server/deps.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"deps.js","sourceRoot":"","sources":["../../server/deps.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AA2B/E,OAAO,EACL,oBAAoB,EACpB,SAAS,EACT,gBAAgB,EAChB,UAAU,GACX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleConnect.d.ts","sourceRoot":"","sources":["../../../server/handlers/handleConnect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"handleConnect.d.ts","sourceRoot":"","sources":["../../../server/handlers/handleConnect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAG7C,OAAO,KAAK,EAAE,aAAa,EAAyB,MAAM,YAAY,CAAC;AA2FvE;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI,CAmBvE"}
|