@lvce-editor/shared-process 0.45.8 → 0.45.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.45.8",
+  "version": "0.45.10",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "1.3.0",
-    "@lvce-editor/extension-host-helper-process": "0.45.8",
+    "@lvce-editor/extension-host-helper-process": "0.45.10",
     "@lvce-editor/ipc": "13.7.0",
     "@lvce-editor/json-rpc": "5.4.0",
     "@lvce-editor/jsonc-parser": "1.5.0",
@@ -35,6 +35,7 @@
     "@lvce-editor/preview-process": "7.22.0",
     "@lvce-editor/pty-host": "3.1.0",
     "@lvce-editor/search-process": "4.1.0",
+    "@lvce-editor/file-watcher-process": "1.4.0",
     "@lvce-editor/typescript-compile-process": "2.3.0",
     "open": "^10.1.0",
     "tail": "^2.2.6",

package/src/parts/BuiltinExtensionsPath/BuiltinExtensionsPath.js

@@ -2,6 +2,6 @@ import { join } from 'path';
 import { fileURLToPath } from 'url';
 export const getBuiltinExtensionsPath = () => {
     const staticServerPath = fileURLToPath(import.meta.resolve('@lvce-editor/static-server'));
-    const builtinExtensionsPath = join(staticServerPath, '..', '..', 'static', '85b69da', 'extensions');
+    const builtinExtensionsPath = join(staticServerPath, '..', '..', 'static', 'b53ee00', 'extensions');
     return builtinExtensionsPath;
 };

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

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

package/src/parts/FileWatcher/FileWatcher.js

@@ -1,27 +1,22 @@
-import * as fs from 'node:fs/promises';
+import * as FileWatcherProcess from '../FileWatcherProcess/FileWatcherProcess.js';
+import * as Id from '../Id/Id.js';
 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);
-    }
+const handleEvents = (id, ipc, event) => {
+    JsonRpc.send(ipc, 'FileWatcher.handleEvent', id, event);
 };
-// TODO  run file watcher in a separate process to not crash application when file watcher crashes
+// handle the case when multiple windows create a file watcher with same id, ids should not collide
+// TODO remove ipc and dispose file watcher when socket / messageport closes
+const internalIdMap = Object.create(null);
 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);
-    }
+    const internalId = Id.create();
+    internalIdMap[internalId] = { id, ipc };
+    await FileWatcherProcess.invoke('FileWatcher.watchFolders', {
+        id: internalId,
+        roots,
+        exclude,
+    });
+};
+export const handleChange = (event) => {
+    const ref = internalIdMap[event.id];
+    handleEvents(ref.id, ref.ipc, event);
 };

package/src/parts/FileWatcherProcess/FileWatcherProcess.js

@@ -0,0 +1,18 @@
+import * as JsonRpc from '../JsonRpc/JsonRpc.js';
+import * as LaunchFileWatcherProcess from '../LaunchFileWatcherProcess/LaunchFileWatcherProcess.js';
+export const state = {
+    /**
+     * @type {any}
+     */
+    ipc: undefined,
+};
+export const getOrCreate = async () => {
+    if (!state.ipc) {
+        state.ipc = LaunchFileWatcherProcess.launchFileWatcherProcess();
+    }
+    return state.ipc;
+};
+export const invoke = async (method, ...params) => {
+    const ipc = await getOrCreate();
+    return JsonRpc.invoke(ipc, method, ...params);
+};

package/src/parts/FileWatcherProcessPath/FileWatcherProcessPath.js

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

package/src/parts/LaunchFileWatcherProcess/LaunchFileWatcherProcess.js

@@ -0,0 +1,17 @@
+import * as FileWatcherProcessPath from '../FileWatcherProcessPath/FileWatcherProcessPath.js';
+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';
+export const launchFileWatcherProcess = async () => {
+    const method = IsElectron.isElectron ? IpcParentType.ElectronUtilityProcess : IpcParentType.NodeForkedProcess;
+    const ipc = await IpcParent.create({
+        method,
+        path: FileWatcherProcessPath.fileWatcherProcessPath,
+        argv: [],
+        stdio: 'inherit',
+        name: 'File Watcher Process',
+    });
+    HandleIpc.handleIpc(ipc);
+    return ipc;
+};

package/src/parts/ModuleMap/ModuleMap.js

@@ -192,6 +192,7 @@ export const getModuleId = (commandId) => {
         case 'Platform.getCacheDir':
         case 'Platform.getCommit':
         case 'Platform.getRoot':
+        case 'Platform.getRootUri':
         case 'Platform.getConfigDir':
         case 'Platform.getDataDir':
         case 'Platform.getDate':
@@ -281,6 +282,7 @@ export const getModuleId = (commandId) => {
         case 'HandleMessagePortForSearchProcess.handleMessagePortForSearchProcess':
             return ModuleId.HandleMessagePortForSearchProcess;
         case 'FileWatcher.watch':
+        case 'FileWatcher.handleChange':
             return ModuleId.FileWatcher;
         case 'Transferrable.transfer':
             return ModuleId.Transferrable;

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

@@ -12,6 +12,7 @@ export const Commands = {
     getDataDir: PlatformPaths.getDataDir,
     getDate: Platform.getDate,
     getRoot: PlatformPaths.getRoot,
+    getRootUri: PlatformPaths.getRootUri,
     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.45.8';
-export const commit = '85b69da';
-export const date = '2025-01-29T21:43:44.000Z';
+export const version = '0.45.10';
+export const commit = 'b53ee00';
+export const date = '2025-02-05T18:37:35.000Z';
 export const getVersion = () => {
     return version;
 };

package/src/parts/PlatformPaths/PlatformPaths.js

@@ -107,6 +107,12 @@ export const getDownloadDir = () => {
 export const getRepository = () => {
     return `lvce-editor/lvce-editor`;
 };
+/**
+ * @deprecated use getRootUri instead
+ */
 export const getRoot = () => {
     return Root.root;
 };
+export const getRootUri = () => {
+    return pathToFileURL(Root.root).toString();
+};