@lvce-editor/renderer-process 8.7.0 → 9.1.0

package/dist/rendererProcessMain.js

@@ -513,13 +513,13 @@ const number$1 = value => {
 const state$1$1 = {
   callbacks: Object.create(null)
 };
-const set$6 = (id, fn) => {
+const set$7 = (id, fn) => {
   state$1$1.callbacks[id] = fn;
 };
-const get$7 = id => {
+const get$8 = id => {
   return state$1$1.callbacks[id];
 };
-const remove$2 = id => {
+const remove$3 = id => {
   delete state$1$1.callbacks[id];
 };
 const state$a = {
@@ -550,7 +550,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = withResolvers$2();
-  set$6(id, resolve);
+  set$7(id, resolve);
   return {
     id,
     promise
@@ -558,14 +558,14 @@ const registerPromise = () => {
 };
 const resolve = (id, args) => {
   number$1(id);
-  const fn = get$7(id);
+  const fn = get$8(id);
   if (!fn) {
     console.log(args);
     warn$1(`callback ${id} may already be disposed`);
     return;
   }
   fn(args);
-  remove$2(id);
+  remove$3(id);
 };
 const create$2$1 = (method, params) => {
   const {
@@ -861,7 +861,7 @@ const preparePrettyError = error => {
   return error;
 };
 const logError$1 = error => {
-  console.error(error);
+  // error is logged in renderer worker
 };
 const handleMessage = event => {
   return handleJsonRpcMessage(event.target, event.data, execute, resolve, preparePrettyError, logError$1, requiresSocket);
@@ -908,10 +908,54 @@ const getModule$1 = method => {
   }
 };
 
+const hasFlag = key => {
+  if (typeof location === 'undefined' || typeof document === 'undefined') {
+    return false;
+  }
+  const configElement = document.getElementById('Config');
+  if (!configElement) {
+    return false;
+  }
+  const text = configElement.textContent;
+  if (!text) {
+    return false;
+  }
+  const config = JSON.parse(text);
+  const result = config[key];
+  return result;
+};
+
+const shouldLaunchMultipleWorkers = hasFlag('prelaunchWorkers');
+
+const ipcs = Object.create(null);
+const set$6 = (name, ipc) => {
+  ipcs[name] = ipc;
+};
+const get$7 = name => {
+  return ipcs[name];
+};
+const remove$2 = name => {
+  delete ipcs[name];
+};
+const has = name => {
+  return ipcs[name];
+};
+
 const create$K = async ({
   method,
   ...options
 }) => {
+  if (shouldLaunchMultipleWorkers && options.name && has(options.name)) {
+    if (!options.id) {
+      throw new Error('id is required');
+    }
+    // TODO rename method
+    // TODO avoid cyclic dependency
+    const port = get$7(options.name);
+    remove$2(options.name);
+    await invokeAndTransfer('Transferrable.transfer', options.id, port);
+    return;
+  }
   const module = await getModule$1(method);
   // @ts-ignore
   return module.create(options);
@@ -1456,57 +1500,79 @@ const handleUnhandledError = (message, filename, lineno, colno, error) => {
 
 const editorWorkerUrl = `${assetDir}/packages/renderer-worker/node_modules/@lvce-editor/editor-worker/dist/editorWorkerMain.js`;
 
-const launchEditorWorker = async () => {
-  return launchWorker({
+const launchEditorWorker = async port => {
+  const ipc = await create$K({
     name: 'Editor Worker',
-    url: editorWorkerUrl
+    url: editorWorkerUrl,
+    method: ModuleWorkerWithMessagePort,
+    port
   });
+  return ipc;
 };
 
 const hydrate$3 = async () => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
   // TODO only launch port and send to renderer worker
-  await launchEditorWorker();
+  const promise = launchEditorWorker(port1);
+  set$6('Editor Worker', port2);
+  await promise;
 };
 
+const isElectron = platform === Electron$1;
+
 const extensionHostWorkerUrl = `${assetDir}/packages/extension-host-worker/src/extensionHostWorkerMain.ts`;
 
-const launchExtensionHostWorker = async () => {
-  return launchWorker({
-    name: 'Extension Host Worker',
-    url: extensionHostWorkerUrl
+const launchExtensionHostWorker = async port => {
+  const name = isElectron ? 'Extension Host (Electron)' : 'Extension Host';
+  const ipc = await create$K({
+    name,
+    url: extensionHostWorkerUrl,
+    method: ModuleWorkerWithMessagePort,
+    port
   });
+  return ipc;
 };
 
 const hydrate$2 = async () => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
   // TODO only launch port and send to renderer worker
-  await launchExtensionHostWorker();
-};
-
-const hasFlag = key => {
-  if (typeof location === 'undefined') {
-    return false;
-  }
-  const params = new URLSearchParams(location.search);
-  return params.has(key);
+  const promise = launchExtensionHostWorker(port1);
+  const name = isElectron ? 'Extension Host (Electron)' : 'Extension Host';
+  set$6(name, port2);
+  await promise;
 };
 
 const syntaxHighlightingWorkerUrl = `${assetDir}/packages/renderer-worker/node_modules/@lvce-editor/syntax-highlighting-worker/dist/syntaxHighlightingWorkerMain.js`;
 
-const launchSyntaxHighlightingWorker = async () => {
-  return launchWorker({
+const launchSyntaxHighlightingWorker = async port => {
+  const ipc = await create$K({
     name: 'Syntax Highlighting Worker',
-    url: syntaxHighlightingWorkerUrl
+    url: syntaxHighlightingWorkerUrl,
+    method: ModuleWorkerWithMessagePort,
+    port
   });
+  return ipc;
 };
 
 const hydrate$1 = async () => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
   // TODO only launch port and send to renderer worker
-  await launchSyntaxHighlightingWorker();
+  const promise = launchSyntaxHighlightingWorker(port1);
+  set$6('Syntax Highlighting Worker', port2);
+  await promise;
 };
 
-const launchMultipleWorkers = hasFlag('prelaunchWorkers');
 const launchWorkers = () => {
-  if (launchMultipleWorkers) {
+  if (shouldLaunchMultipleWorkers) {
     return Promise.all([hydrate$4(), hydrate$3(), hydrate$1(), hydrate$2()]);
   }
   return hydrate$4();
@@ -3049,6 +3115,24 @@ const ImagePreview_ipc = {
   name: name$o
 };
 
+const getTitleBarHeight = () => {
+  if (
+  // @ts-expect-error
+  navigator.windowControlsOverlay?.getTitlebarAreaRect) {
+    // @ts-expect-error
+    const titleBarRect = navigator.windowControlsOverlay.getTitlebarAreaRect();
+    return titleBarRect.height;
+  }
+  return 0;
+};
+const getBounds = () => {
+  return {
+    windowWidth: window.innerWidth,
+    windowHeight: window.innerHeight,
+    titleBarHeight: getTitleBarHeight()
+  };
+};
+
 const getPathName = () => {
   return location.pathname;
 };
@@ -3069,24 +3153,6 @@ const hydrate = () => {
   // addEventListener('popstate', handlePopState)
 };
 
-const getTitleBarHeight = () => {
-  if (
-  // @ts-expect-error
-  navigator.windowControlsOverlay?.getTitlebarAreaRect) {
-    // @ts-expect-error
-    const titleBarRect = navigator.windowControlsOverlay.getTitlebarAreaRect();
-    return titleBarRect.height;
-  }
-  return 0;
-};
-const getBounds = () => {
-  return {
-    windowWidth: window.innerWidth,
-    windowHeight: window.innerHeight,
-    titleBarHeight: getTitleBarHeight()
-  };
-};
-
 const getInitData = () => {
   const initData = {
     Location: {
@@ -3094,6 +3160,9 @@ const getInitData = () => {
     },
     Layout: {
       bounds: getBounds()
+    },
+    Config: {
+      shouldLaunchMultipleWorkers: shouldLaunchMultipleWorkers
     }
   };
   return initData;
@@ -5452,6 +5521,11 @@ const listen$3 = async () => {
   }
   const type = firstMessage.params[0];
   if (type === 'message-port') {
+    parentIpc.send({
+      jsonrpc: '2.0',
+      id: firstMessage.id,
+      result: null
+    });
     parentIpc.dispose();
     const port = firstMessage.params[1];
     return port;
@@ -5885,7 +5959,7 @@ const create$y = async ({
   // TODO await promise
   // TODO call separate method HandleMessagePort.handleMessagePort or
   // HandleIncomingIpc.handleIncomingIpc
-  invokeAndTransfer$1(ipc, [port], 'initialize', 'message-port', port);
+  await invokeAndTransfer$1(ipc, 'initialize', 'message-port', port);
   unhandleIpc(ipc);
   return undefined;
 };
@@ -5906,8 +5980,6 @@ const handleIpcOnce = ipc => {
   }
 };
 
-const isElectron = platform === Electron$1;
-
 // TODO use handleIncomingIpc function
 const create$x = async ({
   port,

package/package.json

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