@lvce-editor/renderer-process 7.0.1 → 7.1.0

package/dist/rendererProcessMain.js

@@ -740,67 +740,6 @@ const unwrapJsonRpcResult = responseMessage => {
   }
   throw new JsonRpcError('unexpected response message');
 };
-const isMessagePort$1 = value => {
-  return typeof MessagePort !== 'undefined' && value instanceof MessagePort;
-};
-const isInstanceOf = (value, constructorName) => {
-  return value?.constructor?.name === constructorName;
-};
-const isMessagePortMain = value => {
-  return isInstanceOf(value, 'MessagePortMain');
-};
-const isOffscreenCanvas = value => {
-  return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
-};
-const isSocket = value => {
-  return isInstanceOf(value, 'Socket');
-};
-const transferrables = [isMessagePort$1, isMessagePortMain, isOffscreenCanvas, isSocket];
-const isTransferrable$1 = value => {
-  for (const fn of transferrables) {
-    if (fn(value)) {
-      return true;
-    }
-  }
-  return false;
-};
-const walkValue$1 = (value, transferrables) => {
-  if (!value) {
-    return;
-  }
-  if (isTransferrable$1(value)) {
-    transferrables.push(value);
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      walkValue$1(item, transferrables);
-    }
-    return;
-  }
-  if (typeof value === 'object') {
-    for (const property of Object.values(value)) {
-      walkValue$1(property, transferrables);
-    }
-  }
-};
-const getTransferrables = value => {
-  const transferrables = [];
-  walkValue$1(value, transferrables);
-  return transferrables;
-};
-const isSingleTransferrable = value => {
-  return isSocket(value);
-};
-const getTransferrableParams = value => {
-  const transferrables = getTransferrables(value);
-  if (transferrables.length === 0) {
-    return undefined;
-  }
-  if (isSingleTransferrable(transferrables[0])) {
-    return transferrables[0];
-  }
-  return transferrables;
-};
 const create$1$1 = (message, error) => {
   return {
     jsonrpc: Two,
@@ -927,17 +866,15 @@ const invoke$2 = async (ipc, method, ...params) => {
 // TODO deprecated old typings,
 // always use automatic transferrable detection
 const invokeAndTransfer$1 = async (ipc, handle, method, ...params) => {
-  let transfer = handle;
   if (typeof handle === 'string') {
     params = [method, ...params];
     method = handle;
-    transfer = getTransferrableParams(params);
   }
   const {
     message,
     promise
   } = create$2$1(method, params);
-  ipc.sendAndTransfer(message, transfer);
+  ipc.sendAndTransfer(message);
   const responseMessage = await promise;
   const result = unwrapJsonRpcResult(responseMessage);
   return result;
@@ -1008,6 +945,49 @@ const create$L = async ({
   return module.create(options);
 };
 
+const transferrables$1 = [];
+if (typeof MessagePort !== 'undefined') {
+  transferrables$1.push(MessagePort);
+}
+if (typeof OffscreenCanvas !== 'undefined') {
+  transferrables$1.push(OffscreenCanvas);
+}
+
+const isTransferrable$1 = value => {
+  for (const fn of transferrables$1) {
+    if (value instanceof fn) {
+      return true;
+    }
+  }
+  return false;
+};
+
+const walkValue$1 = (value, transferrables) => {
+  if (!value) {
+    return;
+  }
+  if (isTransferrable$1(value)) {
+    transferrables.push(value);
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      walkValue$1(item, transferrables);
+    }
+    return;
+  }
+  if (typeof value === 'object') {
+    for (const property of Object.values(value)) {
+      walkValue$1(property, transferrables);
+    }
+  }
+};
+
+const getTransfer = value => {
+  const transferrables = [];
+  walkValue$1(value, transferrables);
+  return transferrables;
+};
+
 const getData$2 = event => {
   // TODO why are some events not instance of message event?
   if (event instanceof MessageEvent) {
@@ -1031,9 +1011,10 @@ const launchWorker = async ({
       // @ts-ignore
       this.worker.postMessage(message);
     },
-    sendAndTransfer(message, transferables) {
+    sendAndTransfer(message) {
+      const transfer = getTransfer(message);
       // @ts-ignore
-      this.worker.postMessage(message, transferables);
+      this.worker.postMessage(message, transfer);
     },
     get onmessage() {
       return this.handleMessage;
@@ -1109,9 +1090,9 @@ const send = (method, ...params) => {
 const invoke$1 = (method, ...params) => {
   return invoke$2(state$9.ipc, method, ...params);
 };
-const sendAndTransfer = (message, transfer) => {
+const sendAndTransfer = message => {
   // @ts-expect-error
-  state$9.ipc.sendAndTransfer(message, transfer);
+  state$9.ipc.sendAndTransfer(message);
 };
 const invokeAndTransfer = (method, ...params) => {
   return invokeAndTransfer$1(state$9.ipc, method, ...params);
@@ -5482,6 +5463,58 @@ const ModuleWorkerAndMessagePort = 8;
 const getData$1 = event => {
   return event.data;
 };
+const isMessagePort$1 = value => {
+  return value && value instanceof MessagePort;
+};
+const isMessagePortMain = value => {
+  return value && value.constructor && value.constructor.name === 'MessagePortMain';
+};
+const isOffscreenCanvas = value => {
+  return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
+};
+const isInstanceOf = (value, constructorName) => {
+  return value?.constructor?.name === constructorName;
+};
+const isSocket = value => {
+  return isInstanceOf(value, 'Socket');
+};
+const transferrables = [isMessagePort$1, isMessagePortMain, isOffscreenCanvas, isSocket];
+const isTransferrable = value => {
+  for (const fn of transferrables) {
+    if (fn(value)) {
+      return true;
+    }
+  }
+  return false;
+};
+const walkValue = (value, transferrables) => {
+  if (!value) {
+    return value;
+  }
+  if (isTransferrable(value)) {
+    transferrables.push(value);
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      walkValue(item, transferrables);
+    }
+    return;
+  }
+  if (typeof value === 'object') {
+    const newObject = Object.create(null);
+    for (const property of Object.values(value)) {
+      walkValue(property, transferrables);
+    }
+    return newObject;
+  }
+  return value;
+};
+const getTransferrables = value => {
+  const transferrables = [];
+  walkValue(value, transferrables);
+  return transferrables;
+};
 const attachEvents$a = that => {
   const handleMessage = (...args) => {
     const data = that.getData(...args);
@@ -5521,7 +5554,8 @@ class IpcChildWithModuleWorker extends Ipc {
     // @ts-ignore
     this._rawIpc.postMessage(message);
   }
-  sendAndTransfer(message, transfer) {
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
     // @ts-ignore
     this._rawIpc.postMessage(message, transfer);
   }
@@ -5786,7 +5820,8 @@ class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
   send(message) {
     this._rawIpc.postMessage(message);
   }
-  sendAndTransfer(message, transfer) {
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
     this._rawIpc.postMessage(message, transfer);
   }
   dispose() {
@@ -5810,30 +5845,25 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
   listen: listen$3,
   wrap: wrap$5
 };
-const isTransferrable = value => {
-  return value instanceof MessagePort;
-};
-const walkValue = (value, transferrables) => {
+const removeValues = (value, toRemove) => {
   if (!value) {
     return value;
   }
-  if (isTransferrable(value)) {
-    transferrables.push(value);
-    return undefined;
-  }
   if (Array.isArray(value)) {
     const newItems = [];
     for (const item of value) {
-      const newItem = walkValue(item, transferrables);
-      newItems.push(newItem);
+      if (!toRemove.includes(item)) {
+        newItems.push(removeValues(item, toRemove));
+      }
     }
     return newItems;
   }
   if (typeof value === 'object') {
     const newObject = Object.create(null);
     for (const [key, property] of Object.entries(value)) {
-      const newValue = walkValue(property, transferrables);
-      newObject[key] = newValue;
+      if (!toRemove.includes(property)) {
+        newObject[key] = removeValues(property, toRemove);
+      }
     }
     return newObject;
   }
@@ -5844,8 +5874,8 @@ const walkValue = (value, transferrables) => {
 // as parameters. If the transferrable object is a parameter, in electron
 // only an empty objected is received in the main process
 const fixElectronParameters = value => {
-  const transfer = [];
-  const newValue = walkValue(value, transfer);
+  const transfer = getTransferrables(value);
+  const newValue = removeValues(value, transfer);
   return {
     newValue,
     transfer
@@ -5857,14 +5887,14 @@ const listen$1 = () => {
 const signal$1 = global => {
   global.postMessage(readyMessage);
 };
-class IpcChildWithWindow extends Ipc {
+class IpcChildWithElectronWindow extends Ipc {
   getData(event) {
     return getData$1(event);
   }
   send(message) {
     this._rawIpc.postMessage(message);
   }
-  sendAndTransfer(message, _transfer) {
+  sendAndTransfer(message) {
     const {
       newValue,
       transfer
@@ -5892,9 +5922,9 @@ class IpcChildWithWindow extends Ipc {
   }
 }
 const wrap$3 = window => {
-  return new IpcChildWithWindow(window);
+  return new IpcChildWithElectronWindow(window);
 };
-const IpcChildWithElectronWindow = {
+const IpcChildWithElectronWindow$1 = {
   __proto__: null,
   listen: listen$1,
   signal: signal$1,
@@ -5918,7 +5948,8 @@ class IpcChildWithMessagePort extends Ipc {
   send(message) {
     this._rawIpc.postMessage(message);
   }
-  sendAndTransfer(message, transfer) {
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
     this._rawIpc.postMessage(message, transfer);
   }
   dispose() {
@@ -6134,7 +6165,8 @@ const wrap = worker => {
     send(message) {
       worker.postMessage(message);
     },
-    sendAndTransfer(message, transfer) {
+    sendAndTransfer(message) {
+      const transfer = getTransfer(message);
       worker.postMessage(message, transfer);
     }
   };
@@ -6240,7 +6272,7 @@ const create$x = async ({
   if (!isElectron) {
     throw new Error('Electron api was requested but is not available');
   }
-  const windowIpc = IpcChildWithElectronWindow.wrap(window);
+  const windowIpc = IpcChildWithElectronWindow$1.wrap(window);
   handleIpcOnce(windowIpc);
   const webContentsIds = await invokeAndTransfer$1(windowIpc, 'CreateMessagePort.createMessagePort', ipcId, port);
   return webContentsIds;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "7.0.1",
+  "version": "7.1.0",
   "description": "",
   "main": "dist/diffWorkerMain.js",
   "type": "module",