-
Notifications
You must be signed in to change notification settings - Fork 1
fix(client): abandon timed-out WebSocket handshakes without blocking (#113) #115
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.
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
+63
−1
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
arcp-client/src/test/java/dev/arcp/client/WebSocketConnectTimeoutTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| package dev.arcp.client; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.assertj.core.api.Assertions.assertThatThrownBy; | ||
|
|
||
| import dev.arcp.core.wire.ArcpMapper; | ||
| import java.net.ServerSocket; | ||
| import java.net.Socket; | ||
| import java.net.URI; | ||
| import java.time.Duration; | ||
| import java.util.Map; | ||
| import java.util.concurrent.atomic.AtomicBoolean; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.Timeout; | ||
|
|
||
| /** | ||
| * #113: a server that accepts the TCP connection but never completes the HTTP upgrade must not turn | ||
| * the configured connect timeout into an indefinite hang — the JDK client retries on EOF, and | ||
| * {@code HttpClient.close()} waits for the abandoned handshake. | ||
| */ | ||
| class WebSocketConnectTimeoutTest { | ||
|
|
||
| @Test | ||
| @Timeout(15) | ||
| void connectThrowsPromptlyAgainstSilentServer() throws Exception { | ||
| AtomicBoolean running = new AtomicBoolean(true); | ||
| try (ServerSocket silent = new ServerSocket(0)) { | ||
| Thread accepter = | ||
| Thread.ofVirtual() | ||
| .start( | ||
| () -> { | ||
| while (running.get()) { | ||
| try { | ||
| Socket s = silent.accept(); | ||
| // Read and discard the upgrade request; never respond. | ||
| s.getInputStream().read(new byte[4096]); | ||
| } catch (java.io.IOException e) { | ||
| return; | ||
| } | ||
| } | ||
| }); | ||
| URI uri = URI.create("ws://127.0.0.1:" + silent.getLocalPort() + "/arcp"); | ||
| long start = System.nanoTime(); | ||
| assertThatThrownBy( | ||
| () -> | ||
| WebSocketTransport.connect( | ||
| uri, Map.of(), ArcpMapper.shared(), Duration.ofMillis(500))) | ||
| .isInstanceOf(IllegalStateException.class) | ||
| .hasMessageContaining("timed out"); | ||
| long elapsedMillis = (System.nanoTime() - start) / 1_000_000; | ||
| // The hang fixed by #113 was unbounded; allow generous slack for slow CI but require the | ||
| // call to return in the same order of magnitude as the configured 500ms timeout. | ||
| assertThat(elapsedMillis).isLessThan(10_000); | ||
| running.set(false); | ||
| accepter.interrupt(); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.