Fix removing tunnels when the tunnel factory throws an error (microsoft#186566)

joshaber · alexr00 · web-flow · commit 661fbc9ecfff · 2023-06-29T20:06:41.000Z
* Await the tunnel promise

* Add null check

* nit: use undefined

---------

Co-authored-by: Alex Ross &lt;alros@microsoft.com&gt;
diff --git a/src/vs/platform/tunnel/common/tunnel.ts b/src/vs/platform/tunnel/common/tunnel.ts
@@ -416,7 +416,7 @@ export abstract class AbstractTunnelService implements ITunnelService {
 		const hostMap = this._tunnels.get(remoteHost);
 		if (hostMap) {
 			const tunnel = hostMap.get(remotePort);
-			const tunnelResult = await tunnel;
+			const tunnelResult = tunnel ? await tunnel.value : undefined;
 			if (!tunnelResult) {
 				hostMap.delete(remotePort);
 			}

Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ export abstract class AbstractTunnelService implements ITunnelService {`
`416`	`416`	`const hostMap = this._tunnels.get(remoteHost);`
`417`	`417`	`if (hostMap) {`
`418`	`418`	`const tunnel = hostMap.get(remotePort);`
`419`		`- const tunnelResult = await tunnel;`
	`419`	`+ const tunnelResult = tunnel ? await tunnel.value : undefined;`
`420`	`420`	`if (!tunnelResult) {`
`421`	`421`	`hostMap.delete(remotePort);`
`422`	`422`	`}`