Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remotes are broken: this.c.makeConnection is not a function #182614

Merged
merged 2 commits into from May 16, 2023
Merged

Remotes are broken: this.c.makeConnection is not a function #182614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
083b370
Remotes are broken: this.c.makeConnection is not a function
aeschli May 16, 2023
1ce61f3
Merge branch 'main' into aeschli/retail-rabbit
aeschli May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/vs/workbench/api/common/extHostExtensionService.ts
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@ import type * as vscode from 'vscode';
import { ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, IExtensionDescription, IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
import { VSBuffer } from 'vs/base/common/buffer';
import { ExtensionGlobalMemento, ExtensionMemento } from 'vs/workbench/api/common/extHostMemento';
import { RemoteAuthorityResolverError, ExtensionKind, ExtensionMode, ExtensionRuntime, ResolvedAuthority as ExtHostResolvedAuthority } from 'vs/workbench/api/common/extHostTypes';
import { RemoteAuthorityResolverError, ExtensionKind, ExtensionMode, ExtensionRuntime, ManagedResolvedAuthority as ExtHostManagedResolvedAuthority } from 'vs/workbench/api/common/extHostTypes';
import { ResolvedAuthority, ResolvedOptions, RemoteAuthorityResolverErrorCode, IRemoteConnectionData, getRemoteAuthorityPrefix, TunnelInformation, ManagedRemoteConnection, WebSocketRemoteConnection } from 'vs/platform/remote/common/remoteAuthorityResolver';
import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
Expand Down Expand Up @@ -838,16 +838,11 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
authenticationSession: result.authenticationSessionForInitializingExtensions ? { id: result.authenticationSessionForInitializingExtensions.id, providerId: result.authenticationSessionForInitializingExtensions.providerId } : undefined
};

logInfo(`returned ${result instanceof ExtHostResolvedAuthority ? `${result.host}:${result.port}` : 'managed authority'}`);
// extension are not required to return an instance of ResolvedAuthority or ManagedResolvedAuthority, so don't use `instanceof`
logInfo(`returned ${ExtHostManagedResolvedAuthority.isManagedResolvedAuthority(result) ? 'managed authority' : `${result.host}:${result.port}`}`);

let authority: ResolvedAuthority;
if (result instanceof ExtHostResolvedAuthority) {
authority = {
authority: remoteAuthority,
connectTo: new WebSocketRemoteConnection(result.host, result.port),
connectionToken: result.connectionToken
};
} else {
if (ExtHostManagedResolvedAuthority.isManagedResolvedAuthority(result)) {
// The socket factory is identified by the `resolveAttempt`, since that is a number which
// always increments and is unique over all resolve() calls in a workbench session.
const socketFactoryId = resolveAttempt;
Expand All @@ -860,6 +855,12 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
connectTo: new ManagedRemoteConnection(socketFactoryId),
connectionToken: result.connectionToken
};
} else {
authority = {
authority: remoteAuthority,
connectTo: new WebSocketRemoteConnection(result.host, result.port),
connectionToken: result.connectionToken
};
}

return {
Expand Down
17 changes: 17 additions & 0 deletions src/vs/workbench/api/common/extHostTypes.ts
View file
Open in desktop
Expand Up @@ -487,6 +487,14 @@ const validateConnectionToken = (connectionToken: string) => {


export class ResolvedAuthority {
public static isResolvedAuthority(resolvedAuthority: any): resolvedAuthority is ResolvedAuthority {
return resolvedAuthority
&& typeof resolvedAuthority === 'object'
&& typeof resolvedAuthority.host === 'string'
&& typeof resolvedAuthority.port === 'number'
&& (resolvedAuthority.connectionToken === undefined || typeof resolvedAuthority.connectionToken === 'string');
}

readonly host: string;
readonly port: number;
readonly connectionToken: string | undefined;
Expand All @@ -507,7 +515,16 @@ export class ResolvedAuthority {
}
}


export class ManagedResolvedAuthority {

public static isManagedResolvedAuthority(resolvedAuthority: any): resolvedAuthority is ManagedResolvedAuthority {
return resolvedAuthority
&& typeof resolvedAuthority === 'object'
&& typeof resolvedAuthority.makeConnection === 'function'
&& (resolvedAuthority.connectionToken === undefined || typeof resolvedAuthority.connectionToken === 'string');
}

constructor(public readonly makeConnection: () => Thenable<vscode.ManagedMessagePassing>, public readonly connectionToken?: string) {
if (typeof connectionToken !== 'undefined') {
validateConnectionToken(connectionToken);
Expand Down