Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-29 04:53:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix problems with port protocol

Browse Source
This commit is contained in:
Alex Ross
2021-05-28 10:52:47 +02:00
parent 903e219ccb
commit 004f6609f8
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/vs/workbench/services/remote/common/remoteExplorerService.ts
View File

@@ -450,16 +450,20 @@ export class TunnelModel extends Disposable {
this.remoteTunnels.set(key, tunnel);
this._onForwardPort.fire(this.forwarded.get(key)!);
}));
this._register(this.tunnelService.onTunnelClosed(async (address) => {
const key = makeAddress(address.host, address.port);
if (this.forwarded.has(key)) {
this.forwarded.delete(key);
await this.storeForwarded();
this._onClosePort.fire(address);
}
this._register(this.tunnelService.onTunnelClosed(address => {
return this.onTunnelClosed(address);
}));
}
private async onTunnelClosed(address: { host: string, port: number }) {
const key = makeAddress(address.host, address.port);
if (this.forwarded.has(key)) {
this.forwarded.delete(key);
await this.storeForwarded();
this._onClosePort.fire(address);
}
}
private makeLocalUri(localAddress: string, attributes?: Attributes) {
if (localAddress.startsWith('http')) {
return URI.parse(localAddress);
@@ -585,7 +589,8 @@ export class TunnelModel extends Disposable {
existingTunnel.name = attributes?.label ?? name;
this._onForwardPort.fire();
}
if (attributes?.protocol && attributes.protocol !== existingTunnel.localUri.scheme) {
// Remove tunnel provider check when protocol is part of the API https://github.com/microsoft/vscode/issues/124816
if (!this.tunnelService.hasTunnelProvider && attributes?.protocol && (attributes.protocol !== existingTunnel.localUri.scheme)) {
await this.close(existingTunnel.remoteHost, existingTunnel.remotePort);
await this.forward({ host: existingTunnel.remoteHost, port: existingTunnel.remotePort }, local, name, source, elevateIfNeeded, isPublic, restore, attributes);
}
@@ -608,7 +613,8 @@ export class TunnelModel extends Disposable {
}
async close(host: string, port: number): Promise<void> {
return this.tunnelService.closeTunnel(host, port);
await this.tunnelService.closeTunnel(host, port);
return this.onTunnelClosed({ host, port });
}
address(host: string, port: number): string | undefined {