@lvce-editor/activity-bar-worker 4.5.0 → 5.1.0

package/dist/activityBarWorkerMain.js

@@ -411,6 +411,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) {
@@ -647,7 +741,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$a = (message, result) => {
   return {
     id: message.id,
     jsonrpc: Two$1,
@@ -656,7 +750,7 @@ const create$7 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$7(message, resultProperty);
+  return create$a(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -750,7 +844,7 @@ const handleJsonRpcMessage = async (...args) => {
 
 const Two = '2.0';
 
-const create$6 = (method, params) => {
+const create$9 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -758,7 +852,7 @@ const create$6 = (method, params) => {
   };
 };
 
-const create$5 = (id, method, params) => {
+const create$8 = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -769,12 +863,12 @@ const create$5 = (id, method, params) => {
 };
 
 let id = 0;
-const create$4 = () => {
+const create$7 = () => {
   return ++id;
 };
 
 const registerPromise = map => {
-  const id = create$4();
+  const id = create$7();
   const {
     promise,
     resolve
@@ -791,7 +885,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$5(id, method, params);
+  const message = create$8(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -827,7 +921,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$6(method, params);
+      const message = create$9(method, params);
       ipc.send(message);
     }
   };
@@ -867,6 +961,83 @@ const listen$1 = async (module, options) => {
   return ipc;
 };
 
+const create$6 = 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$5 = async ({
+  commandMap,
+  isMessagePortOpen,
+  send
+}) => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  await send(port1);
+  return create$6({
+    commandMap,
+    isMessagePortOpen,
+    messagePort: port2
+  });
+};
+
+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$4 = async ({
+  commandMap,
+  isMessagePortOpen,
+  send
+}) => {
+  return createSharedLazyRpc(() => {
+    return create$5({
+      commandMap,
+      isMessagePortOpen,
+      send
+    });
+  });
+};
+
 const create$3 = async ({
   commandMap
 }) => {
@@ -899,7 +1070,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$2 = (id, rpc) => {
+const set$3 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -932,7 +1103,7 @@ const create$2 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$2(rpcId, mockRpc);
+      set$3(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -941,11 +1112,16 @@ const create$2 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$2(rpcId, rpc);
+      set$3(rpcId, rpc);
     }
   };
 };
 
+const {
+  invoke: invoke$1,
+  set: set$2
+} = create$2(6010);
+
 const Button$2 = 'button';
 const None$1 = 'none';
 const Tab$1 = 'tab';
@@ -996,6 +1172,7 @@ const FocusExplorer = 13;
 
 const {
   invoke,
+  invokeAndTransfer,
   set: set$1
 } = create$2(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
@@ -1005,6 +1182,10 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(y);
   await invoke('ContextMenu.show2', uid, menuId, x, y, args);
 };
+const sendMessagePortToAuthWorker = async (port, rpcId) => {
+  const command = 'HandleMessagePort.handleMessagePort';
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToAuthWorker', port, command, rpcId);
+};
 
 const toCommandId = key => {
   const dotIndex = key.indexOf('.');
@@ -1628,33 +1809,110 @@ const handleClickAdditionalViews = async (state, eventX, eventY, viewletId) => {
   return state;
 };
 
-const show = async (sideBarVisible, id) => {
-  if (sideBarVisible) {
-    await invoke('SideBar.show', id);
-  } else {
-    // @ts-ignore
-    await invoke('Layout.showSideBar', /* id */id);
+const findIndex = (activityBarItems, id) => {
+  for (let i = 0; i < activityBarItems.length; i++) {
+    if (activityBarItems[i].id === id) {
+      return i;
+    }
+  }
+  return -1;
+};
+
+const Account = 'Account';
+const DebugAlt2 = 'DebugAlt2';
+const Extensions$1 = 'Extensions';
+const Files = 'Files';
+const Search$1 = 'Search';
+const SettingsGear = 'SettingsGear';
+const SourceControl$1 = 'SourceControl';
+const Ellipsis = 'Ellipsis';
+
+const getFilteredActivityBarItems = (items, height, itemHeight) => {
+  const numberOfVisibleItems = getNumberOfVisibleItems({
+    height,
+    itemHeight
+  });
+  if (numberOfVisibleItems >= items.length) {
+    return items;
   }
+  const showMoreItem = {
+    flags: Button,
+    icon: Ellipsis,
+    id: 'Additional Views',
+    keyShortcuts: '',
+    title: additionalViews()
+  };
+  return [...items.slice(0, numberOfVisibleItems - 2), showMoreItem, items.at(-1)];
 };
-const hide = async () => {
-  await invoke('Layout.hideSideBar');
+
+const setFlag = (item, flag, enabled) => {
+  return {
+    ...item,
+    flags: enabled ? item.flags | flag : item.flags & ~flag
+  };
 };
 
+const markSelected = (items, selectedIndex) => {
+  return items.map((item, index) => {
+    const isSelected = index === selectedIndex;
+    return setFlag(item, Selected, isSelected);
+  });
+};
+
+const toggle = async id => {
+  await invoke('Layout.toggleSideBarView', id);
+};
+
+const getSideBarChange = (sideBarVisible, currentViewletId, viewletId) => {
+  if (sideBarVisible) {
+    if (currentViewletId === viewletId) {
+      return {
+        type: 'hide',
+        viewletId
+      };
+    }
+    return {
+      type: 'switch',
+      viewletId
+    };
+  }
+  return {
+    type: 'show',
+    viewletId
+  };
+};
 const handleClickOther = async (state, viewletId) => {
   const {
+    activityBarItems,
     currentViewletId,
+    height,
+    itemHeight,
     sideBarVisible
   } = state;
-  if (sideBarVisible) {
-    if (currentViewletId === viewletId) {
-      await hide();
-      return state;
-    }
-    await show(sideBarVisible, viewletId);
-    return state;
+  const sideBarChange = getSideBarChange(sideBarVisible, currentViewletId, viewletId);
+  await toggle(viewletId);
+  if (sideBarChange.type === 'hide') {
+    const newActivityBarItems = markSelected(activityBarItems, -1);
+    const filteredItems = getFilteredActivityBarItems(newActivityBarItems, height, itemHeight);
+    return {
+      ...state,
+      activityBarItems: newActivityBarItems,
+      filteredItems,
+      selectedIndex: -1,
+      sideBarVisible: false
+    };
   }
-  await show(sideBarVisible, currentViewletId);
-  return state;
+  const selectedIndex = findIndex(activityBarItems, viewletId);
+  const newActivityBarItems = markSelected(activityBarItems, selectedIndex);
+  const filteredItems = getFilteredActivityBarItems(newActivityBarItems, height, itemHeight);
+  return {
+    ...state,
+    activityBarItems: newActivityBarItems,
+    currentViewletId: viewletId,
+    filteredItems,
+    selectedIndex,
+    sideBarVisible: true
+  };
 };
 
 const handleClickSettings = async (state, eventX, eventY, viewletId) => {
@@ -1703,6 +1961,14 @@ const handleClick = async (state, button, eventX, eventY) => {
 };
 
 const handleClickSignIn = async state => {
+  const {
+    platform
+  } = state;
+  const backendUrl = await invoke('Layout.getBackendUrl');
+  await invoke$1('Auth.login', {
+    backendUrl,
+    platform
+  });
   return state;
 };
 
@@ -1727,33 +1993,6 @@ const handleFocus = state => {
   };
 };
 
-const Account = 'Account';
-const DebugAlt2 = 'DebugAlt2';
-const Extensions$1 = 'Extensions';
-const Files = 'Files';
-const Search$1 = 'Search';
-const SettingsGear = 'SettingsGear';
-const SourceControl$1 = 'SourceControl';
-const Ellipsis = 'Ellipsis';
-
-const getFilteredActivityBarItems = (items, height, itemHeight) => {
-  const numberOfVisibleItems = getNumberOfVisibleItems({
-    height,
-    itemHeight
-  });
-  if (numberOfVisibleItems >= items.length) {
-    return items;
-  }
-  const showMoreItem = {
-    flags: Button,
-    icon: Ellipsis,
-    id: 'Additional Views',
-    keyShortcuts: '',
-    title: additionalViews()
-  };
-  return [...items.slice(0, numberOfVisibleItems - 2), showMoreItem, items.at(-1)];
-};
-
 const handleResize = (state, dimensions) => {
   const {
     activityBarItems,
@@ -1858,20 +2097,6 @@ const getSideBarPosition = async () => {
   }
 };
 
-const setFlag = (item, flag, enabled) => {
-  return {
-    ...item,
-    flags: enabled ? item.flags | flag : item.flags & ~flag
-  };
-};
-
-const markSelected = (items, selectedIndex) => {
-  return items.map((item, index) => {
-    const isSelected = index === selectedIndex;
-    return setFlag(item, Selected, isSelected);
-  });
-};
-
 const handleSettingsChanged = async state => {
   const {
     height,
@@ -1895,37 +2120,6 @@ const handleSettingsChanged = async state => {
   };
 };
 
-const clearItem = item => {
-  const withoutSelected = setFlag(item, Selected, false);
-  return setFlag(withoutSelected, Focused, false);
-};
-const handleSideBarHidden = state => {
-  const {
-    activityBarItems,
-    height,
-    itemHeight
-  } = state;
-  const itemsCleared = activityBarItems.map(clearItem);
-  const filteredItems = getFilteredActivityBarItems(itemsCleared, height, itemHeight);
-  return {
-    ...state,
-    activityBarItems: itemsCleared,
-    filteredItems,
-    focusedIndex: -1,
-    selectedIndex: -1,
-    sideBarVisible: false
-  };
-};
-
-const findIndex = (activityBarItems, id) => {
-  for (let i = 0; i < activityBarItems.length; i++) {
-    if (activityBarItems[i].id === id) {
-      return i;
-    }
-  }
-  return -1;
-};
-
 const getSideBarVisible = async () => {
   try {
     const visible = await invoke('Layout.getSideBarVisible');
@@ -1935,22 +2129,38 @@ const getSideBarVisible = async () => {
   }
 };
 
-const handleSideBarViewletChange = async (state, id, ...args) => {
+const clearItem = item => {
+  const withoutSelected = setFlag(item, Selected, false);
+  return setFlag(withoutSelected, Focused, false);
+};
+const handleSideBarStateChange = async (state, id = state.currentViewletId, sideBarVisibleOverride) => {
   const {
     activityBarItems,
     height,
     itemHeight
   } = state;
-  const sideBarVisible = await getSideBarVisible();
-  const index = findIndex(activityBarItems, id);
-  const newActivityBarItems = markSelected(activityBarItems, index);
+  const sideBarVisible = typeof sideBarVisibleOverride === 'boolean' ? sideBarVisibleOverride : await getSideBarVisible();
+  if (!sideBarVisible) {
+    const itemsCleared = activityBarItems.map(clearItem);
+    const filteredItems = getFilteredActivityBarItems(itemsCleared, height, itemHeight);
+    return {
+      ...state,
+      activityBarItems: itemsCleared,
+      filteredItems,
+      focusedIndex: -1,
+      selectedIndex: -1,
+      sideBarVisible: false
+    };
+  }
+  const selectedIndex = findIndex(activityBarItems, id);
+  const newActivityBarItems = markSelected(activityBarItems, selectedIndex);
   const filteredItems = getFilteredActivityBarItems(newActivityBarItems, height, itemHeight);
   return {
     ...state,
     activityBarItems: newActivityBarItems,
     currentViewletId: id,
     filteredItems,
-    selectedIndex: index,
+    selectedIndex,
     sideBarVisible
   };
 };
@@ -2004,13 +2214,14 @@ const getActiveView = async () => {
 
 const loadContent = async state => {
   const {
+    accountEnabled,
     height,
     itemHeight
   } = state;
-  const [accountEnabled, activeView, sideBarVisible, sidebarLocation] = await Promise.all([getAccountEnabled(state.accountEnabled), getActiveView(), getSideBarVisible(), getSideBarPosition()]);
+  const [accountEnabledNew, activeView, sideBarVisible, sidebarLocation] = await Promise.all([getAccountEnabled(accountEnabled), getActiveView(), getSideBarVisible(), getSideBarPosition()]);
   const newState = {
     ...state,
-    accountEnabled
+    accountEnabled: accountEnabledNew
   };
   const items = getActivityBarItems(newState);
   const index = items.findIndex(item => item.id === activeView);
@@ -2651,12 +2862,7 @@ const renderEventListeners = () => {
 };
 
 const saveState = state => {
-  const {
-    currentViewletId
-  } = state;
-  return {
-    currentViewletId
-  };
+  return {};
 };
 
 const setAccountEnabled = (state, enabled) => {
@@ -2729,8 +2935,7 @@ const commandMap = {
   'ActivityBar.handleContextMenu': wrapCommand(handleContextMenu),
   'ActivityBar.handleFocus': wrapCommand(handleFocus),
   'ActivityBar.handleSettingsChanged': wrapCommand(handleSettingsChanged),
-  'ActivityBar.handleSideBarHidden': wrapCommand(handleSideBarHidden),
-  'ActivityBar.handleSideBarViewletChange': wrapCommand(handleSideBarViewletChange),
+  'ActivityBar.handleSideBarStateChange': wrapCommand(handleSideBarStateChange),
   'ActivityBar.handleUpdateStateChange': wrapCommand(handleUpdateStateChange),
   'ActivityBar.loadContent': wrapCommand(loadContent),
   'ActivityBar.render2': render2,
@@ -2743,12 +2948,25 @@ const commandMap = {
   'ActivityBar.toggleActivityBarItem': wrapCommand(toggleActivityBarItem)
 };
 
+const send = async port => {
+  // @ts-ignore
+  await sendMessagePortToAuthWorker(port);
+};
+const initializeAuthWorker = async () => {
+  const rpc = await create$4({
+    commandMap: {},
+    send
+  });
+  set$2(rpc);
+};
+
 const listen = async () => {
   registerCommands(commandMap);
   const rpc = await create$3({
     commandMap: commandMap
   });
   set$1(rpc);
+  await initializeAuthWorker();
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/activity-bar-worker",
-  "version": "4.5.0",
+  "version": "5.1.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",