Move socketFactory to AbstractRemoteAgentService

alexdima · alexdima · commit f03f57f8aa99 · 2020-07-29T15:00:16.000+02:00
diff --git a/src/vs/workbench/services/remote/browser/remoteAgentServiceImpl.ts b/src/vs/workbench/services/remote/browser/remoteAgentServiceImpl.ts
@@ -10,13 +10,10 @@ import { AbstractRemoteAgentService, RemoteAgentConnection } from 'vs/workbench/
 import { IProductService } from 'vs/platform/product/common/productService';
 import { IWebSocketFactory, BrowserSocketFactory } from 'vs/platform/remote/browser/browserSocketFactory';
 import { ISignService } from 'vs/platform/sign/common/sign';
-import { ISocketFactory } from 'vs/platform/remote/common/remoteAgentConnection';
 import { ILogService } from 'vs/platform/log/common/log';
 
 export class RemoteAgentService extends AbstractRemoteAgentService implements IRemoteAgentService {
 
-	public readonly socketFactory: ISocketFactory;
-
 	private readonly _connection: IRemoteAgentConnection | null = null;
 
 	constructor(
@@ -27,9 +24,8 @@ export class RemoteAgentService extends AbstractRemoteAgentService implements IR
 		@ISignService signService: ISignService,
 		@ILogService logService: ILogService
 	) {
-		super(environmentService, remoteAuthorityResolverService);
+		super(new BrowserSocketFactory(webSocketFactory), environmentService, remoteAuthorityResolverService);
 
-		this.socketFactory = new BrowserSocketFactory(webSocketFactory);
 		const remoteAuthority = environmentService.configuration.remoteAuthority;
 		if (remoteAuthority) {
 			this._connection = this._register(new RemoteAgentConnection(remoteAuthority, productService.commit, this.socketFactory, remoteAuthorityResolverService, signService, logService));
diff --git a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
@@ -23,17 +23,20 @@ import { ISignService } from 'vs/platform/sign/common/sign';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
 
-export abstract class AbstractRemoteAgentService extends Disposable {
+export abstract class AbstractRemoteAgentService extends Disposable implements IRemoteAgentService {
 
 	declare readonly _serviceBrand: undefined;
 
+	public readonly socketFactory: ISocketFactory;
 	private _environment: Promise<IRemoteAgentEnvironment | null> | null;
 
 	constructor(
+		socketFactory: ISocketFactory,
 		@IEnvironmentService protected readonly _environmentService: IEnvironmentService,
 		@IRemoteAuthorityResolverService private readonly _remoteAuthorityResolverService: IRemoteAuthorityResolverService
 	) {
 		super();
+		this.socketFactory = socketFactory;
 		this._environment = null;
 	}
 
diff --git a/src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts b/src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts
@@ -9,14 +9,11 @@ import { IProductService } from 'vs/platform/product/common/productService';
 import { nodeSocketFactory } from 'vs/platform/remote/node/nodeSocketFactory';
 import { AbstractRemoteAgentService, RemoteAgentConnection } from 'vs/workbench/services/remote/common/abstractRemoteAgentService';
 import { ISignService } from 'vs/platform/sign/common/sign';
-import { ISocketFactory } from 'vs/platform/remote/common/remoteAgentConnection';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 
 export class RemoteAgentService extends AbstractRemoteAgentService implements IRemoteAgentService {
 
-	public readonly socketFactory: ISocketFactory;
-
 	private readonly _connection: IRemoteAgentConnection | null = null;
 
 	constructor(
@@ -26,8 +23,7 @@ export class RemoteAgentService extends AbstractRemoteAgentService implements IR
 		@ILogService logService: ILogService,
 		@IProductService productService: IProductService
 	) {
-		super(environmentService, remoteAuthorityResolverService);
-		this.socketFactory = nodeSocketFactory;
+		super(nodeSocketFactory, environmentService, remoteAuthorityResolverService);
 		if (environmentService.configuration.remoteAuthority) {
 			this._connection = this._register(new RemoteAgentConnection(environmentService.configuration.remoteAuthority, productService.commit, nodeSocketFactory, remoteAuthorityResolverService, signService, logService));
 		}
