Merge branch 'main' into feat/disabling-update-badges

src/main/events/auth/index.ts

@@ -0,0 +1,3 @@
+import "./get-session-hash";
+import "./open-auth-window";
+import "./sign-out";

src/main/events/autoupdater/index.ts

@@ -0,0 +1,2 @@
+import "./check-for-updates";
+import "./restart-and-install-update";

src/main/events/catalogue/index.ts

@@ -0,0 +1,4 @@
+import "./get-game-assets";
+import "./get-game-shop-details";
+import "./get-game-stats";
+import "./get-random-game";

src/main/events/cloud-save/index.ts

@@ -0,0 +1,4 @@
+import "./download-game-artifact";
+import "./get-game-backup-preview";
+import "./select-game-backup-path";
+import "./upload-save-game";

src/main/events/download-sources/index.ts

@@ -0,0 +1,6 @@
+import "./add-download-source";
+import "./get-download-sources-check-baseline";
+import "./get-download-sources-since-value";
+import "./get-download-sources";
+import "./remove-download-source";
+import "./sync-download-sources";

src/main/events/hardware/index.ts

@@ -0,0 +1,2 @@
+import "./check-folder-write-permission";
+import "./get-disk-free-space";

src/main/events/index.ts

@@ -1,107 +1,22 @@
 import { appVersion, defaultDownloadsPath, isStaging } from "@main/constants";
 import { ipcMain } from "electron";
 
-import "./catalogue/get-game-shop-details";
-import "./catalogue/get-random-game";
-import "./catalogue/get-game-stats";
-import "./hardware/get-disk-free-space";
-import "./hardware/check-folder-write-permission";
-import "./library/add-game-to-library";
-import "./library/add-custom-game-to-library";
-import "./library/update-custom-game";
-import "./library/update-game-custom-assets";
-import "./library/add-game-to-favorites";
-import "./library/remove-game-from-favorites";
-import "./library/toggle-game-pin";
-import "./library/create-game-shortcut";
-import "./library/close-game";
-import "./library/delete-game-folder";
-import "./library/get-game-by-object-id";
-import "./library/get-library";
-import "./library/refresh-library-assets";
-import "./library/extract-game-download";
-import "./library/clear-new-download-options";
-import "./library/open-game";
-import "./library/open-game-executable-path";
-import "./library/open-game-installer";
-import "./library/open-game-installer-path";
-import "./library/update-executable-path";
-import "./library/update-launch-options";
-import "./library/verify-executable-path";
-import "./library/remove-game";
-import "./library/remove-game-from-library";
-import "./library/select-game-wine-prefix";
-import "./library/reset-game-achievements";
-import "./library/change-game-playtime";
-import "./library/toggle-automatic-cloud-sync";
-import "./library/get-default-wine-prefix-selection-path";
-import "./library/cleanup-unused-assets";
-import "./library/create-steam-shortcut";
-import "./library/copy-custom-game-asset";
-import "./misc/open-checkout";
-import "./misc/open-external";
-import "./misc/show-open-dialog";
-import "./misc/show-item-in-folder";
-import "./misc/install-common-redist";
-import "./misc/can-install-common-redist";
-import "./misc/save-temp-file";
-import "./misc/delete-temp-file";
-import "./misc/install-hydra-decky-plugin";
-import "./misc/get-hydra-decky-plugin-info";
-import "./misc/check-homebrew-folder-exists";
-import "./misc/hydra-api-call";
-import "./torrenting/cancel-game-download";
-import "./torrenting/pause-game-download";
-import "./torrenting/resume-game-download";
-import "./torrenting/start-game-download";
-import "./torrenting/pause-game-seed";
-import "./torrenting/resume-game-seed";
-import "./torrenting/check-debrid-availability";
-import "./user-preferences/get-user-preferences";
-import "./user-preferences/update-user-preferences";
-import "./user-preferences/auto-launch";
-import "./autoupdater/check-for-updates";
-import "./autoupdater/restart-and-install-update";
-import "./user-preferences/authenticate-real-debrid";
-import "./user-preferences/authenticate-torbox";
-import "./download-sources/add-download-source";
-import "./download-sources/sync-download-sources";
-import "./download-sources/get-download-sources-check-baseline";
-import "./download-sources/get-download-sources-since-value";
-import "./auth/sign-out";
-import "./auth/open-auth-window";
-import "./auth/get-session-hash";
-import "./user/get-auth";
-import "./user/get-unlocked-achievements";
-import "./user/get-compared-unlocked-achievements";
-import "./profile/get-me";
-import "./profile/update-profile";
-import "./profile/process-profile-image";
-import "./profile/sync-friend-requests";
-import "./cloud-save/download-game-artifact";
-import "./cloud-save/get-game-backup-preview";
-import "./cloud-save/upload-save-game";
-import "./cloud-save/select-game-backup-path";
-import "./notifications/publish-new-repacks-notification";
-import "./notifications/update-achievement-notification-window";
-import "./notifications/show-achievement-test-notification";
-import "./themes/add-custom-theme";
-import "./themes/delete-custom-theme";
-import "./themes/get-all-custom-themes";
-import "./themes/delete-all-custom-themes";
-import "./themes/update-custom-theme";
-import "./themes/open-editor-window";
-import "./themes/get-custom-theme-by-id";
-import "./themes/get-active-custom-theme";
-import "./themes/close-editor-window";
-import "./themes/toggle-custom-theme";
-import "./themes/copy-theme-achievement-sound";
-import "./themes/remove-theme-achievement-sound";
-import "./themes/get-theme-sound-path";
-import "./themes/get-theme-sound-data-url";
-import "./themes/import-theme-sound-from-store";
-import "./download-sources/remove-download-source";
-import "./download-sources/get-download-sources";
+import "./auth";
+import "./autoupdater";
+import "./catalogue";
+import "./cloud-save";
+import "./download-sources";
+import "./hardware";
+import "./library";
+import "./leveldb";
+import "./misc";
+import "./notifications";
+import "./profile";
+import "./themes";
+import "./torrenting";
+import "./user";
+import "./user-preferences";
+
 import { isPortableVersion } from "@main/helpers";
 
 ipcMain.handle("ping", () => "pong");

src/main/events/leveldb/helpers.ts

@@ -0,0 +1,27 @@
+import { db } from "@main/level";
+
+const sublevelCache = new Map<
+  string,
+  ReturnType<typeof db.sublevel<string, unknown>>
+>();
+
+/**
+ * Gets a sublevel by name, creating it if it doesn't exist.
+ * All sublevels use "json" encoding by default.
+ * @param sublevelName - The name of the sublevel to get or create
+ * @returns The sublevel instance
+ */
+export const getSublevelByName = (
+  sublevelName: string
+): ReturnType<typeof db.sublevel<string, unknown>> => {
+  if (sublevelCache.has(sublevelName)) {
+    return sublevelCache.get(sublevelName)!;
+  }
+
+  // All sublevels use "json" encoding - this cannot be changed per sublevel
+  const sublevel = db.sublevel<string, unknown>(sublevelName, {
+    valueEncoding: "json",
+  });
+  sublevelCache.set(sublevelName, sublevel);
+  return sublevel;
+};

src/main/events/leveldb/index.ts

@@ -0,0 +1,6 @@
+import "./leveldb-get";
+import "./leveldb-put";
+import "./leveldb-del";
+import "./leveldb-clear";
+import "./leveldb-values";
+import "./leveldb-iterator";

src/main/events/leveldb/leveldb-clear.ts

@@ -0,0 +1,18 @@
+import { registerEvent } from "../register-event";
+import { getSublevelByName } from "./helpers";
+import { logger } from "@main/services";
+
+const leveldbClear = async (
+  _event: Electron.IpcMainInvokeEvent,
+  sublevelName: string
+) => {
+  try {
+    const sublevel = getSublevelByName(sublevelName);
+    await sublevel.clear();
+  } catch (error) {
+    logger.error("Error in leveldbClear", error);
+    throw error;
+  }
+};
+
+registerEvent("leveldbClear", leveldbClear);

src/main/events/leveldb/leveldb-del.ts

@@ -0,0 +1,28 @@
+import { registerEvent } from "../register-event";
+import { db } from "@main/level";
+import { getSublevelByName } from "./helpers";
+import { logger } from "@main/services";
+
+const leveldbDel = async (
+  _event: Electron.IpcMainInvokeEvent,
+  key: string,
+  sublevelName?: string | null
+) => {
+  try {
+    if (sublevelName) {
+      const sublevel = getSublevelByName(sublevelName);
+      await sublevel.del(key);
+    } else {
+      await db.del(key);
+    }
+  } catch (error) {
+    if (error instanceof Error && error.name === "NotFoundError") {
+      // NotFoundError on delete is not an error, just return
+      return;
+    }
+    logger.error("Error in leveldbDel", error);
+    throw error;
+  }
+};
+
+registerEvent("leveldbDel", leveldbDel);

src/main/events/leveldb/leveldb-get.ts

@@ -0,0 +1,28 @@
+import { registerEvent } from "../register-event";
+import { db } from "@main/level";
+import { getSublevelByName } from "./helpers";
+import { logger } from "@main/services";
+
+const leveldbGet = async (
+  _event: Electron.IpcMainInvokeEvent,
+  key: string,
+  sublevelName?: string | null,
+  valueEncoding: "json" | "utf8" = "json"
+) => {
+  try {
+    if (sublevelName) {
+      // Note: sublevels always use "json" encoding, valueEncoding parameter is ignored
+      const sublevel = getSublevelByName(sublevelName);
+      return sublevel.get(key);
+    }
+    return db.get<string, unknown>(key, { valueEncoding });
+  } catch (error) {
+    if (error instanceof Error && error.name === "NotFoundError") {
+      return null;
+    }
+    logger.error("Error in leveldbGet", error);
+    throw error;
+  }
+};
+
+registerEvent("leveldbGet", leveldbGet);

src/main/events/leveldb/leveldb-iterator.ts

@@ -0,0 +1,18 @@
+import { registerEvent } from "../register-event";
+import { getSublevelByName } from "./helpers";
+import { logger } from "@main/services";
+
+const leveldbIterator = async (
+  _event: Electron.IpcMainInvokeEvent,
+  sublevelName: string
+) => {
+  try {
+    const sublevel = getSublevelByName(sublevelName);
+    return sublevel.iterator().all();
+  } catch (error) {
+    logger.error("Error in leveldbIterator", error);
+    throw error;
+  }
+};
+
+registerEvent("leveldbIterator", leveldbIterator);

src/main/events/leveldb/leveldb-put.ts

@@ -0,0 +1,27 @@
+import { registerEvent } from "../register-event";
+import { db } from "@main/level";
+import { getSublevelByName } from "./helpers";
+import { logger } from "@main/services";
+
+const leveldbPut = async (
+  _event: Electron.IpcMainInvokeEvent,
+  key: string,
+  value: unknown,
+  sublevelName?: string | null,
+  valueEncoding: "json" | "utf8" = "json"
+) => {
+  try {
+    if (sublevelName) {
+      // Note: sublevels always use "json" encoding, valueEncoding parameter is ignored
+      const sublevel = getSublevelByName(sublevelName);
+      await sublevel.put(key, value);
+    } else {
+      await db.put<string, unknown>(key, value, { valueEncoding });
+    }
+  } catch (error) {
+    logger.error("Error in leveldbPut", error);
+    throw error;
+  }
+};
+
+registerEvent("leveldbPut", leveldbPut);

src/main/events/leveldb/leveldb-values.ts

@@ -0,0 +1,18 @@
+import { registerEvent } from "../register-event";
+import { getSublevelByName } from "./helpers";
+import { logger } from "@main/services";
+
+const leveldbValues = async (
+  _event: Electron.IpcMainInvokeEvent,
+  sublevelName: string
+) => {
+  try {
+    const sublevel = getSublevelByName(sublevelName);
+    return sublevel.values().all();
+  } catch (error) {
+    logger.error("Error in leveldbValues", error);
+    throw error;
+  }
+};
+
+registerEvent("leveldbValues", leveldbValues);

src/main/events/library/index.ts

@@ -0,0 +1,32 @@
+import "./add-custom-game-to-library";
+import "./add-game-to-favorites";
+import "./add-game-to-library";
+import "./change-game-playtime";
+import "./cleanup-unused-assets";
+import "./clear-new-download-options";
+import "./close-game";
+import "./copy-custom-game-asset";
+import "./create-game-shortcut";
+import "./create-steam-shortcut";
+import "./delete-game-folder";
+import "./extract-game-download";
+import "./get-default-wine-prefix-selection-path";
+import "./get-game-by-object-id";
+import "./get-library";
+import "./open-game-executable-path";
+import "./open-game-installer-path";
+import "./open-game-installer";
+import "./open-game";
+import "./refresh-library-assets";
+import "./remove-game-from-favorites";
+import "./remove-game-from-library";
+import "./remove-game";
+import "./reset-game-achievements";
+import "./select-game-wine-prefix";
+import "./toggle-automatic-cloud-sync";
+import "./toggle-game-pin";
+import "./update-custom-game";
+import "./update-executable-path";
+import "./update-game-custom-assets";
+import "./update-launch-options";
+import "./verify-executable-path";

src/main/events/misc/index.ts

@@ -0,0 +1,12 @@
+import "./can-install-common-redist";
+import "./check-homebrew-folder-exists";
+import "./delete-temp-file";
+import "./get-hydra-decky-plugin-info";
+import "./hydra-api-call";
+import "./install-common-redist";
+import "./install-hydra-decky-plugin";
+import "./open-checkout";
+import "./open-external";
+import "./save-temp-file";
+import "./show-item-in-folder";
+import "./show-open-dialog";

src/main/events/notifications/index.ts

@@ -0,0 +1,3 @@
+import "./publish-new-repacks-notification";
+import "./show-achievement-test-notification";
+import "./update-achievement-notification-window";

src/main/events/profile/index.ts

@@ -0,0 +1,4 @@
+import "./get-me";
+import "./process-profile-image";
+import "./sync-friend-requests";
+import "./update-profile";

src/main/events/themes/index.ts

@@ -0,0 +1,15 @@
+import "./add-custom-theme";
+import "./close-editor-window";
+import "./copy-theme-achievement-sound";
+import "./delete-all-custom-themes";
+import "./delete-custom-theme";
+import "./get-active-custom-theme";
+import "./get-all-custom-themes";
+import "./get-custom-theme-by-id";
+import "./get-theme-sound-data-url";
+import "./get-theme-sound-path";
+import "./import-theme-sound-from-store";
+import "./open-editor-window";
+import "./remove-theme-achievement-sound";
+import "./toggle-custom-theme";
+import "./update-custom-theme";

src/main/events/torrenting/index.ts

@@ -0,0 +1,7 @@
+import "./cancel-game-download";
+import "./check-debrid-availability";
+import "./pause-game-download";
+import "./pause-game-seed";
+import "./resume-game-download";
+import "./resume-game-seed";
+import "./start-game-download";

src/main/events/torrenting/resume-game-download.ts

@@ -13,7 +13,11 @@ const resumeGameDownload = async (
 
   const download = await downloadsSublevel.get(gameKey);
 
-  if (download?.status === "paused") {
+  if (
+    download &&
+    (download.status === "paused" || download.status === "active") &&
+    download.progress !== 1
+  ) {
     await DownloadManager.pauseDownload();
 
     for await (const [key, value] of downloadsSublevel.iterator()) {

src/main/events/user-preferences/index.ts

@@ -0,0 +1,5 @@
+import "./authenticate-real-debrid";
+import "./authenticate-torbox";
+import "./auto-launch";
+import "./get-user-preferences";
+import "./update-user-preferences";

src/main/events/user/index.ts

@@ -0,0 +1,3 @@
+import "./get-auth";
+import "./get-compared-unlocked-achievements";
+import "./get-unlocked-achievements";

src/main/level/sublevels/downloadSourcesCheckTimestamp.ts

@@ -7,7 +7,9 @@ export const getDownloadSourcesCheckBaseline = async (): Promise<
   string | null
 > => {
   try {
-    const timestamp = await db.get(levelKeys.downloadSourcesCheckBaseline);
+    const timestamp = await db.get(levelKeys.downloadSourcesCheckBaseline, {
+      valueEncoding: "utf8",
+    });
     return timestamp;
   } catch (error) {
     if (error instanceof Error && error.name === "NotFoundError") {
@@ -27,7 +29,9 @@ export const updateDownloadSourcesCheckBaseline = async (
   timestamp: string
 ): Promise<void> => {
   const utcTimestamp = new Date(timestamp).toISOString();
-  await db.put(levelKeys.downloadSourcesCheckBaseline, utcTimestamp);
+  await db.put(levelKeys.downloadSourcesCheckBaseline, utcTimestamp, {
+    valueEncoding: "utf8",
+  });
 };
 
 // Gets the 'since' value the API used in the last check (for modal comparison)
@@ -35,7 +39,9 @@ export const getDownloadSourcesSinceValue = async (): Promise<
   string | null
 > => {
   try {
-    const timestamp = await db.get(levelKeys.downloadSourcesSinceValue);
+    const timestamp = await db.get(levelKeys.downloadSourcesSinceValue, {
+      valueEncoding: "utf8",
+    });
     return timestamp;
   } catch (error) {
     if (error instanceof Error && error.name === "NotFoundError") {
@@ -55,5 +61,7 @@ export const updateDownloadSourcesSinceValue = async (
   timestamp: string
 ): Promise<void> => {
   const utcTimestamp = new Date(timestamp).toISOString();
-  await db.put(levelKeys.downloadSourcesSinceValue, utcTimestamp);
+  await db.put(levelKeys.downloadSourcesSinceValue, utcTimestamp, {
+    valueEncoding: "utf8",
+  });
 };

src/main/main.ts

@@ -1,5 +1,5 @@
 import { downloadsSublevel } from "./level/sublevels/downloads";
-import { sortBy } from "lodash-es";
+import { orderBy } from "lodash-es";
 import { Downloader } from "@shared";
 import { levelKeys, db } from "./level";
 import type { UserPreferences } from "@types";
@@ -70,7 +70,7 @@ export const loadState = async () => {
     .values()
     .all()
     .then((games) => {
-      return sortBy(games, "timestamp", "DESC");
+      return orderBy(games, "timestamp", "desc");
     });
 
   downloads.forEach((download) => {

src/main/services/download/download-manager.ts

@@ -20,7 +20,7 @@ import { RealDebridClient } from "./real-debrid";
 import path from "path";
 import { logger } from "../logger";
 import { db, downloadsSublevel, gamesSublevel, levelKeys } from "@main/level";
-import { sortBy } from "lodash-es";
+import { orderBy } from "lodash-es";
 import { TorBoxClient } from "./torbox";
 import { GameFilesManager } from "../game-files-manager";
 import { HydraDebridClient } from "./hydra-debrid";
@@ -194,10 +194,10 @@ export class DownloadManager {
           .values()
           .all()
           .then((games) => {
-            return sortBy(
+            return orderBy(
               games.filter((game) => game.status === "paused" && game.queued),
               "timestamp",
-              "DESC"
+              "desc"
             );
           });
 

src/main/services/hydra-api.ts

@@ -30,7 +30,7 @@ export class HydraApi {
   private static instance: AxiosInstance;
 
   private static readonly EXPIRATION_OFFSET_IN_MS = 1000 * 60 * 5; // 5 minutes
-  private static readonly ADD_LOG_INTERCEPTOR = true;
+  private static readonly ADD_LOG_INTERCEPTOR = false;
 
   private static secondsToMilliseconds(seconds: number) {
     return seconds * 1000;
@@ -58,7 +58,13 @@ export class HydraApi {
     const decodedBase64 = atob(payload as string);
     const jsonData = JSON.parse(decodedBase64);
 
-    const { accessToken, expiresIn, refreshToken } = jsonData;
+    const {
+      accessToken,
+      expiresIn,
+      refreshToken,
+      featurebaseJwt,
+      workwondersJwt,
+    } = jsonData;
 
     const now = new Date();
 
@@ -85,6 +91,8 @@ export class HydraApi {
         accessToken,
         refreshToken,
         tokenExpirationTimestamp,
+        featurebaseJwt,
+        workwondersJwt,
       },
       { valueEncoding: "json" }
     );

src/main/services/system-path.ts

@@ -13,9 +13,9 @@ export class SystemPath {
   };
 
   static checkIfPathsAreAvailable() {
-    const paths = Object.keys(SystemPath.paths) as Array<
-      keyof typeof SystemPath.paths
-    >;
+    const paths = Object.keys(
+      SystemPath.paths
+    ) as (keyof typeof SystemPath.paths)[];
 
     paths.forEach((pathName) => {
       try {

src/main/services/window-manager.ts

@@ -138,7 +138,8 @@ export class WindowManager {
       (details, callback) => {
         if (
           details.webContentsId !== this.mainWindow?.webContents.id ||
-          details.url.includes("chatwoot")
+          details.url.includes("chatwoot") ||
+          details.url.includes("workwonders")
         ) {
           return callback(details);
         }
@@ -159,7 +160,8 @@ export class WindowManager {
         if (
           details.webContentsId !== this.mainWindow?.webContents.id ||
           details.url.includes("featurebase") ||
-          details.url.includes("chatwoot")
+          details.url.includes("chatwoot") ||
+          details.url.includes("workwonders")
         ) {
           return callback(details);
         }