Skip to content

Improve GOPACKS exception handling #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wborn merged 1 commit into from
Jan 15, 2026
Merged

Improve GOPACKS exception handling #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 42 additions & 23 deletions ems/src/main/java/org/openremote/extension/ems/manager/gopacs/GOPACSHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.databind.DeserializationFeature;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.Application;
import jakarta.ws.rs.core.GenericType;
import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.jboss.resteasy.client.jaxrs.ResteasyClient;
import org.lfenergy.shapeshifter.api.*;
import org.lfenergy.shapeshifter.api.model.UftpParticipantInformation;
import org.lfenergy.shapeshifter.core.common.exception.UftpConnectorException;
import org.lfenergy.shapeshifter.core.common.xml.XmlSerializer;
import org.lfenergy.shapeshifter.core.common.xsd.XsdFactory;
import org.lfenergy.shapeshifter.core.common.xsd.XsdSchemaFactoryPool;
Expand Down Expand Up @@ -484,30 +486,47 @@ protected long calculatePower(FlexRequestISPType requestIsp) {
}

protected void processRawMessage(String transportXml) {
SignedMessage signedMessage = serializer.fromSignedXml(transportXml);
String payloadXml = cryptoService.verifySignedMessage(signedMessage);
PayloadMessageType payloadMessage = serializer.fromPayloadXml(payloadXml);
var incomingUftpMessage = IncomingUftpMessage.create(new UftpParticipant(signedMessage), payloadMessage, transportXml, payloadXml);
notifyNewIncomingMessage(incomingUftpMessage);

// Send response delayed to ensure HTTP response is sent first
scheduledExecutorService.schedule(() -> {
uftpReceivedMessageService.process(incomingUftpMessage);
}, this.responseDelaySeconds, TimeUnit.SECONDS); // 10s delay to ensure HTTP response is sent

// Check if the message is a FlexRequest and schedule sendFlexOffer with delay
if (payloadMessage instanceof FlexRequest) {
UftpParticipant participant = new UftpParticipant(signedMessage);
FlexRequest flexRequest = (FlexRequest) payloadMessage;

// Schedule FlexOffer to be sent after a short delay to ensure HTTP response is sent first
try {
SignedMessage signedMessage = serializer.fromSignedXml(transportXml);
String payloadXml = cryptoService.verifySignedMessage(signedMessage);
PayloadMessageType payloadMessage = serializer.fromPayloadXml(payloadXml);
var incomingUftpMessage = IncomingUftpMessage.create(new UftpParticipant(signedMessage), payloadMessage, transportXml, payloadXml);
notifyNewIncomingMessage(incomingUftpMessage);

// Send response delayed to ensure HTTP response is sent first
scheduledExecutorService.schedule(() -> {
try {
sendFlexOffer(participant, flexRequest);
} catch (Exception e) {
LOG.log(Level.SEVERE, "Error sending delayed FlexOffer", e);
}
}, this.flexOfferDelaySeconds, TimeUnit.SECONDS); // 30s delay to ensure FlexRequestResponse is sent and processed by the other party
uftpReceivedMessageService.process(incomingUftpMessage);
}, this.responseDelaySeconds, TimeUnit.SECONDS); // 10s delay to ensure HTTP response is sent

// Check if the message is a FlexRequest and schedule sendFlexOffer with delay
if (payloadMessage instanceof FlexRequest flexRequest) {
UftpParticipant participant = new UftpParticipant(signedMessage);

// Schedule FlexOffer to be sent after a short delay to ensure HTTP response is sent first
scheduledExecutorService.schedule(() -> {
try {
sendFlexOffer(participant, flexRequest);
} catch (Exception e) {
LOG.log(Level.SEVERE, "Error sending delayed FlexOffer", e);
}
}, this.flexOfferDelaySeconds, TimeUnit.SECONDS); // 30s delay to ensure FlexRequestResponse is sent and processed by the other party
}
} catch (UftpConnectorException e) {
LOG.log(Level.SEVERE, "Error processing raw message", e);
Throwable rootCause = e;
while (rootCause.getCause() != null && rootCause.getCause() != rootCause) {
rootCause = rootCause.getCause();
}
String errorMessage = rootCause.getMessage();
if (errorMessage == null) {
errorMessage = "Invalid message format";
}
throw new WebApplicationException(errorMessage, Response.Status.BAD_REQUEST);
} catch (Exception e) {
LOG.log(Level.SEVERE, "Error processing raw message", e);
// Do not expose internal exception details to the client
String errorMessage = "Internal server error occurred";
throw new WebApplicationException(errorMessage, Response.Status.INTERNAL_SERVER_ERROR);
}
}

Expand Down
Loading