@lvce-editor/extension-management-worker 4.25.1 → 4.25.3

package/dist/extensionManagementWorkerMain.js

@@ -1264,32 +1264,38 @@ const Electron = 2;
 const Remote = 3;
 const Test = 4;
 
+const ErrorWorker = 3308;
 const ExtensionHostWorker = 44;
 const FileSystemWorker = 209;
 const RendererWorker = 1;
 const SharedProcess = 1492;
 
 const {
-  dispose,
   invoke: invoke$5,
+  set: set$8
+} = create$1(ErrorWorker);
+
+const {
+  dispose,
+  invoke: invoke$4,
   invokeAndTransfer: invokeAndTransfer$2,
   registerMockRpc,
-  set: set$8
+  set: set$7
 } = create$1(ExtensionHostWorker);
 const executeReferenceProvider = async (id, offset) => {
   // @ts-ignore
-  return invoke$5('ExtensionHostReference.executeReferenceProvider', id, offset);
+  return invoke$4('ExtensionHostReference.executeReferenceProvider', id, offset);
 };
 const executeFileReferenceProvider = async id => {
   // @ts-ignore
-  return invoke$5('ExtensionHostReference.executeFileReferenceProvider', id);
+  return invoke$4('ExtensionHostReference.executeFileReferenceProvider', id);
 };
 const getRuntimeStatus$2 = async extensionId => {
   // @ts-ignore
-  return invoke$5('ExtensionHost.getRuntimeStatus', extensionId);
+  return invoke$4('ExtensionHost.getRuntimeStatus', extensionId);
 };
 const getEnabledOutputProviderIds = async () => {
-  const channels = await invoke$5('Output.getEnabledProviders');
+  const channels = await invoke$4('Output.getEnabledProviders');
   return channels;
 };
 
@@ -1300,34 +1306,38 @@ const ExtensionHost = {
   executeReferenceProvider,
   getEnabledOutputProviderIds,
   getRuntimeStatus: getRuntimeStatus$2,
-  invoke: invoke$5,
+  invoke: invoke$4,
   invokeAndTransfer: invokeAndTransfer$2,
   registerMockRpc,
-  set: set$8
+  set: set$7
 };
 
 const {
-  invoke: invoke$4,
-  set: set$7
+  invoke: invoke$3,
+  set: set$6
 } = create$1(FileSystemWorker);
 const readFile$1 = async uri => {
-  return invoke$4('FileSystem.readFile', uri);
+  return invoke$3('FileSystem.readFile', uri);
 };
 const writeFile = async (uri, content) => {
-  return invoke$4('FileSystem.writeFile', uri, content);
+  return invoke$3('FileSystem.writeFile', uri, content);
 };
 const mkdir = async uri => {
-  return invoke$4('FileSystem.mkdir', uri);
+  return invoke$3('FileSystem.mkdir', uri);
 };
 const exists = async uri => {
-  return invoke$4('FileSystem.exists', uri);
+  return invoke$3('FileSystem.exists', uri);
 };
 
 const {
-  invoke: invoke$3,
+  invoke: invoke$2,
   invokeAndTransfer: invokeAndTransfer$1,
-  set: set$6
+  set: set$5
 } = create$1(RendererWorker);
+const sendMessagePortToErrorWorker = async (port, rpcId) => {
+  const command = 'Errors.handleMessagePort';
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToErrorWorker', port, command, rpcId);
+};
 const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
   const command = 'IconTheme.handleMessagePort';
   await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
@@ -1346,8 +1356,8 @@ const sendMessagePortToSharedProcess = async port => {
 };
 
 const {
-  invoke: invoke$2,
-  set: set$5
+  invoke: invoke$1,
+  set: set$4
 } = create$1(SharedProcess);
 
 const create = () => {
@@ -1394,18 +1404,18 @@ const createEmptyRuntimeStatus = id => {
     status: None
   };
 };
-const state$1 = {
+const state = {
   extensionsState: createInitialState()
 };
 const get$4 = () => {
-  return state$1.extensionsState;
+  return state.extensionsState;
 };
-const set$4 = newState => {
-  state$1.extensionsState = newState;
+const set$3 = newState => {
+  state.extensionsState = newState;
 };
 const update = newState => {
-  set$4({
-    ...state$1.extensionsState,
+  set$3({
+    ...state.extensionsState,
     ...newState
   });
 };
@@ -1415,11 +1425,11 @@ const setPlatform = platform => {
   });
 };
 const hasWebExtensionUri = uri => {
-  return state$1.extensionsState.webExtensions.some(extension => extension.uri === uri);
+  return state.extensionsState.webExtensions.some(extension => extension.uri === uri);
 };
 const addExtension$1 = extension => {
   update({
-    webExtensions: [...state$1.extensionsState.webExtensions, extension]
+    webExtensions: [...state.extensionsState.webExtensions, extension]
   });
 };
 const clearCachedExtensions = () => {
@@ -1430,7 +1440,7 @@ const clearCachedExtensions = () => {
 const setRuntimeStatus = status => {
   update({
     runtimeStatuses: {
-      ...state$1.extensionsState.runtimeStatuses,
+      ...state.extensionsState.runtimeStatuses,
       [status.id]: {
         ...status
       }
@@ -1438,7 +1448,7 @@ const setRuntimeStatus = status => {
   });
 };
 const updateRuntimeStatus = (id, statusUpdate) => {
-  const previousStatus = state$1.extensionsState.runtimeStatuses[id] || createEmptyRuntimeStatus(id);
+  const previousStatus = state.extensionsState.runtimeStatuses[id] || createEmptyRuntimeStatus(id);
   setRuntimeStatus({
     ...previousStatus,
     ...statusUpdate,
@@ -1446,7 +1456,7 @@ const updateRuntimeStatus = (id, statusUpdate) => {
   });
 };
 const getRuntimeStatus$1 = extensionId => {
-  return state$1.extensionsState.runtimeStatuses[extensionId];
+  return state.extensionsState.runtimeStatuses[extensionId];
 };
 
 const baseName = path => {
@@ -1566,13 +1576,13 @@ const get$3 = extensionId => {
 const getAll = () => {
   return Object.values(rpcs$1);
 };
-const set$3 = (extensionId, rpc) => {
+const set$2 = (extensionId, rpc) => {
   rpcs$1[extensionId] = rpc;
 };
 
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
-const invoke$1 = (method, ...params) => {
-  return invoke$3(method, ...params);
+const invoke = (method, ...params) => {
+  return invoke$2(method, ...params);
 };
 const invokeAndTransfer = (method, ...params) => {
   return invokeAndTransfer$1(method, ...params);
@@ -1593,10 +1603,33 @@ const getOrCreateIsolatedExtensionHostWorker = async (extensionId, absolutePath,
     return existingRpc;
   }
   const rpc = await createIsolatedExtensionHostWorker(extensionId, absolutePath, workerName, create$7, invokeAndTransfer);
-  set$3(extensionId, rpc);
+  set$2(extensionId, rpc);
   return rpc;
 };
 
+const activateIsolatedExtension = async (extensionId, absolutePath, workerName, activationEvent, getOrCreate = getOrCreateIsolatedExtensionHostWorker) => {
+  const startTime = performance.now();
+  updateRuntimeStatus(extensionId, {
+    activationEvent,
+    activationStartTime: startTime,
+    status: Activating
+  });
+  try {
+    await getOrCreate(extensionId, absolutePath, workerName);
+    const endTime = performance.now();
+    updateRuntimeStatus(extensionId, {
+      activationEndTime: endTime,
+      activationTime: endTime - startTime,
+      status: Activated
+    });
+  } catch (error) {
+    updateRuntimeStatus(extensionId, {
+      status: Error$1
+    });
+    throw error;
+  }
+};
+
 const rpcs = Object.create(null);
 const add = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1696,7 +1729,7 @@ const activateExtension3 = async (extension, absolutePath, activationEvent, plat
   handleRpcInfos(extension, platform);
   const extensionId = extension.id || interExtensionId(extension.uri);
   if (isExtensionIsolated(extension)) {
-    await getOrCreateIsolatedExtensionHostWorker(extensionId, absolutePath, extension.workerName || '');
+    await activateIsolatedExtension(extensionId, absolutePath, extension.workerName || '', activationEvent);
     return;
   }
   await importExtension(extensionId, absolutePath, activationEvent);
@@ -1739,8 +1772,8 @@ const isHttpLocation = () => {
 };
 const getRuntimeContext = async (assetDir, platform) => {
   const shouldInferPlatform = isMissingPlatform(platform);
-  const resolvedAssetDir = isMissingAssetDir(assetDir) ? await invoke$3('Layout.getAssetDir') : assetDir;
-  const resolvedPlatform = shouldInferPlatform ? await invoke$3('Layout.getPlatform') : platform;
+  const resolvedAssetDir = isMissingAssetDir(assetDir) ? await invoke$2('Layout.getAssetDir') : assetDir;
+  const resolvedPlatform = shouldInferPlatform ? await invoke$2('Layout.getPlatform') : platform;
   if (shouldInferPlatform && isHttpLocation() && isStaticHttpAssetDir(resolvedAssetDir)) {
     return {
       assetDir: resolvedAssetDir,
@@ -1819,7 +1852,7 @@ const stringifyJson = data => {
   return JSON.stringify(data, null, 2) + '\n';
 };
 const getWorkspaceUri = async () => {
-  const workspacePath = await invoke$3('Workspace.getPath');
+  const workspacePath = await invoke$2('Workspace.getPath');
   return toWorkspaceUri(workspacePath);
 };
 const getWorkspaceConfigDirUri = async () => {
@@ -1922,7 +1955,7 @@ const getAllExtensionsWithState = async (extensionsState, assetDir, platform) =>
     const compatibleExtensions = [...webExtensions, ...meta].filter(extension => isExtensionCompatible(extension, resolvedPlatform));
     return getExtensionsWithWorkspaceState(compatibleExtensions);
   }
-  const local = await invoke$2('ExtensionManagement.getAllExtensions');
+  const local = await invoke$1('ExtensionManagement.getAllExtensions');
   return getExtensionsWithWorkspaceState([...local, ...meta]);
 };
 
@@ -1992,24 +2025,11 @@ const activateByEvent = async (event, assetDir, platform) => {
 };
 
 const invalidateExtensionsCache = async () => {
-  await invoke$3('ExtensionManagement.invalidateExtensionsCache');
-};
-
-const state = {
-  rpc: undefined
-};
-const set$2 = value => {
-  state.rpc = value;
-};
-const invoke = async (method, ...params) => {
-  if (!state.rpc) {
-    return undefined;
-  }
-  return state.rpc.invoke(method, ...params);
+  await invoke$2('ExtensionManagement.invalidateExtensionsCache');
 };
 
-const handleChange = async id => {
-  await invoke('StatusBar.handleChange', id);
+const handleChange = async _id => {
+  await invoke$2('StatusBar.handleItemsChanged');
 };
 
 const hasStatusBarItems = extension => {
@@ -2020,7 +2040,7 @@ const addExtension = async extension => {
   clearCachedExtensions();
   await invalidateExtensionsCache();
   if (hasStatusBarItems(extension)) {
-    await handleChange(extension.id || extension.path);
+    await handleChange();
   }
   return extension;
 };
@@ -2152,7 +2172,7 @@ const disableExtension2$1 = async (id, platform) => {
       ...oldState,
       disabledIds: [...oldState.disabledIds, id]
     };
-    set$4(newState);
+    set$3(newState);
   } else if (isWeb) {
     const cached = await getJson(disabledExtensionsCacheKey);
     const oldDisabled = cached?.disabledExtensions || [];
@@ -2162,7 +2182,7 @@ const disableExtension2$1 = async (id, platform) => {
     };
     await setJson(disabledExtensionsCacheKey, newData);
   } else {
-    await invoke$2('ExtensionManagement.disable', id);
+    await invoke$1('ExtensionManagement.disable', id);
   }
 };
 const enableExtension2$1 = async (id, platform) => {
@@ -2174,7 +2194,7 @@ const enableExtension2$1 = async (id, platform) => {
       ...oldState,
       disabledIds: oldState.disabledIds.filter(existing => existing !== id)
     };
-    set$4(newState);
+    set$3(newState);
   } else if (isWeb) {
     const cached = await getJson(disabledExtensionsCacheKey);
     const oldDisabled = cached?.disabledExtensions || [];
@@ -2213,7 +2233,7 @@ const enableExtension2 = async (id, platform) => {
   string(id);
   number(platform);
   if (platform === Remote || platform === Electron) {
-    const disabledExtensionsJsonPath = await invoke$3('WebView.compatSharedProcessInvoke', 'PlatformPaths.getDisabledExtensionsJsonUri');
+    const disabledExtensionsJsonPath = await invoke$2('WebView.compatSharedProcessInvoke', 'PlatformPaths.getDisabledExtensionsJsonUri');
     const exists$1 = await exists(disabledExtensionsJsonPath);
     if (!exists$1) {
       return undefined;
@@ -2269,7 +2289,7 @@ const getRpcForCommand = async (extensionsState, id, platform) => {
   return get$3(extensionId);
 };
 const executeRendererCommand = (id, args) => {
-  return invoke$3(id, ...args);
+  return invoke$2(id, ...args);
 };
 const executeCommand = async (extensionsState, id, ...args) => {
   const {
@@ -2599,10 +2619,10 @@ const getViewActions = async (viewId, uid, assetDir, platform) => {
   return instance.rpc.invoke('ExtensionApi.getViewActions', uid);
 };
 const requestViewRerender = async uid => {
-  await invoke$3('Viewlet.executeViewletCommand', uid, 'rerender');
+  await invoke$2('Viewlet.executeViewletCommand', uid, 'rerender');
 };
 const showViewContextMenu = async (uid, viewId, menuId, x, y) => {
-  await invoke$3('ExtensionManagement.showViewContextMenu', uid, viewId, menuId, x, y);
+  await invoke$2('ExtensionManagement.showViewContextMenu', uid, viewId, menuId, x, y);
 };
 const renderViewInstance = async (viewId, uid, assetDir, platform) => {
   const instance = get$1(uid);
@@ -2767,7 +2787,7 @@ const getColorThemeCssCached = async (colorThemeId, platform, getData) => {
 };
 
 const readJson = url => {
-  return invoke$3('FileSystem.readJson', url);
+  return invoke$2('FileSystem.readJson', url);
 };
 
 const join = (pathSeparator, ...parts) => {
@@ -2964,7 +2984,7 @@ const getRemoteUrlForWebView = async (uri, options = {}) => {
   if (!webView) {
     throw new Error(`webview ${options.webViewId} not found`);
   }
-  const [rpc, blob] = await Promise.all([createWebViewIpc(webView), invoke$1('FileSystem.getBlob', uri)]);
+  const [rpc, blob] = await Promise.all([createWebViewIpc(webView), invoke('FileSystem.getBlob', uri)]);
   const objectUrl = await rpc.invoke('createObjectUrl', blob);
   return objectUrl;
 };
@@ -3119,20 +3139,21 @@ const getViews = async (assetDir, platform) => {
 
 const handleData = () => {};
 
-const StatusBarWorker = 200;
-
 const handleMessagePort = async (port, rpcId) => {
-  const rpc = await create$8({
+  await create$8({
     commandMap: commandMapRef,
     messagePort: port
   });
-  if (rpcId === StatusBarWorker) {
-    set$2(rpc);
-  }
+};
+
+const prefix = '[Extension] Uncaught Error: ';
+const handleUncaughtExtensionError = async error => {
+  const prettyError = await invoke$5('Errors.prepare', error);
+  await invoke$5('Errors.print', prettyError, prefix);
 };
 
 const handleViewContextChange = async (uid, viewId, context) => {
-  await invoke$3('ExtensionManagement.handleViewContextChange', uid, viewId, context);
+  await invoke$2('ExtensionManagement.handleViewContextChange', uid, viewId, context);
 };
 
 const getRpcRemote = async () => {
@@ -3164,7 +3185,7 @@ const getRpc = async platform => {
 const initializeSharedProcess = async platform => {
   const rpc = await getRpc(platform);
   if (rpc) {
-    set$5(rpc);
+    set$4(rpc);
   }
 };
 
@@ -3235,10 +3256,10 @@ const getLanguages = async (platform, assetDir) => {
 };
 
 const getPreference = async key => {
-  return invoke$3('Preferences.get', key);
+  return invoke$2('Preferences.get', key);
 };
 const setPreference = async (key, value) => {
-  await invoke$3('Preferences.update', {
+  await invoke$2('Preferences.update', {
     [key]: value
   });
 };
@@ -3251,6 +3272,10 @@ const sendMessagePortToFileSystemWorker = async port => {
   await sendMessagePortToFileSystemWorker$1(port, 0);
 };
 
+const showQuickPick = async options => {
+  return invoke$2('ExtensionHostQuickPick.showQuickPick', options);
+};
+
 const uninstallExtension = async () => {
   // TODO
   await invalidateExtensionsCache();
@@ -3265,6 +3290,7 @@ const wrapCommand = command => {
 };
 const commandMap = {
   'ExtensionApi.readFile': readFile,
+  'ExtensionHostQuickPick.showQuickPick': showQuickPick,
   'Extensions.activate2': activateExtension2,
   'Extensions.activate3': activateExtension3,
   'Extensions.activateByEvent': activateByEvent,
@@ -3310,6 +3336,7 @@ const commandMap = {
   'Extensions.getViews': getViews,
   'Extensions.handleData': handleData,
   'Extensions.handleMessagePort': handleMessagePort,
+  'Extensions.handleUncaughtExtensionError': handleUncaughtExtensionError,
   'Extensions.handleViewContextChange': handleViewContextChange,
   'Extensions.importExtension': importExtension,
   'Extensions.initialize': initialize,
@@ -3326,6 +3353,16 @@ const commandMap = {
   'StatusBar.handleChange': handleChange
 };
 
+const initializeErrorWorker = async () => {
+  const rpc = await create$6({
+    commandMap: commandMapRef,
+    async send(port) {
+      await sendMessagePortToErrorWorker(port, 0);
+    }
+  });
+  set$8(rpc);
+};
+
 const initializeExtensionHostWorker = async () => {
   const rpc = await create$6({
     commandMap: commandMapRef,
@@ -3333,7 +3370,7 @@ const initializeExtensionHostWorker = async () => {
       await sendMessagePortToExtensionHostWorker(port, 0);
     }
   });
-  set$8(rpc);
+  set$7(rpc);
 };
 
 const initializeFileSystemWorker = async () => {
@@ -3343,7 +3380,7 @@ const initializeFileSystemWorker = async () => {
       await sendMessagePortToFileSystemWorker$1(port, 0);
     }
   });
-  set$7(rpc);
+  set$6(rpc);
 };
 
 const initializeIframeWorker = async () => {
@@ -3360,12 +3397,12 @@ const initializeRendererWorker = async () => {
   const rpc = await create$2({
     commandMap: commandMap
   });
-  set$6(rpc);
+  set$5(rpc);
 };
 
 const listen = async () => {
   Object.assign(commandMapRef, commandMap);
-  await Promise.all([initializeRendererWorker(), initializeFileSystemWorker(), initializeIframeWorker(), initializeExtensionHostWorker()]);
+  await Promise.all([initializeRendererWorker(), initializeErrorWorker(), initializeFileSystemWorker(), initializeIframeWorker(), initializeExtensionHostWorker()]);
 };
 
 const main = async () => {

package/package.json

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