fix: second instance lock, deep links

zephraOSS · Jun 17, 2023 · 8bacede · 8bacede
1 parent 38c0921
commit 8bacede
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 15 deletions.
diff --git a/src/browser/index.html b/src/browser/index.html
@@ -45,7 +45,7 @@
                 <div class="settings">
                     <div class="notes"></div>
 
-                    <div class="settings_category">
+                    <div class="settings_category" id="general">
                         <div class="category__header">
                             <h3 data-i18n="settings.category.general">
                                 General
@@ -131,7 +131,7 @@ <h3 data-i18n="settings.category.general">
                         </div>
                     </div>
 
-                    <div class="settings_category">
+                    <div class="settings_category" id="rpc">
                         <div class="category__header">
                             <h3>Rich Presence</h3>
                         </div>
@@ -291,7 +291,7 @@ <h3>Rich Presence</h3>
                         </div>
                     </div>
 
-                    <div class="settings_category">
+                    <div class="settings_category" id="lastfm">
                         <div class="category__header">
                             <h3>Last.fm</h3>
                         </div>
@@ -330,7 +330,7 @@ <h3>Last.fm</h3>
                         </div>
                     </div>
 
-                    <div class="settings_category">
+                    <div class="settings_category" id="cache">
                         <div class="category__header">
                             <h3 data-i18n="settings.category.cache">
                                 Cache Management
@@ -396,7 +396,7 @@ <h3 data-i18n="settings.category.cache">
                         </div>
                     </div>
 
-                    <div class="settings_category">
+                    <div class="settings_category" id="advanced">
                         <div class="category__header">
                             <h3 data-i18n="settings.category.advanced">
                                 Advanced

diff --git a/src/browser/preload.ts b/src/browser/preload.ts
@@ -95,7 +95,8 @@ contextBridge.exposeInMainWorld("api", {
             "update-downloaded",
             "get-current-track",
             "open-modal",
-            "lastfm-connect"
+            "lastfm-connect",
+            "url"
         ];
 
         if (validChannels.includes(channel))

diff --git a/src/browser/renderer/api.ts b/src/browser/renderer/api.ts
@@ -125,4 +125,13 @@ export function init() {
 
         new Modal(data.title, data.description, data.buttons);
     });
+
+    window.api.receive("url", async (url: string) => {
+        console.log("[BROWSER][RENDERER]", "Received URL", url);
+
+        document.getElementById(url).scrollIntoView({
+            behavior: "smooth",
+            block: "center"
+        });
+    });
 }
diff --git a/src/browser/renderer/index.ts b/src/browser/renderer/index.ts
@@ -14,6 +14,8 @@ import { init as initLastFM } from "./lastFM.js";
 import { init as initListeners } from "./listeners.js";
 import { init as initEventSettings } from "./eventSettings.js";
 
+initAPI();
+
 declare global {
     interface Window {
         electron: any;
@@ -35,7 +37,6 @@ export let appVersion,
 
 console.log("[BROWSER][RENDERER] Loading...");
 
-initAPI();
 initLastFM();
 initEventSettings();
 initListeners();

diff --git a/src/index.ts b/src/index.ts
@@ -14,6 +14,7 @@ import { init as initAutoUpdater } from "./managers/updater";
 import { init as initTheme } from "./utils/theme";
 import { init as initMsStoreModal } from "./utils/msStoreModal";
 import { init as initCrowdin } from "./utils/crowdin";
+import { init as initProtocol } from "./utils/protocol";
 
 import { checkAppDependency } from "./utils/checkAppDependency";
 
@@ -44,6 +45,7 @@ if (isRC) log.info("[READY]", "Detected release candidate build");
 if (process.windowsStore) log.info("[READY]", "Detected Windows Store build");
 
 initSentry();
+initProtocol();
 
 app.on("ready", async () => {
     await initCrowdin().catch((err) => log.error("[READY][initCrowdin]", err));

diff --git a/src/managers/browser.ts b/src/managers/browser.ts
@@ -14,24 +14,20 @@ export class Browser {
     static awaitsSend: { channel: string; args: any[] }[] = [];
     static instance: Browser;
 
-    constructor() {
+    constructor(url: string = "") {
         if (Browser.instance) {
             Browser.windowAction("show");
             return;
         }
 
         initIPC();
 
-        this.initWindow();
-
-        this.isReady = true;
-
-        this.checkAwaits();
+        this.initWindow(undefined, url);
 
         Browser.instance = this;
     }
 
-    initWindow(show: boolean = false) {
+    initWindow(show: boolean = false, url: string = "") {
         const windowState = getConfig("windowState");
 
         this.window = new BrowserWindow({
@@ -55,7 +51,12 @@ export class Browser {
             this.window = null;
         });
 
-        if (show) this.window.show();
+        if (show || url) this.window.show();
+        if (url) {
+            this.window.webContents.on("did-finish-load", () => {
+                this.window.webContents.send("url", url);
+            });
+        }
     }
 
     async windowAction(action: string) {

diff --git a/src/utils/protocol.ts b/src/utils/protocol.ts
@@ -0,0 +1,40 @@
+import { app } from "electron";
+
+import * as path from "path";
+import { Browser } from "../managers/browser";
+
+export function init() {
+    if (process.defaultApp) {
+        if (process.argv.length >= 2) {
+            app.setAsDefaultProtocolClient("amrpc", process.execPath, [
+                path.resolve(process.argv[1])
+            ]);
+        }
+    } else {
+        app.setAsDefaultProtocolClient("amrpc");
+    }
+
+    app.on("second-instance", (_e, commandLine) => {
+        let url = commandLine.pop()?.replace("amrpc://", "");
+
+        if (url && url.endsWith("/")) url = url.slice(0, -1);
+
+        if (url === "--allow-file-access-from-files") new Browser();
+        else {
+            new Browser(url.replace("settings/", ""));
+        }
+    });
+
+    app.on("open-url", (_e, url) => {
+        if (!url) return;
+
+        url = url.replace("amrpc://", "");
+
+        if (url && url.endsWith("/")) url = url.slice(0, -1);
+
+        if (url === "--allow-file-access-from-files") new Browser();
+        else {
+            new Browser(url.replace("settings/", ""));
+        }
+    });
+}