feat: updater logic fixed, ipc helpers options added, store refactor, throw error toast handler

Author: Venipa

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ytdlp-gui",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "description": "venipa-electron-template",
   "main": "./out/main/index.js",
   "author": "Venipa <[email protected]>",

src/main/stores/AppStore.ts

@@ -15,5 +15,7 @@ export interface AppStore {
     clipboardMonitorAutoAdd: boolean
     concurrentDownloads: number
   }
+  startMinimized: boolean
+  startOnBoot: boolean
   beta: boolean
 }

src/main/stores/app.migrations.ts

@@ -0,0 +1,21 @@
+import { MAX_PARALLEL_DOWNLOADS } from '@main/trpc/ytdlp.core'
+import { Migration } from 'electron-conf'
+import { AppStore } from './AppStore'
+
+const appStoreMigrations: Migration<AppStore>[] = [
+  {
+    version: 0,
+    hook(instance, currentVersion) {
+      instance.store.features.concurrentDownloads = MAX_PARALLEL_DOWNLOADS
+    }
+  },
+  {
+    version: 1,
+    hook(instance, currentVersion) {
+      instance.store.startMinimized = false
+      instance.store.startOnBoot = true
+    }
+  }
+]
+
+export default appStoreMigrations

src/main/stores/app.store.ts

@@ -3,20 +3,14 @@ import { createYmlStore } from '@shared/electron/store/createYmlStore'
 import { PathsOf } from '@shared/electron/store/inferKey'
 import { app } from 'electron'
 import { AppStore } from './AppStore'
+import appStoreMigrations from './app.migrations'
 export interface AppLicense {
   code: string
   expires: string
 }
 const defaultDownloadsPath = app.getPath('downloads')
 const store = createYmlStore<AppStore>('app-settings', {
-  migrations: [
-    {
-      version: 0,
-      hook(instance, currentVersion) {
-        instance.store.features.concurrentDownloads = MAX_PARALLEL_DOWNLOADS
-      }
-    }
-  ],
+  migrations: appStoreMigrations,
   defaults: {
     ytdlp: {
       checkForUpdate: true,
@@ -32,6 +26,8 @@ const store = createYmlStore<AppStore>('app-settings', {
       clipboardMonitorAutoAdd: true,
       concurrentDownloads: MAX_PARALLEL_DOWNLOADS
     },
+    startMinimized: false,
+    startOnBoot: true,
     beta: false
   }
 })

src/main/trpc/internal.api.ts

@@ -62,9 +62,10 @@ export const internalRouter = router({
   }),
   downloadUpdate: publicProcedure.mutation(() => {
     try {
-      return autoUpdater.downloadUpdate().then((s) => {
-        setUpdateHandledByFrontend(true)
-        return s
+      setUpdateHandledByFrontend(true)
+      return autoUpdater.downloadUpdate().catch((err) => {
+        setUpdateHandledByFrontend(false)
+        throw err
       })
     } catch (ex: any) {
       throw new TRPCError({ message: ex.message, code: 'INTERNAL_SERVER_ERROR' })

src/main/updater/index.ts

@@ -1,7 +1,7 @@
 import { appStore } from '@main/stores/app.store'
 import { isProduction } from '@shared/config'
 import { app, BrowserWindow, dialog } from 'electron'
-import { autoUpdater } from 'electron-updater'
+import { autoUpdater, UpdateInfo } from 'electron-updater'
 import semver from 'semver'
 const [GITHUB_AUTHOR, GITHUB_REPOSITORY] = import.meta.env.VITE_GITHUB_REPOSITORY?.split(
   '/',
@@ -21,6 +21,29 @@ export function checkForUpdates() {
     .then((info) => (info && isUpdateInRange(info.updateInfo.version) && info) || null)
 }
 export function checkForUpdatesAndNotify() {}
+export async function proceedUpdateDialog(info: UpdateInfo) {
+  const releaseNotes = (
+    typeof info.releaseNotes === 'string'
+      ? info.releaseNotes
+      : info.releaseNotes?.map((x) => x.note).join('\n')
+  )
+    ?.replace(/<[^>]+>/g, '')
+    .trimStart()
+  return await dialog
+    .showMessageBox({
+      title: `Update available (${info.version})`,
+      message: `Hey there is a new version which you can update to.\n\n${
+        process.platform === 'win32' ? releaseNotes : info.releaseName
+      }`,
+      type: 'question',
+      buttons: ['Update now', 'Update on quit', 'Cancel'],
+      cancelId: -1
+    })
+    .then(({ response }) => {
+      if (response === 0) autoUpdater.quitAndInstall()
+      else if (response === 1) autoUpdater.autoInstallOnAppQuit = true
+    })
+}
 export function attachAutoUpdaterIPC(win: BrowserWindow) {
   autoUpdater.on(
     'update-available',
@@ -31,36 +54,16 @@ export function attachAutoUpdaterIPC(win: BrowserWindow) {
     win.webContents.send('update-available', false)
     win.webContents.send('update-checking', false)
   })
-  autoUpdater.on('download-progress', (info) =>
-    win.webContents.send('update-download-progress', info)
-  )
-  autoUpdater.on('update-downloaded', (info) => win.webContents.send('update-download-done', info))
   autoUpdater.on('checking-for-update', () =>
     win.webContents.send('update-checking', new Date().toISOString())
   )
+  autoUpdater.signals.progress((info) => {
+    win.webContents.send('update-download-progress', info)
+  })
   autoUpdater.signals.updateDownloaded(async (x) => {
+    win.webContents.send('update-download-done', x)
     if (updateQueuedInFrontend) return
-    const releaseNotes = (
-      typeof x.releaseNotes === 'string'
-        ? x.releaseNotes
-        : x.releaseNotes?.map((x) => x.note).join('\n')
-    )
-      ?.replace(/<[^>]+>/g, '')
-      .trimStart()
-    return await dialog
-      .showMessageBox({
-        title: `Update available (${x.version})`,
-        message: `Hey there is a new version which you can update to.\n\n${
-          process.platform === 'win32' ? releaseNotes : x.releaseName
-        }`,
-        type: 'question',
-        buttons: ['Update now', 'Update on quit', 'Cancel'],
-        cancelId: -1
-      })
-      .then(({ response }) => {
-        if (response === 0) autoUpdater.quitAndInstall()
-        else if (response === 1) autoUpdater.autoInstallOnAppQuit = true
-      })
+    return await proceedUpdateDialog(x)
   })
   if (!import.meta.env.VITE_GITHUB_REPOSITORY)
     autoUpdater.setFeedURL({

src/renderer/src/components/ui/app-navbar.tsx

@@ -21,7 +21,7 @@ export default function AppNavBar({
   const { pathname } = useLocation()
   const isQuitRoute = useMemo(() => quitPaths.includes(pathname), [pathname])
   const { windowState } = useWindowState()
-  const { hide: onClose, close, maximize: onMaximize, minimize: onMinimize } = useWindowControls()
+  const { hide, close, maximize: onMaximize, minimize: onMinimize } = useWindowControls()
   useEventListener(
     'keydown',
     (ev) => {
@@ -36,7 +36,7 @@ export default function AppNavBar({
         title={configState?.title || <Spinner />}
         state={{ ...windowState, title: '' } as any}
         className={cn('h-10 px-1.5', className)}
-        {...{ onMinimize, onMaximize, onClose: isQuitRoute ? close : onClose }}
+        {...{ onMinimize, onMaximize, onClose: isQuitRoute ? close : hide }}
         {...props}
       >
         {windowState && (

src/renderer/src/hooks/use-ipc.ts

@@ -6,8 +6,12 @@ import usePromise from './use-promise'
 
 interface IpcOptions<T = any> {
   defaultValue: T
+  getOnInit?: boolean
 }
-export function useIPC<T = any>(eventName: string, options: IpcOptions<T> = {} as any) {
+export function useIPC<T = any>(
+  eventName: string,
+  options: IpcOptions<T> = { getOnInit: false } as IpcOptions<T>
+) {
   const [state, setState] = useState(options.defaultValue)
   const handle = useCallback(
     (ev: IpcRendererEvent, data: any) => {
@@ -16,12 +20,13 @@ export function useIPC<T = any>(eventName: string, options: IpcOptions<T> = {} a
     [eventName]
   )
   useIsomorphicLayoutEffect(() => {
-    window.api
-      .invoke(`action:${eventName}`)
-      .then((initialData) => setState(initialData))
-      .catch((err) => {
-        logger.error(err)
-      })
+    if (options.getOnInit)
+      window.api
+        .invoke(`action:${eventName}`)
+        .then((initialData) => setState(initialData))
+        .catch((err) => {
+          logger.error(err)
+        })
   }, [eventName])
   useEffect(() => {
     window.api.on(eventName, handle)

src/renderer/src/pages/components/status-bar.tsx

@@ -66,10 +66,10 @@ export default function StatusBar() {
           </>
         ) : updateProgress && !updateDone ? (
           <>
-            <Appear>Downloading... {String(updateProgress.percent).padStart(3, ' ')}%</Appear>
+            <Appear>Downloading... {(updateProgress.percent as number).toFixed(2).padStart(5, ' ')}%</Appear>
             <div className="h-10 w-px bg-muted"></div>
           </>
-        ) : updateAvailable ? (
+        ) : updateAvailable && !updateDone ? (
           <>
             <Appear>Update Available, preparing...</Appear>
             <div className="h-10 w-px bg-muted"></div>

src/renderer/src/pages/sections/about.tsx

@@ -3,6 +3,7 @@ import ClickableText from '@renderer/components/ui/clickable-text'
 import { QTooltip } from '@renderer/components/ui/tooltip'
 import { trpc } from '@renderer/lib/trpc-link'
 import config, { NodeEnv } from '@shared/config'
+import { throwErrorToast } from '@shared/trpc/error'
 import { formatDistanceToNow, isValid } from 'date-fns'
 import { DotIcon } from 'lucide-react'
 import { useMemo, useState } from 'react'
@@ -41,10 +42,18 @@ export default function AboutTab() {
           toast.info('A new version has been found', {
             action: (
               <div className="flex gap-1 ml-auto">
-                <Button className="h-6 px-2 text-xs" variant={"ghost"} onClick={() => resolve(true)}>
+                <Button
+                  className="h-6 px-2 text-xs"
+                  variant={'ghost'}
+                  onClick={() => resolve(true)}
+                >
                   Update Now
                 </Button>
-                <Button className="h-6 px-2 text-xs" variant={"ghost"} onClick={() => resolve(false)}>
+                <Button
+                  className="h-6 px-2 text-xs"
+                  variant={'ghost'}
+                  onClick={() => resolve(false)}
+                >
                   Later
                 </Button>
               </div>
@@ -62,9 +71,16 @@ export default function AboutTab() {
             duration: 0
           })
           await downloadUpdate().then(() => {
-            toast.success('Update downloaded...', { description: 'Awaiting installation.', id })
+            toast.success('Update downloaded...', {
+              description: 'Awaiting installation.',
+              dismissible: true,
+              duration: 3000,
+              id
+            })
+          })
+          await quitAndInstallUpdate().catch((err) => {
+            throwErrorToast(err)
           })
-          await quitAndInstallUpdate()
         } else {
           toast.info('Update postponed.', { id, duration: 5000, description: null })
         }

src/shared/trpc/error.ts

@@ -0,0 +1,9 @@
+import { logger } from '@shared/logger'
+import { toast } from 'sonner'
+import { isTRPCErrorResponse } from './utils'
+
+export function throwErrorToast(err: any) {
+  if (!isTRPCErrorResponse(err)) throw err
+  logger.error(err)
+  return toast.error(err.message)
+}