@lvce-editor/process-explorer-worker 3.18.0 → 3.20.0

package/index.js

@@ -2376,7 +2376,7 @@ const set$1 = rpc => {
   state.connected = true;
 };
 
-const handleMessagePort = async (port, viewletCommandMap) => {
+const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess = true) => {
   const executeViewletCommand = async (uid, command, ...args) => {
     const fn = viewletCommandMap[`ProcessExplorer.${command}`];
     if (typeof fn !== 'function') {
@@ -2391,7 +2391,9 @@ const handleMessagePort = async (port, viewletCommandMap) => {
     },
     messagePort: port
   });
-  set$1(rpc);
+  if (setAsRendererProcess) {
+    set$1(rpc);
+  }
 };
 
 const killProcess = async (state, index = state.focusedIndex) => {
@@ -2515,6 +2517,23 @@ const prepareError = async error => {
   }
 };
 
+const conceptualChildNames = ['embeds-process', 'file-system-process', 'file-watcher-process', 'process-explorer', 'terminal-process'];
+const reparentSharedProcessChildren = processes => {
+  const sharedProcess = processes.find(process => process.name === 'shared-process');
+  if (!sharedProcess) {
+    return processes;
+  }
+  return processes.map(process => {
+    if (process.ppid === sharedProcess.pid || !conceptualChildNames.includes(process.name)) {
+      return process;
+    }
+    return {
+      ...process,
+      ppid: sharedProcess.pid
+    };
+  });
+};
+
 const getFocusedIndex = (oldFocusedIndex, visibleProcesses) => {
   if (visibleProcesses.length === 0) {
     return -1;
@@ -2541,7 +2560,8 @@ const refresh = async state => {
     const processes = await listProcesses(rootPid, state.platform);
     const frontendMemoryProcesses = state.includeFrontendMemoryUsage ? await getFrontendMemoryUsage(rootPid) : [];
     const allProcesses = [...processes, ...frontendMemoryProcesses];
-    const visibleProcesses = getVisibleProcesses(allProcesses, state.collapsedPids, rootPid);
+    const displayedProcesses = state.platform === Electron ? reparentSharedProcessChildren(allProcesses) : allProcesses;
+    const visibleProcesses = getVisibleProcesses(displayedProcesses, state.collapsedPids, rootPid);
     return {
       ...state,
       errorCodeFrame: '',
@@ -2549,7 +2569,7 @@ const refresh = async state => {
       errorStack: '',
       focusedIndex: getFocusedIndex(state.focusedIndex, visibleProcesses),
       initial: false,
-      processes: allProcesses,
+      processes: displayedProcesses,
       rootPid,
       visibleProcesses
     };
@@ -3208,7 +3228,7 @@ const setUpdateInterval = (state, updateInterval) => {
   };
 };
 
-const handleDirectMessagePort = port => handleMessagePort(port, commandMap);
+const handleDirectMessagePort = (port, setAsRendererProcess = true) => handleMessagePort(port, commandMap, setAsRendererProcess);
 const commandMap = {
   'ProcessExplorer.collapseAll': wrapCommand(collapseAll),
   'ProcessExplorer.create': create$d,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/process-explorer-worker",
-  "version": "3.18.0",
+  "version": "3.20.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",