Skip to content
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

Jump to bottom

feat: add timeout config to websocket #613

Merged
merged 4 commits into from Jul 28, 2022
Merged

feat: add timeout config to websocket #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04484e8
feat: add timeout config to websocket
iProdigy Jul 28, 2022
c6f32ae
fix: validate socketTimeout
iProdigy Jul 28, 2022
3967158
chore: pass chatQueueTimeout for socket timeout
iProdigy Jul 28, 2022
f7809b7
fix: don't lower socket timeout to chat queue timeout as it causes di…
iProdigy Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion client-websocket/src/main/java/com/github/twitch4j/client/websocket/WebsocketConnection.java
View file
Open in desktop
Expand Up @@ -70,7 +70,10 @@ public WebsocketConnection(Consumer<WebsocketConnectionConfig> configSpec) {
config = WebsocketConnectionConfig.process(configSpec);

// webSocketFactory and proxy configuration
this.webSocketFactory = new WebSocketFactory();
this.webSocketFactory = new WebSocketFactory()
.setConnectionTimeout(config.connectionTimeout())
.setSocketTimeout(config.socketTimeout());

if (config.proxyConfig() != null) {
webSocketFactory.getProxySettings()
.setHost(config.proxyConfig().getHostname())
Expand Down
16 changes: 16 additions & 0 deletions ...bsocket/src/main/java/com/github/twitch4j/client/websocket/WebsocketConnectionConfig.java
View file
Open in desktop
Expand Up @@ -36,6 +36,12 @@ public void validate() {
if (wsPingPeriod < 0) {
throw new RuntimeException("wsPingPeriod must be 0 or greater, set to 0 to disable!");
}
if (connectionTimeout < 0) {
throw new RuntimeException("connectionTimeout must be 0 or greater, set to 0 to disable!");
}
if (socketTimeout < 0) {
throw new RuntimeException("socketTimeout must be 0 or greater, set to 0 to disable!");
}
Objects.requireNonNull(taskExecutor, "taskExecutor may not be null!");
Objects.requireNonNull(backoffStrategy, "backoffStrategy may not be null!");
Objects.requireNonNull(onStateChanged, "onStateChanged may not be null!");
Expand All @@ -59,6 +65,16 @@ public void validate() {
*/
private int wsPingPeriod = 0;

/**
* Websocket timeout milliseconds for establishing a connection (0 = disabled).
*/
private int connectionTimeout = 60_000;

/**
* Websocket timeout milliseconds for read and write operations (0 = disabled).
*/
private int socketTimeout = 10_000;

/**
* WebSocket Headers
*/
Expand Down