Merge branch 'bugfix/remove_connect_retry'

open-dingtalk · May 14, 2024 · 9ef32c1 · 9ef32c1
2 parents 50d582f + 4e78c77
commit 9ef32c1
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 20 deletions.
diff --git a/app-stream-api/pom.xml b/app-stream-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>open-app-stream-client</artifactId>
         <groupId>com.dingtalk.open</groupId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/app-stream-client/pom.xml b/app-stream-client/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>open-app-stream-client</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>app-stream-client</artifactId>
     <packaging>jar</packaging>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
     <name>app-stream-client</name>
 
     <dependencies>

diff --git a/app-stream-network/app-stream-network-api/pom.xml b/app-stream-network/app-stream-network-api/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>app-stream-network</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>app-stream-network-api</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
     <packaging>jar</packaging>
 
     <name>app-stream-network-api</name>

diff --git a/app-stream-network/app-stream-network-core/pom.xml b/app-stream-network/app-stream-network-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>app-stream-network</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...work-core/src/main/java/com/dingtalk/open/app/stream/network/core/DefaultSessionPool.java b/...work-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<Session>(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
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>app-stream-network</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/app-stream-network/app-stream-network-ws/pom.xml b/app-stream-network/app-stream-network-ws/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>app-stream-network</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...am-network-ws/src/main/java/com/dingtalk/open/app/stream/network/ws/KeepAliveHandler.java b/...am-network-ws/src/main/java/com/dingtalk/open/app/stream/network/ws/KeepAliveHandler.java
@@ -31,14 +31,13 @@
 public class KeepAliveHandler extends SimpleChannelInboundHandler<PongWebSocketFrame> {
     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<String, Timeout> 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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>open-app-stream-client</artifactId>
         <groupId>com.dingtalk.open</groupId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

diff --git a/app-stream-protocol/pom.xml b/app-stream-protocol/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>open-app-stream-client</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
     </parent>
 
     <artifactId>app-stream-protocol</artifactId>

diff --git a/dingtalk-stream/pom.xml b/dingtalk-stream/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>open-app-stream-client</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>dingtalk-stream</artifactId>
     <packaging>jar</packaging>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
     <name>app-stream-client</name>
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.dingtalk.open</groupId>
     <artifactId>open-app-stream-client</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
     <modules>
         <module>app-stream-client</module>
         <module>app-stream-api</module>

diff --git 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