Merge branch 'release/v3.7.2'

Author: zamitto

.env.example

@@ -3,3 +3,4 @@ MAIN_VITE_AUTH_URL=
 MAIN_VITE_WS_URL=
 RENDERER_VITE_REAL_DEBRID_REFERRAL_ID=
 RENDERER_VITE_TORBOX_REFERRAL_CODE=
+MAIN_VITE_LAUNCHER_SUBDOMAIN=

.github/workflows/build-renderer.yml

@@ -6,23 +6,38 @@ concurrency:
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - release/**
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
+    permissions:
+      contents: read
+
+    env:
+      NODE_OPTIONS: --max-old-space-size=4096
+      BRANCH_NAME: ${{ github.ref_name }}
+
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-      - name: Install Node.js
+      - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
           node-version: 22.21.0
+          cache: "yarn"
+
+      - name: Enable Corepack (Yarn)
+        run: corepack enable
 
       - name: Install dependencies
-        run: yarn --frozen-lockfile --ignore-scripts
+        run: yarn install --frozen-lockfile --ignore-scripts
 
       - name: Build Renderer
         run: yarn build
@@ -36,5 +51,5 @@ jobs:
         run: |
           npx --yes wrangler@3 pages deploy out/renderer \
             --project-name="hydra" \
-            --commit-dirty=true \
-            --branch="main"
+            --branch "$BRANCH_NAME" \
+            --commit-dirty

.github/workflows/release.yml

@@ -6,7 +6,8 @@ concurrency:
 
 on:
   push:
-    branches: [main]
+    branches:
+      - release/**
 
 jobs:
   build:
@@ -61,7 +62,7 @@ jobs:
           RENDERER_VITE_SENTRY_DSN: ${{ vars.SENTRY_DSN }}
           RENDERER_VITE_REAL_DEBRID_REFERRAL_ID: ${{ vars.RENDERER_VITE_REAL_DEBRID_REFERRAL_ID }}
           RENDERER_VITE_TORBOX_REFERRAL_CODE: ${{ vars.RENDERER_VITE_TORBOX_REFERRAL_CODE }}
-          MAIN_VITE_RENDERER_URL: ${{ vars.MAIN_VITE_RENDERER_URL }}
+          MAIN_VITE_LAUNCHER_SUBDOMAIN: ${{ vars.MAIN_VITE_LAUNCHER_SUBDOMAIN }}
 
       - name: Build Windows
         if: matrix.os == 'windows-2022'
@@ -78,7 +79,7 @@ jobs:
           RENDERER_VITE_SENTRY_DSN: ${{ vars.SENTRY_DSN }}
           RENDERER_VITE_REAL_DEBRID_REFERRAL_ID: ${{ vars.RENDERER_VITE_REAL_DEBRID_REFERRAL_ID }}
           RENDERER_VITE_TORBOX_REFERRAL_CODE: ${{ vars.RENDERER_VITE_TORBOX_REFERRAL_CODE }}
-          MAIN_VITE_RENDERER_URL: ${{ vars.MAIN_VITE_RENDERER_URL }}
+          MAIN_VITE_LAUNCHER_SUBDOMAIN: ${{ vars.MAIN_VITE_LAUNCHER_SUBDOMAIN }}
 
       - name: Create artifact
         uses: actions/upload-artifact@v4

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hydralauncher",
-  "version": "3.7.1",
+  "version": "3.7.2",
   "description": "Hydra",
   "main": "./out/main/index.js",
   "author": "Los Broxas",

src/main/services/window-manager.ts

@@ -25,6 +25,7 @@ import type {
 } from "@types";
 import { AuthPage, generateAchievementCustomNotificationTest } from "@shared";
 import { isStaging } from "@main/constants";
+import { logger } from "./logger";
 
 export class WindowManager {
   public static mainWindow: Electron.BrowserWindow | null = null;
@@ -54,21 +55,25 @@ export class WindowManager {
       show: false,
     };
 
+  private static formatVersionNumber(version: string) {
+    return version.replaceAll(".", "-");
+  }
+
   private static async loadWindowURL(window: BrowserWindow, hash: string = "") {
     // HMR for renderer base on electron-vite cli.
     // Load the remote URL for development or the local html file for production.
     if (is.dev && process.env["ELECTRON_RENDERER_URL"]) {
       window.loadURL(`${process.env["ELECTRON_RENDERER_URL"]}#/${hash}`);
-    } else if (import.meta.env.MAIN_VITE_RENDERER_URL) {
+    } else if (import.meta.env.MAIN_VITE_LAUNCHER_SUBDOMAIN) {
       // Try to load from remote URL in production
       try {
         await window.loadURL(
-          `${import.meta.env.MAIN_VITE_RENDERER_URL}#/${hash}`
+          `https://release-v${this.formatVersionNumber(app.getVersion())}.${import.meta.env.MAIN_VITE_LAUNCHER_SUBDOMAIN}#/${hash}`
         );
       } catch (error) {
         // Fall back to local file if remote URL fails
-        console.error(
-          "Failed to load from MAIN_VITE_RENDERER_URL, falling back to local file:",
+        logger.error(
+          "Failed to load from MAIN_VITE_LAUNCHER_SUBDOMAIN, falling back to local file:",
           error
         );
         window.loadFile(path.join(__dirname, "../renderer/index.html"), {

src/main/vite-env.d.ts

@@ -7,7 +7,7 @@ interface ImportMetaEnv {
   readonly MAIN_VITE_CHECKOUT_URL: string;
   readonly MAIN_VITE_EXTERNAL_RESOURCES_URL: string;
   readonly MAIN_VITE_WS_URL: string;
-  readonly MAIN_VITE_RENDERER_URL: string;
+  readonly MAIN_VITE_LAUNCHER_SUBDOMAIN: string;
   readonly ELECTRON_RENDERER_URL: string;
 }