Do not send isBuilt

This commit is contained in:
Alex Dima
2019-07-31 21:42:28 +02:00
parent ec78f9eed2
commit fc727b7bc7
7 changed files with 3 additions and 15 deletions
-3
View File
@@ -697,8 +697,6 @@ export class CodeApplication extends Disposable {
private handleRemoteAuthorities(): void {
const connectionPool: Map<string, ActiveConnection> = new Map<string, ActiveConnection>();
const isBuilt = this.environmentService.isBuilt;
class ActiveConnection {
private readonly _authority: string;
private readonly _connection: Promise<ManagementPersistentConnection>;
@@ -708,7 +706,6 @@ export class CodeApplication extends Disposable {
this._authority = authority;
const options: IConnectionOptions = {
isBuilt,
commit: product.commit,
socketFactory: nodeSocketFactory,
addressProvider: {
@@ -35,7 +35,6 @@ export interface ConnectionTypeRequest {
signedData?: string;
desiredConnectionType?: ConnectionType;
args?: any;
isBuilt: boolean;
}
export interface ErrorMessage {
@@ -51,7 +50,6 @@ export type HandshakeMessage = AuthRequest | SignRequest | ConnectionTypeRequest
interface ISimpleConnectionOptions {
isBuilt: boolean;
commit: string | undefined;
host: string;
port: number;
@@ -110,8 +108,7 @@ async function connectToRemoteExtensionHostAgent(options: ISimpleConnectionOptio
type: 'connectionType',
commit: options.commit,
signedData: signed,
desiredConnectionType: connectionType,
isBuilt: options.isBuilt
desiredConnectionType: connectionType
};
if (args) {
connTypeRequest.args = args;
@@ -200,7 +197,6 @@ async function doConnectRemoteAgentTunnel(options: ISimpleConnectionOptions, sta
}
export interface IConnectionOptions {
isBuilt: boolean;
commit: string | undefined;
socketFactory: ISocketFactory;
addressProvider: IAddressProvider;
@@ -210,7 +206,6 @@ export interface IConnectionOptions {
async function resolveConnectionOptions(options: IConnectionOptions, reconnectionToken: string, reconnectionProtocol: PersistentProtocol | null): Promise<ISimpleConnectionOptions> {
const { host, port } = await options.addressProvider.getAddress();
return {
isBuilt: options.isBuilt,
commit: options.commit,
host: host,
port: port,
@@ -71,7 +71,6 @@ export class RemoteExtensionHostClient extends Disposable implements IExtensionH
public start(): Promise<IMessagePassingProtocol> {
const options: IConnectionOptions = {
isBuilt: this._environmentService.isBuilt,
commit: this._productService.commit,
socketFactory: this._socketFactory,
addressProvider: {
@@ -28,7 +28,7 @@ export class RemoteAgentService extends AbstractRemoteAgentService implements IR
super(environmentService);
this.socketFactory = new BrowserSocketFactory(webSocketFactory);
this._connection = this._register(new RemoteAgentConnection(environmentService.configuration.remoteAuthority!, productService.commit, this.socketFactory, environmentService, remoteAuthorityResolverService, signService));
this._connection = this._register(new RemoteAgentConnection(environmentService.configuration.remoteAuthority!, productService.commit, this.socketFactory, remoteAuthorityResolverService, signService));
}
getConnection(): IRemoteAgentConnection | null {
@@ -84,7 +84,6 @@ export class RemoteAgentConnection extends Disposable implements IRemoteAgentCon
remoteAuthority: string,
private readonly _commit: string | undefined,
private readonly _socketFactory: ISocketFactory,
private readonly _environmentService: IEnvironmentService,
private readonly _remoteAuthorityResolverService: IRemoteAuthorityResolverService,
private readonly _signService: ISignService
) {
@@ -111,7 +110,6 @@ export class RemoteAgentConnection extends Disposable implements IRemoteAgentCon
private async _createConnection(): Promise<Client<RemoteAgentConnectionContext>> {
let firstCall = true;
const options: IConnectionOptions = {
isBuilt: this._environmentService.isBuilt,
commit: this._commit,
socketFactory: this._socketFactory,
addressProvider: {
@@ -27,7 +27,7 @@ export class RemoteAgentService extends AbstractRemoteAgentService implements IR
super(environmentService);
this.socketFactory = nodeSocketFactory;
if (remoteAuthority) {
this._connection = this._register(new RemoteAgentConnection(remoteAuthority, product.commit, nodeSocketFactory, environmentService, remoteAuthorityResolverService, signService));
this._connection = this._register(new RemoteAgentConnection(remoteAuthority, product.commit, nodeSocketFactory, remoteAuthorityResolverService, signService));
}
}
@@ -100,7 +100,6 @@ export class TunnelService implements ITunnelService {
}
const options: IConnectionOptions = {
isBuilt: this.environmentService.isBuilt,
commit: product.commit,
socketFactory: nodeSocketFactory,
addressProvider: {