@lvce-editor/panel-worker 2.8.0 → 2.10.0

package/dist/panelWorkerMain.js

@@ -423,6 +423,100 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
   listen: listen$6,
   wrap: wrap$e
 };
+const addListener = (emitter, type, callback) => {
+  if ('addEventListener' in emitter) {
+    emitter.addEventListener(type, callback);
+  } else {
+    emitter.on(type, callback);
+  }
+};
+const removeListener = (emitter, type, callback) => {
+  if ('removeEventListener' in emitter) {
+    emitter.removeEventListener(type, callback);
+  } else {
+    emitter.off(type, callback);
+  }
+};
+const getFirstEvent = (eventEmitter, eventMap) => {
+  const {
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  const listenerMap = Object.create(null);
+  const cleanup = value => {
+    for (const event of Object.keys(eventMap)) {
+      removeListener(eventEmitter, event, listenerMap[event]);
+    }
+    resolve(value);
+  };
+  for (const [event, type] of Object.entries(eventMap)) {
+    const listener = event => {
+      cleanup({
+        event,
+        type
+      });
+    };
+    addListener(eventEmitter, event, listener);
+    listenerMap[event] = listener;
+  }
+  return promise;
+};
+const Message$1 = 3;
+const create$5$1 = async ({
+  isMessagePortOpen,
+  messagePort
+}) => {
+  if (!isMessagePort(messagePort)) {
+    throw new IpcError('port must be of type MessagePort');
+  }
+  if (isMessagePortOpen) {
+    return messagePort;
+  }
+  const eventPromise = getFirstEvent(messagePort, {
+    message: Message$1
+  });
+  messagePort.start();
+  const {
+    event,
+    type
+  } = await eventPromise;
+  if (type !== Message$1) {
+    throw new IpcError('Failed to wait for ipc message');
+  }
+  if (event.data !== readyMessage) {
+    throw new IpcError('unexpected first message');
+  }
+  return messagePort;
+};
+const signal$1 = messagePort => {
+  messagePort.start();
+};
+class IpcParentWithMessagePort extends Ipc {
+  getData = getData$2;
+  send(message) {
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    this._rawIpc.postMessage(message, transfer);
+  }
+  dispose() {
+    this._rawIpc.close();
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
+  onClose(callback) {}
+}
+const wrap$5 = messagePort => {
+  return new IpcParentWithMessagePort(messagePort);
+};
+const IpcParentWithMessagePort$1 = {
+  __proto__: null,
+  create: create$5$1,
+  signal: signal$1,
+  wrap: wrap$5
+};
 
 class CommandNotFoundError extends Error {
   constructor(command) {
@@ -700,7 +794,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$7 = (message, result) => {
+const create$8 = (message, result) => {
   return {
     id: message.id,
     jsonrpc: Two$1,
@@ -709,7 +803,7 @@ const create$7 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$7(message, resultProperty);
+  return create$8(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -803,7 +897,7 @@ const handleJsonRpcMessage = async (...args) => {
 
 const Two = '2.0';
 
-const create$6 = (method, params) => {
+const create$7 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -811,7 +905,7 @@ const create$6 = (method, params) => {
   };
 };
 
-const create$5 = (id, method, params) => {
+const create$6 = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -822,12 +916,12 @@ const create$5 = (id, method, params) => {
 };
 
 let id = 0;
-const create$4 = () => {
+const create$5 = () => {
   return ++id;
 };
 
 const registerPromise = map => {
-  const id = create$4();
+  const id = create$5();
   const {
     promise,
     resolve
@@ -844,7 +938,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$5(id, method, params);
+  const message = create$6(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -880,7 +974,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$6(method, params);
+      const message = create$7(method, params);
       ipc.send(message);
     }
   };
@@ -920,6 +1014,24 @@ const listen$1 = async (module, options) => {
   return ipc;
 };
 
+const create$4 = async ({
+  commandMap,
+  isMessagePortOpen = true,
+  messagePort
+}) => {
+  // TODO create a commandMap per rpc instance
+  register(commandMap);
+  const rawIpc = await IpcParentWithMessagePort$1.create({
+    isMessagePortOpen,
+    messagePort
+  });
+  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
+  handleIpc(ipc);
+  const rpc = createRpc(ipc);
+  messagePort.start();
+  return rpc;
+};
+
 const create$3 = async ({
   commandMap
 }) => {
@@ -952,7 +1064,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$2 = (id, rpc) => {
+const set$4 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -985,7 +1097,7 @@ const create$2 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$2(rpcId, mockRpc);
+      set$4(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -994,7 +1106,7 @@ const create$2 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$2(rpcId, rpc);
+      set$4(rpcId, rpc);
     }
   };
 };
@@ -1174,13 +1286,19 @@ const VirtualDomElements = {
 
 const TargetName = 'event.target.name';
 
+const RendererProcess = 1670;
 const RendererWorker = 1;
 
 const SetPatches = 'Viewlet.setPatches';
 
 const {
-  invoke,
-  set: set$1
+  invoke: invoke$2,
+  set: set$3
+} = create$2(RendererProcess);
+
+const {
+  invoke: invoke$1,
+  set: set$2
 } = create$2(RendererWorker);
 
 const toCommandId = key => {
@@ -1433,7 +1551,7 @@ const {
   get,
   getCommandIds,
   registerCommands,
-  set,
+  set: set$1,
   wrapCommand,
   wrapGetter
 } = create$1();
@@ -1460,7 +1578,7 @@ const create = (uid, uri, x, y, width, height, platform, assetDir) => {
     x,
     y
   };
-  set(uid, state, state);
+  set$1(uid, state, state);
 };
 
 const isEqual$2 = (oldState, newState) => {
@@ -1503,6 +1621,39 @@ const diff2 = uid => {
   return result;
 };
 
+const state = {
+  connected: false
+};
+const isConnected = () => {
+  const {
+    connected
+  } = state;
+  return connected;
+};
+const invoke = (method, ...params) => invoke$2(method, ...params);
+const set = rpc => {
+  set$3(rpc);
+  state.connected = true;
+};
+
+const handleMessagePort = async (port, viewletCommandMap) => {
+  const executeViewletCommand = async (uid, command, ...args) => {
+    const fn = viewletCommandMap[`Panel.${command}`];
+    if (typeof fn !== 'function') {
+      throw new TypeError(`Viewlet command not found: ${command}`);
+    }
+    await fn(uid, ...args);
+    await invoke$1('Viewlet.requestRender', uid);
+  };
+  const rpc = await create$4({
+    commandMap: {
+      'Viewlet.executeViewletCommand': executeViewletCommand
+    },
+    messagePort: port
+  });
+  set(rpc);
+};
+
 const setBadgeCount = (state, id, count) => {
   const {
     badgeCounts
@@ -1534,16 +1685,16 @@ const handleProblemsSummaryChange = (state, summary) => {
 };
 
 const handleClickClose = async state => {
-  await invoke('Layout.hidePanel');
+  await invoke$1('Layout.hidePanel');
   return state;
 };
 
 const handleClickMaximize = async state => {
-  await invoke('Layout.maximizePanel');
+  await invoke$1('Layout.maximizePanel');
   return state;
 };
 const handleClickUnmaximize = async state => {
-  await invoke('Layout.unmaximizePanel');
+  await invoke$1('Layout.unmaximizePanel');
   return state;
 };
 
@@ -1574,7 +1725,7 @@ const handleFilterInput = async (state, value) => {
     currentViewletId
   } = state;
   const fullCommand = `${currentViewletId}.handleFilterInput`;
-  await invoke(fullCommand, value);
+  await invoke$1(fullCommand, value);
   return state;
 };
 
@@ -1591,7 +1742,7 @@ const getSavedViewletId = savedState => {
 };
 
 const createViewlet = async (viewletModuleId, editorUid, tabId, actionsUid, bounds, uri, focus) => {
-  await invoke('Layout.createPanelViewlet', viewletModuleId, editorUid, tabId, actionsUid, bounds, uri, focus);
+  await invoke$1('Layout.createPanelViewlet', viewletModuleId, editorUid, tabId, actionsUid, bounds, uri, focus);
 };
 
 const getContentDimensions = dimensions => {
@@ -1620,7 +1771,7 @@ const saveViewletState = async (childUid, viewletId) => {
     return;
   }
   try {
-    await invoke(command, childUid, viewletId);
+    await invoke$1(command, childUid, viewletId);
   } catch (error) {
     if (!isCommandNotFoundError(error)) {
       throw error;
@@ -2201,9 +2352,14 @@ const render2 = (uid, diffResult) => {
     newState,
     oldState
   } = get(uid);
-  set(uid, newState, newState);
+  set$1(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
-  return commands;
+  if (!isConnected()) return commands;
+  return renderDirect(uid, commands);
+};
+const renderDirect = async (uid, commands) => {
+  const transactionId = await invoke('Viewlet.queueCommands', uid, commands);
+  return [['Viewlet.commitPending', uid, transactionId]];
 };
 
 const renderEventListeners = () => {
@@ -2241,7 +2397,7 @@ const resize = async (state, dimensions) => {
     };
   }
   // @ts-ignore
-  await invoke('Viewlet.resize', childUid, dimensions);
+  await invoke$1('Viewlet.resize', childUid, dimensions);
   return {
     ...newState
   };
@@ -2272,6 +2428,7 @@ const selectName = async (state, name) => {
   return selectIndex(state, index);
 };
 
+const handleDirectMessagePort = port => handleMessagePort(port, commandMap);
 const commandMap = {
   'Panel.create': create,
   'Panel.diff2': diff2,
@@ -2281,6 +2438,7 @@ const commandMap = {
   'Panel.handleClickMaximize': wrapCommand(handleClickMaximize),
   'Panel.handleClickUnmaximize': wrapCommand(handleClickUnmaximize),
   'Panel.handleFilterInput': wrapCommand(handleFilterInput),
+  'Panel.handleMessagePort': handleDirectMessagePort,
   'Panel.handlePanelLayoutChanged': wrapCommand(handlePanelLayoutChanged),
   'Panel.handleProblemsSummaryChange': wrapCommand(handleProblemsSummaryChange),
   'Panel.loadContent': wrapCommand(loadContent),
@@ -2302,7 +2460,7 @@ const listen = async () => {
   const rpc = await create$3({
     commandMap: commandMap
   });
-  set$1(rpc);
+  set$2(rpc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/panel-worker",
-  "version": "2.8.0",
+  "version": "2.10.0",
   "description": "Panel Worker",
   "repository": {
     "type": "git",