✨ Electron 7, Discord state and auto-launch

Author: i1u5

package.json

@@ -3,7 +3,7 @@
   "productName": "PreMiD",
   "author": "Jack 'DooMLorD' W. <doomlordcs@gmail.com> (https://github.com/doomlerd)",
   "description": "Discord Rich Presence for web services",
-  "version": "2.2.15",
+  "version": "2.2.16",
   "repository": {
     "type": "git",
     "url": "git://github.com/PreMiD/Linux.git"
@@ -58,12 +58,12 @@
   "devDependencies": {
     "@timeraa/devscript": "Timeraa/DevScript",
     "@types/auto-launch": "5.0.1",
-    "@types/discord-rpc": "3.0.2",
-    "@types/node": "13.11.1",
+    "@types/discord-rpc": "3.0.3",
+    "@types/node": "^12.12.6",
     "@types/socket.io": "2.1.4",
-    "@typescript-eslint/eslint-plugin": "2.27.0",
-    "@typescript-eslint/parser": "2.27.0",
-    "electron": "8.2.1",
+    "@typescript-eslint/eslint-plugin": "2.28.0",
+    "@typescript-eslint/parser": "2.28.0",
+    "electron": "^7.1.11",
     "electron-builder": "22.4.1",
     "eslint": "6.8.0",
     "typescript": "3.8.3"

src/index.ts

@@ -11,10 +11,8 @@ let singleInstanceLock: boolean;
 if (app.isPackaged) singleInstanceLock = app.requestSingleInstanceLock();
 export let trayManager: TrayManager;
 
-//* When app is ready
-export let updateCheckerInterval = null;
-app.whenReady().then(async () => {
-  if (!singleInstanceLock) return app.exit();
+app.on("ready", async () => {
+  if (!singleInstanceLock && app.isPackaged) return app.exit();
 
   trayManager = new TrayManager();
 
@@ -23,7 +21,7 @@ app.whenReady().then(async () => {
 
   if (app.isPackaged && app.name.includes("Portable")) {
     await checkForUpdate(true);
-    updateCheckerInterval = setInterval(() => {
+    setInterval(() => {
       checkForUpdate(true);
     }, 15 * 1000 * 60);
   }

src/managers/discordManager.ts

@@ -1,5 +1,6 @@
 import { Client } from "discord-rpc";
 import { app } from "electron";
+import { trayManager } from "..";
 
 //* Import custom types
 /* eslint-disable no-unused-vars */
@@ -9,6 +10,12 @@ import PresenceData from "../../@types/PreMiD/PresenceData";
 //* Define Presence array
 export let rpcClients: Array<RPCClient> = [];
 
+//* States :
+//* - Disconnected
+//* - Connected
+//* - Connecting
+export let connectionState: String = "Connecting";
+
 class RPCClient {
   clientId: string;
   currentPresence: PresenceData;
@@ -24,21 +31,25 @@ class RPCClient {
     });
 
     this.client.once("ready", () => {
+      updateTray("Connected");
       this.clientReady = true;
       this.setActivity();
     });
 
     this.client.once(
       // @ts-ignore
       "disconnected",
-      () =>
-        (rpcClients = rpcClients.filter(
+      () => {
+        updateTray("Disconnected");
+        rpcClients = rpcClients.filter(
           (client) => client.clientId !== this.clientId
-        ))
+        );
+      }
     );
 
     this.client.login({ clientId: this.clientId }).catch(() => this.destroy());
 
+    updateTray("Connected");
     console.log(`Create RPC client (${this.clientId})`);
   }
 
@@ -54,6 +65,8 @@ class RPCClient {
     )
       presenceData.presenceData.largeImageText = `PreMiD 🐧 v${app.getVersion()}`;
 
+    updateTray("Connected");
+
     this.client
       .setActivity(presenceData.presenceData)
       .catch(() => this.destroy());
@@ -113,6 +126,7 @@ export function clearActivity(clientId: string = undefined) {
 }
 
 export async function getDiscordUser() {
+  updateTray("Connecting");
   return new Promise((resolve, reject) => {
     const c = new Client({ transport: "ipc" });
 
@@ -128,3 +142,10 @@ app.once(
   "will-quit",
   async () => await Promise.all(rpcClients.map((c) => c.destroy()))
 );
+
+function updateTray(reason: string = "Connecting") {
+  if (!connectionState || (connectionState && connectionState !== reason)) {
+    connectionState = reason;
+    if (trayManager) trayManager.update();
+  }
+}

src/managers/launchManager.ts

@@ -14,15 +14,8 @@ let autoLaunch = new AutoLaunch({
 export function update() {
   //* If app not packaged return
   //* Either enable/disable autolaunch
-  if (!app.isPackaged || (app.isPackaged && app.name.includes("Portable"))) {
-    //* Return
-    console.log(
-      (app.isPackaged
-        ? "Portable version detected,"
-        : "Debug version detected,") + " skipping autoLaunch"
-    );
+  if (!app.isPackaged || (app.isPackaged && app.name.includes("Portable")))
     return;
-  }
   //* Enable if disabled and vice versa
   settings.get("autoLaunch") ? autoLaunch.enable() : autoLaunch.disable();
 }

src/managers/socketManager.ts

@@ -16,7 +16,12 @@ import { trayManager } from "..";
 export let io: socketIo.Server;
 export let socket: socketIo.Socket;
 export let server: Server;
-export let connected: boolean = false;
+
+//* States :
+//* - Disconnected
+//* - Connected
+//* - Connecting
+export let connectionState: String = "Connecting";
 
 export function init() {
   return new Promise((resolve) => {
@@ -58,14 +63,14 @@ function socketConnection(cSocket: socketIo.Socket) {
     socket.emit("receiveVersion", app.getVersion().replace(/[\D]/g, ""))
   );
   socket.once("disconnect", () => {
-    connected = false;
-    if(trayManager && trayManager.tray) trayManager.update();
+    updateTray("Disconnected");
+    if (trayManager && trayManager.tray) trayManager.update();
     //* Destroy all open RPC connections
     console.log("Socket disconnected.");
     rpcClients.forEach((c) => c.destroy());
   });
-  connected = true;
-  if(trayManager && trayManager.tray) trayManager.update();
+  updateTray("Connected");
+  if (trayManager && trayManager.tray) trayManager.update();
 }
 
 app.on("quit", () => {
@@ -76,6 +81,7 @@ app.on("quit", () => {
 async function socketError(e: any) {
   //* If port in use
   if (e.code === "EADDRINUSE") {
+    updateTray("Disconnected");
     //* Focus app
     //* Show error dialog
     //* Exit app afterwards
@@ -89,3 +95,10 @@ async function socketError(e: any) {
     console.log(`Socket error :\n${e.message}`);
   }
 }
+
+function updateTray(reason: string = "Connecting") {
+  if (!connectionState || (connectionState && connectionState !== reason)) {
+    connectionState = reason;
+    if (trayManager) trayManager.update();
+  }
+}

src/managers/trayManager.ts

@@ -1,8 +1,10 @@
 import { Menu, Tray, app, shell } from "electron";
 import { join } from "path";
-import { trayManager } from "..";
 import { checkForUpdate, updateProcess } from "../util/updateChecker";
-import { connected } from "./socketManager";
+import { connectionState as socketState } from "./socketManager";
+import { connectionState as discordState } from "./discordManager";
+import { settings } from "./settingsManager";
+import { update as updateAutoLaunch } from "./launchManager";
 
 export class TrayManager {
   tray: Tray;
@@ -14,6 +16,7 @@ export class TrayManager {
 
     this.update();
     this.tray.on("click", () => this.update());
+    this.tray.on("right-click", () => this.update());
   }
 
   update() {
@@ -24,20 +27,32 @@ export class TrayManager {
           enabled: false
         },
         {
-          id: "connectInfo",
-          label: `Extension - ${connected ? "Connected" : "Not connected"}`,
-          enabled: false
+          type: "separator"
         },
         {
-          type: "separator"
+          label: `Extension - ${socketState ? socketState : "Connecting"}`,
+          enabled: false
         },
         {
-          label: "Presence Store",
-          click: () => shell.openExternal("https://premid.app/store")
+          label: `Discord - ${discordState ? socketState : "Disconnected"}`,
+          enabled: false
         },
         {
           type: "separator"
         },
+        {
+          label: "Auto launch",
+          type: "checkbox",
+          click: () => {
+            settings.get("autoLaunch")
+              ? settings.set("autoLaunch", false)
+              : settings.set("autoLaunch", true);
+            updateAutoLaunch();
+          },
+          checked: settings.get("autoLaunch") == true,
+          enabled: app.isPackaged,
+          visible: !app.name.includes("Portable")
+        },
         {
           label: "Check for updates",
           click: () => checkForUpdate(),
@@ -64,6 +79,13 @@ export class TrayManager {
             updateProcess &&
             updateProcess === "checking"
         },
+        {
+          type: "separator"
+        },
+        {
+          label: "Presence Store",
+          click: () => shell.openExternal("https://premid.app/store")
+        },
         {
           label: "Acknowledgments",
           click: () => shell.openExternal("https://premid.app/contributors")
@@ -72,16 +94,10 @@ export class TrayManager {
           type: "separator"
         },
         {
-          label: `Quit ${app.name}`,
+          label: `Quit`,
           role: "quit"
         }
       ])
     );
   }
 }
-
-app.once("quit", () => {
-  if (trayManager && trayManager.tray) {
-    trayManager.tray.destroy();
-  }
-});

src/util/updateChecker.ts

@@ -44,9 +44,11 @@ autoUpdater.on("error", (error: any) => {
   errHandler(error);
 });
 
-function updateTray(reason: string) {
-  updateProcess = reason;
-  trayManager.update();
+function updateTray(reason: string = "standby") {
+  if (!updateProcess || (updateProcess && updateProcess !== reason)) {
+    updateProcess = reason;
+    if (trayManager) trayManager.update();
+  }
 }
 
 // Temporarily