-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #135774 from microsoft/alex/main-process-extension…
…-host Create extension host processes from a node worker in the main process
- Loading branch information
Showing
15 changed files
with
375 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
src/vs/platform/extensions/electron-main/directMainProcessExtensionHostStarter.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /*--------------------------------------------------------------------------------------------- | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. See License.txt in the project root for license information. | ||
| *--------------------------------------------------------------------------------------------*/ | ||
|
|
||
| import { ExtensionHostStarter, IPartialLogService } from 'vs/platform/extensions/node/extensionHostStarter'; | ||
| import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService'; | ||
| import { ILogService } from 'vs/platform/log/common/log'; | ||
|
|
||
| export class DirectMainProcessExtensionHostStarter extends ExtensionHostStarter { | ||
|
|
||
| constructor( | ||
| @ILogService logService: IPartialLogService, | ||
| @ILifecycleMainService lifecycleMainService: ILifecycleMainService | ||
| ) { | ||
| super(logService); | ||
|
|
||
| // Abnormal shutdown: terminate extension hosts asap | ||
| lifecycleMainService.onWillKill(() => { | ||
| this.killAllNow(); | ||
| }); | ||
|
|
||
| // Normal shutdown: gracefully await extension host shutdowns | ||
| lifecycleMainService.onWillShutdown((e) => { | ||
| e.join(this.waitForAllExit(6000)); | ||
| }); | ||
| } | ||
|
|
||
| } |
160 changes: 160 additions & 0 deletions
160
src/vs/platform/extensions/electron-main/workerMainProcessExtensionHostStarter.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,160 @@ | ||
| /*--------------------------------------------------------------------------------------------- | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. See License.txt in the project root for license information. | ||
| *--------------------------------------------------------------------------------------------*/ | ||
|
|
||
| import { canceled, SerializedError } from 'vs/base/common/errors'; | ||
| import { IDisposable } from 'vs/base/common/lifecycle'; | ||
| import { IExtensionHostProcessOptions, IExtensionHostStarter } from 'vs/platform/extensions/common/extensionHostStarter'; | ||
| import { Event } from 'vs/base/common/event'; | ||
| import { FileAccess } from 'vs/base/common/network'; | ||
| import { ILogService } from 'vs/platform/log/common/log'; | ||
| import { Worker } from 'worker_threads'; | ||
| import { IWorker, IWorkerCallback, IWorkerFactory, SimpleWorkerClient } from 'vs/base/common/worker/simpleWorker'; | ||
| import { IExtensionHostStarterWorkerHost } from 'vs/platform/extensions/node/extensionHostStarterWorker'; | ||
| import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService'; | ||
| import { ExtensionHostStarter } from 'vs/platform/extensions/node/extensionHostStarter'; | ||
|
|
||
| class NodeWorker implements IWorker { | ||
|
|
||
| private readonly _worker: Worker; | ||
|
|
||
| constructor(callback: IWorkerCallback, onErrorCallback: (err: any) => void) { | ||
| this._worker = new Worker( | ||
| FileAccess.asFileUri('vs/platform/extensions/node/extensionHostStarterWorkerMain.js', require).fsPath, | ||
| ); | ||
| this._worker.on('message', callback); | ||
| this._worker.on('error', onErrorCallback); | ||
| // this._worker.on('exit', (code) => { | ||
| // console.log(`worker exited with code `, code); | ||
| // }); | ||
| } | ||
|
|
||
| getId(): number { | ||
| return 1; | ||
| } | ||
|
|
||
| postMessage(message: any, transfer: ArrayBuffer[]): void { | ||
| this._worker.postMessage(message, transfer); | ||
| } | ||
|
|
||
| dispose(): void { | ||
| this._worker.terminate(); | ||
| } | ||
| } | ||
|
|
||
| class ExtensionHostStarterWorkerHost implements IExtensionHostStarterWorkerHost { | ||
| constructor( | ||
| @ILogService private readonly _logService: ILogService | ||
| ) { } | ||
|
|
||
| public async logInfo(message: string): Promise<void> { | ||
| this._logService.info(message); | ||
| } | ||
| } | ||
|
|
||
| export class WorkerMainProcessExtensionHostStarter implements IDisposable, IExtensionHostStarter { | ||
| _serviceBrand: undefined; | ||
|
|
||
| private _proxy: ExtensionHostStarter | null; | ||
| private readonly _worker: SimpleWorkerClient<ExtensionHostStarter, IExtensionHostStarterWorkerHost>; | ||
| private _shutdown = false; | ||
|
|
||
| constructor( | ||
| @ILogService private readonly _logService: ILogService, | ||
| @ILifecycleMainService lifecycleMainService: ILifecycleMainService | ||
| ) { | ||
| this._proxy = null; | ||
|
|
||
| const workerFactory: IWorkerFactory = { | ||
| create: (moduleId: string, callback: IWorkerCallback, onErrorCallback: (err: any) => void): IWorker => { | ||
| const worker = new NodeWorker(callback, onErrorCallback); | ||
| worker.postMessage(moduleId, []); | ||
| return worker; | ||
| } | ||
| }; | ||
| this._worker = new SimpleWorkerClient<ExtensionHostStarter, IExtensionHostStarterWorkerHost>( | ||
| workerFactory, | ||
| 'vs/platform/extensions/node/extensionHostStarterWorker', | ||
| new ExtensionHostStarterWorkerHost(this._logService) | ||
| ); | ||
| this._initialize(); | ||
|
|
||
| // Abnormal shutdown: terminate extension hosts asap | ||
| lifecycleMainService.onWillKill(async () => { | ||
| this._shutdown = true; | ||
| if (this._proxy) { | ||
| this._proxy.killAllNow(); | ||
| } | ||
| }); | ||
|
|
||
| // Normal shutdown: gracefully await extension host shutdowns | ||
| lifecycleMainService.onWillShutdown((e) => { | ||
| this._shutdown = true; | ||
| if (this._proxy) { | ||
| e.join(this._proxy.waitForAllExit(6000)); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| dispose(): void { | ||
| // Intentionally not killing the extension host processes | ||
| } | ||
|
|
||
| async _initialize(): Promise<void> { | ||
| this._proxy = await this._worker.getProxyObject(); | ||
| this._logService.info(`ExtensionHostStarterWorker created`); | ||
| } | ||
|
|
||
| onDynamicStdout(id: string): Event<string> { | ||
| return this._proxy!.onDynamicStderr(id); | ||
| } | ||
|
|
||
| onDynamicStderr(id: string): Event<string> { | ||
| return this._proxy!.onDynamicStderr(id); | ||
| } | ||
|
|
||
| onDynamicMessage(id: string): Event<any> { | ||
| return this._proxy!.onDynamicMessage(id); | ||
| } | ||
|
|
||
| onDynamicError(id: string): Event<{ error: SerializedError; }> { | ||
| return this._proxy!.onDynamicError(id); | ||
| } | ||
|
|
||
| onDynamicExit(id: string): Event<{ code: number; signal: string; }> { | ||
| return this._proxy!.onDynamicExit(id); | ||
| } | ||
|
|
||
| async createExtensionHost(): Promise<{ id: string; }> { | ||
| const proxy = await this._worker.getProxyObject(); | ||
| if (this._shutdown) { | ||
| throw canceled(); | ||
| } | ||
| return proxy.createExtensionHost(); | ||
| } | ||
|
|
||
| async start(id: string, opts: IExtensionHostProcessOptions): Promise<{ pid: number; }> { | ||
| const proxy = await this._worker.getProxyObject(); | ||
| if (this._shutdown) { | ||
| throw canceled(); | ||
| } | ||
| return proxy.start(id, opts); | ||
| } | ||
|
|
||
| async enableInspectPort(id: string): Promise<boolean> { | ||
| const proxy = await this._worker.getProxyObject(); | ||
| if (this._shutdown) { | ||
| throw canceled(); | ||
| } | ||
| return proxy.enableInspectPort(id); | ||
| } | ||
|
|
||
| async kill(id: string): Promise<void> { | ||
| const proxy = await this._worker.getProxyObject(); | ||
| if (this._shutdown) { | ||
| throw canceled(); | ||
| } | ||
| return proxy.kill(id); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.