fix: fixes #448 Theming not OK Windows 11

jarrodek · jarrodek · commit 260eec6ea849 · 2022-02-07T16:56:53.000-08:00
Signed-off-by: Pawel Psztyc &lt;jarrodek@gmail.com&gt;
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,6 +4,7 @@
     "advancedrestclient",
     "appresources",
     "arccontextmenu",
+    "asar",
     "autoupdate",
     "camelcase",
     "codemirror",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "@types/uuid": "^8.3.1",
     "chai": "^4.3.4",
     "chance": "^1.1.8",
-    "dotenv": "^15.0.0",
+    "dotenv": "^16.0.0",
     "electron": "^17.0.0",
     "electron-builder": "^22.13.1",
     "electron-builder-notarize": "^1.2.0",
@@ -77,7 +77,7 @@
     "pouchdb": "^7.2.2",
     "rimraf": "^3.0.2",
     "sinon": "^13.0.0",
-    "spectron": "^15.0.0",
+    "spectron": "^19.0.0",
     "typescript": "^4.4.4",
     "typescript-lit-html-plugin": "^0.9.0"
   },
@@ -86,7 +86,7 @@
     "@advanced-rest-client/events": "^0.2.31",
     "@api-components/amf-web-api": "^0.1.1",
     "camelcase": "^6.2.0",
-    "electron-log": "^4.4.1",
+    "electron-log": "^4.4.6",
     "electron-prompt": "^1.7.0",
     "electron-updater": "^4.3.9",
     "esm": "^3.2.25",
diff --git a/src/io/AmfParserConnector.js b/src/io/AmfParserConnector.js
@@ -27,6 +27,10 @@ export class AmfParserConnector {
     ipcMain.handle('amf-parser', this.ipcHandler.bind(this));
   }
 
+  unlisten() {
+    ipcMain.removeHandler('amf-parser');
+  }
+
   /**
    * @param {Electron.IpcMainEvent} e
    * @param {string} action The action to perform.
diff --git a/src/io/AppPrompts.js b/src/io/AppPrompts.js
@@ -17,6 +17,11 @@ export class AppPrompts {
     ipcMain.handle('open-dialog', this[openDialogHandler].bind(this));
   }
 
+  unlisten() {
+    ipcMain.removeHandler('save-dialog');
+    ipcMain.removeHandler('open-dialog');
+  }
+
   /**
    * Handles save action dialog. Opens "save as..." dialog and returns the result to the app.
    *
diff --git a/src/io/AppStateManager.js b/src/io/AppStateManager.js
@@ -33,6 +33,11 @@ export class AppStateManager extends ArcPreferences {
     ipcMain.handle('app-state-update', this[changeHandler]);
   }
 
+  unlisten() {
+    ipcMain.removeHandler('app-state-read');
+    ipcMain.removeHandler('app-state-update');
+  }
+
   async [readHandler]() {
     let data;
     try {
diff --git a/src/io/ApplicationDefaults.js b/src/io/ApplicationDefaults.js
@@ -1,4 +1,4 @@
-import { ThemeDefaults } from './defaults/ThemeDefaults.js';
+import { ThemeDefaults } from './defaults/ThemeDefaultsNew.js';
 import { WorkspaceDefaults } from  './defaults/WorkspaceDefaults.js';
 import { DataStore } from  './defaults/DataStore.js';
 
diff --git a/src/io/ApplicationMenu.js b/src/io/ApplicationMenu.js
@@ -65,7 +65,7 @@ export class ApplicationMenu extends EventEmitter {
   async getTemplate() {
     const osName = this.platformToName();
     const name = `${osName}.json`;
-    const file = path.join(__dirname, '..', 'menus', name);
+    const file = path.join(app.getAppPath(), 'src', 'menus', name);
     logger.debug(`Menu template location: ${file}`);
     return fs.readJson(file);
   }
diff --git a/src/io/ApplicationUpdater.js b/src/io/ApplicationUpdater.js
@@ -1,6 +1,6 @@
 import { autoUpdater } from 'electron-updater';
 import { EventEmitter } from 'events';
-import { dialog, nativeImage, ipcMain, BrowserWindow } from 'electron';
+import { dialog, nativeImage, ipcMain, BrowserWindow, app } from 'electron';
 import path from 'path';
 import { logger } from './Logger.js';
 
@@ -257,7 +257,7 @@ export class ApplicationUpdater extends EventEmitter {
       detail,
     };
     if (!isError) {
-      const imgPath = path.join(__dirname, '..', '..', 'assets', 'icon.iconset', 'icon_512x512.png');
+      const imgPath = path.join(app.getAppPath(), 'assets', 'icon.iconset', 'icon_512x512.png');
       dialogOpts.icon = nativeImage.createFromPath(imgPath);
     }
     dialog.showMessageBox(dialogOpts);
diff --git a/src/io/ArcEnvironment.js b/src/io/ArcEnvironment.js
@@ -303,15 +303,31 @@ export class ArcEnvironment {
       logger.debug('All windows are now closed.');
       // https://github.com/advanced-rest-client/arc-electron/issues/396
       logger.debug('Quitting the IO thread.');
-      app.quit();
-      // if (process.platform !== 'darwin') {
-      //   logger.debug('Quitting main thread.');
-      // } else {
-      //   logger.debug('Keeping main thread running.');
-      // }
+      this.destruct();
+      // app.quit();
+      app.exit();
     }, 1000);
   }
 
+  destruct() {
+    app.removeAllListeners('activate');
+    app.removeAllListeners('window-all-closed');
+    this.wm.unlisten();
+    this.themes.unlisten();
+    this.sm.unlisten();
+    this.proxy.unlisten();
+    this.config.unlisten();
+    this.appMenuService.unlisten();
+    this.osHosts.unlisten();
+    this.gDrive.unlisten();
+    this.externalResources.unlisten();
+    this.search.unlisten();
+    this.state.unlisten();
+    this.prompts.unlisten();
+    this.updater.unlisten();
+    this.amf.unlisten();
+  }
+
   /**
    * On OS X it's common to re-create a window in the app when the
    * dock icon is clicked and there are no other windows open.
diff --git a/src/io/ContentSearchService.js b/src/io/ContentSearchService.js
@@ -74,6 +74,10 @@ export class ContentSearchService {
     ipcMain.on('search-bar-command', this[searchBarCommandHandler].bind(this));
   }
 
+  unlisten() {
+    ipcMain.off('search-bar-command', this[searchBarCommandHandler].bind(this));
+  }
+
   /**
    * Starts a search for a content window or focuses on the search button if the search bar is already opened.
    * @param {Electron.BrowserWindow} win
diff --git a/src/io/EsmProtocol.js b/src/io/EsmProtocol.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-bitwise */
-import { session, protocol } from 'electron';
+import { session, protocol, app } from 'electron';
 import path from 'path';
 import fs from 'fs-extra';
 import mime from 'mime-types';
@@ -36,7 +36,7 @@ export class EsmProtocol {
      * Base path to the application folder.
      * @type {String}
      */
-    this.basePath = path.join(__dirname, '..', '..');
+    this.basePath = app.getAppPath();
   }
 
   /**
@@ -100,12 +100,12 @@ export class EsmProtocol {
   findFile(filepath, prefixes = locationPrefixes) {
     for (let i = 0, len = prefixes.length; i <len; i++) {
       const prefix = prefixes[i];
-      const loc = path.join(__dirname, '..', '..', prefix, filepath);
+      const loc = path.join(this.basePath, prefix, filepath);
       if (fs.existsSync(loc)) {
         return loc;
       }
     }
-    return path.join(__dirname, '..', '..', filepath);
+    return path.join(this.basePath, filepath);
   }
 
   /**
@@ -146,7 +146,7 @@ export class EsmProtocol {
     if (!absolutePath) {
       return null;
     }
-    const appRoot = path.join(__dirname, '..', '..');
+    const appRoot = this.basePath;
     if (ext) {
       if (!absolutePath.startsWith(appRoot)) {
         // only internal paths are allowed
diff --git a/src/io/ExternalResourcesManager.js b/src/io/ExternalResourcesManager.js
@@ -8,9 +8,19 @@ const openExternalHandler = Symbol('openExternalHandler');
 const openHelpTopicHandler = Symbol('openHelpTopicHandler');
 
 export class ExternalResourcesManager {
+  constructor() {
+    this[openExternalHandler] = this[openExternalHandler].bind(this);
+    this[openHelpTopicHandler] = this[openHelpTopicHandler].bind(this);
+  }
+
   listen() {
-    ipcMain.on('open-external-url', this[openExternalHandler].bind(this));
-    ipcMain.on('help-topic', this[openHelpTopicHandler].bind(this));
+    ipcMain.on('open-external-url', this[openExternalHandler]);
+    ipcMain.on('help-topic', this[openHelpTopicHandler]);
+  }
+
+  unlisten() {
+    ipcMain.off('open-external-url', this[openExternalHandler]);
+    ipcMain.off('help-topic', this[openHelpTopicHandler]);
   }
 
   [openExternalHandler](e, url) {
diff --git a/src/io/HostsManager.js b/src/io/HostsManager.js
@@ -13,11 +13,16 @@ const requestHandler = Symbol('requestHandler');
 export class HostsManager {
   constructor() {
     this.factory = new Hosts();
+    this[requestHandler] = this[requestHandler].bind(this);
   }
 
   listen() {
     logger.debug('Listening for OS hosts events');
-    ipcMain.handle('os-hosts', this[requestHandler].bind(this));
+    ipcMain.handle('os-hosts', this[requestHandler]);
+  }
+
+  unlisten() {
+    ipcMain.removeHandler('os-hosts');
   }
 
   /**
diff --git a/src/io/PopupMenuService.js b/src/io/PopupMenuService.js
@@ -36,6 +36,11 @@ export class PopupMenuService {
     ipcMain.on('popup-app-menu-nav', this[popupNavHandler]);
   }
 
+  unlisten() {
+    ipcMain.off('popup-app-menu', this[popupAppMenuHandler]);
+    ipcMain.off('popup-app-menu-nav', this[popupNavHandler]);
+  }
+
   /**
    * Handler for `popup-app-menu` event dispatched by ARC windows.
    * @param {Event} e
diff --git a/src/io/PreferencesManager.js b/src/io/PreferencesManager.js
@@ -27,6 +27,11 @@ export class PreferencesManager extends ArcPreferences {
     ipcMain.handle('preferences-update', this[changeHandler]);
   }
 
+  unlisten() {
+    ipcMain.removeHandler('preferences-read');
+    ipcMain.removeHandler('preferences-update');
+  }
+
   /**
    * Loads current settings from settings file.
    * This is just to provide typings.
diff --git a/src/io/ProxyManager.js b/src/io/ProxyManager.js
@@ -27,24 +27,43 @@ export class ProxyManager {
     this.currentUsername = undefined;
     /** @type string */
     this.currentPassword = undefined;
+
+    this._appLoginHandler = this._appLoginHandler.bind(this);
+    this._updatedLoginHandler = this._updatedLoginHandler.bind(this);
   }
 
   listen() {
-    app.on('login', (event, webContents, request, authInfo, callback) => {
-      if (this.isConfigured && this.currentUsername && authInfo.isProxy) {
-        event.preventDefault();
-        callback(this.currentUsername, this.currentPassword);
-      } else {
-        callback();
-      }
-    });
-    autoUpdater.on('login', async (authInfo, callback) => {
-      if (this.isConfigured && this.currentUsername && authInfo.isProxy) {
-        callback(this.currentUsername, this.currentPassword);
-      } else {
-        callback();
-      }
-    });
+    app.on('login', this._appLoginHandler);
+    autoUpdater.on('login', this._updatedLoginHandler);
+  }
+
+  unlisten() {
+    app.off('login', this._appLoginHandler);
+    autoUpdater.off('login', this._updatedLoginHandler);
+  }
+
+  /**
+   * @param {Electron.Event} event 
+   * @param {Electron.WebContents} webContents 
+   * @param {Electron.AuthenticationResponseDetails} request 
+   * @param {Electron.AuthInfo} authInfo 
+   * @param {(username?: string, password?: string) => void} callback 
+   */
+  _appLoginHandler(event, webContents, request, authInfo, callback) {
+    if (this.isConfigured && this.currentUsername && authInfo.isProxy) {
+      event.preventDefault();
+      callback(this.currentUsername, this.currentPassword);
+    } else {
+      callback();
+    }
+  }
+
+  _updatedLoginHandler(authInfo, callback) {
+    if (this.isConfigured && this.currentUsername && authInfo.isProxy) {
+      callback(this.currentUsername, this.currentPassword);
+    } else {
+      callback();
+    }
   }
   
   /**
diff --git a/src/io/ThemeManager.js b/src/io/ThemeManager.js
@@ -64,6 +64,17 @@ export class ThemeManager {
     nativeTheme.on('updated', this[osThemeUpdateHandler]);
   }
 
+  unlisten() {
+    ipcMain.removeHandler('theme-manager-read-themes');
+    ipcMain.removeHandler('theme-manager-active-theme-info');
+    ipcMain.removeHandler('theme-manager-activate-theme');
+    ipcMain.removeHandler('theme-manager-install-theme');
+    ipcMain.removeHandler('theme-manager-uninstall-theme');
+    ipcMain.removeHandler('theme-manager-update-property');
+    ipcMain.removeHandler('theme-manager-system-theme');
+    nativeTheme.off('updated', this[osThemeUpdateHandler]);
+  }
+
   /**
    * Reads the current theme info
    * @returns {Promise<ArcThemeStore>}
diff --git a/src/io/WindowsManager.js b/src/io/WindowsManager.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import { BrowserWindow, ipcMain, shell } from 'electron';
+import { BrowserWindow, ipcMain, shell, app } from 'electron';
 import path from 'path';
 import url from 'url';
 import { v4 } from 'uuid';
@@ -149,6 +149,15 @@ export class WindowsManager {
     ipcMain.handle('workspace-change-location', this[workspaceChangeLocationHandler]);
   }
 
+  unlisten() {
+    ipcMain.off('new-window', this[windowOpenHandler]);
+    ipcMain.off('toggle-devtools', this[toggleDevToolsHandler]);
+    ipcMain.off('settings-changed', this[settingHandler]);
+    ipcMain.off('window-context-menu-init', this[winContextInitHandler]);
+    ipcMain.removeHandler('workspace-get-location');
+    ipcMain.removeHandler('workspace-change-location');
+  }
+
   /**
    * Notifies all opened windows with event data.
    *
@@ -301,7 +310,7 @@ export class WindowsManager {
       },
     });
     if (preload) {
-      options.webPreferences.preload = path.join(__dirname, '..', 'preload', preload);
+      options.webPreferences.preload = path.join(app.getAppPath(), 'src', 'preload', preload);
     }
     return options;
   }
diff --git a/src/io/defaults/ThemeDefaults.js b/src/io/defaults/ThemeDefaults.js
@@ -58,9 +58,11 @@ export class ThemeDefaults {
   async _listThemePackages(themePath, parent) {
     let items;
     try {
-      items = await fs.readdir(themePath);
+      items = await fs.readdir(themePath, 'utf8');
     } catch (e) {
-      logger.warn(`Unable to read themes path ${themePath}. Skipping themes initialization.`);
+      logger.error(`Unable to read themes path ${themePath}. Skipping themes initialization.`);
+      logger.error(e);
+      logger.error(e.stack);
       return undefined;
     }
     let themePaths = [];
diff --git a/src/io/defaults/ThemeDefaultsNew.js b/src/io/defaults/ThemeDefaultsNew.js
diff --git a/src/io/lib/FsUtils.js b/src/io/lib/FsUtils.js
diff --git a/src/preload/arc-preload.js b/src/preload/arc-preload.js

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,11 @@ export class AppPrompts {`
`17`	`17`	`ipcMain.handle('open-dialog', this[openDialogHandler].bind(this));`
`18`	`18`	`}`
`19`	`19`
	`20`	`+ unlisten() {`
	`21`	`+ ipcMain.removeHandler('save-dialog');`
	`22`	`+ ipcMain.removeHandler('open-dialog');`
	`23`	`+ }`
	`24`	`+`
`20`	`25`	`/**`
`21`	`26`	`* Handles save action dialog. Opens "save as..." dialog and returns the result to the app.`
`22`	`27`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ThemeDefaults } from './defaults/ThemeDefaults.js';`
	`1`	`+import { ThemeDefaults } from './defaults/ThemeDefaultsNew.js';`
`2`	`2`	`import { WorkspaceDefaults } from './defaults/WorkspaceDefaults.js';`
`3`	`3`	`import { DataStore } from './defaults/DataStore.js';`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ export class ApplicationMenu extends EventEmitter {`
`65`	`65`	`async getTemplate() {`
`66`	`66`	`const osName = this.platformToName();`
`67`	`67`	const name = `${osName}.json`;
`68`		`- const file = path.join(__dirname, '..', 'menus', name);`
	`68`	`+ const file = path.join(app.getAppPath(), 'src', 'menus', name);`
`69`	`69`	logger.debug(`Menu template location: ${file}`);
`70`	`70`	`return fs.readJson(file);`
`71`	`71`	`}`