@lvce-editor/shared-process 0.29.8 → 0.30.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.29.8",
+  "version": "0.30.1",
   "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.8",
+    "@lvce-editor/extension-host-helper-process": "0.30.1",
     "@lvce-editor/ipc": "^9.2.0",
     "@lvce-editor/json-rpc": "^1.3.0",
-    "@lvce-editor/jsonc-parser": "^1.3.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",
@@ -29,7 +29,7 @@
     "xdg-basedir": "^5.1.0"
   },
   "optionalDependencies": {
-    "@lvce-editor/network-process": "^1.2.0",
+    "@lvce-editor/network-process": "^1.3.0",
     "@lvce-editor/preload": "^1.3.0",
     "@lvce-editor/search-process": "^1.2.0",
     "@lvce-editor/typescript-compile-process": "^1.2.0",

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\``);

package/src/parts/GetElectronFileResponseContent/GetElectronFileResponseContent.js

@@ -2,6 +2,8 @@ import { readFile } from 'node:fs/promises';
 import * as Platform from '../Platform/Platform.js';
 import * as ShouldTranspileTypescript from '../ShouldTranspileTypescript/ShouldTranspileTypescript.js';
 import * as TranspileTypeScript from '../TranspileTypeScript/TranspileTypeScript.js';
+import * as Preferences from '../Preferences/Preferences.js';
+import { pathToFileURL } from 'node:url';
 export const getElectronFileResponseContent = async (request, absolutePath, url) => {
     if (ShouldTranspileTypescript.shouldTranspileTypescript(request, url)) {
         const content = await readFile(absolutePath);
@@ -13,5 +15,15 @@ export const getElectronFileResponseContent = async (request, absolutePath, url)
         // @ts-ignore
         content = content.toString().replace('    <link rel="manifest" href="/manifest.json" crossorigin="use-credentials" />\n', '');
     }
+    if (!Platform.isProduction && url === '/') {
+        const preferences = await Preferences.getUserPreferences();
+        if (preferences['develop.rendererProcessPath']) {
+            console.log('custom renderer process path');
+            // @ts-ignore
+            content = content
+                .toString()
+                .replace('/packages/renderer-worker/node_modules/@lvce-editor/renderer-process/dist/rendererProcessMain.js', '/remote' + pathToFileURL(preferences['develop.rendererProcessPath']).toString().slice(7));
+        }
+    }
     return content;
 };

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/Platform/Platform.js

@@ -41,9 +41,9 @@ export const getAppImageName = () => {
 export const getSetupName = () => {
     return 'Lvce-Setup';
 };
-export const version = '0.29.8';
-export const commit = '03ea80f';
-export const date = '2024-06-10T08:30:47.000Z';
+export const version = '0.30.1';
+export const commit = '0d78ce4';
+export const date = '2024-06-16T07:24:35.000Z';
 export const getVersion = () => {
     return version;
 };