@lvce-editor/update-worker 1.1.0 → 1.2.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',
@@ -951,7 +958,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
@@ -998,38 +1005,53 @@ 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 info = await getLatestReleaseVersion(repository);
+    if (!info || !info.version) {
+      return {
+        updated: false,
+        error: undefined
+      };
+    }
+    if (!(await shouldUpdate(updateSetting, info.version))) {
+      return {
+        updated: false,
+        error: undefined
+      };
+    }
+    // @ts-ignore
+    await invoke('Layout.setUpdateState', {
+      state: 'downloading',
+      progress: 0
+    });
+    await downloadUpdateToCache(repository, info.version);
+    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.2.0",
   "description": "Update Worker",
   "repository": {
     "type": "git",