Merge pull request #1 from ZA139/new-process_tree

Integrate windows-process-tree for Windows process enumeration

Author: ZA139

package-lock.json

@@ -682,6 +682,7 @@
         "@vscode/debugprotocol": "^1.65.0",
         "@vscode/extension-telemetry": "^0.8.4",
         "@vscode/python-extension": "^1.0.6",
+        "@vscode/windows-process-tree": "^0.7.0",
         "fs-extra": "^11.2.0",
         "iconv-lite": "^0.6.3",
         "jsonc-parser": "^3.0.0",

package.json

@@ -4,6 +4,7 @@
 'use strict';
 
 import { l10n } from 'vscode';
+import * as wpc from '@vscode/windows-process-tree';
 import { getOSType, OSType } from '../../common/platform';
 import { PsProcessParser } from './psProcessParser';
 import { IAttachItem, IAttachProcessProvider, ProcessListCommand } from './types';
@@ -58,24 +59,46 @@ export class AttachProcessProvider implements IAttachProcessProvider {
     }
 
     public async _getInternalProcessEntries(): Promise<IAttachItem[]> {
-        let processCmd: ProcessListCommand;
         const osType = getOSType();
+
+        if (osType === OSType.Windows) {
+            try {
+                const processList = await new Promise<wpc.IProcessInfo[]>((resolve) => {
+                    wpc.getAllProcesses((processes) => resolve(processes), wpc.ProcessDataFlag.CommandLine);
+                });
+                return processList.map((p) => ({
+                    label: p.name,
+                    description: String(p.pid),
+                    detail: p.commandLine || '',
+                    id: String(p.pid),
+                    processName: p.name,
+                    commandLine: p.commandLine || '',
+                }));
+            } catch {
+                const customEnvVars = await getEnvironmentVariables();
+                const output = await plainExec(
+                    WmicProcessParser.wmicCommand.command,
+                    WmicProcessParser.wmicCommand.args,
+                    { throwOnStdErr: true },
+                    customEnvVars,
+                );
+                logProcess(WmicProcessParser.wmicCommand.command, WmicProcessParser.wmicCommand.args, { throwOnStdErr: true });
+                return WmicProcessParser.parseProcesses(output.stdout);
+            }
+        }
+
+        let processCmd: ProcessListCommand;
         if (osType === OSType.OSX) {
             processCmd = PsProcessParser.psDarwinCommand;
         } else if (osType === OSType.Linux) {
             processCmd = PsProcessParser.psLinuxCommand;
-        } else if (osType === OSType.Windows) {
-            processCmd = WmicProcessParser.wmicCommand;
         } else {
             throw new Error(l10n.t("Operating system '{0}' not supported.", osType));
         }
 
         const customEnvVars = await getEnvironmentVariables();
         const output = await plainExec(processCmd.command, processCmd.args, { throwOnStdErr: true }, customEnvVars);
         logProcess(processCmd.command, processCmd.args, { throwOnStdErr: true });
-
-        return osType === OSType.Windows
-            ? WmicProcessParser.parseProcesses(output.stdout)
-            : PsProcessParser.parseProcesses(output.stdout);
+        return PsProcessParser.parseProcesses(output.stdout);
     }
 }