Tidy up window<->pty host connection

Author: Tyriar

src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts

@@ -12,8 +12,9 @@ import { IReconnectConstants } from 'vs/platform/terminal/common/terminal';
 import { IPtyHostConnection, IPtyHostStarter } from 'vs/platform/terminal/node/ptyHost';
 import { UtilityProcess } from 'vs/platform/utilityProcess/electron-main/utilityProcess';
 import { Client as MessagePortClient } from 'vs/base/parts/ipc/electron-main/ipc.mp';
-import { MessageChannelMain, MessagePortMain } from 'electron';
+import { IpcMainEvent } from 'electron';
 import { assertIsDefined } from 'vs/base/common/types';
+import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
 
 export class ElectronPtyHostStarter implements IPtyHostStarter {
 
@@ -27,7 +28,7 @@ export class ElectronPtyHostStarter implements IPtyHostStarter {
 	) {
 	}
 
-	async start(lastPtyId: number): Promise<IPtyHostConnection> {
+	start(lastPtyId: number): IPtyHostConnection {
 		this.utilityProcess = new UtilityProcess(this._logService, NullTelemetryService, this._lifecycleMainService);
 
 		const inspectParams = parsePtyHostDebugPort(this._environmentService.args, this._environmentService.isBuilt);
@@ -51,6 +52,9 @@ export class ElectronPtyHostStarter implements IPtyHostStarter {
 		const port = this.utilityProcess.connect();
 		const client = new MessagePortClient(port, 'ptyHost');
 
+		// Listen for new windows to establish connection directly to pty host
+		validatedIpcMain.on('vscode:createPtyHostMessageChannel', (e, nonce) => this._onWindowConnection(e, nonce));
+
 		return {
 			client,
 			port,
@@ -71,4 +75,20 @@ export class ElectronPtyHostStarter implements IPtyHostStarter {
 			VSCODE_RECONNECT_SCROLLBACK: this._reconnectConstants.scrollback
 		};
 	}
+
+	private _onWindowConnection(e: IpcMainEvent, nonce: string) {
+		const port = this.utilityProcess!.connect();
+
+		// Check back if the requesting window meanwhile closed
+		// Since shared process is delayed on startup there is
+		// a chance that the window close before the shared process
+		// was ready for a connection.
+
+		if (e.sender.isDestroyed()) {
+			port.close();
+			return;
+		}
+
+		e.sender.postMessage('vscode:createPtyHostMessageChannelResult', nonce, [port]);
+	}
 }

src/vs/platform/terminal/node/ptyHost.ts

@@ -22,5 +22,5 @@ export interface IPtyHostStarter {
 	 * @param lastPtyId Tracks the last terminal ID from the pty host so we can give it to the new
 	 * pty host if it's restarted and avoid ID conflicts.
 	 */
-	start(lastPtyId: number): IPtyHostConnection | Promise<IPtyHostConnection>;
+	start(lastPtyId: number): IPtyHostConnection;
 }

src/vs/platform/terminal/node/ptyHostService.ts

@@ -3,12 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IpcMainEvent, MessagePortMain } from 'electron';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IProcessEnvironment, OperatingSystem, isWindows } from 'vs/base/common/platform';
 import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
-import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILogService, ILoggerService } from 'vs/platform/log/common/log';
 import { RemoteLoggerChannelClient } from 'vs/platform/log/common/logIpc';
@@ -96,38 +94,14 @@ export class PtyHostService extends Disposable implements IPtyService {
 		this._resolveVariablesRequestStore = this._register(new RequestStore(undefined, this._logService));
 		this._resolveVariablesRequestStore.onCreateRequest(this._onPtyHostRequestResolveVariables.fire, this._onPtyHostRequestResolveVariables);
 
-		validatedIpcMain.on('vscode:createPtyHostMessageChannel', (e, nonce) => this._onWindowConnection(e, nonce));
+		[this._connection, this._proxy] = this._startPtyHost();
 
-		// TODO: Start on demand on first window connection (see SharedProcess.onWindowConnection
-		// TODO: Make direct message port connection to each window when requested
-
-		this._startPtyHost().then(value => {
-			this._connection = value[0];
-			this._proxy = value[1];
-
-			this._register(this._configurationService.onDidChangeConfiguration(async e => {
-				if (e.affectsConfiguration(TerminalSettingId.IgnoreProcessNames)) {
-					await this._refreshIgnoreProcessNames();
-				}
-			}));
-			this._refreshIgnoreProcessNames();
-		});
-	}
-
-	private _onWindowConnection(e: IpcMainEvent, nonce: string) {
-		const port = this._connection.connect!() as MessagePortMain;
-
-
-		// Check back if the requesting window meanwhile closed
-		// Since shared process is delayed on startup there is
-		// a chance that the window close before the shared process
-		// was ready for a connection.
-
-		if (e.sender.isDestroyed()) {
-			return port.close();
-		}
-
-		e.sender.postMessage('vscode:createPtyHostMessageChannelResult', nonce, [port]);
+		this._register(this._configurationService.onDidChangeConfiguration(async e => {
+			if (e.affectsConfiguration(TerminalSettingId.IgnoreProcessNames)) {
+				await this._refreshIgnoreProcessNames();
+			}
+		}));
+		this._refreshIgnoreProcessNames();
 	}
 
 	private get _ignoreProcessNames(): string[] {
@@ -152,8 +126,8 @@ export class PtyHostService extends Disposable implements IPtyService {
 		}
 	}
 
-	private async _startPtyHost(): Promise<[IPtyHostConnection, IPtyService]> {
-		const connection = await this._ptyHostStarter.start(lastPtyId);
+	private _startPtyHost(): [IPtyHostConnection, IPtyService] {
+		const connection = this._ptyHostStarter.start(lastPtyId);
 		const client = connection.client;
 
 		this._onPtyHostStart.fire();