@lvce-editor/about-view 7.8.0 → 7.10.0

package/dist/aboutWorkerMain.js

@@ -3,9 +3,18 @@ const toCommandId = key => {
   return key.slice(dotIndex + 1);
 };
 const create$a = () => {
+  const commandQueues = new Map();
+  const generations = Object.create(null);
   const states = Object.create(null);
   const commandMapRef = {};
-  const updateState = (uid, updater) => {
+  const getGeneration = uid => generations[uid] || 0;
+  const isCurrentGeneration = (uid, generation) => {
+    return states[uid] !== undefined && getGeneration(uid) === generation;
+  };
+  const updateState = (uid, generation, fallbackState, updater) => {
+    if (!isCurrentGeneration(uid, generation)) {
+      return Promise.resolve(fallbackState);
+    }
     const current = states[uid];
     const updatedState = updater(current.newState);
     if (updatedState !== current.newState) {
@@ -17,8 +26,44 @@ const create$a = () => {
     }
     return Promise.resolve(updatedState);
   };
+  const createAsyncCommandContext = (uid, generation) => {
+    let latestState = states[uid].newState;
+    return {
+      getState: () => {
+        if (isCurrentGeneration(uid, generation)) {
+          latestState = states[uid].newState;
+        }
+        return latestState;
+      },
+      updateState: async updater => {
+        latestState = await updateState(uid, generation, latestState, updater);
+        return latestState;
+      }
+    };
+  };
+  const enqueueCommand = async (uid, command) => {
+    const previous = commandQueues.get(uid) || Promise.resolve();
+    const run = async () => {
+      try {
+        await previous;
+      } catch {
+        // The previous caller receives its error; later commands must still run.
+      }
+      await command();
+    };
+    const current = run();
+    commandQueues.set(uid, current);
+    try {
+      await current;
+    } finally {
+      if (commandQueues.get(uid) === current) {
+        commandQueues.delete(uid);
+      }
+    }
+  };
   return {
     clear() {
+      commandQueues.clear();
       for (const key of Object.keys(states)) {
         delete states[key];
       }
@@ -38,6 +83,7 @@ const create$a = () => {
       return diffResult;
     },
     dispose(uid) {
+      commandQueues.delete(uid);
       delete states[uid];
     },
     get(uid) {
@@ -55,6 +101,10 @@ const create$a = () => {
       Object.assign(commandMapRef, commandMap);
     },
     set(uid, oldState, newState, scheduledState) {
+      const current = states[uid];
+      if (!current || oldState === newState && newState !== current.newState) {
+        generations[uid] = getGeneration(uid) + 1;
+      }
       states[uid] = {
         newState,
         oldState,
@@ -63,16 +113,15 @@ const create$a = () => {
     },
     wrapAsyncCommand(fn) {
       const wrapped = async (uid, ...args) => {
-        const context = {
-          getState: () => states[uid].newState,
-          updateState: updater => updateState(uid, updater)
-        };
+        const generation = getGeneration(uid);
+        const context = createAsyncCommandContext(uid, generation);
         await fn(context, ...args);
       };
       return wrapped;
     },
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
+        const generation = getGeneration(uid);
         const {
           newState,
           oldState
@@ -81,6 +130,9 @@ const create$a = () => {
         if (oldState === newerState || newState === newerState) {
           return;
         }
+        if (!isCurrentGeneration(uid, generation)) {
+          return;
+        }
         const latestOld = states[uid];
         const latestNew = {
           ...latestOld.newState,
@@ -105,6 +157,7 @@ const create$a = () => {
     },
     wrapLoadContent(fn) {
       const wrapped = async (uid, ...args) => {
+        const generation = getGeneration(uid);
         const {
           newState,
           oldState
@@ -119,6 +172,11 @@ const create$a = () => {
             error
           };
         }
+        if (!isCurrentGeneration(uid, generation)) {
+          return {
+            error
+          };
+        }
         const latestOld = states[uid];
         const latestNew = {
           ...latestOld.newState,
@@ -134,6 +192,51 @@ const create$a = () => {
         };
       };
       return wrapped;
+    },
+    wrapSerialAsyncCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        await enqueueCommand(uid, async () => {
+          if (!states[uid]) {
+            return;
+          }
+          const generation = getGeneration(uid);
+          const context = createAsyncCommandContext(uid, generation);
+          await fn(context, ...args);
+        });
+      };
+      return wrapped;
+    },
+    wrapSerialCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        await enqueueCommand(uid, async () => {
+          if (!states[uid]) {
+            return;
+          }
+          const generation = getGeneration(uid);
+          const {
+            newState,
+            oldState
+          } = states[uid];
+          const newerState = await fn(newState, ...args);
+          if (oldState === newerState || newState === newerState) {
+            return;
+          }
+          if (!isCurrentGeneration(uid, generation)) {
+            return;
+          }
+          const latestOld = states[uid];
+          const latestNew = {
+            ...latestOld.newState,
+            ...newerState
+          };
+          states[uid] = {
+            newState: latestNew,
+            oldState: latestOld.oldState,
+            scheduledState: latestNew
+          };
+        });
+      };
+      return wrapped;
     }
   };
 };
@@ -251,7 +354,7 @@ const focusPrevious = state => {
 };
 
 const Audio = 0;
-const Button$2 = 1;
+const Button$1 = 1;
 const Col = 2;
 const ColGroup = 3;
 const Div = 4;
@@ -342,7 +445,7 @@ const VirtualDomElements = {
   Audio,
   BlockQuote,
   Br,
-  Button: Button$2,
+  Button: Button$1,
   Canvas,
   Circle,
   Cite,
@@ -427,7 +530,7 @@ const Escape = 8;
 const Shift = 1 << 10 >>> 0;
 
 const FileSystemWorker = 209;
-const RendererWorker = 1;
+const RendererWorker$1 = 1;
 
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
@@ -1006,7 +1109,10 @@ const constructError = (message, type, name) => {
   if (ErrorConstructor === Error) {
     const error = new Error(message);
     if (name && name !== 'VError') {
-      error.name = name;
+      Object.defineProperty(error, 'name', {
+        configurable: true,
+        value: name
+      });
     }
     return error;
   }
@@ -1037,31 +1143,45 @@ const getParentStack = error => {
 };
 const MethodNotFound = -32601;
 const Custom = -32001;
+const setStack = (error, stack) => {
+  const descriptor = Object.getOwnPropertyDescriptor(error, 'stack');
+  if (descriptor) {
+    if (!descriptor.configurable && !descriptor.writable) {
+      return;
+    }
+    if (!descriptor.configurable && descriptor.writable) {
+      error.stack = stack;
+      return;
+    }
+  }
+  Object.defineProperty(error, 'stack', {
+    configurable: true,
+    value: stack,
+    writable: true
+  });
+};
 const restoreExistingError = (error, currentStack) => {
   if (typeof error.stack === 'string') {
-    error.stack = error.stack + NewLine$1 + currentStack;
+    setStack(error, `${error.stack}${NewLine$1}${currentStack}`);
   }
   return error;
 };
 const restoreMethodNotFoundError = (error, currentStack) => {
   const restoredError = new JsonRpcError(error.message);
   const parentStack = getParentStack(error);
-  restoredError.stack = parentStack + NewLine$1 + currentStack;
+  setStack(restoredError, `${parentStack}${NewLine$1}${currentStack}`);
   return restoredError;
 };
 const restoreStackFromData = (restoredError, error, currentStack) => {
   if (error.data.stack && error.data.type && error.message) {
-    restoredError.stack = error.data.type + ': ' + error.message + NewLine$1 + error.data.stack + NewLine$1 + currentStack;
+    setStack(restoredError, `${error.data.type}: ${error.message}${NewLine$1}${error.data.stack}${NewLine$1}${currentStack}`);
     return;
   }
   if (error.data.stack) {
-    restoredError.stack = error.data.stack;
+    setStack(restoredError, error.data.stack);
   }
 };
 const applyDataProperties = (restoredError, error) => {
-  if (!error.data) {
-    return;
-  }
   restoreStackFromData(restoredError, error, getCurrentStack());
   if (error.data.codeFrame) {
     // @ts-ignore
@@ -1082,7 +1202,7 @@ const applyDirectProperties = (restoredError, error) => {
     const indexNewLine = getNewLineIndex(lowerStack);
     const parentStack = getParentStack(error);
     // @ts-ignore
-    restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
+    setStack(restoredError, `${parentStack}${lowerStack.slice(indexNewLine)}`);
   }
   if (error.codeFrame) {
     // @ts-ignore
@@ -1579,7 +1699,7 @@ const {
   invoke,
   invokeAndTransfer,
   set
-} = create(RendererWorker);
+} = create(RendererWorker$1);
 const getElectronVersion$1 = async () => {
   return invoke('Process.getElectronVersion');
 };
@@ -1615,7 +1735,27 @@ const getWindowId$1 = async () => {
   return invoke('GetWindowId.getWindowId');
 };
 
-const closeWidget = closeWidget$1;
+const RendererWorker = {
+  __proto__: null,
+  closeWidget: closeWidget$1,
+  getChromeVersion: getChromeVersion$1,
+  getElectronVersion: getElectronVersion$1,
+  getNodeVersion: getNodeVersion$1,
+  getV8Version: getV8Version$1,
+  getWindowId: getWindowId$1,
+  invoke,
+  invokeAndTransfer,
+  openWidget,
+  sendMessagePortToFileSystemWorker,
+  set,
+  setFocus,
+  showMessageBox: showMessageBox$1,
+  writeClipBoardText
+};
+
+const {
+  closeWidget
+} = RendererWorker;
 
 const About$1 = 'About';
 
@@ -1678,7 +1818,10 @@ const handleFocusIn = async context => {
   // TODO remove side effect
   await setFocus(FocusAbout);
   await context.updateState(state => {
-    if (state.focusId) {
+    const {
+      focusId
+    } = state;
+    if (focusId) {
       return state;
     }
     return {
@@ -1997,7 +2140,6 @@ const getString = (config, key) => {
 const loadConfig = async () => {
   const configJsonPath = await getConfigJsonPath();
   // FileSystemWorker.readFile is a custom RPC that already returns a string.
-  // eslint-disable-next-line unicorn/consistent-json-file-read
   const content = await readFile(configJsonPath);
   const config = JSON.parse(content);
   return {
@@ -2055,7 +2197,7 @@ const createViewModel = state => {
   };
 };
 
-const Button$1 = 'Button';
+const Button = 'Button';
 const ButtonPrimary = 'ButtonPrimary';
 const ButtonSecondary = 'ButtonSecondary';
 const DialogButtonsRow = 'DialogButtonsRow';
@@ -2101,26 +2243,25 @@ const getAboutContentVirtualDom = lines => {
 
 const True = 'true';
 
-const Button = 'button';
 const Dialog = 'dialog';
 
 const getPrimaryButtonVirtualDom = (message, name) => {
   return [{
     childCount: 1,
-    className: mergeClassNames(Button$1, ButtonPrimary),
+    className: mergeClassNames(Button, ButtonPrimary),
     name,
     onClick: HandleClickButton,
-    type: Button$2
+    type: Button$1
   }, text(message)];
 };
 
 const getSecondaryButtonVirtualDom = (message, name) => {
   return [{
     childCount: 1,
-    className: mergeClassNames(Button$1, ButtonSecondary),
+    className: mergeClassNames(Button, ButtonSecondary),
     name,
     onClick: HandleClickButton,
-    type: Button$2
+    type: Button$1
   }, text(message)];
 };
 
@@ -2152,8 +2293,7 @@ const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copy
     childCount: 1,
     className: DialogClose,
     onClick: HandleClickClose,
-    role: Button,
-    type: Div
+    type: Button$1
   }, {
     childCount: 0,
     className: mergeClassNames(MaskIcon, MaskIconClose),
@@ -2225,7 +2365,7 @@ const renderFocus = (oldState, newState) => {
 };
 
 const renderFocusContext = (oldState, newState) => {
-  return ['Viewlet.setFocusContext', FocusAbout];
+  return ['Viewlet.setFocusContext', newState.uid, FocusAbout];
 };
 
 const getRenderer = diffType => {
@@ -2283,7 +2423,9 @@ const showAboutDefault = async () => {
   await openWidget(About$1);
 };
 
-const getWindowId = getWindowId$1;
+const {
+  getWindowId
+} = RendererWorker;
 
 const showMessageBox = async options => {
   const windowId = await getWindowId();
@@ -2296,10 +2438,18 @@ const showMessageBox = async options => {
 
 const Info = 'info';
 
-const getElectronVersion = getElectronVersion$1;
-const getNodeVersion = getNodeVersion$1;
-const getChromeVersion = getChromeVersion$1;
-const getV8Version = getV8Version$1;
+const {
+  getElectronVersion
+} = RendererWorker;
+const {
+  getNodeVersion
+} = RendererWorker;
+const {
+  getChromeVersion
+} = RendererWorker;
+const {
+  getV8Version
+} = RendererWorker;
 
 const getDetailString = async config => {
   const [electronVersion, nodeVersion, chromeVersion, v8Version] = await Promise.all([getElectronVersion(), getNodeVersion(), getChromeVersion(), getV8Version()]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/about-view",
-  "version": "7.8.0",
+  "version": "7.10.0",
   "description": "About View Worker",
   "keywords": [
     "about-view"