Merge pull request #2880 from murgatroid99/grpc-js-xds_preserve_type_state_1.12.x

murgatroid99 · web-flow · commit c6c69df25bf7 · 2025-01-08T15:27:36.000-08:00
grpc-js-xds: Preserve resource type version and nonce when unsubscribing (1.12.x)
diff --git a/packages/grpc-js-xds/package.json b/packages/grpc-js-xds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js-xds",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "description": "Plugin for @grpc/grpc-js. Adds the xds:// URL scheme and associated features.",
   "main": "build/src/index.js",
   "scripts": {
diff --git a/packages/grpc-js-xds/src/xds-client.ts b/packages/grpc-js-xds/src/xds-client.ts
@@ -457,9 +457,6 @@ class AdsCallState {
     if (authorityMap.size === 0) {
       typeState.subscribedResources.delete(name.authority);
     }
-    if (typeState.subscribedResources.size === 0) {
-      this.typeStates.delete(type);
-    }
     this.updateNames(type);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@grpc/grpc-js-xds",`
`3`		`- "version": "1.12.0",`
	`3`	`+ "version": "1.12.1",`
`4`	`4`	`"description": "Plugin for @grpc/grpc-js. Adds the xds:// URL scheme and associated features.",`
`5`	`5`	`"main": "build/src/index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -457,9 +457,6 @@ class AdsCallState {`
`457`	`457`	`if (authorityMap.size === 0) {`
`458`	`458`	`typeState.subscribedResources.delete(name.authority);`
`459`	`459`	`}`
`460`		`- if (typeState.subscribedResources.size === 0) {`
`461`		`- this.typeStates.delete(type);`
`462`		`- }`
`463`	`460`	`this.updateNames(type);`
`464`	`461`	`}`
`465`	`462`