@lvce-editor/process-explorer 3.2.0 → 3.3.0

package/dist/index.js

@@ -1,11 +1,11 @@
 import { ElectronMessagePortRpcClient, WebSocketRpcParent, NodeWebSocketRpcClient, NodeWorkerRpcClient, NodeForkedProcessRpcClient, ElectronUtilityProcessRpcClient } from '@lvce-editor/rpc';
 import { object, number, string } from '@lvce-editor/assert';
 import { RpcId, MainProcess, set as set$2 } from '@lvce-editor/rpc-registry';
+import { execFile as execFile$2 } from 'node:child_process';
+import { promisify } from 'node:util';
 import { VError } from '@lvce-editor/verror';
 import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
-import { execFile as execFile$1 } from 'node:child_process';
-import { promisify } from 'node:util';
 
 const state = {
   commandMap: {}
@@ -70,6 +70,9 @@ const createWebSocketRpc = async (create, handle, request) => {
   });
 };
 const handleWebSocket = async (handle, request, rpcId) => {
+  if (!handle || !request) {
+    return;
+  }
   object(handle);
   object(request);
   const rpc = await createWebSocketRpc(NodeWebSocketRpcClient.create, handle, request);
@@ -85,13 +88,50 @@ const getModule$1 = async () => {
   return Promise.resolve().then(function () { return ListProcessesWithMemoryUsageUnix; });
 };
 
-const listProcessesWithMemoryUsage$2 = async rootPid => {
+const listProcessesWithMemoryUsage$2 = async (rootPid, includeElectronData = true) => {
   const module = await getModule$1();
-  return module.listProcessesWithMemoryUsage(rootPid);
+  return module.listProcessesWithMemoryUsage(rootPid, includeElectronData);
 };
 
-const getMainProcessId = () => {
-  return process.ppid;
+const execFile$1 = promisify(execFile$2);
+const parseProcessId = stdout => {
+  const parentProcessId = Number(stdout.trim());
+  if (!Number.isFinite(parentProcessId) || parentProcessId <= 0) {
+    return 0;
+  }
+  return parentProcessId;
+};
+const getParentProcessIdUnix = async pid => {
+  const {
+    stdout
+  } = await execFile$1('ps', ['-o', 'ppid=', '-p', String(pid)]);
+  return parseProcessId(stdout);
+};
+const getParentProcessIdWindows = async pid => {
+  const {
+    stdout
+  } = await execFile$1('powershell.exe', ['-NoProfile', '-Command', `(Get-CimInstance Win32_Process -Filter "ProcessId = ${pid}").ParentProcessId`]);
+  return parseProcessId(stdout);
+};
+const getParentProcessId = async pid => {
+  if (process.platform === 'win32') {
+    return getParentProcessIdWindows(pid);
+  }
+  return getParentProcessIdUnix(pid);
+};
+const getRemoteRootProcessId = async (childProcessId = process.ppid) => {
+  try {
+    const parentProcessId = await getParentProcessId(childProcessId);
+    return parentProcessId || process.ppid;
+  } catch {
+    return process.ppid;
+  }
+};
+const getMainProcessId = (includeElectronData = true, childProcessId = process.ppid) => {
+  if (includeElectronData) {
+    return Promise.resolve(process.ppid);
+  }
+  return getRemoteRootProcessId(childProcessId);
 };
 
 const commandMap = {
@@ -319,13 +359,13 @@ const CommandLine = 2;
 
 // listProcesses windows implementation based on https://github.com/microsoft/vscode/blob/c0769274fa136b45799edeccc0d0a2f645b75caf/src/vs/base/node/ps.ts (License MIT)
 
-const listProcessesWithMemoryUsage$1 = async rootPid => {
+const listProcessesWithMemoryUsage$1 = async (rootPid, includeElectronData = true) => {
   try {
     const processList = await getProcessList(rootPid, CommandLine | Memory);
     if (!processList) {
       throw new VError(`Root process ${rootPid} not found`);
     }
-    const pidMap = await createPidMap();
+    const pidMap = includeElectronData ? await createPidMap() : {};
     const completeProcessList = await addCpuUsage(processList);
     const result = toResult(completeProcessList, rootPid, pidMap);
     return result;
@@ -417,7 +457,7 @@ const addAccurateMemoryUsage = async process => {
 
 const SIGINT = 'SIGINT';
 
-const execFile = promisify(execFile$1);
+const execFile = promisify(execFile$2);
 const getPsOutput = async () => {
   try {
     const {
@@ -512,10 +552,10 @@ const parsePsOutput = (stdout, rootPid, pidMap) => {
   return result;
 };
 
-const listProcessesWithMemoryUsage = async rootPid => {
+const listProcessesWithMemoryUsage = async (rootPid, includeElectronData = true) => {
   // console.time('getPsOutput')
   const stdout = await getPsOutput();
-  const pidMap = await createPidMap();
+  const pidMap = includeElectronData ? await createPidMap() : {};
   // console.log({ stdout })
   // console.timeEnd('getPsOutput')
   // console.time('parsePsOutput')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/process-explorer",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "Process Explorer",
   "main": "dist/index.js",
   "bin": "bin/processExplorer.js",