Merge pull request #2790 from murgatroid99/grpc-js_server_idle_test_d…

…eflake grpc-js: Increase state change deadline in server idle tests
grpc · Jul 10, 2024 · fbbc78d · fbbc78d
2 parents c934257 + 395de4b
commit fbbc78d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/packages/grpc-js/src/server.ts b/packages/grpc-js/src/server.ts
@@ -1790,19 +1790,22 @@ export class Server {
     // for future refreshes
     if (
       sessionInfo !== undefined &&
-      sessionInfo.activeStreams === 0 &&
-      Date.now() - sessionInfo.lastIdle >= ctx.sessionIdleTimeout
+      sessionInfo.activeStreams === 0
     ) {
-      ctx.trace(
-        'Session idle timeout triggered for ' +
-          socket?.remoteAddress +
-          ':' +
-          socket?.remotePort +
-          ' last idle at ' +
-          sessionInfo.lastIdle
-      );
+      if (Date.now() - sessionInfo.lastIdle >= ctx.sessionIdleTimeout) {
+        ctx.trace(
+          'Session idle timeout triggered for ' +
+            socket?.remoteAddress +
+            ':' +
+            socket?.remotePort +
+            ' last idle at ' +
+            sessionInfo.lastIdle
+        );
 
-      ctx.closeSession(session);
+        ctx.closeSession(session);
+      } else {
+        sessionInfo.timeout.refresh();
+      }
     }
   }
 

diff --git a/packages/grpc-js/test/test-idle-timer.ts b/packages/grpc-js/test/test-idle-timer.ts
@@ -199,7 +199,7 @@ describe('Server idle timer', () => {
         grpc.connectivityState.READY
       );
       client?.waitForClientState(
-        Date.now() + 600,
+        Date.now() + 1500,
         grpc.connectivityState.IDLE,
         done
       );
@@ -217,7 +217,7 @@ describe('Server idle timer', () => {
       );
 
       client!.waitForClientState(
-        Date.now() + 600,
+        Date.now() + 1500,
         grpc.connectivityState.IDLE,
         err => {
           if (err) return done(err);
@@ -248,7 +248,7 @@ describe('Server idle timer', () => {
       );
 
       client!.waitForClientState(
-        Date.now() + 600,
+        Date.now() + 1500,
         grpc.connectivityState.IDLE,
         done
       );