development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set the remote ext host pid and name (#115891)

Browse source 
Fixes #115213
This commit is contained in:
Alex Ross 2021-02-05 17:00:34 +01:00 committed by GitHub
parent 46c91d443a
commit 26e6d9e93a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/vs/workbench/api/browser/mainThreadTunnelService.ts
View file

@ -35,7 +35,8 @@ export class MainThreadTunnelService extends Disposable implements MainThreadTun
this._register(tunnelService.onTunnelClosed(() => this._proxy.$onDidTunnelsChange()));
}
async $setCandidateFinder(): Promise<void> {
async $setRemoteTunnelService(processId: number): Promise<void> {
this.remoteExplorerService.namedProcesses.set(processId, 'Code Extension Host');
if (this.remoteExplorerService.portsFeaturesEnabled) {
this._proxy.$registerCandidateFinder(this.configurationService.getValue(PORT_AUTO_FORWARD_SETTING));
} else {

2
src/vs/workbench/api/common/extHost.protocol.ts
View file

@ -995,7 +995,7 @@ export interface MainThreadTunnelServiceShape extends IDisposable {
$closeTunnel(remote: { host: string, port: number }): Promise<void>;
$getTunnels(): Promise<TunnelDescription[]>;
$setTunnelProvider(features: TunnelProviderFeatures): Promise<void>;
$setCandidateFinder(): Promise<void>;
$setRemoteTunnelService(processId: number): Promise<void>;
$setCandidateFilter(): Promise<void>;
$onFoundNewCandidates(candidates: { host: string, port: number, detail: string }[]): Promise<void>;
}

2
src/vs/workbench/api/node/extHostTunnelService.ts
View file

@ -147,7 +147,7 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
super();
this._proxy = extHostRpc.getProxy(MainContext.MainThreadTunnelService);
if (isLinux && initData.remote.isRemote && initData.remote.authority) {
this._proxy.$setCandidateFinder();
this._proxy.$setRemoteTunnelService(process.pid);
}
}

28
src/vs/workbench/contrib/remote/browser/tunnelView.ts
View file

@ -137,7 +137,7 @@ export class TunnelViewModel extends Disposable implements ITunnelViewModel {
get forwarded(): TunnelItem[] {
const forwarded = Array.from(this.model.forwarded.values()).map(tunnel => {
const tunnelItem = TunnelItem.createFromTunnel(tunnel);
const tunnelItem = TunnelItem.createFromTunnel(this.remoteExplorerService, tunnel);
this.addProcessInfoFromCandidate(tunnelItem);
return tunnelItem;
}).sort((a: TunnelItem, b: TunnelItem) => {
@ -155,7 +155,7 @@ export class TunnelViewModel extends Disposable implements ITunnelViewModel {
get detected(): TunnelItem[] {
return Array.from(this.model.detected.values()).map(tunnel => {
const tunnelItem = TunnelItem.createFromTunnel(tunnel, TunnelType.Detected, false);
const tunnelItem = TunnelItem.createFromTunnel(this.remoteExplorerService, tunnel, TunnelType.Detected, false);
this.addProcessInfoFromCandidate(tunnelItem);
return tunnelItem;
});
@ -404,7 +404,7 @@ interface ITunnelGroup {
}
class TunnelItem implements ITunnelItem {
static createFromTunnel(tunnel: Tunnel, type: TunnelType = TunnelType.Forwarded, closeable?: boolean) {
static createFromTunnel(remoteExplorerService: IRemoteExplorerService, tunnel: Tunnel, type: TunnelType = TunnelType.Forwarded, closeable?: boolean) {
return new TunnelItem(type,
tunnel.remoteHost,
tunnel.remotePort,
@ -415,7 +415,8 @@ class TunnelItem implements ITunnelItem {
tunnel.runningProcess,
tunnel.source,
tunnel.pid,
tunnel.privacy);
tunnel.privacy,
remoteExplorerService);
}
constructor(
@ -430,6 +431,7 @@ class TunnelItem implements ITunnelItem {
private source?: string,
private pid?: number,
public privacy?: TunnelPrivacy,
private remoteExplorerService?: IRemoteExplorerService
) { }
get label(): string {
if (this.name) {
@ -477,7 +479,10 @@ class TunnelItem implements ITunnelItem {
if (item.runningProcess) {
let processPid: string;
if (isWide) {
if (item.pid && item.remoteExplorerService?.namedProcesses.has(item.pid)) {
// This is a known process. Give it a friendly name.
processPid = item.remoteExplorerService.namedProcesses.get(item.pid)!;
} else if (isWide) {
processPid = item.runningProcess.replace(/\0/g, ' ').trim();
} else {
const nullIndex = item.runningProcess.indexOf('\0');
@ -903,9 +908,9 @@ interface QuickPickTunnel extends IQuickPickItem {
tunnel?: ITunnelItem
}
function makeTunnelPicks(tunnels: Tunnel[]): QuickPickInput<QuickPickTunnel>[] {
function makeTunnelPicks(tunnels: Tunnel[], remoteExplorerService: IRemoteExplorerService): QuickPickInput<QuickPickTunnel>[] {
const picks: QuickPickInput<QuickPickTunnel>[] = tunnels.map(forwarded => {
const item = TunnelItem.createFromTunnel(forwarded);
const item = TunnelItem.createFromTunnel(remoteExplorerService, forwarded);
return {
label: item.label,
description: item.description,
@ -941,7 +946,7 @@ namespace ClosePortAction {
const remoteExplorerService = accessor.get(IRemoteExplorerService);
const commandService = accessor.get(ICommandService);
const picks: QuickPickInput<QuickPickTunnel>[] = makeTunnelPicks(Array.from(remoteExplorerService.tunnelModel.forwarded.values()).filter(tunnel => tunnel.closeable));
const picks: QuickPickInput<QuickPickTunnel>[] = makeTunnelPicks(Array.from(remoteExplorerService.tunnelModel.forwarded.values()).filter(tunnel => tunnel.closeable), remoteExplorerService);
const result = await quickInputService.pick(picks, { placeHolder: nls.localize('remote.tunnel.closePlaceholder', "Choose a port to stop forwarding") });
if (result && result.tunnel) {
await remoteExplorerService.close({ host: result.tunnel.remoteHost, port: result.tunnel.remotePort });
@ -1035,12 +1040,13 @@ namespace OpenPortInBrowserCommandPaletteAction {
export function handler(): ICommandHandler {
return async (accessor, arg) => {
const model = accessor.get(IRemoteExplorerService).tunnelModel;
const remoteExplorerService = accessor.get(IRemoteExplorerService);
const model = remoteExplorerService.tunnelModel;
const quickPickService = accessor.get(IQuickInputService);
const openerService = accessor.get(IOpenerService);
const commandService = accessor.get(ICommandService);
const options: QuickPickTunnel[] = [...model.forwarded, ...model.detected].map(value => {
const tunnelItem = TunnelItem.createFromTunnel(value[1]);
const tunnelItem = TunnelItem.createFromTunnel(remoteExplorerService, value[1]);
return {
label: tunnelItem.label,
description: tunnelItem.description,
@ -1096,7 +1102,7 @@ namespace CopyAddressAction {
const clipboardService = accessor.get(IClipboardService);
const tunnels = Array.from(remoteExplorerService.tunnelModel.forwarded.values()).concat(Array.from(remoteExplorerService.tunnelModel.detected.values()));
const result = await quickInputService.pick(makeTunnelPicks(tunnels), { placeHolder: nls.localize('remote.tunnel.copyAddressPlaceholdter', "Choose a forwarded port") });
const result = await quickInputService.pick(makeTunnelPicks(tunnels, remoteExplorerService), { placeHolder: nls.localize('remote.tunnel.copyAddressPlaceholdter', "Choose a forwarded port") });
if (result && result.tunnel) {
await copyAddress(remoteExplorerService, clipboardService, result.tunnel);
} else if (result) {

2
src/vs/workbench/services/remote/common/remoteExplorerService.ts
View file

@ -524,6 +524,7 @@ export interface IRemoteExplorerService {
enablePortsFeatures(): void;
onEnabledPortsFeatures: Event<void>;
portsFeaturesEnabled: boolean;
readonly namedProcesses: Map<number, string>;
}
class RemoteExplorerService implements IRemoteExplorerService {
@ -538,6 +539,7 @@ class RemoteExplorerService implements IRemoteExplorerService {
private readonly _onEnabledPortsFeatures: Emitter<void> = new Emitter();
public readonly onEnabledPortsFeatures: Event<void> = this._onEnabledPortsFeatures.event;
private _portsFeaturesEnabled: boolean = false;
public readonly namedProcesses = new Map<number, string>();
constructor(
@IStorageService private readonly storageService: IStorageService,