Merge pull request #489 from Zagrios/chore/use-self-contained-depot-downloader

[chore] use self contained depot downloader
2026-07-03 14:08:25 +02:00 · 2024-06-04 21:09:45 +02:00
parent d91a95ec0b 764eeff57a
commit f0cbb066e4
25 changed files with 20 additions and 324 deletions
@@ -238,9 +238,6 @@
                    }
                },
                "errors": {
-                    "titles": {
-                        "dotnet-required": ".NET 6 Benötigt"
-                    },
                    "msg": {
                        "401": "Steam scheint uns BeatSaber nicht herunterladen zu lassen 😢",
                        "404": "Steam-Server können nicht kontaktiert werden.",
@@ -263,11 +260,7 @@
                        "LicenceError": "Die Liste der Lizenzen kann nicht abgerufen werden.",
                        "RateLimitExceeded": "Du hast es zu oft versucht, warte eine Weile und versuche es später erneut.",
                        "TokenRejected": "Ihr Anmeldetoken wurde abgelehnt 😕 Bitte versuchen Sie es erneut.",
-                        "AccessDenied": "Der Zugang zu Steam wurde verweigert.",
-                        "dotnet-required": ".NET 6 Runtime muss installiert sein, um eine Version von BeatSaber herunterzuladen. Lade es herunter, indem Du auf die Schaltfläche unten klickst."
-                    },
-                    "actions": {
-                        "download-dotnet": ".NET 6 Herunterladen"
+                        "AccessDenied": "Der Zugang zu Steam wurde verweigert."
                    }
                }
            },
@@ -238,9 +238,6 @@
                    }
                },
                "errors": {
-                    "titles": {
-                        "dotnet-required": ".NET 6 Required"
-                    },
                    "msg": {
                        "401": "Steam doesn't seem to want to let us download Beat Saber 😢",
                        "404": "Unable to contact Steam servers.",
@@ -263,11 +260,7 @@
                        "LicenceError": "Unable to get the list of licenses.",
                        "RateLimitExceeded": "You've tried too many times, wait a while and try again later.",
                        "TokenRejected": "Your login token has been rejected 😕 Please try again.",
-                        "AccessDenied": "Access to Steam has been denied.",
-                        "dotnet-required": ".NET 6 Runtime must be installed in order to download a version of Beat Saber. Download it by clicking the button below."
-                    },
-                    "actions": {
-                        "download-dotnet": "Download .NET 6"
+                        "AccessDenied": "Access to Steam has been denied."
                    }
                }
            },
@@ -238,9 +238,6 @@
                    }
                },
                "errors": {
-                    "titles": {
-                        "dotnet-required": ".NET 6 Requerido"
-                    },
                    "msg": {
                        "401": "Parece que Steam no quiere dejarnos descargar Beat Saber 😢",
                        "404": "No se puede contactar con los servidores de Steam",
@@ -263,11 +260,7 @@
                        "LicenceError": "No se puede obtener la lista de licencias.",
                        "RateLimitExceeded": "Lo has intentado demasiadas veces, espera un poco y vuelve a intentarlo más tarde.",
                        "TokenRejected": "Tu token de inicio de sesión ha sido rechazada 😕 Por favor, inténtalo de nuevo.",
-                        "AccessDenied": "El acceso a Steam ha sido denegado.",
-                        "dotnet-required": "Se debe instalar el tiempo de ejecución de .NET 6 para descargar una versión de Beat Saber. Descárgalo haciendo clic en el botón de abajo."
-                    },
-                    "actions": {
-                        "download-dotnet": "Descargar .NET 6"
+                        "AccessDenied": "El acceso a Steam ha sido denegado."
                    }
                }
            },
@@ -238,9 +238,6 @@
                    }
                },
                "errors": {
-                    "titles": {
-                        "dotnet-required": ".NET 6 Requis"
-                    },
                    "msg": {
                        "401": "Steam ne semble pas vouloir nous laisser télécharger Beat Saber 😢",
                        "404": "Impossible de contacter les serveurs de Steam.",
@@ -263,11 +260,7 @@
                        "LicenceError": "Impossible d'obtenir la liste des licences.",
                        "RateLimitExceeded": "Tu as essayé trop de fois attends un peu et recommence plus tard.",
                        "TokenRejected": "Votre token de connexion a été rejeté 😕 Veuillez réessayer.",
-                        "AccessDenied": "L'accès à Steam a été refusé.",
-                        "dotnet-required": ".NET 6 Runtime doit être installé pour pouvoir télécharger une version de Beat Saber. Télécharge-le en cliquant sur le bouton ci-dessous."
-                    },
-                    "actions": {
-                        "download-dotnet": "Télécharger .NET 6"
+                        "AccessDenied": "L'accès à Steam a été refusé."
                    }
                }
            },
@@ -238,9 +238,6 @@
                    }
                },
                "errors": {
-                    "titles": {
-                        "dotnet-required": ".NET 6が必要です!"
-                    },
                    "msg": {
                        "401": "SteamがBeat Saberのダウンロードを許可してくれないようだ。😢",
                        "404": "Steamサーバーに接続できません。",
@@ -263,11 +260,7 @@
                        "LicenceError": "ライセンスリストを取得できません。",
                        "RateLimitExceeded": "何度も試しているのでしばらくたって、もう一度お試しください。",
                        "TokenRejected": "ログイントークンが拒否されました 😕 もう一度お試しください。",
-                        "AccessDenied": "Steamへのアクセスが拒否されました。",
-                        "dotnet-required": "Beat Saberをダウンロードするには、.NET 6 Runtimeがインストールされている必要があります。下のボタンをクリックしてダウンロードしてください。"
-                    },
-                    "actions": {
-                        "download-dotnet": ".NET 6をダウンロード"
+                        "AccessDenied": "Steamへのアクセスが拒否されました。"
                    }
                }
            },
@@ -238,9 +238,6 @@
                    }
                },
                "errors": {
-                    "titles": {
-                        "dotnet-required": "Требуется .NET 6"
-                    },
                    "msg": {
                        "401": "Похоже Steam не хочет, чтобы мы скачали Beat Saber 😢",
                        "404": "Нет связи с серверами Steam.",
@@ -263,11 +260,7 @@
                        "LicenceError": "Не удалось проверить наличие лицензии.",
                        "RateLimitExceeded": "Слишком много попыток, вернитесь позже и попробуйте снова.",
                        "TokenRejected": "Ваш токен для входа был отклонен 😕 Пожалуйста, попробуйте снова.",
-                        "AccessDenied": "Доступ к Steam был отклонен.",
-                        "dotnet-required": "Среда запуска .NET 6 должна быть установлена, чтобы скачать Beat Saber. Скачайте её с помощью кнопки ниже."
-                    },
-                    "actions": {
-                        "download-dotnet": "Скачать .NET 6"
+                        "AccessDenied": "Доступ к Steam был отклонен."
                    }
                }
            },
@@ -238,9 +238,6 @@
                    }
                },
                "errors": {
-                    "titles": {
-                        "dotnet-required": "需要 .NET 6"
-                    },
                    "msg": {
                        "401": "Steam 似乎不想讓我們下載 Beat Saber😢",
                        "404": "無法聯繫 Steam 伺服器。",
@@ -263,11 +260,7 @@
                        "LicenceError": "無法獲取許可證列表。",
                        "RateLimitExceeded": "你已經嘗試了太多次，請稍等片刻，稍後再試。",
                        "TokenRejected": "你的登錄令牌已被拒絕 😕 請重試。",
-                        "AccessDenied": "訪問 Steam 被拒絕。",
-                        "dotnet-required": "必須安裝 .NET 6 Runtime 才能下載 Beat Saber 版本。單擊下面的按鈕下載它。"
-                    },
-                    "actions": {
-                        "download-dotnet": "下載 .NET 6"
+                        "AccessDenied": "訪問 Steam 被拒絕。"
                    }
                }
            },
@@ -238,9 +238,6 @@
                    }
                },
                "errors": {
-                    "titles": {
-                        "dotnet-required": "需要 .NET 6"
-                    },
                    "msg": {
                        "401": "Steam 似乎不想让我们下载 Beat Saber😢",
                        "404": "无法联系 Steam 服务器。",
@@ -263,11 +260,7 @@
                        "LicenceError": "无法获取许可证列表。",
                        "RateLimitExceeded": "你已经尝试了太多次，请稍等片刻，稍后再试。",
                        "TokenRejected": "你的登录令牌已被拒绝 😕 请重试。",
-                        "AccessDenied": "访问 Steam 被拒绝。",
-                        "dotnet-required": "必须安装 .NET 6 Runtime 才能下载 Beat Saber 版本。单击下面的按钮下载它。"
-                    },
-                    "actions": {
-                        "download-dotnet": "下载 .NET 6"
+                        "AccessDenied": "访问 Steam 被拒绝。"
                    }
                }
            },
@@ -1,166 +0,0 @@
-{
-  "runtimeTarget": {
-    "name": ".NETCoreApp,Version=v6.0",
-    "signature": ""
-  },
-  "compilationOptions": {},
-  "targets": {
-    ".NETCoreApp,Version=v6.0": {
-      "DepotDownloader/2.5.0": {
-        "dependencies": {
-          "QRCoder": "1.4.3",
-          "SteamKit2": "2.5.0-Beta.1",
-          "protobuf-net": "3.2.16"
-        },
-        "runtime": {
-          "DepotDownloader.dll": {}
-        }
-      },
-      "Microsoft.NETCore.Platforms/5.0.0": {},
-      "Microsoft.Win32.Registry/5.0.0": {
-        "dependencies": {
-          "System.Security.AccessControl": "5.0.0",
-          "System.Security.Principal.Windows": "5.0.0"
-        }
-      },
-      "protobuf-net/3.2.16": {
-        "dependencies": {
-          "protobuf-net.Core": "3.2.16"
-        },
-        "runtime": {
-          "lib/net6.0/protobuf-net.dll": {
-            "assemblyVersion": "3.0.0.0",
-            "fileVersion": "3.2.16.54102"
-          }
-        }
-      },
-      "protobuf-net.Core/3.2.16": {
-        "dependencies": {
-          "System.Collections.Immutable": "7.0.0"
-        },
-        "runtime": {
-          "lib/net6.0/protobuf-net.Core.dll": {
-            "assemblyVersion": "3.0.0.0",
-            "fileVersion": "3.2.16.54102"
-          }
-        }
-      },
-      "QRCoder/1.4.3": {
-        "runtime": {
-          "lib/net6.0/QRCoder.dll": {
-            "assemblyVersion": "1.4.3.0",
-            "fileVersion": "1.4.3.0"
-          }
-        }
-      },
-      "SteamKit2/2.5.0-Beta.1": {
-        "dependencies": {
-          "Microsoft.Win32.Registry": "5.0.0",
-          "protobuf-net": "3.2.16"
-        },
-        "runtime": {
-          "lib/net6.0/SteamKit2.dll": {
-            "assemblyVersion": "2.5.0.0",
-            "fileVersion": "2.5.0.0"
-          }
-        }
-      },
-      "System.Collections.Immutable/7.0.0": {
-        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-        },
-        "runtime": {
-          "lib/net6.0/System.Collections.Immutable.dll": {
-            "assemblyVersion": "7.0.0.0",
-            "fileVersion": "7.0.22.51805"
-          }
-        }
-      },
-      "System.Runtime.CompilerServices.Unsafe/6.0.0": {},
-      "System.Security.AccessControl/5.0.0": {
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "5.0.0",
-          "System.Security.Principal.Windows": "5.0.0"
-        }
-      },
-      "System.Security.Principal.Windows/5.0.0": {}
-    }
-  },
-  "libraries": {
-    "DepotDownloader/2.5.0": {
-      "type": "project",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "Microsoft.NETCore.Platforms/5.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==",
-      "path": "microsoft.netcore.platforms/5.0.0",
-      "hashPath": "microsoft.netcore.platforms.5.0.0.nupkg.sha512"
-    },
-    "Microsoft.Win32.Registry/5.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==",
-      "path": "microsoft.win32.registry/5.0.0",
-      "hashPath": "microsoft.win32.registry.5.0.0.nupkg.sha512"
-    },
-    "protobuf-net/3.2.16": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-W6RM2B2f5O7SigBGfkXFYzI/a7Mks+rCHtuGlE/b5O3NMupDon7I0akjCLhrfcnqIfdWDkDafseav/MnIzUSHA==",
-      "path": "protobuf-net/3.2.16",
-      "hashPath": "protobuf-net.3.2.16.nupkg.sha512"
-    },
-    "protobuf-net.Core/3.2.16": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-ZFoY0lfMUWGJ4RoyI0oNj2o2l8t08n3k27YyDD0kYWQ+vXj0hTbWEwYWOpGAfCWvyUPkq9Jcc/4uR74GICZL2g==",
-      "path": "protobuf-net.core/3.2.16",
-      "hashPath": "protobuf-net.core.3.2.16.nupkg.sha512"
-    },
-    "QRCoder/1.4.3": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-fWuFqjm8GTlEb2GqBl3Hi8HZZeZQwBSHxvRPtPjyNbT82H0ff0JwavKRBmMaXCno1Av6McPC8aJzri0Mj2w9Jw==",
-      "path": "qrcoder/1.4.3",
-      "hashPath": "qrcoder.1.4.3.nupkg.sha512"
-    },
-    "SteamKit2/2.5.0-Beta.1": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-fwwdF0cZZEIdNpcUc1+B9zbP5Q48A3DFOAclPhBh2dMTU03aROaIDktFW+Ww/NN1Z/Emp/LwVqHB+hCM8uxS4Q==",
-      "path": "steamkit2/2.5.0-beta.1",
-      "hashPath": "steamkit2.2.5.0-beta.1.nupkg.sha512"
-    },
-    "System.Collections.Immutable/7.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==",
-      "path": "system.collections.immutable/7.0.0",
-      "hashPath": "system.collections.immutable.7.0.0.nupkg.sha512"
-    },
-    "System.Runtime.CompilerServices.Unsafe/6.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==",
-      "path": "system.runtime.compilerservices.unsafe/6.0.0",
-      "hashPath": "system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512"
-    },
-    "System.Security.AccessControl/5.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==",
-      "path": "system.security.accesscontrol/5.0.0",
-      "hashPath": "system.security.accesscontrol.5.0.0.nupkg.sha512"
-    },
-    "System.Security.Principal.Windows/5.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==",
-      "path": "system.security.principal.windows/5.0.0",
-      "hashPath": "system.security.principal.windows.5.0.0.nupkg.sha512"
-    }
-  }
-}
@@ -1,13 +0,0 @@
-{
-  "runtimeOptions": {
-    "tfm": "net6.0",
-    "rollForward": "LatestMajor",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "6.0.0"
-    },
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
-    }
-  }
-}
@@ -38,8 +38,7 @@
        "extraResources": [
            "./assets/favicon.ico",
            "./assets/jsons/bs-versions.json",
-            "./assets/jsons/patreons.json",
-            "./assets/scripts/**"
+            "./assets/jsons/patreons.json"
        ],
        "productName": "BSManager",
        "appId": "org.erb.BSManager",
@@ -51,46 +50,24 @@
        ],
        "afterSign": ".erb/scripts/notarize.js",
        "afterPack": ".erb/scripts/after-pack.js",
-        "mac": {
-            "target": {
-                "target": "default",
-                "arch": [
-                    "arm64",
-                    "x64"
-                ]
-            },
-            "type": "distribution",
-            "hardenedRuntime": true,
-            "entitlements": "assets/entitlements.mac.plist",
-            "entitlementsInherit": "assets/entitlements.mac.plist",
-            "gatekeeperAssess": false
-        },
-        "dmg": {
-            "contents": [
-                {
-                    "x": 130,
-                    "y": 220
-                },
-                {
-                    "x": 410,
-                    "y": 220,
-                    "type": "link",
-                    "path": "/Applications"
-                }
-            ]
-        },
        "win": {
            "target": [
                "nsis",
                "nsis-web"
            ],
-            "icon": "assets/favicon.ico"
+            "icon": "assets/favicon.ico",
+            "extraResources": [
+                "./assets/scripts/*.exe"
+            ]
        },
        "linux": {
            "target": [
                "AppImage"
            ],
-            "category": "Development"
+            "category": "Development",
+            "extraResources": [
+                "./assets/scripts/DepotDownloader"
+            ]
        },
        "directories": {
            "app": "release/app",
@@ -14,11 +14,6 @@ ipc.on("import-version", (args, reply) => {

 // #region Steam

-ipc.on("is-dotnet-6-installed", (_, reply) => {
-    const installer = BsSteamDownloaderService.getInstance();
-    reply(from(installer.isDotNet6Installed()));
-});
-
 ipc.on("bs-download.installation-folder", (_, reply) => {
    const installLocation = InstallationLocationService.getInstance();
    reply(from(installLocation.installationDirectory()));
@@ -41,23 +41,7 @@ export class BsSteamDownloaderService {
    }

    private getDepotDownloaderExePath(): string {
-        return path.join(this.utils.getAssetsScriptsPath(), "depot-downloader", `DepotDownloader.${process.platform === 'linux' ? 'dll' : 'exe'}`);
-    }
-
-    public async isDotNet6Installed(): Promise<boolean> {
-        try {
-           const proc = process.platform === 'linux'
-                ? spawnSync('dotnet', [this.getDepotDownloaderExePath()])
-                : spawnSync(this.getDepotDownloaderExePath());
-            if (proc.stderr?.toString()) {
-                log.error("no dotnet", proc.stderr.toString());
-                return false;
-            }
-            return true;
-        } catch (e) {
-            log.error("Error while checking .NET 6", e);
-            return false;
-        }
+        return path.join(this.utils.getAssetsScriptsPath(), process.platform === 'linux' ? "DepotDownloader" : "DepotDownloader.exe");
    }

    private async buildDepotDownloaderInstance(downloadInfos: DownloadSteamInfo, qr?: boolean): Promise<{depotDownloader: DepotDownloader, depotDownloaderOptions: DepotDownloaderArgsOptions, version: BSVersion}> {
@@ -84,13 +68,12 @@ export class BsSteamDownloaderService {

        await ensureDir(await this.installLocationService.versionsDirectory());

-        const isLinux = process.platform === 'linux';
        const exePath = this.getDepotDownloaderExePath();
        const args = DepotDownloader.buildArgs(depotDownloaderOptions);

        const depotDownloader = new DepotDownloader({
-            command: isLinux ? 'dotnet' : exePath,
-            args: isLinux ? [exePath, ...args] : args,
+            command: exePath,
+            args,
            options: { cwd: await this.installLocationService.versionsDirectory() },
            echoStartData: downloadVersion
        }, log);
@@ -44,28 +44,11 @@ export class SteamDownloaderService extends AbstractBsDownloaderService implemen
        this.linkOpener = LinkOpenerService.getInstance();
    }

-    public isDotNet6Installed(): Promise<boolean> {
-        return lastValueFrom(this.ipcService.sendV2("is-dotnet-6-installed"));
-    }
-
    private setSteamSession(username: string): void { localStorage.setItem(this.STEAM_SESSION_USERNAME_KEY, username); }
    private getSteamUsername(): string { return localStorage.getItem(this.STEAM_SESSION_USERNAME_KEY); }
    public deleteSteamSession(): void { localStorage.removeItem(this.STEAM_SESSION_USERNAME_KEY); }
    public sessionExist(): boolean { return !!localStorage.getItem(this.STEAM_SESSION_USERNAME_KEY); }

-    private async showDotNetNotInstalledError(): Promise<void> {
-        const choice = await this.notificationService.notifyError({
-            duration: 11_000,
-            title: "notifications.bs-download.steam-download.errors.titles.dotnet-required",
-            desc: "notifications.bs-download.steam-download.errors.msg.dotnet-required",
-            actions: [{ id: "0", title: "notifications.bs-download.steam-download.errors.actions.download-dotnet" }],
-        });
-
-        if (choice === "0") {
-            this.linkOpener.open("https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-6.0.12-windows-x64-installer");
-        }
-    }
-
    public async getInstallationFolder(): Promise<string> {
        return lastValueFrom(this.ipcService.sendV2("bs-download.installation-folder"));
    }
@@ -220,12 +203,6 @@ export class SteamDownloaderService extends AbstractBsDownloaderService implemen

        const downloadPromise = (async () => {

-            const haveDotNet = await this.isDotNet6Installed().catch(() => false);
-            if(!haveDotNet){
-                this.showDotNetNotInstalledError();
-                return Promise.reject(new Error("DotNet not installed"));
-            }
-
            const downloadInfo: DownloadSteamInfo = {bsVersion, isVerification}

            const autoDownload = await lastValueFrom(this.tryAutoDownloadBsVersion(downloadInfo)).then(() => true).catch(() => false);
@@ -25,7 +25,6 @@ export interface IpcChannelMapping extends Record<string, { request: unknown, re

    /* ** bs-download-ipcs ** */
    "import-version": { request: ImportVersionOptions, response: Progression<BSVersion>};
-    "is-dotnet-6-installed": { request: void, response: boolean};
    "bs-download.installation-folder": { request: void, response: string};
    "bs-download.set-installation-folder": { request: string, response: string};
    "auto-download-bs-version": { request: DownloadSteamInfo, response: DepotDownloaderEvent};