@lvce-editor/extension-host-worker 8.44.0 → 8.45.1

package/dist/extension-api/index.js

@@ -977,12 +977,29 @@ var create7 = async ({ commandMap: commandMap5, isMessagePortOpen, send: send2 }
   });
 };
 
+// packages/extension-api/node_modules/@lvce-editor/rpc/dist/parts/MessagePortRpcParent/MessagePortRpcParent.js
+var MessagePortRpcParent_exports = {};
+__export(MessagePortRpcParent_exports, {
+  create: () => create8
+});
+var create8 = async ({ commandMap: commandMap5, isMessagePortOpen, messagePort }) => {
+  register(commandMap5);
+  const rawIpc = await IpcParentWithMessagePort$1.create({
+    isMessagePortOpen,
+    messagePort
+  });
+  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
+  handleIpc(ipc);
+  const rpc = createRpc(ipc);
+  return rpc;
+};
+
 // packages/extension-api/node_modules/@lvce-editor/rpc/dist/parts/WebWorkerRpcClient/WebWorkerRpcClient.js
 var WebWorkerRpcClient_exports = {};
 __export(WebWorkerRpcClient_exports, {
-  create: () => create8
+  create: () => create9
 });
-var create8 = async ({ commandMap: commandMap5 }) => {
+var create9 = async ({ commandMap: commandMap5 }) => {
   register(commandMap5);
   const ipc = await listen(IpcChildWithModuleWorkerAndMessagePort$1);
   handleIpc(ipc);
@@ -1022,7 +1039,7 @@ var remove2 = (id2) => {
 };
 
 // packages/extension-api/node_modules/@lvce-editor/rpc-registry/dist/parts/RpcFactory/RpcFactory.js
-var create9 = (rpcId) => {
+var create10 = (rpcId) => {
   return {
     async dispose() {
       const rpc = get2(rpcId);
@@ -1370,7 +1387,7 @@ __export(ExtensionManagementWorker_exports, {
   set: () => set2,
   uninstall: () => uninstall
 });
-var { dispose, invoke, invokeAndTransfer, registerMockRpc, set: set2 } = create9(RpcId_exports.ExtensionManagementWorker);
+var { dispose, invoke, invokeAndTransfer, registerMockRpc, set: set2 } = create10(RpcId_exports.ExtensionManagementWorker);
 var enable = (id2) => {
   return invoke(`Extensions.enable`, id2);
 };
@@ -1425,7 +1442,7 @@ __export(FileSystemWorker_exports, {
   watchFile: () => watchFile,
   writeFile: () => writeFile
 });
-var { dispose: dispose2, invoke: invoke2, invokeAndTransfer: invokeAndTransfer2, registerMockRpc: registerMockRpc2, set: set3 } = create9(RpcId_exports.FileSystemWorker);
+var { dispose: dispose2, invoke: invoke2, invokeAndTransfer: invokeAndTransfer2, registerMockRpc: registerMockRpc2, set: set3 } = create10(RpcId_exports.FileSystemWorker);
 var remove3 = async (dirent) => {
   return invoke2("FileSystem.remove", dirent);
 };
@@ -1556,11 +1573,11 @@ var createProviderRegistry = ({
   requiredMethods,
   requireLanguageId = false
 }) => {
-  const providers2 = /* @__PURE__ */ Object.create(null);
+  const providers3 = /* @__PURE__ */ Object.create(null);
   const hasProvider = (id2) => {
-    return id2 in providers2;
+    return id2 in providers3;
   };
-  const registerProvider = (provider) => {
+  const registerProvider2 = (provider) => {
     if (!provider) {
       throw new ExtensionApiError(`${providerName} is not defined`);
     }
@@ -1582,14 +1599,14 @@ var createProviderRegistry = ({
       throw new ExtensionApiError(`${providerName} ${id2} is already registered`);
     }
     const registeredProvider = mapProvider(provider);
-    providers2[registeredProvider.id] = registeredProvider;
+    providers3[registeredProvider.id] = registeredProvider;
     return registeredProvider;
   };
   const deleteProvider = (id2) => {
-    delete providers2[id2];
+    delete providers3[id2];
   };
   const getProviders = () => {
-    return Object.values(providers2);
+    return Object.values(providers3);
   };
   const getProviderByLanguageId = (languageId) => {
     return getProviders().find((provider) => {
@@ -1597,8 +1614,8 @@ var createProviderRegistry = ({
     });
   };
   const reset = () => {
-    for (const id2 of Object.keys(providers2)) {
-      delete providers2[id2];
+    for (const id2 of Object.keys(providers3)) {
+      delete providers3[id2];
     }
   };
   const executeProviderByLanguageId = async (languageId, methodName, args, validateResult) => {
@@ -1619,7 +1636,7 @@ var createProviderRegistry = ({
     getProviderByLanguageId,
     getProviders,
     hasProvider,
-    registerProvider,
+    registerProvider: registerProvider2,
     reset
   };
 };
@@ -1929,6 +1946,84 @@ var getHoverProviderRegistrySnapshot = () => {
 };
 var resetHoverProviderRegistry = registry5.reset;
 
+// packages/extension-api/src/parts/LanguageProvider/LanguageProvider.ts
+var providers = /* @__PURE__ */ Object.create(null);
+var getProvider = (kind, languageId) => {
+  return providers[kind]?.find((provider) => provider.languageId === languageId);
+};
+var registerProvider = (kind, provider, requiredMethods) => {
+  if (!provider || typeof provider !== "object") {
+    throw new ExtensionApiError(`${kind} provider is not defined`);
+  }
+  if (typeof provider.id !== "string" || provider.id.length === 0) {
+    throw new ExtensionApiError(`${kind} provider is missing id`);
+  }
+  if (typeof provider.languageId !== "string" || provider.languageId.length === 0) {
+    throw new ExtensionApiError(`${kind} provider ${provider.id} is missing languageId`);
+  }
+  for (const methodName of requiredMethods) {
+    if (typeof provider[methodName] !== "function") {
+      throw new ExtensionApiError(`${kind} provider ${provider.id} is missing ${methodName} function`);
+    }
+  }
+  const kindProviders = providers[kind] ||= [];
+  if (kindProviders.some((registeredProvider) => registeredProvider.id === provider.id)) {
+    throw new ExtensionApiError(`${kind} provider ${provider.id} is already registered`);
+  }
+  kindProviders.push(provider);
+  return {
+    dispose() {
+      const index = kindProviders.indexOf(provider);
+      if (index !== -1) {
+        kindProviders.splice(index, 1);
+      }
+    }
+  };
+};
+var executeLanguageProvider = async (kind, methodName, textDocument, ...args) => {
+  const provider = getProvider(kind, textDocument.languageId);
+  if (!provider) {
+    throw new ExtensionApiError(`No ${kind} provider found for ${textDocument.languageId}`);
+  }
+  const method = provider[methodName];
+  if (typeof method !== "function") {
+    throw new ExtensionApiError(`${kind} provider ${provider.id} is missing ${methodName} function`);
+  }
+  return method(textDocument, ...args);
+};
+var executeOrganizeImportsProvider = async (textDocument) => {
+  const provider = getProvider("code action", textDocument.languageId);
+  if (!provider) {
+    throw new ExtensionApiError(`No code action provider found for ${textDocument.languageId}`);
+  }
+  const provideCodeActions = provider.provideCodeActions;
+  const actions = await provideCodeActions(textDocument);
+  if (!Array.isArray(actions)) {
+    throw new ExtensionApiError("invalid code action result: code actions must be of type array");
+  }
+  const action = actions.find((candidate) => candidate && typeof candidate === "object" && candidate.kind === "source.organizeImports");
+  if (!action || typeof action.execute !== "function") {
+    return [];
+  }
+  return action.execute(textDocument);
+};
+var registerBraceCompletionProvider = (provider) => registerProvider("brace completion", provider, ["provideBraceCompletion"]);
+var registerClosingTagProvider = (provider) => registerProvider("closing tag", provider, ["provideClosingTag"]);
+var registerCodeActionsProvider = (provider) => registerProvider("code action", provider, ["provideCodeActions"]);
+var registerCommentProvider = (provider) => registerProvider("comment", provider, ["provideComment"]);
+var registerDefinitionProvider = (provider) => registerProvider("definition", provider, ["provideDefinition"]);
+var registerImplementationProvider = (provider) => registerProvider("implementation", provider, ["provideImplementations"]);
+var registerReferenceProvider = (provider) => registerProvider("reference", provider, ["provideReferences"]);
+var registerRenameProvider = (provider) => registerProvider("rename", provider, ["provideRename"]);
+var registerSelectionProvider = (provider) => registerProvider("selection", provider, ["provideSelections"]);
+var registerTabCompletionProvider = (provider) => registerProvider("tab completion", provider, ["provideTabCompletion"]);
+var registerTypeDefinitionProvider = (provider) => registerProvider("type definition", provider, ["provideTypeDefinition"]);
+var resetLanguageProviderRegistry = () => {
+  for (const kind of Object.keys(providers)) {
+    delete providers[kind];
+  }
+};
+
 // packages/extension-api/src/parts/OutputChannel/OutputChannel.ts
 var outputChannels = /* @__PURE__ */ Object.create(null);
 var outputChannelLogs = /* @__PURE__ */ Object.create(null);
@@ -2004,7 +2099,7 @@ var resetOutputChannelRegistry = () => {
 };
 
 // packages/extension-api/src/parts/SourceControlProviderRegistry/SourceControlProviderRegistry.ts
-var providers = /* @__PURE__ */ Object.create(null);
+var providers2 = /* @__PURE__ */ Object.create(null);
 var optionalMethods = [
   "acceptInput",
   "add",
@@ -2037,12 +2132,12 @@ var assertSourceControlProvider = (provider) => {
   for (const methodName of optionalMethods) {
     assertOptionalProviderMethod2(providerRecord, id2, methodName);
   }
-  if (id2 in providers) {
+  if (id2 in providers2) {
     throw new ExtensionApiError(`source control provider ${id2} is already registered`);
   }
 };
-var getProvider = (id2) => {
-  const provider = providers[id2];
+var getProvider2 = (id2) => {
+  const provider = providers2[id2];
   if (!provider) {
     throw new ExtensionApiError(`source control provider ${id2} not found`);
   }
@@ -2087,30 +2182,30 @@ var mapSourceControlProvider = (provider) => {
 };
 var registerSourceControlProvider = (provider) => {
   assertSourceControlProvider(provider);
-  providers[provider.id] = mapSourceControlProvider(provider);
+  providers2[provider.id] = mapSourceControlProvider(provider);
   return {
     dispose() {
-      delete providers[provider.id];
+      delete providers2[provider.id];
     }
   };
 };
 var executeSourceControlAcceptInput = async (id2, value) => {
-  return getProvider(id2).acceptInput?.(value);
+  return getProvider2(id2).acceptInput?.(value);
 };
 var executeSourceControlAdd = async (id2, path) => {
-  return getProvider(id2).add?.(path);
+  return getProvider2(id2).add?.(path);
 };
 var executeSourceControlDiscard = async (id2, path) => {
-  return getProvider(id2).discard?.(path);
+  return getProvider2(id2).discard?.(path);
 };
 var executeSourceControlGenerateCommitMessage = async (id2) => {
-  return getProvider(id2).generateCommitMessage?.();
+  return getProvider2(id2).generateCommitMessage?.();
 };
 var executeSourceControlGetChangedFiles = async (id2) => {
-  return getProvider(id2).getChangedFiles();
+  return getProvider2(id2).getChangedFiles();
 };
 var executeSourceControlGetBadgeCount = async (id2) => {
-  const provider = getProvider(id2);
+  const provider = getProvider2(id2);
   if (provider.getBadgeCount) {
     return provider.getBadgeCount();
   }
@@ -2118,16 +2213,16 @@ var executeSourceControlGetBadgeCount = async (id2) => {
   return files.length;
 };
 var executeSourceControlGetFeatures = async (id2) => {
-  return getProvider(id2).getFeatures?.() ?? {};
+  return getProvider2(id2).getFeatures?.() ?? {};
 };
 var executeSourceControlGetFileBefore = async (id2, uri) => {
-  return getProvider(id2).getFileBefore?.(uri);
+  return getProvider2(id2).getFileBefore?.(uri);
 };
 var executeSourceControlGetFileDecorations = async (id2, uris) => {
-  return getProvider(id2).getFileDecorations?.(uris) ?? [];
+  return getProvider2(id2).getFileDecorations?.(uris) ?? [];
 };
 var executeSourceControlGetGroups = async (id2, cwd) => {
-  const provider = getProvider(id2);
+  const provider = getProvider2(id2);
   if (provider.getGroups) {
     return provider.getGroups(cwd);
   }
@@ -2140,18 +2235,18 @@ var executeSourceControlGetGroups = async (id2, cwd) => {
   ];
 };
 var executeSourceControlIsActive = async (id2, scheme, root) => {
-  return Boolean(await getProvider(id2).isActive?.(scheme, root));
+  return Boolean(await getProvider2(id2).isActive?.(scheme, root));
 };
 var getSourceControlProviderRegistrySnapshot = () => {
   return {
-    providers: Object.values(providers).map((provider) => ({
+    providers: Object.values(providers2).map((provider) => ({
       id: provider.id
     }))
   };
 };
 var resetSourceControlProviderRegistry = () => {
-  for (const id2 of Object.keys(providers)) {
-    delete providers[id2];
+  for (const id2 of Object.keys(providers2)) {
+    delete providers2[id2];
   }
 };
 
@@ -2914,6 +3009,8 @@ var commandMap = {
   "ExtensionApi.executeDiagnosticProvider": executeDiagnosticProvider,
   "ExtensionApi.executeFormattingProvider": executeFormattingProvider,
   "ExtensionApi.executeHoverProvider": executeHoverProvider,
+  "ExtensionApi.executeLanguageProvider": executeLanguageProvider,
+  "ExtensionApi.executeOrganizeImportsProvider": executeOrganizeImportsProvider,
   "ExtensionApi.executeResolveCompletionItemProvider": executeResolveCompletionItemProvider,
   "ExtensionApi.executeSourceControlAcceptInput": executeSourceControlAcceptInput,
   "ExtensionApi.executeSourceControlAdd": executeSourceControlAdd,
@@ -3099,33 +3196,38 @@ var handleExtensionManagementMessagePort2 = async ({
 };
 
 // packages/extension-api/src/parts/Rpc/Rpc.ts
-var sendMessagePortToNode = async (port) => {
-  await ExtensionManagementWorker_exports.invokeAndTransfer(
-    "Extensions.sendMessagePortToElectron",
-    port,
-    "HandleMessagePortForExtensionHostHelperProcess.handleMessagePortForExtensionHostHelperProcess"
-  );
-};
-var sendMessagePortToWebWorker = async (port, name) => {
-  await ExtensionManagementWorker_exports.invokeAndTransfer("Extensions.createWebViewWorkerRpc", { name }, port);
+var sendMessagePortToWebWorker = async (port, name, url) => {
+  await ExtensionManagementWorker_exports.invokeAndTransfer("Extensions.createWebViewWorkerRpc2", { name, url }, port);
 };
-var createRpc2 = async ({ commandMap: commandMap5 = {}, name = "", url }) => {
-  const rpc = await LazyTransferMessagePortRpcParent_exports.create({
+var createMessagePortRpc = async (commandMap5, send2) => {
+  const { port1, port2 } = new MessageChannel();
+  const rpcPromise2 = MessagePortRpcParent_exports.create({
     commandMap: commandMap5,
-    send(port) {
-      return sendMessagePortToWebWorker(port, name);
-    }
+    isMessagePortOpen: true,
+    messagePort: port2
   });
-  await rpc.invoke("LoadFile.loadFile", url);
-  return rpc;
+  port2.start();
+  await send2(port1);
+  return rpcPromise2;
 };
-var createNodeRpc = async ({ path }) => {
-  const rpc = await LazyTransferMessagePortRpcParent_exports.create({
-    commandMap: {},
-    send: sendMessagePortToNode
-  });
-  await rpc.invoke("LoadFile.loadFile", path);
-  return rpc;
+var createRpc2 = async ({ commandMap: commandMap5 = {}, name = "", url }) => {
+  return createMessagePortRpc(commandMap5, (port) => sendMessagePortToWebWorker(port, name, url));
+};
+var createNodeRpc = async ({ name = "", path }) => {
+  const id2 = await ExtensionManagementWorker_exports.invoke("Extensions.executeCommand", "ExtensionNodeRpc.create", name, path);
+  const invoke3 = (method, ...params) => {
+    return ExtensionManagementWorker_exports.invoke("Extensions.executeCommand", "ExtensionNodeRpc.invoke", id2, method, ...params);
+  };
+  return {
+    async dispose() {
+      await ExtensionManagementWorker_exports.invoke("Extensions.executeCommand", "ExtensionNodeRpc.dispose", id2);
+    },
+    invoke: invoke3,
+    invokeAndTransfer: invoke3,
+    send(method, ...params) {
+      void invoke3(method, ...params);
+    }
+  };
 };
 export {
   activate,
@@ -3170,13 +3272,24 @@ export {
   openUri,
   readDirWithFileTypes2 as readDirWithFileTypes,
   readFile2 as readFile,
+  registerBraceCompletionProvider,
+  registerClosingTagProvider,
+  registerCodeActionsProvider,
   registerCommand,
+  registerCommentProvider,
   registerCompletionProvider,
+  registerDefinitionProvider,
   registerDiagnosticProvider,
   registerFormattingProvider,
   registerHoverProvider,
+  registerImplementationProvider,
+  registerReferenceProvider,
+  registerRenameProvider,
+  registerSelectionProvider,
   registerSourceControlProvider,
   registerStatusBarItemProvider,
+  registerTabCompletionProvider,
+  registerTypeDefinitionProvider,
   registerView,
   remove4 as remove,
   renderViewInstance,
@@ -3184,6 +3297,7 @@ export {
   resetDiagnosticProviderRegistry,
   resetFormattingProviderRegistry,
   resetHoverProviderRegistry,
+  resetLanguageProviderRegistry,
   resetOutputChannelRegistry,
   resetSourceControlProviderRegistry,
   resetStatusBarItemProviderRegistry,

package/dist/extension-api/parts/ExtensionApiCommandMap/ExtensionApiCommandMap.js

@@ -4,6 +4,7 @@ import { executeDiagnosticProvider, getDiagnosticProviderRegistrySnapshot } from
 import { executeFormattingProvider, getFormattingProviderRegistrySnapshot } from "../Formatting/Formatting.js";
 import { getStatusBarItems } from "../GetStatusBarItems/GetStatusBarItems.js";
 import { executeHoverProvider, getHoverProviderRegistrySnapshot } from "../Hover/Hover.js";
+import { executeLanguageProvider, executeOrganizeImportsProvider } from "../LanguageProvider/LanguageProvider.js";
 import { getOutputChannelRegistrySnapshot } from "../OutputChannel/OutputChannel.js";
 import {
   executeSourceControlAcceptInput,
@@ -39,6 +40,8 @@ const commandMap = {
   "ExtensionApi.executeDiagnosticProvider": executeDiagnosticProvider,
   "ExtensionApi.executeFormattingProvider": executeFormattingProvider,
   "ExtensionApi.executeHoverProvider": executeHoverProvider,
+  "ExtensionApi.executeLanguageProvider": executeLanguageProvider,
+  "ExtensionApi.executeOrganizeImportsProvider": executeOrganizeImportsProvider,
   "ExtensionApi.executeResolveCompletionItemProvider": executeResolveCompletionItemProvider,
   "ExtensionApi.executeSourceControlAcceptInput": executeSourceControlAcceptInput,
   "ExtensionApi.executeSourceControlAdd": executeSourceControlAdd,

package/dist/extension-api/parts/LanguageProvider/LanguageProvider.js

@@ -0,0 +1,93 @@
+import { ExtensionApiError } from "../ExtensionApiError/ExtensionApiError.js";
+const providers = /* @__PURE__ */ Object.create(null);
+const getProvider = (kind, languageId) => {
+  return providers[kind]?.find((provider) => provider.languageId === languageId);
+};
+const registerProvider = (kind, provider, requiredMethods) => {
+  if (!provider || typeof provider !== "object") {
+    throw new ExtensionApiError(`${kind} provider is not defined`);
+  }
+  if (typeof provider.id !== "string" || provider.id.length === 0) {
+    throw new ExtensionApiError(`${kind} provider is missing id`);
+  }
+  if (typeof provider.languageId !== "string" || provider.languageId.length === 0) {
+    throw new ExtensionApiError(`${kind} provider ${provider.id} is missing languageId`);
+  }
+  for (const methodName of requiredMethods) {
+    if (typeof provider[methodName] !== "function") {
+      throw new ExtensionApiError(`${kind} provider ${provider.id} is missing ${methodName} function`);
+    }
+  }
+  const kindProviders = providers[kind] ||= [];
+  if (kindProviders.some((registeredProvider) => registeredProvider.id === provider.id)) {
+    throw new ExtensionApiError(`${kind} provider ${provider.id} is already registered`);
+  }
+  kindProviders.push(provider);
+  return {
+    dispose() {
+      const index = kindProviders.indexOf(provider);
+      if (index !== -1) {
+        kindProviders.splice(index, 1);
+      }
+    }
+  };
+};
+const executeLanguageProvider = async (kind, methodName, textDocument, ...args) => {
+  const provider = getProvider(kind, textDocument.languageId);
+  if (!provider) {
+    throw new ExtensionApiError(`No ${kind} provider found for ${textDocument.languageId}`);
+  }
+  const method = provider[methodName];
+  if (typeof method !== "function") {
+    throw new ExtensionApiError(`${kind} provider ${provider.id} is missing ${methodName} function`);
+  }
+  return method(textDocument, ...args);
+};
+const executeOrganizeImportsProvider = async (textDocument) => {
+  const provider = getProvider("code action", textDocument.languageId);
+  if (!provider) {
+    throw new ExtensionApiError(`No code action provider found for ${textDocument.languageId}`);
+  }
+  const provideCodeActions = provider.provideCodeActions;
+  const actions = await provideCodeActions(textDocument);
+  if (!Array.isArray(actions)) {
+    throw new ExtensionApiError("invalid code action result: code actions must be of type array");
+  }
+  const action = actions.find((candidate) => candidate && typeof candidate === "object" && candidate.kind === "source.organizeImports");
+  if (!action || typeof action.execute !== "function") {
+    return [];
+  }
+  return action.execute(textDocument);
+};
+const registerBraceCompletionProvider = (provider) => registerProvider("brace completion", provider, ["provideBraceCompletion"]);
+const registerClosingTagProvider = (provider) => registerProvider("closing tag", provider, ["provideClosingTag"]);
+const registerCodeActionsProvider = (provider) => registerProvider("code action", provider, ["provideCodeActions"]);
+const registerCommentProvider = (provider) => registerProvider("comment", provider, ["provideComment"]);
+const registerDefinitionProvider = (provider) => registerProvider("definition", provider, ["provideDefinition"]);
+const registerImplementationProvider = (provider) => registerProvider("implementation", provider, ["provideImplementations"]);
+const registerReferenceProvider = (provider) => registerProvider("reference", provider, ["provideReferences"]);
+const registerRenameProvider = (provider) => registerProvider("rename", provider, ["provideRename"]);
+const registerSelectionProvider = (provider) => registerProvider("selection", provider, ["provideSelections"]);
+const registerTabCompletionProvider = (provider) => registerProvider("tab completion", provider, ["provideTabCompletion"]);
+const registerTypeDefinitionProvider = (provider) => registerProvider("type definition", provider, ["provideTypeDefinition"]);
+const resetLanguageProviderRegistry = () => {
+  for (const kind of Object.keys(providers)) {
+    delete providers[kind];
+  }
+};
+export {
+  executeLanguageProvider,
+  executeOrganizeImportsProvider,
+  registerBraceCompletionProvider,
+  registerClosingTagProvider,
+  registerCodeActionsProvider,
+  registerCommentProvider,
+  registerDefinitionProvider,
+  registerImplementationProvider,
+  registerReferenceProvider,
+  registerRenameProvider,
+  registerSelectionProvider,
+  registerTabCompletionProvider,
+  registerTypeDefinitionProvider,
+  resetLanguageProviderRegistry
+};

package/dist/extension-api/parts/Rpc/Rpc.js

@@ -1,32 +1,37 @@
-import { LazyTransferMessagePortRpcParent } from "@lvce-editor/rpc";
+import { MessagePortRpcParent } from "@lvce-editor/rpc";
 import { ExtensionManagementWorker } from "@lvce-editor/rpc-registry";
-const sendMessagePortToNode = async (port) => {
-  await ExtensionManagementWorker.invokeAndTransfer(
-    "Extensions.sendMessagePortToElectron",
-    port,
-    "HandleMessagePortForExtensionHostHelperProcess.handleMessagePortForExtensionHostHelperProcess"
-  );
+const sendMessagePortToWebWorker = async (port, name, url) => {
+  await ExtensionManagementWorker.invokeAndTransfer("Extensions.createWebViewWorkerRpc2", { name, url }, port);
 };
-const sendMessagePortToWebWorker = async (port, name) => {
-  await ExtensionManagementWorker.invokeAndTransfer("Extensions.createWebViewWorkerRpc", { name }, port);
-};
-const createRpc = async ({ commandMap = {}, name = "", url }) => {
-  const rpc = await LazyTransferMessagePortRpcParent.create({
+const createMessagePortRpc = async (commandMap, send) => {
+  const { port1, port2 } = new MessageChannel();
+  const rpcPromise = MessagePortRpcParent.create({
     commandMap,
-    send(port) {
-      return sendMessagePortToWebWorker(port, name);
-    }
+    isMessagePortOpen: true,
+    messagePort: port2
   });
-  await rpc.invoke("LoadFile.loadFile", url);
-  return rpc;
+  port2.start();
+  await send(port1);
+  return rpcPromise;
 };
-const createNodeRpc = async ({ path }) => {
-  const rpc = await LazyTransferMessagePortRpcParent.create({
-    commandMap: {},
-    send: sendMessagePortToNode
-  });
-  await rpc.invoke("LoadFile.loadFile", path);
-  return rpc;
+const createRpc = async ({ commandMap = {}, name = "", url }) => {
+  return createMessagePortRpc(commandMap, (port) => sendMessagePortToWebWorker(port, name, url));
+};
+const createNodeRpc = async ({ name = "", path }) => {
+  const id = await ExtensionManagementWorker.invoke("Extensions.executeCommand", "ExtensionNodeRpc.create", name, path);
+  const invoke = (method, ...params) => {
+    return ExtensionManagementWorker.invoke("Extensions.executeCommand", "ExtensionNodeRpc.invoke", id, method, ...params);
+  };
+  return {
+    async dispose() {
+      await ExtensionManagementWorker.invoke("Extensions.executeCommand", "ExtensionNodeRpc.dispose", id);
+    },
+    invoke,
+    invokeAndTransfer: invoke,
+    send(method, ...params) {
+      void invoke(method, ...params);
+    }
+  };
 };
 export {
   createNodeRpc,