@lvce-editor/extension-host-worker 1.2.0 → 1.3.0

package/dist/extensionHostWorkerMain.js

@@ -303,7 +303,7 @@ const syncIncremental = (textDocumentId, changes) => {
   textDocument.text = before + syntheticChange.inserted + after;
   runListenersSafe(getDidChangeListeners(), textDocument, syntheticChanges);
 };
-const get$3 = textDocumentId => {
+const get$4 = textDocumentId => {
   const textDocument = getDocument(textDocumentId);
   return textDocument;
 };
@@ -536,7 +536,7 @@ const registerMethod = ({
 }) => {
   context[`execute${name}Provider`] = async function (textDocumentId, ...params) {
     try {
-      const textDocument = get$3(textDocumentId);
+      const textDocument = get$4(textDocumentId);
       if (!textDocument) {
         throw new Error(`textDocument with id ${textDocumentId} not found`);
       }
@@ -671,7 +671,7 @@ const executeOrganizeImports = async uid => {
   if (!organizeImportsAction) {
     return [];
   }
-  const textDocument = get$3(uid);
+  const textDocument = get$4(uid);
   const edits = await organizeImportsAction.execute(textDocument);
   return edits;
 };
@@ -804,10 +804,10 @@ const number = value => {
 const state$1$1 = {
   callbacks: Object.create(null)
 };
-const set$2 = (id, fn) => {
+const set$3 = (id, fn) => {
   state$1$1.callbacks[id] = fn;
 };
-const get$2 = id => {
+const get$3 = id => {
   return state$1$1.callbacks[id];
 };
 const remove = id => {
@@ -841,7 +841,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = withResolvers$2();
-  set$2(id, resolve);
+  set$3(id, resolve);
   return {
     id,
     promise
@@ -849,7 +849,7 @@ const registerPromise = () => {
 };
 const resolve = (id, args) => {
   number(id);
-  const fn = get$2(id);
+  const fn = get$3(id);
   if (!fn) {
     console.log(args);
     warn(`callback ${id} may already be disposed`);
@@ -1160,7 +1160,7 @@ class CommandNotFoundError extends Error {
 }
 
 const state$7 = {};
-const register = commandMap => {
+const register$1 = commandMap => {
   Object.assign(state$7, commandMap);
 };
 const execute = (method, ...params) => {
@@ -1197,28 +1197,28 @@ const state$6 = {
    */
   ipc: undefined
 };
-const get$1 = () => {
+const get$2 = () => {
   return state$6.ipc;
 };
-const set$1 = ipc => {
+const set$2 = ipc => {
   state$6.ipc = ipc;
 };
 
 const send = (method, ...params) => {
-  const ipc = get$1();
+  const ipc = get$2();
   send$1(ipc, method, ...params);
 };
 const invoke = (method, ...params) => {
-  const ipc = get$1();
+  const ipc = get$2();
   return invoke$1(ipc, method, ...params);
 };
 const invokeAndTransfer = (method, ...params) => {
-  const ipc = get$1();
+  const ipc = get$2();
   return invokeAndTransfer$1(ipc, method, ...params);
 };
 const listen$2 = ipc => {
   handleIpc(ipc);
-  set$1(ipc);
+  set$2(ipc);
 };
 
 const state$5 = {
@@ -1771,25 +1771,44 @@ const {
   }]
 });
 
-const rpcs = Object.create(null);
+const getExtensionHostSubWorkerUrl = () => {
+  return new URL('../../../../extension-host-sub-worker/src/extensionHostSubWorkerMain.js', import.meta.url).toString();
+};
+const extensionHostSubWorkerUrl = getExtensionHostSubWorkerUrl();
+
+const set$1 = async (url, contentSecurityPolicy) => {
+  const pathName = new URL(url).pathname;
+  await invoke('ExtensionHostWorkerContentSecurityPolicy.set', pathName, contentSecurityPolicy);
+};
+
+const rpcs$1 = Object.create(null);
 const add$1 = (id, rpc) => {
-  rpcs[id] = rpc;
+  rpcs$1[id] = rpc;
+};
+const get$1 = id => {
+  return rpcs$1[id];
+};
+
+const registry = Object.create(null);
+const rpcs = Object.create(null);
+const register = (id, execute) => {
+  registry[id] = execute;
+};
+const acquire = id => {
+  const fn = registry[id];
+  delete registry[id];
+  return fn;
 };
 const get = id => {
   return rpcs[id];
 };
-
-const getExtensionHostSubWorkerUrl = () => {
-  return new URL('../../../../extension-host-sub-worker/src/extensionHostSubWorkerMain.js', import.meta.url).toString();
+const set = (id, rpc) => {
+  rpcs[id] = rpc;
 };
-const extensionHostSubWorkerUrl = getExtensionHostSubWorkerUrl();
 
-const createRpcWithId = async ({
-  id,
-  execute
-}) => {
-  string(id);
-  const info = get(id);
+const createRpcWithId$1 = async id => {
+  const fn = acquire(id);
+  const info = get$1(id);
   if (!info) {
     throw new Error(`rpc with id ${id} not found`);
   }
@@ -1798,24 +1817,72 @@ const createRpcWithId = async ({
     url: extensionHostSubWorkerUrl,
     name: info.name
   });
-  const rpc = await create$6({
+  const newRpc = await create$6({
     ipc,
     method: JsonRpc,
-    execute
+    execute: fn
   });
-  await rpc.invoke('LoadFile.loadFile', info.url);
-  return rpc;
+  await newRpc.invoke('LoadFile.loadFile', info.url);
+  set(id, newRpc);
+  return newRpc;
 };
 
-const set = async (url, contentSecurityPolicy) => {
-  const pathName = new URL(url).pathname;
-  await invoke('ExtensionHostWorkerContentSecurityPolicy.set', pathName, contentSecurityPolicy);
+const getOrCreateRpc = async id => {
+  const rpc = get(id);
+  if (!rpc) {
+    set(id, createRpcWithId$1(id));
+  }
+  return get(id);
+};
+const createRpcWithId = ({
+  id,
+  execute
+}) => {
+  string(id);
+  register(id, execute);
+  const lazyRpc = {
+    async invoke(method, ...params) {
+      const rpc = await getOrCreateRpc(id);
+      await rpc.invoke(method, ...params);
+    }
+  };
+  return lazyRpc;
 };
 
 const defaultExecute = () => {
   throw new Error('not implemented');
 };
-const createRpc = async ({
+
+/**
+ *
+ * @deprecated
+ */
+const createLegacyRpc = async ({
+  url,
+  name,
+  execute = defaultExecute,
+  contentSecurityPolicy
+}) => {
+  string(url);
+  string(name);
+  fn(execute);
+  if (contentSecurityPolicy) {
+    await set$1(url, contentSecurityPolicy);
+  }
+  const ipc = await create$7({
+    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug$1,
+    url: extensionHostSubWorkerUrl,
+    name
+  });
+  const rpc = await create$6({
+    ipc,
+    method: JsonRpc,
+    execute
+  });
+  await rpc.invoke('LoadFile.loadFile', url);
+  return rpc;
+};
+const createRpc = ({
   id,
   url,
   name,
@@ -1825,32 +1892,17 @@ const createRpc = async ({
   try {
     if (id) {
       string(id);
-      const rpc = await createRpcWithId({
+      return createRpcWithId({
         id,
         execute
       });
-      return rpc;
-    }
-
-    // deprecated
-    string(url);
-    string(name);
-    fn(execute);
-    if (contentSecurityPolicy) {
-      await set(url, contentSecurityPolicy);
     }
-    const ipc = await create$7({
-      method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug$1,
-      url: extensionHostSubWorkerUrl,
-      name
+    return createLegacyRpc({
+      url,
+      name,
+      execute,
+      contentSecurityPolicy
     });
-    const rpc = await create$6({
-      ipc,
-      method: JsonRpc,
-      execute
-    });
-    await rpc.invoke('LoadFile.loadFile', url);
-    return rpc;
   } catch (error) {
     throw new VError$1(error, `Failed to create webworker rpc`);
   }
@@ -3434,7 +3486,7 @@ const main = async () => {
     self.addEventListener('securitypolicyviolation', handleContentSecurityPolicyViolation);
   }
   globalThis.vscode = api;
-  register(commandMap);
+  register$1(commandMap);
   const ipc = await listen({
     method: Auto()
   });
@@ -3632,7 +3684,7 @@ const create$2 = async ({
     port1,
     port2
   } = getPortTuple();
-  await invokeAndTransfer([port1], 'IpcParent.create', {
+  await invokeAndTransfer('IpcParent.create', {
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
     url,
     name,

package/package.json

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