Local terminal reconnection

src/vs/base/common/async.ts

@@ -367,6 +367,25 @@ export class Barrier {
 	}
 }
 
+/**
+ * A barrier that is initially closed and then becomes opened permanently after a certain period of
+ * time or when open is called explicitly
+ */
+export class AutoOpenBarrier extends Barrier {
+
+	private readonly _timeout: any;
+
+	constructor(autoOpenTimeMs: number) {
+		super();
+		this._timeout = setTimeout(() => this.open(), autoOpenTimeMs);
+	}
+
+	open(): void {
+		clearTimeout(this._timeout);
+		super.open();
+	}
+}
+
 export function timeout(millis: number): CancelablePromise<void>;
 export function timeout(millis: number, token: CancellationToken): Promise<void>;
 export function timeout(millis: number, token?: CancellationToken): CancelablePromise<void> | Promise<void> {

src/vs/platform/terminal/common/environmentVariable.ts

@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ThemeIcon } from 'vs/platform/theme/common/themeService';
+
+export enum EnvironmentVariableMutatorType {
+	Replace = 1,
+	Append = 2,
+	Prepend = 3
+}
+export interface IEnvironmentVariableMutator {
+	readonly value: string;
+	readonly type: EnvironmentVariableMutatorType;
+}
+/** [variable, mutator] */
+export type ISerializableEnvironmentVariableCollection = [string, IEnvironmentVariableMutator][];
+
+export interface IEnvironmentVariableInfo {
+	readonly requiresAction: boolean;
+	getInfo(): string;
+	getIcon(): ThemeIcon;
+	getActions?(): { label: string, iconClass?: string, run: () => void, commandId: string }[];
+}

src/vs/platform/terminal/common/terminal.ts

@@ -4,9 +4,171 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Event } from 'vs/base/common/event';
+import { IDisposable } from 'vs/base/common/lifecycle';
 import { IProcessEnvironment } from 'vs/base/common/platform';
 import { URI } from 'vs/base/common/uri';
 
+export interface IRemoteTerminalAttachTarget {
+	id: number;
+	pid: number;
+	title: string;
+	cwd: string;
+	workspaceId: string;
+	workspaceName: string;
+	isOrphan: boolean;
+}
+
+export interface IRawTerminalInstanceLayoutInfo<T> {
+	relativeSize: number;
+	terminal: T;
+}
+export type ITerminalInstanceLayoutInfoById = IRawTerminalInstanceLayoutInfo<number>;
+export type ITerminalInstanceLayoutInfo = IRawTerminalInstanceLayoutInfo<IPtyHostAttachTarget>;
+
+export interface IRawTerminalTabLayoutInfo<T> {
+	isActive: boolean;
+	activeTerminalProcessId: number | undefined;
+	terminals: IRawTerminalInstanceLayoutInfo<T>[];
+}
+
+export type ITerminalTabLayoutInfoById = IRawTerminalTabLayoutInfo<number>;
+export type ITerminalTabLayoutInfo = IRawTerminalTabLayoutInfo<IPtyHostAttachTarget | null>;
+
+export interface IRawTerminalsLayoutInfo<T> {
+	tabs: IRawTerminalTabLayoutInfo<T>[];
+}
+
+export interface IPtyHostAttachTarget {
+	id: number;
+	pid: number;
+	title: string;
+	cwd: string;
+	workspaceId: string;
+	workspaceName: string;
+	isOrphan: boolean;
+}
+
+export type ITerminalsLayoutInfo = IRawTerminalsLayoutInfo<IPtyHostAttachTarget | null>;
+export type ITerminalsLayoutInfoById = IRawTerminalsLayoutInfo<number>;
+
+/**
+ * Provides access to native Windows calls that can be injected into non-native layers.
+ */
+export interface ITerminalNativeWindowsDelegate {
+	/**
+	 * Gets the Windows build number, eg. this would be `19041` for Windows 10 version 2004
+	 */
+	getWindowsBuildNumber(): number;
+	/**
+	 * Converts a regular Windows path into the WSL path equivalent, eg. `C:\` -> `/mnt/c`
+	 * @param path The Windows path.
+	 */
+	getWslPath(path: string): Promise<string>;
+}
+
+export interface IShellDefinition {
+	label: string;
+	path: string;
+}
+
+export interface ICommandTracker {
+	scrollToPreviousCommand(): void;
+	scrollToNextCommand(): void;
+	selectToPreviousCommand(): void;
+	selectToNextCommand(): void;
+	selectToPreviousLine(): void;
+	selectToNextLine(): void;
+}
+
+export interface INavigationMode {
+	exitNavigationMode(): void;
+	focusPreviousLine(): void;
+	focusNextLine(): void;
+}
+
+export interface IBeforeProcessDataEvent {
+	/**
+	 * The data of the event, this can be modified by the event listener to change what gets sent
+	 * to the terminal.
+	 */
+	data: string;
+}
+
+
+export interface ITerminalProcessExtHostProxy extends IDisposable {
+	readonly terminalId: number;
+
+	emitData(data: string): void;
+	emitTitle(title: string): void;
+	emitReady(pid: number, cwd: string): void;
+	emitExit(exitCode: number | undefined): void;
+	emitOverrideDimensions(dimensions: ITerminalDimensions | undefined): void;
+	emitResolvedShellLaunchConfig(shellLaunchConfig: IShellLaunchConfig): void;
+	emitInitialCwd(initialCwd: string): void;
+	emitCwd(cwd: string): void;
+	emitLatency(latency: number): void;
+
+	onInput: Event<string>;
+	onResize: Event<{ cols: number, rows: number }>;
+	onAcknowledgeDataEvent: Event<number>;
+	onShutdown: Event<boolean>;
+	onRequestInitialCwd: Event<void>;
+	onRequestCwd: Event<void>;
+	onRequestLatency: Event<void>;
+}
+
+export interface ISpawnExtHostProcessRequest {
+	proxy: ITerminalProcessExtHostProxy;
+	shellLaunchConfig: IShellLaunchConfig;
+	activeWorkspaceRootUri: URI | undefined;
+	cols: number;
+	rows: number;
+	isWorkspaceShellAllowed: boolean;
+	callback: (error: ITerminalLaunchError | undefined) => void;
+}
+
+export interface IStartExtensionTerminalRequest {
+	proxy: ITerminalProcessExtHostProxy;
+	cols: number;
+	rows: number;
+	callback: (error: ITerminalLaunchError | undefined) => void;
+}
+
+export interface IAvailableShellsRequest {
+	callback: (shells: IShellDefinition[]) => void;
+}
+
+export interface IDefaultShellAndArgsRequest {
+	useAutomationShell: boolean;
+	callback: (shell: string, args: string[] | string | undefined) => void;
+}
+
+export enum LinuxDistro {
+	Fedora,
+	Ubuntu,
+	Unknown
+}
+
+export enum TitleEventSource {
+	/** From the API or the rename command that overrides any other type */
+	Api,
+	/** From the process name property*/
+	Process,
+	/** From the VT sequence */
+	Sequence
+}
+
+export interface IWindowsShellHelper extends IDisposable {
+	readonly onShellNameChange: Event<string>;
+
+	getShellName(): Promise<string>;
+}
+
+export interface IRawTerminalInstanceLayoutInfo<T> {
+	relativeSize: number;
+	terminal: T;
+}
+
 export enum TerminalIpcChannels {
 	/**
 	 * Communicates between the renderer process and shared process.
@@ -206,6 +368,17 @@ export interface ITerminalChildProcess {
 	getLatency(): Promise<number>;
 }
 
+export const enum ReconnectConstants {
+	/**
+	 * If there is no reconnection within this time-frame, consider the connection permanently closed...
+	*/
+	ReconnectionGraceTime = 5000, // 5 seconds
+	/**
+	 * Maximal grace time between the first and the last reconnection...
+	*/
+	ReconnectionShortGraceTime = 1000, // 1 second
+}
+
 export const enum FlowControlConstants {
 	/**
 	 * The number of _unacknowledged_ chars to have been sent before the pty is paused in order for
@@ -252,3 +425,26 @@ export interface ITerminalDimensionsOverride extends ITerminalDimensions {
 	 */
 	forceExactSize?: boolean;
 }
+
+export function printTime(ms: number): string {
+	let h = 0;
+	let m = 0;
+	let s = 0;
+	if (ms >= 1000) {
+		s = Math.floor(ms / 1000);
+		ms -= s * 1000;
+	}
+	if (s >= 60) {
+		m = Math.floor(s / 60);
+		s -= m * 60;
+	}
+	if (m >= 60) {
+		h = Math.floor(m / 60);
+		m -= h * 60;
+	}
+	const _h = h ? `${h}h` : ``;
+	const _m = m ? `${m}m` : ``;
+	const _s = s ? `${s}s` : ``;
+	const _ms = ms ? `${ms}ms` : ``;
+	return `${_h}${_m}${_s}${_ms}`;
+}

src/vs/platform/terminal/common/terminalDataBuffering.ts

@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Event } from 'vs/base/common/event';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { IProcessDataEvent } from 'vs/platform/terminal/common/terminal';
+interface TerminalDataBuffer extends IDisposable {
+	data: string[];
+	timeoutId: any;
+}
+export class TerminalDataBufferer implements IDisposable {
+	private readonly _terminalBufferMap = new Map<number, TerminalDataBuffer>();
+
+	constructor(private readonly _callback: (id: number, data: string) => void) {
+	}
+
+	dispose() {
+		for (const buffer of this._terminalBufferMap.values()) {
+			buffer.dispose();
+		}
+	}
+
+	startBuffering(id: number, event: Event<string | IProcessDataEvent>, throttleBy: number = 5): IDisposable {
+		let disposable: IDisposable;
+		disposable = event((e: string | IProcessDataEvent) => {
+			const data = (typeof e === 'string' ? e : e.data);
+			let buffer = this._terminalBufferMap.get(id);
+			if (buffer) {
+				buffer.data.push(data);
+
+				return;
+			}
+
+			const timeoutId = setTimeout(() => this._flushBuffer(id), throttleBy);
+			buffer = {
+				data: [data],
+				timeoutId: timeoutId,
+				dispose: () => {
+					clearTimeout(timeoutId);
+					this._flushBuffer(id);
+					disposable.dispose();
+				}
+			};
+			this._terminalBufferMap.set(id, buffer);
+		});
+		return disposable;
+	}
+
+	stopBuffering(id: number) {
+		const buffer = this._terminalBufferMap.get(id);
+		if (buffer) {
+			buffer.dispose();
+		}
+	}
+
+	private _flushBuffer(id: number): void {
+		const buffer = this._terminalBufferMap.get(id);
+		if (buffer) {
+			this._terminalBufferMap.delete(id);
+			this._callback(id, buffer.data.join(''));
+		}
+	}
+}