Stop rodio player on reload and app close

Author: Ovenoboyo

src/utils/main/ipc/index.ts

@@ -26,6 +26,7 @@ import { ipcMain } from 'electron'
 let scannerChannel: ScannerChannel | undefined = undefined
 let updateChannel: UpdateChannel | undefined = undefined
 let extensionChannel: ExtensionHostChannel | undefined = undefined
+let rodioChannel: RodioChannel | undefined = undefined
 let preferenceChannel: PreferenceChannel | undefined = undefined
 let storeChannel: StoreChannel | undefined = undefined
 let mprisChannel: MprisChannel | undefined = undefined
@@ -46,11 +47,18 @@ export function registerIpcChannels() {
     new NotifierChannel(),
     getMprisChannel(),
     getSpotifyPlayerChannel(),
-    new RodioChannel(),
+    getRodioChannel(),
   ]
   ipcChannels.forEach((channel) => ipcMain.on(channel.name, (event, request) => channel.handle(event, request)))
 }
 
+export function getRodioChannel() {
+  if (!rodioChannel) {
+    rodioChannel = new RodioChannel()
+  }
+  return rodioChannel
+}
+
 export function getExtensionHostChannel() {
   if (!extensionChannel) {
     extensionChannel = new ExtensionHostChannel()

src/utils/main/ipc/rodio.ts

@@ -82,13 +82,13 @@ export class RodioChannel implements IpcChannelInterface {
     event.reply(request.responseChannel)
   }
 
-  private async stop(event: Electron.IpcMainEvent, request: IpcRequest) {
+  public async stop(event?: Electron.IpcMainEvent, request?: IpcRequest) {
     try {
       await this.rodioInstance?.stop()
     } catch (e) {
       this.emitError(e)
     }
-    event.reply(request.responseChannel)
+    event?.reply(request?.responseChannel ?? '')
   }
 
   private async setVolume(event: Electron.IpcMainEvent, request: IpcRequest<RodioRequests.Volume>) {

src/utils/main/windowManager.ts

@@ -24,7 +24,7 @@ import {
 import { ButtonEnum, PlayerButtons } from 'media-controller'
 import { SongEvents, WindowEvents } from './ipc/constants'
 import { access, readFile } from 'fs/promises'
-import { getMprisChannel, getSpotifyPlayerChannel } from './ipc/index'
+import { getMprisChannel, getRodioChannel, getSpotifyPlayerChannel } from './ipc/index'
 import { getWindowSize, loadPreferences, setWindowSize } from './db/preferences'
 
 import { $t } from './i18nLoader'
@@ -314,6 +314,7 @@ export class WindowHandler {
   }
 
   public async stopAll() {
+    getRodioChannel().stop()
     getSpotifyPlayerChannel().closePlayer()
     // Stop extension Host
     await getExtensionHostChannel().closeExtensionHost()
@@ -352,10 +353,6 @@ export class WindowHandler {
         }
       }
     })
-    // window.webContents.on('', (event, url) {
-    //   event.preventDefault()
-    //   open(url)
-    // })
 
     window.webContents.on(
       'did-frame-navigate',

src/utils/ui/mixins/KeyHandlerMixin.ts

@@ -85,6 +85,7 @@ export default class KeyHandlerMixin extends mixins(PlayerControls) {
         break
       case HotkeyEvents.RELOAD_PAGE:
         window.SpotifyPlayer.close()
+          .then(() => window.RodioUtils.stop())
           .then(() => window.WindowUtils.handleReload())
           .then(() => location.reload())
         break