@lvce-editor/file-system-process 4.0.0 → 4.1.0

package/dist/index.js

@@ -221,7 +221,7 @@ const MainProcess = -5;
 const SharedProcess$1 = 1492;
 
 const rpcs = Object.create(null);
-const set$1 = (id, rpc) => {
+const set$2 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -247,7 +247,7 @@ const create$3 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$1(rpcId, rpc);
+      set$2(rpcId, rpc);
     }
   };
 };
@@ -1368,6 +1368,36 @@ const ElectronUtilityProcessRpcClient = {
   __proto__: null,
   create: create$o
 };
+
+/* 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$k = async ({
   commandMap,
   getPortTuple,
@@ -1384,9 +1414,22 @@ const create$k = async ({
   });
   return rpc;
 };
-const TransferElectronMessagePortRpc = {
+const create$j = async ({
+  commandMap,
+  getPortTuple,
+  send
+}) => {
+  return createSharedLazyRpc(() => {
+    return create$k({
+      commandMap,
+      getPortTuple,
+      send
+    });
+  });
+};
+const LazyTransferElectronMessagePortRpc = {
   __proto__: null,
-  create: create$k
+  create: create$j
 };
 const create$9 = async ({
   commandMap
@@ -1441,8 +1484,13 @@ const NodeWorkerRpcClient = {
 };
 
 const {
-  dispose,
   invoke: invoke$2,
+  set: set$1
+} = create$3(MainProcess);
+
+const {
+  dispose,
+  invoke: invoke$1,
   invokeAndTransfer: invokeAndTransfer$1,
   set
 } = create$3(SharedProcess$1);
@@ -1450,52 +1498,16 @@ const {
 const SharedProcess = {
   __proto__: null,
   dispose,
-  invoke: invoke$2,
+  invoke: invoke$1,
   invokeAndTransfer: invokeAndTransfer$1,
   set
 };
 
-const createLazyRpc = rpcId => {
-  let rpcPromise;
-  let factory;
-  const createRpc = async () => {
-    const rpc = await factory();
-    set$1(rpcId, rpc);
-  };
-  const ensureRpc = async () => {
-    if (!rpcPromise) {
-      rpcPromise = createRpc();
-    }
-    await rpcPromise;
-  };
-  return {
-    async invoke(method, ...params) {
-      await ensureRpc();
-      const rpc = get$1(rpcId);
-      return rpc.invoke(method, ...params);
-    },
-    async invokeAndTransfer(method, ...params) {
-      await ensureRpc();
-      const rpc = get$1(rpcId);
-      return rpc.invokeAndTransfer(method, ...params);
-    },
-    setFactory(value) {
-      factory = value;
-    }
-  };
-};
-
-const {
-  invoke: invoke$1,
-  setFactory
-} = createLazyRpc(MainProcess);
-
 const trash$2 = async path => {
   if (!existsSync(path)) {
     return;
   }
-  // @ts-ignore
-  await invoke$1('Trash.trash', path);
+  await invoke$2('Trash.trash', path);
 };
 
 // @ts-ignore
@@ -1816,7 +1828,7 @@ const handleElectronMessagePort = async (messagePort, rpcId) => {
     method: ElectronMessagePort
   });
   if (rpcId) {
-    set$1(rpcId, rpc);
+    set$2(rpcId, rpc);
   }
 };
 
@@ -1881,24 +1893,20 @@ const getPortTuple = async () => {
 };
 
 const createMainProcessRpc = async () => {
-  try {
-    const rpc = TransferElectronMessagePortRpc.create({
-      commandMap: {},
-      getPortTuple,
-      async send(port) {
-        await invokeAndTransfer(
-        // @ts-ignore
-        'TemporaryMessagePort.sendToElectron', port, MainProcess, FileSystemProcess);
-      }
-    });
-    return rpc;
-  } catch (error) {
-    throw new VError(error, `Failed to create main process rpc`);
-  }
+  const rpc = await LazyTransferElectronMessagePortRpc.create({
+    commandMap: {},
+    getPortTuple,
+    async send(port) {
+      await invokeAndTransfer(
+      // @ts-ignore
+      'TemporaryMessagePort.sendToElectron', port, MainProcess, FileSystemProcess);
+    }
+  });
+  set$1(rpc);
 };
 
 const initialize = async () => {
-  setFactory(createMainProcessRpc);
+  await createMainProcessRpc();
 };
 
 const commandMap = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/file-system-process",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "File System Process",
   "keywords": [
     "Lvce Editor",