@lvce-editor/shared-process 0.28.4 → 0.29.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.28.4",
+  "version": "0.29.1",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,25 +18,26 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.2.0",
-    "@lvce-editor/extension-host-helper-process": "0.28.4",
-    "@lvce-editor/ipc": "^8.2.1",
+    "@lvce-editor/extension-host-helper-process": "0.29.1",
+    "@lvce-editor/ipc": "^9.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.28.4",
     "@lvce-editor/verror": "^1.2.0",
     "debug": "^4.3.4",
-    "exit-hook": "^4.0.0",
     "is-object": "^1.0.2",
     "xdg-basedir": "^5.1.0"
   },
   "optionalDependencies": {
+    "@lvce-editor/network-process": "^1.1.0",
+    "@lvce-editor/preload": "^1.0.0",
+    "@lvce-editor/search-process": "^1.1.0",
+    "@lvce-editor/pty-host": "^1.1.0",
+    "@lvce-editor/embeds-process": "^1.1.0",
     "open": "^10.1.0",
     "tail": "^2.2.6",
     "tmp-promise": "^3.0.3",
     "trash": "^8.1.1",
-    "@lvce-editor/network-process": "0.28.4",
-    "@lvce-editor/search-process": "0.28.4",
-    "@lvce-editor/typescript-compile-process": "0.28.4"
+    "@lvce-editor/typescript-compile-process": "0.29.1"
   }
 }

package/src/parts/EmbedsProcessPath/EmbedsProcessPath.js

@@ -1,3 +1,3 @@
 import * as Path from '../Path/Path.js';
 import * as Root from '../Root/Root.js';
-export const embedsProcessPath = Path.join(Root.root, 'packages', 'embeds-process', 'dist', 'embedsProcessMain.js');
+export const embedsProcessPath = Path.join(Root.root, 'packages', 'shared-process', 'node_modules', '@lvce-editor', 'embeds-process', 'dist', 'embedsProcessMain.js');

package/src/parts/HandleDisconnect/HandleDisconnect.js

@@ -0,0 +1,6 @@
+import * as ExitCode from '../ExitCode/ExitCode.js';
+import * as Process from '../Process/Process.js';
+export const handleDisconnect = () => {
+    console.info('[shared process] disconnected');
+    Process.exit(ExitCode.Success);
+};

package/src/parts/HandleRemoteRequest/HandleRemoteRequest.js

@@ -1,9 +1,9 @@
 import * as Assert from '../Assert/Assert.js';
 import * as GetElectronFileResponse from '../GetElectronFileResponse/GetElectronFileResponse.js';
 import * as HttpServerResponse from '../HttpServerResponse/HttpServerResponse.js';
-export const handleRemoteRequest = async (request, socket) => {
-    Assert.object(request);
+export const handleRemoteRequest = async (socket, request) => {
     Assert.object(socket);
+    Assert.object(request);
     const result = await GetElectronFileResponse.getElectronFileResponse(request.url, request);
     HttpServerResponse.send(request, socket, result);
 };

package/src/parts/HandleRequestTest/HandleRequestTest.js

@@ -1,10 +1,10 @@
 import * as Assert from '../Assert/Assert.js';
 import * as GetTestRequestResponse from '../GetTestRequestResponse/GetTestRequestResponse.js';
 import * as HttpServerResponse from '../HttpServerResponse/HttpServerResponse.js';
-export const handleRequestTest = async (request, indexHtmlPath, socket) => {
+export const handleRequestTest = async (socket, request, indexHtmlPath) => {
+    Assert.object(socket);
     Assert.object(request);
     Assert.string(indexHtmlPath);
-    Assert.object(socket);
     const result = await GetTestRequestResponse.getTestRequestResponse(request, indexHtmlPath);
     HttpServerResponse.send(request, socket, result);
 };

package/src/parts/HandleWebSocket/HandleWebSocket.js

@@ -3,10 +3,10 @@ import * as DestroyWebSocket from '../DestroySocket/DestroySocket.js';
 import * as HandleWebSocketModule from '../HandleWebSocketModule/HandleWebSocketModule.js';
 import * as GetTypeFromUrl from '../GetTypeFromUrl/GetTypeFromUrl.js';
 import { VError } from '../VError/VError.js';
-export const handleWebSocket = async (message, handle) => {
+export const handleWebSocket = async (handle, message) => {
     try {
-        Assert.object(message);
         Assert.object(handle);
+        Assert.object(message);
         const { url } = message;
         const type = GetTypeFromUrl.getTypeFromUrl(url);
         handle.pause();

package/src/parts/LaunchPtyHost/LaunchPtyHost.js

@@ -1,21 +1,8 @@
-import exitHook from 'exit-hook';
-import * as Debug from '../Debug/Debug.js';
 import * as IpcParent from '../IpcParent/IpcParent.js';
 import * as PtyHostPath from '../PtyHostPath/PtyHostPath.js';
 import * as PtyHostState from '../PtyHostState/PtyHostState.js';
-const cleanUpAll = () => {
-    if (PtyHostState.state.ipc) {
-        PtyHostState.state.ipc.dispose();
-        PtyHostState.state.ipc = undefined;
-    }
-};
-const handleProcessExit = () => {
-    Debug.debug('shared process exit, clean terminals');
-    cleanUpAll();
-};
 export const launchPtyHost = async (method) => {
-    exitHook(handleProcessExit);
-    const ptyHostPath = await PtyHostPath.getPtyHostPath();
+    const ptyHostPath = await PtyHostPath.ptyHostPath;
     const ptyHost = await IpcParent.create({
         method,
         path: ptyHostPath,

package/src/parts/Main/Main.js

@@ -1,4 +1,5 @@
 import * as Command from '../Command/Command.js';
+import * as HandleDisconnect from '../HandleDisconnect/HandleDisconnect.js';
 import * as HandleUncaughtExceptionMonitor from '../HandleUncaughtExceptionMonitor/HandleUncaughtExceptionMonitor.js';
 import * as Module from '../Module/Module.js';
 import * as ParentIpc from '../ParentIpc/ParentIpc.js';
@@ -6,7 +7,7 @@ import * as ProcessListeners from '../ProcessListeners/ProcessListeners.js';
 import * as Signal from '../Signal/Signal.js';
 export const main = async () => {
     Command.setLoad(Module.load);
-    process.on('disconnect', ProcessListeners.handleDisconnect);
+    process.on('disconnect', HandleDisconnect.handleDisconnect);
     process.on(Signal.SIGTERM, ProcessListeners.handleSigTerm);
     process.on('uncaughtException', HandleUncaughtExceptionMonitor.handleUncaughtException);
     process.on('unhandledRejection', HandleUncaughtExceptionMonitor.handleUnhandledRejection);

package/src/parts/NetworkProcessPath/NetworkProcessPath.js

@@ -1 +1,2 @@
-export { networkProcessPath } from '@lvce-editor/network-process';
+import * as ResolveBin from '../ResolveBin/ResolveBin.js';
+export const networkProcessPath = ResolveBin.resolveBin('@lvce-editor/network-process');

package/src/parts/Platform/Platform.js

@@ -41,9 +41,9 @@ export const getAppImageName = () => {
 export const getSetupName = () => {
     return 'Lvce-Setup';
 };
-export const version = '0.28.4';
-export const commit = '00ff408';
-export const date = '2024-05-05T09:02:33.000Z';
+export const version = '0.29.1';
+export const commit = 'a725526';
+export const date = '2024-05-12T10:43:00.000Z';
 export const getVersion = () => {
     return version;
 };

package/src/parts/PreloadUrl/PreloadUrl.js

@@ -1,3 +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');
+export const preloadUrl = join(Root.root, 'packages', 'shared-process', 'node_modules', '@lvce-editor', 'preload', 'src', 'index.js');

package/src/parts/ProcessExplorerPath/ProcessExplorerPath.js

@@ -1,3 +1,3 @@
 import * as Path from '../Path/Path.js';
 import * as Root from '../Root/Root.js';
-export const processExplorerPath = Path.join(Root.root, 'packages', 'process-explorer', 'src', 'processExplorerMain.js');
+export const processExplorerPath = Path.join(Root.root, 'packages', 'shared-process', 'node_modules', '@lvce-editor', 'process-explorer', 'dist', 'index.js');

package/src/parts/ProcessListeners/ProcessListeners.js

@@ -1,10 +1,6 @@
 import * as ErrorHandling from '../ErrorHandling/ErrorHandling.js';
 import * as ExitCode from '../ExitCode/ExitCode.js';
 import * as Process from '../Process/Process.js';
-export const handleDisconnect = () => {
-    console.info('[shared process] disconnected');
-    Process.exit(ExitCode.Success);
-};
 export const handleSigTerm = () => {
     console.info('[shared-process] sigterm');
     Process.exit(ExitCode.Success);

package/src/parts/PtyHostPath/PtyHostPath.js

@@ -1,11 +1,2 @@
-import * as Root from '../Root/Root.js';
-import * as Path from '../Path/Path.js';
-export const getPtyHostPath = async () => {
-    try {
-        const { ptyHostPath } = await import('@lvce-editor/pty-host');
-        return ptyHostPath;
-    }
-    catch {
-        return Path.join(Root.root, 'packages', 'pty-host', 'src', 'ptyHostMain.js');
-    }
-};
+import * as ResolveBin from '../ResolveBin/ResolveBin.js';
+export const ptyHostPath = ResolveBin.resolveBin('@lvce-editor/pty-host');

package/src/parts/ResolveBin/ResolveBin.js

@@ -0,0 +1,11 @@
+import { fileURLToPath } from 'node:url';
+export const resolveBin = (name) => {
+    try {
+        const uri = import.meta.resolve(name);
+        const path = fileURLToPath(uri);
+        return path;
+    }
+    catch {
+        return '';
+    }
+};

package/src/parts/SearchProcessPath/SearchProcessPath.js

@@ -1 +1,2 @@
-export { searchProcessPath } from '@lvce-editor/search-process';
+import * as ResolveBin from '../ResolveBin/ResolveBin.js';
+export const searchProcessPath = ResolveBin.resolveBin('@lvce-editor/search-process');

package/src/parts/ChildProcess/ChildProcess.js

@@ -1,83 +0,0 @@
-import * as NodeChildProcess from 'node:child_process';
-import { Worker } from 'node:worker_threads';
-import exitHook from 'exit-hook';
-import * as Debug from '../Debug/Debug.js';
-export const state = {
-    /** @type{NodeChildProcess.ChildProcess[]} */
-    childProcesses: [],
-};
-const cleanUpAll = () => {
-    for (const childProcess of state.childProcesses) {
-        childProcess.kill();
-    }
-};
-const handleProcessExit = () => {
-    Debug.debug('exiting');
-    console.info('[shared process] exiting');
-    cleanUpAll();
-};
-/**
- *
- * @param {string} path
- * @param {NodeChildProcess.ForkOptions } options
- * @returns
- */
-export const fork = (path, argv, options) => {
-    exitHook(handleProcessExit);
-    const childProcess = NodeChildProcess.fork(path, argv, options);
-    // childProcess.on('error', (error) => {
-    //   onError(error)
-    // })
-    // childProcess.on('exit', (exitCode) => {
-    //   onExit(exitCode)
-    // })
-    // childProcess.once('message', (message) => {
-    //   if (message === 'ready') {
-    //     onReady()
-    //     childProcess.on('message', onMessage)
-    //     // TODO remove jsonrpc part from here
-    //     // childProcess.on('message', (message) => {
-    //     //   // @ts-ignore
-    //     //   if ('result' in message) {
-    //     //     // @ts-ignore
-    //     //     callbacks[message.id](message.result)
-    //     //     // @ts-ignore
-    //     //     delete callbacks[message.id]
-    //     //   } else {
-    //     //     onMessage(message)
-    //     //   }
-    //     // })
-    //   }
-    // })
-    state.childProcesses.push(childProcess);
-    return childProcess;
-};
-export const disposeFork = (childProcess) => {
-    childProcess.kill();
-};
-export const createWorker = (path, { onError, onExit, onMessage }) => {
-    const worker = new Worker(path, {
-        resourceLimits: {
-            maxOldGenerationSizeMb: 10,
-            maxYoungGenerationSizeMb: 10,
-        },
-    });
-    worker.on('error', (error) => {
-        onError(error);
-    });
-    worker.on('exit', (exitCode) => {
-        onExit(exitCode);
-    });
-    worker.on('message', (message) => {
-        onMessage(message);
-    });
-    return {
-        dispose() {
-            worker.terminate();
-        },
-        send(message) {
-            worker.postMessage(message);
-        },
-        async invoke(commandId, ...args) { },
-    };
-};