@lvce-editor/update-worker 1.1.0 → 1.3.0

package/dist/updateWorkerMain.js

@@ -903,6 +903,13 @@ const promptRestart = () => {
   return i18nString(UiStrings.DoYouWantToRestart);
 };
 
+// TODO avoid js prompt in elctron, since it crashes electron
+
+const confirmPrompt = async message => {
+  // TODO
+  return true;
+};
+
 const downloadUpdate = async updateUrl => {
   const response = await fetch(updateUrl, {
     priority: 'low',
@@ -914,21 +921,47 @@ const downloadUpdate = async updateUrl => {
   return response;
 };
 
-const getUpdateUrl = (repository, version) => {
-  const fileName = `Lvce-Setup-v${version}-x64.exe`;
-  const url = `https://github.com/${repository}/releases/download/v${version}/${fileName}`;
-  return url;
-};
-
-const putInCache = async (url, response) => {
-  const cache = await caches.open('electron-updates');
+const putInCache = async (url, response, cache) => {
   await cache.put(url, response);
 };
 
-const downloadUpdateToCache = async (repository, version) => {
-  const downloadUrl = getUpdateUrl(repository, version);
+const downloadUpdateToCache = async (downloadUrl, cache) => {
   const response = await downloadUpdate(downloadUrl);
-  await putInCache(downloadUrl, response);
+  await putInCache(downloadUrl, response, cache);
+};
+
+/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
+
+const cachedCaches = Object.create(null);
+const noopCache = {
+  async match() {
+    return undefined;
+  },
+  async put() {}
+};
+const supportsStorageBuckets = () => {
+  // @ts-ignore
+  return Boolean(navigator.storageBuckets);
+};
+const getCacheInternal = async (bucketName, cacheName) => {
+  if (!supportsStorageBuckets()) {
+    return noopCache;
+  }
+  const twoWeeks = 14 * 24 * 60 * 60 * 1000;
+  // @ts-ignore
+  const bucket = await navigator.storageBuckets.open(bucketName, {
+    quota: 1000 * 1024 * 1024,
+    // 1 GB
+    expires: Date.now() + twoWeeks
+  });
+  const cache = await bucket.caches.open(cacheName);
+  return cache;
+};
+const getCache = (bucketName, cacheName) => {
+  if (!(cacheName in cachedCaches)) {
+    cachedCaches[cacheName] = getCacheInternal(bucketName, cacheName);
+  }
+  return cachedCaches[cacheName];
 };
 
 const parseVersionFromUrl = (url, repository) => {
@@ -951,7 +984,7 @@ const getLatestReleaseVersion = async repository => {
     const finalUrlResponse = await fetch(url, {
       method: 'HEAD'
     });
-    const finalUrl = await finalUrlResponse.text();
+    const finalUrl = finalUrlResponse.url;
     const version = parseVersionFromUrl(finalUrl, repository);
     return {
       version
@@ -961,6 +994,12 @@ const getLatestReleaseVersion = async repository => {
   }
 };
 
+const getUpdateUrl = (repository, version) => {
+  const fileName = `Lvce-Setup-v${version}-x64.exe`;
+  const url = `https://github.com/${repository}/releases/download/v${version}/${fileName}`;
+  return url;
+};
+
 const exec = async (path, args, options) => {
   // TODO
   return {
@@ -994,42 +1033,72 @@ const installAndRestart = async downloadPath => {
   }
 };
 
+const isCached = async (url, cache) => {
+  const match = await cache.match(url);
+  if (match) {
+    return true;
+  }
+  return false;
+};
+
 const shouldUpdate = async (updateSetting, version) => {
   if (updateSetting && updateSetting !== 'none') {
     return true;
   }
-  const message = promptMessage(version);
-  const shouldUpdate = await invoke('ConfirmPrompt.prompt', message, {
-    confirmMessage: '',
-    title: ''
-  });
+  promptMessage(version);
+  const shouldUpdate = await confirmPrompt();
   return shouldUpdate;
 };
 
 const checkForUpdates = async (updateSetting, repository) => {
-  const info = await getLatestReleaseVersion(repository);
-  if (!info || !info.version) {
-    return;
-  }
-  if (!(await shouldUpdate(updateSetting, info.version))) {
-    return;
-  }
-  // @ts-ignore
-  await invoke('Layout.setUpdateState', {
-    state: 'downloading',
-    progress: 0
-  });
-  await downloadUpdateToCache(repository, info.version);
-  const downloadPath = ''; // TODO get it from cache to disk somehow
-  const messageRestart = promptRestart();
-  const shouldRestart = await invoke('ConfirmPrompt.prompt', messageRestart, {
-    confirmMessage: '',
-    title: ''
-  });
-  if (!shouldRestart) {
-    return;
+  try {
+    const bucketName = 'electron-updates';
+    const cacheName = 'electron-updates';
+    const info = await getLatestReleaseVersion(repository);
+    if (!info || !info.version) {
+      return {
+        updated: false,
+        error: undefined
+      };
+    }
+    const cache = await getCache(bucketName, cacheName);
+    if (!(await shouldUpdate(updateSetting, info.version))) {
+      return {
+        updated: false,
+        error: undefined
+      };
+    }
+    const downloadUrl = getUpdateUrl(repository, info.version);
+
+    // @ts-ignore
+    await invoke('Layout.setUpdateState', {
+      state: 'downloading',
+      progress: 0
+    });
+    if (!(await isCached(downloadUrl, cache))) {
+      await downloadUpdateToCache(downloadUrl, cache);
+    }
+    const messageRestart = promptRestart();
+    const shouldRestart = await confirmPrompt(messageRestart);
+    if (!shouldRestart) {
+      return {
+        updated: false,
+        error: undefined
+      };
+    }
+    const downloadPath = ''; // TODO get it from cache to disk somehow
+    await installAndRestart(downloadPath);
+    return {
+      updated: true,
+      error: undefined
+    };
+  } catch (error) {
+    console.error(error);
+    return {
+      updated: false,
+      error: undefined
+    };
   }
-  await installAndRestart(downloadPath);
 };
 
 const commandMap = {

package/package.json

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