chore: tests & cleanup of unref?.()

grpc · Mar 2, 2024 · 62e8ea9 · 62e8ea9
1 parent b873dce
commit 62e8ea9
Show file tree

Hide file tree

Showing 8 changed files with 235 additions and 91 deletions.
diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json
@@ -20,9 +20,9 @@
     "@types/lodash": "^4.14.202",
     "@types/mocha": "^10.0.6",
     "@types/ncp": "^2.0.8",
+    "@types/node": ">=20.11.20",
     "@types/pify": "^5.0.4",
     "@types/semver": "^7.5.8",
-    "@types/node": ">=20.11.20",
     "@typescript-eslint/eslint-plugin": "^7.1.0",
     "@typescript-eslint/parser": "^7.1.0",
     "@typescript-eslint/typescript-estree": "^7.1.0",

diff --git a/packages/grpc-js/src/load-balancer-pick-first.ts b/packages/grpc-js/src/load-balancer-pick-first.ts
@@ -415,7 +415,8 @@ export class PickFirstLoadBalancer implements LoadBalancer {
     }
     this.connectionDelayTimeout = setTimeout(() => {
       this.startNextSubchannelConnecting(subchannelIndex + 1);
-    }, CONNECTION_DELAY_INTERVAL_MS).unref?.();
+    }, CONNECTION_DELAY_INTERVAL_MS);
+    this.connectionDelayTimeout.unref?.();
   }
 
   private pickSubchannel(subchannel: SubchannelInterface) {

diff --git a/packages/grpc-js/src/resolver-dns.ts b/packages/grpc-js/src/resolver-dns.ts
@@ -309,7 +309,8 @@ class DnsResolver implements Resolver {
       if (this.continueResolving) {
         this.startResolutionWithBackoff();
       }
-    }, this.minTimeBetweenResolutionsMs).unref?.();
+    }, this.minTimeBetweenResolutionsMs);
+    this.nextResolutionTimer.unref?.();
     this.isNextResolutionTimerRunning = true;
   }
 

diff --git a/packages/grpc-js/src/resolving-load-balancer.ts b/packages/grpc-js/src/resolving-load-balancer.ts
@@ -212,6 +212,7 @@ export class ResolvingLoadBalancer implements LoadBalancer {
         methodConfig: [],
       };
     }
+
     this.updateState(ConnectivityState.IDLE, new QueuePicker(this));
     this.childLoadBalancer = new ChildLoadBalancerHandler(
       {