@lvce-editor/shared-process 0.26.2 → 0.26.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.26.2",
+  "version": "0.26.4",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,12 +18,12 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.2.0",
-    "@lvce-editor/extension-host-helper-process": "0.26.2",
-    "@lvce-editor/ipc": "^7.2.0",
+    "@lvce-editor/extension-host-helper-process": "0.26.4",
+    "@lvce-editor/ipc": "^8.0.0",
     "@lvce-editor/json-rpc": "^1.3.0",
     "@lvce-editor/jsonc-parser": "^1.2.0",
     "@lvce-editor/pretty-error": "^1.5.0",
-    "@lvce-editor/pty-host": "0.26.2",
+    "@lvce-editor/pty-host": "0.26.4",
     "@lvce-editor/verror": "^1.2.0",
     "@lvce-editor/web-socket-server": "^1.1.0",
     "debug": "^4.3.4",
@@ -32,7 +32,7 @@
     "got": "^14.2.1",
     "is-object": "^1.0.2",
     "p-queue": "^8.0.1",
-    "tar-fs": "^3.0.5",
+    "tar-fs": "^3.0.6",
     "xdg-basedir": "^5.1.0"
   },
   "optionalDependencies": {

package/src/parts/ApplyIncomingIpcResponse/ApplyIncomingIpcResponse.js

@@ -0,0 +1,13 @@
+import * as HandleIpc from '../HandleIpc/HandleIpc.js';
+import * as SendIncomingIpc from '../SendIncomingIpc/SendIncomingIpc.js';
+export const applyIncomingIpcResponse = async (target, response, ipcId) => {
+    switch (response.type) {
+        case 'handle':
+            HandleIpc.handleIpc(target);
+            break;
+        case 'send':
+            return SendIncomingIpc.sendIncomingIpc(target, response, ipcId);
+        default:
+            throw new Error('unexpected response');
+    }
+};

package/src/parts/ConnectIpcToElectron/ConnectIpcToElectron.js

@@ -2,8 +2,8 @@ import * as GetPortTuple from '../GetPortTuple/GetPortTuple.js';
 import * as IpcId from '../IpcId/IpcId.js';
 import * as JsonRpc from '../JsonRpc/JsonRpc.js';
 import * as ParentIpc from '../ParentIpc/ParentIpc.js';
-export const connectIpcToElectron = async (ipc) => {
+export const connectIpcToElectron = async (ipc, ipcId = IpcId.Unknown) => {
     const { port1, port2 } = await GetPortTuple.getPortTuple();
     await JsonRpc.invokeAndTransfer(ipc, [port1], 'HandleElectronMessagePort.handleElectronMessagePort', IpcId.MainProcess);
-    await ParentIpc.invokeAndTransfer('HandleElectronMessagePort.handleElectronMessagePort', [port2]);
+    await ParentIpc.invokeAndTransfer('HandleElectronMessagePort.handleElectronMessagePort', [port2], ipcId);
 };

package/src/parts/ElectronWindowProcessExplorer/ElectronWindowProcessExplorer.js

@@ -2,12 +2,12 @@ import { writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import * as ColorTheme from '../ColorTheme/ColorTheme.js';
-import * as GetPreloadUrl from '../GetPreloadUrl/GetPreloadUrl.js';
+import * as PreloadUrl from '../PreloadUrl/PreloadUrl.js';
 import * as GetProcessExplorerUrl from '../GetProcessExplorerUrl/GetProcessExplorerUrl.js';
 import * as ParentIpc from '../ParentIpc/ParentIpc.js';
 const getOptions = async (colorThemeJson) => {
     const backgroundColor = colorThemeJson.MainBackground;
-    const preload = GetPreloadUrl.getPreloadUrl();
+    const preload = PreloadUrl.preloadUrl;
     const options = {
         width: 800,
         height: 500,

package/src/parts/GetBrowserWindowOptions/GetBrowserWindowOptions.js

@@ -1,5 +1,5 @@
 import * as GetIcon from '../GetIcon/GetIcon.js';
-import * as GetPreloadUrl from '../GetPreloadUrl/GetPreloadUrl.js';
+import * as PreloadUrl from '../PreloadUrl/PreloadUrl.js';
 /**
  *
  * @returns {any}
@@ -21,7 +21,7 @@ export const getBrowserWindowOptions = ({ x, y, width, height, titleBarStyle, ti
             sandbox: true,
             contextIsolation: true,
             v8CacheOptions: 'bypassHeatCheck', // TODO this is what vscode uses, but it doesn't work properly in electron https://github.com/electron/electron/issues/27075
-            preload: GetPreloadUrl.getPreloadUrl(),
+            preload: PreloadUrl.preloadUrl,
             additionalArguments: ['--lvce-window-kind'],
         },
         backgroundColor: background,

package/src/parts/GetWindowId/GetWindowId.js

@@ -1,5 +1,6 @@
 import * as Assert from '../Assert/Assert.js';
-export const getWindowId = (ipc) => {
-    Assert.object(ipc);
-    return ipc.windowId;
+import * as ParentIpc from '../ParentIpc/ParentIpc.js';
+export const getWindowId = (webContentsId) => {
+    Assert.number(webContentsId);
+    return ParentIpc.invoke('GetWindowId.getWindowId', webContentsId);
 };

package/src/parts/HandleElectronMessagePort/HandleElectronMessagePort.js

@@ -1,11 +1,8 @@
 import * as HandleIncomingIpc from '../HandleIncomingIpc/HandleIncomingIpc.js';
 import * as IpcId from '../IpcId/IpcId.js';
-export const handleElectronMessagePort = (messagePort, ...params) => {
-    const ipcId = params[0];
-    const windowId = params[1];
+export const handleElectronMessagePort = (messagePort, ipcId) => {
     const message = {
         ipcId,
-        windowId,
     };
     return HandleIncomingIpc.handleIncomingIpc(IpcId.SharedProcess, messagePort, message);
 };

package/src/parts/HandleIncomingIpc/HandleIncomingIpc.js

@@ -1,44 +1,18 @@
+import * as ApplyIncomingIpcResponse from '../ApplyIncomingIpcResponse/ApplyIncomingIpcResponse.js';
 import * as Assert from '../Assert/Assert.js';
-import * as HandleIpc from '../HandleIpc/HandleIpc.js';
+import * as HandleIncomingIpcMessagePort from '../HandleIncomingIpcMessagePort/HandleIncomingIpcMessagePort.js';
+import * as HandleIncomingIpcWebSocket from '../HandleIncomingIpcWebSocket/HandleIncomingIpcWebSocket.js';
 import * as HandleIpcModule from '../HandleIpcModule/HandleIpcModule.js';
 import * as IsMessagePortMain from '../IsMessagePortMain/IsMessagePortMain.js';
-import * as SendIncomingIpc from '../SendIncomingIpc/SendIncomingIpc.js';
-const handleIncomingIpcMessagePort = async (module, handle, message) => {
-    const target = await module.targetMessagePort(handle, message);
-    const response = module.upgradeMessagePort(handle, message);
-    return {
-        target,
-        response,
-    };
-};
-const handleIncomingIpcWebSocket = async (module, handle, message) => {
-    const target = await module.targetWebSocket(handle, message);
-    const response = module.upgradeWebSocket(handle, message);
-    return {
-        target,
-        response,
-    };
-};
 const getIpcAndResponse = (module, handle, message) => {
     if (IsMessagePortMain.isMessagePortMain(handle)) {
-        return handleIncomingIpcMessagePort(module, handle, message);
-    }
-    return handleIncomingIpcWebSocket(module, handle, message);
-};
-const applyResponse = async (target, response, ipcId) => {
-    switch (response.type) {
-        case 'handle':
-            HandleIpc.handleIpc(target);
-            break;
-        case 'send':
-            return SendIncomingIpc.sendIncomingIpc(target, response, ipcId);
-        default:
-            throw new Error('unexpected response');
+        return HandleIncomingIpcMessagePort.handleIncomingIpcMessagePort(module, handle, message);
     }
+    return HandleIncomingIpcWebSocket.handleIncomingIpcWebSocket(module, handle, message);
 };
 export const handleIncomingIpc = async (ipcId, handle, message) => {
     Assert.number(ipcId);
     const module = HandleIpcModule.getModule(ipcId);
     const { target, response } = await getIpcAndResponse(module, handle, message);
-    await applyResponse(target, response, ipcId);
+    await ApplyIncomingIpcResponse.applyIncomingIpcResponse(target, response, ipcId);
 };

package/src/parts/HandleIncomingIpcMessagePort/HandleIncomingIpcMessagePort.js

@@ -0,0 +1,8 @@
+export const handleIncomingIpcMessagePort = async (module, handle, message) => {
+    const target = await module.targetMessagePort(handle, message);
+    const response = module.upgradeMessagePort(handle, message);
+    return {
+        target,
+        response,
+    };
+};

package/src/parts/HandleIncomingIpcWebSocket/HandleIncomingIpcWebSocket.js

@@ -0,0 +1,8 @@
+export const handleIncomingIpcWebSocket = async (module, handle, message) => {
+    const target = await module.targetWebSocket(handle, message);
+    const response = module.upgradeWebSocket(handle, message);
+    return {
+        target,
+        response,
+    };
+};

package/src/parts/IpcId/IpcId.js

@@ -1,8 +1,10 @@
-export const SharedProcess = 1;
-export const MainProcess = -5;
 export const EmbedsProcess = 2;
-export const TerminalProcess = 7;
+export const EmbedsWorker = 77;
 export const ExtensionHostHelperProcess = 3;
+export const MainProcess = -5;
 export const ProcessExplorer = 11;
 export const SearchProcess = 13;
+export const SharedProcess = 1;
+export const TerminalProcess = 7;
 export const Unknown = 0;
+export const ProcessExplorerRenderer = 33;

package/src/parts/LaunchEmbedsProcess/LaunchEmbedsProcess.js

@@ -3,6 +3,7 @@ import * as EmbedsProcessPath from '../EmbedsProcessPath/EmbedsProcessPath.js';
 import * as HandleIpc from '../HandleIpc/HandleIpc.js';
 import * as IpcParent from '../IpcParent/IpcParent.js';
 import * as IpcParentType from '../IpcParentType/IpcParentType.js';
+import * as IpcId from '../IpcId/IpcId.js';
 export const launchEmbedsProcess = async () => {
     const ipc = await IpcParent.create({
         method: IpcParentType.ElectronUtilityProcess,
@@ -12,7 +13,7 @@ export const launchEmbedsProcess = async () => {
         name: 'Embeds Process',
     });
     HandleIpc.handleIpc(ipc);
-    await ConnectIpcToElectron.connectIpcToElectron(ipc);
+    await ConnectIpcToElectron.connectIpcToElectron(ipc, IpcId.EmbedsProcess);
     HandleIpc.unhandleIpc(ipc);
     return ipc;
 };

package/src/parts/LaunchProcessExplorer/LaunchProcessExplorer.js

@@ -1,5 +1,6 @@
 import * as ConnectIpcToElectron from '../ConnectIpcToElectron/ConnectIpcToElectron.js';
 import * as HandleIpc from '../HandleIpc/HandleIpc.js';
+import * as IpcId from '../IpcId/IpcId.js';
 import * as IpcParent from '../IpcParent/IpcParent.js';
 import * as IpcParentType from '../IpcParentType/IpcParentType.js';
 import * as ProcessExplorerPath from '../ProcessExplorerPath/ProcessExplorerPath.js';
@@ -12,7 +13,7 @@ export const launchProcessExplorer = async () => {
         name: 'Process Explorer',
     });
     HandleIpc.handleIpc(ipc);
-    await ConnectIpcToElectron.connectIpcToElectron(ipc);
+    await ConnectIpcToElectron.connectIpcToElectron(ipc, IpcId.ProcessExplorerRenderer);
     HandleIpc.unhandleIpc(ipc);
     return ipc;
 };

package/src/parts/Platform/Platform.js

@@ -41,9 +41,9 @@ export const getAppImageName = () => {
 export const getSetupName = () => {
     return 'Lvce-Setup';
 };
-export const version = '0.26.2';
-export const commit = 'efc5b0f';
-export const date = '2024-04-23T20:38:06.000Z';
+export const version = '0.26.4';
+export const commit = '59e174c';
+export const date = '2024-04-28T08:40:44.000Z';
 export const getVersion = () => {
     return version;
 };

package/src/parts/PreloadUrl/PreloadUrl.js

@@ -0,0 +1,3 @@
+import { join } from 'node:path';
+import * as Root from '../Root/Root.js';
+export const preloadUrl = join(Root.root, 'packages', 'preload', 'src', 'index.js');

package/src/parts/RequiresSocket/RequiresSocket.js

@@ -1,6 +1,7 @@
 // TODO find a better way to do this
 // most commands don't require sockets
 // but output channel and terminal need to continuously send data through the socket
+// TODO remove all of these
 const METHODS_THAT_REQUIRE_SOCKET = new Set([
     'OutputChannel.open',
     'ExtensionHost.start',
@@ -9,7 +10,6 @@ const METHODS_THAT_REQUIRE_SOCKET = new Set([
     'Terminal.create',
     'IncrementalTextSearch.start',
     'ElectronApplicationMenu.setItems',
-    'GetWindowId.getWindowId',
     'HandleMessagePortForExtensionHostHelperProcess.handleMessagePortForExtensionHostHelperProcess',
     'ElectronBrowserView.createBrowserView',
     'ElectronWebContentsView.createWebContentsView',

package/src/parts/GetPreloadUrl/GetPreloadUrl.js

@@ -1,5 +0,0 @@
-import { join } from 'node:path';
-import * as Root from '../Root/Root.js';
-export const getPreloadUrl = () => {
-    return join(Root.root, 'packages', 'main-process', 'src', 'preload.js');
-};