Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

MQTT Broker re-connect handling improvements

Rich Turner728fc807b1e9
diff --git a/manager/src/main/java/org/openremote/manager/apps/ConsoleAppResourceImpl.java b/manager/src/main/java/org/openremote/manager/apps/ConsoleAppResourceImpl.java
index 8c3d69768..9579a9aa6 100644
--- a/manager/src/main/java/org/openremote/manager/apps/ConsoleAppResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/apps/ConsoleAppResourceImpl.java
@@ -20,16 +20,17 @@
package org.openremote.manager.apps;
import org.openremote.container.web.WebResource;
-import org.openremote.model.Constants;
import org.openremote.model.apps.ConsoleAppConfig;
import org.openremote.model.apps.ConsoleAppResource;
import org.openremote.model.http.RequestParams;
+import org.openremote.model.util.ValueUtil;
import javax.ws.rs.BeanParam;
+import javax.ws.rs.NotFoundException;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
-import java.net.URI;
-import java.nio.file.Paths;
+import java.io.IOException;
+import java.nio.file.Files;
public class ConsoleAppResourceImpl extends WebResource implements ConsoleAppResource {
@@ -51,11 +52,31 @@ public class ConsoleAppResourceImpl extends WebResource implements ConsoleAppRes
}
}
- // Left here as android console stops working once this is removed
+ // Left here as android console stops working once this is removed and it won't follow redirects
@Override
public ConsoleAppConfig getAppConfig(RequestParams requestParams) {
- return consoleAppService.getAppConfig(getRequestRealm());
-// String realm = getRequestRealm() != null ? getRequestRealm() : Constants.MASTER_REALM;
-// return Response.seeOther(URI.create("../" + ConsoleAppService.CONSOLE_APP_CONFIG_PATH + "/" + realm + ".json")).build();
+ return getAppConfig(getRequestRealm());
+ }
+
+ @Deprecated
+ protected ConsoleAppConfig getAppConfig(String realm) {
+ try {
+ if (!Files.isDirectory(consoleAppService.consoleAppDocRoot)) {
+ return null;
+ }
+
+ return Files.list(consoleAppService.consoleAppDocRoot)
+ .filter(dir -> dir.getFileName().toString().startsWith(realm))
+ .map(dir -> {
+ try {
+ return ValueUtil.JSON.readValue(dir.toFile(), ConsoleAppConfig.class);
+ } catch (IOException e) {
+ throw new WebApplicationException(e);
+ }
+ })
+ .findFirst().orElseThrow(NotFoundException::new);
+ } catch (IOException e) {
+ throw new WebApplicationException(e);
+ }
}
}
diff --git a/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java b/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java
index 0aee4f679..6c074ffa2 100644
--- a/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java
+++ b/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java
@@ -56,7 +56,7 @@ public class ConsoleAppService implements ContainerService {
protected ManagerWebService managerWebService;
protected ManagerIdentityService identityService;
protected PersistenceService persistenceService;
- protected Path consoleAppDocRoot;
+ Path consoleAppDocRoot;
@Override
public void init(Container container) throws Exception {
@@ -101,28 +101,6 @@ public class ConsoleAppService implements ContainerService {
.toArray(String[]::new);
}
- @Deprecated
- public ConsoleAppConfig getAppConfig(String realm) {
- try {
- if (!Files.isDirectory(consoleAppDocRoot)) {
- return null;
- }
-
- return Files.list(consoleAppDocRoot)
- .filter(dir -> dir.getFileName().toString().startsWith(realm))
- .map(dir -> {
- try {
- return ValueUtil.JSON.readValue(dir.toFile(), ConsoleAppConfig.class);
- } catch (IOException e) {
- throw new WebApplicationException(e);
- }
- })
- .findFirst().orElseThrow(NotFoundException::new);
- } catch (IOException e) {
- throw new WebApplicationException(e);
- }
- }
-
@Override
public String toString() {
return getClass().getSimpleName() + "{" +
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java
index ebc776737..6d4b09a81 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java
@@ -119,10 +119,22 @@ public class DefaultMQTTHandler extends MQTTHandler {
public void onConnect(MqttConnection connection, InterceptConnectMessage msg) {
super.onConnect(connection, msg);
+ // Moquette is awful and client ID rather than socket descriptors are used everywhere so cannot distinguish
+ // between multiple connections using the same client ID
+ // Force disconnect any existing session that is using this client ID
+ clientEventService.closeSession(connection.getClientId());
+
+ // Clear existing subscriptions by sending session close message
Map<String, Object> headers = prepareHeaders(connection);
+ headers.put(ConnectionConstants.SESSION_CLOSE, true);
+ messageBrokerService.getProducerTemplate().sendBodyAndHeaders(ClientEventService.CLIENT_EVENT_QUEUE, null, headers);
+
+ headers.remove(ConnectionConstants.SESSION_CLOSE);
headers.put(ConnectionConstants.SESSION_OPEN, true);
+
// Put a close connection runnable into the headers for the client event service
- Runnable closeRunnable = () -> mqttBrokerService.forceDisconnect(connection.getClientId());
+ // Get the current session which is specific to the current connection
+ Runnable closeRunnable = mqttBrokerService.getForceDisconnectRunnable(connection.getClientId());
headers.put(ConnectionConstants.SESSION_TERMINATOR, closeRunnable);
messageBrokerService.getProducerTemplate().sendBodyAndHeaders(ClientEventService.CLIENT_EVENT_QUEUE, null, headers);
LOG.fine("Connected: " + connection);
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
index 3aec5f963..33033997c 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
@@ -297,7 +297,7 @@ public class MqttBrokerService extends RouteBuilder implements ContainerService,
return sessionRegistry;
}
- protected Object getSession(String clientId) {
+ Object getSession(String clientId) {
if (mqttBroker == null) {
return null;
}
@@ -314,9 +314,20 @@ public class MqttBrokerService extends RouteBuilder implements ContainerService,
return null;
}
+ public Runnable getForceDisconnectRunnable(String clientId) {
+ MqttConnection connection = getConnection(clientId);
+ Object session = getSession(clientId);
+
+ return () -> doForceDisconnect(connection, session);
+ }
+
public void forceDisconnect(String clientId) {
MqttConnection connection = getConnection(clientId);
Object session = getSession(clientId);
+ doForceDisconnect(connection, session);
+ }
+
+ protected void doForceDisconnect(MqttConnection connection, Object session) {
if (connection == null || session == null) {
return;
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java
index 6eaff6dbf..b2baf1e93 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java
@@ -28,6 +28,8 @@ import org.openremote.container.timer.TimerService;
import org.openremote.manager.security.ManagerKeycloakIdentityProvider;
import org.openremote.model.syslog.SyslogCategory;
+import java.util.HashMap;
+import java.util.WeakHashMap;
import java.util.logging.Logger;
import static org.openremote.model.syslog.SyslogCategory.API;
@@ -39,6 +41,7 @@ public class ORInterceptHandler extends AbstractInterceptHandler {
protected final MessageBrokerService messageBrokerService;
protected final ManagerKeycloakIdentityProvider identityProvider;
protected final TimerService timerService;
+ protected final WeakHashMap<String, MqttConnection> disconnectedConnections = new WeakHashMap<>();
public ORInterceptHandler(MqttBrokerService brokerService,
ManagerKeycloakIdentityProvider identityProvider,
@@ -88,21 +91,45 @@ public class ORInterceptHandler extends AbstractInterceptHandler {
@Override
public void onDisconnect(InterceptDisconnectMessage msg) {
- MqttConnection connection = brokerService.clearConnectionSession(msg.getClientID());
+ MqttConnection connection;
+ synchronized (disconnectedConnections) {
+ connection = disconnectedConnections.remove(msg.getClientID());
+ }
if (connection != null) {
// No topic info here so just notify all custom handlers
- brokerService.getCustomHandlers().forEach(customHandler -> customHandler.onDisconnect(connection, msg));
+ MqttConnection finalConnection = connection;
+ brokerService.getCustomHandlers().forEach(customHandler -> customHandler.onDisconnect(finalConnection, msg));
+ } else {
+ connection = brokerService.clearConnectionSession(msg.getClientID());
+
+ // Store weak reference to connection for onConnectionLost
+ synchronized (disconnectedConnections) {
+ disconnectedConnections.put(msg.getClientID(), connection);
+ }
}
}
@Override
public void onConnectionLost(InterceptConnectionLostMessage msg) {
- MqttConnection connection = brokerService.clearConnectionSession(msg.getClientID());
+ // This can fire after onConnect which causes the connection to be removed; seems that onDisconnect also gets
+ // called when connection is lost and that is called first and before onConnect so we'll just use that for now
+ MqttConnection connection;
+ synchronized (disconnectedConnections) {
+ connection = disconnectedConnections.remove(msg.getClientID());
+ }
if (connection != null) {
// No topic info here so just notify all custom handlers
- brokerService.getCustomHandlers().forEach(customHandler -> customHandler.onConnectionLost(connection, msg));
+ MqttConnection finalConnection = connection;
+ brokerService.getCustomHandlers().forEach(customHandler -> customHandler.onConnectionLost(finalConnection, msg));
+ } else {
+ connection = brokerService.clearConnectionSession(msg.getClientID());
+
+ // Store weak reference to connection for onDisconnect
+ synchronized (disconnectedConnections) {
+ disconnectedConnections.put(msg.getClientID(), connection);
+ }
}
}