aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar/forward
diff options
context:
space:
mode:
authorSupriyo <hisupriyooo@gmail.com>2024-03-16 12:36:48 +0530
committerSupriyo <hisupriyooo@gmail.com>2024-03-16 12:36:48 +0530
commit22b0611d9c00e70f4b70787e314075afcd4538ec (patch)
tree3052870bf30b4fcc4aee5f30a40b74eb82f19ad6 /src/main/java/org/traccar/forward
parent87df697b992234caa6e89229dd7fe1ee194859f5 (diff)
downloadtrackermap-server-22b0611d9c00e70f4b70787e314075afcd4538ec.tar.gz
trackermap-server-22b0611d9c00e70f4b70787e314075afcd4538ec.tar.bz2
trackermap-server-22b0611d9c00e70f4b70787e314075afcd4538ec.zip
feat: refractor mqtt utils to MqttClient like EmqxClient
Diffstat (limited to 'src/main/java/org/traccar/forward')
-rw-r--r--src/main/java/org/traccar/forward/EventForwarderMqtt.java10
-rw-r--r--src/main/java/org/traccar/forward/MqttClient.java76
-rw-r--r--src/main/java/org/traccar/forward/PositionForwarderMqtt.java9
3 files changed, 82 insertions, 13 deletions
diff --git a/src/main/java/org/traccar/forward/EventForwarderMqtt.java b/src/main/java/org/traccar/forward/EventForwarderMqtt.java
index 83df795b1..7d1c7dd3c 100644
--- a/src/main/java/org/traccar/forward/EventForwarderMqtt.java
+++ b/src/main/java/org/traccar/forward/EventForwarderMqtt.java
@@ -17,22 +17,20 @@ package org.traccar.forward;
import org.traccar.config.Config;
import org.traccar.config.Keys;
-import org.traccar.helper.MqttUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient;
public class EventForwarderMqtt implements EventForwarder {
- private final Mqtt5AsyncClient client;
+ private final MqttClient mqttClient;
private final ObjectMapper objectMapper;
private final String topic;
public EventForwarderMqtt(Config config, ObjectMapper objectMapper) {
this.topic = config.getString(Keys.EVENT_FORWARD_TOPIC);
- client = MqttUtil.createClient(config.getString(Keys.EVENT_FORWARD_URL));
+ mqttClient = new MqttClient(config.getString(Keys.FORWARD_URL));
this.objectMapper = objectMapper;
}
@@ -41,12 +39,10 @@ public class EventForwarderMqtt implements EventForwarder {
String payload;
try {
payload = objectMapper.writeValueAsString(eventData);
+ mqttClient.publish(topic, payload, (message, e) -> resultHandler.onResult(e == null, e));
} catch (JsonProcessingException e) {
resultHandler.onResult(false, e);
- return;
}
-
- MqttUtil.publish(client, topic, payload, (message, e) -> resultHandler.onResult(e == null, e));
}
}
diff --git a/src/main/java/org/traccar/forward/MqttClient.java b/src/main/java/org/traccar/forward/MqttClient.java
new file mode 100644
index 000000000..9059fc876
--- /dev/null
+++ b/src/main/java/org/traccar/forward/MqttClient.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2023 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.forward;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.UUID;
+import java.util.function.BiConsumer;
+
+import com.hivemq.client.mqtt.datatypes.MqttQos;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientBuilder;
+import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth;
+import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult;
+
+public class MqttClient {
+ private final Mqtt5AsyncClient client;
+ MqttClient(String url) {
+ URI uri;
+ try {
+ uri = new URI(url);
+ } catch (URISyntaxException e) {
+ throw new RuntimeException(e);
+ }
+
+ Mqtt5SimpleAuth simpleAuth = this.getSimpleAuth(uri);
+
+ String host = uri.getHost();
+ int port = uri.getPort();
+ Mqtt5ClientBuilder builder = Mqtt5Client.builder().identifier("traccar-" + UUID.randomUUID())
+ .serverHost(host).serverPort(port).simpleAuth(simpleAuth).automaticReconnectWithDefaultConfig();
+
+ client = builder.buildAsync();
+ client.connectWith().send().whenComplete((message, e) -> {
+ throw new RuntimeException(e);
+ });
+ }
+
+
+ private Mqtt5SimpleAuth getSimpleAuth(final URI uri) {
+ String userInfo = uri.getUserInfo();
+ Mqtt5SimpleAuth simpleAuth = null;
+ if (userInfo != null) {
+ int delimiter = userInfo.indexOf(':');
+ if (delimiter == -1) {
+ throw new IllegalArgumentException("Wrong MQTT credentials. Should be in format \"username:password\"");
+ } else {
+ simpleAuth = Mqtt5SimpleAuth.builder().username(userInfo.substring(0, delimiter++))
+ .password(userInfo.substring(delimiter).getBytes()).build();
+ }
+ }
+ return simpleAuth;
+ }
+
+ public void publish(final String pubTopic, final String payload,
+ final BiConsumer<? super Mqtt5PublishResult,
+ ? super Throwable> whenComplete) {
+ client.publishWith().topic(pubTopic).qos(MqttQos.AT_LEAST_ONCE).payload(payload.getBytes()).send()
+ .whenComplete(whenComplete);
+ }
+
+}
diff --git a/src/main/java/org/traccar/forward/PositionForwarderMqtt.java b/src/main/java/org/traccar/forward/PositionForwarderMqtt.java
index a6d0965b8..a22c3bee6 100644
--- a/src/main/java/org/traccar/forward/PositionForwarderMqtt.java
+++ b/src/main/java/org/traccar/forward/PositionForwarderMqtt.java
@@ -17,14 +17,12 @@ package org.traccar.forward;
import org.traccar.config.Config;
import org.traccar.config.Keys;
-import org.traccar.helper.MqttUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient;
public class PositionForwarderMqtt implements PositionForwarder {
- private final Mqtt5AsyncClient client;
+ private final MqttClient mqttClient;
@Override
public void forward(final PositionData positionData, final ResultHandler resultHandler) {
@@ -37,7 +35,7 @@ public class PositionForwarderMqtt implements PositionForwarder {
public PositionForwarderMqtt(final Config config, final ObjectMapper objectMapper) {
this.topic = config.getString(Keys.FORWARD_TOPIC);
- this.client = MqttUtil.createClient(config.getString(Keys.FORWARD_URL));
+ mqttClient = new MqttClient(config.getString(Keys.FORWARD_URL));
this.objectMapper = objectMapper;
}
@@ -45,11 +43,10 @@ public class PositionForwarderMqtt implements PositionForwarder {
final String payload;
try {
payload = objectMapper.writeValueAsString(object);
+ mqttClient.publish(pubTopic, payload, (message, e) -> resultHandler.onResult(e == null, e));
} catch (JsonProcessingException e) {
resultHandler.onResult(false, e);
- return;
}
- MqttUtil.publish(client, pubTopic, payload, (message, e) -> resultHandler.onResult(e == null, e));
}
}