@lvce-editor/shared-process 0.35.4 → 0.35.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.35.4",
+  "version": "0.35.6",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.3.0",
-    "@lvce-editor/extension-host-helper-process": "0.35.4",
+    "@lvce-editor/extension-host-helper-process": "0.35.6",
     "@lvce-editor/ipc": "^11.0.1",
     "@lvce-editor/json-rpc": "^4.1.0",
     "@lvce-editor/jsonc-parser": "^1.4.0",

package/src/parts/{AddCustomRendererProcessPath/AddCustomRendererProcessPath.js → AddCustomPathsToIndexHtml/AddCustomPathsToIndexHtml.js}

@@ -1,15 +1,24 @@
 import { pathToFileURL } from 'node:url';
 import * as Platform from '../Platform/Platform.js';
 import * as Preferences from '../Preferences/Preferences.js';
-export const addCustomRendererProcessPath = async (content) => {
+export const addCustomPathsToIndexHtml = async (content) => {
     if (Platform.isProduction) {
         return content;
     }
+    let newContent = content;
     const preferences = await Preferences.getUserPreferences();
     if (preferences['develop.rendererProcessPath']) {
-        return content
+        newContent = newContent
             .toString()
             .replace('/packages/renderer-worker/node_modules/@lvce-editor/renderer-process/dist/rendererProcessMain.js', '/remote' + pathToFileURL(preferences['develop.rendererProcessPath']).toString().slice(7));
     }
-    return content;
+    if (preferences['develop.extensionHostWorkerPath']) {
+        const actualUrl = '/remote' + pathToFileURL(preferences['develop.extensionHostWorkerPath']).toString().slice(7);
+        const config = JSON.stringify({
+            extensionHostWorkerUrl: actualUrl,
+        });
+        newContent = newContent.toString().replace('</title>', `</title>
+      <script type="application.json" id="Config">${config}</script>`);
+    }
+    return newContent;
 };

package/src/parts/ExportStatic/ExportStatic.js

@@ -97,6 +97,7 @@ const applyOverrides = async ({ root, commitHash, pathPrefix, serverStaticPath }
     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\``);
     await replace(Path.join(root, 'dist', commitHash, 'packages', 'extension-host-worker', 'dist', 'extensionHostWorkerMain.js'), `/${commitHash}`, `${pathPrefix}/${commitHash}`);
+    await replace(Path.join(root, 'dist', commitHash, 'packages', 'extension-host-worker', 'dist', 'extensionHostWorkerMain.js'), `const platform = Remote`, `const platform = Web`);
     await replace(Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'), `return \`\${assetDir}/extensions/builtin.\${iconThemeId}/icon-theme.json\``, `return \`\${assetDir}/icon-themes/\${iconThemeId}.json\``);
     const extensionDirents = await FileSystem.readDir(Path.join(serverStaticPath, commitHash, 'extensions'));
     const languageBasicsDirents = extensionDirents.filter(isLanguageBasics);

package/src/parts/ExtensionManifests/ExtensionManifestsFromLinkedExtensionsFolder.js

@@ -1,8 +1,8 @@
 import { readlink } from 'node:fs/promises';
 import * as ExtensionManifest from '../ExtensionManifest/ExtensionManifest.js';
-import * as ExtensionManifestStatus from '../ExtensionManifestStatus/ExtensionManifestStatus.js';
 import * as FileSystem from '../FileSystem/FileSystem.js';
 import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js';
+import * as MergeWithSymlinks from '../MergeWithSymlinks/MergeWithSymlinks.js';
 import * as ToAbsolutePaths from '../ToAbsolutePaths/ToAbsolutePaths.js';
 import { VError } from '../VError/VError.js';
 const readSymlink = async (absolutePath) => {
@@ -17,21 +17,6 @@ const readSymlink = async (absolutePath) => {
 const readSymlinks = (absolutePaths) => {
     return Promise.all(absolutePaths.map(readSymlink));
 };
-const mergeWithSymLinks = (manifests, symlinks) => {
-    const { length } = manifests;
-    const merged = [];
-    for (let i = 0; i < length; i++) {
-        const manifest = manifests[i];
-        const symlink = symlinks[i];
-        if (manifest.status === ExtensionManifestStatus.Rejected) {
-            merged.push(manifest);
-        }
-        else {
-            merged.push({ ...manifest, symlink });
-        }
-    }
-    return merged;
-};
 export const getExtensionManifests = async (path) => {
     try {
         if (!path) {
@@ -41,7 +26,7 @@ export const getExtensionManifests = async (path) => {
         const absolutePaths = ToAbsolutePaths.toAbsolutePaths(path, dirents);
         const manifests = await Promise.all(absolutePaths.map(ExtensionManifest.get));
         const symlinks = await readSymlinks(absolutePaths);
-        const merged = mergeWithSymLinks(manifests, symlinks);
+        const merged = MergeWithSymlinks.mergeWithSymLinks(manifests, symlinks);
         return merged;
     }
     catch (error) {

package/src/parts/GetElectronFileResponseContent/GetElectronFileResponseContent.js

@@ -1,5 +1,5 @@
 import { readFile } from 'node:fs/promises';
-import * as AddCustomRendererProcessPath from '../AddCustomRendererProcessPath/AddCustomRendererProcessPath.js';
+import * as AddCustomPathsToIndexHtml from '../AddCustomPathsToIndexHtml/AddCustomPathsToIndexHtml.js';
 import * as Platform from '../Platform/Platform.js';
 import * as ShouldTranspileTypescript from '../ShouldTranspileTypescript/ShouldTranspileTypescript.js';
 import * as TranspileTypeScript from '../TranspileTypeScript/TranspileTypeScript.js';
@@ -18,7 +18,7 @@ export const getElectronFileResponseContent = async (request, absolutePath, url)
         content = content.toString().replace('    <link rel="manifest" href="/manifest.json" crossorigin="use-credentials" />\n', '');
     }
     if (url === '/') {
-        content = await AddCustomRendererProcessPath.addCustomRendererProcessPath(content);
+        content = await AddCustomPathsToIndexHtml.addCustomPathsToIndexHtml(content);
     }
     if (typeof content === 'string') {
         content = Buffer.from(content);

package/src/parts/GetExtensions/GetExtensions.ipc.js

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

package/src/parts/GetExtensions/GetExtensions.js

@@ -0,0 +1,4 @@
+import * as ExtensionManagement from '../ExtensionManagement/ExtensionManagement.js';
+export const getExtensions = () => {
+    return ExtensionManagement.getExtensions();
+};

package/src/parts/GetTestRequestResponse/GetTestRequestResponse.js

@@ -1,6 +1,6 @@
 import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
-import * as AddCustomRendererProcessPath from '../AddCustomRendererProcessPath/AddCustomRendererProcessPath.js';
+import * as AddCustomPathsToIndexHtml from '../AddCustomPathsToIndexHtml/AddCustomPathsToIndexHtml.js';
 import * as CreateTestOverview from '../CreateTestOverview/CreateTestOverview.js';
 import * as CrossOriginEmbedderPolicy from '../CrossOriginEmbedderPolicy/CrossOriginEmbedderPolicy.js';
 import * as CrossOriginOpenerPolicy from '../CrossOriginOpenerPolicy/CrossOriginOpenerPolicy.js';
@@ -14,7 +14,7 @@ export const getTestRequestResponse = async (request, indexHtmlPath) => {
     const pathName = GetPathName.getPathName(request);
     if (pathName.endsWith('.html')) {
         const body = await readFile(indexHtmlPath, 'utf8');
-        const content = await AddCustomRendererProcessPath.addCustomRendererProcessPath(body);
+        const content = await AddCustomPathsToIndexHtml.addCustomPathsToIndexHtml(body);
         return {
             body: content,
             init: {

package/src/parts/MergeWithSymlinks/MergeWithSymlinks.js

@@ -0,0 +1,16 @@
+import * as ExtensionManifestStatus from '../ExtensionManifestStatus/ExtensionManifestStatus.js';
+export const mergeWithSymLinks = (manifests, symlinks) => {
+    const { length } = manifests;
+    const merged = [];
+    for (let i = 0; i < length; i++) {
+        const manifest = manifests[i];
+        const symlink = symlinks[i];
+        if (manifest.status === ExtensionManifestStatus.Rejected) {
+            merged.push(manifest);
+        }
+        else {
+            merged.push({ ...manifest, symlink });
+        }
+    }
+    return merged;
+};

package/src/parts/Module/Module.js

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

package/src/parts/ModuleId/ModuleId.js

@@ -69,3 +69,4 @@ export const HandleMessagePortForSearchProcess = 74;
 export const FileWatcher = 75;
 export const WebViewServer = 76;
 export const Transferrable = 77;
+export const GetExtensions = 78;

package/src/parts/ModuleMap/ModuleMap.js

@@ -285,6 +285,8 @@ export const getModuleId = (commandId) => {
         case 'WebViewServer.setHandler':
         case 'WebViewServer.registerProtocol':
             return ModuleId.WebViewServer;
+        case 'GetExtensions.getExtensions':
+            return ModuleId.GetExtensions;
         default:
             throw new CommandNotFoundError(commandId);
     }

package/src/parts/Platform/Platform.js

@@ -41,9 +41,9 @@ export const getAppImageName = () => {
 export const getSetupName = () => {
     return 'Lvce-Setup';
 };
-export const version = '0.35.4';
-export const commit = '6140002';
-export const date = '2024-10-04T13:22:59.000Z';
+export const version = '0.35.6';
+export const commit = '08a59f1';
+export const date = '2024-10-05T08:00:49.000Z';
 export const getVersion = () => {
     return version;
 };