@lvce-editor/shared-process 0.29.5 → 0.29.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.29.5",
+  "version": "0.29.6",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,26 +18,26 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.2.0",
-    "@lvce-editor/extension-host-helper-process": "0.29.5",
+    "@lvce-editor/extension-host-helper-process": "0.29.6",
     "@lvce-editor/ipc": "^9.1.0",
     "@lvce-editor/json-rpc": "^1.3.0",
     "@lvce-editor/jsonc-parser": "^1.2.0",
     "@lvce-editor/pretty-error": "^1.5.0",
-    "@lvce-editor/verror": "^1.2.0",
+    "@lvce-editor/verror": "^1.3.0",
     "debug": "^4.3.4",
     "is-object": "^1.0.2",
     "xdg-basedir": "^5.1.0"
   },
   "optionalDependencies": {
-    "@lvce-editor/network-process": "^1.1.0",
-    "@lvce-editor/preload": "^1.0.0",
-    "@lvce-editor/search-process": "^1.1.0",
-    "@lvce-editor/pty-host": "^1.1.0",
+    "@lvce-editor/network-process": "^1.2.0",
+    "@lvce-editor/preload": "^1.2.0",
+    "@lvce-editor/search-process": "^1.2.0",
+    "@lvce-editor/pty-host": "^1.2.0",
     "@lvce-editor/embeds-process": "^1.5.0",
     "open": "^10.1.0",
     "tail": "^2.2.6",
     "tmp-promise": "^3.0.3",
     "trash": "^8.1.1",
-    "@lvce-editor/typescript-compile-process": "0.29.5"
+    "@lvce-editor/typescript-compile-process": "0.29.6"
   }
 }

package/src/parts/ContentSecurityPolicySearchWorker/ContentSecurityPolicySearchWorker.js

@@ -0,0 +1,2 @@
+import * as GetContentSecurityPolicy from '../GetContentSecurityPolicy/GetContentSecurityPolicy.js';
+export const value = GetContentSecurityPolicy.getContentSecurityPolicy([`default-src 'none'`, `script-src 'self'`]);

package/src/parts/ExtensionManagement/ExtensionManagementColorTheme.js

@@ -1,10 +1,10 @@
 import * as Assert from '../Assert/Assert.js';
-import * as FileSystemWatch from '../FileSystemWatch/FileSystemWatch.js';
 import * as ReadJson from '../JsonFile/JsonFile.js';
 import * as JsonRpcVersion from '../JsonRpcVersion/JsonRpcVersion.js';
 import * as Path from '../Path/Path.js';
 import * as Process from '../Process/Process.js';
 import { VError } from '../VError/VError.js';
+import * as FileSystemWatch from '../WatchFile/WatchFile.js';
 import * as ExtensionManagement from './ExtensionManagement.js';
 // TODO test this function
 // TODO very similar with getIconTheme
@@ -67,8 +67,8 @@ export const watch = async (socket, colorThemeId) => {
     if (verbose) {
         console.info(`[shared-process] starting to watch color theme ${colorThemeId} at ${colorThemePath}`);
     }
-    const watcher = FileSystemWatch.watchFile(colorThemePath);
-    for await (const event of watcher) {
+    const callback = () => {
         socket.send({ jsonrpc: JsonRpcVersion.Two, method: 'ColorTheme.reload', params: [] });
-    }
+    };
+    await FileSystemWatch.watchFile(colorThemePath, callback);
 };

package/src/parts/GetHeaders/GetHeaders.js

@@ -1,4 +1,4 @@
-import { extname } from 'path';
+import { basename, extname } from 'path';
 import * as GetHeadersDefault from '../GetHeadersDefault/GetHeadersDefault.js';
 import * as GetHeadersEditorWorker from '../GetHeadersEditorWorker/GetHeadersEditorWorker.js';
 import * as GetHeadersEmbedsWorker from '../GetHeadersEmbedsWorker/GetHeadersEmbedsWorker.js';
@@ -6,6 +6,7 @@ import * as GetHeadersExtensionHostWorker from '../GetHeadersExtensionHostWorker
 import * as GetHeadersMainFrame from '../GetHeadersMainFrame/GetHeadersMainFrame.js';
 import * as GetHeadersOtherWorker from '../GetHeadersOtherWorker/GetHeadersOtherWorker.js';
 import * as GetHeadersRendererWorker from '../GetHeadersRendererWorker/GetHeadersRendererWorker.js';
+import * as GetHeadersSearchWorker from '../GetHeadersSearchWorker/GetHeadersSearchWorker.js';
 import * as GetHeadersSyntaxHighlightingWorker from '../GetHeadersSyntaxHighlightingWorker/GetHeadersSyntaxHighlightingWorker.js';
 import * as GetHeadersTerminalWorker from '../GetHeadersTerminalWorker/GetHeadersTerminalWorker.js';
 import * as GetHeadersTestWorker from '../GetHeadersTestWorker/GetHeadersTestWorker.js';
@@ -17,31 +18,38 @@ const getExtraHeaders = (pathName, fileExtension) => {
             return GetHeadersMainFrame.getHeadersMainFrame();
         case '.js':
         case '.ts':
-            if (pathName.endsWith('editorWorkerMain.js') || pathName.endsWith('editorWorkerMain.ts')) {
-                return GetHeadersEditorWorker.getHeadersEditorWorker();
+            const baseName = basename(pathName);
+            switch (baseName) {
+                case 'editorWorkerMain.js':
+                case 'editorWorkerMain.ts':
+                    return GetHeadersEditorWorker.getHeadersEditorWorker();
+                case 'testWorkerMain.js':
+                case 'testWorkerMain.ts':
+                    return GetHeadersTestWorker.getHeadersExtensionHostWorker(); // TODO
+                case 'rendererWorkerMain.js':
+                case 'rendererWorkerMain.ts':
+                    return GetHeadersRendererWorker.getHeadersRendererWorker();
+                case 'extensionHostWorkerMain.js':
+                case 'extensionHostWorkerMain.ts':
+                    return GetHeadersExtensionHostWorker.getHeadersExtensionHostWorker();
+                case 'terminalWorkerMain.js':
+                case 'terminalWorkerMain.ts':
+                    return GetHeadersTerminalWorker.getHeadersTerminalWorker();
+                case 'syntaxHighlightingWorkerMain.js':
+                case 'syntaxHighlightingWorkerMain.ts':
+                    return GetHeadersSyntaxHighlightingWorker.getHeadersSyntaxHighlightingWorker();
+                case 'embedsWorkerMain.js':
+                case 'embedsWorkerMain.ts':
+                    return GetHeadersEmbedsWorker.getHeadersEmbedsWorker();
+                case 'searchWorkerMain.js':
+                case 'searchWorkerMain.ts':
+                    return GetHeadersSearchWorker.getHeadersSearchWorker();
+                default:
+                    if (pathName.endsWith('WorkerMain.js') || pathName.endsWith('WorkerMain.ts')) {
+                        return GetHeadersOtherWorker.getHeadersOtherWorker(pathName);
+                    }
+                    return GetHeadersDefault.getHeadersDefault();
             }
-            if (pathName.endsWith('testWorkerMain.js') || pathName.endsWith('testWorkerMain.ts')) {
-                return GetHeadersTestWorker.getHeadersExtensionHostWorker();
-            }
-            if (pathName.endsWith('rendererWorkerMain.js') || pathName.endsWith('rendererWorkerMain.ts')) {
-                return GetHeadersRendererWorker.getHeadersRendererWorker();
-            }
-            if (pathName.endsWith('extensionHostWorkerMain.js') || pathName.endsWith('extensionHostWorkerMain.ts')) {
-                return GetHeadersExtensionHostWorker.getHeadersExtensionHostWorker();
-            }
-            if (pathName.endsWith('terminalWorkerMain.js') || pathName.endsWith('terminalWorkerMain.ts')) {
-                return GetHeadersTerminalWorker.getHeadersTerminalWorker();
-            }
-            if (pathName.endsWith('syntaxHighlightingWorkerMain.js') || pathName.endsWith('syntaxHighlightingWorkerMain.ts')) {
-                return GetHeadersSyntaxHighlightingWorker.getHeadersSyntaxHighlightingWorker();
-            }
-            if (pathName.endsWith('embedsWorkerMain.js') || pathName.endsWith('embedsWorkerMain.ts')) {
-                return GetHeadersEmbedsWorker.getHeadersEmbedsWorker();
-            }
-            if (pathName.endsWith('WorkerMain.js') || pathName.endsWith('WorkerMain.ts')) {
-                return GetHeadersOtherWorker.getHeadersOtherWorker(pathName);
-            }
-            return GetHeadersDefault.getHeadersDefault();
         default:
             return GetHeadersDefault.getHeadersDefault();
     }

package/src/parts/GetHeadersSearchWorker/GetHeadersSearchWorker.js

@@ -0,0 +1,9 @@
+import * as ContentSecurityPolicySearchWorker from '../ContentSecurityPolicySearchWorker/ContentSecurityPolicySearchWorker.js';
+import * as CrossOriginEmbedderPolicy from '../CrossOriginEmbedderPolicy/CrossOriginEmbedderPolicy.js';
+import * as HttpHeader from '../HttpHeader/HttpHeader.js';
+export const getHeadersSearchWorker = () => {
+    return {
+        [HttpHeader.CrossOriginEmbedderPolicy]: CrossOriginEmbedderPolicy.value,
+        [HttpHeader.ContentSecurityPolicy]: ContentSecurityPolicySearchWorker.value,
+    };
+};

package/src/parts/Platform/Platform.js

@@ -41,9 +41,9 @@ export const getAppImageName = () => {
 export const getSetupName = () => {
     return 'Lvce-Setup';
 };
-export const version = '0.29.5';
-export const commit = 'e4111e1';
-export const date = '2024-05-19T12:24:59.000Z';
+export const version = '0.29.6';
+export const commit = '3103eaf';
+export const date = '2024-05-20T07:02:57.000Z';
 export const getVersion = () => {
     return version;
 };

package/src/parts/WatchFile/WatchFile.js

@@ -0,0 +1,14 @@
+import { VError } from '@lvce-editor/verror';
+import * as fs from 'node:fs/promises';
+export const watchFile = async (path, callback) => {
+    try {
+        const watcher = fs.watch(path);
+        for await (const event of watcher) {
+            callback(event);
+        }
+        return watcher;
+    }
+    catch (error) {
+        console.error(new VError(error, `Failed to watch file`));
+    }
+};

package/src/parts/FileSystemWatch/FileSystemWatch.js

@@ -1,5 +0,0 @@
-import * as fs from 'node:fs/promises';
-export const watchFile = (path) => {
-    const watcher = fs.watch(path);
-    return watcher;
-};