z

Author: Kartik Raj

build/webpack/webpack.extension.config.js

@@ -51,10 +51,6 @@ const config = {
                     },
                 ],
             },
-            {
-                test: /\.worker\.js$/,
-                use: { loader: 'worker-loader' },
-            },
         ],
     },
     externals: [

src/client/common/process/proc.ts

@@ -7,7 +7,8 @@ import { IDisposable } from '../types';
 import { EnvironmentVariables } from '../variables/types';
 import { execObservable, killPid, plainExec, shellExec } from './rawProcessApis';
 import { ExecutionResult, IProcessService, ObservableExecutionResult, ShellOptions, SpawnOptions } from './types';
-import { workerPlainExec, workerShellExec } from './worker/rawProcessApiWrapper';
+import { workerPlainExec } from './worker/workerPlainExec';
+import { workerShellExec } from './worker/workerShellExec';
 
 export class ProcessService extends EventEmitter implements IProcessService {
     private processesToKill = new Set<IDisposable>();

src/client/common/process/worker/main.ts

@@ -1,37 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+// !!!! IMPORTANT: DO NOT IMPORT FROM VSCODE MODULE AS IT IS NOT AVAILABLE INSIDE WORKER THREADS !!!!
+
 import { Worker } from 'worker_threads';
-import { traceVerbose, traceError } from '../../../logging/index';
 
-/**
- * Executes a worker file.
- * @param workerFileName Filename of the worker file to execute, it has to end with ".worker.js" for webpack to bundle it.
- * @param workerData Arguments to the worker file.
- * @returns
- */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
 export async function executeWorkerFile(workerFileName: string, workerData: any): Promise<any> {
-    if (!workerFileName.endsWith('.worker.js')) {
-        throw new Error('Worker file must end with ".worker.js" for webpack to bundle webworkers');
-    }
     return new Promise((resolve, reject) => {
-        traceVerbose(`Starting worker ${workerFileName} with data ${JSON.stringify(workerData)}`);
         const worker = new Worker(workerFileName, { workerData });
-        traceVerbose(`Started worker ${workerFileName}`);
         worker.on('message', (msg: { err: Error; res: unknown }) => {
-            traceVerbose(`Worker ${workerFileName} sent message ${JSON.stringify(msg)}`);
             if (msg.err) {
                 reject(msg.err);
             }
             resolve(msg.res);
         });
         worker.on('error', (ex: Error) => {
-            traceError(`Error in worker ${workerFileName}`, ex);
             reject(ex);
         });
         worker.on('exit', (code) => {
-            traceVerbose(`Worker ${workerFileName} exited with code ${code}`);
             if (code !== 0) {
                 reject(new Error(`Worker ${workerFileName} stopped with exit code ${code}`));
             }

src/client/common/process/worker/rawProcessApiWrapper.ts

@@ -1,6 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// !!!! IMPORTANT: DO NOT IMPORT FROM VSCODE MODULE AS IT IS NOT AVAILABLE INSIDE WORKER THREADS !!!!
+
+import { SpawnOptions } from 'child_process';
 import { isMainThread, parentPort, workerData } from 'worker_threads';
+import { executeWorkerFile } from './main';
+import { ExecutionResult } from './types';
+
 import { _workerPlainExecImpl } from './workerRawProcessApis';
 
+export function workerPlainExec(
+    file: string,
+    args: string[],
+    options: SpawnOptions = {},
+): Promise<ExecutionResult<string>> {
+    return executeWorkerFile(__filename, {
+        file,
+        args,
+        options,
+    });
+}
+
 if (!isMainThread) {
     _workerPlainExecImpl(workerData.file, workerData.args, workerData.options)
         .then((res) => {

src/client/common/process/worker/plainExec.worker.ts renamed to src/client/common/process/worker/workerPlainExec.ts

@@ -1,6 +1,20 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// !!!! IMPORTANT: DO NOT IMPORT FROM VSCODE MODULE AS IT IS NOT AVAILABLE INSIDE WORKER THREADS !!!!
+
 import { isMainThread, parentPort, workerData } from 'worker_threads';
+import { executeWorkerFile } from './main';
+import { ExecutionResult, ShellOptions } from './types';
 import { _workerShellExecImpl } from './workerRawProcessApis';
 
+export function workerShellExec(command: string, options: ShellOptions): Promise<ExecutionResult<string>> {
+    return executeWorkerFile(__filename, {
+        command,
+        options,
+    });
+}
+
 if (!isMainThread) {
     _workerShellExecImpl(workerData.command, workerData.options, workerData.defaultEnv)
         .then((res) => {