@lvce-editor/update-worker 1.7.0 → 1.9.0

package/README.md

@@ -1,6 +1,6 @@
 # Update Worker
 
-Webworker for the menu functionality in LVCE Editor.
+Webworker for the update functionality in LVCE Editor.
 
 ## Contributing
 

package/dist/updateWorkerMain.js

@@ -889,20 +889,16 @@ const i18nString = (key, placeholders = emptyObject) => {
   return key.replaceAll(RE_PLACEHOLDER, replacer);
 };
 
-/**
- * @enum {string}
- */
-const UiStrings = {
-  DoYouWantToUpdate: 'Do you want to update to version {PH1}?',
-  DoYouWantToRestart: 'The Update has been downloaded. Do you want to restart now?'
-};
+const DoYouWantToUpdate = 'Do you want to update to version {PH1}?';
+const DoYouWantToRestart = 'The Update has been downloaded. Do you want to restart now?';
+
 const promptMessage = version => {
-  return i18nString(UiStrings.DoYouWantToUpdate, {
+  return i18nString(DoYouWantToUpdate, {
     PH1: version
   });
 };
 const promptRestart = () => {
-  return i18nString(UiStrings.DoYouWantToRestart);
+  return i18nString(DoYouWantToRestart);
 };
 
 const confirmPrompt = async message => {
@@ -1021,8 +1017,8 @@ const getLatestReleaseVersion = async repository => {
   }
 };
 
-const getUpdateUrl = (repository, version) => {
-  const fileName = `Lvce-Setup-v${version}-x64.exe`;
+const getUpdateUrl = (repository, fileNameTemplate, version) => {
+  const fileName = fileNameTemplate.replace('${version}', version);
   const url = `https://github.com/${repository}/releases/download/v${version}/${fileName}`;
   return url;
 };
@@ -1083,7 +1079,7 @@ const shouldUpdate = async (updateSetting, version) => {
   return shouldUpdate;
 };
 
-const checkForUpdates = async (updateSetting, repository) => {
+const doCheckForUpdates = async (updateSetting, repository, fileNameTemplate, bucketName, cacheName) => {
   try {
     if (!isOnline()) {
       return {
@@ -1091,8 +1087,6 @@ const checkForUpdates = async (updateSetting, repository) => {
         error: undefined
       };
     }
-    const bucketName = 'electron-updates';
-    const cacheName = 'electron-updates';
     const info = await getLatestReleaseVersion(repository);
     if (!info || !info.version) {
       return {
@@ -1107,7 +1101,7 @@ const checkForUpdates = async (updateSetting, repository) => {
         error: undefined
       };
     }
-    const downloadUrl = getUpdateUrl(repository, info.version);
+    const downloadUrl = getUpdateUrl(repository, fileNameTemplate, info.version);
 
     // @ts-ignore
     await invoke('Layout.setUpdateState', {
@@ -1150,6 +1144,31 @@ const checkForUpdates = async (updateSetting, repository) => {
   }
 };
 
+const requestLock = async (lockName, callback) => {
+  const result = await navigator.locks.request(lockName, {
+    ifAvailable: true
+  }, callback);
+  return result;
+};
+
+const checkForUpdates = async (updateSetting, repository) => {
+  const lockName = 'electron-updates';
+  const bucketName = 'electron-updates';
+  const cacheName = 'electron-updates';
+  const fileNameTemplate = `Lvce-Setup-v\${version}-x64.exe`;
+  const result = await requestLock(lockName, async lock => {
+    if (!lock) {
+      return {
+        updated: false,
+        error: undefined
+      };
+    }
+    const result = await doCheckForUpdates(updateSetting, repository, fileNameTemplate, bucketName, cacheName);
+    return result;
+  });
+  return result;
+};
+
 const commandMap = {
   'Update.downloadToCache': downloadUpdateToCache,
   'Update.checkForUpdates': checkForUpdates

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/update-worker",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "Update Worker",
   "repository": {
     "type": "git",