@lvce-editor/file-search-worker 7.2.0 → 7.3.0

package/dist/fileSearchWorkerMain.js

@@ -1,3 +1,42 @@
+const EditorWorker = 99;
+const RendererWorker = 1;
+
+const SetDom2 = 'Viewlet.setDom2';
+
+const FocusQuickPickInput = 20;
+
+const rpcs = Object.create(null);
+const set$3 = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get$2 = id => {
+  return rpcs[id];
+};
+
+const create$7 = rpcId => {
+  return {
+    async dispose() {
+      const rpc = get$2(rpcId);
+      await rpc.dispose();
+    },
+    // @ts-ignore
+    invoke(method, ...params) {
+      const rpc = get$2(rpcId);
+      // @ts-ignore
+      return rpc.invoke(method, ...params);
+    },
+    // @ts-ignore
+    invokeAndTransfer(method, ...params) {
+      const rpc = get$2(rpcId);
+      // @ts-ignore
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    set(rpc) {
+      set$3(rpcId, rpc);
+    }
+  };
+};
+
 const normalizeLine = line => {
   if (line.startsWith('Error: ')) {
     return line.slice('Error: '.length);
@@ -526,7 +565,7 @@ const IpcParentWithMessagePort$1 = {
 
 const Two$1 = '2.0';
 const callbacks$1 = Object.create(null);
-const get$2 = id => {
+const get$1 = id => {
   return callbacks$1[id];
 };
 const remove = id => {
@@ -675,7 +714,7 @@ const warn$1 = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$2(id);
+  const fn = get$1(id);
   if (!fn) {
     console.log(response);
     warn$1(`callback ${id} may already be disposed`);
@@ -1012,9 +1051,35 @@ const create$6 = async ({
     messagePort: port2
   });
 };
-const TransferMessagePortRpcParent = {
-  __proto__: null,
-  create: create$6
+
+/* eslint-disable @typescript-eslint/no-misused-promises */
+
+const createSharedLazyRpc = factory => {
+  let rpcPromise;
+  const getOrCreate = () => {
+    if (!rpcPromise) {
+      rpcPromise = factory();
+    }
+    return rpcPromise;
+  };
+  return {
+    async dispose() {
+      const rpc = await getOrCreate();
+      await rpc.dispose();
+    },
+    async invoke(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invoke(method, ...params);
+    },
+    async invokeAndTransfer(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    async send(method, ...params) {
+      const rpc = await getOrCreate();
+      rpc.send(method, ...params);
+    }
+  };
 };
 const create$2$1 = async ({
   commandMap
@@ -1030,50 +1095,28 @@ const WebWorkerRpcClient = {
   __proto__: null,
   create: create$2$1
 };
-
-const EditorWorker = 99;
-const RendererWorker = 1;
-
-const SetDom2 = 'Viewlet.setDom2';
-
-const FocusQuickPickInput = 20;
-
-const rpcs = Object.create(null);
-const set$3 = (id, rpc) => {
-  rpcs[id] = rpc;
-};
-const get$1 = id => {
-  return rpcs[id];
+const create$3 = async ({
+  commandMap,
+  isMessagePortOpen,
+  send
+}) => {
+  return createSharedLazyRpc(() => {
+    return create$6({
+      commandMap,
+      isMessagePortOpen,
+      send
+    });
+  });
 };
-
-const create$3 = rpcId => {
-  return {
-    async dispose() {
-      const rpc = get$1(rpcId);
-      await rpc.dispose();
-    },
-    // @ts-ignore
-    invoke(method, ...params) {
-      const rpc = get$1(rpcId);
-      // @ts-ignore
-      return rpc.invoke(method, ...params);
-    },
-    // @ts-ignore
-    invokeAndTransfer(method, ...params) {
-      const rpc = get$1(rpcId);
-      // @ts-ignore
-      return rpc.invokeAndTransfer(method, ...params);
-    },
-    set(rpc) {
-      set$3(rpcId, rpc);
-    }
-  };
+const LazyTransferMessagePortRpcParent = {
+  __proto__: null,
+  create: create$3
 };
 
 const {
   invoke: invoke$2,
   set: set$2
-} = create$3(EditorWorker);
+} = create$7(EditorWorker);
 const getLines = async editorUid => {
   const lines = await invoke$2('Editor.getLines2', editorUid);
   return lines;
@@ -1083,7 +1126,7 @@ const {
   invoke: invoke$1,
   invokeAndTransfer,
   set: set$1
-} = create$3(RendererWorker);
+} = create$7(RendererWorker);
 const sendMessagePortToEditorWorker = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
   // @ts-ignore
@@ -2951,14 +2994,7 @@ const handleMessagePort = async port => {
 };
 
 const initialize = async () => {
-  // TODO
-  const rpc = await TransferMessagePortRpcParent.create({
-    commandMap: {},
-    async send(port) {
-      await sendMessagePortToEditorWorker(port, 0);
-    }
-  });
-  set$2(rpc);
+  // not needed anymore
 };
 
 const getDefaultValue = id => {
@@ -3637,6 +3673,23 @@ const commandMap = {
   'QuickPick.showQuickInput': showQuickInput
 };
 
+const initializeEditorWorker = async () => {
+  const rpc = await LazyTransferMessagePortRpcParent.create({
+    commandMap: {},
+    async send(port) {
+      await sendMessagePortToEditorWorker(port, 0);
+    }
+  });
+  set$2(rpc);
+};
+
+const initializeRendererWorker = async () => {
+  const rpc = await WebWorkerRpcClient.create({
+    commandMap: commandMap
+  });
+  set$1(rpc);
+};
+
 const Memfs = 'memfs';
 const Html = 'html';
 const Fetch = 'fetch';
@@ -3693,10 +3746,7 @@ const listen = async () => {
   Object.assign(commandMapRef, commandMap);
   registerCommands(commandMap);
   register(searchModules);
-  const rpc = await WebWorkerRpcClient.create({
-    commandMap: commandMap
-  });
-  set$1(rpc);
+  await Promise.all([initializeRendererWorker(), initializeEditorWorker()]);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/file-search-worker",
-  "version": "7.2.0",
+  "version": "7.3.0",
   "keywords": [
     "text-search"
   ],