Use a disposable store

Author: Tyriar

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

@@ -13,8 +13,8 @@ import { IPtyHostConnection, IPtyHostStarter } from 'vs/platform/terminal/node/p
 import { UtilityProcess } from 'vs/platform/utilityProcess/electron-main/utilityProcess';
 import { Client as MessagePortClient } from 'vs/base/parts/ipc/electron-main/ipc.mp';
 import { IpcMainEvent } from 'electron';
-import { assertIsDefined } from 'vs/base/common/types';
 import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
+import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
 
 export class ElectronPtyHostStarter implements IPtyHostStarter {
 
@@ -55,11 +55,19 @@ export class ElectronPtyHostStarter implements IPtyHostStarter {
 		// Listen for new windows to establish connection directly to pty host
 		validatedIpcMain.on('vscode:createPtyHostMessageChannel', (e, nonce) => this._onWindowConnection(e, nonce));
 
+		// TODO: Do we need to listen for window close to close the port?
+
+		const store = new DisposableStore();
+		store.add(client);
+		store.add(this.utilityProcess);
+		store.add(toDisposable(() => {
+			validatedIpcMain.removeHandler('vscode:createPtyHostMessageChannel');
+			this.utilityProcess = undefined;
+		}));
+
 		return {
 			client,
-			port,
-			connect: () => assertIsDefined(this.utilityProcess).connect(),
-			dispose: client.dispose,
+			store,
 			onDidProcessExit: this.utilityProcess.onExit
 		};
 	}

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

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { FileAccess } from 'vs/base/common/network';
 import { Client, IIPCOptions } from 'vs/base/parts/ipc/node/ipc.cp';
 import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -43,9 +44,12 @@ export class NodePtyHostStarter implements IPtyHostStarter {
 
 		const client = new Client(FileAccess.asFileUri('bootstrap-fork').fsPath, opts);
 
+		const store = new DisposableStore();
+		store.add(client);
+
 		return {
 			client,
-			dispose: client.dispose,
+			store,
 			onDidProcessExit: client.onDidProcessExit
 		};
 	}

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

@@ -4,14 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Event } from 'vs/base/common/event';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { IChannelClient } from 'vs/base/parts/ipc/common/ipc';
 
-export interface IPtyHostConnection extends IDisposable {
+export interface IPtyHostConnection {
 	readonly client: IChannelClient;
-	// TODO: Type
-	readonly port?: any;
-	connect?(): any;
+	readonly store: DisposableStore;
 	readonly onDidProcessExit: Event<{ code: number; signal: string }>;
 }
 

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

@@ -320,7 +320,7 @@ export class PtyHostService extends Disposable implements IPtyService {
 
 	private _disposePtyHost(): void {
 		this._proxy.shutdownAll?.();
-		this._connection.dispose();
+		this._connection.store.dispose();
 	}
 
 	private _handleHeartbeat() {

src/vs/workbench/contrib/terminal/electron-sandbox/localTerminalBackend.ts

@@ -34,6 +34,7 @@ import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/enviro
 import { Client as MessagePortClient } from 'vs/base/parts/ipc/common/ipc.mp';
 import { acquirePort } from 'vs/base/parts/ipc/electron-sandbox/ipc.mp';
 import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
+import { mark } from 'vs/base/common/performance';
 
 export class LocalTerminalBackendContribution implements IWorkbenchContribution {
 	constructor(
@@ -74,26 +75,24 @@ class LocalTerminalBackend extends BaseTerminalBackend implements ITerminalBacke
 	) {
 		super(_localPtyService, logService, notificationService, historyService, _configurationResolverService, workspaceContextService);
 
-
-
-
+		// TODO: Use the direct connection
 		(async () => {
-			// mark('code/willConnectSharedProcess');
-			// this.logService.trace('Renderer->SharedProcess#connect: before acquirePort');
+			mark('code/willConnectPtyHost');
+			logService.trace('Renderer->PtyHost#connect: before acquirePort');
 			const port = await acquirePort('vscode:createPtyHostMessageChannel', 'vscode:createPtyHostMessageChannelResult');
-			// mark('code/didConnectSharedProcess');
-			// this.logService.trace('Renderer->SharedProcess#connect: connection established');
+			mark('code/didConnectPtyHost');
+			logService.trace('Renderer->PtyHost#connect: connection established');
 
 			const client = new MessagePortClient(port, `window:${environmentService.window.id}`);
 			const proxy = ProxyChannel.toService<IPtyService>(client.getChannel(TerminalIpcChannels.PtyHostWindow));
 
+			// Testing
 			logService.info('latency: ', proxy.getLatency(0));
 			proxy.onProcessData(e => {
 				logService.info('message port process data: ' + e.event);
 			});
 		})();
 
-
 		// Attach process listeners
 		this._localPtyService.onProcessData(e => this._ptys.get(e.id)?.handleData(e.event));
 		this._localPtyService.onDidChangeProperty(e => this._ptys.get(e.id)?.handleDidChangeProperty(e.property));