Umbau MQTT

lib/model/rank.dart

@@ -0,0 +1,41 @@
+import 'package:isar/isar.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'rank.g.dart';
+
+@collection
+@JsonSerializable()
+class Ranking {
+  late Id id;
+
+  late String zip;
+
+  late String area;
+
+  late int time;
+
+  late List<Vehicle> vehicles;
+
+  Ranking();
+
+  factory Ranking.fromJson(Map<String, dynamic> json) => _$RankingFromJson(json);
+
+  Map<String, dynamic> toJson() => _$RankingToJson(this);
+}
+
+@embedded
+@JsonSerializable()
+class Vehicle {
+  late int id;
+
+  late int type;
+
+  @JsonKey(name: 'self', defaultValue: false)
+  late bool? self;
+
+  Vehicle();
+
+  factory Vehicle.fromJson(Map<String, dynamic> json) => _$VehicleFromJson(json);
+
+  Map<String, dynamic> toJson() => _$VehicleToJson(this);
+}

lib/tools/messages/refresh_badges_message.dart

@@ -0,0 +1,4 @@
+
+class RefreshBadgesMessage {
+  RefreshBadgesMessage();
+}

lib/tools/mqtt_core.dart

@@ -97,14 +97,14 @@ class MqttCore {
 
       _mqttClient = MqttServerClient.withPort(_brokerUri, clientId, _brokerPort);
       _mqttClient.logging(on: false);
-      _mqttClient.keepAlivePeriod = 20;
-      _mqttClient.autoReconnect = false;
+      _mqttClient.keepAlivePeriod = 5;
+      _mqttClient.disconnectOnNoResponsePeriod = 10;
+      _mqttClient.autoReconnect = true;
       _mqttClient.onDisconnected = _clientDisconnected;
+      _mqttClient.onAutoReconnect = _clientDisconnected;
+      _mqttClient.onAutoReconnected = _clientConnected;
       _mqttClient.connectionMessage = MqttConnectMessage()
           .withClientIdentifier(await Util.getAppUuid())
-          .withWillQos(MqttQos.atMostOnce)
-          .withWillTopic('willTopic')
-          .withWillMessage('willMessage')
           .authenticateAs("app", "apppwd");
 
       await _mqttClient.connect();
@@ -121,13 +121,9 @@ class MqttCore {
         Util.logInfo('Verbindung zum MQTT-Broker fehlgeschlagen!');
 
         MessageService().publish<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, arguments: ConnectionStatus(status: ConnectionStatusEnum.notConnected));
-
-        _startReconnectTimer();
       }
 
     } catch (ex) {
-      _startReconnectTimer();
-
       Util.logInfo('Verbindung zum MQTT-Broker fehlgeschlagen!: $ex');
 
       MessageService().publish<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, arguments: ConnectionStatus(status: ConnectionStatusEnum.notConnected));
@@ -350,7 +346,7 @@ class MqttCore {
     publishBinary(topic, gzipBytes!);
   }
 
-  void _startReconnectTimer() {
+  void _startBootstrapReconnectTimer() {
     connectionState = ConnectionStateEnum.notConnected;
 
     if (!_disconnectInProgress) {
@@ -371,17 +367,23 @@ class MqttCore {
   }
 
   void _clientDisconnected() {
-    connectionState = ConnectionStateEnum.notConnected;
-
-    _cancelTrackTimer();
-
     Util.logInfo("_clientDisconnected called");
 
-    MessageService().publish<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, arguments: ConnectionStatus(status: ConnectionStatusEnum.notConnected));
+    connectionState = ConnectionStateEnum.notConnected;
 
-    if (!_disconnectInProgress) {
-      _startReconnectTimer();
-    }
+    _startTrackTimer();
+
+    MessageService().publish<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, arguments: ConnectionStatus(status: ConnectionStatusEnum.notConnected));
+  }
+
+  void _clientConnected() {
+    Util.logInfo("_clientDisconnected called");
+
+    connectionState = ConnectionStateEnum.connected;
+
+    _initSession();
+
+    MessageService().publish<ConnectionStatus>(Constants.messageTopicConnectionStatusChanged, arguments: ConnectionStatus(status: ConnectionStatusEnum.connected));
   }
 
   void _processBootstrap() async {
@@ -405,7 +407,7 @@ class MqttCore {
 
       var jsonMap = handshakeMessage.toJson();
       var json = jsonEncode(jsonMap);
-      var uri = "https://init-x.assecutor.de/bootstrap?get_mqtt_broker=$json";
+      String uri = "https://init-x.assecutor.de/bootstrap?get_mqtt_broker=$json";
       Util.logInfo("Bootstrap request: $uri");
 
       var response = await http.get(Uri.parse(uri));
@@ -421,7 +423,7 @@ class MqttCore {
 
       _connectToBroker();
     } catch (ex) {
-      _startReconnectTimer();
+      _startBootstrapReconnectTimer();
     }
   }