@lvce-editor/extension-host-worker 3.1.0 → 3.3.0

package/dist/extensionHostWorkerMain.js

@@ -761,7 +761,7 @@ const setConfigurations = preferences => {
 const state$8 = {
   rpc: undefined
 };
-const invoke$1 = (method, ...params) => {
+const invoke$2 = (method, ...params) => {
   const rpc = state$8.rpc;
   return rpc.invoke(method, ...params);
 };
@@ -937,7 +937,7 @@ const {
 
 const showInformationMessage = message => {
   string(message);
-  const result = invoke$1('ExtensionHostDialog.showInformationMessage', message);
+  const result = invoke$2('ExtensionHostDialog.showInformationMessage', message);
   return result;
 };
 
@@ -992,7 +992,7 @@ const readFileExternal = async path => {
   // this avoid parsing the potentially large message
   // and improve performance by not blocking the renderer worker
   // when reading / writing large files
-  const content = await invoke$1('FileSystem.readFile', path);
+  const content = await invoke$2('FileSystem.readFile', path);
   return content;
 };
 const readDirWithFileTypesExternal = async path => {
@@ -1002,7 +1002,7 @@ const readDirWithFileTypesExternal = async path => {
   // this avoid parsing the potentially large message
   // and improve performance by not blocking the renderer worker
   // when reading / writing large files
-  const content = await invoke$1('FileSystem.readDirWithFileTypes', path);
+  const content = await invoke$2('FileSystem.readDirWithFileTypes', path);
   return content;
 };
 const writeFile = async (protocol, uri, content) => {
@@ -1975,7 +1975,7 @@ const send = (transport, method, ...params) => {
   const message = create$4$1(method, params);
   transport.send(message);
 };
-const invoke = (ipc, method, ...params) => {
+const invoke$1 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
 const invokeAndTransfer = (ipc, method, ...params) => {
@@ -2008,7 +2008,7 @@ const createRpc$1 = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke(ipc, method, ...params);
+      return invoke$1(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer(ipc, method, ...params);
@@ -2332,7 +2332,7 @@ const createNodeRpc = async ({
 
 const confirm = message => {
   string(message);
-  const result = invoke$1('ConfirmPrompt.prompt', message);
+  const result = invoke$2('ConfirmPrompt.prompt', message);
   return result;
 };
 
@@ -2344,7 +2344,7 @@ const showQuickPick = async ({
 }) => {
   const rawPicks = await getPicks();
   const picks = rawPicks.map(toPick);
-  return invoke$1(ExtensionHostQuickPickShow, picks);
+  return invoke$2(ExtensionHostQuickPickShow, picks);
 };
 
 const {
@@ -2404,7 +2404,7 @@ const extensionHostSubWorkerUrl = getExtensionHostSubWorkerUrl();
 
 const set$2 = async (url, contentSecurityPolicy) => {
   const pathName = new URL(url).pathname;
-  await invoke$1('ExtensionHostWorkerContentSecurityPolicy.set', pathName, contentSecurityPolicy);
+  await invoke$2('ExtensionHostWorkerContentSecurityPolicy.set', pathName, contentSecurityPolicy);
 };
 
 /**
@@ -2769,7 +2769,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$2('FileSystem.getBlob', uri)]);
   const objectUrl = await rpc.invoke('createObjectUrl', blob);
   return objectUrl;
 };
@@ -2794,7 +2794,7 @@ const getRemoteUrl = async (uri, options = {}) => {
     return getRemoteUrlForWebView(uri, options);
   }
   if (uri.startsWith('html://')) {
-    const url = await invoke$1('Blob.getSrc', uri);
+    const url = await invoke$2('Blob.getSrc', uri);
     return url;
   }
   throw new Error(`unsupported platform for remote url`);
@@ -2837,6 +2837,9 @@ const registerWebViewProvider = provider => {
 };
 const getWebViewInfo = providerId => {
   const webView = getWebView(providerId);
+  if (!webView) {
+    throw new Error(`Webview not found: ${providerId}`);
+  }
   return {
     uid: webView.uid,
     origin: webView.origin,
@@ -3071,6 +3074,97 @@ const setup = ({
   global.vscode = api;
 };
 
+const getAssetDir = () => {
+  // @ts-ignore
+  if (typeof ASSET_DIR !== 'undefined') {
+    // @ts-ignore
+    return ASSET_DIR;
+  }
+  if (platform === Electron) {
+    return '../../../../..';
+  }
+  return '';
+};
+const assetDir = getAssetDir();
+
+const iframeWorkerUrl = `${assetDir}/packages/renderer-worker/node_modules/@lvce-editor/iframe-worker/dist/iframeWorkerMain.js`;
+
+const get$1 = key => {
+  return invoke$2('Preferences.get', key);
+};
+
+const getConfiguredIframeWorkerUrl = async () => {
+  let configuredWorkerUrl = (await get$1('develop.iframeWorkerPath')) || '';
+  if (configuredWorkerUrl) {
+    configuredWorkerUrl = '/remote' + configuredWorkerUrl;
+  }
+  configuredWorkerUrl = configuredWorkerUrl || iframeWorkerUrl;
+  return configuredWorkerUrl;
+};
+
+const state$2 = {
+  id: 0
+};
+const create$1 = () => {
+  return ++state$2.id;
+};
+
+const commandMap$1 = {
+  'WebView.compatExtensionHostWorkerInvoke': (...args) => invoke$2('WebView.compatExtensionHostWorkerInvoke', ...args),
+  'WebView.compatExtensionHostWorkerInvokeAndTransfer': (...args) => invokeAndTransfer$1('WebView.compatExtensionHostWorkerInvokeAndTransfer', ...args),
+  'WebView.compatRendererProcessInvoke': (...args) => invoke$2('WebView.compatRendererProcessInvoke', ...args),
+  'WebView.compatRendererProcessInvokeAndTransfer': (...args) => invokeAndTransfer$1('WebView.compatRendererProcessInvokeAndTransfer', ...args),
+  'WebView.compatSharedProcessInvoke': (...args) => invoke$2('WebView.compatSharedProcessInvoke', ...args),
+  'WebView.getSavedState': (...args) => invoke$2('WebView.getSavedState', ...args),
+  'WebView.getWebViewInfo': (...args) => invoke$2('WebView.getWebViewInfo', ...args),
+  'WebView.getWebViews': (...args) => invoke$2('WebView.getWebViews', ...args),
+  'WebView.setPort': (...args) => invoke$2('WebView.setPort', ...args),
+  'ExtensionHostManagement.activateByEvent': (...args) => invoke$2('ExtensionHostManagement.activateByEvent', ...args)
+};
+const launchIframeWorker = async () => {
+  const configuredWorkerUrl = await getConfiguredIframeWorkerUrl();
+  const name = 'Iframe Worker';
+  const id = create$1();
+  const rpc = await create$2({
+    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug$1,
+    name,
+    url: configuredWorkerUrl,
+    id,
+    commandMap: commandMap$1
+  });
+  return rpc;
+};
+
+let workerPromise;
+const ensureWorker = () => {
+  if (!workerPromise) {
+    workerPromise = launchIframeWorker();
+  }
+  return workerPromise;
+};
+const invoke = async (method, ...params) => {
+  const rpc = await ensureWorker();
+  return rpc.invoke(method, ...params);
+};
+
+const createWebView3 = async ({
+  id,
+  uri,
+  isGitpod,
+  platform,
+  assetDir,
+  webViewScheme
+}) => {
+  await invoke('WebView.create3', {
+    id,
+    uri,
+    isGitpod,
+    platform,
+    assetDir,
+    webViewScheme
+  });
+};
+
 const BraceCompletionExecuteBraceCompletionProvider = 'ExtensionHostBraceCompletion.executeBraceCompletionProvider';
 const ClosingTagExecuteClosingTagProvider = 'ExtensionHostClosingTag.executeClosingTagProvider';
 const CommandExecute = 'ExtensionHostCommand.executeCommand';
@@ -3110,7 +3204,7 @@ const WorkspaceSetPath = 'Workspace.setWorkspacePath';
 const SelectionExecuteSelectionProvider = 'ExtensionHostSelection.executeSelectionProvider';
 const ConfigurationSetConfiguration = 'ExtensionHostConfiguration.setConfiguration';
 
-const create$1 = () => {
+const create = () => {
   return {
     finished: false
   };
@@ -3232,19 +3326,6 @@ class BabelParseError extends SyntaxError {
   }
 }
 
-const getAssetDir = () => {
-  // @ts-ignore
-  if (typeof ASSET_DIR !== 'undefined') {
-    // @ts-ignore
-    return ASSET_DIR;
-  }
-  if (platform === Electron) {
-    return '../../../../..';
-  }
-  return '';
-};
-const assetDir = getAssetDir();
-
 const loadBabelParser = () => {
   const url = `${assetDir}/js/babel-parser.js`;
   return import(url);
@@ -3535,7 +3616,7 @@ const activate = async (extension, absolutePath) => {
     string(absolutePath);
     const module = await importScript(absolutePath);
     handleRpcInfos(extension);
-    const token = create$1();
+    const token = create();
     try {
       await Promise.race([module.activate(extension), rejectAfterTimeout(activationTimeout, token)]);
     } catch (error) {
@@ -3571,7 +3652,7 @@ const mockExec = () => {
   try {
     // @ts-ignore
     api.exec = async (command, args, options) => {
-      const result = await invoke$1('Test.executeMockExecFunction', command, args, options);
+      const result = await invoke$2('Test.executeMockExecFunction', command, args, options);
       const {
         stdout,
         stderr,
@@ -3597,7 +3678,7 @@ const mockRpc = () => {
     try {
       return {
         async invoke(method, ...params) {
-          const result = await invoke$1('Test.executeMockRpcFunction', options.name, method, ...params);
+          const result = await invoke$2('Test.executeMockRpcFunction', options.name, method, ...params);
           return result;
         }
       };
@@ -3890,7 +3971,7 @@ replaceTraps(oldTraps => ({
   }
 }));
 
-const state$2 = {
+const state$1 = {
   databases: Object.create(null),
   eventId: 0,
   dbVersion: 1,
@@ -3908,7 +3989,7 @@ const isDataCloneError = error => {
 
 const getDb$1 = async () => {
   // @ts-ignore
-  const db = await openDB('session', state$2.dbVersion, {
+  const db = await openDB('session', state$1.dbVersion, {
     async upgrade(db, oldVersion) {
       if (!db.objectStoreNames.contains('session')) {
         const objectStore = await db.createObjectStore('session', {
@@ -3923,8 +4004,8 @@ const getDb$1 = async () => {
   return db;
 };
 const getDbMemoized$1 = async () => {
-  state$2.cachedDb ||= await getDb$1();
-  return state$2.cachedDb;
+  state$1.cachedDb ||= await getDb$1();
+  return state$1.cachedDb;
 };
 const saveValue = async (storeId, value) => {
   try {
@@ -3963,7 +4044,7 @@ const getValuesByIndexName = async (storeId, indexName, only) => {
   return objects;
 };
 const getHandleDb = async () => {
-  const db = await openDB('handle', state$2.dbVersion, {
+  const db = await openDB('handle', state$1.dbVersion, {
     async upgrade(db, oldVersion) {
       if (!db.objectStoreNames.contains('file-handles-store')) {
         // @ts-ignore
@@ -3987,13 +4068,13 @@ const storeId = 'lvce-keyvalue';
 
 // TODO high memory usage in idb because of transactionDoneMap
 
-const state$1 = {
+const state = {
   databases: Object.create(null),
   dbVersion: 2,
   cachedDb: undefined
 };
 const getDb = async () => {
-  const db = await openDB(storeId, state$1.dbVersion, {
+  const db = await openDB(storeId, state.dbVersion, {
     async upgrade(db, oldVersion) {
       if (!db.objectStoreNames.contains(storeId)) {
         await db.createObjectStore(storeId, {
@@ -4005,8 +4086,8 @@ const getDb = async () => {
   return db;
 };
 const getDbMemoized = async () => {
-  state$1.cachedDb ||= await getDb();
-  return state$1.cachedDb;
+  state.cachedDb ||= await getDb();
+  return state.cachedDb;
 };
 
 // TODO high memory usage in idb because of transactionDoneMap
@@ -4019,7 +4100,7 @@ const set = async (key, value) => {
     throw new VError(error, 'Failed to save value to indexed db');
   }
 };
-const get$1 = async key => {
+const get = async key => {
   try {
     const db = await getDbMemoized();
     const value = await db.get(storeId, key);
@@ -4029,41 +4110,6 @@ const get$1 = async key => {
   }
 };
 
-const iframeWorkerUrl = `${assetDir}/packages/renderer-worker/node_modules/@lvce-editor/iframe-worker/dist/iframeWorkerMain.js`;
-
-const get = key => {
-  return invoke$1('Preferences.get', key);
-};
-
-const getConfiguredIframeWorkerUrl = async () => {
-  let configuredWorkerUrl = (await get('develop.iframeWorkerPath')) || '';
-  if (configuredWorkerUrl) {
-    configuredWorkerUrl = '/remote' + configuredWorkerUrl;
-  }
-  configuredWorkerUrl = configuredWorkerUrl || iframeWorkerUrl;
-  return configuredWorkerUrl;
-};
-
-const state = {
-  id: 0
-};
-const create = () => {
-  return ++state.id;
-};
-
-const launchIframeWorker = async () => {
-  const configuredWorkerUrl = getConfiguredIframeWorkerUrl();
-  const name = 'Iframe Worker';
-  const id = create();
-  const rpc = await create$2({
-    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug$1,
-    name,
-    url: configuredWorkerUrl,
-    id
-  });
-  return rpc;
-};
-
 const loadWebView = async (providerId, savedState) => {
   const rpc = getWebView(providerId);
   await rpc.provider.create(rpc, rpc.uri, savedState);
@@ -4379,11 +4425,12 @@ const textSearch = async (scheme, root, query) => {
 };
 
 const commandMap = {
+  'WebView.create3': createWebView3,
   'ExtensionHost.launchIframeWorker': launchIframeWorker,
   'ExtensionHostRename.executeprepareRenameProvider': executeprepareRenameProvider,
   'ExtensionHostRename.executeRenameProvider': executeRenameProvider,
   'IndexedDb.addHandle': addHandle,
-  'IndexedDb.get': get$1,
+  'IndexedDb.get': get,
   'IndexedDb.getHandle': getHandle$1,
   'IndexedDb.getValues': getValues,
   'IndexedDb.getValuesByIndexName': getValuesByIndexName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-host-worker",
-  "version": "3.1.0",
+  "version": "3.3.0",
   "description": "Webworker for the extension host functionality in Lvce Editor.",
   "main": "dist/extensionHostWorkerMain.js",
   "type": "module",