feat(merge): #53 & #54

.gitignore

@@ -3,4 +3,5 @@ node_modules
 .env
 .DS_Store
 .idea/
-.pnpm-store/
+.pnpm-store/
+.direnv

src/main/mainWindow.ts

@@ -25,6 +25,7 @@ import { isTruthy } from "shared/utils/guards";
 import { once } from "shared/utils/once";
 import type { SettingsStore } from "shared/utils/SettingsStore";
 
+import { sleep } from "../shared/utils/sleep";
 import { createAboutWindow } from "./about";
 import { initArRPC } from "./arrpc";
 import {
@@ -482,7 +483,17 @@ function createMainWindow() {
             : "";
 
     addSplashLog();
-    win.loadURL(`https://${subdomain}discord.com/app`);
+    const loadDiscord = async (iteration: number = 0) => {
+        try {
+            await win.loadURL(`https://${subdomain}discord.com/app`);
+        } catch (error) {
+            console.error((error as Error).message);
+            await sleep(2000 * iteration); // Slow down if connection fails multiple times
+            await loadDiscord(iteration++);
+        }
+    };
+
+    loadDiscord();
 
     return win;
 }

src/renderer/utils.ts

@@ -13,8 +13,32 @@ export const isFirstRun = (() => {
     return true;
 })();
 
-const { platform } = navigator;
+export type NavigatorUAData = {
+    platform: string;
+    brands: Array<{ brand: string; version: string }>;
+    mobile: boolean;
+};
 
-export const isWindows = platform.startsWith("Win");
-export const isMac = platform.startsWith("Mac");
-export const isLinux = platform.startsWith("Linux");
+export interface NavigatorExtended extends Navigator {
+    userAgentData?: NavigatorUAData;
+}
+
+const getPlatform = (): string => {
+    const navigatorExtended = navigator as NavigatorExtended;
+
+    if (navigatorExtended.userAgentData) {
+        return navigatorExtended.userAgentData.platform;
+    }
+
+    return navigator.userAgent; // Fallback for older browsers
+};
+
+const platform = getPlatform().toLowerCase();
+
+export const isWindows = platform.includes("win");
+export const isMac = platform.includes("mac");
+export const isLinux = platform.includes("linux");
+
+// console.log("Is Windows?", isWindows);
+// console.log("Is Mac?", isMac);
+// console.log("Is Linux?", isLinux);