Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package gr.cytech.sendium.core.smpp.server;

import gr.cytech.sendium.core.message.StandardMessage;
import gr.cytech.sendium.core.worker.InMemoryDlrService;
import gr.cytech.sendium.core.worker.MessageState;
import jakarta.inject.Inject;
import org.slf4j.Logger;
Expand Down Expand Up @@ -54,8 +55,48 @@ public Future<Boolean> persistMessages(List<InEvent<StandardMessage>> eventsQueu

@Override
public boolean markAsUnpushed(StandardMessage msg) {
logger.info("markAsUnpushed message {}", msg);
return true;
if (msg == null || msg.type != StandardMessage.MSG_DLR) {
return false;
}

try {
boolean saved = getDlrService().saveUnpushedDlr(msg);
if (!saved) {
logger.warn("Failed to save unpushed DLR: {}", msg);
}
return saved;
} catch (Exception e) {
logger.warn("Exception while saving unpushed DLR: {}", msg, e);
return false;
}
}

@Override
public void onClientConnected(String systemId) {
InMemoryDlrService dlrService = getDlrService();
List<StandardMessage> unpushedDlrs = dlrService.claimUnpushedDlrs(systemId);
if (unpushedDlrs.isEmpty()) {
logger.info("Unpushed DLR(s) not found for systemId:{}", systemId);
return;
}

logger.info("Re-enqueuing {} unpushed DLR(s) for systemId:{}", unpushedDlrs.size(), systemId);
for (StandardMessage msg : unpushedDlrs) {
try {
if (worker.enqueueNoExceptions(msg)) {
dlrService.removeUnpushedDlr(msg);
} else {
dlrService.releaseUnpushedDlrClaim(msg);
}
} catch (Exception e) {
dlrService.releaseUnpushedDlrClaim(msg);
logger.warn("Failed to re-enqueue unpushed DLR: {}", msg, e);
}
}
}

private InMemoryDlrService getDlrService() {
return worker.getWorkerResources().getDlrService();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,13 @@ public void sessionCreated(

logger.info("Session created for account ID: {}", accountId);
session.serverReady(handler);
try {
if (worker.getMessageStore() != null) {
worker.getMessageStore().onClientConnected(handler.getSystemId());
}
} catch (Exception e) {
logger.warn("Failed to process unpushed DLRs for systemId:{}", handler.getSystemId(), e);
}
}

public void sessionDestroyed(Long sessionId, SmppServerSession session) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ public interface SmppServerMessageStore<M extends StandardMessage> {
*/
boolean markAsUnpushed(M msg);

/**
* Called when a transmittable SMPP client session becomes available again.
*/
default void onClientConnected(String systemId) {
}

/**
* Fetch the maximum allowed attempts for a message.
*/
Expand Down
Loading
Loading