Fix candidate filter and auto forwarding wiring (#114290)

src/vs/workbench/api/browser/mainThreadTunnelService.ts

@@ -24,7 +24,10 @@ export class MainThreadTunnelService extends Disposable implements MainThreadTun
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostTunnelService);
 		this._register(tunnelService.onTunnelOpened(() => this._proxy.$onDidTunnelsChange()));
 		this._register(tunnelService.onTunnelClosed(() => this._proxy.$onDidTunnelsChange()));
-		this._register(remoteExplorerService.onEnabledPortsFeatures(() => this._proxy.$registerCandidateFinder()));
+	}
+
+	async $setCandidateFinder(): Promise<void> {
+		this._register(this.remoteExplorerService.onEnabledPortsFeatures(() => this._proxy.$registerCandidateFinder()));
 	}
 
 	async $openTunnel(tunnelOptions: TunnelOptions, source: string): Promise<TunnelDto | undefined> {
@@ -79,6 +82,13 @@ export class MainThreadTunnelService extends Disposable implements MainThreadTun
 		this.tunnelService.setTunnelProvider(tunnelProvider, features);
 	}
 
+	async $setCandidateFilter(): Promise<void> {
+		this.remoteExplorerService.setCandidateFilter((candidates: CandidatePort[]): Promise<CandidatePort[]> => {
+			return this._proxy.$applyCandidateFilter(candidates);
+		});
+	}
+
+
 	dispose(): void {
 
 	}

src/vs/workbench/api/common/extHost.protocol.ts

@@ -59,6 +59,7 @@ import { DebugConfigurationProviderTriggerKind } from 'vs/workbench/api/common/e
 import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility';
 import { IExtensionIdWithVersion } from 'vs/platform/userDataSync/common/extensionsStorageSync';
 import { InternalTestItem, RunTestForProviderRequest, RunTestsRequest, RunTestsResult, TestIdWithProvider, TestsDiff } from 'vs/workbench/contrib/testing/common/testCollection';
+import { CandidatePort } from 'vs/workbench/services/remote/common/remoteExplorerService';
 
 export interface IEnvironment {
 	isExtensionDevelopmentDebug: boolean;
@@ -984,6 +985,8 @@ export interface MainThreadTunnelServiceShape extends IDisposable {
 	$closeTunnel(remote: { host: string, port: number }): Promise<void>;
 	$getTunnels(): Promise<TunnelDescription[]>;
 	$setTunnelProvider(features: TunnelProviderFeatures): Promise<void>;
+	$setCandidateFinder(): Promise<void>;
+	$setCandidateFilter(): Promise<void>;
 	$onFoundNewCandidates(candidates: { host: string, port: number, detail: string }[]): Promise<void>;
 }
 
@@ -1785,6 +1788,7 @@ export interface ExtHostTunnelServiceShape {
 	$closeTunnel(remote: { host: string, port: number }, silent?: boolean): Promise<void>;
 	$onDidTunnelsChange(): Promise<void>;
 	$registerCandidateFinder(): Promise<void>;
+	$applyCandidateFilter(candidates: CandidatePort[]): Promise<CandidatePort[]>;
 }
 
 export interface ExtHostTimelineShape {

src/vs/workbench/api/common/extHostTunnelService.ts

@@ -11,6 +11,7 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { Emitter } from 'vs/base/common/event';
 import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { CandidatePort } from 'vs/workbench/services/remote/common/remoteExplorerService';
 
 export interface TunnelDto {
 	remoteAddress: { port: number, host: string };
@@ -57,6 +58,9 @@ export class ExtHostTunnelService implements IExtHostTunnelService {
 		@IExtHostRpcService extHostRpc: IExtHostRpcService,
 	) {
 	}
+	async $applyCandidateFilter(candidates: CandidatePort[]): Promise<CandidatePort[]> {
+		return candidates;
+	}
 
 	async openTunnel(extension: IExtensionDescription, forward: TunnelOptions): Promise<vscode.Tunnel | undefined> {
 		return undefined;

src/vs/workbench/api/node/extHostTunnelService.ts

@@ -141,10 +141,13 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 
 	constructor(
 		@IExtHostRpcService extHostRpc: IExtHostRpcService,
-		@IExtHostInitDataService private initData: IExtHostInitDataService
+		@IExtHostInitDataService initData: IExtHostInitDataService
 	) {
 		super();
 		this._proxy = extHostRpc.getProxy(MainContext.MainThreadTunnelService);
+		if (isLinux && initData.remote.isRemote && initData.remote.authority) {
+			this._proxy.$setCandidateFinder();
+		}
 	}
 
 	async openTunnel(extension: IExtensionDescription, forward: TunnelOptions): Promise<vscode.Tunnel | undefined> {
@@ -169,9 +172,6 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 	}
 
 	async $registerCandidateFinder(): Promise<void> {
-		if (!isLinux || !this.initData.remote.isRemote || !this.initData.remote.authority) {
-			return;
-		}
 		// Regularly scan to see if the candidate ports have changed.
 		let movingAverage = new MovingAverage();
 		let oldPorts: { host: string, port: number, detail: string }[] | undefined = undefined;
@@ -182,7 +182,7 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 			movingAverage.update(timeTaken);
 			if (!oldPorts || (JSON.stringify(oldPorts) !== JSON.stringify(newPorts))) {
 				oldPorts = newPorts;
-				await this._proxy.$onFoundNewCandidates(oldPorts.filter(async (candidate) => await this._showCandidatePort(candidate.host, candidate.port, candidate.detail)));
+				await this._proxy.$onFoundNewCandidates(oldPorts);
 			}
 			await (new Promise<void>(resolve => setTimeout(() => resolve(), this.calculateDelay(movingAverage.value))));
 		}
@@ -192,6 +192,7 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 		if (provider) {
 			if (provider.showCandidatePort) {
 				this._showCandidatePort = provider.showCandidatePort;
+				await this._proxy.$setCandidateFilter();
 			}
 			if (provider.tunnelFactory) {
 				this._forwardPortProvider = provider.tunnelFactory;
@@ -242,6 +243,10 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
 		return undefined;
 	}
 
+	async $applyCandidateFilter(candidates: CandidatePort[]): Promise<CandidatePort[]> {
+		return Promise.all(candidates.filter(candidate => this._showCandidatePort(candidate.host, candidate.port, candidate.detail)));
+	}
+
 	async findCandidatePorts(): Promise<CandidatePort[]> {
 		let tcp: string = '';
 		let tcp6: string = '';