feat: added version check for updater

Author: Venipa

package.json

@@ -132,6 +132,7 @@
     "@types/node": "^20.14.8",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
+    "@types/semver": "^7.5.8",
     "@vitejs/plugin-react": "^4.3.1",
     "autoprefixer": "^10.4.20",
     "cross-env": "^7.0.3",

pnpm-lock.yaml

@@ -1,4 +1,5 @@
 import secureStore from '@main/secureStore'
+import { checkForUpdates, setUpdateHandledByFrontend } from '@main/updater'
 import { TRPCError } from '@trpc/server'
 import { shell } from 'electron'
 import { autoUpdater } from 'electron-updater'
@@ -56,22 +57,22 @@ export const internalRouter = router({
     .mutation(async ({ input: { path: filePath } }) => {
       await shell.openPath(filePath)
     }),
-  checkUpdate: publicProcedure
-    .input(z.boolean().default(false))
-    .mutation(async ({ input: notifyIfUpdateAvailable }) => {
-      if (notifyIfUpdateAvailable) return await autoUpdater.checkForUpdatesAndNotify()
-      return await autoUpdater.checkForUpdates()
-    }),
+  checkUpdate: publicProcedure.mutation(async () => {
+    return await checkForUpdates()
+  }),
   downloadUpdate: publicProcedure.mutation(() => {
     try {
-      return autoUpdater.downloadUpdate()
+      return autoUpdater.downloadUpdate().then((s) => {
+        setUpdateHandledByFrontend(true)
+        return s
+      })
     } catch (ex: any) {
       throw new TRPCError({ message: ex.message, code: 'INTERNAL_SERVER_ERROR' })
     }
   }),
   quitAndInstallUpdate: publicProcedure.mutation(() => {
     try {
-      return autoUpdater.quitAndInstall()
+      return autoUpdater.quitAndInstall(false, true)
     } catch (ex: any) {
       throw new TRPCError({ message: ex.message, code: 'INTERNAL_SERVER_ERROR' })
     }

src/main/trpc/internal.api.ts

@@ -1,7 +1,29 @@
-import { BrowserWindow, dialog } from 'electron'
+import { appStore } from '@main/stores/app.store'
+import { isProduction } from '@shared/config'
+import { app, BrowserWindow, dialog } from 'electron'
 import { autoUpdater } from 'electron-updater'
+import semver from 'semver'
+const [GITHUB_AUTHOR, GITHUB_REPOSITORY] = import.meta.env.VITE_GITHUB_REPOSITORY.split('/', 2)
+let updateQueuedInFrontend = false
+export const setUpdateHandledByFrontend = (value: boolean) => (updateQueuedInFrontend = value)
+export function isUpdateInRange(ver: string) {
+  if (!isProduction) return true
+  return semver.gtr(ver, app.getVersion(), {
+    includePrerelease: appStore.store.beta
+  })
+}
+export function checkForUpdates() {
+  return autoUpdater
+    .checkForUpdates()
+    .then((info) => (info && isUpdateInRange(info.updateInfo.version) && info) || null)
+}
+export function checkForUpdatesAndNotify() {}
 export function attachAutoUpdaterIPC(win: BrowserWindow) {
-  autoUpdater.on('update-available', (info) => win.webContents.send('update-available', info))
+  autoUpdater.on(
+    'update-available',
+    (info) =>
+      info && isUpdateInRange(info.version) && win.webContents.send('update-available', info)
+  )
   autoUpdater.on('update-not-available', (info) => {
     win.webContents.send('update-available', false)
     win.webContents.send('update-checking', false)
@@ -14,6 +36,7 @@ export function attachAutoUpdaterIPC(win: BrowserWindow) {
     win.webContents.send('update-checking', new Date().toISOString())
   )
   autoUpdater.signals.updateDownloaded(async (x) => {
+    if (updateQueuedInFrontend) return
     const releaseNotes = (
       typeof x.releaseNotes === 'string'
         ? x.releaseNotes
@@ -36,4 +59,11 @@ export function attachAutoUpdaterIPC(win: BrowserWindow) {
         else if (response === 1) autoUpdater.autoInstallOnAppQuit = true
       })
   })
+
+  autoUpdater.setFeedURL({
+    provider: 'github',
+    owner: GITHUB_AUTHOR,
+    repo: GITHUB_REPOSITORY
+  })
+  autoUpdater.autoDownload = false
 }

src/main/updater/index.ts

@@ -40,11 +40,11 @@ export default function AboutTab() {
         const updateNow = await new Promise<boolean>((resolve) => {
           toast.info('A new version has been found', {
             action: (
-              <div className="flex gap-1">
-                <Button className="h-6 px-1" onClick={() => resolve(true)}>
+              <div className="flex gap-1 ml-auto">
+                <Button className="h-6 px-2 text-xs" variant={"ghost"} onClick={() => resolve(true)}>
                   Update Now
                 </Button>
-                <Button className="h-6 px-1" onClick={() => resolve(false)}>
+                <Button className="h-6 px-2 text-xs" variant={"ghost"} onClick={() => resolve(false)}>
                   Later
                 </Button>
               </div>
@@ -56,6 +56,8 @@ export default function AboutTab() {
         if (updateNow) {
           toast.loading('Downloading update...', {
             id,
+            action: null,
+            description: null,
             dismissible: false,
             duration: 0
           })
@@ -64,7 +66,7 @@ export default function AboutTab() {
           })
           await quitAndInstallUpdate()
         } else {
-          toast.info('Update postponed.', { id, duration: 5000 })
+          toast.info('Update postponed.', { id, duration: 5000, description: null })
         }
       }
     } finally {