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

[MX42-345] Add QualityOfService at publishing/subscribing of AT_LEAST… #135

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[MX42-345] Add QualityOfService at publishing/subscribing of AT_LEAST… #135

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
4 changes: 3 additions & 1 deletion gaia-sdk-java/gaia-sdk-mqtt/src/main/kotlin/gaia/sdk/mqtt/MqttSensorQueue.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package gaia.sdk.mqtt
import com.fasterxml.jackson.databind.ObjectMapper
import com.hivemq.client.mqtt.MqttGlobalPublishFilter.SUBSCRIBED
import com.hivemq.client.mqtt.MqttWebSocketConfig
import com.hivemq.client.mqtt.datatypes.MqttQos
import com.hivemq.client.mqtt.lifecycle.MqttClientAutoReconnect
import com.hivemq.client.mqtt.mqtt5.Mqtt5Client
import com.hivemq.client.mqtt.mqtt5.Mqtt5RxClient
Expand Down Expand Up @@ -72,7 +73,7 @@ class MqttSensorQueue(private val options: QueueOptions) : ISensorQueue {

override fun subscribe(type: IQueueType, header: QueueHeader, consumer: (QueuePayload<ByteArray>) -> Unit): Completable {
return client.subscribeWith()
.topicFilter(getTopic(type, header)).noLocal(true)
.topicFilter(getTopic(type, header)).noLocal(true).qos(MqttQos.AT_LEAST_ONCE)
.applySubscribe()
.timeout(options.subscribeTimeout, TimeUnit.SECONDS)
.doOnSuccess {
Expand All @@ -99,6 +100,7 @@ class MqttSensorQueue(private val options: QueueOptions) : ISensorQueue {
override fun publish(type: IQueueType, header: QueueHeader, payload: QueuePayload<ByteArray>): Completable {
val publish = Mqtt5Publish.builder()
.topic(getTopic(type, header))
.qos(MqttQos.AT_LEAST_ONCE)
.userProperties()
.add("identityId", header.identityId.toString())
.add("userId", options.userId)
Expand Down
4 changes: 2 additions & 2 deletions gaia-sdk-javascript/src/mqtt/MqttSensorQueue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class MqttSensorQueue {
deviceId: this.options.deviceId,
userId: this.options.userId
});
const opts: IMqttPublishOpts = {properties: {userProperties}};
const opts: IMqttPublishOpts = {properties: {userProperties}, qos: 1};
this.client.publish(topic, payloadStr, opts, this.mqttCallback(JSON.parse(payloadStr)));
}

Expand All @@ -45,7 +45,7 @@ export class MqttSensorQueue {
}
if (callback) {
console.debug('subscribe to', topic);
this.client.subscribe(topic, callback);
this.client.subscribe(topic, {qos: 1}, callback);
this.subscriptions.set(topic, callback);
}
}
Expand Down