Merge branch 'main' of github.com:hydralauncher/hydra into feature/seed-completed-downloads

src/main/constants.ts

@@ -5,12 +5,12 @@ export const LUDUSAVI_MANIFEST_URL = "https://cdn.losbroxas.org/manifest.yaml";
 
 export const defaultDownloadsPath = app.getPath("downloads");
 
+export const isStaging = import.meta.env.MAIN_VITE_API_URL.includes("staging");
+
 export const databaseDirectory = path.join(app.getPath("appData"), "hydra");
 export const databasePath = path.join(
   databaseDirectory,
-  import.meta.env.MAIN_VITE_API_URL.includes("staging")
-    ? "hydra_test.db"
-    : "hydra.db"
+  isStaging ? "hydra_test.db" : "hydra.db"
 );
 
 export const logsPath = path.join(app.getPath("appData"), "hydra", "logs");
@@ -25,4 +25,4 @@ export const achievementSoundPath = app.isPackaged
 
 export const backupsPath = path.join(app.getPath("userData"), "Backups");
 
-export const appVersion = app.getVersion();
+export const appVersion = app.getVersion() + (isStaging ? "-staging" : "");

src/main/events/misc/open-checkout.ts

@@ -1,10 +1,16 @@
 import { shell } from "electron";
 import { registerEvent } from "../register-event";
-import { userAuthRepository } from "@main/repository";
+import {
+  userAuthRepository,
+  userPreferencesRepository,
+} from "@main/repository";
 import { HydraApi } from "@main/services";
 
 const openCheckout = async (_event: Electron.IpcMainInvokeEvent) => {
-  const userAuth = await userAuthRepository.findOne({ where: { id: 1 } });
+  const [userAuth, userPreferences] = await Promise.all([
+    userAuthRepository.findOne({ where: { id: 1 } }),
+    userPreferencesRepository.findOne({ where: { id: 1 } }),
+  ]);
 
   if (!userAuth) {
     return;
@@ -16,6 +22,7 @@ const openCheckout = async (_event: Electron.IpcMainInvokeEvent) => {
 
   const params = new URLSearchParams({
     token: paymentToken,
+    lng: userPreferences?.language || "en",
   });
 
   shell.openExternal(

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

@@ -1,5 +1,4 @@
 import { registerEvent } from "../register-event";
-import parseTorrent from "parse-torrent";
 import type { StartGameDownloadPayload } from "@types";
 import { DownloadManager, HydraApi, logger } from "@main/services";
 
@@ -9,7 +8,6 @@ import { createGame } from "@main/services/library-sync";
 import { steamUrlBuilder } from "@shared";
 import { dataSource } from "@main/data-source";
 import { DownloadQueue, Game } from "@main/entity";
-import { HydraAnalytics } from "@main/services/hydra-analytics";
 
 const startGameDownload = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -91,17 +89,6 @@ const startGameDownload = async (
       logger.error("Failed to create game download", err);
     });
 
-    if (uri.startsWith("magnet:")) {
-      try {
-        const { infoHash } = await parseTorrent(payload.uri);
-        if (infoHash) {
-          HydraAnalytics.postDownload(infoHash).catch(() => {});
-        }
-      } catch (err) {
-        logger.error("Failed to parse torrent", err);
-      }
-    }
-
     await DownloadManager.cancelDownload(updatedGame!.id);
     await DownloadManager.startDownload(updatedGame!);
 

src/main/services/hydra-analytics.ts

@@ -1,34 +0,0 @@
-import { userSubscriptionRepository } from "@main/repository";
-import axios from "axios";
-import { appVersion } from "@main/constants";
-
-export class HydraAnalytics {
-  private static instance = axios.create({
-    baseURL: import.meta.env.MAIN_VITE_ANALYTICS_API_URL,
-    headers: { "User-Agent": `Hydra Launcher v${appVersion}` },
-  });
-
-  private static async hasActiveSubscription() {
-    const userSubscription = await userSubscriptionRepository.findOne({
-      where: { id: 1 },
-    });
-
-    return (
-      userSubscription?.expiresAt && userSubscription.expiresAt > new Date()
-    );
-  }
-
-  static async postDownload(hash: string) {
-    const hasSubscription = await this.hasActiveSubscription();
-
-    return this.instance
-      .post("/track", {
-        event: "download",
-        attributes: {
-          hash,
-          hasSubscription,
-        },
-      })
-      .then((response) => response.data);
-  }
-}

src/main/services/hydra-api.ts

@@ -12,6 +12,7 @@ import { UserNotLoggedInError, SubscriptionRequiredError } from "@shared";
 import { omit } from "lodash-es";
 import { appVersion } from "@main/constants";
 import { getUserData } from "./user/get-user-data";
+import { isFuture, isToday } from "date-fns";
 
 interface HydraApiOptions {
   needsAuth?: boolean;
@@ -45,10 +46,8 @@ export class HydraApi {
   }
 
   private static hasActiveSubscription() {
-    return (
-      this.userAuth.subscription?.expiresAt &&
-      this.userAuth.subscription.expiresAt > new Date()
-    );
+    const expiresAt = this.userAuth.subscription?.expiresAt;
+    return expiresAt && (isFuture(expiresAt) || isToday(expiresAt));
   }
 
   static async handleExternalAuth(uri: string) {
@@ -112,6 +111,8 @@ export class HydraApi {
       expirationTimestamp: 0,
       subscription: null,
     };
+
+    this.post("/auth/logout", {}, { needsAuth: false }).catch(() => {});
   }
 
   static async setupApi() {