Merge pull request #4 from DorvakOff/develop

v1.0.4

README.md

@@ -18,13 +18,8 @@
 
 ### Settings (tray / notifications icon)
 > Settings are available in the tray icon (located in the notification icons area)
-- Toggle: Shows or hides the DeezerRPC window.
-- Player: Manually control basic player actions outside main window.
-- Settings: Miscellaneous options like controlling how the window is minimized and checking for updates on startup.
-- Check for updates: Check if there is a new version available.
-- DeezerRPC [version]: Open this GitHub page.
-- Exit: Closes the application.
 
+Right click the tray icon to display the menu.
 
 ## Notes
 - This application is not affiliated with Deezer or Discord.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "deezer-rpc",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Deezer integrated with the Discord Rich Presence.",
   "main": "build/main.js",
   "scripts": {

src/app/app.ts

@@ -1,6 +1,8 @@
-import { Client } from 'discord-rpc';
-import { BrowserWindow } from 'electron';
+import {Client} from 'discord-rpc';
 import ElectronStore from 'electron-store';
+import {SetIntervalAsyncTimer} from "set-interval-async";
+import {setIntervalAsync} from "set-interval-async/dynamic";
+import {updateRPC} from "../player/player";
 
 const PACKAGE = require('../../package.json');
 
@@ -18,41 +20,63 @@ export const APP = {
         discordClientID: '1193973433986449458'
     },
     preferences: {
-        closeToTray: 'closeToTray',
-        checkUpdates: 'checkUpdates',
-        startOnStartup: 'startOnStartup',
+        closeToTray: 'closeToTray', checkUpdates: 'checkUpdates', startOnStartup: 'startOnStartup',
     },
 };
 
 export const APP_CONFIG = new ElectronStore({
     defaults: {
-        closeToTray: true,
-        checkUpdates: true,
-        startOnStartup: true,
+        closeToTray: true, checkUpdates: true, startOnStartup: true,
     }
 });
 
-// RPC
-export let RPC = new Client({
-    transport: 'ipc'
-});
+let rpc: Client;
+
+export function getRPC() {
+    if (rpc == null) {
+        resetRPC();
+    }
+    return rpc;
+}
+
+let connected = false;
+let timer: SetIntervalAsyncTimer
+
+export function isConnected() {
+    return connected;
+}
 
-let firstTime = true;
+function resetRPC() {
+    connected = false;
+    newClient()
+}
 
-export function resetRPC() {
-    let newClient = new Client({
+function newClient() {
+    rpc = new Client({
         transport: 'ipc'
     });
+}
 
-    if (firstTime) {
-        firstTime = false;
-        RPC = newClient;
-        return;
-    }
-
-    RPC.destroy().then(() => {
-        RPC = newClient;
-    }).catch(() => {
-        RPC = newClient;
-    })
+export function handleRPCError(reason: any) {
+    console.error('Failed to initialize RPC, retrying in 10 seconds... Reason: ' + reason.message);
+    resetRPC()
+    setTimeout(() => {
+        console.log('Retrying RPC initialization...');
+        initializeRPC();
+    }, 10_000);
 }
+
+export function initializeRPC() {
+    if (timer == null) {
+        timer = setIntervalAsync(updateRPC, 1_000);
+    }
+    try {
+        getRPC().login({clientId: APP.settings.discordClientID}).then(() => {
+            if (connected) return;
+            connected = true;
+            console.log('RPC initialized successfully');
+        }).catch(handleRPCError);
+    } catch (e) {
+        handleRPCError(e)
+    }
+}

src/main.ts

@@ -1,4 +1,4 @@
-import {APP, resetRPC, RPC} from './app/app';
+import {APP, initializeRPC} from './app/app';
 import * as Tray from './manager/tray';
 import * as Update from './utils/update';
 import * as Player from './player/player';
@@ -38,11 +38,15 @@ function createMainWindow() {
 
     // Load URL
     mainWindow.loadURL(APP.settings.deezerUrl, {userAgent: Window.userAgent()}).then(() => {
-        let css = `
-            .page-topbar, .css-efpag6, .tempo-topbar, #dzr-app {
-                margin-top: 30px !important;
-            }
-        `;
+        let selectors = [
+            '.page-topbar',
+            '.css-efpag6',
+            '.tempo-topbar',
+            '#dzr-app',
+            '.mtZhp'
+        ];
+
+        let css = selectors.join(', ') + ' { margin-top: 30px !important; }';
 
         let javascript = `
             if (document.head.querySelector('#deezer-rpc-css') == null) {
@@ -71,14 +75,15 @@ function createMainWindow() {
         mainWindow.setPosition(mainWindowStateKeeper.x, mainWindowStateKeeper.y)
         mainWindow.setSize(mainWindowStateKeeper.width, mainWindowStateKeeper.height)
         TitleBar.register()
+        loadThumbnailButtons()
     });
     mainWindow.on('hide', () => {
         mainWindowStateKeeper.saveState(mainWindow);
         TitleBar.unregister()
     })
 
     mainWindow.on('minimize', () => {
-        mainWindow.hide();
+        mainWindow.minimize();
     });
 
     mainWindow.on('close', (event) => {
@@ -97,7 +102,6 @@ function handleLoadComplete() {
 
     Tray.register();
     Player.registerShortcuts();
-    loadThumbnailButtons()
 
     if (Preferences.getPreference<boolean>(APP.preferences.checkUpdates)) Update.checkVersion(false);
 
@@ -106,6 +110,9 @@ function handleLoadComplete() {
 }
 
 export function loadThumbnailButtons(playing: boolean = false) {
+    if (!mainWindow.isVisible()) {
+        return;
+    }
     mainWindow.setThumbarButtons([{
         tooltip: 'Previous',
         icon: nativeImage.createFromPath(path.join(__dirname, 'assets/images/previous.png')),
@@ -125,17 +132,6 @@ export function getMainWindow() {
     return mainWindow;
 }
 
-function initializeRPC() {
-    RPC.login({clientId: APP.settings.discordClientID}).then(() => {
-        console.log('RPC initialized successfully');
-        setTimeout(Player.registerRPC, 3000);
-    }).catch(() => {
-        console.error('Failed to initialize RPC, retrying in 10 seconds...');
-        resetRPC()
-        setTimeout(initializeRPC, 10000);
-    });
-}
-
 const gotTheLock = app.requestSingleInstanceLock()
 
 if (!gotTheLock) {

src/player/player.ts

@@ -1,12 +1,11 @@
-import {APP, RPC} from '../app/app';
+import {APP, getRPC, handleRPCError, isConnected} from '../app/app';
 import Song from '../model/song';
 import Radio from '../model/radio';
 import Unknown from '../model/unknown';
 import Episode from '../model/episode';
 import * as Tray from '../manager/tray';
 import {globalShortcut} from 'electron';
 import PlayerModel from '../model/player';
-import {setIntervalAsync} from 'set-interval-async/dynamic';
 import {getMainWindow, loadThumbnailButtons} from "../main";
 
 let LAST = '';
@@ -32,28 +31,24 @@ export function registerShortcuts() {
     globalShortcut.register('MediaPreviousTrack', () => previousSong());
 }
 
-export function registerRPC() {
-    setIntervalAsync(updateRPC, 1_000);
-}
+export async function updateRPC() {
+    let [current, listening, remaining] = await getMainWindow().webContents.executeJavaScript(`[ dzPlayer.getCurrentSong(),dzPlayer.isPlaying(), dzPlayer.getRemainingTime() ]`);
 
-async function updateRPC() {
-    try {
-        let [current, listening, remaining] = await getMainWindow().webContents.executeJavaScript(`[
-                    dzPlayer.getCurrentSong(),
-                    dzPlayer.isPlaying(),
-                    dzPlayer.getRemainingTime()
-                ]`);
+    playing = listening;
 
-        playing = listening;
+    SONG = getSong(current, listening, remaining);
 
-        SONG = getSong(current, listening, remaining);
+    loadThumbnailButtons(listening);
 
-        loadThumbnailButtons(listening);
+    if (!isConnected()) {
+        return;
+    }
 
+    try {
         if (!SONG.listening) {
-            RPC.clearActivity();
+            getRPC().clearActivity().catch(handleRPCError)
         } else {
-            RPC.setActivity({
+            getRPC().setActivity({
                 details: SONG.title,
                 state: SONG.getState(),
                 startTimestamp: SONG.getStartTimestamp(),
@@ -64,15 +59,15 @@ async function updateRPC() {
                 smallImageText: 'DeezerRPC v' + APP.version,
                 buttons: SONG.getButtons(),
                 instance: false
-            });
+            }).catch(handleRPCError);
 
             if (LAST !== SONG.getId()) {
                 Tray.setMessage(SONG.trayMessage);
                 LAST = SONG.getId();
             }
         }
     } catch (e) {
-        console.error(e);
+        handleRPCError(e)
     }
 }