Merge from vscode 31e03b8ffbb218a87e3941f2b63a249f061fe0e4 (#4986)

src/vs/platform/remote/common/remoteAgentEnvironment.ts

@@ -11,7 +11,7 @@ export interface IRemoteAgentEnvironment {
 	pid: number;
 	appRoot: URI;
 	appSettingsHome: URI;
-	appSettingsPath: URI;
+	settingsPath: URI;
 	logsPath: URI;
 	extensionsPath: URI;
 	extensionHostLogsPath: URI;

src/vs/platform/remote/common/remoteHosts.ts

@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from 'vs/base/common/uri';
+import { Schemas } from 'vs/base/common/network';
 
-export const REMOTE_HOST_SCHEME = 'vscode-remote';
+export const REMOTE_HOST_SCHEME = Schemas.vscodeRemote;
 
 export function getRemoteAuthority(uri: URI): string | undefined {
 	return uri.scheme === REMOTE_HOST_SCHEME ? uri.authority : undefined;

src/vs/platform/remote/common/tunnel.ts

@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+
+export const ITunnelService = createDecorator<ITunnelService>('tunnelService');
+
+export interface RemoteTunnel {
+	readonly tunnelRemotePort: number;
+	readonly tunnelLocalPort: number;
+
+	dispose(): void;
+}
+
+export interface ITunnelService {
+	_serviceBrand: any;
+
+	openTunnel(remotePort: number): Promise<RemoteTunnel> | undefined;
+}

src/vs/platform/remote/node/nodeWebSocketFactory.ts

@@ -3,10 +3,42 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as net from 'net';
+import { NodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
 import { IWebSocketFactory, IConnectCallback } from 'vs/platform/remote/common/remoteAgentConnection';
 
 export const nodeWebSocketFactory = new class implements IWebSocketFactory {
 	connect(host: string, port: number, query: string, callback: IConnectCallback): void {
-		throw new Error(`Not implemented`);
+		const errorListener = (err: any) => callback(err, undefined);
+
+		const socket = net.createConnection({ host: host, port: port }, () => {
+			socket.removeListener('error', errorListener);
+
+			// https://tools.ietf.org/html/rfc6455#section-4
+			const buffer = Buffer.alloc(16);
+			for (let i = 0; i < 16; i++) {
+				buffer[i] = Math.round(Math.random() * 256);
+			}
+			const nonce = buffer.toString('base64');
+
+			let headers = [
+				`GET ws://${host}:${port}/?${query}&skipWebSocketFrames=true HTTP/1.1`,
+				`Connection: Upgrade`,
+				`Upgrade: websocket`,
+				`Sec-WebSocket-Key: ${nonce}`
+			];
+			socket.write(headers.join('\r\n') + '\r\n\r\n');
+
+			const onData = (data: Buffer) => {
+				const strData = data.toString();
+				if (strData.indexOf('\r\n\r\n') >= 0) {
+					// headers received OK
+					socket.off('data', onData);
+					callback(undefined, new NodeSocket(socket));
+				}
+			};
+			socket.on('data', onData);
+		});
+		socket.once('error', errorListener);
 	}
 };

src/vs/platform/remote/node/tunnelService.ts

@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ITunnelService, RemoteTunnel } from 'vs/platform/remote/common/tunnel';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+
+export class TunnelService implements ITunnelService {
+	_serviceBrand: any;
+
+	public constructor(
+	) {
+	}
+
+	openTunnel(remotePort: number): Promise<RemoteTunnel> | undefined {
+		return undefined;
+	}
+}
+
+registerSingleton(ITunnelService, TunnelService);