@lvce-editor/shared-process 0.39.0 → 0.40.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.39.0",
+  "version": "0.40.1",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,24 +18,24 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.3.0",
-    "@lvce-editor/extension-host-helper-process": "0.39.0",
-    "@lvce-editor/ipc": "^11.3.0",
+    "@lvce-editor/extension-host-helper-process": "0.40.1",
+    "@lvce-editor/ipc": "^11.6.0",
     "@lvce-editor/json-rpc": "^5.2.0",
     "@lvce-editor/jsonc-parser": "^1.5.0",
     "@lvce-editor/pretty-error": "^1.6.0",
     "@lvce-editor/verror": "^1.6.0",
-    "debug": "^4.3.7",
+    "debug": "^4.4.0",
     "is-object": "^1.0.2",
     "xdg-basedir": "^5.1.0"
   },
   "optionalDependencies": {
-    "@lvce-editor/embeds-process": "^1.5.0",
+    "@lvce-editor/embeds-process": "^1.6.0",
     "@lvce-editor/network-process": "^2.1.0",
     "@lvce-editor/preload": "^1.4.0",
     "@lvce-editor/preview-process": "^3.11.0",
     "@lvce-editor/pty-host": "^3.0.0",
-    "@lvce-editor/search-process": "^3.3.0",
-    "@lvce-editor/typescript-compile-process": "^1.6.0",
+    "@lvce-editor/search-process": "^4.0.1",
+    "@lvce-editor/typescript-compile-process": "^2.1.0",
     "open": "^10.1.0",
     "tail": "^2.2.6",
     "tmp-promise": "^3.0.3",

package/src/parts/BuiltinExtensionsPath/BuiltinExtensionsPath.js

@@ -0,0 +1,7 @@
+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', '21f6893', 'extensions');
+    return builtinExtensionsPath;
+};

package/src/parts/ExportStatic/ExportStatic.js

@@ -371,6 +371,18 @@ const resolveServerStaticPath = (root) => {
     if (existsSync(guessThree)) {
         return guessThree;
     }
+    const guessFour = Path.join(root, 'packages', 'build', 'node_modules', '@lvce-editor', 'static-server', 'static');
+    if (existsSync(guessFour)) {
+        return guessFour;
+    }
+    const guessFive = Path.join(root, 'node_modules', '@lvce-editor', 'static-server', 'static');
+    if (existsSync(guessFive)) {
+        return guessFive;
+    }
+    const guessSix = Path.join(root, 'packages', 'server', 'node_modules', '@lvce-editor', 'static-server', 'static');
+    if (existsSync(guessSix)) {
+        return guessSix;
+    }
     throw new Error(`server static path not found`);
 };
 /**

package/src/parts/ExtensionList/ExtensionList.js

@@ -3,6 +3,7 @@ import * as ExtensionManifestInputType from '../ExtensionManifestInputType/Exten
 import * as ExtensionManifestStatus from '../ExtensionManifestStatus/ExtensionManifestStatus.js';
 import * as ExtensionManifests from '../ExtensionManifests/ExtensionManifests.js';
 import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js';
+import * as BuiltinExtensionsPath from '../BuiltinExtensionsPath/BuiltinExtensionsPath.js';
 import { VError } from '../VError/VError.js';
 const getManifestVersion = (json) => {
     if (json && json.version && typeof json.version === 'string') {
@@ -52,7 +53,7 @@ export const list = async () => {
             },
             {
                 type: ExtensionManifestInputType.Folder,
-                path: PlatformPaths.getBuiltinExtensionsPath(),
+                path: BuiltinExtensionsPath.getBuiltinExtensionsPath(),
             },
         ]);
         const infos = getManifestInfos(manifests);

package/src/parts/ExtensionManagement/ExtensionManagement.js

@@ -3,6 +3,7 @@ import * as Debug from '../Debug/Debug.js';
 import * as ExtensionManifestInputType from '../ExtensionManifestInputType/ExtensionManifestInputType.js';
 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 { VError } from '../VError/VError.js';
 export const enable = async (id) => {
@@ -33,9 +34,9 @@ export const getBuiltinExtensions = () => {
     return ExtensionManifests.getAll([
         {
             type: ExtensionManifestInputType.Folder,
-            path: PlatformPaths.getBuiltinExtensionsPath(),
+            path: BuiltinExtensionsPath.getBuiltinExtensionsPath(),
         },
-    ], PlatformPaths.getBuiltinExtensionsPath());
+    ], BuiltinExtensionsPath.getBuiltinExtensionsPath());
 };
 export const getInstalledExtensions = () => {
     return ExtensionManifests.getAll([
@@ -43,7 +44,7 @@ export const getInstalledExtensions = () => {
             type: ExtensionManifestInputType.Folder,
             path: PlatformPaths.getExtensionsPath(),
         },
-    ], PlatformPaths.getBuiltinExtensionsPath());
+    ], BuiltinExtensionsPath.getBuiltinExtensionsPath());
 };
 export const getExtensions = () => {
     return ExtensionManifests.getAll([
@@ -61,9 +62,9 @@ export const getExtensions = () => {
         },
         {
             type: ExtensionManifestInputType.Folder,
-            path: PlatformPaths.getBuiltinExtensionsPath(),
+            path: BuiltinExtensionsPath.getBuiltinExtensionsPath(),
         },
-    ], PlatformPaths.getBuiltinExtensionsPath());
+    ], BuiltinExtensionsPath.getBuiltinExtensionsPath());
 };
 export const getDisabledExtensions = () => {
     return ExtensionManifests.getAll([
@@ -71,6 +72,6 @@ export const getDisabledExtensions = () => {
             type: ExtensionManifestInputType.Folder,
             path: PlatformPaths.getDisabledExtensionsPath(),
         },
-    ], PlatformPaths.getBuiltinExtensionsPath());
+    ], BuiltinExtensionsPath.getBuiltinExtensionsPath());
 };
 export * from '../ExtensionUninstall/ExtensionUninstall.js';

package/src/parts/GetElectronFileResponse/GetElectronFileResponse.js

@@ -1,12 +1,11 @@
-import { stat } from 'node:fs/promises';
 import * as GetContentResponse from '../GetContentResponse/GetContentResponse.js';
 import * as GetElectronFileResponseAbsolutePath from '../GetElectronFileResponseAbsolutePath/GetElectronFileResponseAbsolutePath.js';
 import * as GetElectronFileResponseContent from '../GetElectronFileResponseContent/GetElectronFileResponseContent.js';
 import * as GetElectronFileResponseRelativePath from '../GetElectronFileResponseRelativePath/GetElectronFileResponseRelativePath.js';
-import * as GetEtag from '../GetEtag/GetEtag.js';
 import * as GetHeaders from '../GetHeaders/GetHeaders.js';
 import * as GetNotFoundResponse from '../GetNotFoundResponse/GetNotFoundResponse.js';
 import * as GetNotModifiedResponse from '../GetNotModifiedResponse/GetNotModifiedResponse.js';
+import * as GetPathEtag from '../GetPathEtag/GetPathEtag.js';
 import * as GetServerErrorResponse from '../GetServerErrorResponse/GetServerErrorResponse.js';
 import * as HttpHeader from '../HttpHeader/HttpHeader.js';
 import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js';
@@ -20,12 +19,7 @@ export const getElectronFileResponse = async (url, request) => {
         let etag;
         // TODO when is there no request?
         if (request) {
-            let stats = await stat(absolutePath);
-            if (stats.isDirectory()) {
-                absolutePath += '/index.html';
-                stats = await stat(absolutePath);
-            }
-            etag = GetEtag.getEtag(stats);
+            etag = await GetPathEtag.getPathEtag(absolutePath);
             if (request.headers[HttpHeader.IfNotMatch] === etag) {
                 const headers = GetHeaders.getHeaders(absolutePath, pathName);
                 return GetNotModifiedResponse.getNotModifiedResponse(headers);

package/src/parts/GetPathEtag/GetPathEtag.js

@@ -0,0 +1,11 @@
+import { stat } from 'node:fs/promises';
+import * as GetEtag from '../GetEtag/GetEtag.js';
+export const getPathEtag = async (absolutePath) => {
+    let stats = await stat(absolutePath);
+    if (stats.isDirectory()) {
+        absolutePath += '/index.html';
+        stats = await stat(absolutePath);
+    }
+    const etag = GetEtag.getEtag(stats);
+    return etag;
+};

package/src/parts/GetTypeScriptPath/GetTypeScriptPath.js

@@ -1,13 +1,13 @@
 import { join } from 'node:path';
 import { pathToFileURL } from 'node:url';
+import * as BuiltinExtensionsPath from '../BuiltinExtensionsPath/BuiltinExtensionsPath.js';
 import * as IsBuiltServer from '../IsBuiltServer/IsBuiltServer.js';
 import * as IsProduction from '../IsProduction/IsProduction.js';
-import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js';
 export const getTypeScriptUri = () => {
     if (!IsProduction.isProduction || IsBuiltServer.isBuiltServer) {
         return 'typescript';
     }
-    const typescriptPath = join(PlatformPaths.getBuiltinExtensionsPath(), 'builtin.language-features-typescript', 'node', 'node_modules', 'typescript', 'lib', 'typescript.js');
+    const typescriptPath = join(BuiltinExtensionsPath.getBuiltinExtensionsPath(), 'builtin.language-features-typescript', 'node', 'node_modules', 'typescript', 'lib', 'typescript.js');
     const typescriptUri = pathToFileURL(typescriptPath).toString();
     return typescriptUri;
 };

package/src/parts/HandleRequest/HandleRequest.ipc.js

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

package/src/parts/HandleRequest/HandleRequest.js

@@ -0,0 +1,9 @@
+import * as Assert from '../Assert/Assert.js';
+import * as HttpServerResponse from '../HttpServerResponse/HttpServerResponse.js';
+import * as GetElectronFileResponse from '../GetElectronFileResponse/GetElectronFileResponse.js';
+export const handleRequest = async (socket, request) => {
+    Assert.object(socket);
+    Assert.object(request);
+    const fileResponse = await GetElectronFileResponse.getElectronFileResponse(request.url, request);
+    HttpServerResponse.send(request, socket, fileResponse);
+};

package/src/parts/Module/Module.js

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

package/src/parts/ModuleId/ModuleId.js

@@ -71,3 +71,4 @@ export const WebViewServer = 76;
 export const Transferrable = 77;
 export const GetExtensions = 78;
 export const FileSystemDisk = 79;
+export const HandleRequest = 80;

package/src/parts/ModuleMap/ModuleMap.js

@@ -300,6 +300,8 @@ export const getModuleId = (commandId) => {
         case 'FileSystemDisk.readJson':
         case 'FileSystemDisk.writeFile':
             return ModuleId.FileSystemDisk;
+        case 'HandleRequest.handleRequest':
+            return ModuleId.HandleRequest;
         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.39.0';
-export const commit = '95c7ea1';
-export const date = '2024-12-01T18:13:02.000Z';
+export const version = '0.40.1';
+export const commit = '21f6893';
+export const date = '2024-12-08T16:28:13.000Z';
 export const getVersion = () => {
     return version;
 };

package/src/parts/StaticPath/StaticPath.js

@@ -1,14 +1,12 @@
-import { dirname, join } from 'node:path';
+import { join } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import * as IsBuiltServer from '../IsBuiltServer/IsBuiltServer.js';
 import * as Root from '../Root/Root.js';
-import { fileURLToPath } from 'node:url';
 export const getStaticPath = () => {
     if (IsBuiltServer.isBuiltServer) {
         // TODO maybe move static files to separate package
-        const serverIndexUri = import.meta.resolve('@lvce-editor/server');
-        const serverIndexPath = fileURLToPath(serverIndexUri);
-        const serverPath = dirname(serverIndexPath);
-        const staticPath = join(serverPath, 'static');
+        const staticServerUri = fileURLToPath(import.meta.resolve('@lvce-editor/static-server'));
+        const staticPath = join(staticServerUri, '..', '..', 'static');
         return staticPath;
     }
     return join(Root.root, 'static');