Skip to content

fix(connect): log exception message when rejecting session proposals #148

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
robinbraemer merged 1 commit into from
Aug 21, 2026
Merged

fix(connect): log exception message when rejecting session proposals #148

Show file tree
Hide file tree
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
9 changes: 7 additions & 2 deletions core/src/main/java/com/minekube/connect/register/WatcherRegister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,9 +315,14 @@ public void onProposal(SessionProposal proposal) {
).connect();
} catch (RuntimeException e) {
reject(proposal, rejectionStatus(e));
logger.warn("Rejected one Connect session proposal (category={}); " +
logger.warn("Rejected one Connect session proposal (category={}, message={}); " +
"keeping WatchService active",
e.getClass().getSimpleName());
e.getClass().getSimpleName(), e.getMessage());
if (logger.isDebug()) {
logger.debug("Rejected one Connect session proposal (category={}, " +
"message={}); keeping WatchService active",
e.getClass().getSimpleName(), e.getMessage(), e);
}
} catch (Error e) {
reject(proposal, rejectionStatus(e));
throw e;
Expand Down
47 changes: 47 additions & 0 deletions core/src/test/java/com/minekube/connect/register/WatcherRegisterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
Expand All @@ -27,13 +28,15 @@
import com.minekube.connect.config.ConnectConfig;
import com.minekube.connect.tunnel.p2p.Libp2pEndpoint;
import com.minekube.connect.tunnel.Tunneler;
import com.minekube.connect.util.MessageFormatter;
import com.minekube.connect.watch.SessionProposal;
import com.minekube.connect.watch.WatchBootstrap;
import com.minekube.connect.watch.WatchClient;
import com.minekube.connect.watch.Watcher;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -439,6 +442,50 @@ void invalidWatchProposalCancelsPrivateAdmissionImmediately() throws Exception {
}
}

@Test
void rejectedProposalWarnCarriesTheExceptionMessage() throws Exception {
BedrockAdmissionCoordinator coordinator = new BedrockAdmissionCoordinator(
new VerifiedBedrockIdentityRegistry());
try {
Fixture fixture = newFixture(coordinator);
ConnectLogger logger = (ConnectLogger) getField(fixture.register, "logger");
List<String> warns = new ArrayList<>();
doAnswer(invocation -> {
Object[] raw = invocation.getRawArguments();
warns.add(MessageFormatter.format((String) raw[0], (Object[]) raw[1]));
return null;
}).when(logger).warn(anyString(), any(Object[].class));

register = fixture.register;
register.start();
ArgumentCaptor<Watcher> watcher = ArgumentCaptor.forClass(Watcher.class);
verify(fixture.watchClient).watch(watcher.capture());
Session session = Session.newBuilder()
.setId("session-warn-message")
.setTunnelServiceAddr("wss://tunnel.example")
.setPlayer(Player.newBuilder()
.setAddr("127.0.0.1")
.setProfile(GameProfile.newBuilder()
.setId("00000000-0000-0000-0000-000000000001")
.setName("Player")))
.build();
SessionProposal superseded = coordinator.proposal(
session, reason -> {}, "endpoint-1", "org-1");
SessionProposal current = coordinator.proposal(
session, reason -> {}, "endpoint-1", "org-1");

watcher.getValue().onProposal(superseded);

assertFalse(warns.isEmpty(), "expected a proposal-rejection WARN");
assertTrue(warns.stream().anyMatch(w -> w.contains("IllegalStateException")
&& w.contains("expired or been superseded")),
"WARN must carry the exception message, got: " + warns);
coordinator.discard(current);
} finally {
coordinator.close();
}
}

@Test
void supersededProposalIsRejectedWithoutClosingTheWatchStream() throws Exception {
BedrockAdmissionCoordinator coordinator = new BedrockAdmissionCoordinator(
Expand Down
Loading