diff --git a/app-stream-api/pom.xml b/app-stream-api/pom.xml index ed1bed8..d20c8cf 100644 --- a/app-stream-api/pom.xml +++ b/app-stream-api/pom.xml @@ -5,7 +5,7 @@ open-app-stream-client com.dingtalk.open - 1.3.2 + 1.3.3 ../pom.xml 4.0.0 diff --git a/app-stream-client/pom.xml b/app-stream-client/pom.xml index 291b4a1..bb1904c 100644 --- a/app-stream-client/pom.xml +++ b/app-stream-client/pom.xml @@ -4,13 +4,13 @@ com.dingtalk.open open-app-stream-client - 1.3.2 + 1.3.3 ../pom.xml app-stream-client jar - 1.3.2 + 1.3.3 app-stream-client diff --git a/app-stream-network/app-stream-network-api/pom.xml b/app-stream-network/app-stream-network-api/pom.xml index 9f427ab..8842dc9 100644 --- a/app-stream-network/app-stream-network-api/pom.xml +++ b/app-stream-network/app-stream-network-api/pom.xml @@ -4,12 +4,12 @@ com.dingtalk.open app-stream-network - 1.3.2 + 1.3.3 ../pom.xml app-stream-network-api - 1.3.2 + 1.3.3 jar app-stream-network-api diff --git a/app-stream-network/app-stream-network-core/pom.xml b/app-stream-network/app-stream-network-core/pom.xml index e9fd2e3..75ccae5 100644 --- a/app-stream-network/app-stream-network-core/pom.xml +++ b/app-stream-network/app-stream-network-core/pom.xml @@ -4,7 +4,7 @@ com.dingtalk.open app-stream-network - 1.3.2 + 1.3.3 ../pom.xml diff --git a/app-stream-network/app-stream-network-core/src/main/java/com/dingtalk/open/app/stream/network/core/DefaultSessionPool.java b/app-stream-network/app-stream-network-core/src/main/java/com/dingtalk/open/app/stream/network/core/DefaultSessionPool.java index d3e4669..0bf97ad 100644 --- a/app-stream-network/app-stream-network-core/src/main/java/com/dingtalk/open/app/stream/network/core/DefaultSessionPool.java +++ b/app-stream-network/app-stream-network-core/src/main/java/com/dingtalk/open/app/stream/network/core/DefaultSessionPool.java @@ -165,8 +165,7 @@ public void run() { closeSession(previous.getId()); } } - Session session = new RetryRunner(MAX_RETRY_COUNT, new ExponentialBackoffPolicy()) - .run(() -> Connector.connect(connection, new TransportConnectionListener(), connectionTimeout, connectionTTL, keepAliveIdle)); + Session session = Connector.connect(connection, new TransportConnectionListener(), connectionTimeout, connectionTTL, keepAliveIdle); if (session == null) { return; } diff --git a/app-stream-network/app-stream-network-rsocket/pom.xml b/app-stream-network/app-stream-network-rsocket/pom.xml index 7e64122..bf0d111 100644 --- a/app-stream-network/app-stream-network-rsocket/pom.xml +++ b/app-stream-network/app-stream-network-rsocket/pom.xml @@ -4,7 +4,7 @@ com.dingtalk.open app-stream-network - 1.3.2 + 1.3.3 ../pom.xml diff --git a/app-stream-network/app-stream-network-ws/pom.xml b/app-stream-network/app-stream-network-ws/pom.xml index e5aad80..9355dba 100644 --- a/app-stream-network/app-stream-network-ws/pom.xml +++ b/app-stream-network/app-stream-network-ws/pom.xml @@ -4,7 +4,7 @@ com.dingtalk.open app-stream-network - 1.3.2 + 1.3.3 ../pom.xml diff --git a/app-stream-network/app-stream-network-ws/src/main/java/com/dingtalk/open/app/stream/network/ws/KeepAliveHandler.java b/app-stream-network/app-stream-network-ws/src/main/java/com/dingtalk/open/app/stream/network/ws/KeepAliveHandler.java index a177a65..b2fa344 100644 --- a/app-stream-network/app-stream-network-ws/src/main/java/com/dingtalk/open/app/stream/network/ws/KeepAliveHandler.java +++ b/app-stream-network/app-stream-network-ws/src/main/java/com/dingtalk/open/app/stream/network/ws/KeepAliveHandler.java @@ -31,14 +31,13 @@ public class KeepAliveHandler extends SimpleChannelInboundHandler { private static final InternalLogger LOGGER = InternalLoggerFactory.getLogger(KeepAliveHandler.class); private final Duration timeout; - private final HashedWheelTimer timer; + private final static HashedWheelTimer TIMER = new HashedWheelTimer(); private Channel channel; private final Map timeouts; private final AtomicBoolean active; public KeepAliveHandler(Duration timeout) { this.timeout = timeout; - this.timer = new HashedWheelTimer(); this.active = new AtomicBoolean(false); this.timeouts = new ConcurrentHashMap<>(); } @@ -82,7 +81,6 @@ private void shutdown() { entry.getValue().cancel(); it.remove(); } - this.timer.stop(); } private class PingTask implements Runnable { @@ -96,7 +94,7 @@ public void run() { PingWebSocketFrame frame = new PingWebSocketFrame(byteBuf); channel.writeAndFlush(frame).addListener(future -> { if (future.isSuccess()) { - Timeout pingTimeout = timer.newTimeout(timeout -> { + Timeout pingTimeout = TIMER.newTimeout(timeout -> { LOGGER.warn("[DingTalk] connection ping timeout, channel is closing"); timeouts.remove(seq); channel.close(); diff --git a/app-stream-network/pom.xml b/app-stream-network/pom.xml index 4c751d9..64e4ca0 100644 --- a/app-stream-network/pom.xml +++ b/app-stream-network/pom.xml @@ -5,7 +5,7 @@ open-app-stream-client com.dingtalk.open - 1.3.2 + 1.3.3 ../pom.xml pom diff --git a/app-stream-protocol/pom.xml b/app-stream-protocol/pom.xml index 1815916..3e337a4 100644 --- a/app-stream-protocol/pom.xml +++ b/app-stream-protocol/pom.xml @@ -6,7 +6,7 @@ com.dingtalk.open open-app-stream-client - 1.3.2 + 1.3.3 app-stream-protocol diff --git a/dingtalk-stream/pom.xml b/dingtalk-stream/pom.xml index 980eb78..b35b846 100644 --- a/dingtalk-stream/pom.xml +++ b/dingtalk-stream/pom.xml @@ -4,13 +4,13 @@ com.dingtalk.open open-app-stream-client - 1.3.2 + 1.3.3 ../pom.xml dingtalk-stream jar - 1.3.2 + 1.3.3 app-stream-client diff --git a/pom.xml b/pom.xml index f419289..f73fe2e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.dingtalk.open open-app-stream-client pom - 1.3.2 + 1.3.3 app-stream-client app-stream-api diff --git a/version.sh b/version.sh index 76b9a97..c18a3f9 100755 --- a/version.sh +++ b/version.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -mvn versions:set -DnewVersion=1.3.2 +mvn versions:set -DnewVersion=1.3.3