reconnect to mqtt when connection lost (and rewrite half the mqtt code while implementing this)

Author: lolcatjpg

src/main/kotlin/gent/zeus/guitar/mqtt/Mqtt.kt

@@ -5,6 +5,7 @@ import gent.zeus.guitar.StartupCheckResult
 import org.springframework.boot.ApplicationArguments
 import org.springframework.boot.ApplicationRunner
 import org.springframework.stereotype.Component
+import java.util.UUID
 
 
 internal object MqttEnv : StartupCheck {
@@ -14,7 +15,7 @@ internal object MqttEnv : StartupCheck {
     val PUBLISH_TOPIC: String? = System.getenv("MQTT_PUBLISH_TOPIC")
 
     val hostString: String get() = "tcp://$URL:$PORT"
-
+    val clientId = "GUITAR-" + UUID.randomUUID().toString()
 
     override fun checkOnStartup(): StartupCheckResult {
         val passed = with(MqttEnv) {

src/main/kotlin/gent/zeus/guitar/mqtt/MqttCallbackClient.kt

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.module.kotlin.readValue
 import gent.zeus.guitar.Logging
 import gent.zeus.guitar.data.DataProvider
 import gent.zeus.guitar.db.InMemoryTrackStore
+import org.apache.juli.logging.Log
 import org.eclipse.paho.client.mqttv3.*
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence
 import java.util.*
@@ -15,11 +16,12 @@ class MqttCallbackClient : MqttCallback {
     private val trackStore = InMemoryTrackStore()
     private val dataProvider = DataProvider(trackStore)
 
-    private lateinit var mqttClientId: String
-    private lateinit var mqttClient: MqttClient
-
-    init {
-        makeClient()
+    private var mqttClient: MqttClient = MqttClient(
+        "tcp://${MqttEnv.URL}:${MqttEnv.PORT}",
+        MqttEnv.clientId,
+        MemoryPersistence(),
+    ).apply {
+        setCallback(this@MqttCallbackClient)
     }
 
     private val publisher = MqttTrackDetailPublisher(mqttClient, dataProvider)
@@ -30,33 +32,20 @@ class MqttCallbackClient : MqttCallback {
         connectionTimeout = 10
     }
 
-    private fun makeClient() {
-        mqttClientId = "GUITAR-" + UUID.randomUUID().toString()
-        mqttClient = MqttClient(
-            "tcp://${MqttEnv.URL}:${MqttEnv.PORT}",
-            mqttClientId,
-            MemoryPersistence(),
-        ).apply {
-            setCallback(this@MqttCallbackClient)
-        }
-        Logging.log.info("mqtt: made new client with id $mqttClientId")
-    }
-
     fun connect() {
         Logging.log.info("mqtt: connecting...")
         mqttClient.connect(mqttOptions)
         mqttClient.subscribe(MqttEnv.LISTEN_TOPIC)
-        Logging.log.info("mqtt: connected to ${MqttEnv.hostString} with id $mqttClientId")
+        Logging.log.info("mqtt: connected to ${MqttEnv.hostString} with id ${MqttEnv.clientId}")
     }
 
     override fun connectionLost(cause: Throwable?) {
-        Logging.log.warn("mqtt: connection lost, reconnecting...")
-        makeClient()
+        Logging.log.warn("mqtt: connection lost, reconnecting...", cause)
         connect()
-//        reconnect()
     }
 
     override fun messageArrived(topic: String?, message: MqttMessage?) {
+        Logging.log.info("mqtt: received message on $topic")
         message ?: return
         val playingJson = try {
             val playingJson: MqttPlayingJson = with(jacksonObjectMapper()) {