@lvce-editor/shared-process 0.32.1 → 0.32.2

package/package.json

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

package/src/parts/CreateWebViewServerHandler/CreateWebViewServerHandler.js

@@ -4,6 +4,8 @@ import { pipeline } from 'node:stream/promises';
 import { fileURLToPath } from 'node:url';
 import * as GetContentSecurityPolicy from '../GetContentSecurityPolicy/GetContentSecurityPolicy.js';
 import * as SetHeaders from '../SetHeaders/SetHeaders.js';
+import * as PreviewInjectedCode from '../PreviewInjectedCode/PreviewInjectedCode.js';
+import { readFile } from 'node:fs/promises';
 const getPathName = (request) => {
     const { pathname } = new URL(request.url || '', `https://${request.headers.host}`);
     return pathname;
@@ -29,8 +31,61 @@ const textMimeType = {
 const getContentType = (filePath) => {
     return textMimeType[extname(filePath)] || 'text/plain';
 };
+const injectPreviewScript = (html) => {
+    const injectedCode = `<script type="module" src="/preview-injected.js"></script>\n`;
+    const titleEndIndex = html.indexOf('</title>');
+    const newHtml = html.slice(0, titleEndIndex + '</title>'.length) + '\n' + injectedCode + html.slice(titleEndIndex);
+    return newHtml;
+};
+const handleIndexHtml = async (response, filePath, frameAncestors) => {
+    try {
+        const csp = GetContentSecurityPolicy.getContentSecurityPolicy([`default-src 'none'`, `script-src 'self'`, `frame-ancestors ${frameAncestors}`]);
+        const contentType = getContentType(filePath);
+        const content = await readFile(filePath, 'utf8');
+        SetHeaders.setHeaders(response, {
+            'Cross-Origin-Resource-Policy': 'cross-origin',
+            'Cross-Origin-Embedder-Policy': 'require-corp',
+            'Content-Security-Policy': csp,
+            'Content-Type': contentType,
+        });
+        const newContent = injectPreviewScript(content);
+        response.end(newContent);
+    }
+    catch (error) {
+        console.error(`[preview-server] ${error}`);
+    }
+};
+const handleOther = async (response, filePath) => {
+    try {
+        const contentType = getContentType(filePath);
+        // TODO figure out which of these headers are actually needed
+        SetHeaders.setHeaders(response, {
+            'Cross-Origin-Resource-Policy': 'cross-origin',
+            'Cross-Origin-Embedder-Policy': 'require-corp',
+            'Access-Control-Allow-Origin': '*',
+            'Content-Type': contentType,
+        });
+        await pipeline(createReadStream(filePath), response);
+    }
+    catch (error) {
+        console.error(error);
+        response.end(`[preview-server] ${error}`);
+    }
+};
+const handlePreviewInjected = (response) => {
+    try {
+        const injectedCode = PreviewInjectedCode.injectedCode;
+        const contentType = getContentType('/test/file.js');
+        SetHeaders.setHeaders(response, {
+            'Content-Type': contentType,
+        });
+        response.end(injectedCode);
+    }
+    catch (error) {
+        console.error(`[preview-server] ${error}`);
+    }
+};
 export const createHandler = (frameAncestors, webViewRoot) => {
-    const csp = GetContentSecurityPolicy.getContentSecurityPolicy([`default-src 'none'`, `script-src 'self'`, `frame-ancestors ${frameAncestors}`]);
     const handleRequest = async (request, response) => {
         let pathName = getPathName(request);
         if (pathName === '/') {
@@ -38,25 +93,13 @@ export const createHandler = (frameAncestors, webViewRoot) => {
         }
         const filePath = fileURLToPath(`file://${webViewRoot}${pathName}`);
         const isHtml = filePath.endsWith('index.html');
-        const contentType = getContentType(filePath);
         if (isHtml) {
-            SetHeaders.setHeaders(response, {
-                'Cross-Origin-Resource-Policy': 'cross-origin',
-                'Cross-Origin-Embedder-Policy': 'require-corp',
-                'Content-Security-Policy': csp,
-                'Content-Type': contentType,
-            });
+            return handleIndexHtml(response, filePath, frameAncestors);
         }
-        else {
-            // TODO figure out which of these headers are actually needed
-            SetHeaders.setHeaders(response, {
-                'Cross-Origin-Resource-Policy': 'cross-origin',
-                'Cross-Origin-Embedder-Policy': 'require-corp',
-                'Access-Control-Allow-Origin': '*',
-                'Content-Type': contentType,
-            });
+        if (filePath.endsWith('preview-injected.js')) {
+            return handlePreviewInjected(response);
         }
-        await pipeline(createReadStream(filePath), response);
+        return handleOther(response, filePath);
     };
     return handleRequest;
 };

package/src/parts/GetAppWindowOptions/GetAppWindowOptions.js

@@ -6,7 +6,7 @@ export const getAppWindowOptions = (preferences, screenWidth, screenHeight) => {
     const titleBarStyle = titleBarPreference === 'custom' ? 'hidden' : undefined;
     const zoomLevelPreference = preferences['window.zoomLevel'];
     const zoomLevel = zoomLevelPreference;
-    const windowControlsOverlayPreference = (Platform.isWindows || Platform.isMacOs) && preferences['window.controlsOverlay.enabled'];
+    const windowControlsOverlayPreference = (Platform.isWindows || Platform.isMacOs || Platform.isLinux) && preferences['window.controlsOverlay.enabled'];
     const titleBarOverlay = windowControlsOverlayPreference
         ? {
             color: '#1e2324',

package/src/parts/ModuleId/ModuleId.js

@@ -68,3 +68,4 @@ export const HandleMessagePortForProcessExplorer = 73;
 export const HandleMessagePortForSearchProcess = 74;
 export const FileWatcher = 75;
 export const WebViewServer = 76;
+export const Transferrable = 77;

package/src/parts/ModuleMap/ModuleMap.js

@@ -277,6 +277,8 @@ export const getModuleId = (commandId) => {
             return ModuleId.HandleMessagePortForSearchProcess;
         case 'FileWatcher.watch':
             return ModuleId.FileWatcher;
+        case 'Transferrable.transfer':
+            return ModuleId.Transferrable;
         case 'WebViewServer.start':
         case 'WebViewServer.setHandler':
             return ModuleId.WebViewServer;

package/src/parts/Platform/Platform.js

@@ -41,9 +41,9 @@ export const getAppImageName = () => {
 export const getSetupName = () => {
     return 'Lvce-Setup';
 };
-export const version = '0.32.1';
-export const commit = 'f51fb63';
-export const date = '2024-08-18T19:59:49.000Z';
+export const version = '0.32.2';
+export const commit = '93e00a3';
+export const date = '2024-08-20T21:05:50.000Z';
 export const getVersion = () => {
     return version;
 };

package/src/parts/PreviewInjectedCode/PreviewInjectedCode.js

@@ -0,0 +1,74 @@
+export const injectedCode = `
+let commandMap = {}
+let port
+const callbacks = Object.create(null)
+
+
+const isJsonRpcResponse = message => {
+  return 'result' in message || 'error' in message
+}
+
+const handleMessage = async (event) => {
+  const message = event.data
+  if(isJsonRpcResponse(message)){
+    const fn = callbacks[message.id]
+    fn(message.result)
+    return
+  }
+  const { method, params } = message
+  const fn = commandMap[method]
+  if(!fn){
+    throw new Error("command not found \${method}")
+  }
+  const result = await fn(...params)
+}
+
+const handleFirstMessage = (event) => {
+  const message = event.data
+  port = message.params[0]
+  port.onmessage = handleMessage
+  port.postMessage('ready')
+}
+
+window.addEventListener('message', handleFirstMessage, {
+  once: true,
+})
+
+const withResolvers = () => {
+  let _resolve
+  const promise = new Promise(resolve => {
+    _resolve = resolve
+  })
+  return {
+    resolve: _resolve,
+    promise
+  }
+}
+
+const registerPromise = () => {
+  const id = 1
+  const {resolve, promise} = withResolvers()
+  callbacks[id] = { resolve }
+  return {
+    id, promise
+  }
+}
+
+globalThis.lvceRpc = (value) => {
+  commandMap = value
+  return {
+    async invoke(method, ...params){
+      const {id, promise } = registerPromise()
+      port.postMessage({
+        jsonrpc: '2.0',
+        id,
+        method,
+        params
+      })
+      const response = await promise
+      // TODO unwrap jsonrpc result
+      return response
+    }
+  }
+}
+`;