@lvce-editor/shared-process 0.33.2 → 0.33.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.33.2",
+  "version": "0.33.4",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.2.0",
-    "@lvce-editor/extension-host-helper-process": "0.33.2",
+    "@lvce-editor/extension-host-helper-process": "0.33.4",
     "@lvce-editor/ipc": "^10.0.4",
     "@lvce-editor/json-rpc": "^3.0.0",
     "@lvce-editor/jsonc-parser": "^1.4.0",
@@ -35,6 +35,7 @@
     "@lvce-editor/typescript-compile-process": "^1.2.0",
     "@lvce-editor/pty-host": "^2.0.0",
     "@lvce-editor/embeds-process": "^1.5.0",
+    "@lvce-editor/preview-process": "^1.2.1",
     "open": "^10.1.0",
     "tail": "^2.2.6",
     "tmp-promise": "^3.0.3",

package/src/parts/CrossOriginResourcePolicy/CrossOriginResourcePolicy.js

@@ -1 +1 @@
-export const value = 'cross-origin';
+export const value = 'same-origin';

package/src/parts/ExtensionManagement/ExtensionManagementLanguages.js

@@ -39,13 +39,17 @@ export const getLanguages = async () => {
     return languages;
 };
 const getWebViewsFromExtensions = (extensions) => {
+    // console.log({ extensions })
     const webViews = [];
     for (const extension of extensions) {
         if (extension && extension.webViews) {
             for (const webView of extension.webViews) {
+                const path = join(extension.path, webView.path);
+                const remotePath = GetRemoteUrl.getRemoteUrl(path);
                 webViews.push({
                     id: webView.id,
-                    path: join(extension.path, webView.path),
+                    path,
+                    remotePath,
                 });
             }
         }

package/src/parts/GetHeaders/GetHeaders.js

@@ -1,4 +1,6 @@
 import { basename, extname } from 'path';
+import * as CrossOriginEmbedderPolicy from '../CrossOriginEmbedderPolicy/CrossOriginEmbedderPolicy.js';
+import * as CrossOriginResourcePolicy from '../CrossOriginResourcePolicy/CrossOriginResourcePolicy.js';
 import * as GetHeadersDefault from '../GetHeadersDefault/GetHeadersDefault.js';
 import * as GetHeadersEditorWorker from '../GetHeadersEditorWorker/GetHeadersEditorWorker.js';
 import * as GetHeadersEmbedsWorker from '../GetHeadersEmbedsWorker/GetHeadersEmbedsWorker.js';
@@ -59,6 +61,8 @@ export const getHeaders = (absolutePath, pathName) => {
     const mime = GetMimeType.getMimeType(extension);
     const headers = {
         [HttpHeader.ContentType]: mime,
+        [HttpHeader.CrossOriginResourcePolicy]: CrossOriginResourcePolicy.value,
+        [HttpHeader.CrossOriginEmbedderPolicy]: CrossOriginEmbedderPolicy.value,
     };
     const extraHeaders = getExtraHeaders(pathName, extension);
     return {

package/src/parts/GetHeadersMainFrame/GetHeadersMainFrame.js

@@ -1,11 +1,13 @@
 import * as ContentSecurityPolicyDocument from '../ContentSecurityPolicyDocument/ContentSecurityPolicyDocument.js';
 import * as CrossOriginEmbedderPolicy from '../CrossOriginEmbedderPolicy/CrossOriginEmbedderPolicy.js';
 import * as CrossOriginOpenerPolicy from '../CrossOriginOpenerPolicy/CrossOriginOpenerPolicy.js';
+import * as CrossOriginResourcePolicy from '../CrossOriginResourcePolicy/CrossOriginResourcePolicy.js';
 import * as HttpHeader from '../HttpHeader/HttpHeader.js';
 export const getHeadersMainFrame = () => {
     return {
         [HttpHeader.ContentSecurityPolicy]: ContentSecurityPolicyDocument.value,
-        [HttpHeader.CrossOriginOpenerPolicy]: CrossOriginOpenerPolicy.value,
         [HttpHeader.CrossOriginEmbedderPolicy]: CrossOriginEmbedderPolicy.value,
+        [HttpHeader.CrossOriginOpenerPolicy]: CrossOriginOpenerPolicy.value,
+        [HttpHeader.CrossOriginResourcePolicy]: CrossOriginResourcePolicy.value,
     };
 };

package/src/parts/LaunchPreviewProcess/LaunchPreviewProcess.js

@@ -0,0 +1,16 @@
+import * as HandleIpc from '../HandleIpc/HandleIpc.js';
+import * as IpcParent from '../IpcParent/IpcParent.js';
+import * as IpcParentType from '../IpcParentType/IpcParentType.js';
+import * as PreviewProcessPath from '../PreviewProcessPath/PreviewProcessPath.js';
+export const launchPreviewProcess = async () => {
+    const method = IpcParentType.NodeForkedProcess;
+    const previewProcess = await IpcParent.create({
+        method,
+        path: PreviewProcessPath.previewProcessPath,
+        argv: [],
+        stdio: 'inherit',
+        name: 'Preview Process',
+    });
+    HandleIpc.handleIpc(previewProcess);
+    return previewProcess;
+};

package/src/parts/Platform/Platform.js

@@ -41,9 +41,9 @@ export const getAppImageName = () => {
 export const getSetupName = () => {
     return 'Lvce-Setup';
 };
-export const version = '0.33.2';
-export const commit = 'fa60d57';
-export const date = '2024-08-25T16:12:04.000Z';
+export const version = '0.33.4';
+export const commit = 'da8ae3e';
+export const date = '2024-08-28T17:12:51.000Z';
 export const getVersion = () => {
     return version;
 };

package/src/parts/PreviewProcess/PreviewProcess.js

@@ -0,0 +1,18 @@
+import * as JsonRpc from '../JsonRpc/JsonRpc.js';
+import * as LaunchPreviewProcess from '../LaunchPreviewProcess/LaunchPreviewProcess.js';
+export const state = {
+    /**
+     * @type {any}
+     */
+    ipc: undefined,
+};
+export const getOrCreate = async () => {
+    if (!state.ipc) {
+        state.ipc = LaunchPreviewProcess.launchPreviewProcess();
+    }
+    return state.ipc;
+};
+export const invoke = async (method, ...params) => {
+    const ipc = await getOrCreate();
+    return JsonRpc.invoke(ipc, method, ...params);
+};

package/src/parts/PreviewProcessPath/PreviewProcessPath.js

@@ -0,0 +1,2 @@
+import * as ResolveBin from '../ResolveBin/ResolveBin.js';
+export const previewProcessPath = ResolveBin.resolveBin('@lvce-editor/preview-process');

package/src/parts/WebViewServer/WebViewServer.js

@@ -1,21 +1,7 @@
-import * as CreateWebViewServer from '../CreateWebViewServer/CreateWebViewServer.js';
-import * as CreateWebViewServerHandler from '../CreateWebViewServerHandler/CreateWebViewServerHandler.js';
-const state = {
-    /**
-     * @type {any }
-     */
-    promise: undefined,
-};
-// TODO move webview preview
-// server into separate process
+import * as PreviewProcess from '../PreviewProcess/PreviewProcess.js';
 export const start = async (port) => {
-    if (!state.promise) {
-        state.promise = CreateWebViewServer.createWebViewServer(port);
-    }
-    return state.promise;
+    await PreviewProcess.invoke('WebViewServer.start', port);
 };
 export const setHandler = async (frameAncestors, webViewRoot) => {
-    const server = await state.promise;
-    const handler = CreateWebViewServerHandler.createHandler(frameAncestors, webViewRoot);
-    server.setHandler(handler);
+    await PreviewProcess.invoke('WebViewServer.setHandler', frameAncestors, webViewRoot);
 };

package/src/parts/CreateWebViewServer/CreateWebViewServer.js

@@ -1,24 +0,0 @@
-import { VError } from '@lvce-editor/verror';
-import { createServer } from 'node:http';
-import * as Promises from '../Promises/Promises.js';
-export const createWebViewServer = async (port) => {
-    try {
-        const server = createServer();
-        const { resolve, promise } = Promises.withResolvers();
-        server.listen(port, resolve);
-        await promise;
-        return {
-            handler: undefined,
-            setHandler(handleRequest) {
-                if (this.handler) {
-                    return;
-                }
-                this.handler = this.handler;
-                server.on('request', handleRequest);
-            },
-        };
-    }
-    catch (error) {
-        throw new VError(error, `Failed to start webview server`);
-    }
-};

package/src/parts/CreateWebViewServerHandler/CreateWebViewServerHandler.js

@@ -1,105 +0,0 @@
-import { createReadStream } from 'node:fs';
-import { extname } from 'node:path';
-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;
-};
-const textMimeType = {
-    '.html': 'text/html',
-    '.js': 'text/javascript',
-    '.ts': 'text/javascript',
-    '.mjs': 'text/javascript',
-    '.json': 'application/json',
-    '.css': 'text/css',
-    '.svg': 'image/svg+xml',
-    '.avif': 'image/avif',
-    '.woff': 'application/font-woff',
-    '.ttf': 'font/ttf',
-    '.png': 'image/png',
-    '.jpe': 'image/jpg',
-    '.ico': 'image/x-icon',
-    '.jpeg': 'image/jpg',
-    '.jpg': 'image/jpg',
-    '.webp': 'image/webp',
-};
-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 handleRequest = async (request, response) => {
-        let pathName = getPathName(request);
-        if (pathName === '/') {
-            pathName += 'index.html';
-        }
-        const filePath = fileURLToPath(`file://${webViewRoot}${pathName}`);
-        const isHtml = filePath.endsWith('index.html');
-        if (isHtml) {
-            return handleIndexHtml(response, filePath, frameAncestors);
-        }
-        if (filePath.endsWith('preview-injected.js')) {
-            return handlePreviewInjected(response);
-        }
-        return handleOther(response, filePath);
-    };
-    return handleRequest;
-};

package/src/parts/PreviewInjectedCode/PreviewInjectedCode.js

@@ -1,74 +0,0 @@
-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
-    }
-  }
-}
-`;