feat: add configuration for event forwarding with mqtt

4 files changed, 152 insertions, 70 deletions

diff --git a/src/main/java/org/traccar/MainModule.java b/src/main/java/org/traccar/MainModule.java
index 3fec4d1e6..c3c3586be 100644
--- a/src/main/java/org/traccar/MainModule.java
+++ b/src/main/java/org/traccar/MainModule.java
@@ -35,17 +35,7 @@ import org.traccar.config.Keys;
 import org.traccar.database.LdapProvider;
 import org.traccar.database.OpenIdProvider;
 import org.traccar.database.StatisticsManager;
-import org.traccar.forward.EventForwarder;
-import org.traccar.forward.EventForwarderJson;
-import org.traccar.forward.EventForwarderAmqp;
-import org.traccar.forward.EventForwarderKafka;
-import org.traccar.forward.EventForwarderMqtt;
-import org.traccar.forward.PositionForwarder;
-import org.traccar.forward.PositionForwarderJson;
-import org.traccar.forward.PositionForwarderAmqp;
-import org.traccar.forward.PositionForwarderKafka;
-import org.traccar.forward.PositionForwarderRedis;
-import org.traccar.forward.PositionForwarderUrl;
+import org.traccar.forward.*;
 import org.traccar.geocoder.AddressFormat;
 import org.traccar.geocoder.BanGeocoder;
 import org.traccar.geocoder.BingMapsGeocoder;
@@ -386,6 +376,8 @@ public class MainModule extends AbstractModule {
                     return new PositionForwarderAmqp(config, objectMapper);
                 case "kafka":
                     return new PositionForwarderKafka(config, objectMapper);
+                case "mqtt":
+                    return new PositionForwarderMqtt(config, objectMapper);
                 case "redis":
                     return new PositionForwarderRedis(config, objectMapper);
                 case "url":
diff --git a/src/main/java/org/traccar/forward/EventForwarderMqtt.java b/src/main/java/org/traccar/forward/EventForwarderMqtt.java
index 7f4e29384..90e8500ea 100644
--- a/src/main/java/org/traccar/forward/EventForwarderMqtt.java
+++ b/src/main/java/org/traccar/forward/EventForwarderMqtt.java
@@ -15,86 +15,38 @@
  */
 package org.traccar.forward;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-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.message.auth.Mqtt5SimpleAuth;
 import org.traccar.config.Config;
 import org.traccar.config.Keys;
+import org.traccar.helper.MqttUtil;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.UUID;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient;
 
 public class EventForwarderMqtt implements EventForwarder {
 
-    private final Mqtt5AsyncClient client;
+    private final Mqtt3AsyncClient client;
     private final ObjectMapper objectMapper;
 
     private final String topic;
 
     public EventForwarderMqtt(Config config, ObjectMapper objectMapper) {
-        URI url;
-        try {
-            url = new URI(config.getString(Keys.EVENT_FORWARD_URL));
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
-
-        String userInfo = url.getUserInfo();
-        Mqtt5SimpleAuth simpleAuth = null;
-        if (userInfo != null) {
-            int delimiter = userInfo.indexOf(':');
-            if (delimiter == -1) {
-                throw new IllegalArgumentException("Wrong credentials. Should be in format \"username:password\"");
-            } else {
-                simpleAuth = Mqtt5SimpleAuth.builder()
-                        .username(userInfo.substring(0, delimiter++))
-                        .password(userInfo.substring(delimiter).getBytes())
-                        .build();
-            }
-        }
-
-        String host = url.getHost();
-        int port = url.getPort();
-        client = Mqtt5Client.builder()
-                .identifier("traccar-" + UUID.randomUUID())
-                .serverHost(host)
-                .serverPort(port)
-                .simpleAuth(simpleAuth)
-                .automaticReconnectWithDefaultConfig()
-                .buildAsync();
-
-        client.connectWith()
-                .send()
-                .whenComplete((message, e) -> {
-                    if (e != null) {
-                        throw new RuntimeException(e);
-                    }
-                });
-
+        this.topic = config.getString(Keys.EVENT_FORWARD_TOPIC);
+        client = MqttUtil.createClient(config.getString(Keys.EVENT_FORWARD_URL));
         this.objectMapper = objectMapper;
-        topic = config.getString(Keys.EVENT_FORWARD_TOPIC);
     }
 
     @Override
     public void forward(EventData eventData, ResultHandler resultHandler) {
-        byte[] payload;
+        String payload;
         try {
-            payload = objectMapper.writeValueAsString(eventData).getBytes();
+            payload = objectMapper.writeValueAsString(eventData);
         } catch (JsonProcessingException e) {
             resultHandler.onResult(false, e);
             return;
         }
 
-        client.publishWith()
-                .topic(topic)
-                .qos(MqttQos.AT_LEAST_ONCE)
-                .payload(payload)
-                .send()
-                .whenComplete((message, e) -> resultHandler.onResult(e == null, e));
+        MqttUtil.publish(client, topic, payload, (message, e) -> resultHandler.onResult(e == null, e));
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/traccar/forward/PositionForwarderMqtt.java b/src/main/java/org/traccar/forward/PositionForwarderMqtt.java
new file mode 100644
index 000000000..e530c76a1
--- /dev/null
+++ b/src/main/java/org/traccar/forward/PositionForwarderMqtt.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2022 - 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 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.mqtt3.Mqtt3AsyncClient;
+
+public class PositionForwarderMqtt implements PositionForwarder {
+    private final Mqtt3AsyncClient client;
+
+    @Override
+    public void forward(final PositionData positionData, final ResultHandler resultHandler) {
+        publish(topic, positionData, resultHandler);
+    }
+    private final ObjectMapper objectMapper;
+
+    protected final String topic;
+
+
+    public PositionForwarderMqtt(final Config config, final ObjectMapper objectMapper) {
+        this.topic = config.getString(Keys.FORWARD_TOPIC);
+        this.client = MqttUtil.createClient(config.getString(Keys.FORWARD_URL));
+        this.objectMapper = objectMapper;
+    }
+
+    protected void publish(final String pubTopic, final Object object, final ResultHandler resultHandler) {
+        final String payload;
+        try {
+            payload = objectMapper.writeValueAsString(object);
+        } catch (JsonProcessingException e) {
+            resultHandler.onResult(false, e);
+            return;
+        }
+        MqttUtil.publish(client, pubTopic, payload, (message, e) -> resultHandler.onResult(e == null, e));
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/traccar/helper/MqttUtil.java b/src/main/java/org/traccar/helper/MqttUtil.java
new file mode 100644
index 000000000..54167f65c
--- /dev/null
+++ b/src/main/java/org/traccar/helper/MqttUtil.java
@@ -0,0 +1,83 @@
+/*
+ * 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.helper;
+
+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.mqtt3.Mqtt3AsyncClient;
+import com.hivemq.client.mqtt.mqtt3.Mqtt3Client;
+import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientBuilder;
+import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth;
+import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish;
+
+public final class MqttUtil {
+
+    private MqttUtil() {
+
+    }
+
+    public static Mqtt3AsyncClient createClient(final String url) {
+        URI uri;
+        try {
+            uri = new URI(url);
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+
+        final Mqtt3SimpleAuth simpleAuth = getSimpleAuth(uri);
+
+        final String host = uri.getHost();
+        final int port = uri.getPort();
+        final Mqtt3ClientBuilder builder = Mqtt3Client.builder().identifier("traccar-" + UUID.randomUUID())
+                .serverHost(host).serverPort(port).simpleAuth(simpleAuth).automaticReconnectWithDefaultConfig();
+        final Mqtt3AsyncClient client;
+        
+        client = builder.buildAsync();
+        
+
+        client.connectWith().send().whenComplete((message, e) -> {
+            throw new RuntimeException(e);
+        });
+
+        return client;
+    }
+
+    private static Mqtt3SimpleAuth getSimpleAuth(final URI uri) {
+        final String userInfo = uri.getUserInfo();
+        Mqtt3SimpleAuth 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 = Mqtt3SimpleAuth.builder().username(userInfo.substring(0, delimiter++))
+                        .password(userInfo.substring(delimiter).getBytes()).build();
+            }
+        }
+        return simpleAuth;
+    }
+
+    public static void publish(final Mqtt3AsyncClient client, final String pubTopic, final String payload,
+            final BiConsumer<? super Mqtt3Publish, ? super Throwable> whenComplete) {
+        client.publishWith().topic(pubTopic).qos(MqttQos.AT_LEAST_ONCE).payload(payload.getBytes()).send()
+                .whenComplete(whenComplete);
+    }
+
+}
\ No newline at end of file