@lvce-editor/shared-process 0.43.5 → 0.44.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.43.5",
+  "version": "0.44.1",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "1.3.0",
-    "@lvce-editor/extension-host-helper-process": "0.43.5",
+    "@lvce-editor/extension-host-helper-process": "0.44.1",
     "@lvce-editor/ipc": "13.7.0",
     "@lvce-editor/json-rpc": "5.4.0",
     "@lvce-editor/jsonc-parser": "1.5.0",

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', '61b6a61', 'extensions');
+    const builtinExtensionsPath = join(staticServerPath, '..', '..', 'static', '2935016', 'extensions');
     return builtinExtensionsPath;
 };

package/src/parts/ExportStatic/ExportStatic.js

@@ -95,13 +95,13 @@ const applyOverrides = async ({ root, commitHash, pathPrefix, serverStaticPath }
     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\``);
+    await replace(Path.join(root, 'dist', commitHash, 'packages', 'extension-host-worker', 'dist', 'extensionHostWorkerMain.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', 'iframe-worker', 'dist', 'iframeWorkerMain.js'), `const platform = Remote`, `const platform = Web`);
     await replace(Path.join(root, 'dist', commitHash, 'packages', 'iframe-worker', 'dist', 'iframeWorkerMain.js'), `/${commitHash}`, `${pathPrefix}/${commitHash}`);
     await replace(Path.join(root, 'dist', commitHash, 'packages', 'file-search-worker', 'dist', 'fileSearchWorkerMain.js'), `/${commitHash}`, `${pathPrefix}/${commitHash}`);
-    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\``);
+    await replace(Path.join(root, 'dist', commitHash, 'packages', 'extension-host-worker', 'dist', 'extensionHostWorkerMain.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);
     const themeDirents = extensionDirents.filter(isTheme);
@@ -154,7 +154,7 @@ const applyOverrides = async ({ root, commitHash, pathPrefix, serverStaticPath }
     }
     const indexHtmlPath = Path.join(root, 'dist', 'index.html');
     await replace(indexHtmlPath, `/${commitHash}`, `${pathPrefix}/${commitHash}`);
-    await replace(indexHtmlPath, '</title>', `</title>
+    await replace(indexHtmlPath, '#282e2f" />', `#282e2f" />
     <meta http-equiv="Content-Security-Policy" content="${staticContentSecurityPolicy}">`);
     if (pathPrefix) {
         await replace(indexHtmlPath, '</title>', `</title>
@@ -257,6 +257,19 @@ const addExtensionLanguages = async ({ root, extensionPath, extensionJson, commi
     }
 };
 const addExtensionWebExtension = async ({ root, extensionPath, commitHash, extensionJson, pathPrefix, useSimpleWebExtensionFile }) => {
+    {
+        const dirents = await FileSystem.readDir(Path.join(root, 'dist', commitHash, 'extensions'));
+        const manifests = await Promise.all(dirents.map(async (dirent) => {
+            const json = await JsonFile.readJson(Path.join(root, 'dist', commitHash, 'extensions', dirent, 'extension.json'));
+            const webExtensionPath = `${pathPrefix}/${commitHash}/extensions/${dirent}`;
+            return {
+                ...json,
+                path: webExtensionPath,
+            };
+        }));
+        const newExtensions = [...manifests, extensionJson];
+        await JsonFile.writeJson(Path.join(root, 'dist', commitHash, 'config', 'extensions.json'), newExtensions);
+    }
     if (!extensionJson.browser) {
         return;
     }

package/src/parts/ExtensionManagement/ExtensionManagement.ipc.js

@@ -16,4 +16,5 @@ export const Commands = {
     'ExtensionManagement.getAllExtensions': ExtensionManagement.getExtensions,
     'ExtensionManagement.getExtensions': ExtensionManagement.getExtensions,
     'ExtensionManagement.uninstall': ExtensionManagement.uninstall,
+    'ExtensionManagement.getExtensionsEtag': ExtensionManagement.getExtensionsEtag,
 };

package/src/parts/ExtensionManagement/ExtensionManagement.js

@@ -5,6 +5,8 @@ import * as ExtensionManifests from '../ExtensionManifests/ExtensionManifests.js
 import * as Path from '../Path/Path.js';
 import * as BuiltinExtensionsPath from '../BuiltinExtensionsPath/BuiltinExtensionsPath.js';
 import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js';
+import * as GetExtensionEtags from '../GetExtensionEtags/GetExtensionEtags.js';
+import * as GetEtagFromStats from '../GetEtagFromStats/GetEtagFromStats.js';
 import { VError } from '../VError/VError.js';
 export const enable = async (id) => {
     try {
@@ -66,6 +68,28 @@ export const getExtensions = () => {
         },
     ], BuiltinExtensionsPath.getBuiltinExtensionsPath());
 };
+export const getExtensionsEtag = async () => {
+    const stats = await GetExtensionEtags.getExtensionEtags([
+        {
+            type: ExtensionManifestInputType.OnlyExtension,
+            path: PlatformPaths.getOnlyExtensionPath(),
+        },
+        {
+            type: ExtensionManifestInputType.Folder,
+            path: PlatformPaths.getLinkedExtensionsPath(),
+        },
+        {
+            type: ExtensionManifestInputType.Folder,
+            path: PlatformPaths.getExtensionsPath(),
+        },
+        {
+            type: ExtensionManifestInputType.Folder,
+            path: BuiltinExtensionsPath.getBuiltinExtensionsPath(),
+        },
+    ]);
+    const etag = GetEtagFromStats.getEtagFromStats(stats);
+    return etag;
+};
 export const getDisabledExtensions = () => {
     return ExtensionManifests.getAll([
         {

package/src/parts/ExtensionManagement/ExtensionManagementLanguages.js

@@ -35,9 +35,7 @@ const getLanguagesFromExtensions = (extensions) => {
     return extensions.flatMap(getLanguagesFromExtension);
 };
 export const getLanguages = async () => {
-    const extensions = await ExtensionManagement.getExtensions();
-    const languages = getLanguagesFromExtensions(extensions);
-    return languages;
+    throw new Error('deprecated');
 };
 export const getWebViews = async () => {
     const extensions = await ExtensionManagement.getExtensions();

package/src/parts/GetEtagFromStats/GetEtagFromStats.js

@@ -0,0 +1,10 @@
+import { createHash } from 'node:crypto';
+export const getEtagFromStats = (stats) => {
+    const hash = createHash('sha1');
+    for (const stat of stats) {
+        hash.update(`${stat.mtime}`);
+        hash.update(`${stat.size}`);
+    }
+    const finalHash = hash.digest('hex');
+    return finalHash;
+};

package/src/parts/GetExtensionEtags/GetExtensionEtags.js

@@ -0,0 +1,51 @@
+import { readdir, stat } from 'node:fs/promises';
+import { join } from 'node:path';
+import * as ExtensionManifestInputType from '../ExtensionManifestInputType/ExtensionManifestInputType.js';
+import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js';
+const serializeStats = (stats) => {
+    const { mtime, size } = stats;
+    return {
+        mtime,
+        size,
+    };
+};
+const getOnly = async (path) => {
+    if (!path) {
+        return [];
+    }
+    const absolutePath = join(path, 'extension.json');
+    const stats = await stat(absolutePath);
+    return [serializeStats(stats)];
+};
+const getFolder = async (path) => {
+    try {
+        const dirents = await readdir(path);
+        const stats = await Promise.all(dirents.map(async (dirent) => {
+            const extensionManifestPath = join(path, dirent, 'extension.json');
+            const direntStats = await stat(extensionManifestPath);
+            return serializeStats(direntStats);
+        }));
+        return stats;
+    }
+    catch (error) {
+        if (IsEnoentError.isEnoentError(error)) {
+            return [];
+        }
+    }
+};
+const get = (input) => {
+    switch (input.type) {
+        case ExtensionManifestInputType.Folder:
+        case ExtensionManifestInputType.LinkedExtensionsFolder:
+            return getFolder(input.path);
+        case ExtensionManifestInputType.OnlyExtension:
+            return getOnly(input.path);
+        default:
+            return [];
+    }
+};
+export const getExtensionEtags = async (inputs) => {
+    const stats = await Promise.all(inputs.map(get));
+    const flatStats = stats.flat(1);
+    return flatStats;
+};

package/src/parts/GetTestRequestResponse/GetTestRequestResponse.js

@@ -10,6 +10,7 @@ import * as GetContentResponse from '../GetContentResponse/GetContentResponse.js
 import * as GetMultipleChoiceResponse from '../GetMultipleChoiceResponse/GetMultipleChoiceResponse.js';
 import * as GetPathName from '../GetPathName/GetPathName.js';
 import * as GetTestPath from '../GetTestPath/GetTestPath.js';
+import * as GetNotFoundResponse from '../GetNotFoundResponse/GetNotFoundResponse.js';
 import * as HttpHeader from '../HttpHeader/HttpHeader.js';
 import * as HttpStatusCode from '../HttpStatusCode/HttpStatusCode.js';
 import * as Logger from '../Logger/Logger.js';
@@ -38,6 +39,7 @@ export const getTestRequestResponse = async (request, indexHtmlPath) => {
             };
             return GetMultipleChoiceResponse.getMultipleChoiceResponse(body, headers);
         }
+        return GetNotFoundResponse.getNotFoundResponse();
     }
     catch (error) {
         Logger.error(error);

package/src/parts/HandleRequestTest/HandleRequestTest.js

@@ -6,5 +6,5 @@ export const handleRequestTest = async (socket, request, indexHtmlPath) => {
     Assert.object(request);
     Assert.string(indexHtmlPath);
     const result = await GetTestRequestResponse.getTestRequestResponse(request, indexHtmlPath);
-    HttpServerResponse.send(request, socket, result);
+    await HttpServerResponse.send(request, socket, result);
 };

package/src/parts/HttpServerResponse/HttpServerResponse.js

@@ -1,7 +1,7 @@
 import { ServerResponse } from 'node:http';
 import * as Assert from '../Assert/Assert.js';
 import * as SetHeaders from '../SetHeaders/SetHeaders.js';
-export const send = (request, socket, result) => {
+export const send = async (request, socket, result) => {
     Assert.object(request);
     Assert.object(socket);
     Assert.object(result);
@@ -12,5 +12,9 @@ export const send = (request, socket, result) => {
         ...result.init.headers,
         Connection: 'close',
     });
+    // TODO use promises if possible
+    socket.on('error', (error) => {
+        console.error(`[shared-process] Failed to send response ${error}`);
+    });
     response.end(result.body);
 };

package/src/parts/ModuleMap/ModuleMap.js

@@ -129,6 +129,7 @@ export const getModuleId = (commandId) => {
         case 'ExtensionManagement.getExtensions':
         case 'ExtensionManagement.install':
         case 'ExtensionManagement.uninstall':
+        case 'ExtensionManagement.getExtensionsEtag':
             return ModuleId.ExtensionManagement;
         case 'FileSystem.chmod':
         case 'FileSystem.copy':

package/src/parts/Platform/Platform.js

@@ -41,9 +41,9 @@ export const getAppImageName = () => {
 export const getSetupName = () => {
     return 'Lvce-Setup';
 };
-export const version = '0.43.5';
-export const commit = '61b6a61';
-export const date = '2025-01-03T22:24:26.000Z';
+export const version = '0.44.1';
+export const commit = '2935016';
+export const date = '2025-01-05T17:38:03.000Z';
 export const getVersion = () => {
     return version;
 };