@lvce-editor/shared-process 0.29.7 → 0.30.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.29.7",
+  "version": "0.30.0",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,10 +18,10 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.2.0",
-    "@lvce-editor/extension-host-helper-process": "0.29.7",
-    "@lvce-editor/ipc": "^9.1.0",
+    "@lvce-editor/extension-host-helper-process": "0.30.0",
+    "@lvce-editor/ipc": "^9.2.0",
     "@lvce-editor/json-rpc": "^1.3.0",
-    "@lvce-editor/jsonc-parser": "^1.2.0",
+    "@lvce-editor/jsonc-parser": "^1.4.0",
     "@lvce-editor/pretty-error": "^1.5.0",
     "@lvce-editor/verror": "^1.3.0",
     "debug": "^4.3.5",
@@ -32,12 +32,12 @@
     "@lvce-editor/network-process": "^1.2.0",
     "@lvce-editor/preload": "^1.3.0",
     "@lvce-editor/search-process": "^1.2.0",
+    "@lvce-editor/typescript-compile-process": "^1.2.0",
     "@lvce-editor/pty-host": "^1.2.0",
     "@lvce-editor/embeds-process": "^1.5.0",
     "open": "^10.1.0",
     "tail": "^2.2.6",
     "tmp-promise": "^3.0.3",
-    "trash": "^8.1.1",
-    "@lvce-editor/typescript-compile-process": "0.29.7"
+    "trash": "^8.1.1"
   }
 }

package/src/parts/ExportStatic/ExportStatic.js

@@ -76,9 +76,12 @@ const clean = async (root) => {
 const copyStaticFiles = async (root, commitHash) => {
     await FileSystem.copy(Path.join(root, 'node_modules', '@lvce-editor', 'server', 'static'), Path.join(root, 'dist'));
 };
-const applyOverrides = async ({ root, commitHash, pathPrefix }) => {
-    await replace(Path.join(root, 'dist', commitHash, 'packages', 'renderer-process', 'dist', 'rendererProcessMain.js'), 'platform = getPlatform();', 'platform = "web"');
+const applyOverridesRendererProcess = async ({ root, commitHash, pathPrefix }) => {
+    await replace(Path.join(root, 'dist', commitHash, 'packages', 'renderer-process', 'dist', 'rendererProcessMain.js'), 'platform = Remote;', 'platform = Web');
     await replace(Path.join(root, 'dist', commitHash, 'packages', 'renderer-process', 'dist', 'rendererProcessMain.js'), `/${commitHash}`, `${pathPrefix}/${commitHash}`);
+};
+const applyOverrides = async ({ root, commitHash, pathPrefix }) => {
+    await applyOverridesRendererProcess({ root, commitHash, pathPrefix });
     await replace(Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'), 'platform = Remote;', 'platform = Web$1;');
     await replace(Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'), `/${commitHash}`, `${pathPrefix}/${commitHash}`);
     await replace(Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'), `return \`\${assetDir}/extensions/builtin.theme-\${colorThemeId}/color-theme.json\``, `return \`\${assetDir}/themes/\${colorThemeId}.json\``);
@@ -138,11 +141,11 @@ const applyOverrides = async ({ root, commitHash, pathPrefix }) => {
     }
 };
 const addExtensionSeo = async ({ root, name, description, commitHash }) => {
-    await replace(Path.join(root, 'dist', 'index.html'), '<title>Code Editor</title>', `<title>${name}</title>`);
+    await replace(Path.join(root, 'dist', 'index.html'), '<title>Lvce Editor</title>', `<title>${name}</title>`);
     await replace(Path.join(root, 'dist', commitHash, 'manifest.json'), `"name": "Code Editor Web - OSS"`, `"name": "${name}"`);
     await replace(Path.join(root, 'dist', commitHash, 'manifest.json'), `"short_name": "Web - OSS"`, `"short_name": "${name}"`);
     await replace(Path.join(root, 'dist', commitHash, 'manifest.json'), `"description": "Web Code Editor."`, `"description": "${description}"`);
-    await replace(Path.join(root, 'dist', 'index.html'), '<meta name="description" content="Online Code Editor" />', `<meta name="description" content="${description}" />`);
+    await replace(Path.join(root, 'dist', 'index.html'), '<meta name="description" content="VS Code inspired text editor that mostly runs in a webworker." />', `<meta name="description" content="${description}" />`);
 };
 const getId = (object) => {
     return object.id;

package/src/parts/FileWatcher/FileWatcher.ipc.js

@@ -0,0 +1,5 @@
+import * as FileWatcher from '../FileWatcher/FileWatcher.js';
+export const name = 'FileWatcher';
+export const Commands = {
+    watch: FileWatcher.watch,
+};

package/src/parts/FileWatcher/FileWatcher.js

@@ -0,0 +1,27 @@
+import * as fs from 'node:fs/promises';
+import * as JsonRpc from '../JsonRpc/JsonRpc.js';
+const handleEvents = async (watcher, id, ipc) => {
+    try {
+        for await (const event of watcher) {
+            JsonRpc.send(ipc, 'FileWatcher.handleEvent', id, event);
+            // ipc.send('FileWatcher.handleEvent', id, event)
+        }
+    }
+    catch (error) {
+        console.log('event error', error);
+    }
+};
+// TODO  run file watcher in a separate process to not crash application when file watcher crashes
+export const watch = async (ipc, id, { roots, exclude }) => {
+    try {
+        for (const root of roots) {
+            const watcher = fs.watch(root, {
+                recursive: true,
+            });
+            handleEvents(watcher, id, ipc);
+        }
+    }
+    catch (error) {
+        console.error(error);
+    }
+};

package/src/parts/HandleIpcFileWatcher/HandleIpcFileWatcher.js

@@ -0,0 +1,24 @@
+import * as PtyHost from '../PtyHost/PtyHost.js';
+import * as IpcParentType from '../IpcParentType/IpcParentType.js';
+export const targetWebSocket = () => {
+    return PtyHost.getOrCreate(IpcParentType.NodeForkedProcess);
+};
+export const upgradeWebSocket = (handle, message) => {
+    return {
+        type: 'send',
+        method: 'HandleWebSocket.handleWebSocket',
+        params: [message],
+        transfer: handle,
+    };
+};
+export const targetMessagePort = () => {
+    return PtyHost.getOrCreate(IpcParentType.ElectronUtilityProcess);
+};
+export const upgradeMessagePort = (port) => {
+    return {
+        type: 'send',
+        method: 'HandleElectronMessagePort.handleElectronMessagePort',
+        params: [],
+        transfer: [port],
+    };
+};

package/src/parts/HandleWebSocket/HandleWebSocket.js

@@ -10,8 +10,8 @@ export const handleWebSocket = async (handle, message) => {
         const { url } = message;
         const type = GetTypeFromUrl.getTypeFromUrl(url);
         handle.pause();
-        const module = await HandleWebSocketModule.load(type);
-        await module.handleWebSocket(message, handle, type);
+        const module = HandleWebSocketModule.load(type);
+        module.handleWebSocket(message, handle, type);
     }
     catch (error) {
         DestroyWebSocket.destroySocket(handle);

package/src/parts/HandleWebSocketModule/HandleWebSocketModule.js

@@ -1,3 +1,8 @@
+import * as HandleWebSocketForExtensionHostHelperProcess from '../HandleWebSocketForExtensionHostHelperProcess/HandleWebSocketForExtensionHostHelperProcess.js';
+import * as HandleWebSocketForSearchProcess from '../HandleWebSocketForSearchProcess/HandleWebSocketForSearchProcess.js';
+import * as HandleWebSocketForSharedProcess from '../HandleWebSocketForSharedProcess/HandleWebSocketForSharedProcess.js';
+import * as HandleWebSocketForTerminalProcess from '../HandleWebSocketForTerminalProcess/HandleWebSocketForTerminalProcess.js';
+import * as HandleWebSocketForUnknown from '../HandleWebSocketForUnknown/HandleWebSocketForUnknown.js';
 import * as ProtocolType from '../ProtocolType/ProtocolType.js';
 import { VError } from '../VError/VError.js';
 export const load = (protocol) => {
@@ -6,14 +11,14 @@ export const load = (protocol) => {
     }
     switch (protocol) {
         case ProtocolType.SharedProcess:
-            return import('../HandleWebSocketForSharedProcess/HandleWebSocketForSharedProcess.js');
+            return HandleWebSocketForSharedProcess;
         case ProtocolType.ExtensionHostHelperProcess:
-            return import('../HandleWebSocketForExtensionHostHelperProcess/HandleWebSocketForExtensionHostHelperProcess.js');
+            return HandleWebSocketForExtensionHostHelperProcess;
         case ProtocolType.TerminalProcess:
-            return import('../HandleWebSocketForTerminalProcess/HandleWebSocketForTerminalProcess.js');
+            return HandleWebSocketForTerminalProcess;
         case ProtocolType.SearchProcess:
-            return import('../HandleWebSocketForSearchProcess/HandleWebSocketForSearchProcess.js');
+            return HandleWebSocketForSearchProcess;
         default:
-            return import('../HandleWebSocketForUnknown/HandleWebSocketForUnknown.js');
+            return HandleWebSocketForUnknown;
     }
 };

package/src/parts/IsIgnoredError/IsIgnoredError.js

@@ -9,5 +9,9 @@ export const isIgnoredError = (error) => {
         // parent process is disposed, ignore
         return true;
     }
+    if (error && error.code === ErrorCodes.ECONNRESET) {
+        // TODO investigate why this error occurs sometimes when reloading the page
+        return true;
+    }
     return false;
 };

package/src/parts/LaunchTypeScriptCompileProcess/LaunchTypeScriptCompileProcess.js

@@ -2,6 +2,8 @@ import * as HandleIpc from '../HandleIpc/HandleIpc.js';
 import * as IpcParent from '../IpcParent/IpcParent.js';
 import * as IpcParentType from '../IpcParentType/IpcParentType.js';
 import * as IsElectron from '../IsElectron/IsElectron.js';
+import * as GetTypeScriptPath from '../GetTypeScriptPath/GetTypeScriptPath.js';
+import * as JsonRpc from '../JsonRpc/JsonRpc.js';
 export const launchTypeScriptCompileProcess = async () => {
     const method = IsElectron.isElectron ? IpcParentType.ElectronUtilityProcess : IpcParentType.NodeForkedProcess;
     const TypeScriptCompileProcessPath = await import('../TypeScriptCompileProcessPath/TypeScriptCompileProcessPath.js');
@@ -13,5 +15,7 @@ export const launchTypeScriptCompileProcess = async () => {
         name: 'TypeScript Compile Process',
     });
     HandleIpc.handleIpc(typescriptCompileProcess);
+    const typeScriptPath = GetTypeScriptPath.getTypeScriptUri();
+    await JsonRpc.invoke(typescriptCompileProcess, 'TypeScript.setTypeScriptPath', typeScriptPath);
     return typescriptCompileProcess;
 };

package/src/parts/Module/Module.js

@@ -127,6 +127,8 @@ export const load = (moduleId) => {
             return import('../HandleMessagePortForProcessExplorer/HandleMessagePortForProcessExplorer.ipc.js');
         case ModuleId.HandleMessagePortForSearchProcess:
             return import('../HandleMessagePortForSearchProcess/HandleMessagePortForSearchProcess.ipc.js');
+        case ModuleId.FileWatcher:
+            return import('../FileWatcher/FileWatcher.ipc.js');
         default:
             throw new Error(`module ${moduleId} not found`);
     }

package/src/parts/ModuleId/ModuleId.js

@@ -66,3 +66,4 @@ export const ContentSecurityPolicy = 70;
 export const HandleMessagePortForEmbedsProcess = 72;
 export const HandleMessagePortForProcessExplorer = 73;
 export const HandleMessagePortForSearchProcess = 74;
+export const FileWatcher = 75;

package/src/parts/ModuleMap/ModuleMap.js

@@ -185,6 +185,7 @@ export const getModuleId = (commandId) => {
         case 'Platform.getCachedExtensionsPath':
         case 'Platform.getCacheDir':
         case 'Platform.getCommit':
+        case 'Platform.getRoot':
         case 'Platform.getConfigDir':
         case 'Platform.getDataDir':
         case 'Platform.getDate':
@@ -273,6 +274,8 @@ export const getModuleId = (commandId) => {
             return ModuleId.HandleMessagePortForProcessExplorer;
         case 'HandleMessagePortForSearchProcess.handleMessagePortForSearchProcess':
             return ModuleId.HandleMessagePortForSearchProcess;
+        case 'FileWatcher.watch':
+            return ModuleId.FileWatcher;
         default:
             throw new CommandNotFoundError(commandId);
     }

package/src/parts/Platform/Platform.ipc.js

@@ -11,6 +11,7 @@ export const Commands = {
     getConfigDir: PlatformPaths.getConfigDir,
     getDataDir: PlatformPaths.getDataDir,
     getDate: Platform.getDate,
+    getRoot: PlatformPaths.getRoot,
     getDisabledExtensionsPath: PlatformPaths.getDisabledExtensionsPath,
     getDownloadDir: PlatformPaths.getDownloadDir,
     getExtensionsPath: PlatformPaths.getExtensionsPath,

package/src/parts/Platform/Platform.js

@@ -41,9 +41,9 @@ export const getAppImageName = () => {
 export const getSetupName = () => {
     return 'Lvce-Setup';
 };
-export const version = '0.29.7';
-export const commit = '77ff834';
-export const date = '2024-05-31T16:58:06.000Z';
+export const version = '0.30.0';
+export const commit = '1d13af6';
+export const date = '2024-06-13T18:16:21.000Z';
 export const getVersion = () => {
     return version;
 };

package/src/parts/PlatformPaths/PlatformPaths.js

@@ -104,3 +104,6 @@ export const getDownloadDir = () => {
 export const getRepository = () => {
     return `lvce-editor/lvce-editor`;
 };
+export const getRoot = () => {
+    return Root.root;
+};

package/src/parts/RequiresSocket/RequiresSocket.js

@@ -13,6 +13,7 @@ const METHODS_THAT_REQUIRE_SOCKET = new Set([
     'HandleMessagePortForExtensionHostHelperProcess.handleMessagePortForExtensionHostHelperProcess',
     'ElectronBrowserView.createBrowserView',
     'ElectronWebContentsView.createWebContentsView',
+    'FileWatcher.watch',
 ]);
 export const requiresSocket = (method) => {
     return METHODS_THAT_REQUIRE_SOCKET.has(method);

package/src/parts/TypeScriptCompileProcessPath/TypeScriptCompileProcessPath.js

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