Refactored code

Author: phpusr

src/index.js

@@ -51,7 +51,7 @@ function createWindow() {
       const { createPlayer } = require('./player.js')
       createPlayer(webContents, mainWindow)
     }
-    webContents.executeJavaScript('const app = new YandexMusicPlayer()')
+    webContents.executeJavaScript('const app = new YandexMusicPlayer(externalAPI)')
   })
 }
 

src/player.js

@@ -1,8 +1,8 @@
 function createPlayer(webContents, window) {
   // eslint-disable-next-line global-require
-  const Player = require('mpris-service')
+  const MprisService = require('mpris-service')
 
-  const player = Player({
+  const mprisService = MprisService({
     name: 'YandexMusic',
     identity: 'YandexMusic media player',
     supportedUriSchemes: ['file'],
@@ -11,37 +11,37 @@ function createPlayer(webContents, window) {
   })
 
   // Events
-  player.on('play', () => {
+  mprisService.on('play', () => {
     webContents.send('player:play')
   })
 
-  player.on('pause', () => {
+  mprisService.on('pause', () => {
     webContents.send('player:pause')
   })
 
-  player.on('playpause', () => {
+  mprisService.on('playpause', () => {
     webContents.send('player:playPause')
   })
 
-  player.on('next', () => {
+  mprisService.on('next', () => {
     webContents.send('player:next')
   })
 
-  player.on('previous', () => {
+  mprisService.on('previous', () => {
     webContents.send('player:prev')
   })
-  player.on('position', (data) => {
+  mprisService.on('position', (data) => {
     webContents.send('player:setPosition', data.position)
   })
 
-  player.on('quit', () => {
+  mprisService.on('quit', () => {
     process.exit()
   })
 
   // Metadata
 
   // return the position of your player
-  player.getPosition = () => 0
+  mprisService.getPosition = () => 0
 
   // eslint-disable-next-line global-require
   const ipc = require('electron').ipcMain
@@ -50,16 +50,16 @@ function createPlayer(webContents, window) {
     const { trackId, title, artists, playbackStatus, length, seek, artUrl, album } = metadata
     window.setTitle(`${artists} - ${title}`)
     // @see http://www.freedesktop.org/wiki/Specifications/mpris-spec/metadata/
-    player.metadata = {
-      'mpris:trackid': player.objectPath(trackId),
+    mprisService.metadata = {
+      'mpris:trackid': mprisService.objectPath(trackId),
       'mpris:length': length,
       'mpris:artUrl': artUrl,
       'xesam:title': title,
       'xesam:album': album,
       'xesam:artist': artists
     }
-    player.playbackStatus = playbackStatus
-    player.seeked(seek)
+    mprisService.playbackStatus = playbackStatus
+    mprisService.seeked(seek)
     webContents.send('player:metadata', metadata)
   })
 }

src/preload.js

@@ -1,4 +1,4 @@
-/* global document window externalAPI */
+/* global document window */
 
 const ONE_M = 1000 * 1000
 
@@ -8,39 +8,45 @@ function q(selector) {
   return document.querySelector(selector)
 }
 
-ipc.on('player:play', () => {
-  externalAPI.togglePause('')
-})
+class YandexMusicPlayer {
+  constructor(externalAPI) {
+    this.externalAPI = externalAPI
+    this.initCallbacks()
 
-ipc.on('player:pause', () => {
-  externalAPI.togglePause('PAUSE')
-})
+    setInterval(() => {
+      this.sendMetadata()
+      this.hideAds()
+    }, 1000)
+  }
 
-ipc.on('player:playPause', () => {
-  externalAPI.togglePause()
-})
+  initCallbacks() {
+    ipc.on('player:play', () => {
+      this.externalAPI.togglePause('')
+    })
 
-ipc.on('player:next', () => {
-  externalAPI.next()
-})
+    ipc.on('player:pause', () => {
+      this.externalAPI.togglePause('PAUSE')
+    })
 
-ipc.on('player:prev', () => {
-  externalAPI.prev()
-})
+    ipc.on('player:playPause', () => {
+      this.externalAPI.togglePause()
+    })
 
-ipc.on('player:setPosition', (ev, position) => {
-  externalAPI.setPosition(position / ONE_M)
-})
+    ipc.on('player:next', () => {
+      this.externalAPI.next()
+    })
 
-class YandexMusicPlayer {
-  constructor() {
-    setInterval(() => {
-      this.sendMetadata()
-      this.hideAds()
-    }, 1000)
+    ipc.on('player:prev', () => {
+      this.externalAPI.prev()
+    })
+
+    ipc.on('player:setPosition', (ev, position) => {
+      this.externalAPI.setPosition(position / ONE_M)
+    })
   }
+
   sendMetadata() {
-    const currentTrack = externalAPI.getCurrentTrack()
+    const currentTrack = this.externalAPI.getCurrentTrack()
 
     if (!currentTrack) {
       return
@@ -53,17 +59,18 @@ class YandexMusicPlayer {
       artists: currentTrack.artists.map(a => a.title),
       artUrl: `https://${currentTrack.cover.replace('%%', '300x300')}`,
       length: currentTrack.duration * ONE_M,
-      seek: externalAPI.getProgress().position * ONE_M
+      seek: this.externalAPI.getProgress().position * ONE_M
     }
 
-    if (externalAPI.isPlaying()) {
+    if (this.externalAPI.isPlaying()) {
       metadata.playbackStatus = 'Playing'
     } else {
       metadata.playbackStatus = 'Paused'
     }
 
     ipc.send('player:metadata', metadata)
   }
+
   hideAds() {
     const closeAdButton = q('.d-overhead__close button')
     if (closeAdButton) {