Merge pull request #342 from victoralvesf/development

Release v0.12.0

Author: victoralvesf

dev-app-update.yml

@@ -1,3 +1,2 @@
 provider: generic
-url: https://example.com/auto-updates
-updaterCacheDirName: aonsoku-electron-updater
+url: https://minio.trinitylab.work/aonsoku-dev-update

electron-builder.yml

@@ -38,6 +38,7 @@ mac:
   category: public.app-category.music
   entitlementsInherit: build/entitlements.mac.plist
   notarize: false
+  identity: "-"
   icon: ./build/icon.icns
   target:
     - target: dmg

electron.vite.config.ts

@@ -32,7 +32,7 @@ export default defineConfig({
         },
       },
       externalizeDeps: {
-        exclude: ['@electron-toolkit/preload'],
+        exclude: ['@electron-toolkit/preload', 'electron-updater'],
       },
     },
   },

electron/main/core/events.ts

@@ -5,6 +5,7 @@ import {
   OverlayColors,
   PlayerStatePayload,
 } from '../../preload/types'
+import { isQuitting } from '../index'
 import { tray, updateTray } from '../tray'
 import { colorsState } from './colors'
 import {
@@ -61,6 +62,11 @@ export function setupEvents(window: BrowserWindow | null) {
   })
 
   window.on('close', (event) => {
+    if (isQuitting) {
+      if (tray && !tray.isDestroyed()) tray.destroy()
+      return
+    }
+
     if (is.dev || !getAppSetting('minimizeToTray')) {
       if (tray && !tray.isDestroyed()) tray.destroy()
       return

electron/main/core/menu.ts

@@ -1,12 +1,22 @@
-import { platform } from '@electron-toolkit/utils'
-import { app, Menu, shell } from 'electron'
+import { is, platform } from '@electron-toolkit/utils'
+import {
+  app,
+  Menu,
+  MenuItem,
+  MenuItemConstructorOptions,
+  shell,
+} from 'electron'
 import { repository } from '../../../package.json'
 import { aboutDialog } from './about'
 
 export function createAppMenu() {
   if (!platform.isMacOS) return
 
-  const template = [
+  const toggleDevTools = {
+    role: 'toggleDevTools',
+  } as const
+
+  const template: (MenuItemConstructorOptions | MenuItem)[] = [
     {
       label: app.name,
       submenu: [
@@ -51,7 +61,7 @@ export function createAppMenu() {
       submenu: [
         { role: 'reload' },
         { role: 'forceReload' },
-        { role: 'toggleDevTools' },
+        ...(is.dev ? [toggleDevTools] : []),
         { type: 'separator' },
         { role: 'resetZoom' },
         { role: 'zoomIn' },
@@ -84,7 +94,6 @@ export function createAppMenu() {
     },
   ]
 
-  // @ts-expect-error set only roles for menu
   const menu = Menu.buildFromTemplate(template)
 
   Menu.setApplicationMenu(menu)

electron/main/core/updater.ts

@@ -1,38 +1,22 @@
-import { is } from '@electron-toolkit/utils'
 import { BrowserWindow, ipcMain } from 'electron'
 import electronUpdater from 'electron-updater'
 import { IpcChannels } from '../../preload/types'
 
 const { autoUpdater } = electronUpdater
 
-export function setupUpdater(window: BrowserWindow | null) {
-  if (!window) return
+let updateWindow: BrowserWindow | null = null
 
+export function setUpdaterWindow(window: BrowserWindow | null) {
+  updateWindow = window
+}
+
+export function initAutoUpdater() {
   autoUpdater.autoDownload = false
   autoUpdater.autoInstallOnAppQuit = true
+  autoUpdater.forceDevUpdateConfig = false
 
   // IPC Handlers
   ipcMain.handle(IpcChannels.CheckForUpdates, async () => {
-    if (is.dev) {
-      // add mock up response
-      return {
-        files: [
-          {
-            url: 'https://github.com/victoralvesf/aonsoku/releases/download/v0.11.0/Aonsoku-v0.11.0-linux-x86_64.AppImage',
-            sha512:
-              'QRsm6JGcGxiFzngU5VK9LhN7AJlO1mTjXpZBpUFIb7CmmNyWtH7nmT+YjaaeHVdBLCQJRGZna6U9ZCVfag8CiA==',
-            size: 126846979,
-            blockMapSize: 133143,
-          },
-        ],
-        version: '9.99.9',
-        updateUrl: 'https://github.com/victoralvesf/aonsoku/releases',
-        releaseDate: '2025-11-30T02:45:24.024Z',
-        releaseNotes:
-          '## New version available\n\n- New feature 1\n- New feature 2\n\n### Fixes\n\n- Fix 1\n- Fix 2',
-      }
-    }
-
     try {
       return await autoUpdater.checkForUpdates()
     } catch (e) {
@@ -55,22 +39,22 @@ export function setupUpdater(window: BrowserWindow | null) {
   })
 
   autoUpdater.on('update-available', (info) => {
-    window.webContents.send(IpcChannels.UpdateAvailable, info)
+    updateWindow?.webContents.send(IpcChannels.UpdateAvailable, info)
   })
 
   autoUpdater.on('update-not-available', () => {
-    window.webContents.send(IpcChannels.UpdateNotAvailable)
+    updateWindow?.webContents.send(IpcChannels.UpdateNotAvailable)
   })
 
   autoUpdater.on('error', (err) => {
-    window.webContents.send(IpcChannels.UpdateError, err.message)
+    updateWindow?.webContents.send(IpcChannels.UpdateError, err.message)
   })
 
   autoUpdater.on('download-progress', (progressObj) => {
-    window.webContents.send(IpcChannels.DownloadProgress, progressObj)
+    updateWindow?.webContents.send(IpcChannels.DownloadProgress, progressObj)
   })
 
   autoUpdater.on('update-downloaded', (info) => {
-    window.webContents.send(IpcChannels.UpdateDownloaded, info)
+    updateWindow?.webContents.send(IpcChannels.UpdateDownloaded, info)
   })
 }

electron/main/index.ts

@@ -1,8 +1,11 @@
 import { electronApp, optimizer, platform } from '@electron-toolkit/utils'
-import { app, globalShortcut } from 'electron'
+import { app } from 'electron'
 import { createAppMenu } from './core/menu'
+import { initAutoUpdater } from './core/updater'
 import { createWindow, mainWindow } from './window'
 
+export let isQuitting = false
+
 const currentDesktop = process.env.XDG_CURRENT_DESKTOP ?? ''
 
 if (platform.isLinux && currentDesktop.toLowerCase().includes('gnome')) {
@@ -31,6 +34,7 @@ if (!instanceLock) {
   app.whenReady().then(() => {
     electronApp.setAppUserModelId('com.victoralvesf.aonsoku')
 
+    initAutoUpdater()
     createWindow()
   })
 
@@ -51,10 +55,21 @@ if (!instanceLock) {
 
   app.on('browser-window-created', (_, window) => {
     optimizer.watchWindowShortcuts(window)
-    globalShortcut.register('F11', () => {})
+
+    window.webContents.on('before-input-event', (event, input) => {
+      if (input.key === 'F11') {
+        event.preventDefault()
+      }
+    })
+  })
+
+  app.on('before-quit', () => {
+    isQuitting = true
   })
 
   app.on('window-all-closed', () => {
-    app.quit()
+    if (!platform.isMacOS) {
+      app.quit()
+    }
   })
 }

electron/main/window.ts

@@ -7,7 +7,7 @@ import { setupDownloads } from './core/downloads'
 import { setupEvents, setupIpcEvents } from './core/events'
 import { appIcon } from './core/icon'
 import { titleBarOverlay } from './core/titleBarOverlay'
-import { setupUpdater } from './core/updater'
+import { setUpdaterWindow } from './core/updater'
 import { StatefulBrowserWindow } from './core/windowPosition'
 import { createTray } from './tray'
 
@@ -44,7 +44,7 @@ export function createWindow(): void {
   setupEvents(mainWindow)
   setupIpcEvents(mainWindow)
   setupDownloads(mainWindow)
-  setupUpdater(mainWindow)
+  setUpdaterWindow(mainWindow)
 
   // HMR for renderer base on electron-vite cli.
   // Load the remote URL for development or the local html file for production.

electron/preload/types.ts

@@ -1,3 +1,9 @@
+import {
+  type ProgressInfo,
+  type UpdateCheckResult,
+  type UpdateDownloadedEvent,
+  type UpdateInfo,
+} from 'electron-updater'
 import { RpcPayload } from '../main/core/discordRpc'
 import { IDownloadPayload } from '../main/core/downloads'
 import { ISettingPayload } from '../main/core/settings'
@@ -51,24 +57,6 @@ export type PlayerStateListenerActions =
   | 'toggleShuffle'
   | 'toggleRepeat'
 
-export type UpdateInfo = {
-  version: string
-  files: { url: string; sha512: string; size: number }[]
-  path: string
-  sha512: string
-  releaseName: string | null
-  releaseNotes: string | null
-  releaseDate: string
-}
-
-export type ProgressInfo = {
-  total: number
-  delta: number
-  transferred: number
-  percent: number
-  bytesPerSecond: number
-}
-
 export interface IAonsokuAPI {
   enterFullScreen: () => void
   exitFullScreen: () => void
@@ -93,12 +81,12 @@ export interface IAonsokuAPI {
   setDiscordRpcActivity: (payload: RpcPayload) => void
   clearDiscordRpcActivity: () => void
   saveAppSettings: (payload: ISettingPayload) => void
-  checkForUpdates: () => Promise<UpdateInfo | null>
+  checkForUpdates: () => Promise<UpdateCheckResult | null>
   downloadUpdate: () => void
   quitAndInstall: () => void
   onUpdateAvailable: (callback: (info: UpdateInfo) => void) => void
   onUpdateNotAvailable: (callback: () => void) => void
   onUpdateError: (callback: (error: string) => void) => void
   onDownloadProgress: (callback: (progress: ProgressInfo) => void) => void
-  onUpdateDownloaded: (callback: (info: UpdateInfo) => void) => void
+  onUpdateDownloaded: (callback: (info: UpdateDownloadedEvent) => void) => void
 }

index.html

@@ -15,7 +15,7 @@
 
   <body>
     <div id="root"></div>
-    <script src="/env-config.js"></script>
+    <script src="./env-config.js"></script>
     <script type="module" src="/src/main.tsx"></script>
   </body>
 </html>