@lvce-editor/shared-process 0.24.5 → 0.24.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.24.5",
+  "version": "0.24.6",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,12 +18,12 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.2.0",
-    "@lvce-editor/extension-host-helper-process": "0.24.5",
+    "@lvce-editor/extension-host-helper-process": "0.24.6",
     "@lvce-editor/ipc": "^2.1.0",
     "@lvce-editor/json-rpc": "^1.0.0",
     "@lvce-editor/jsonc-parser": "^1.1.1",
     "@lvce-editor/pretty-error": "^1.5.0",
-    "@lvce-editor/pty-host": "0.24.5",
+    "@lvce-editor/pty-host": "0.24.6",
     "@lvce-editor/verror": "^1.1.2",
     "@lvce-editor/web-socket-server": "^1.1.0",
     "debug": "^4.3.4",

package/src/parts/ContentSecurityPolicy/ContentSecurityPolicy.ipc.js

@@ -0,0 +1,7 @@
+import * as ContentSecurityPolicy from './ContentSecurityPolicy.js'
+
+export const name = 'ContentSecurityPolicy'
+
+export const Commands = {
+  set: ContentSecurityPolicy.set,
+}

package/src/parts/ContentSecurityPolicy/ContentSecurityPolicy.js

@@ -1,16 +1,8 @@
-import * as Character from '../Character/Character.js'
-import * as AddSemiColon from '../AddSemiColon/AddSemiColon.js'
+import * as Assert from '../Assert/Assert.js'
+import * as ContentSecurityPolicyState from '../ContentSecurityPolicyState/ContentSecurityPolicyState.js'
 
-export const key = 'Content-Security-Policy'
-
-export const value = [
-  `default-src 'none'`,
-  `font-src 'self'`,
-  `frame-src *`,
-  `img-src 'self' https: data:`,
-  `script-src 'self'`,
-  `media-src 'self'`,
-  `style-src 'self'`,
-]
-  .map(AddSemiColon.addSemicolon)
-  .join(Character.Space)
+export const set = (url, contentSecurityPolicy) => {
+  Assert.string(url)
+  Assert.string(contentSecurityPolicy)
+  ContentSecurityPolicyState.set(url, contentSecurityPolicy)
+}

package/src/parts/ContentSecurityPolicyDocument/ContentSecurityPolicyDocument.js

@@ -0,0 +1,16 @@
+import * as Character from '../Character/Character.js'
+import * as AddSemiColon from '../AddSemiColon/AddSemiColon.js'
+
+export const key = 'Content-Security-Policy'
+
+export const value = [
+  `default-src 'none'`,
+  `font-src 'self'`,
+  `frame-src *`,
+  `img-src 'self' https: data:`,
+  `script-src 'self'`,
+  `media-src 'self'`,
+  `style-src 'self'`,
+]
+  .map(AddSemiColon.addSemicolon)
+  .join(Character.Space)

package/src/parts/ContentSecurityPolicyState/ContentSecurityPolicyState.js

@@ -0,0 +1,9 @@
+const map = Object.create(null)
+
+export const set = (url, contentSecurityPolicy) => {
+  map[url] = contentSecurityPolicy
+}
+
+export const get = (url) => {
+  return map[url]
+}

package/src/parts/ContentSecurityPolicyTestWorker/ContentSecurityPolicyTestWorker.js

@@ -0,0 +1,6 @@
+import * as Character from '../Character/Character.js'
+import * as AddSemiColon from '../AddSemiColon/AddSemiColon.js'
+
+export const key = 'Content-Security-Policy'
+
+export const value = [`default-src 'none'`, `script-src 'self'`].map(AddSemiColon.addSemicolon).join(Character.Space)

package/src/parts/GetElectronFileResponse/GetElectronFileResponse.js

@@ -28,7 +28,7 @@ export const getElectronFileResponse = async (url, request) => {
       }
     }
     const content = await GetElectronFileResponseContent.getElectronFileResponseContent(request, absolutePath, url)
-    const headers = GetHeaders.getHeaders(absolutePath)
+    const headers = GetHeaders.getHeaders(absolutePath, pathName)
     headers['Cache-Control'] = 'public, max-age=0, must-revalidate'
     if (etag) {
       headers['Etag'] = etag

package/src/parts/GetHeaders/GetHeaders.js

@@ -1,6 +1,7 @@
 import { extname } from 'path'
 import * as GetHeadersExtensionHostWorker from '../GetHeadersExtensionHostWorker/GetHeadersExtensionHostWorker.js'
 import * as GetHeadersMainFrame from '../GetHeadersMainFrame/GetHeadersMainFrame.js'
+import * as GetHeadersTestWorker from '../GetHeadersTestWorker/GetHeadersTestWorker.js'
 import * as GetHeadersOtherWorker from '../GetHeadersOtherWorker/GetHeadersOtherWorker.js'
 import * as GetHeadersRendererWorker from '../GetHeadersRendererWorker/GetHeadersRendererWorker.js'
 import * as GetMimeType from '../GetMimeType/GetMimeType.js'
@@ -9,19 +10,23 @@ const getHeadersDefault = () => {
   return {}
 }
 
-const getExtraHeaders = (url, fileExtension) => {
+const getExtraHeaders = (pathName, fileExtension) => {
   switch (fileExtension) {
     case '.html':
       return GetHeadersMainFrame.getHeadersMainFrame()
     case '.js':
-      if (url.endsWith('rendererWorkerMain.js')) {
+    case '.ts':
+      if (pathName.endsWith('testWorkerMain.js') || pathName.endsWith('testWorkerMain.ts')) {
+        return GetHeadersTestWorker.getHeadersExtensionHostWorker()
+      }
+      if (pathName.endsWith('rendererWorkerMain.js')) {
         return GetHeadersRendererWorker.getHeadersRendererWorker()
       }
-      if (url.endsWith('extensionHostWorkerMain.js')) {
+      if (pathName.endsWith('extensionHostWorkerMain.js')) {
         return GetHeadersExtensionHostWorker.getHeadersExtensionHostWorker()
       }
-      if (url.endsWith('WorkerMain.js')) {
-        return GetHeadersOtherWorker.getHeadersOtherWorker()
+      if (pathName.endsWith('WorkerMain.js') || pathName.endsWith('WorkerMain.ts')) {
+        return GetHeadersOtherWorker.getHeadersOtherWorker(pathName)
       }
       return getHeadersDefault()
     default:
@@ -29,13 +34,13 @@ const getExtraHeaders = (url, fileExtension) => {
   }
 }
 
-export const getHeaders = (absolutePath) => {
+export const getHeaders = (absolutePath, pathName) => {
   const extension = extname(absolutePath)
   const mime = GetMimeType.getMimeType(extension)
   const headers = {
     'Content-Type': mime,
   }
-  const extraHeaders = getExtraHeaders(absolutePath, extension)
+  const extraHeaders = getExtraHeaders(pathName, extension)
   return {
     ...headers,
     ...extraHeaders,

package/src/parts/GetHeadersMainFrame/GetHeadersMainFrame.js

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

package/src/parts/GetHeadersOtherWorker/GetHeadersOtherWorker.js

@@ -1,7 +1,13 @@
+import * as ContentSecurityPolicyState from '../ContentSecurityPolicyState/ContentSecurityPolicyState.js'
 import * as CrossOriginEmbedderPolicy from '../CrossOriginEmbedderPolicy/CrossOriginEmbedderPolicy.js'
 
-export const getHeadersOtherWorker = () => {
-  return {
+export const getHeadersOtherWorker = (url) => {
+  const headers = {
     [CrossOriginEmbedderPolicy.key]: CrossOriginEmbedderPolicy.value,
   }
+  const dynamicCsp = ContentSecurityPolicyState.get(url)
+  if (dynamicCsp) {
+    headers['Content-Security-Policy'] = dynamicCsp
+  }
+  return headers
 }

package/src/parts/GetHeadersTestWorker/GetHeadersTestWorker.js

@@ -0,0 +1,9 @@
+import * as ContentSecurityPolicyTestWorker from '../ContentSecurityPolicyTestWorker/ContentSecurityPolicyTestWorker.js'
+import * as CrossOriginEmbedderPolicy from '../CrossOriginEmbedderPolicy/CrossOriginEmbedderPolicy.js'
+
+export const getHeadersExtensionHostWorker = () => {
+  return {
+    [CrossOriginEmbedderPolicy.key]: CrossOriginEmbedderPolicy.value,
+    [ContentSecurityPolicyTestWorker.key]: ContentSecurityPolicyTestWorker.value,
+  }
+}

package/src/parts/Module/Module.js

@@ -148,6 +148,8 @@ export const load = (moduleId) => {
       return import('../ElectronWebContentsView/ElectronWebContentsView.ipc.js')
     case ModuleId.ElectronWebContentsViewFunctions:
       return import('../ElectronWebContentsViewFunctions/ElectronWebContentsViewFunctions.ipc.js')
+    case ModuleId.ContentSecurityPolicy:
+      return import('../ContentSecurityPolicy/ContentSecurityPolicy.ipc.js')
     default:
       throw new Error(`module ${moduleId} not found`)
   }

package/src/parts/ModuleId/ModuleId.js

@@ -73,3 +73,4 @@ export const ElectronWebContents = 66
 export const ElectronWebContentsView = 67
 export const ElectronWebContentsViewFunctions = 68
 export const HandleRequestTest = 69
+export const ContentSecurityPolicy = 70

package/src/parts/ModuleMap/ModuleMap.js

@@ -323,6 +323,8 @@ export const getModuleId = (commandId) => {
       return ModuleId.ElectronWebContentsView
     case 'HandleRequestTest.handleRequestTest':
       return ModuleId.HandleRequestTest
+    case 'ContentSecurityPolicy.set':
+      return ModuleId.ContentSecurityPolicy
     default:
       throw new CommandNotFoundError(commandId)
   }

package/src/parts/Platform/Platform.js

@@ -61,11 +61,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.24.5'
+export const version = '0.24.6'
 
-export const commit = '0319484'
+export const commit = '4d24d4d'
 
-export const date = '2024-03-22T20:31:46.000Z'
+export const date = '2024-03-23T08:10:57.000Z'
 
 export const getVersion = () => {
   return version