@lvce-editor/extension-management-worker 4.5.0 → 4.7.0

package/dist/extensionManagementWorkerMain.js

@@ -7,7 +7,7 @@ class AssertionError extends Error {
 const Object$1 = 1;
 const Number = 2;
 const Array$1 = 3;
-const String = 4;
+const String$1 = 4;
 const Boolean$1 = 5;
 const Function = 6;
 const Null = 7;
@@ -19,7 +19,7 @@ const getType = value => {
     case 'function':
       return Function;
     case 'string':
-      return String;
+      return String$1;
     case 'object':
       if (value === null) {
         return Null;
@@ -48,7 +48,7 @@ const number = value => {
 };
 const string = value => {
   const type = getType(value);
-  if (type !== String) {
+  if (type !== String$1) {
     throw new AssertionError('expected value to be of type string');
   }
 };
@@ -604,10 +604,10 @@ const execute = (command, ...args) => {
 
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const get$5 = id => {
+const get$6 = id => {
   return callbacks[id];
 };
-const remove$1 = id => {
+const remove$2 = id => {
   delete callbacks[id];
 };
 class JsonRpcError extends Error {
@@ -753,14 +753,14 @@ const warn$1 = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$5(id);
+  const fn = get$6(id);
   if (!fn) {
     console.log(response);
     warn$1(`callback ${id} may already be disposed`);
     return;
   }
   fn(response);
-  remove$1(id);
+  remove$2(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -1212,13 +1212,13 @@ const createMockRpc = ({
 };
 
 const rpcs$2 = Object.create(null);
-const set$8 = (id, rpc) => {
+const set$9 = (id, rpc) => {
   rpcs$2[id] = rpc;
 };
-const get$4 = id => {
+const get$5 = id => {
   return rpcs$2[id];
 };
-const remove = id => {
+const remove$1 = id => {
   delete rpcs$2[id];
 };
 
@@ -1226,18 +1226,18 @@ const remove = id => {
 const create$1 = rpcId => {
   return {
     async dispose() {
-      const rpc = get$4(rpcId);
+      const rpc = get$5(rpcId);
       await rpc.dispose();
     },
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get$4(rpcId);
+      const rpc = get$5(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get$4(rpcId);
+      const rpc = get$5(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
@@ -1245,16 +1245,16 @@ const create$1 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$8(rpcId, mockRpc);
+      set$9(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
-        remove(rpcId);
+        remove$1(rpcId);
       };
       // @ts-ignore
       return mockRpc;
     },
     set(rpc) {
-      set$8(rpcId, rpc);
+      set$9(rpcId, rpc);
     }
   };
 };
@@ -1274,7 +1274,7 @@ const {
   invoke: invoke$5,
   invokeAndTransfer: invokeAndTransfer$2,
   registerMockRpc,
-  set: set$7
+  set: set$8
 } = create$1(ExtensionHostWorker);
 const executeReferenceProvider = async (id, offset) => {
   // @ts-ignore
@@ -1303,12 +1303,12 @@ const ExtensionHost = {
   invoke: invoke$5,
   invokeAndTransfer: invokeAndTransfer$2,
   registerMockRpc,
-  set: set$7
+  set: set$8
 };
 
 const {
   invoke: invoke$4,
-  set: set$6
+  set: set$7
 } = create$1(FileSystemWorker);
 const readFile = async uri => {
   return invoke$4('FileSystem.readFile', uri);
@@ -1323,7 +1323,7 @@ const exists = async uri => {
 const {
   invoke: invoke$3,
   invokeAndTransfer: invokeAndTransfer$1,
-  set: set$5
+  set: set$6
 } = create$1(RendererWorker);
 const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
   const command = 'IconTheme.handleMessagePort';
@@ -1344,7 +1344,7 @@ const sendMessagePortToSharedProcess = async port => {
 
 const {
   invoke: invoke$2,
-  set: set$4
+  set: set$5
 } = create$1(SharedProcess);
 
 const create = () => {
@@ -1391,16 +1391,18 @@ const createEmptyRuntimeStatus = id => {
     status: None
   };
 };
-let extensionsState = createInitialState();
-const get$3 = () => {
-  return extensionsState;
+const state$1 = {
+  extensionsState: createInitialState()
 };
-const set$3 = newState => {
-  extensionsState = newState;
+const get$4 = () => {
+  return state$1.extensionsState;
+};
+const set$4 = newState => {
+  state$1.extensionsState = newState;
 };
 const update = newState => {
-  set$3({
-    ...extensionsState,
+  set$4({
+    ...state$1.extensionsState,
     ...newState
   });
 };
@@ -1410,11 +1412,11 @@ const setPlatform = platform => {
   });
 };
 const hasWebExtensionUri = uri => {
-  return extensionsState.webExtensions.some(extension => extension.uri === uri);
+  return state$1.extensionsState.webExtensions.some(extension => extension.uri === uri);
 };
 const addWebExtension$1 = extension => {
   update({
-    webExtensions: [...extensionsState.webExtensions, extension]
+    webExtensions: [...state$1.extensionsState.webExtensions, extension]
   });
 };
 const clearCachedExtensions = () => {
@@ -1425,7 +1427,7 @@ const clearCachedExtensions = () => {
 const setRuntimeStatus = status => {
   update({
     runtimeStatuses: {
-      ...extensionsState.runtimeStatuses,
+      ...state$1.extensionsState.runtimeStatuses,
       [status.id]: {
         ...status
       }
@@ -1433,7 +1435,7 @@ const setRuntimeStatus = status => {
   });
 };
 const updateRuntimeStatus = (id, statusUpdate) => {
-  const previousStatus = extensionsState.runtimeStatuses[id] || createEmptyRuntimeStatus(id);
+  const previousStatus = state$1.extensionsState.runtimeStatuses[id] || createEmptyRuntimeStatus(id);
   setRuntimeStatus({
     ...previousStatus,
     ...statusUpdate,
@@ -1441,7 +1443,7 @@ const updateRuntimeStatus = (id, statusUpdate) => {
   });
 };
 const getRuntimeStatus$1 = extensionId => {
-  return extensionsState.runtimeStatuses[extensionId];
+  return state$1.extensionsState.runtimeStatuses[extensionId];
 };
 
 const baseName = path => {
@@ -1555,13 +1557,13 @@ const activateExtension2 = async (extensionId, extension, absolutePath, extensio
 const commandMapRef = {};
 
 const rpcs$1 = Object.create(null);
-const get$2 = extensionId => {
+const get$3 = extensionId => {
   return rpcs$1[extensionId];
 };
 const getAll = () => {
   return Object.values(rpcs$1);
 };
-const set$2 = (extensionId, rpc) => {
+const set$3 = (extensionId, rpc) => {
   rpcs$1[extensionId] = rpc;
 };
 
@@ -1583,12 +1585,12 @@ const createIsolatedExtensionHostWorker = async (extensionId, absolutePath, crea
   });
 };
 const getOrCreateIsolatedExtensionHostWorker = async (extensionId, absolutePath) => {
-  const existingRpc = get$2(extensionId);
+  const existingRpc = get$3(extensionId);
   if (existingRpc) {
     return existingRpc;
   }
   const rpc = await createIsolatedExtensionHostWorker(extensionId, absolutePath, create$7, invokeAndTransfer);
-  set$2(extensionId, rpc);
+  set$3(extensionId, rpc);
   return rpc;
 };
 
@@ -1596,7 +1598,7 @@ const rpcs = Object.create(null);
 const add = (id, rpc) => {
   rpcs[id] = rpc;
 };
-const get$1 = id => {
+const get$2 = id => {
   return rpcs[id];
 };
 
@@ -1619,13 +1621,13 @@ const handleRpcInfos = (extension, platform) => {
       return;
     }
     const rpcs = extension.rpc;
-    const urlPrefix = getUrlPrefix(platform, extension.path);
     if (!rpcs) {
       return;
     }
     if (!Array.isArray(rpcs)) {
       return;
     }
+    const urlPrefix = getUrlPrefix(platform, extension.path);
     for (const rpc of rpcs) {
       rpc.url = `${urlPrefix}/${rpc.url}`;
       add(rpc.id, rpc);
@@ -1701,9 +1703,9 @@ const activateExtension3 = async (extension, absolutePath, activationEvent, plat
 const getExtensionAbsolutePath = (id, isWeb, isBuiltin, path, relativePath, origin, platform, assetDir) => {
   if (path.startsWith('http')) {
     if (path.endsWith('/')) {
-      return new URL(relativePath, path).toString();
+      return new URL(relativePath, path).href;
     }
-    return new URL(relativePath, path + '/').toString();
+    return new URL(relativePath, path + '/').href;
   }
   if (!path.startsWith('/')) {
     path = '/' + path;
@@ -1717,7 +1719,7 @@ const getExtensionAbsolutePath = (id, isWeb, isBuiltin, path, relativePath, orig
   if (isBuiltin) {
     return `${assetDir}/extensions/${id}/${relativePath}`;
   }
-  return new URL('/remote' + path + '/' + relativePath, origin).toString();
+  return new URL('/remote' + path + '/' + relativePath, origin).href;
 };
 
 const getJson$1 = async url => {
@@ -1766,7 +1768,7 @@ const getAllExtensionsWithState = async (extensionsState, assetDir, platform) =>
 };
 
 const getAllExtensions = async (assetDir, platform) => {
-  return getAllExtensionsWithState(get$3(), assetDir, platform);
+  return getAllExtensionsWithState(get$4(), assetDir, platform);
 };
 
 const activatingExtensions = Object.create(null);
@@ -1780,6 +1782,15 @@ const getExtensionId$2 = extension => {
 const getAbsolutePath$1 = (extension, assetDir, platform) => {
   return getExtensionAbsolutePath(extension.id, extension.isWeb, extension.builtin, extension.path || extension.uri, extension.browser, globalThis.location.origin, platform, assetDir);
 };
+const doActivateExtension = async (extension, absolutePath, event, platform) => {
+  const extensionId = getExtensionId$2(extension);
+  try {
+    await activateExtension3(extension, absolutePath, event, platform);
+    runningExtensions[extensionId] = true;
+  } finally {
+    delete activatingExtensions[extensionId];
+  }
+};
 const activateExtension = async (extension, event, assetDir, platform) => {
   const extensionId = getExtensionId$2(extension);
   if (runningExtensions[extensionId]) {
@@ -1787,11 +1798,7 @@ const activateExtension = async (extension, event, assetDir, platform) => {
   }
   if (!Object.hasOwn(activatingExtensions, extensionId)) {
     const absolutePath = getAbsolutePath$1(extension, assetDir, platform);
-    activatingExtensions[extensionId] = activateExtension3(extension, absolutePath, event, platform).then(() => {
-      runningExtensions[extensionId] = true;
-    }).finally(() => {
-      delete activatingExtensions[extensionId];
-    });
+    activatingExtensions[extensionId] = doActivateExtension(extension, absolutePath, event, platform);
   }
   await activatingExtensions[extensionId];
 };
@@ -1826,15 +1833,17 @@ const getWebManifestPath = path => {
   return manifestPath;
 };
 
-let rpc;
-const set$1 = value => {
-  rpc = value;
+const state = {
+  rpc: undefined
+};
+const set$2 = value => {
+  state.rpc = value;
 };
 const invoke = async (method, ...params) => {
-  if (!rpc) {
+  if (!state.rpc) {
     return undefined;
   }
-  return rpc.invoke(method, ...params);
+  return state.rpc.invoke(method, ...params);
 };
 
 const handleChange = async id => {
@@ -1879,7 +1888,7 @@ const createWebViewWorkerRpc2 = async (rpcInfo, port) => {
 };
 
 const getExtensionHostSubWorkerUrl = () => {
-  return new URL('../../../../extension-host-sub-worker/src/extensionHostSubWorkerMain.js', import.meta.url).toString();
+  return new URL('../../../../extension-host-sub-worker/src/extensionHostSubWorkerMain.js', import.meta.url).href;
 };
 const extensionHostSubWorkerUrl = getExtensionHostSubWorkerUrl();
 
@@ -1915,7 +1924,7 @@ const createResponseFromData = data => {
   const responseString = JSON.stringify(data);
   const response = new Response(responseString, {
     headers: {
-      [ContentLength]: `${responseString.length}`,
+      [ContentLength]: String(responseString.length),
       [ContentType]: 'application/json'
     }
   });
@@ -1949,13 +1958,13 @@ const disabledExtensionsCacheKey = '/cache/disabledExtensions.json';
 const disableExtension2$1 = async (id, platform) => {
   const isTest = platform === Test;
   const isWeb = platform === Web;
-  const oldState = get$3(); // TODO maybe pass in an application id? Would allow multiple editors with different extensions.
+  const oldState = get$4(); // TODO maybe pass in an application id? Would allow multiple editors with different extensions.
   if (isTest) {
     const newState = {
       ...oldState,
       disabledIds: [...oldState.disabledIds, id]
     };
-    set$3(newState);
+    set$4(newState);
   } else if (isWeb) {
     const cached = await getJson(disabledExtensionsCacheKey);
     const oldDisabled = cached?.disabledExtensions || [];
@@ -1971,13 +1980,13 @@ const disableExtension2$1 = async (id, platform) => {
 const enableExtension2$1 = async (id, platform) => {
   const isTest = platform === Test;
   const isWeb = platform === Web;
-  const oldState = get$3();
+  const oldState = get$4();
   if (isTest) {
     const newState = {
       ...oldState,
       disabledIds: oldState.disabledIds.filter(existing => existing !== id)
     };
-    set$3(newState);
+    set$4(newState);
   } else if (isWeb) {
     const cached = await getJson(disabledExtensionsCacheKey);
     const oldDisabled = cached?.disabledExtensions || [];
@@ -2006,7 +2015,7 @@ const disableExtension2 = async (id, platform) => {
 };
 
 const disableExtension = async (id, isTest) => {
-  const oldState = get$3();
+  const oldState = get$4();
   return disableExtension2(id, oldState.platform);
 };
 
@@ -2033,7 +2042,7 @@ const enableExtension2 = async (id, platform) => {
 };
 
 const enableExtension = async (id, isTest) => {
-  const oldState = get$3();
+  const oldState = get$4();
   return enableExtension2(id, oldState.platform);
 };
 
@@ -2055,12 +2064,12 @@ const getRpcForCommand = async (extensionsState, id, platform) => {
     return undefined;
   }
   const extensionId = getExtensionId$1(extension);
-  const existingRpc = get$2(extensionId);
+  const existingRpc = get$3(extensionId);
   if (existingRpc) {
     return existingRpc;
   }
   await activateByEvent(`onCommand:${id}`, '', platform);
-  return get$2(extensionId);
+  return get$3(extensionId);
 };
 const executeRendererCommand = (id, args) => {
   return invoke$3(id, ...args);
@@ -2088,7 +2097,7 @@ const getAbsolutePath = (extension, assetDir, platform) => {
 };
 const getRpc$1 = async (extension, assetDir, platform) => {
   const extensionId = getExtensionId(extension);
-  const existingRpc = get$2(extensionId);
+  const existingRpc = get$3(extensionId);
   if (existingRpc) {
     return existingRpc;
   }
@@ -2201,6 +2210,67 @@ const executeHoverProvider = async (extensionsState, textDocument, ...args) => {
   return results[0];
 };
 
+const instances = Object.create(null);
+const set$1 = (uid, instance) => {
+  instances[uid] = instance;
+};
+const get$1 = uid => {
+  return instances[uid];
+};
+const remove = uid => {
+  delete instances[uid];
+};
+
+const hasView = (extension, viewId) => {
+  return Array.isArray(extension.views) && extension.views.some(view => view.id === viewId);
+};
+const getExtensionForView = async (viewId, assetDir, platform) => {
+  const extensions = await getAllExtensions(assetDir, platform);
+  const extension = extensions.find(extension => isExtensionIsolated(extension) && hasView(extension, viewId));
+  if (!extension) {
+    throw new Error(`view ${viewId} not found`);
+  }
+  return extension;
+};
+const getRpcForView = async (viewId, assetDir, platform) => {
+  const extension = await getExtensionForView(viewId, assetDir, platform);
+  const existingRpc = get$3(getExtensionId(extension));
+  if (existingRpc) {
+    return existingRpc;
+  }
+  await activateByEvent(`onView:${viewId}`, assetDir, platform);
+  return getRpc$1(extension, assetDir, platform);
+};
+const getRpcForInstance = async (viewId, uid, assetDir, platform) => {
+  const instance = get$1(uid);
+  if (instance) {
+    return instance.rpc;
+  }
+  return getRpcForView(viewId, assetDir, platform);
+};
+const createViewInstance = async (viewId, uid, context, assetDir, platform) => {
+  const rpc = await getRpcForView(viewId, assetDir, platform);
+  const result = await rpc.invoke('ExtensionApi.createViewInstance', viewId, uid, context);
+  set$1(uid, {
+    rpc,
+    viewId
+  });
+  return result;
+};
+const dispatchViewEvent = async (viewId, uid, event, assetDir, platform) => {
+  const rpc = await getRpcForInstance(viewId, uid, assetDir, platform);
+  return rpc.invoke('ExtensionApi.dispatchViewEvent', uid, event);
+};
+const disposeViewInstance = async (viewId, uid, assetDir, platform) => {
+  const rpc = await getRpcForInstance(viewId, uid, assetDir, platform);
+  await rpc.invoke('ExtensionApi.disposeViewInstance', uid);
+  remove(uid);
+};
+const saveViewInstanceState = async (viewId, uid, assetDir, platform) => {
+  const rpc = await getRpcForInstance(viewId, uid, assetDir, platform);
+  return rpc.invoke('ExtensionApi.saveViewInstanceState', uid);
+};
+
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 const warn = (...args) => {
   console.warn(...args);
@@ -2349,16 +2419,21 @@ const join = (pathSeparator, ...parts) => {
   return parts.join(pathSeparator);
 };
 
+const getColorThemeUriFromExtension = (extension, colorThemeId) => {
+  if (!extension.colorThemes) {
+    return '';
+  }
+  for (const colorTheme of extension.colorThemes) {
+    if (colorTheme.id === colorThemeId) {
+      return join('/', extension.uri, colorTheme.path);
+    }
+  }
+  return '';
+};
 const getColorThemeUri = (extensions, colorThemeId) => {
   for (const extension of extensions) {
-    if (!extension.colorThemes) {
-      continue;
-    }
-    for (const colorTheme of extension.colorThemes) {
-      if (colorTheme.id !== colorThemeId) {
-        continue;
-      }
-      const absolutePath = join('/', extension.uri, colorTheme.path);
+    const absolutePath = getColorThemeUriFromExtension(extension, colorThemeId);
+    if (absolutePath) {
       return absolutePath;
     }
   }
@@ -2428,7 +2503,7 @@ const getColorThemeNames = async (assetDir, platform) => {
 };
 
 const getDynamicWebExtensions = () => {
-  return get$3().webExtensions;
+  return get$4().webExtensions;
 };
 
 const getExtension = async (id, assetDir, platform) => {
@@ -2498,7 +2573,7 @@ const getRemoteUrlForWebView = async (uri, options = {}) => {
 };
 
 const getRpcInfo = rpcId => {
-  const info = get$1(rpcId);
+  const info = get$2(rpcId);
   if (!info) {
     throw new Error(`Rpc not found ${rpcId}`);
   }
@@ -2558,6 +2633,7 @@ const toView = (extension, registeredView, assetDir, platform) => {
     icon: registeredView.icon || manifestView?.icon || '',
     id,
     iframe: getIframe(extension, manifestView, assetDir, platform),
+    kind: registeredView.kind || manifestView?.kind || '',
     title: registeredView.title || manifestView?.title || id
   };
 };
@@ -2590,7 +2666,7 @@ const handleMessagePort = async (port, rpcId) => {
     messagePort: port
   });
   if (rpcId === StatusBarWorker) {
-    set$1(rpc);
+    set$2(rpc);
   }
 };
 
@@ -2623,7 +2699,7 @@ const getRpc = async platform => {
 const initializeSharedProcess = async platform => {
   const rpc = await getRpc(platform);
   if (rpc) {
-    set$4(rpc);
+    set$5(rpc);
   }
 };
 
@@ -2700,7 +2776,7 @@ const uninstallExtension = async () => {
 
 const wrapCommand = command => {
   return (...args) => {
-    return command(get$3(), ...args);
+    return command(get$4(), ...args);
   };
 };
 const commandMap = {
@@ -2708,10 +2784,13 @@ const commandMap = {
   'Extensions.activate3': activateExtension3,
   'Extensions.activateByEvent': activateByEvent,
   'Extensions.addWebExtension': addWebExtension,
+  'Extensions.createViewInstance': createViewInstance,
   'Extensions.createWebViewWorkerRpc': createWebViewWorkerRpc,
   'Extensions.createWebViewWorkerRpc2': createWebViewWorkerRpc2,
   'Extensions.disable': disableExtension,
   'Extensions.disable2': disableExtension2,
+  'Extensions.dispatchViewEvent': dispatchViewEvent,
+  'Extensions.disposeViewInstance': disposeViewInstance,
   'Extensions.enable': enableExtension,
   'Extensions.enable2': enableExtension2,
   'Extensions.executeCommand': wrapCommand(executeCommand),
@@ -2738,6 +2817,7 @@ const commandMap = {
   'Extensions.initialize': initialize,
   'Extensions.install': installExtension,
   'Extensions.invalidateExtensionsCache': invalidateExtensionsCache,
+  'Extensions.saveViewInstanceState': saveViewInstanceState,
   'Extensions.uninstall': uninstallExtension,
   'StatusBar.handleChange': handleChange
 };
@@ -2749,7 +2829,7 @@ const initializeExtensionHostWorker = async () => {
       await sendMessagePortToExtensionHostWorker(port, 0);
     }
   });
-  set$7(rpc);
+  set$8(rpc);
 };
 
 const initializeFileSystemWorker = async () => {
@@ -2759,7 +2839,7 @@ const initializeFileSystemWorker = async () => {
       await sendMessagePortToFileSystemWorker(port, 0);
     }
   });
-  set$6(rpc);
+  set$7(rpc);
 };
 
 const initializeIframeWorker = async () => {
@@ -2776,7 +2856,7 @@ const initializeRendererWorker = async () => {
   const rpc = await create$2({
     commandMap: commandMap
   });
-  set$5(rpc);
+  set$6(rpc);
 };
 
 const listen = async () => {

package/package.json

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