introduce RemoteAuthorities

alexdima · alexdima · commit 6624dbbce9a3 · 2019-08-15T23:11:40.000+02:00
diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts
@@ -49,3 +49,26 @@ export namespace Schemas {
 
 	export const userData: string = 'vscode-userdata';
 }
+
+class RemoteAuthoritiesImpl {
+	private readonly _hosts: { [authority: string]: string; };
+	private readonly _ports: { [authority: string]: number; };
+	private readonly _connectionTokens: { [authority: string]: string; };
+
+	constructor() {
+		this._hosts = Object.create(null);
+		this._ports = Object.create(null);
+		this._connectionTokens = Object.create(null);
+	}
+
+	public set(authority: string, host: string, port: number): void {
+		this._hosts[authority] = host;
+		this._ports[authority] = port;
+	}
+
+	public setConnectionToken(authority: string, connectionToken: string): void {
+		this._connectionTokens[authority] = connectionToken;
+	}
+}
+
+export const RemoteAuthorities = new RemoteAuthoritiesImpl();
diff --git a/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts b/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts
@@ -6,6 +6,7 @@
 import { ResolvedAuthority, IRemoteAuthorityResolverService, ResolverResult, ResolvedOptions } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { ipcRenderer as ipc } from 'electron';
 import * as errors from 'vs/base/common/errors';
+import { RemoteAuthorities } from 'vs/base/common/network';
 
 class PendingResolveAuthorityRequest {
 	constructor(
@@ -50,6 +51,7 @@ export class RemoteAuthorityResolverService implements IRemoteAuthorityResolverS
 		if (this._resolveAuthorityRequests[resolvedAuthority.authority]) {
 			let request = this._resolveAuthorityRequests[resolvedAuthority.authority];
 			ipc.send('vscode:remoteAuthorityResolved', resolvedAuthority);
+			RemoteAuthorities.set(resolvedAuthority.authority, resolvedAuthority.host, resolvedAuthority.port);
 			request.resolve({ authority: resolvedAuthority, options });
 		}
 	}
diff --git a/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts b/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
@@ -9,6 +9,7 @@ import { IChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
 import { IDiagnosticInfoOptions, IDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnostics';
+import { RemoteAuthorities } from 'vs/base/common/network';
 
 export interface IGetEnvironmentDataArguments {
 	language: string;
@@ -44,6 +45,8 @@ export class RemoteExtensionEnvironmentChannelClient {
 
 		const data = await this.channel.call<IRemoteAgentEnvironmentDTO>('getEnvironmentData', args);
 
+		RemoteAuthorities.setConnectionToken(remoteAuthority, data.connectionToken);
+
 		return {
 			pid: data.pid,
 			connectionToken: data.connectionToken,

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`import { ResolvedAuthority, IRemoteAuthorityResolverService, ResolverResult, ResolvedOptions } from 'vs/platform/remote/common/remoteAuthorityResolver';`
`7`	`7`	`import { ipcRenderer as ipc } from 'electron';`
`8`	`8`	`import * as errors from 'vs/base/common/errors';`
	`9`	`+import { RemoteAuthorities } from 'vs/base/common/network';`
`9`	`10`
`10`	`11`	`class PendingResolveAuthorityRequest {`
`11`	`12`	`constructor(`
`@@ -50,6 +51,7 @@ export class RemoteAuthorityResolverService implements IRemoteAuthorityResolverS`
`50`	`51`	`if (this._resolveAuthorityRequests[resolvedAuthority.authority]) {`
`51`	`52`	`let request = this._resolveAuthorityRequests[resolvedAuthority.authority];`
`52`	`53`	`ipc.send('vscode:remoteAuthorityResolved', resolvedAuthority);`
	`54`	`+ RemoteAuthorities.set(resolvedAuthority.authority, resolvedAuthority.host, resolvedAuthority.port);`
`53`	`55`	`request.resolve({ authority: resolvedAuthority, options });`
`54`	`56`	`}`
`55`	`57`	`}`