@lvce-editor/test-worker 1.3.0 → 1.5.0

package/dist/testWorkerMain.js

@@ -134,7 +134,6 @@ const getErrorConstructor = (message, type) => {
   if (type) {
     switch (type) {
       case DomException:
-        // @ts-ignore
         return DOMException;
       case TypeError$1:
         return TypeError;
@@ -159,7 +158,6 @@ const getErrorConstructor = (message, type) => {
 };
 const constructError = (message, type, name) => {
   const ErrorConstructor = getErrorConstructor(message, type);
-  // @ts-ignore
   if (ErrorConstructor === DOMException && name) {
     return new ErrorConstructor(message, name);
   }
@@ -175,6 +173,13 @@ const constructError = (message, type, name) => {
 const getNewLineIndex$2 = (string, startIndex = undefined) => {
   return string.indexOf(NewLine$3, startIndex);
 };
+const getParentStack = error => {
+  let parentStack = error.stack || error.data || error.message || '';
+  if (parentStack.startsWith('    at')) {
+    parentStack = error.message + NewLine$3 + parentStack;
+  }
+  return parentStack;
+};
 const joinLines$1 = lines => {
   return lines.join(NewLine$3);
 };
@@ -183,18 +188,11 @@ const Custom = -32001;
 const splitLines$1 = lines => {
   return lines.split(NewLine$3);
 };
-const getParentStack = error => {
-  let parentStack = error.stack || error.data || error.message || '';
-  if (parentStack.startsWith('    at')) {
-    parentStack = error.message + NewLine$3 + parentStack;
-  }
-  return parentStack;
-};
 const restoreJsonRpcError = error => {
   if (error && error instanceof Error) {
     return error;
   }
-  const currentStack = joinLines$1(splitLines$1(new Error().stack).slice(1));
+  const currentStack = joinLines$1(splitLines$1(new Error().stack || '').slice(1));
   if (error && error.code && error.code === MethodNotFound) {
     const restoredError = new JsonRpcError(error.message);
     const parentStack = getParentStack(error);
@@ -223,7 +221,6 @@ const restoreJsonRpcError = error => {
       }
     } else {
       if (error.stack) {
-        // TODO accessing stack might be slow
         const lowerStack = restoredError.stack || '';
         // @ts-ignore
         const indexNewLine = getNewLineIndex$2(lowerStack);
@@ -305,7 +302,42 @@ const getResponse = async (message, ipc, execute, preparePrettyError, logError,
     return getErrorResponse(message, error, preparePrettyError, logError);
   }
 };
-const handleJsonRpcMessage = async (ipc, message, execute, resolve, preparePrettyError, logError, requiresSocket) => {
+const defaultPreparePrettyError = error => {
+  return error;
+};
+const defaultLogError = () => {
+  // ignore
+};
+const defaultRequiresSocket = () => {
+  return false;
+};
+const defaultResolve = resolve;
+const handleJsonRpcMessage = async (...args) => {
+  let message;
+  let ipc;
+  let execute;
+  let preparePrettyError;
+  let logError;
+  let resolve;
+  let requiresSocket;
+  if (args.length === 1) {
+    const arg = args[0];
+    message = arg.message;
+    ipc = arg.ipc;
+    execute = arg.execute;
+    preparePrettyError = arg.preparePrettyError || defaultPreparePrettyError;
+    logError = arg.logError || defaultLogError;
+    requiresSocket = arg.requiresSocket || defaultRequiresSocket;
+    resolve = arg.resolve || defaultResolve;
+  } else {
+    ipc = args[0];
+    message = args[1];
+    execute = args[2];
+    resolve = args[3];
+    preparePrettyError = args[4];
+    logError = args[5];
+    requiresSocket = args[6];
+  }
   if ('id' in message) {
     if ('method' in message) {
       const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
@@ -337,18 +369,40 @@ const invoke$1 = async (ipc, method, ...params) => {
   return result;
 };
 
+// TODO deprecated old typings,
+// always use automatic transferrable detection
+const invokeAndTransfer$1 = async (ipc, handle, method, ...params) => {
+  if (typeof handle === 'string') {
+    params = [method, ...params];
+    method = handle;
+  }
+  const {
+    message,
+    promise
+  } = create$2(method, params);
+  ipc.sendAndTransfer(message);
+  const responseMessage = await promise;
+  const result = unwrapJsonRpcResult(responseMessage);
+  return result;
+};
+
 const invoke = (method, ...params) => {
   const ipc = get$1();
   return invoke$1(ipc, method, ...params);
 };
-const listen$4 = ipc => {
+const invokeAndTransfer = (method, ...params) => {
+  const ipc = get$1();
+  return invokeAndTransfer$1(ipc, method, ...params);
+};
+const listen$2 = ipc => {
   set$1(ipc);
 };
 
 const Rpc = {
   __proto__: null,
   invoke,
-  listen: listen$4
+  invokeAndTransfer,
+  listen: listen$2
 };
 
 const Fail = 'fail';
@@ -840,13 +894,13 @@ const TestFrameWorkComponentBaseUrl = {
   getBaseUrl
 };
 
-const execute$2 = async (id, ...args) => {
+const execute$3 = async (id, ...args) => {
   return invoke(id, ...args);
 };
 
 const TestFrameWorkComponentCommand = {
   __proto__: null,
-  execute: execute$2
+  execute: execute$3
 };
 
 const selectItem$1 = async text => {
@@ -1405,7 +1459,62 @@ const TestFrameWorkComponentTitleBarMenuBar = {
   toggleMenu
 };
 
+const getPortTuple = () => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  return {
+    port1,
+    port2
+  };
+};
+
+const sendPortToWebView = async (webviewId, port) => {
+  await invokeAndTransfer('Transferrable.transferToRendererProcess', webviewId, port);
+  console.log('did send port to renderer process');
+  // TODO ask renderer process to transfer the port to the webview
+};
+
+const preparePrettyError$1 = error => {
+  return error;
+};
+const logError$1 = () => {
+  // ignore
+};
+const execute$2 = () => {};
+const requiresSocket$1 = () => {
+  return false;
+};
+const createPortIpc = async webViewId => {
+  const {
+    port1,
+    port2
+  } = getPortTuple();
+  const firstEventPromise = new Promise(resolve => {
+    port1.onmessage = resolve;
+  });
+  await sendPortToWebView(webViewId, port2);
+  const firstEvent = await firstEventPromise;
+  // @ts-ignore
+  if (firstEvent.data !== 'ready') {
+    throw new Error('unexpected first message');
+  }
+  const handleOtherMessage = async event => {
+    // @ts-ignore
+    await handleJsonRpcMessage(ipc, event.data, resolve, preparePrettyError$1, execute$2, logError$1, requiresSocket$1);
+  };
+  port1.onmessage = handleOtherMessage;
+  const ipc = {
+    send(message) {
+      port1.postMessage(message);
+    }
+  };
+  return ipc;
+};
+
 const fromId = async webViewId => {
+  const ipc = await createPortIpc(webViewId);
   // TODO
   // 1. create messagechannel
   // 2. send one message port to webview
@@ -1413,7 +1522,7 @@ const fromId = async webViewId => {
   // 4. send test commands like locator.toBeVisible to webview
   const webViewRpc = {
     invoke(method, ...params) {
-      console.log('invoke called', method, params);
+      return invoke$1(ipc, method, ...params);
     }
   };
   return {
@@ -1548,14 +1657,14 @@ const handleIpc = ipc => {
   ipc.addEventListener('message', handleMessage);
 };
 
-const MessagePort = 1;
+const MessagePort$1 = 1;
 const ModuleWorker = 2;
 const ReferencePort = 3;
 const ModuleWorkerAndMessagePort = 8;
 const Auto = () => {
   // @ts-ignore
   if (globalThis.acceptPort) {
-    return MessagePort;
+    return MessagePort$1;
   }
   // @ts-ignore
   if (globalThis.acceptReferencePort) {
@@ -1567,6 +1676,56 @@ const Auto = () => {
 const getData$1 = event => {
   return event.data;
 };
+const walkValue = (value, transferrables, isTransferrable) => {
+  if (!value) {
+    return;
+  }
+  if (isTransferrable(value)) {
+    transferrables.push(value);
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      walkValue(item, transferrables, isTransferrable);
+    }
+    return;
+  }
+  if (typeof value === 'object') {
+    for (const property of Object.values(value)) {
+      walkValue(property, transferrables, isTransferrable);
+    }
+    return;
+  }
+};
+const isMessagePort = 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, isMessagePortMain, isOffscreenCanvas, isSocket];
+const isTransferrable = value => {
+  for (const fn of transferrables) {
+    if (fn(value)) {
+      return true;
+    }
+  }
+  return false;
+};
+const getTransferrables = value => {
+  const transferrables = [];
+  walkValue(value, transferrables, isTransferrable);
+  return transferrables;
+};
 const attachEvents = that => {
   const handleMessage = (...args) => {
     const data = that.getData(...args);
@@ -1588,14 +1747,14 @@ class Ipc extends EventTarget {
   }
 }
 const readyMessage = 'ready';
-const listen$3 = () => {
+const listen$4 = () => {
   // @ts-ignore
   if (typeof WorkerGlobalScope === 'undefined') {
     throw new TypeError('module is not in web worker scope');
   }
   return globalThis;
 };
-const signal$2 = global => {
+const signal$3 = global => {
   global.postMessage(readyMessage);
 };
 class IpcChildWithModuleWorker extends Ipc {
@@ -1606,7 +1765,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);
   }
@@ -1620,14 +1780,14 @@ class IpcChildWithModuleWorker extends Ipc {
     this._rawIpc.addEventListener('message', callback);
   }
 }
-const wrap$5 = global => {
+const wrap$6 = global => {
   return new IpcChildWithModuleWorker(global);
 };
 const IpcChildWithModuleWorker$1 = {
   __proto__: null,
-  listen: listen$3,
-  signal: signal$2,
-  wrap: wrap$5
+  listen: listen$4,
+  signal: signal$3,
+  wrap: wrap$6
 };
 const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
 const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON';
@@ -1845,10 +2005,10 @@ const waitForFirstMessage = async port => {
   // @ts-ignore
   return event.data;
 };
-const listen$2 = async () => {
-  const parentIpcRaw = listen$3();
-  signal$2(parentIpcRaw);
-  const parentIpc = wrap$5(parentIpcRaw);
+const listen$3 = async () => {
+  const parentIpcRaw = listen$4();
+  signal$3(parentIpcRaw);
+  const parentIpc = wrap$6(parentIpcRaw);
   const firstMessage = await waitForFirstMessage(parentIpc);
   if (firstMessage.method !== 'initialize') {
     throw new IpcError('unexpected first message');
@@ -1871,7 +2031,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() {
@@ -1887,13 +2048,13 @@ class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
     this._rawIpc.start();
   }
 }
-const wrap$4 = port => {
+const wrap$5 = port => {
   return new IpcChildWithModuleWorkerAndMessagePort(port);
 };
 const IpcChildWithModuleWorkerAndMessagePort$1 = {
   __proto__: null,
-  listen: listen$2,
-  wrap: wrap$4
+  listen: listen$3,
+  wrap: wrap$5
 };
 
 const getModule = method => {
@@ -1925,7 +2086,7 @@ const listen = async () => {
     method: Auto()
   });
   handleIpc(ipc);
-  listen$4(ipc);
+  listen$2(ipc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/test-worker",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "",
   "main": "dist/testWorkerMain.js",
   "type": "module",