Implement window manager

public/app/createWindow.js

@@ -8,6 +8,7 @@ const path = require('path')
 
 const { isDev, isWindows, appName } = require('../constants')
 const store = require('../store/store')
+const { getMainWindow } = require('./windowManager')
 
 const windowStateKeeper = require('electron-window-state')
 
@@ -109,7 +110,7 @@ function createWindow (type, destination = '', display = null, isPopup = false)
       // Handle the close button action by having window hide
       window.on('close', (e) => {
         e.preventDefault()
-        global.mainWindow.hide()
+        getMainWindow().hide()
       })
 
       // If not configured to hide the app on app startup, show window when ready

public/app/initializeApp.js

@@ -1,6 +1,7 @@
 const { BrowserWindow, app } = require('electron')
 
 const { appPath, isMacOS, isDev } = require('../constants')
+const { setMainWindow } = require('./windowManager')
 const createWindow = require('./createWindow')
 const store = require('../store/store')
 
@@ -22,12 +23,12 @@ app.whenReady().then(() => {
   app.setAppUserModelId(process.execPath)
 
   // Create main window
-  global.mainWindow = createWindow('main')
+  setMainWindow(createWindow('main'))
 
   // macOS: Recreate a window if none are open but the dock icon is activated
   app.on('activate', function () {
     if (BrowserWindow.getAllWindows().length === 0) {
-      global.mainWindow = createWindow('main')
+      setMainWindow(createWindow('main'))
     }
   })
 

public/app/initializeMenu.js

@@ -18,6 +18,7 @@ const { Menu } = require('electron')
 
 const { timerSystem } = require('../systems/systems')
 const createWindow = require('./createWindow')
+const { setPrefsWindow, getPrefsWindow } = require('./windowManager')
 
 const { isDev } = require('../constants')
 
@@ -29,11 +30,11 @@ const menu = Menu.buildFromTemplate([
         label: 'Preferences',
         accelerator: 'CmdOrCtrl+,',
         click: () => {
-          if (!global.prefsWindow || global.prefsWindow.isDestroyed()) {
-            global.prefsWindow = createWindow('preferences', 'preferences')
+          if (!getPrefsWindow() || getPrefsWindow().isDestroyed()) {
+            setPrefsWindow(createWindow('preferences', 'preferences'))
           } else {
-            global.prefsWindow.restore()
-            global.prefsWindow.focus()
+            getPrefsWindow().restore()
+            getPrefsWindow().focus()
           }
         }
       },

public/app/initializeTray.js

@@ -4,6 +4,7 @@ const { app, nativeTheme, nativeImage, Menu, Tray } = require('electron')
 
 const { isMacOS } = require('../constants')
 const { timerSystem } = require('../systems/systems')
+const { getMainWindow } = require('./windowManager')
 
 let appTray = null
 
@@ -39,8 +40,8 @@ appTray = new Tray(getTrayImage())
 appTray.setToolTip(app.getName())
 appTray.setContextMenu(contextMenu)
 appTray.on('click', () => {
-  global.mainWindow.show()
-  global.mainWindow.focus()
+  getMainWindow().show()
+  getMainWindow().focus()
 })
 
 // Update system tray icon on an interval

public/app/ipcHandlers.js

@@ -7,6 +7,7 @@ const { BrowserWindow, ipcMain, app, nativeTheme } = require('electron')
 
 const { isDev } = require('../constants')
 const createWindow = require('./createWindow')
+const { getPrefsWindow, setPrefsWindow } = require('./windowManager')
 
 /* ------------------------------------------------------------------------- */
 /* Main */
@@ -23,11 +24,11 @@ ipcMain.handle('log-to-main', (event, content) => {
 
 // Open preferences
 ipcMain.handle('open-preferences', () => {
-  if (!global.prefsWindow || global.prefsWindow.isDestroyed()) {
-    global.prefsWindow = createWindow('preferences', 'preferences')
+  if (!getPrefsWindow() || getPrefsWindow().isDestroyed()) {
+    setPrefsWindow(createWindow('preferences', 'preferences'))
   } else {
-    global.prefsWindow.restore()
-    global.prefsWindow.focus()
+    getPrefsWindow().restore()
+    getPrefsWindow().focus()
   }
 })
 

public/app/theming.js

@@ -1,6 +1,7 @@
 const { nativeTheme } = require('electron')
 
 const store = require('../store/store')
+const { getMainWindow, getPrefsWindow } = require('./windowManager')
 
 /** Theming */
 
@@ -11,11 +12,11 @@ nativeTheme.themeSource = store.get('preferences.appearance.theme')
 nativeTheme.on('updated', () => {
   const themeName = nativeTheme.shouldUseDarkColors ? 'dark' : 'light'
 
-  if (global.mainWindow && !global.mainWindow.isDestroyed()) {
-    global.mainWindow.webContents.send('theme-updated', themeName)
+  if (getMainWindow() && !getMainWindow().isDestroyed()) {
+    getMainWindow().webContents.send('theme-updated', themeName)
   }
 
-  if (global.prefsWindow && !global.prefsWindow.isDestroyed()) {
-    global.prefsWindow.webContents.send('theme-updated', themeName)
+  if (getPrefsWindow() && !getPrefsWindow().isDestroyed()) {
+    getPrefsWindow().webContents.send('theme-updated', themeName)
   }
 })

public/app/windowManager.js

@@ -0,0 +1,23 @@
+let mainWindow
+let prefsWindow
+
+function sendToAllWindows (channel, message) {
+  for (const window of [mainWindow, prefsWindow]) {
+    if (window && !window.isDestroyed()) {
+      window.webContents.send(channel, message)
+    }
+  }
+}
+
+/** Exports */
+module.exports = {
+
+  getMainWindow: () => mainWindow,
+  getPrefsWindow: () => prefsWindow,
+
+  setMainWindow: (window) => { mainWindow = window },
+  setPrefsWindow: (window) => { prefsWindow = window },
+
+  sendToAllWindows: sendToAllWindows
+
+}

public/enforceInstance.js

@@ -5,13 +5,15 @@
 
 const { app } = require('electron')
 
+const { getMainWindow } = require('./app/windowManager')
+
 // Lock acquisition
 const gotSingleInstanceLock = app.requestSingleInstanceLock()
 if (!gotSingleInstanceLock) app.exit() // Quit the app if another app has the lock
 
 // Show first instance if a second instance is requested
 app.on('second-instance', () => {
-  if (global.mainWindow && !global.mainWindow.isDestroyed()) {
-    global.mainWindow.show()
+  if (getMainWindow() && !getMainWindow().isDestroyed()) {
+    getMainWindow().show()
   }
 })

public/ipc/storeIPC.js

@@ -3,10 +3,11 @@ const path = require('path')
 const { ipcMain, app, dialog } = require('electron')
 
 const store = require('../store/store')
+const { getPrefsWindow } = require('../app/windowManager')
 
 // Show a dialog to import a custom sound
 ipcMain.handle('add-custom-sound', (event) => {
-  dialog.showOpenDialog(global.mainWindow, {
+  dialog.showOpenDialog(getPrefsWindow(), {
     title: 'Choose custom sound',
     filters: [{
       name: 'Audio files',

public/ipc/systemsIPC.js

@@ -1,6 +1,6 @@
 const { ipcMain } = require('electron')
 
-const { timerSystem, breakSystem, blockerSystem } = require('../systems/systems')
+const { timerSystem, breakSystem, blockerSystem, appSnapshotSystem } = require('../systems/systems')
 
 /* ------------------------------------------------------------------------- */
 /* System-related */
@@ -37,7 +37,7 @@ ipcMain.handle('play-sound', () => {
 
 // Get list of open windows
 ipcMain.on('get-open-windows', async (event) => {
-  event.returnValue = global.systems.appSnapshot.getLastSnapshot()
+  event.returnValue = appSnapshotSystem.getLastSnapshot()
 })
 
 // Get timer status

public/store/store.js

@@ -7,6 +7,7 @@ const { nativeTheme, app } = require('electron')
 const Store = require('electron-store')
 
 const storeSchema = require('./storeSchema')
+const { getMainWindow, sendToAllWindows } = require('../app/windowManager')
 
 /** Initialize the store and reset if necessary */
 
@@ -30,29 +31,18 @@ store.onDidChange('preferences.startup.startAppOnLogin', (newVal, oldVal) => {
 
 // Configure the main BrowserWindow's alwaysOnTop property when its corresponding preference option changes
 store.onDidChange('preferences.appearance.alwaysOnTop', (newVal, oldVal) => {
-  global.mainWindow.setAlwaysOnTop(newVal)
+  getMainWindow().setAlwaysOnTop(newVal)
 })
 
 // Notify the preferences window and main window when any preference changes
 store.onDidChange('preferences', () => {
-  if (global.mainWindow && !global.mainWindow.isDestroyed()) {
-    global.mainWindow.webContents.send('store-changed', 'preferences')
-  }
+  sendToAllWindows('store-changed', 'preferences')
 
-  if (global.prefsWindow && !global.prefsWindow.isDestroyed()) {
-    global.prefsWindow.webContents.send('store-changed', 'preferences')
-  }
 })
 
 // Notify the preferences and main window when there is an update to the list of sounds
 store.onDidChange('sounds', () => {
-  if (global.mainWindow && !global.mainWindow.isDestroyed()) {
-    global.mainWindow.webContents.send('store-changed', 'sounds')
-  }
-
-  if (global.prefsWindow && !global.prefsWindow.isDestroyed()) {
-    global.prefsWindow.webContents.send('store-changed', 'sounds')
-  }
+  sendToAllWindows('store-changed', 'sounds')
 })
 
 // Update the Electron nativeTheme's themeSource property when its corresponding preference changes

public/systems/modules/TimerSystem.js

@@ -43,6 +43,7 @@
 
 const EventEmitter = require('./EventEmitter')
 const store = require('../../store/store')
+const { sendToAllWindows } = require('../../app/windowManager')
 
 /** Timer states */
 const states = {
@@ -179,10 +180,10 @@ module.exports = class TimerSystem extends EventEmitter {
   resetSendingInterval () {
     clearInterval(this.sendingInterval)
 
-    if (global.mainWindow && !global.mainWindow.isDestroyed()) { global.mainWindow.webContents.send('receive-timer-status', this.getStatus()) }
+    sendToAllWindows('receive-timer-status', this.getStatus())
 
     this.sendingInterval = setInterval(() => {
-      if (global.mainWindow && !global.mainWindow.isDestroyed()) { global.mainWindow.webContents.send('receive-timer-status', this.getStatus()) }
+      sendToAllWindows('receive-timer-status', this.getStatus())
     }, 1000)
   }