@lvce-editor/extension-management-worker 4.33.0 → 4.35.0

package/dist/extensionManagementWorkerMain.js

@@ -1748,26 +1748,26 @@ const bindCommandMap = (rpc, commandMap) => {
   }
   return rpc;
 };
-const createIsolatedExtensionHostWorker = async (extensionId, absolutePath, workerName, createRpc, invokeAndTransfer) => {
+const createIsolatedExtensionHostWorker = async (extensionId, absolutePath, workerName, contentSecurityPolicy, createRpc, invokeAndTransfer) => {
   const commandMap = createExtensionCommandMap(extensionId);
   const rpc = await createRpc({
     commandMap,
     isMessagePortOpen: true,
     send(port) {
-      return invokeAndTransfer('LaunchIsolatedExtensionHostWorker.launchIsolatedExtensionHostWorker', port, extensionId, absolutePath, workerName);
+      return invokeAndTransfer('LaunchIsolatedExtensionHostWorker.launchIsolatedExtensionHostWorker', port, extensionId, absolutePath, workerName, contentSecurityPolicy);
     }
   });
   return bindCommandMap(rpc, commandMap);
 };
-const createWorker = (extensionId, absolutePath, workerName) => {
-  return createIsolatedExtensionHostWorker(extensionId, absolutePath, workerName, create$7, invokeAndTransfer);
+const createWorker = (extensionId, absolutePath, workerName, contentSecurityPolicy) => {
+  return createIsolatedExtensionHostWorker(extensionId, absolutePath, workerName, contentSecurityPolicy, create$7, invokeAndTransfer);
 };
-const createAndStoreRpc = async (extensionId, absolutePath, workerName, create) => {
-  const rpc = await create(extensionId, absolutePath, workerName);
+const createAndStoreRpc = async (extensionId, absolutePath, workerName, contentSecurityPolicy, create) => {
+  const rpc = await create(extensionId, absolutePath, workerName, contentSecurityPolicy);
   set$2(extensionId, rpc);
   return rpc;
 };
-const getOrCreateIsolatedExtensionHostWorker = async (extensionId, absolutePath, workerName = '', create = createWorker) => {
+const getOrCreateIsolatedExtensionHostWorker = async (extensionId, absolutePath, workerName = '', contentSecurityPolicy = '', create = createWorker) => {
   const existingRpc = get$3(extensionId);
   if (existingRpc) {
     return existingRpc;
@@ -1776,7 +1776,7 @@ const getOrCreateIsolatedExtensionHostWorker = async (extensionId, absolutePath,
   if (pendingRpc !== undefined) {
     return pendingRpc;
   }
-  const newRpc = createAndStoreRpc(extensionId, absolutePath, workerName, create);
+  const newRpc = createAndStoreRpc(extensionId, absolutePath, workerName, contentSecurityPolicy, create);
   pendingRpcs[extensionId] = newRpc;
   try {
     return await newRpc;
@@ -1785,7 +1785,7 @@ const getOrCreateIsolatedExtensionHostWorker = async (extensionId, absolutePath,
   }
 };
 
-const activateIsolatedExtension = async (extensionId, absolutePath, workerName, activationEvent, getOrCreate = getOrCreateIsolatedExtensionHostWorker) => {
+const activateIsolatedExtension = async (extensionId, absolutePath, workerName, contentSecurityPolicy, activationEvent, getOrCreate = getOrCreateIsolatedExtensionHostWorker) => {
   const startTime = performance.now();
   updateRuntimeStatus(extensionId, {
     activationEvent,
@@ -1793,7 +1793,7 @@ const activateIsolatedExtension = async (extensionId, absolutePath, workerName,
     status: Activating
   });
   try {
-    await getOrCreate(extensionId, absolutePath, workerName);
+    await getOrCreate(extensionId, absolutePath, workerName, contentSecurityPolicy);
     const endTime = performance.now();
     updateRuntimeStatus(extensionId, {
       activationEndTime: endTime,
@@ -1808,6 +1808,16 @@ const activateIsolatedExtension = async (extensionId, absolutePath, workerName,
   }
 };
 
+const addSemicolon = directive => {
+  return directive.endsWith(';') ? directive : `${directive};`;
+};
+const getContentSecurityPolicy = directives => {
+  if (!directives) {
+    return '';
+  }
+  return directives.map(addSemicolon).join(' ');
+};
+
 const rpcs = Object.create(null);
 const add = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1918,7 +1928,8 @@ const activateExtension3 = async (extension, absolutePath, activationEvent, plat
   handleRpcInfos(extension, platform);
   const extensionId = extension.id || interExtensionId(extension.uri);
   if (isExtensionIsolated(extension)) {
-    await activateIsolatedExtension(extensionId, absolutePath, extension.workerName || '', activationEvent);
+    const contentSecurityPolicy = getContentSecurityPolicy(extension.contentSecurityPolicy);
+    await activateIsolatedExtension(extensionId, absolutePath, extension.workerName || '', contentSecurityPolicy, activationEvent);
     return;
   }
   await importExtension(extensionId, absolutePath, activationEvent);
@@ -2666,7 +2677,8 @@ const getRpc$1 = async (extension, assetDir, platform) => {
   }
   handleRpcInfos(extension, platform);
   const absolutePath = getAbsolutePath(extension, assetDir, platform);
-  return getOrCreateIsolatedExtensionHostWorker(extensionId, absolutePath, extension.workerName || '');
+  const contentSecurityPolicy = getContentSecurityPolicy(extension.contentSecurityPolicy);
+  return getOrCreateIsolatedExtensionHostWorker(extensionId, absolutePath, extension.workerName || '', contentSecurityPolicy);
 };
 
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-management-worker",
-  "version": "4.33.0",
+  "version": "4.35.0",
   "description": "Webworker for the Extension Management functionality in Lvce Editor.",
   "keywords": [
     "web-worker"