@lvce-editor/shared-process 0.37.12 → 0.37.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.37.12",
+  "version": "0.37.13",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.3.0",
-    "@lvce-editor/extension-host-helper-process": "0.37.12",
+    "@lvce-editor/extension-host-helper-process": "0.37.13",
     "@lvce-editor/ipc": "^11.1.0",
     "@lvce-editor/json-rpc": "^5.0.0",
     "@lvce-editor/jsonc-parser": "^1.5.0",
@@ -32,7 +32,7 @@
     "@lvce-editor/embeds-process": "^1.5.0",
     "@lvce-editor/network-process": "^2.1.0",
     "@lvce-editor/preload": "^1.4.0",
-    "@lvce-editor/preview-process": "^3.9.0",
+    "@lvce-editor/preview-process": "^3.11.0",
     "@lvce-editor/pty-host": "^2.1.0",
     "@lvce-editor/search-process": "^3.2.0",
     "@lvce-editor/typescript-compile-process": "^1.5.0",

package/src/parts/AddCustomPathsToIndexHtml/AddCustomPathsToIndexHtml.js

@@ -1,26 +1,17 @@
-import { pathToFileURL } from 'node:url';
+import * as GetCustomPathsConfig from '../GetCustomPathsConfig/GetCustomPathsConfig.js';
 import * as Platform from '../Platform/Platform.js';
 import * as Preferences from '../Preferences/Preferences.js';
-const getRemoteUrl = (path) => {
-    return '/remote' + pathToFileURL(path).toString().slice(7);
-};
 export const addCustomPathsToIndexHtml = async (content) => {
     if (Platform.isProduction) {
         return content;
     }
-    let newContent = content;
     const preferences = await Preferences.getUserPreferences();
-    if (preferences['develop.rendererProcessPath']) {
+    const config = GetCustomPathsConfig.getCustomPathsConfig(preferences);
+    let newContent = content;
+    if (config.rendererProcessPath) {
         newContent = newContent
             .toString()
-            .replace('/packages/renderer-worker/node_modules/@lvce-editor/renderer-process/dist/rendererProcessMain.js', getRemoteUrl(preferences['develop.rendererProcessPath']));
-    }
-    const config = Object.create(null);
-    if (preferences['develop.extensionHostWorkerPath']) {
-        config.extensionHostWorkerUrl = getRemoteUrl(preferences['develop.extensionHostWorkerPath']);
-    }
-    if (preferences['develop.editorWorkerPath']) {
-        config.editorWorkerUrl = getRemoteUrl(preferences['develop.editorWorkerPath']);
+            .replace('/packages/renderer-worker/node_modules/@lvce-editor/renderer-process/dist/rendererProcessMain.js', config.rendererProcessPath);
     }
     const stringifiedConfig = JSON.stringify(config, null, 2);
     newContent = newContent.toString().replace('</title>', `</title>

package/src/parts/GetCustomPathsConfig/GetCustomPathsConfig.js

@@ -0,0 +1,14 @@
+import * as GetRemoteUrl from '../GetRemoteUrl/GetRemoteUrl.js';
+export const getCustomPathsConfig = (preferences) => {
+    const config = Object.create(null);
+    if (preferences['develop.rendererProcessPath']) {
+        config.rendererProcessPath = GetRemoteUrl.getRemoteUrl(preferences['develop.rendererProcessPath']);
+    }
+    if (preferences['develop.extensionHostWorkerPath']) {
+        config.extensionHostWorkerUrl = GetRemoteUrl.getRemoteUrl(preferences['develop.extensionHostWorkerPath']);
+    }
+    if (preferences['develop.editorWorkerPath']) {
+        config.editorWorkerUrl = GetRemoteUrl.getRemoteUrl(preferences['develop.editorWorkerPath']);
+    }
+    return config;
+};

package/src/parts/GetElectronFileResponseAbsolutePath/GetElectronFileResponseAbsolutePath.js

@@ -1,6 +1,7 @@
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import * as IndexHtmlPath from '../IndexHtmlPath/IndexHtmlPath.js';
 import * as Path from '../Path/Path.js';
 import * as Platform from '../Platform/Platform.js';
 import * as Root from '../Root/Root.js';
@@ -8,7 +9,7 @@ import * as Root from '../Root/Root.js';
 export const getElectronFileResponseAbsolutePath = (pathName) => {
     // TODO remove if/else in prod (use replacement)
     if (pathName === `/` || pathName.startsWith(`/?`)) {
-        return Path.join(Root.root, 'static', 'index.html');
+        return IndexHtmlPath.indexHtmlPath;
     }
     if (pathName.startsWith(`/packages`)) {
         return Path.join(Root.root, pathName);

package/src/parts/IndexHtmlPath/IndexHtmlPath.js

@@ -0,0 +1,3 @@
+import * as Path from '../Path/Path.js';
+import * as Root from '../Root/Root.js';
+export const indexHtmlPath = Path.join(Root.root, 'static', 'index.html');

package/src/parts/Platform/Platform.js

@@ -41,9 +41,9 @@ export const getAppImageName = () => {
 export const getSetupName = () => {
     return 'Lvce-Setup';
 };
-export const version = '0.37.12';
-export const commit = '4cea652';
-export const date = '2024-11-06T16:49:34.000Z';
+export const version = '0.37.13';
+export const commit = '11ff8c4';
+export const date = '2024-11-08T22:28:54.000Z';
 export const getVersion = () => {
     return version;
 };

package/src/parts/RegisterWebViewProtocol/RegisterWebViewProtocol.js

@@ -0,0 +1,14 @@
+import * as GetPortTuple from '../GetPortTuple/GetPortTuple.js';
+import * as ParentIpc from '../ParentIpc/ParentIpc.js';
+import * as PreviewProcess from '../PreviewProcess/PreviewProcess.js';
+import * as WebViewProtocolState from '../WebViewProtocolState/WebViewProtocolState.js';
+const doRegisterWebViewProtocol = async () => {
+    const { port1, port2 } = await GetPortTuple.getPortTuple();
+    await ParentIpc.invokeAndTransfer('ElectronSession.registerWebviewProtocol', port1);
+    // TODO launch preview process at the start of this
+    await PreviewProcess.invokeAndTransfer('HandleElectronMessagePort.handleElectronMessagePort', port2);
+};
+// TODO send port directly to from preview process to renderer worker?
+export const registerWebViewProtocol = async () => {
+    return WebViewProtocolState.getOrCreate(doRegisterWebViewProtocol);
+};

package/src/parts/WebViewProtocolState/WebViewProtocolState.js

@@ -0,0 +1,9 @@
+const state = {
+    promise: undefined,
+};
+export const getOrCreate = (fn) => {
+    if (!state.promise) {
+        state.promise = fn();
+    }
+    return state.promise;
+};

package/src/parts/WebViewServer/WebViewServer.js

@@ -1,21 +1,6 @@
 import * as PreviewProcess from '../PreviewProcess/PreviewProcess.js';
-import * as ParentIpc from '../ParentIpc/ParentIpc.js';
-import * as GetPortTuple from '../GetPortTuple/GetPortTuple.js';
-// TODO send port directly to from preview process to renderer worker?
-export const registerProtocol = async () => {
-    // TODO only do this once
-    // TODO send messageport to proview process
-    // TODO send other messageport to parent process
-    console.time('get-ports');
-    const { port1, port2 } = await GetPortTuple.getPortTuple();
-    console.timeEnd('get-ports');
-    console.time('register-protocol');
-    await ParentIpc.invokeAndTransfer('ElectronSession.registerWebviewProtocol', port1);
-    console.timeEnd('register-protocol');
-    console.time('handle-port');
-    await PreviewProcess.invokeAndTransfer('HandleElectronMessagePort.handleElectronMessagePort', port2);
-    console.timeEnd('handle-port');
-};
+import * as RegisterWebViewProtocol from '../RegisterWebViewProtocol/RegisterWebViewProtocol.js';
+export const registerProtocol = RegisterWebViewProtocol.registerWebViewProtocol;
 export const create = async (previewId) => {
     await PreviewProcess.invoke('WebViewServer.create', previewId);
 };