Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 93 #94

Merged
merged 1 commit into from
May 5, 2024
Merged

Issue 93 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/src/mqtt_subscription.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class MqttSubscription {
/// User properties as supplied in subscribe or unsubscribe operations
/// or as received in subscribe acknowledge or unsubscribe acknowledge
/// messages.
List<MqttUserProperty>? userProperties;
List<MqttUserProperty> userProperties = [];

@override
bool operator ==(Object other) {
Expand Down
8 changes: 5 additions & 3 deletions lib/src/mqtt_subscription_manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,9 @@ class MqttSubscriptionManager {
try {
final subscriptionTopic = MqttSubscriptionTopic(topic);
final sub = MqttSubscription.withMaximumQos(subscriptionTopic, qos);
sub.userProperties = userProperties;
if (userProperties != null) {
sub.userProperties = userProperties;
}
if (option != null) {
sub.option = option;
}
Expand Down Expand Up @@ -237,7 +239,7 @@ class MqttSubscriptionManager {
final unsubscribeMsg = MqttUnsubscribeMessage()
.withMessageIdentifier(messageIdentifierDispenser.nextMessageIdentifier)
.fromTopic(subscription.topic)
.withUserProperties(subscription.userProperties!);
.withUserProperties(subscription.userProperties);
_connectionHandler.sendMessage(unsubscribeMsg);
pendingUnsubscriptions[unsubscribeMsg.variableHeader.messageIdentifier] =
<MqttSubscription>[subscription];
Expand All @@ -255,7 +257,7 @@ class MqttSubscriptionManager {
final unsubscribeMsg = MqttUnsubscribeMessage()
.withMessageIdentifier(messageIdentifierDispenser.nextMessageIdentifier)
.fromSubscriptionList(subscriptions)
.withUserProperties(subscriptions.first.userProperties!);
.withUserProperties(subscriptions.first.userProperties);
_connectionHandler.sendMessage(unsubscribeMsg);
pendingUnsubscriptions[unsubscribeMsg.variableHeader.messageIdentifier] =
subscriptions;
Expand Down
80 changes: 68 additions & 12 deletions test/mqtt_client_subscription_manager_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void main() {
DateTime.now().millisecondsSinceEpoch,
isTrue);
expect(subscription.option, isNotNull);
expect(subscription.userProperties, isNull);
expect(subscription.userProperties, []);
expect(subscription.reasonCode, MqttSubscribeReasonCode.notSet);
subscription.maximumQos = MqttQos.exactlyOnce;
expect(subscription.maximumQos, MqttQos.exactlyOnce);
Expand All @@ -50,7 +50,7 @@ void main() {
DateTime.now().millisecondsSinceEpoch,
isTrue);
expect(subscription.option, isNotNull);
expect(subscription.userProperties, isNull);
expect(subscription.userProperties, []);
expect(subscription.reasonCode, MqttSubscribeReasonCode.notSet);
expect(subscription.option!.noLocal, isTrue);
});
Expand All @@ -64,7 +64,7 @@ void main() {
DateTime.now().millisecondsSinceEpoch,
isTrue);
expect(subscription.option, isNotNull);
expect(subscription.userProperties, isNull);
expect(subscription.userProperties, []);
expect(subscription.reasonCode, MqttSubscribeReasonCode.notSet);
});
test('Equality', () {
Expand Down Expand Up @@ -292,9 +292,9 @@ void main() {
var cbCalled = false;
void subCallback(MqttSubscription subscription) {
expect(subscription.topic.rawTopic, 'testtopic');
expect(subscription.userProperties!.length, 1);
expect(subscription.userProperties![0].pairName, 'abc');
expect(subscription.userProperties![0].pairValue, 'def');
expect(subscription.userProperties.length, 1);
expect(subscription.userProperties[0].pairName, 'abc');
expect(subscription.userProperties[0].pairValue, 'def');
expect(subscription.reasonCode, MqttSubscribeReasonCode.grantedQos0);
cbCalled = true;
}
Expand Down Expand Up @@ -432,9 +432,9 @@ void main() {

void subFailCallback(MqttSubscription subscription) {
expect(subscription.topic.rawTopic, 'testtopic');
expect(subscription.userProperties!.length, 1);
expect(subscription.userProperties![0].pairName, 'abc');
expect(subscription.userProperties![0].pairValue, 'def');
expect(subscription.userProperties.length, 1);
expect(subscription.userProperties[0].pairName, 'abc');
expect(subscription.userProperties[0].pairValue, 'def');
expect(
subscription.reasonCode, MqttSubscribeReasonCode.notAuthorized);
cbFailCalled = true;
Expand Down Expand Up @@ -710,6 +710,62 @@ void main() {
expect(msg.payload.subscriptions.first.rawTopic, topic);
expect(subs.pendingUnsubscriptions[2]!.first.topic.rawTopic, topic);
});
test(
'Unsubscription request creates pending unsubscription - no properties',
() {
final clientEventBus = events.EventBus();
final testCHS = TestConnectionHandlerSend(clientEventBus,
socketOptions: socketOptions);
const topic = 'testtopic';
final subscription = MqttSubscription(MqttSubscriptionTopic(topic));
final subs = MqttSubscriptionManager(testCHS, clientEventBus);
subs.messageIdentifierDispenser.reset();
subs.subscribeSubscription(subscription);
// Confirm the subscription
final buffer = typed.Uint8Buffer();
buffer.add(0x90);
buffer.add(0x18);
buffer.add(0x00); // Message identifier
buffer.add(0x01);
buffer.add(0x14); // Property length
buffer.add(0x1f); // Reason String
buffer.add(0x00);
buffer.add(0x06);
buffer.add('r'.codeUnitAt(0));
buffer.add('e'.codeUnitAt(0));
buffer.add('a'.codeUnitAt(0));
buffer.add('s'.codeUnitAt(0));
buffer.add('o'.codeUnitAt(0));
buffer.add('n'.codeUnitAt(0));
buffer.add(0x26); // User property
buffer.add(0x00);
buffer.add(0x03);
buffer.add('a'.codeUnitAt(0));
buffer.add('b'.codeUnitAt(0));
buffer.add('c'.codeUnitAt(0));
buffer.add(0x00);
buffer.add(0x03);
buffer.add('d'.codeUnitAt(0));
buffer.add('e'.codeUnitAt(0));
buffer.add('f'.codeUnitAt(0));
buffer.add(0x00); // Payload
final stream = MqttByteBuffer(buffer);
final baseMessage = MqttMessage.createFrom(stream)!;
final subAckMsg = baseMessage as MqttSubscribeAckMessage;
subs.confirmSubscription(subAckMsg);
// Unsubscribe
subs.unsubscribeSubscription(subscription);
expect(subs.pendingUnsubscriptions.length, 1);
expect(subs.subscriptions.length, 1);
expect(testCHS.sentMessages.length, 2);
expect(testCHS.sentMessages[1],
const TypeMatcher<MqttUnsubscribeMessage>());
final msg = testCHS.sentMessages[1] as MqttUnsubscribeMessage;
expect(msg.variableHeader.messageIdentifier, 2);
expect(msg.payload.subscriptions.length, 1);
expect(msg.payload.subscriptions.first.rawTopic, topic);
expect(subs.pendingUnsubscriptions[2]!.first.topic.rawTopic, topic);
});
test('Unsubscription list request creates pending unsubscription', () {
final clientEventBus = events.EventBus();
final testCHS = TestConnectionHandlerSend(clientEventBus,
Expand Down Expand Up @@ -791,9 +847,9 @@ void main() {
void unsubCallback(MqttSubscription subscription) {
expect(subscription.topic.rawTopic, 'testtopic');
expect(subscription.reasonCode, MqttSubscribeReasonCode.grantedQos0);
expect(subscription.userProperties!.length, 1);
expect(subscription.userProperties![0].pairName, 'abc');
expect(subscription.userProperties![0].pairValue, 'def');
expect(subscription.userProperties.length, 1);
expect(subscription.userProperties[0].pairName, 'abc');
expect(subscription.userProperties[0].pairValue, 'def');
cbCalled = true;
}

Expand Down
Loading