Compare commits

..

52 Commits

Author SHA1 Message Date
MathieuG-P 4b741ead15 bumb to 1.3.0 2023-08-10 19:02:14 +02:00
MathieuG-P de03044ff9 remove diamond rank 2023-08-10 18:52:43 +02:00
MathieuG-P b3a3955f69 [hotfix] useless word in EN translation 2023-08-10 18:51:40 +02:00
MathieuG-P f5c83ee9ca bumb to 1.3.0-alpha.6 2023-08-10 01:31:42 +02:00
MathieuG-P e1546d0975 Merge pull request #301 from Zagrios/chore/add-logs-for-depotdownloader-events
[chore] add logs for depotdownloader events
2023-08-10 01:26:09 +02:00
MathieuG-P d69ecac496 [chore] add logs for depotdownloader events 2023-08-10 01:19:06 +02:00
MathieuG-P 8f1a2015bd Merge pull request #300 from Zagrios/bugfix/change-token-rejected-translation
[bugfix] change error message for TokenReject error from DepotDownloader
2023-08-10 00:40:22 +02:00
MathieuG-P 3e4afe5a07 [bugfix] change error message for TokenReject error from DepotDownloader 2023-08-10 00:34:44 +02:00
MathieuG-P 288c219417 Merge pull request #297 from Insprill/fix/depot-downloader-linux
Fix Depot Downloader not working on Linux
2023-08-09 23:50:45 +02:00
Pierce Thompson 31db079b08 Fix process command/args 2023-08-09 17:16:15 -04:00
MathieuG-P 5e1eff7143 Merge pull request #299 from Zagrios/bugfix/fix-focus-outside-element-with-tabs/298
[bugfix-298] fix focus outside element with tab key
2023-08-09 23:01:39 +02:00
MathieuG-P 301d2fdfc4 [bugfix-298] fix focus outside element with tab key 2023-08-09 22:46:10 +02:00
Pierce Thompson 9638c65407 Fix Depot Downloader not working on Linux 2023-08-08 23:51:38 -04:00
MathieuG-P efd69e4bb3 bumb to 1.3.0-alpha.5 2023-08-08 02:13:45 +02:00
MathieuG-P 90cb0d5038 Merge pull request #296 from Zagrios/bugfix/incorrect-text-colors-on-models-elemtnts-with-light-theme
[bugfix] Incorrect text colors on Models elements with light theme in download modal
2023-08-08 02:11:01 +02:00
MathieuG-P 73e8e0f15a Merge pull request #295 from Zagrios/bugfix/unable-download-bs-version-with-fresh-install
[bugfix] Ensure BSInstances exist before running depotdownloader
2023-08-08 02:07:10 +02:00
MathieuG-P b169b04637 [bugfix] Incorrect text colors on Models elements with light theme in download modal 2023-08-08 02:06:50 +02:00
MathieuG-P 6296a78cbc [bugfix] Ensure BSInstances exist before running depotdownloader 2023-08-08 01:51:07 +02:00
MathieuG-P 1305756cac add patreon 2023-08-07 19:07:48 +02:00
MathieuG-P 1f2601427b add patreon 2023-08-06 21:41:35 +02:00
MathieuG-P 1e7ec798e6 bumb to 1.3.0-alpha.4 2023-08-06 16:42:34 +02:00
MathieuG-P d56262b56d Merge pull request #294 from Zagrios/chore/update-electron-updater
[chore] update electron-builder & electron-updater
2023-08-06 16:30:27 +02:00
MathieuG-P 4a3528229e [chore] update electron-builder & electron-updater 2023-08-06 16:25:35 +02:00
MathieuG-P f61d44b14a Merge pull request #293 from Zagrios/feature/login-with-qr-code
[feature] login to Steam with QRCode + handle login approval from Steam app
2023-08-06 16:16:07 +02:00
MathieuG-P 1f99ce1ec1 [feature] remove code smells 2023-08-06 16:07:58 +02:00
MathieuG-P 0d75b56d19 [feature] Correct translation + adjust qr code color with loght theme 2023-08-06 15:39:12 +02:00
MathieuG-P 35aa1af377 add patreon 2023-08-06 15:00:39 +02:00
MathieuG-P 4ee4d0f565 [feature] use the fixed depot downloader 2023-08-06 03:19:59 +02:00
MathieuG-P 30275a920e Merge pull request #292 from Zagrios/bugfix/shared-folders-not-saved
[bugfix] Fix additionnal shared folders not saved
2023-08-05 04:25:14 +02:00
MathieuG-P e51e63af8e [bugfix] Fix additionnal shared folders not saved 2023-08-05 04:20:58 +02:00
MathieuG-P 1be3b7af31 [feature] Add notifications for BS download 2023-08-05 03:50:04 +02:00
MathieuG-P a92c65be53 [feature] Add waiting for Steam app approval modal 2023-08-03 03:52:13 +02:00
MathieuG-P 922aad7867 [feature] can now login to Steam with QRCode + ipc management optimization 2023-08-02 02:36:36 +02:00
MathieuG-P 82bca18f3f [bugfix] fix no dependency in useEffect 2023-08-02 02:33:19 +02:00
MathieuG-P d0aff9d27b [feature] properly handle link click from renderer 2023-08-02 02:31:41 +02:00
MathieuG-P b308d66c2c Add patreon 2023-07-29 21:06:36 +02:00
MathieuG-P 82675925ff bumb to 1.3.0-alpha.3 2023-07-23 18:54:19 +02:00
MathieuG-P 8adda9c027 [hotfix] unable to install mods 2023-07-23 18:46:43 +02:00
MathieuG-P 5d4a824a76 bumb to 1.3.0-alpha.2 2023-07-23 16:26:20 +02:00
MathieuG-P 6472aff718 Merge pull request #291 from Zagrios/bugfix/sometimes-installing-mods-downgrades-newer-installed-mods
[bugfix] do not install mods that are less recent than those installed
2023-07-22 23:58:51 +02:00
MathieuG-P 02d3d64a18 [bugfix] do not install mods that are less recent than those installed 2023-07-22 23:53:44 +02:00
MathieuG-P 6d8d3e993a Merge pull request #288 from Zagrios/bugfix/crash-loading-bunch-of-maps/276
[bugfix-276] Fix crashing when loading bunch of maps
2023-07-21 04:19:29 +02:00
MathieuG-P 570a20470e Merge pull request #290 from Zagrios/bugfix/window-title-become-index.html-when-closing-settings/289
[bugfix-289] Add title in index.ejs to prevent the window title to be wiped magically
2023-07-21 02:29:17 +02:00
MathieuG-P e96a977abe [bugfix-289] Add title in index.ejs to prevent the window title to be wiped magically 2023-07-21 02:24:37 +02:00
MathieuG-P 6ef328caec Merge pull request #287 from Dead0Duck/feature/russian-translation
[feature] Russian translation
2023-07-18 22:44:10 +02:00
DeadDuck 80f625102e [fix] Corrected translation of oculus-description 2023-07-18 18:36:09 +07:00
MathieuG-P abf622e68f Merge pull request #286 from Snailedlt/chore/rework-issue-templates
Chore/rework issue templates
2023-07-17 23:29:56 +02:00
MathieuG-P 63c9bd9436 [bugfix-276] use stream to reduce ram consumption + load maps by chunk to avoid open files limit 2023-07-17 23:19:49 +02:00
MathieuG-P 5e763c99d8 bumb to v1.3.0-alpha1 2023-07-17 23:16:24 +02:00
DeadDuck 2e5b11bdb0 [feature] Russian translation 2023-07-17 22:25:22 +07:00
Jørgen Kalsnes Hagen 7287dfffde Update -bug--bug-report.md 2023-07-16 23:27:00 +02:00
Jørgen Kalsnes Hagen 92461639b0 Update -feat---feature-request.md 2023-07-16 23:24:13 +02:00
55 changed files with 2255 additions and 848 deletions
+1
View File
@@ -46,6 +46,7 @@ module.exports = {
"react/prop-types": "off",
"import/no-cycle": "off",
"prefer-promise-reject-errors": "off",
"react/jsx-no-target-blank": "off"
},
parserOptions: {
ecmaVersion: 2020,
+14 -11
View File
@@ -6,27 +6,30 @@ labels: bug
assignees: Zagrios
---
**Describe the bug**
A clear and concise description of what the bug is.
## Bug Description
<!-- A clear and concise description of what the bug is. -->
**To Reproduce**
Steps to reproduce the behavior:
## Reproduction Steps
<!-- Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
-->
**Expected behavior**
A clear and concise description of what you expected to happen.
## Expected Behavior
<!-- A clear and concise description of what you expected to happen. -->
**Screenshots**
If applicable, add screenshots to help explain your problem.
## Screenshots
<!-- If applicable, add screenshots to help explain your problem. -->
**Desktop (please complete the following information):**
## System Specs
<!-- **Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Version [e.g. 22]
-->
**Additional context**
Add any other context about the problem here.
## Additional context
<!-- Add any other context about the problem here. -->
@@ -6,14 +6,17 @@ labels: enhancement
assignees: Zagrios
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
## Problem
<!-- **Is your feature request related to a problem? Please describe.** -->
<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
## Solution
<!-- **Describe the solution you'd like** -->
<!-- A clear and concise description of what you want to happen. -->
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
## Alternative solutions (if any)
<!-- **Describe alternatives you've considered** -->
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
**Additional context**
Add any other context or screenshots about the feature request here.
## Additional context
<!-- Add any other context or screenshots about the feature request here. -->
Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

+6 -2
View File
@@ -1,6 +1,6 @@
[
{"username": "Shidorien"},
{"username": "iPixelGalaxy", "type": "diamond", "link": "https://twitch.tv/ipixelgalaxy"},
{"username": "iPixelGalaxy"},
{"username": "Emyte", "type": "gold"},
{"username": "GoodOldNervy"},
{"username": "Naysy"},
@@ -11,5 +11,9 @@
{"username": "Anonymously42", "type": "diamond", "link": "https://www.twitch.tv/anonymously42tv"},
{"username": "En4Yuz"},
{"username": "AndyIsHereBoi", "type": "gold"},
{"username": "grtroadrunner"}
{"username": "grtroadrunner"},
{"username": "Ilnahro"},
{"username": "T3chLog"},
{"username": "Phil", "type": "gold"},
{"username": "Protocrush", "type": "gold"}
]
+28 -15
View File
@@ -147,12 +147,14 @@
"fr-FR": "Français",
"es-ES": "Español",
"de-DE": "Deutsch",
"ru-RU": "Русский",
"translated": {
"en-EN": "Englisch, Vereinigtes Königreich",
"en-US": "Englisch, USA",
"fr-FR": "Französisch",
"es-ES": "Spanisch",
"de-DE": "Deutsch"
"de-DE": "Deutsch",
"ru-RU": "Russisch"
}
}
},
@@ -229,8 +231,7 @@
"401": "Steam scheint uns BeatSaber nicht herunterladen zu lassen 😢",
"404": "Steam-Server können nicht kontaktiert werden.",
"Password": "Passwort ist ungültig.",
"InvalidCredentials": "Deine E-Mail oder Passwort ist ungültig 😴",
"InvalidPassword": "Dein Passwort ist ungültig 😕",
"InvalidCredentials": "Ungültige Anmeldedaten, nicht genehmigte Verbindung oder zu viele Anmeldeversuche.",
"NoManifest": "Es wurde keine Manifest gefunden",
"DirectoryCreate": "Die erforderlichen Ordner können nicht installiert werden.",
"NotAvailableApp": "Versuchst du, Beat Saber herunterzuladen, wenn Du es nicht hast? 🤣",
@@ -246,10 +247,9 @@
"SteamLib": "Wenn dieser Fehler auftritt, melde den Fehler auf Github mit Protokollen, bitte.",
"ConnectionError": "Kann nach 10 Versuchen keine Verbindung zu Steam herstellen 🤯",
"LicenceError": "Die Liste der Lizenzen kann nicht abgerufen werden.",
"verification-failed": "Verifikation fehlgeschlagen, versuche es später erneut.",
"RateLimitExceeded": "Du hast es zu oft versucht, warte eine Weile und versuche es später erneut.",
"AlreadyDownloading": "Ein Download ist bereits im Gange",
"no-internet": "Keine Internet Verbindung",
"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": {
@@ -480,26 +480,39 @@
}
},
"steam-login": {
"title": "Steam Login",
"title": "Steam Anmeldung",
"inputs": {
"username": {
"label": "Nutzername",
"placeholder": "Gebe deinen Nutzernamen ein"
"label": "Mit Accountnamen anmelden",
"placeholder": "Geben Sie Ihren Accountnamen ein"
},
"password": {
"label": "Passwort",
"placeholder": "Gebe dein Passwort ein",
"max-length-warning": "Das Passwort überschreitet 64 Zeichen! Wenn das Passwort ungültig ist, versuchen Sie nur die ersten 64 Zeichen einzugeben."
"placeholder": "Geben Sie Ihr Passwort ein",
"max-length-warning": "Das Passwort überschreitet 64 Zeichen! Wenn das Passwort ungültig ist, versuchen Sie nur seine ersten 64 Zeichen einzugeben."
},
"stay": {
"label": "Verbunden bleiben"
}
"qr":{
"label": "Oder mit einem QR-Code",
"note":{
"use-the":"Anmelden Sie sich über die ",
"steam-mobile-app": "Steam-Mobile-App",
"to-connect-with-qr": " per QR-Code an."
}
},
"stay": "Angemeldet bleiben"
},
"why-credentials": "Warum braucht ihr meine Anmeldeinformationen?",
"why-credentials": "Warum sind meine Anmeldedaten notwendig?",
"need-help-to-connect": "Ich brauche Hilfe, um auf mein Konto zuzugreifen!",
"buttons": {
"submit": "Anmelden"
}
},
"steam-auth-approve":{
"title": "Warten auf Bestätigung",
"protected-by-mobile-auth": "Konto durch mobile Authentifizierung geschützt.",
"use-steam-app-to-approve": "Verwenden Sie die Steam Mobile-App, um die Verbindung zu bestätigen...",
"not-access-to-steam-app": "Ich habe keinen Zugang zur Steam Mobile-App"
},
"steam-credentials": {
"title": "Steam Anmeldeinformationen",
"p-1": "Die Anmeldeinformationen werden nur zum Herunterladen des Spiels verwendet, da Steam überprüfen muss, ob Du das Spiel bezahlt hast, um es herunterladen zu dürfen. Sie werden nicht gespeichert und direkt an DepotDownloader weitergegeben. Wenn Du deine Anmeldeinformationen nicht eingeben möchtest, kannst Du diesem Tutorial folgen:",
+27 -14
View File
@@ -147,12 +147,14 @@
"fr-FR": "Français",
"es-ES": "Español",
"de-DE": "Deutsch",
"ru-RU": "Русский",
"translated": {
"en-EN": "English, United Kingdom",
"en-US": "English, USA",
"fr-FR": "French",
"es-ES": "Spanish",
"de-DE": "German"
"de-DE": "German",
"ru-RU": "Russian"
}
}
},
@@ -229,8 +231,7 @@
"401": "Steam doesn't seem to want to let us download Beat Saber 😢",
"404": "Unable to contact Steam servers.",
"Password": "Password is invalid.",
"InvalidCredentials": "Your e-mail or password is invalid 😴",
"InvalidPassword": "Your password is invalid 😕",
"InvalidCredentials": "Invalid login credentials, unapproved connection, or too many login attempts.",
"NoManifest": "No manifest was found",
"DirectoryCreate": "Unable to install the necessary folders.",
"NotAvailableApp": "Are you trying to download Beat Saber when you don't have it? 🤣",
@@ -246,10 +247,9 @@
"SteamLib": "If you have this error, report the bug on GitHub with the logs pls.",
"ConnectionError": "Unable to connect to Steam after 10 tries 🤯",
"LicenceError": "Unable to get the list of licenses.",
"verification-failed": "Verification failed, try again later.",
"RateLimitExceeded": "You've tried too many times, wait a while and try again later.",
"AlreadyDownloading": "A download is already in progress",
"no-internet": "No internet connection.",
"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": {
@@ -483,23 +483,36 @@
"title": "Steam Login",
"inputs": {
"username": {
"label": "Username",
"placeholder": "Enter your username"
"label": "Sign in with account name",
"placeholder": "Enter your account name"
},
"password": {
"label": "Password",
"placeholder": "Enter your password",
"max-length-warning": "The password exceeds 64 characters! If the password is invalid, try to put its first 64 characters."
"max-length-warning": "The password exceeds 64 characters! If the password is invalid, try to enter only its first 64 characters."
},
"stay": {
"label": "Stay connected"
}
"qr":{
"label": "Or with a QR code",
"note":{
"use-the":"Use the ",
"steam-mobile-app": "Steam Mobile App",
"to-connect-with-qr": "to sign in via QR code."
}
},
"stay": "Remember me"
},
"why-credentials": "Why do you need my credentials?",
"why-credentials": "Why are my credentials necessary?",
"need-help-to-connect": "I need help to access my account!",
"buttons": {
"submit": "Login"
"submit": "Sign in"
}
},
"steam-auth-approve":{
"title": "Waiting for confirmation",
"protected-by-mobile-auth": "Account protected by mobile authenticator.",
"use-steam-app-to-approve": "Use the Steam mobile app to confirm the connection...",
"not-access-to-steam-app": "I don't have access to the Steam mobile app"
},
"steam-credentials": {
"title": "Steam Credentials",
"p-1": "The credentials are only used to download the game because steam need to verify that you paid the game in order to be allowed to download it. They aren't saved and directly passed to DepotDownloader. If you don't want to enter your credentials you can follow this tutorial :",
+28 -15
View File
@@ -146,12 +146,14 @@
"fr-FR": "Français",
"es-ES": "Español",
"de-DE": "Deutsch",
"ru-RU": "Русский",
"translated": {
"en-EN": "Inglés, Reino Unido",
"en-US": "Inglés, Estados Unidos",
"fr-FR": "Francés",
"es-ES": "Español",
"de-DE": "Alemán"
"de-DE": "Alemán",
"ru-RU": "Ruso"
}
}
},
@@ -228,8 +230,7 @@
"401": "Parece que Steam no quiere dejarnos descargar BeatSaber 😢",
"404": "No se puede contactar con los servidores de Steam",
"Password": "La contraseña es inválida.",
"InvalidCredentials": "Su correo electrónico o contraseña no son válidos 😴",
"InvalidPassword": "Su contraseña no es válida 😕",
"InvalidCredentials": "Credenciales de inicio de sesión inválidas, conexión no aprobada, o demasiados intentos de inicio de sesión.",
"NoManifest": "No se ha encontrado el manifiesto",
"DirectoryCreate": "No se pueden instalar las carpetas necesarias.",
"NotAvailableApp": "¿Intentas descargar BeatSaber cuando no lo tienes? 🤣",
@@ -245,10 +246,9 @@
"SteamLib": "Si tienes este error, reporta el bug en GitHub con los logs por favor.",
"ConnectionError": "No se puede conectar a Steam después de 10 intentos 🤯",
"LicenceError": "No se puede obtener la lista de licencias.",
"verification-failed": "Verificación fallida, inténtelo más tarde.",
"RateLimitExceeded": "Lo has intentado demasiadas veces, espera un poco y vuelve a intentarlo más tarde.",
"AlreadyDownloading": "La descarga ya está en curso",
"no-internet": "Sin conexión a Internet.",
"TokenRejected": "Tu token de inicio de sesión ha sido rechazado 😕 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 BeatSaber. Descárguelo haciendo clic en el botón de abajo."
},
"actions": {
@@ -479,26 +479,39 @@
}
},
"steam-login": {
"title": "Steam Conectar",
"title": "Inicio de sesión Steam",
"inputs": {
"username": {
"label": "Nombre de usuario",
"placeholder": "Introduzca su nombre de usuario"
"label": "Iniciar sesión con un nombre de cuenta",
"placeholder": "Introduce tu nombre de cuenta"
},
"password": {
"label": "Contraseña",
"placeholder": "Introduzca su contraseña",
"placeholder": "Introduce tu contraseña",
"max-length-warning": "¡La contraseña supera los 64 caracteres! Si la contraseña es inválida, intenta ingresar solo sus primeros 64 caracteres."
},
"stay": {
"label": "Manténgase conectado"
}
"qr":{
"label": "O con un código QR",
"note":{
"use-the":"Usa la ",
"steam-mobile-app": "aplicación Steam Mobile",
"to-connect-with-qr": "para conectarte con un código QR."
}
},
"stay": "Recuérdame"
},
"why-credentials": "¿Por qué necesitas mis credenciales?",
"why-credentials": "¿Por qué son necesarias mis credenciales?",
"need-help-to-connect": "¡Necesito ayuda para acceder a mi cuenta!",
"buttons": {
"submit": "Inicio de sesión"
"submit": "Iniciar sesión"
}
},
"steam-auth-approve":{
"title": "Esperando confirmación",
"protected-by-mobile-auth": "Cuenta protegida por el autenticador móvil.",
"use-steam-app-to-approve": "Use la aplicación móvil de Steam para confirmar la conexión...",
"not-access-to-steam-app": "No tengo acceso a la aplicación móvil de Steam"
},
"steam-credentials": {
"title": "Steam Credentials",
"p-1": "Las credenciales sólo se utilizan para descargar el juego porque steam necesita verificar que has pagado el juego para que se te permita descargarlo. No se guardan y se pasan directamente a DepotDownloader. Si no quieres introducir tus credenciales puedes seguir este tutorial :",
+24 -14
View File
@@ -146,12 +146,14 @@
"fr-FR": "Français",
"es-ES": "Español",
"de-DE": "Deutsch",
"ru-RU": "Русский",
"translated": {
"en-EN": "Anglais, Royaume-Uni",
"en-US": "Anglais, États-Unis",
"fr-FR": "Français",
"es-ES": "Espagnol",
"de-DE": "Allemand"
"de-DE": "Allemand",
"ru-RU": "Russe"
}
}
},
@@ -213,10 +215,7 @@
},
"warnings": {
"msg": {
"ManifestChecksum": "Le manifest téléchargé précédemment ne correspond pas au nouveau 🤔",
"ConnectionTimeout": "Ta connexion internet semble instable 🥶",
"ConnectionLost": "La connexion a été perdue, nouvelle tentative...",
"ConnectionError": "Impossible de se connecter à Steam, nouvelle tentative...",
"Unknown": "Quelque chose d'étrange s'est produit 🤔 Votre connexion est surement instable."
}
},
@@ -228,8 +227,7 @@
"401": "Steam ne semble pas vouloir nous laisser télécharger Beat Saber 😢",
"404": "Impossible de contacter les serveurs de Steam.",
"Password": "Le mot de passe est invalide.",
"InvalidCredentials": "Ton e-mail ou mot de passe est invalide 😴",
"InvalidPassword": "Ton mot de passe est invalide 😕",
"InvalidCredentials": "Identifiants de connexion invalides, connexion non approuvée, ou trop de tentatives de connexion.",
"NoManifest": "Aucun manifest n'a été trouvé.",
"DirectoryCreate": "Impossible d'installer les dossiers nécessaires.",
"NotAvailableApp": "Tu essayes de télécharger Beat Saber alors que tu ne l'as pas ? 🤣",
@@ -245,10 +243,9 @@
"SteamLib": "Si tu as cette erreur, signale le bug sur GitHub avec les logs stp.",
"ConnectionError": "Impossible de se connecter à Steam après 10 essais 🤯",
"LicenceError": "Impossible d'obtenir la liste des licences.",
"verification-failed": "La vérification a échoué, réessaye plus tard.",
"RateLimitExceeded": "Tu as essayé trop de fois attends un peu et recommence plus tard.",
"AlreadyDownloading": "Un téléchargement est déjà en cours",
"no-internet": "Pas de connexion internet.",
"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": {
@@ -482,23 +479,36 @@
"title": "Connexion Steam",
"inputs": {
"username": {
"label": "Nom d'utilisateur",
"placeholder": "Entre ton nom d'utilisateur"
"label": "Se connecter avec un nom de compte",
"placeholder": "Entre ton nom de compte"
},
"password": {
"label": "Mot de passe",
"placeholder": "Entre ton mot de passe",
"max-length-warning": "Le mot de passe dépasse 64 caractères ! Si le mot de passe est invalide, tente d'entrer seulement ses 64 premiers caractères."
},
"stay": {
"label": "Rester connecté"
}
"qr":{
"label": "Ou avec un QR code",
"note":{
"use-the":"Utilisez l'",
"steam-mobile-app": "application mobile Steam",
"to-connect-with-qr": "pour vous connecter avec un QR code."
}
},
"stay": "Se souvenir de moi"
},
"why-credentials": "Pourquoi mes identifiants sont nécessaires ?",
"need-help-to-connect": "J'ai besoin d'aide pour accéder à mon compte !",
"buttons": {
"submit": "Se connecter"
}
},
"steam-auth-approve":{
"title": "Attente de confirmation",
"protected-by-mobile-auth": "Compte protégé par l'authentificateur mobile.",
"use-steam-app-to-approve": "Utilisez l'application mobile Steam pour confirmer la connexion...",
"not-access-to-steam-app": "Je n'ai pas accès à l'application mobile Steam"
},
"steam-credentials": {
"title": "Steam Credentials",
"p-1": "Les informations d'identification ne sont utilisées que pour télécharger le jeu, car Steam doit vérifier que vous avez payé le jeu afin d'être autorisé à le télécharger. Ils ne sont pas sauvegardés et transmis directement à DepotDownloader. Si vous ne voulez pas entrer vos informations d'identification, vous pouvez suivre ce tutoriel :",
+913
View File
@@ -0,0 +1,913 @@
{
"misc": {
"download": "Скачать",
"add": "Добавить",
"verify": "Проверить",
"launch": "Запустить",
"mods": "Моды",
"maps": "Карты",
"playlists": "Плейлисты",
"models": "Модели",
"cancel": "Отмена",
"delete": "Удалить",
"accept": "Принять",
"refuse": "Отказаться",
"apply": "Применить",
"copy": "Скопировать",
"copied": "Скопировано!"
},
"nav-bar": {
"add-version": "Добавить версию игры",
"settings": "Настройки",
"shared": {
"text": "Общий",
"tooltip": "Общий контент"
}
},
"pages": {
"shared-maps": {
"title": "Общие карты"
},
"version-viewer": {
"launch-mods": {
"oculus": "Режим Oculus",
"oculus-description": "Если вы используете Beat Saber через Steam, это позволит использовать Oculus's VR в обход SteamVR, для потенциального прироста производительности. Это необязательно для шлемов Oculus.",
"desktop": "Режим FPFC",
"desktop-description": "Режим Летающих контроллеров от первого лица(FPFC) позволит вам использовать меню с помощью WASD и мышки. Это облегчает тестирование модов, потому что вам не нужно подключать шлем!",
"debug": "Режим отладки",
"debug-description": "Включает окно логов для IPA. В окне будут отображаться логи модов.",
"advanced-launch": {
"button": "Расширенный запуск",
"placeholder": "Параметры запуска, например: --revert; --nowait"
}
},
"maps": {
"title": "Общие карты",
"search-bar": {
"search-placeholder": "Поиск среди карт",
"filters-btn": "Фильтр",
"dropdown": {
"export-maps": "Экспорт карт",
"delete-maps": "Удалить карты"
}
},
"tabs": {
"maps": {
"actions": {
"add-maps": {
"text": "Добавить"
},
"link-maps": {
"tooltips": {
"link": "Привязать карты",
"unlink": "Отвязать карты"
}
}
},
"empty-maps": {
"text": "Нет карт",
"button": "Скачать карты"
}
}
}
},
"mods": {
"loading-mods": "Загрузка модов...",
"no-internet": "Нет интернета",
"mods-not-available": "Не найдены моды для этой версии Beat Saber",
"buttons": {
"more-infos": "Подробнее",
"install-or-update": "Установить или обновить"
},
"mods-grid": {
"header-bar": {
"name": "Имя",
"installed": "Установлено",
"latest": "Latest",
"description": "Описание",
"dropdown": {
"uninstall-all": "Удалить всё"
}
}
}
},
"dropdown": {
"open-folder": "Открыть папку",
"verify-files": "Проверить файлы",
"clone": "Клонировать",
"edit": "Редактировать",
"uninstall": "Удалить",
"create-shortcut": "Создать ярлык",
"shared-folders": "Общие папки"
}
},
"available-versions": {
"title": "Выберите версию",
"steam-release": "Список изменений",
"dropdown": {
"refresh": "Обновить список",
"import-version": "Импорт версии"
}
},
"settings": {
"steam": {
"title": "Steam",
"description": "Если вы выйдете из Steam, вам придётся снова войти, если вы хотите скачать другие версии Beat Saber.",
"logout": "Выйти"
},
"appearance": {
"title": "Персонализация",
"description": "Выберите два основных цвета для BSManager.",
"reset": "Сброс",
"sub-title": "Тема",
"themes": {
"dark": "Тёмная",
"light": "Светлая",
"os": "Как на компьютере"
}
},
"installation-folder": {
"title": "Папка установок",
"description": "Измените стандартную папку, где будут версии Beat Saber и прочее.",
"choose-folder": "Изменить папку"
},
"additional-content": {
"title": "Дополнительный контент",
"description": "Дополнительный контент для кастомизации Beat Saber!",
"deep-links": {
"sub-title": "OneClick установка"
}
},
"language": {
"title": "Язык",
"description": "Выберите язык.",
"languages": {
"en-EN": "English, UK",
"en-US": "English, US",
"fr-FR": "Français",
"es-ES": "Español",
"de-DE": "Deutsch",
"ru-RU": "Русский",
"translated": {
"en-EN": "Английский, Великобритания",
"en-US": "Английский, США",
"fr-FR": "Французский",
"es-ES": "Испанский",
"de-DE": "Немецкий",
"ru-RU": "Русский"
}
}
},
"patreon": {
"title": "Поддержи BSManager 💖",
"description": "Поддержи проект, чтобы мы могли дальше улучшать BSManager.",
"buttons": {
"support": "Поддержать BSManager 🥰",
"supporters": "Поддержавшие 👀"
},
"view": {
"no-supporters": "Пока нет поддержавших",
"sponsors": "Спонсоры",
"supporters": "Поддержавшие"
}
},
"discord": {
"description": "Присоединяйся к сообществу BSManager в социальных сетях!"
},
"contribution": {
"description": "Предложите улучшения или сообщите о баге!",
"buttons": {
"request-features": "Предложить улучшение",
"report-bug": "Сообщить о баге",
"open-logs": "Открыть логи"
}
}
}
},
"notifications": {
"types": {
"error": "🚨 Ошибка",
"warning": "⚠️ Предупреждение",
"success": "🎉 Успех"
},
"common": {
"msg": {
"error-occurred": "Возникла ошибка"
}
},
"shared": {
"errors": {
"titles": {
"operation-running": "Операция в процессе",
"no-internet": "Нет интернета"
},
"msg": {
"operation-running": "Дождитесь завершения операции, потом попробуйте снова.",
"no-internet": "Проверьте своё соединение и попробуйте снова."
}
}
},
"bs-download": {
"success": {
"titles": {
"download-success": "Скачивание завершено",
"verification-finished": "Проверка завершена"
}
},
"warnings": {
"msg": {
"ManifestChecksum": "Предыдущий файл манифесте не совпадает с новым 🤔",
"ConnectionTimeout": "У вас нестабильное соединение с интернетом 🥶",
"ConnectionLost": "Соединение потеряно, попробуйте снова...",
"ConnectionError": "Не удалось подключиться к Steam, попробуйте снова...",
"Unknown": "Что-то странное произошло 🤔 Возможно ваш интернет барахлит."
}
},
"errors": {
"titles": {
"dotnet-required": "Требуется .NET 6"
},
"msg": {
"401": "Похоже Steam не хочет, чтобы мы скачали Beat Saber 😢",
"404": "Нет связи с серверами Steam.",
"Password": "Неверный пароль.",
"InvalidCredentials": "Неверные учетные данные для входа, неразрешенное соединение или слишком много попыток входа.",
"NoManifest": "Файл манифеста не найден",
"DirectoryCreate": "Не смогли создать нужные папки.",
"NotAvailableApp": "Вы пытаетесь скачать Beat Saber, не купив её? 🤣",
"DepotNotFound": "Не удалось скачать Beat Saber 😥 повторите попытку позже 😕",
"NotCompleted": "Скачивание не завершилось ¯\\_(ツ)_/¯",
"InvalidManifest": "Не удалось скачать Beat Saber 😥 повторите попытку позже 😕",
"NoValidKey": "Не удалось скачать Beat Saber 😥 повторите попытку позже 😕",
"NoManifestCode": "Не удалось скачать Beat Saber 😥 повторите попытку позже 😕",
"Unknown": "Неизвестная ошибка ¯\\_(ツ)_/¯",
"NoServer": "Нет связи с серверами Steam.",
"NotAllowed": "Внезапно, вы не можете скачать Beat Saber 🥱",
"ConnectionTimeout": "Не удалось подключиться к Steam 😕",
"SteamLib": "Если вы это видите, пожалуйста, сообщите о баге на GitHub с файлом логов.",
"ConnectionError": "Не удалось подключиться к Steam за 10 попыток 🤯",
"LicenceError": "Не удалось проверить наличие лицензии.",
"RateLimitExceeded": "Слишком много попыток, вернитесь позже и попробуйте снова.",
"TokenRejected": "Ваш токен для входа был отклонен 😕 Пожалуйста, попробуйте снова.",
"AccessDenied": "Доступ к Steam был отклонен.",
"dotnet-required": "Среда запуска .NET 6 должна быть установлена, чтобы скачать Beat Saber. Скачайте её с помощью кнопки ниже."
},
"actions": {
"download-dotnet": "Скачать .NET 6"
}
}
},
"bs-import-version": {
"success": {
"start-import": {
"title": "Импортируем 👌",
"desc": "Импорт может занять какое-то время в зависимости от вашего компьютера."
},
"imported": {
"title": "Версия импортирована 🎉"
}
},
"errors": {
"import-error": {
"desc": "Убедитесь, что выбранная папка - это корневая папка Beat Saber."
}
}
},
"settings": {
"move-folder": {
"success": {
"titles": {
"transfer-started": "Перемещение в процессе",
"transfer-finished": "Перемещение завершено"
},
"descs": {
"transfer-started": "Перемещение может занять какое-то время в зависимости от вашего компьютера."
}
},
"errors": {
"titles": {
"transfer-failed": "Ошибка перемещения 😕"
},
"descs": {
"COPY_TO_SUBPATH": "The destination folder cannot be a subfolder of the source folder.",
"restore-linked-folders": "Произошла ошибка при перемещении общих папок. Вы сами можете переместить файлы, нажмите 'Общие папки' в меню версии."
}
}
},
"steam": {
"success": {
"titles": {
"logout": "Вышли из Steam."
}
}
},
"additional-content": {
"deep-link": {
"select-all": "Выбрать всё",
"activation": {
"success": {
"title": "OneClick включена!",
"description": "OneClick установка теперь включена."
},
"error": {
"description": "Не удалось включить OneClick установку."
}
},
"deactivation": {
"success": {
"title": "OneClick выключена!",
"description": "OneClick установка теперь отключена."
},
"error": {
"description": "Неизвестная ошика."
}
},
"check-all-enabled": {
"title": "OneClick отключен",
"description": "Один или более вариантов OneClick установок отключены. Перейдите в настройки, чтобы включить их.",
"actions": {
"settings": "Настройки",
"not-remind": "Больше не напоминать"
}
}
}
}
},
"bs-launch": {
"success": {
"titles": {
"BS_LAUNCHING": "Запуск...🚀",
"STEAM_LAUNCHING": "Steam запускается!"
},
"msg": {
"BS_LAUNCHING": "Не забудьте разогреться 😉",
"STEAM_LAUNCHING": "Beat Saber запустится сам после Steam."
}
},
"errors": {
"titles": {
"UNKNOWN_ERROR": "Не удалось запустить",
"STEAM_NOT_RUNNING": "Steam не запущен",
"OCULUS_NOT_RUNNING": "Oculus не запущен",
"BS_ALREADY_RUNNING": "Beat Saber уде запущен",
"EXE_NOT_FINDED": "Отсутствуют файлы",
"EXIT": "Вылет"
},
"msg": {
"UNKNOWN_ERROR": "Возникла неизвестная ошибка.",
"STEAM_NOT_RUNNING": "Steam должен быть запущен, чтобы запустить BeatSaber.",
"OCULUS_NOT_RUNNING": "Oculus должен быть запущен, чтобы запустить BeatSaber.",
"BS_ALREADY_RUNNING": "Закройте BeatSaber, чтобы запустить его.",
"EXE_NOT_FINDED": "Некоторые файлы отсутствуют, пробуем их проверить.",
"EXIT": "BeatSaber вылетел, пытаемся проверить файлы."
},
"actions": {
"STEAM_NOT_RUNNING": "Запустить Steam"
}
}
},
"steam": {
"steam-launching": {
"title": "Steam запускается!",
"description": "Beat Saber запустится сам после Steam."
}
},
"custom-version": {
"errors": {
"titles": {
"CantEditSteam": "Не удалось изменить",
"CantRename": "Переименование невозможно",
"VersionAlreadExist": "Эта версия уже добавлена",
"CantClone": "Клонирование невозможно"
},
"msg": {
"CantEditSteam": "Вы не можете изменить версию из Steam, но вы можете её клонировать."
}
},
"success": {
"titles": {
"CloningFinished": "Клонирование завершено 🎉"
}
}
},
"mods": {
"install-mods": {
"titles": {
"success": "Моды установлены 🎉",
"warning": "Моды установлены 🤔"
},
"msg": {
"success": "Все моды были установлены.",
"warning": "Лишь часть модов была установлена.",
"errors": {
"no-mods": "Нет модов для установки.",
"cannot-install-bsipa": "Ошибка установки BSIPA 😨"
}
}
},
"uninstall-mod": {
"titles": {
"success": "Мод удалён 🎉"
},
"msg": {
"errors": {
"no-mods": "Этот мод не установлен 😑"
}
}
},
"uninstall-all-mods": {
"titles": {
"success": "Моды удалены 🎉"
},
"msg": {
"success": "Все моды были удалены.",
"errors": {
"no-mods": "Для этой версии не было установлено модов 😑"
}
}
}
},
"maps": {
"one-click-install": {
"success": "Карта установлена",
"error": "Ошибка установки карты"
}
},
"playlists": {
"one-click-install": {
"success": "Плейлист установлен",
"error": "Ошибка установки плейлиста"
}
},
"models": {
"one-click-install": {
"success": "Модель установлена",
"error": "Ошибка установки модели"
}
},
"shared-folder": {
"info": {
"userdata-backup-created": {
"title": "Бэкап создан",
"msg": "Общая папка 'UserData' может создавать ошибки. В случае проблем отвяжите папку, чтобы восстановить бэкап."
}
}
},
"create-launch-shortcut": {
"success": {
"title": "Ярлык создан",
"msg": "Ярлык находится на рабочем столе."
},
"error": {
"msg": "Ошибка создания ярлыка."
}
}
},
"modals": {
"misc": {
"remember-my-choice": "Запомнить выбор"
},
"guard": {
"title": "Steam Guard",
"inputs": {
"guard-code": {
"label": "Код Steam Guard",
"placeholder": "Введите код Steam Guard"
}
},
"buttons": {
"submit": "Войти"
}
},
"steam-login": {
"title": "Вход в Steam",
"inputs": {
"username": {
"label": "Войти с именем пользователя",
"placeholder": "Введите ваше имя пользователя"
},
"password": {
"label": "Пароль",
"placeholder": "Введите ваш пароль",
"max-length-warning": "Пароль превышает 64 символа! Если пароль недействителен, попробуйте ввести только его первые 64 символа."
},
"qr":{
"label": "Или с QR-кодом",
"note":{
"use-the":"Используйте ",
"steam-mobile-app": "мобильное приложение Steam",
"to-connect-with-qr": "для входа с QR-кодом."
}
},
"stay": "Запомнить меня"
},
"why-credentials": "Зачем мне нужны учетные данные?",
"need-help-to-connect": "Мне нужна помощь, чтобы войти в свой аккаунт!",
"buttons": {
"submit": "Войти"
}
},
"steam-auth-approve":{
"title": "Ожидание подтверждения",
"protected-by-mobile-auth": "Учетная запись защищена мобильным аутентификатором.",
"use-steam-app-to-approve": "Используйте мобильное приложение Steam для подтверждения подключения...",
"not-access-to-steam-app": "У меня нет доступа к мобильному приложению Steam"
},
"steam-credentials": {
"title": "Данные входа Steam",
"p-1": "Данные входа используются только при скачивании, чтобы проверить наличие у вас Beat Saber, это нужно Steam, чтобы разрешить скачивание. Они не сохраняются и напрямую передаются в DepotDownloader. Если вы не хотите вводить данные для входа, воспользуйтесь руководством(Оно на английском языке) :",
"p-2": "Нажмите на шестерню справа вверху и выберите \"Импорт версии\", выберите папку со скачанным Beat Saber (Если вы воспользовались руководством, у вас должен быть корректный путь к папке)"
},
"bs-import-version": {
"title": "Импорт версии",
"description": "Импортировать версию Beat Saber, чтобы использоваться BSManager. Beat Saber будет скопирован в папку версий BSManager.",
"buttons": {
"submit": "Импортировать версию"
}
},
"bs-uninstall": {
"title": "Удалить",
"description": "Вы действительно хотите удалить Beat Saber {version}? Вам нужно будет снова её скачать, чтобы поиграть.",
"buttons": {
"submit": "Удалить"
}
},
"install-folder": {
"title": "Папка установок",
"description": "Все данные будут перемещены в новую папку.",
"buttons": {
"submit": "Выбрать папку"
}
},
"edit-version": {
"title": "Изменить версию",
"buttons": {
"submit": "Изменить"
}
},
"clone-version": {
"title": "Клонировать версию",
"description": "Клонирование версий позволит вам установить разный контент для каждой копии Beat Saber.",
"inputs": {
"name": {
"label": "Имя",
"placeholder": "Имя версии"
},
"color": {
"label": "Цвет"
}
},
"buttons": {
"submit": "Клонировать"
}
},
"uninstall-mod": {
"title": "Удаление мода",
"description": "Вы точно хотите удалить {mod}? Другие моды могут перестать работать.",
"description-bsipa": "AВы точно хотите удалить BSIPA? Все моды перестануть работать."
},
"uninstall-all-mods": {
"title": "Удаление всех модов",
"description": "Вы точно хотите удалить все моды для версии {version}? Это необратимое действие."
},
"maps-actions": {
"delete-maps": {
"title": {
"single": "Удалить карту?",
"multiple": "Удалить карты?"
},
"desc": {
"single": "Вы точно хотите удалить карту {name}?",
"multiple": "Вы точно хотите удалить {nb} карт(ы)?"
},
"info": {
"desc": {
"single": "Это общая карта",
"multiple": "Это общие карты"
},
"title": {
"single": "Эта карта будет удалена из всех версий, использующих общие карты",
"multiple": "Эти карты будут удалены из всех версий, использующих общие карты"
}
}
},
"link-maps": {
"title": "Связать карты",
"desc": "Общие карты доступны во всех версиях игры с этой функцией. Пока связь есть, эта версия будет иметь общие карты.",
"info": "Добавление и удаление карт так же будут общими",
"keep-maps": {
"label": "Оставить карты",
"title": "Все карты из этой версии станут общими. Если не включить, то карты этой версии будут потеряны."
},
"valid-btn": "Связать карты"
},
"unlink-maps": {
"title": "Отвязать карты",
"desc": "Осторожно, отвязка карт сделает недоступными общие карты для этой версии, пока вы не свяжете их снова.",
"keep-maps": {
"label": "Оставить карты",
"title": "Общие карты будут скопированы в папку карт этой версии. Карты не будут потеряны, если это не выбрано."
},
"valid-btn": "Отвязать карты"
}
},
"download-maps": {
"search-btn": "Поиск",
"loading-maps": "Загрузка карт...",
"no-maps-found": "Карты не найдены",
"no-internet": "Нет интернета"
},
"mods-disclaimer": {
"title": "внимание",
"p-1": "Играя с модами, вы соглашаетесь, что:",
"li-1": "У вам могут быть проблемы, которых нет в оригинальной игре. 99.9% багов, вылетов и лагов из-за модов.",
"li-2": "Моды могут быть несовместимы с обновлениями и это норма - будьте терпеливы и уважайте мододелов, они волонтёры со своими личными жизнями.",
"li-3": "Beat Games не специально ломают моды. Они лишь обновляют код, что иногда ломает коды. Они не хотят уничтожить моды",
"p-2": "Не спамьте разработчикам игры из-за проблем с модами и наоборот - мододелы и разработчики игры - разные группы людей. Не будьте идиотами."
},
"shared-folders": {
"title": "Общие папки",
"description": "Свяжите папки Beat Saber, чтобы они стали общими и их содержимое было в других версиях. Заметьте, что удаление файлов так же будет общим.",
"buttons": {
"add-folder": "Добавить папку",
"link-folder": "Связать папку",
"unlink-folder": "Отвязать папку",
"link-all": "Связать всё"
}
},
"create-launch-shortcut": {
"title": "Создать ярлык",
"desc": "Ярлык позволит вам запустить Beat Saber без помощи BSManager.",
"launch-options": "Параметры запуска",
"advanced-launch": "Расширенный запуск",
"valid-btn": "Создать ярлык"
}
},
"maps": {
"map-filter-panel": {
"duration": "Длительность",
"tags": "тэги",
"specificities": "основное",
"requirements": "требуемые моды"
},
"map-types": {
"accuracy": "точность",
"balanced": "баланс",
"challenge": "испытание",
"dancestyle": "танец",
"fitness": "фитнес",
"speed": "скорость",
"tech": "техника"
},
"map-styles": {
"dance": "танец",
"swing": "свинг",
"nightcore": "найткор",
"folk": "народные",
"family": "семейные",
"ambient": "эмбиент",
"funk": "фанк",
"jazz": "джаз",
"soul": "соул",
"speedcore": "спидкор",
"punk": "панк",
"rb": "ар-н-би",
"holiday": "праздник",
"vocaloid": "вокалоиды",
"jrock": "джей-рок",
"trance": "транс",
"drumbass": "драм-н-бейс",
"comedy": "комедия",
"instrumental": "инструментальные",
"hardcore": "хардкор",
"kpop": "кей-поп",
"indie": "инди",
"techno": "техно",
"house": "хаус",
"game": "видеоигры",
"film": "фильмы",
"alt": "альтернативные",
"dubstep": "дапстеп",
"metal": "метал",
"anime": "аниме",
"hiphop": "хипхоп",
"jpop": "джей-поп",
"rock": "прк",
"pop": "поп",
"electronic": "электроника",
"classical-orchestral": "Классика и Оркестр"
},
"map-specificities": {
"automapper": "ИИ",
"ranked": "с рейтингом",
"curated": "оценённые куратором",
"verified": "проверенные авторы",
"fullSpread": "полный набор"
},
"difficulties": {
"Easy": "легко",
"Normal": "нормально",
"Hard": "сложно",
"Expert": "эксперт",
"ExpertPlus": "эксперт+"
},
"map-item": {
"by": "От {songAutor}",
"mapped-by": "автор карты "
}
},
"models": {
"types": {
"singular": {
"avatar": "аватар",
"saber": "мечь",
"platform": "платформа",
"bloq": "куб"
},
"plural": {
"avatar": "аватары",
"saber": "мечи",
"platform": "платформы",
"bloq": "кубы"
}
},
"sorts": {
"name": "Имя",
"date": "Дата",
"author": "Автор"
},
"panel": {
"actions": {
"search": "Поиск скачанных моделей",
"drop-down": {
"delete": "Удалить модели",
"export": "Экспорт моделей"
},
"link-models": "Связать модели",
"unlink-models": "Отвязать модели"
},
"grid": {
"loading": "Загрузка моделей...",
"no-models": "Нет моделей",
"download-models": "Скачать модели"
}
},
"modals": {
"delete-model": {
"title": "Удалить модель",
"desc": "Вы уверены, что хотите удалить модель {modelName}?",
"linked-annotation": "Эта модель будет удалена из всех соединённых версий."
},
"delete-models": {
"title": "Удалить модели",
"desc": "Вы уверены, что хотите удалить {nb} модели(ей)?",
"linked-annotation": "Эти модели будут удалены из всех соединённых версий."
},
"download-models": {
"search-btn": "Поиск",
"search-placeholder": "Поиск моделей",
"search-tips": {
"header": {
"tag": "Тэги",
"desc": "Описание"
},
"author-desc": "Показывать модели только от определённого автора.",
"hash-desc": "Показывать модели только с определённым хэшом.",
"tag-desc": "Показывать модели только с определённым тэгом.",
"name-desc": "Показывать модели только с определённым именем.",
"discordid-desc": "Показывать модели только от определённого пользователя Discord.",
"status-desc": "Показывать модели только с определённым статусом. (только профиль, и только для авторов)"
},
"no-models": "Модели не найдены.",
"no-internet": "Нет интернета.",
"error-occured": "Ошибка, повторите попытку позже."
},
"link-models": {
"avatar": {
"title": "Связать аватары",
"desc": "Общие аватары доступны во всех версиях игры с этой функцией. Пока связь есть, эта версия будет иметь общие аватары.",
"info": "Добавление и удаление аватаров так же будут общими",
"keep-models": {
"label": "Оставить аватары",
"title": "Все аватары из этой версии станут общими. Если не включить, то аватары этой версии будут потеряны."
},
"valid-btn": "Связать аватары"
},
"saber": {
"title": "Связать мечи",
"desc": "Общие мечи доступны во всех версиях игры с этой функцией. Пока связь есть, эта версия будет иметь общие мечи.",
"info": "Добавление и удаление мечей так же будут общими",
"keep-models": {
"label": "Оставить мечи",
"title": "Все мечи из этой версии станут общими. Если не включить, то мечи этой версии будут потеряны."
},
"valid-btn": "Связать мечи"
},
"platform": {
"title": "Связать платформы",
"desc": "Общие платформы доступны во всех версиях игры с этой функцией. Пока связь есть, эта версия будет иметь общие платформы.",
"info": "Добавление и удаление платформ так же будут общими",
"keep-models": {
"label": "Оставить платформы",
"title": "Все платформы из этой версии станут общими. Если не включить, то платформы этой версии будут потеряны."
},
"valid-btn": "Связать платформы"
},
"bloq": {
"title": "Связать кубы",
"desc": "Общие кубы доступны во всех версиях игры с этой функцией. Пока связь есть, эта версия будет иметь общие кубы.",
"info": "Adding and deleting bloqs will also be shared",
"keep-models": {
"label": "Оставить кубы",
"title": "Все кубы из этой версии станут общими. Если не включить, то кубы этой версии будут потеряны."
},
"valid-btn": "Связать кубы"
}
},
"unlink-models": {
"avatar": {
"title": "Отвязать аватары",
"desc": "Осторожно, отвязка аватаров сделает недоступными общие аватары для этой версии, пока вы не свяжете их снова.",
"keep-models": {
"label": "Оставить аватары",
"title": "Общие аватары будут скопированы в папку аватаров этой версии. Аватары не будут потеряны, если это не выбрано."
},
"valid-btn": "Отвязать аватары"
},
"saber": {
"title": "Отвязать мечи",
"desc": "Осторожно, отвязка мечей сделает недоступными общие мечи для этой версии, пока вы не свяжете их снова.",
"keep-models": {
"label": "Оставить мечи",
"title": "Общие мечи будут скопированы в папку мечей этой версии. Мечи не будут потеряны, если это не выбрано."
},
"valid-btn": "Отвязать мечи"
},
"platform": {
"title": "Отвязать платформы",
"desc": "Осторожно, отвязка платформ сделает недоступными общие платформы для этой версии, пока вы не свяжете их снова.",
"keep-models": {
"label": "Оставить платформы",
"title": "Общие платформы будут скопированы в папку платформ этой версии. Платформы не будут потеряны, если это не выбрано."
},
"valid-btn": "Отвязать платформы"
},
"bloq": {
"title": "Отвязать кубы",
"desc": "Осторожно, отвязка кубов сделает недоступными общие кубы для этой версии, пока вы не свяжете их снова.",
"keep-models": {
"label": "Оставить кубы",
"title": "Общие кубы будут скопированы в папку кубов этой версии. Кубы не будут потеряны, если это не выбрано."
},
"valid-btn": "Отвязать кубы"
}
}
},
"notifications": {
"prevent-for-mods": {
"title": "Требуемые моды",
"desc": "Убедитесь, что вы установили все нужные моды, чтобы использовать модели в Beat Saber",
"go-to-mods": "Перейти к модам",
"not-remind": "Больше не напоминать"
},
"prevent-for-models-breaks": {
"title": "Сломанные модели",
"desc": "После обновления движка Beat Saber, модели не работают с этой версией."
},
"export-success": {
"title": "Экспорт завершен 🎉"
}
}
},
"beat-saver": {
"maps-sorts": {
"Latest": "Недавние",
"Relevance": "Релевантные",
"Rating": "Рейтинг",
"Curated": "Оценённые куратором"
}
},
"auto-update": {
"checking": "Проверка на обновления",
"downloading": "Скачивание обновления"
},
"bs-shortcut-launch": {
"beat-saber-launching": "Запускается Beat Saber",
"launching": "Запуск",
"open-bsmanager": "Открыть BSManager",
"status-text": {
"init": "Инициализация...",
"success": {
"BS_LAUNCHING": "Запускаем Beat Saber...",
"STEAM_LAUNCHING": "Запускаем Steam...",
"STEAM_LAUNCHED": "Steam запущен!",
"UNABLE_TO_LAUNCH_STEAM": "Не удалось запустить Steam, пытаемся запустить Beat Saber..."
}
}
},
"dateformat": {
"dayNames": ["Вск", "Пнд", "Втр", "Срд", "Чтв", "Птн", "Суб", "Воскресение", "Понедельник", "Вторник", "Среда", "Четверг", "Пятница", "Суббота"],
"monthNames": ["Янв", "Фев", "Мар", "Апр", "Май", "Июн", "Июл", "Авн", "Сен", "Окт", "Ноя", "Дек", "Январь", "Февраль", "Март", "Апрель", "Май", "Июнь", "Июль", "Август", "Сентябрь", "Октябрь", "Ноябрь", "Декабрь"],
"timeNames": ["д", "п", "дп", "пп", "Д", "П", "ДП", "ПП"]
}
}
@@ -1,121 +1,166 @@
{
"runtimeTarget": {
"name": ".NETCoreApp,Version=v6.0",
"signature": ""
},
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {
"DepotDownloader/2.4.6": {
"dependencies": {
"SteamKit2": "2.4.1",
"protobuf-net": "3.0.101"
},
"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.0.101": {
"dependencies": {
"protobuf-net.Core": "3.0.101"
},
"runtime": {
"lib/net5.0/protobuf-net.dll": {
"assemblyVersion": "3.0.0.0",
"fileVersion": "3.0.101.59408"
}
}
},
"protobuf-net.Core/3.0.101": {
"runtime": {
"lib/net5.0/protobuf-net.Core.dll": {
"assemblyVersion": "3.0.0.0",
"fileVersion": "3.0.101.59408"
}
}
},
"SteamKit2/2.4.1": {
"dependencies": {
"Microsoft.Win32.Registry": "5.0.0",
"protobuf-net": "3.0.101"
},
"runtime": {
"lib/net6.0/SteamKit2.dll": {
"assemblyVersion": "2.4.1.0",
"fileVersion": "2.4.1.10"
}
}
},
"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": {}
"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": {}
}
},
"libraries": {
"DepotDownloader/2.4.6": {
"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.0.101": {
"type": "package",
"serviceable": true,
"sha512": "sha512-mLm8VGfGylp9q+rbJDp3uw0BOeNzfGENecVz/EYGlzq3ss7tfajGXHCMoZm/GxJ9vSn9pcK22UXWZnQ5GJQMjA==",
"path": "protobuf-net/3.0.101",
"hashPath": "protobuf-net.3.0.101.nupkg.sha512"
},
"protobuf-net.Core/3.0.101": {
"type": "package",
"serviceable": true,
"sha512": "sha512-gf9QIF0RlctfjmOjbE6eOyMulkNEsH7tHncjKj/4BTu9tkuTyrH3fv5I+35GnolJqKJ6fh9kYaezvNRL3t75+Q==",
"path": "protobuf-net.core/3.0.101",
"hashPath": "protobuf-net.core.3.0.101.nupkg.sha512"
},
"SteamKit2/2.4.1": {
"type": "package",
"serviceable": true,
"sha512": "sha512-t9yptysn/2YY6KZaI123vOOnumS+ZCFcC6MhFEkTiQ04mdpZ/EWhk5RVY7jU36IQHyTQUXotmn7taKFCXMKp4g==",
"path": "steamkit2/2.4.1",
"hashPath": "steamkit2.2.4.1.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"
},
"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"
}
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,13 +1,13 @@
{
"runtimeOptions": {
"tfm": "net6.0",
"rollForward": "LatestMajor",
"framework": {
"name": "Microsoft.NETCore.App",
"version": "6.0.0"
},
"configProperties": {
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false
}
"runtimeOptions": {
"tfm": "net6.0",
"rollForward": "LatestMajor",
"framework": {
"name": "Microsoft.NETCore.App",
"version": "6.0.0"
},
"configProperties": {
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false
}
}
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
+136 -129
View File
@@ -17,7 +17,7 @@
"electron-debug": "^3.2.0",
"electron-log": "^4.4.8",
"electron-store": "^8.1.0",
"electron-updater": "^6.1.1",
"electron-updater": "^6.1.4",
"fast-deep-equal": "^3.1.3",
"framer-motion": "^10.12.16",
"fs-extra": "^11.1.1",
@@ -27,6 +27,7 @@
"node-fetch": "^2.6.7",
"node-stream-zip": "^1.15.0",
"ps-list": "^7.2.0",
"qrcode.react": "^3.1.0",
"react": "^18.2.0",
"react-colorful": "^5.6.1",
"react-dom": "^18.2.0",
@@ -84,7 +85,7 @@
"css-minimizer-webpack-plugin": "^4.1.0",
"detect-port": "^1.3.0",
"electron": "^25.3.0",
"electron-builder": "^24.4.0",
"electron-builder": "^24.6.3",
"electron-devtools-installer": "^3.2.0",
"electron-notarize": "^1.2.1",
"electronmon": "^2.0.2",
@@ -3469,6 +3470,15 @@
}
}
},
"node_modules/@xmldom/xmldom": {
"version": "0.8.10",
"resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
"integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
"dev": true,
"engines": {
"node": ">=10.0.0"
}
},
"node_modules/@xtuc/ieee754": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -3791,27 +3801,26 @@
"dev": true
},
"node_modules/app-builder-lib": {
"version": "24.4.0",
"resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.4.0.tgz",
"integrity": "sha512-EcdqtWvg1LAApKCfyRBukcVkmsa94s2e1VKHjZLpvA9/D14QEt8rHhffYeaA+cH/pVeoNVn2ob735KnfJKEEow==",
"version": "24.6.3",
"resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.6.3.tgz",
"integrity": "sha512-++0Zp7vcCHfXMBGVj7luFxpqvMPk5mcWeTuw7OK0xNAaNtYQTTN0d9YfWRsb1MvviTOOhyHeULWz1CaixrdrDg==",
"dev": true,
"dependencies": {
"@develar/schema-utils": "~2.6.5",
"@electron/notarize": "^1.2.3",
"@electron/osx-sign": "^1.0.4",
"@electron/rebuild": "^3.2.13",
"@electron/universal": "1.3.4",
"@malept/flatpak-bundler": "^0.4.0",
"@types/fs-extra": "9.0.13",
"7zip-bin": "~5.1.1",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.9",
"builder-util": "24.4.0",
"builder-util": "24.5.0",
"builder-util-runtime": "9.2.1",
"chromium-pickle-js": "^0.2.0",
"debug": "^4.3.4",
"ejs": "^3.1.8",
"electron-publish": "24.4.0",
"electron-publish": "24.5.0",
"form-data": "^4.0.0",
"fs-extra": "^10.1.0",
"hosted-git-info": "^4.1.0",
@@ -4648,9 +4657,9 @@
"dev": true
},
"node_modules/builder-util": {
"version": "24.4.0",
"resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.4.0.tgz",
"integrity": "sha512-tONb/GIK1MKa1BcOPHE1naId3o5nj6gdka5kP7yUJh2DOfF+jMq3laiu+UOZH6A7ZtkMtnGNMYFKFTIv408n/A==",
"version": "24.5.0",
"resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.5.0.tgz",
"integrity": "sha512-STnBmZN/M5vGcv01u/K8l+H+kplTaq4PAIn3yeuufUKSpcdro0DhJWxPI81k5XcNfC//bjM3+n9nr8F9uV4uAQ==",
"dev": true,
"dependencies": {
"@types/debug": "^4.1.6",
@@ -6389,13 +6398,13 @@
"integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
},
"node_modules/dmg-builder": {
"version": "24.4.0",
"resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.4.0.tgz",
"integrity": "sha512-p5z9Cx539GSBYb+b09Z+hMhuBTh/BrI71VRg4rgF6f2xtIRK/YlTGVS/O08k5OojoyhZcpS7JXxDVSmQoWgiiQ==",
"version": "24.6.3",
"resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.6.3.tgz",
"integrity": "sha512-O7KNT7OKqtV54fMYUpdlyTOCP5DoPuRMLqMTgxxV2PO8Hj/so6zOl5o8GTs8pdDkeAhJzCFOUNB3BDhgXbUbJg==",
"dev": true,
"dependencies": {
"app-builder-lib": "24.4.0",
"builder-util": "24.4.0",
"app-builder-lib": "24.6.3",
"builder-util": "24.5.0",
"builder-util-runtime": "9.2.1",
"fs-extra": "^10.1.0",
"iconv-lite": "^0.6.2",
@@ -6685,21 +6694,21 @@
}
},
"node_modules/electron-builder": {
"version": "24.4.0",
"resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.4.0.tgz",
"integrity": "sha512-D5INxodxaUIJgEX6p/fqBd8wQNS8XRAToNIJ9SQC+taNS5D73ZsjLuXiRraFGCB0cVk9KeKhEkdEOH5AaVya4g==",
"version": "24.6.3",
"resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.6.3.tgz",
"integrity": "sha512-O6PqhRXwfxCNTXI4BlhELSeYYO6/tqlxRuy+4+xKBokQvwDDjDgZMMoSgAmanVSCuzjE7MZldI9XYrKFk+EQDw==",
"dev": true,
"dependencies": {
"app-builder-lib": "24.4.0",
"builder-util": "24.4.0",
"app-builder-lib": "24.6.3",
"builder-util": "24.5.0",
"builder-util-runtime": "9.2.1",
"chalk": "^4.1.2",
"dmg-builder": "24.4.0",
"dmg-builder": "24.6.3",
"fs-extra": "^10.1.0",
"is-ci": "^3.0.0",
"lazy-val": "^1.0.5",
"read-config-file": "6.3.2",
"simple-update-notifier": "^1.1.0",
"simple-update-notifier": "2.0.0",
"yargs": "^17.6.2"
},
"bin": {
@@ -6804,13 +6813,13 @@
}
},
"node_modules/electron-publish": {
"version": "24.4.0",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.4.0.tgz",
"integrity": "sha512-U3mnVSxIfNrLW7ZnwiedFhcLf6ExPFXgAsx89WpfQFsV4gFAt/LG+H74p0m9NSvsLXiZuF82yXoxi7Ou8GHq4Q==",
"version": "24.5.0",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.5.0.tgz",
"integrity": "sha512-zwo70suH15L15B4ZWNDoEg27HIYoPsGJUF7xevLJLSI7JUPC8l2yLBdLGwqueJ5XkDL7ucYyRZzxJVR8ElV9BA==",
"dev": true,
"dependencies": {
"@types/fs-extra": "^9.0.11",
"builder-util": "24.4.0",
"builder-util": "24.5.0",
"builder-util-runtime": "9.2.1",
"chalk": "^4.1.2",
"fs-extra": "^10.1.0",
@@ -6851,9 +6860,9 @@
"dev": true
},
"node_modules/electron-updater": {
"version": "6.1.1",
"resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.1.tgz",
"integrity": "sha512-IBT3zJ4yO5UZMF2gOTC9HrlmG4OYSRtOiHKzNAShJvfuicdx6UaXoa6AvhcTxdx6zf/rJyFMRBISS9jhVwTfow==",
"version": "6.1.4",
"resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.4.tgz",
"integrity": "sha512-yYAJc6RQjjV4WtInZVn+ZcLyXRhbVXoomKEfUUwDqIk5s2wxzLhWaor7lrNgxODyODhipjg4SVPMhJHi5EnsCA==",
"dependencies": {
"builder-util-runtime": "9.2.1",
"fs-extra": "^10.1.0",
@@ -6862,7 +6871,7 @@
"lodash.escaperegexp": "^4.1.2",
"lodash.isequal": "^4.5.0",
"semver": "^7.3.8",
"typed-emitter": "^2.1.0"
"tiny-typed-emitter": "^2.1.0"
}
},
"node_modules/electron-updater/node_modules/fs-extra": {
@@ -9944,13 +9953,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/iconv-corefoundation/node_modules/node-addon-api": {
"version": "1.7.2",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz",
"integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==",
"dev": true,
"optional": true
},
"node_modules/iconv-corefoundation/node_modules/slice-ansi": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
@@ -13508,6 +13510,13 @@
"node": ">=10"
}
},
"node_modules/node-addon-api": {
"version": "1.7.2",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz",
"integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==",
"dev": true,
"optional": true
},
"node_modules/node-api-version": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.1.4.tgz",
@@ -14360,16 +14369,17 @@
}
},
"node_modules/plist": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/plist/-/plist-3.0.6.tgz",
"integrity": "sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==",
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
"integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==",
"dev": true,
"dependencies": {
"@xmldom/xmldom": "^0.8.8",
"base64-js": "^1.5.1",
"xmlbuilder": "^15.1.1"
},
"engines": {
"node": ">=6"
"node": ">=10.4.0"
}
},
"node_modules/pngjs": {
@@ -15334,6 +15344,14 @@
"node": ">= 12"
}
},
"node_modules/qrcode.react": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/qrcode.react/-/qrcode.react-3.1.0.tgz",
"integrity": "sha512-oyF+Urr3oAMUG/OiOuONL3HXM+53wvuH3mtIWQrYmsXoAq0DkvZp2RYUWFSMFtbdOpuS++9v+WAkzNVkMlNW6Q==",
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
}
},
"node_modules/qs": {
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
@@ -16254,9 +16272,9 @@
}
},
"node_modules/semver": {
"version": "7.5.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
"integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
"version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dependencies": {
"lru-cache": "^6.0.0"
},
@@ -16555,24 +16573,15 @@
"integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
},
"node_modules/simple-update-notifier": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
"integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
"integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
"dev": true,
"dependencies": {
"semver": "~7.0.0"
"semver": "^7.5.3"
},
"engines": {
"node": ">=8.10.0"
}
},
"node_modules/simple-update-notifier/node_modules/semver": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
"integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
"dev": true,
"bin": {
"semver": "bin/semver.js"
"node": ">=10"
}
},
"node_modules/sirv": {
@@ -17521,6 +17530,11 @@
"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
"dev": true
},
"node_modules/tiny-typed-emitter": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz",
"integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA=="
},
"node_modules/tinycolor2": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz",
@@ -17954,14 +17968,6 @@
"node": ">= 0.6"
}
},
"node_modules/typed-emitter": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/typed-emitter/-/typed-emitter-2.1.0.tgz",
"integrity": "sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==",
"optionalDependencies": {
"rxjs": "*"
}
},
"node_modules/typedarray-to-buffer": {
"version": "3.1.5",
"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
@@ -21840,6 +21846,12 @@
"dev": true,
"requires": {}
},
"@xmldom/xmldom": {
"version": "0.8.10",
"resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
"integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
"dev": true
},
"@xtuc/ieee754": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -22082,27 +22094,26 @@
"dev": true
},
"app-builder-lib": {
"version": "24.4.0",
"resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.4.0.tgz",
"integrity": "sha512-EcdqtWvg1LAApKCfyRBukcVkmsa94s2e1VKHjZLpvA9/D14QEt8rHhffYeaA+cH/pVeoNVn2ob735KnfJKEEow==",
"version": "24.6.3",
"resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.6.3.tgz",
"integrity": "sha512-++0Zp7vcCHfXMBGVj7luFxpqvMPk5mcWeTuw7OK0xNAaNtYQTTN0d9YfWRsb1MvviTOOhyHeULWz1CaixrdrDg==",
"dev": true,
"requires": {
"@develar/schema-utils": "~2.6.5",
"@electron/notarize": "^1.2.3",
"@electron/osx-sign": "^1.0.4",
"@electron/rebuild": "^3.2.13",
"@electron/universal": "1.3.4",
"@malept/flatpak-bundler": "^0.4.0",
"@types/fs-extra": "9.0.13",
"7zip-bin": "~5.1.1",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.9",
"builder-util": "24.4.0",
"builder-util": "24.5.0",
"builder-util-runtime": "9.2.1",
"chromium-pickle-js": "^0.2.0",
"debug": "^4.3.4",
"ejs": "^3.1.8",
"electron-publish": "24.4.0",
"electron-publish": "24.5.0",
"form-data": "^4.0.0",
"fs-extra": "^10.1.0",
"hosted-git-info": "^4.1.0",
@@ -22755,9 +22766,9 @@
"dev": true
},
"builder-util": {
"version": "24.4.0",
"resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.4.0.tgz",
"integrity": "sha512-tONb/GIK1MKa1BcOPHE1naId3o5nj6gdka5kP7yUJh2DOfF+jMq3laiu+UOZH6A7ZtkMtnGNMYFKFTIv408n/A==",
"version": "24.5.0",
"resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.5.0.tgz",
"integrity": "sha512-STnBmZN/M5vGcv01u/K8l+H+kplTaq4PAIn3yeuufUKSpcdro0DhJWxPI81k5XcNfC//bjM3+n9nr8F9uV4uAQ==",
"dev": true,
"requires": {
"@types/debug": "^4.1.6",
@@ -24034,13 +24045,13 @@
"integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
},
"dmg-builder": {
"version": "24.4.0",
"resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.4.0.tgz",
"integrity": "sha512-p5z9Cx539GSBYb+b09Z+hMhuBTh/BrI71VRg4rgF6f2xtIRK/YlTGVS/O08k5OojoyhZcpS7JXxDVSmQoWgiiQ==",
"version": "24.6.3",
"resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.6.3.tgz",
"integrity": "sha512-O7KNT7OKqtV54fMYUpdlyTOCP5DoPuRMLqMTgxxV2PO8Hj/so6zOl5o8GTs8pdDkeAhJzCFOUNB3BDhgXbUbJg==",
"dev": true,
"requires": {
"app-builder-lib": "24.4.0",
"builder-util": "24.4.0",
"app-builder-lib": "24.6.3",
"builder-util": "24.5.0",
"builder-util-runtime": "9.2.1",
"dmg-license": "^1.0.11",
"fs-extra": "^10.1.0",
@@ -24270,21 +24281,21 @@
}
},
"electron-builder": {
"version": "24.4.0",
"resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.4.0.tgz",
"integrity": "sha512-D5INxodxaUIJgEX6p/fqBd8wQNS8XRAToNIJ9SQC+taNS5D73ZsjLuXiRraFGCB0cVk9KeKhEkdEOH5AaVya4g==",
"version": "24.6.3",
"resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.6.3.tgz",
"integrity": "sha512-O6PqhRXwfxCNTXI4BlhELSeYYO6/tqlxRuy+4+xKBokQvwDDjDgZMMoSgAmanVSCuzjE7MZldI9XYrKFk+EQDw==",
"dev": true,
"requires": {
"app-builder-lib": "24.4.0",
"builder-util": "24.4.0",
"app-builder-lib": "24.6.3",
"builder-util": "24.5.0",
"builder-util-runtime": "9.2.1",
"chalk": "^4.1.2",
"dmg-builder": "24.4.0",
"dmg-builder": "24.6.3",
"fs-extra": "^10.1.0",
"is-ci": "^3.0.0",
"lazy-val": "^1.0.5",
"read-config-file": "6.3.2",
"simple-update-notifier": "^1.1.0",
"simple-update-notifier": "2.0.0",
"yargs": "^17.6.2"
},
"dependencies": {
@@ -24373,13 +24384,13 @@
}
},
"electron-publish": {
"version": "24.4.0",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.4.0.tgz",
"integrity": "sha512-U3mnVSxIfNrLW7ZnwiedFhcLf6ExPFXgAsx89WpfQFsV4gFAt/LG+H74p0m9NSvsLXiZuF82yXoxi7Ou8GHq4Q==",
"version": "24.5.0",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.5.0.tgz",
"integrity": "sha512-zwo70suH15L15B4ZWNDoEg27HIYoPsGJUF7xevLJLSI7JUPC8l2yLBdLGwqueJ5XkDL7ucYyRZzxJVR8ElV9BA==",
"dev": true,
"requires": {
"@types/fs-extra": "^9.0.11",
"builder-util": "24.4.0",
"builder-util": "24.5.0",
"builder-util-runtime": "9.2.1",
"chalk": "^4.1.2",
"fs-extra": "^10.1.0",
@@ -24416,9 +24427,9 @@
"dev": true
},
"electron-updater": {
"version": "6.1.1",
"resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.1.tgz",
"integrity": "sha512-IBT3zJ4yO5UZMF2gOTC9HrlmG4OYSRtOiHKzNAShJvfuicdx6UaXoa6AvhcTxdx6zf/rJyFMRBISS9jhVwTfow==",
"version": "6.1.4",
"resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.4.tgz",
"integrity": "sha512-yYAJc6RQjjV4WtInZVn+ZcLyXRhbVXoomKEfUUwDqIk5s2wxzLhWaor7lrNgxODyODhipjg4SVPMhJHi5EnsCA==",
"requires": {
"builder-util-runtime": "9.2.1",
"fs-extra": "^10.1.0",
@@ -24427,7 +24438,7 @@
"lodash.escaperegexp": "^4.1.2",
"lodash.isequal": "^4.5.0",
"semver": "^7.3.8",
"typed-emitter": "^2.1.0"
"tiny-typed-emitter": "^2.1.0"
},
"dependencies": {
"fs-extra": {
@@ -26686,13 +26697,6 @@
"string-width": "^4.2.0"
}
},
"node-addon-api": {
"version": "1.7.2",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz",
"integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==",
"dev": true,
"optional": true
},
"slice-ansi": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
@@ -29502,6 +29506,13 @@
"semver": "^7.3.5"
}
},
"node-addon-api": {
"version": "1.7.2",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz",
"integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==",
"dev": true,
"optional": true
},
"node-api-version": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.1.4.tgz",
@@ -30131,11 +30142,12 @@
}
},
"plist": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/plist/-/plist-3.0.6.tgz",
"integrity": "sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==",
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
"integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==",
"dev": true,
"requires": {
"@xmldom/xmldom": "^0.8.8",
"base64-js": "^1.5.1",
"xmlbuilder": "^15.1.1"
}
@@ -30768,6 +30780,12 @@
}
}
},
"qrcode.react": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/qrcode.react/-/qrcode.react-3.1.0.tgz",
"integrity": "sha512-oyF+Urr3oAMUG/OiOuONL3HXM+53wvuH3mtIWQrYmsXoAq0DkvZp2RYUWFSMFtbdOpuS++9v+WAkzNVkMlNW6Q==",
"requires": {}
},
"qs": {
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
@@ -31449,9 +31467,9 @@
}
},
"semver": {
"version": "7.5.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
"integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
"version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"requires": {
"lru-cache": "^6.0.0"
}
@@ -31703,20 +31721,12 @@
}
},
"simple-update-notifier": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
"integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
"integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
"dev": true,
"requires": {
"semver": "~7.0.0"
},
"dependencies": {
"semver": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
"integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
"dev": true
}
"semver": "^7.5.3"
}
},
"sirv": {
@@ -32431,6 +32441,11 @@
"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
"dev": true
},
"tiny-typed-emitter": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz",
"integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA=="
},
"tinycolor2": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz",
@@ -32749,14 +32764,6 @@
"mime-types": "~2.1.24"
}
},
"typed-emitter": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/typed-emitter/-/typed-emitter-2.1.0.tgz",
"integrity": "sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==",
"requires": {
"rxjs": "*"
}
},
"typedarray-to-buffer": {
"version": "3.1.5",
"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+3 -2
View File
@@ -180,7 +180,7 @@
"css-minimizer-webpack-plugin": "^4.1.0",
"detect-port": "^1.3.0",
"electron": "^25.3.0",
"electron-builder": "^24.4.0",
"electron-builder": "^24.6.3",
"electron-devtools-installer": "^3.2.0",
"electron-notarize": "^1.2.1",
"electronmon": "^2.0.2",
@@ -238,7 +238,7 @@
"electron-debug": "^3.2.0",
"electron-log": "^4.4.8",
"electron-store": "^8.1.0",
"electron-updater": "^6.1.1",
"electron-updater": "^6.1.4",
"fast-deep-equal": "^3.1.3",
"framer-motion": "^10.12.16",
"fs-extra": "^11.1.1",
@@ -248,6 +248,7 @@
"node-fetch": "^2.6.7",
"node-stream-zip": "^1.15.0",
"ps-list": "^7.2.0",
"qrcode.react": "^3.1.0",
"react": "^18.2.0",
"react-colorful": "^5.6.1",
"react-dom": "^18.2.0",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "bs-manager",
"version": "1.2.0",
"version": "1.3.0",
"description": "BSManager",
"main": "./dist/main/main.js",
"author": {
+34 -59
View File
@@ -1,60 +1,18 @@
import { ipcMain } from "electron";
import { BSInstallerService, DownloadEventType, DownloadInfo } from "../services/bs-installer.service";
import { IpcRequest } from "shared/models/ipc";
import { BSInstallerService, DownloadInfo } from "../services/bs-installer.service";
import { InstallationLocationService } from "../services/installation-location.service";
import { UtilsService } from "../services/utils.service";
import { LocalMapsManagerService } from "../services/additional-content/local-maps-manager.service";
import { IpcService } from "../services/ipc.service";
import { from } from "rxjs";
export interface InitDownloadInfoInterface {
cwd: string;
folder: string;
app: string;
depot: string;
manifest: string;
username: string;
stay: boolean;
}
import { from, of } from "rxjs";
const ipc = IpcService.getInstance();
ipcMain.on("is-dotnet-6-installed", async (event, request: IpcRequest<void>) => {
ipc.on("is-dotnet-6-installed", (_, reply) => {
const installer = BSInstallerService.getInstance();
const utils = UtilsService.getInstance();
installer.isDotNet6Installed().then(installed => {
utils.ipcSend(request.responceChannel, { success: true, data: installed });
});
reply(from(installer.isDotNet6Installed()));
});
ipcMain.on("bs-download.start", async (event, request: IpcRequest<DownloadInfo>) => {
BSInstallerService.getInstance()
.downloadBsVersion(request.args)
.then(async res => {
await LocalMapsManagerService.getInstance()
.linkVersionMaps(request.args.bsVersion, true)
.catch(e => {});
UtilsService.getInstance().ipcSend(request.responceChannel, { success: true, data: res });
})
.catch(e => {
UtilsService.getInstance().ipcSend(request.responceChannel, { success: false, data: e });
});
});
ipcMain.on(`bs-download.${"[2FA]" as DownloadEventType}`, async (event, args: IpcRequest<string>) => {
BSInstallerService.getInstance().sendInputProcess(args.args);
});
ipcMain.on("bs-download.kill", async (event, request: IpcRequest<void>) => {
const res = await BSInstallerService.getInstance().killDownloadProcess();
if (request.responceChannel) {
UtilsService.getInstance().ipcSend(request.responceChannel, { success: res });
}
});
ipcMain.on("bs-download.installation-folder", async (event, request: IpcRequest<void>) => {
const installationFolder = InstallationLocationService.getInstance().installationDirectory;
UtilsService.getInstance().ipcSend(request.responceChannel, { success: true, data: installationFolder });
ipc.on("bs-download.installation-folder", (_, reply) => {
const installLocation = InstallationLocationService.getInstance();
reply(of(installLocation.installationDirectory));
});
ipc.on<string>("bs-download.set-installation-folder", (req, reply) => {
@@ -62,15 +20,32 @@ ipc.on<string>("bs-download.set-installation-folder", (req, reply) => {
reply(from(installerService.setInstallationDirectory(req.args)));
});
ipcMain.on("bs-download.import-version", (event, request: IpcRequest<string>) => {
const utils = UtilsService.getInstance();
ipc.on<string>("bs-download.import-version", (req, reply) => {
const installer = BSInstallerService.getInstance();
installer
.importVersion(request.args)
.catch(e => {
utils.ipcSend(request.responceChannel, { success: false, error: e });
})
.then(() => {
utils.ipcSend(request.responceChannel, { success: true });
});
reply(from(installer.importVersion(req.args)));
});
ipc.on<DownloadInfo>("auto-download-bs-version", (req, reply) => {
const bsInstaller = BSInstallerService.getInstance();
reply(bsInstaller.autoDownloadBsVersion(req.args));
});
ipc.on<DownloadInfo>("download-bs-version", (req, reply) => {
const bsInstaller = BSInstallerService.getInstance();
reply(bsInstaller.downloadBsVersion(req.args))
});
ipc.on<DownloadInfo>("download-bs-version-qr", (req, reply) => {
const bsInstaller = BSInstallerService.getInstance();
reply(bsInstaller.downloadBsVersionWithQRCode(req.args))
});
ipc.on("stop-download-bs-version", (_, reply) => {
const bsInstaller = BSInstallerService.getInstance();
reply(of(bsInstaller.stopDownload()));
});
ipc.on<string>("send-input-bs-download", (req, reply) => {
const bsInstaller = BSInstallerService.getInstance();
reply(of(bsInstaller.sendInput(req.args)));
});
+115
View File
@@ -0,0 +1,115 @@
import { ChildProcessWithoutNullStreams, SpawnOptionsWithoutStdio, spawn } from "child_process";
import { Observable, ReplaySubject, Subscriber, filter, map, share } from "rxjs";
import { DepotDownloaderArgsOptions, DepotDownloaderErrorEvent, DepotDownloaderEvent, DepotDownloaderEventType, DepotDownloaderEventTypes, DepotDownloaderInfoEvent, DepotDownloaderWarningEvent } from "../../shared/models/depot-downloader.model";
export class DepotDownloader {
private process: ChildProcessWithoutNullStreams;
private processOut$: Observable<string>;
private subscriber: Subscriber<string>;
public constructor(
options: {
command: string, args?: string[], options?: SpawnOptionsWithoutStdio, echoStartData?: unknown
},
logger?: Logger
){
this.processOut$ = new Observable<string>(subscriber => {
this.subscriber = subscriber;
this.process = spawn(options.command, options.args ?? [], options.options);
subscriber.next(`[Info]|[Start]|${JSON.stringify(options.echoStartData) ?? ""}`);
this.process.stdout.on("data", data => {
const stringData: string = data.toString();
if(!stringData.includes(DepotDownloaderInfoEvent.Progress) && !stringData.includes(DepotDownloaderInfoEvent.Validated)){
logger?.info("DepotDownloader stdout:", stringData);
}
const lines: string[] = stringData.split("\n");
lines.forEach(line => subscriber.next(line));
});
this.process.on("error", error => subscriber.error(error));
this.process.stderr.on("error", error => subscriber.error(error));
this.process.on("exit", () => subscriber.complete());
return () => {
this.process.kill();
logger?.info("DepotDownloader process end with code", this.process.exitCode);
this.process = null;
}
}).pipe(share({connector: () => new ReplaySubject(1)}));
}
public $events(): Observable<DepotDownloaderEvent<unknown>>{
const eventTypesArr = Object.values(DepotDownloaderEventType);
const DepotDownloaderSubTypeOfEventType: {[key in DepotDownloaderEventType]: DepotDownloaderEventTypes[]} = {
[DepotDownloaderEventType.Error]: Object.values(DepotDownloaderErrorEvent),
[DepotDownloaderEventType.Warning]: Object.values(DepotDownloaderWarningEvent),
[DepotDownloaderEventType.Info]: Object.values(DepotDownloaderInfoEvent),
}
return this.processOut$.pipe(map(line => {
const matched = (line.toString() as string).match(/(?:\[(.*?)\])\|(?:\[(.*?)\]\|)?(.*?)(?=$|\[)/gm)?.[0] ?? null;
if(!matched){ return null; }
const splitedLine = matched.split("|").map(str => str.trim().replaceAll("[", "").replaceAll("]", "")) as [DepotDownloaderEventType, DepotDownloaderEventTypes, unknown];
if(!eventTypesArr.includes(splitedLine[0]) || !DepotDownloaderSubTypeOfEventType[splitedLine[0]].includes(splitedLine[1])){
return null;
}
return {
type: splitedLine[0],
subType: splitedLine[1],
data: splitedLine[2],
}
}),
filter(Boolean));
}
public sendInput(input: string): boolean{
if(!this.process.stdin.writable){ throw new Error("DepotDownloader stdin is not writable"); }
return this.process.stdin.write(`${input}\n`);
}
public stop(){
this.subscriber.complete();
}
public get running(){ return !!this.process }
public static buildArgs(depotDownloaderArgs: DepotDownloaderArgsOptions): string[]{
const args: string[] = [];
for(const [key, value] of Object.entries(depotDownloaderArgs)){
if(value === true){
args.push(`-${key}`);
}
else if(value){
args.push(`-${key}`);
args.push(`${value}`);
}
}
return args;
}
}
interface Logger {
info: (...args: unknown[]) => void,
warn: (...args: unknown[]) => void,
error: (...args: unknown[]) => void,
}
@@ -7,7 +7,7 @@ import { InstallationLocationService } from "../installation-location.service";
import { UtilsService } from "../utils.service";
import crypto from "crypto";
import { lstatSync, unlinkSync } from "fs";
import { copySync } from "fs-extra";
import { copySync, createReadStream } from "fs-extra";
import StreamZip from "node-stream-zip";
import { RequestService } from "../request.service";
import sanitize from "sanitize-filename";
@@ -22,6 +22,7 @@ import { deleteFolder, ensureFolderExist, getFilesInFolder, getFoldersInFolder,
import { readFile } from "fs/promises";
import { FolderLinkerService } from "../folder-linker.service";
import { allSettled } from "../../../shared/helpers/promise.helpers";
import { splitIntoChunk } from "../../../shared/helpers/array.helpers";
export class LocalMapsManagerService {
private static instance: LocalMapsManagerService;
@@ -82,17 +83,26 @@ export class LocalMapsManagerService {
}
private async computeMapHash(mapPath: string, rawInfoString: string): Promise<string> {
const mapRawInfo = JSON.parse(rawInfoString);
const mapRawInfo: RawMapInfoData = JSON.parse(rawInfoString);
const shasum = crypto.createHash("sha1");
shasum.update(rawInfoString);
const hashFile = (filePath: string): Promise<void> => {
return new Promise<void>((resolve, reject) => {
const stream = createReadStream(filePath);
stream.on("data", data => shasum.update(data));
stream.on("error", reject);
stream.on("close", resolve);
});
};
for (const set of mapRawInfo._difficultyBeatmapSets) {
for (const diff of set._difficultyBeatmaps) {
const diffFilePath = path.join(mapPath, diff._beatmapFilename);
const diffContent = await readFile(diffFilePath, { encoding: "utf-8" }).catch(() => null);
diffContent && shasum.update(diffContent);
await hashFile(diffFilePath);
}
}
return shasum.digest("hex");
}
@@ -146,28 +156,41 @@ export class LocalMapsManagerService {
(async () => {
const levelsFolder = await this.getMapsFolderPath(version);
const levelsPaths = (await pathExist(levelsFolder)) ? await getFoldersInFolder(levelsFolder) : [];
if(!(await pathExist(levelsFolder))) {
return observer.complete();
}
const levelsPaths = (await getFoldersInFolder(levelsFolder)) ?? [];
progression.total = levelsPaths.length;
const promises = levelsPaths.map(async levelPath => {
const mapInfo = await this.loadMapInfoFromPath(levelPath);
if (!mapInfo) {
return null;
}
progression.loaded++;
observer.next(progression);
return mapInfo;
});
const pathChunks = splitIntoChunk(levelsPaths, 50);
const mapsInfo = await allSettled(promises, { removeFalsy: true });
const loadedMaps: BsmLocalMap[] = [];
progression.maps = mapsInfo;
for (const chunk of pathChunks) {
const mapsInfo = await allSettled(chunk.map(async mapPath => {
const mapInfo = await this.loadMapInfoFromPath(mapPath);
if(!mapInfo) {
return null;
}
progression.loaded++;
observer.next(progression);
return mapInfo;
}), {removeFalsy: true});
loadedMaps.push(...(mapsInfo ?? []));
}
progression.maps = loadedMaps;
observer.next(progression);
})().then(() => {
observer.complete();
})();
}).catch(e=> {
observer.error(e);
});
});
}
+93 -110
View File
@@ -2,14 +2,16 @@ import { BS_APP_ID, BS_DEPOT } from "../constants";
import path from "path";
import { BSVersion } from "shared/bs-version.interface";
import { UtilsService } from "./utils.service";
import { ChildProcessWithoutNullStreams, spawn, spawnSync } from "child_process";
import { spawnSync } from "child_process";
import log from "electron-log";
import { InstallationLocationService } from "./installation-location.service";
import { BSLocalVersionService } from "./bs-local-version.service";
import { WindowManagerService } from "./window-manager.service";
import { copy } from "fs-extra";
import { ensureFolderExist, pathExist } from "../helpers/fs.helpers";
import { net } from "electron";
import { copy, ensureDir } from "fs-extra";
import { pathExist } from "../helpers/fs.helpers";
import { Observable, map } from "rxjs";
import { DepotDownloaderArgsOptions, DepotDownloaderErrorEvent, DepotDownloaderEvent, DepotDownloaderEventType, DepotDownloaderInfoEvent } from "../../shared/models/depot-downloader.model";
import { DepotDownloader } from "../models/depot-downloader.class";
export class BSInstallerService {
private static instance: BSInstallerService;
@@ -19,7 +21,7 @@ export class BSInstallerService {
private readonly localVersionService: BSLocalVersionService;
private readonly windows: WindowManagerService;
private downloadProcess: ChildProcessWithoutNullStreams;
private depotDownloader: DepotDownloader;
private constructor() {
this.utils = UtilsService.getInstance();
@@ -28,7 +30,7 @@ export class BSInstallerService {
this.windows = WindowManagerService.getInstance();
this.windows.getWindow("index.html")?.on("close", () => {
this.killDownloadProcess();
this.depotDownloader?.stop();
});
}
@@ -40,35 +42,16 @@ export class BSInstallerService {
}
private getDepotDownloaderExePath(): string {
return path.join(this.utils.getAssetsScriptsPath(), "depot-downloader", "DepotDownloader.exe");
}
private removeSpecialSchar(txt: string): string {
return txt.replaceAll(/[\[\]]/g, "");
}
private sendDownloadEvent(event: DownloadEventType, data?: string | number, success = true): void {
if (typeof data === "string") {
data = this.removeSpecialSchar(data);
}
this.utils.ipcSend(`bs-download.${event}`, { success, data });
}
public sendInputProcess(input: string) {
if (this.downloadProcess.stdin.writable) {
this.downloadProcess.stdin.write(`${input}\n`);
}
}
public killDownloadProcess(): boolean {
return this.downloadProcess.kill();
return path.join(this.utils.getAssetsScriptsPath(), "depot-downloader", `DepotDownloader.${process.platform === 'linux' ? 'dll' : 'exe'}`);
}
public async isDotNet6Installed(): Promise<boolean> {
try {
const process = spawnSync(this.getDepotDownloaderExePath());
if (process.stderr.toString()) {
log.error("no dotnet", process.stderr.toString());
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;
@@ -78,95 +61,95 @@ export class BSInstallerService {
}
}
public async downloadBsVersion(downloadInfos: DownloadInfo): Promise<DownloadEvent> {
// TODO : Can be a lot improved by using ipcV2 and Observable -- This will be reworked for qrCode login
if (this.downloadProcess?.connected) {
throw "AlreadyDownloading";
}
const { bsVersion } = downloadInfos;
if (!bsVersion) {
return { type: "[Error]" };
}
if (!net.isOnline()) {
throw "no-internet";
}
await ensureFolderExist(this.installLocationService.versionsDirectory);
const versionPath = await this.localVersionService.getVersionPath(bsVersion);
const dest = !downloadInfos.isVerification ? await this.getPathNotAleardyExist(versionPath) : versionPath;
private async buildDepotDownloaderInstance(downloadInfos: DownloadInfo, qr?: boolean): Promise<DepotDownloader> {
const versionPath = await this.localVersionService.getVersionPath(downloadInfos.bsVersion);
const dest = downloadInfos.isVerification ? versionPath : await this.getPathNotAleardyExist(versionPath);
const downloadVersion: BSVersion = { ...downloadInfos.bsVersion, ...(path.basename(dest) !== downloadInfos.bsVersion.BSVersion && { name: path.basename(dest) }) };
this.downloadProcess = spawn(this.getDepotDownloaderExePath(), ["-app", BS_APP_ID, "-depot", BS_DEPOT, "-manifest", bsVersion.BSManifest, "-username", downloadInfos.username, "-dir", this.localVersionService.getVersionFolder(downloadVersion)], { cwd: this.installLocationService.versionsDirectory });
const depotDownloaderOptions: DepotDownloaderArgsOptions = {
app: BS_APP_ID,
depot: BS_DEPOT,
dir: this.localVersionService.getVersionFolder(downloadVersion),
manifest: downloadInfos.bsVersion.BSManifest,
username: downloadInfos.username,
password: downloadInfos.password,
"remember-password": downloadInfos.stay,
validate: downloadInfos.isVerification,
qr
}
this.utils.ipcSend("start-download-version", { success: true, data: downloadVersion });
await ensureDir(this.installLocationService.versionsDirectory);
return new Promise((resolve, reject) => {
this.downloadProcess.stdout.on("data", data => {
const matched = (data.toString() as string).match(/(?:\[(.*?)\])\|(?:\[(.*?)\]\|)?(.*?)(?=$|\[)/gm) ?? [];
matched.forEach(match => {
const out = match.split("|");
const isLinux = process.platform === 'linux';
const exePath = this.getDepotDownloaderExePath();
const args = DepotDownloader.buildArgs(depotDownloaderOptions);
if (out[0] !== "[Progress]" && out[0] !== "[Validated]") {
log.info(data.toString());
return new DepotDownloader({
command: isLinux ? 'dotnet' : exePath,
args: isLinux ? [exePath, ...args] : args,
options: { cwd: this.installLocationService.versionsDirectory },
echoStartData: downloadVersion
}, log);
}
private buildDepotDownloaderObservable(downloadInfos: DownloadInfo, qr?: boolean): Observable<DepotDownloaderEvent> {
return new Observable(sub => {
const depotDownloaderBuildPromise = this.buildDepotDownloaderInstance(downloadInfos, qr);
depotDownloaderBuildPromise.then(depotDownloader => {
if(this.depotDownloader?.running){
this.depotDownloader.stop();
}
this.depotDownloader = depotDownloader;
depotDownloader.$events().pipe(map(event => {
if(event.type === DepotDownloaderEventType.Error){
throw event;
}
return event;
})).subscribe(sub);
if (out[0] === ("[Password]" as DownloadEventType) && downloadInfos.password) {
this.sendInputProcess(downloadInfos.password);
} else if (out[0] === ("[Password]" as DownloadEventType)) {
this.killDownloadProcess();
resolve({ type: "[Password]", data: bsVersion });
} else if (out[0] === ("[2FA]" as DownloadEventType) || out[0] === ("[Guard]" as DownloadEventType)) {
this.sendDownloadEvent("[2FA]");
} else if (out[0] === ("[Progress]" as DownloadEventType) || (out[0] === ("[Validated]" as DownloadEventType) && parseFloat(out[1]) < 100)) {
this.sendDownloadEvent("[Progress]", parseFloat(out[1].replaceAll(",", ".")));
} else if (out[0] === ("[Finished]" as DownloadEventType) || (out[0] === ("[Validated]" as DownloadEventType) && parseFloat(out[1]) === 100)) {
resolve({ type: "[Finished]" });
this.killDownloadProcess();
} else if (out[0] === ("[SteamID]" as DownloadEventType)) {
this.sendDownloadEvent("[SteamID]", out[1]);
} else if (out[0] === ("[Warning]" as DownloadEventType)) {
this.sendDownloadEvent("[Warning]", out[1]);
} else if (out[0] === ("[Error]" as DownloadEventType)) {
reject(this.removeSpecialSchar(out[1]));
this.killDownloadProcess();
log.error("Download Event, Error", data.toString());
}
});
});
}).catch(err => sub.error({
type: DepotDownloaderEventType.Error,
subType: DepotDownloaderErrorEvent.Unknown,
data: err
} as DepotDownloaderEvent));
this.downloadProcess.stdout.on("error", err => {
log.error("BS-DOWNLOAD ERROR", err.toString());
this.killDownloadProcess();
if (err.toString().includes(".NET") || err.toString().includes("dotnet") || err.toString().includes(".dll")) {
reject("dotnet");
}
reject();
});
this.downloadProcess.stderr.on("data", err => {
log.error("BS-DOWNLOAD ERROR", err.toString());
this.killDownloadProcess();
if (err.toString().includes(".NET") || err.toString().includes("dotnet") || err.toString().includes(".dll")) {
reject("dotnet");
}
reject();
});
this.downloadProcess.stderr.on("error", err => {
log.error("BS-DOWNLOAD ERROR", err.toString());
this.killDownloadProcess();
if (err.toString().includes(".NET") || err.toString().includes("dotnet") || err.toString().includes(".dll")) {
reject("dotnet");
}
reject();
});
this.downloadProcess.on("close", () => reject());
return () => {
depotDownloaderBuildPromise.then(depotDownloader => depotDownloader.stop());
}
});
}
public downloadBsVersion(downloadInfos: DownloadInfo): Observable<DepotDownloaderEvent> {
return this.buildDepotDownloaderObservable(downloadInfos);
}
public autoDownloadBsVersion(downloadInfos: DownloadInfo): Observable<DepotDownloaderEvent> {
return this.buildDepotDownloaderObservable({...downloadInfos, password: null, stay: true}).pipe(map(event => {
if(event.type === DepotDownloaderEventType.Info && event.subType === DepotDownloaderInfoEvent.Password){
throw new Error("Ask for password while auto download");
}
return event;
}));
}
public downloadBsVersionWithQRCode(downloadInfos: DownloadInfo): Observable<DepotDownloaderEvent> {
return this.buildDepotDownloaderObservable(downloadInfos, true);
}
public sendInput(input: string): boolean {
return this.depotDownloader?.sendInput(input);
}
public stopDownload(): void {
this.depotDownloader?.stop();
}
private async getPathNotAleardyExist(path: string): Promise<string> {
let destPath = path;
let folderExist = await pathExist(destPath);
@@ -198,10 +181,10 @@ export class BSInstallerService {
export interface DownloadInfo {
bsVersion: BSVersion;
username: string;
username?: string;
password?: string;
stay?: boolean;
isVerification: boolean;
isVerification?: boolean;
}
export interface DownloadEvent {
+17 -10
View File
@@ -1,7 +1,7 @@
import { IpcRequest } from "shared/models/ipc";
import { ipcMain } from "electron";
import { Observable } from "rxjs";
import { IpcCompleteChannel, IpcErrorChannel } from "shared/models/ipc/ipc-response.interface";
import { IpcCompleteChannel, IpcErrorChannel, IpcTearDownChannel } from "shared/models/ipc/ipc-response.interface";
import { AppWindow } from "shared/models/window-manager/app-window.model";
import { WindowManagerService } from "./window-manager.service";
import { IpcReplier } from "shared/models/ipc/ipc-request.interface";
@@ -31,6 +31,10 @@ export class IpcService {
return `${channel}_complete`;
}
private getTearDownChannel(channel: string): IpcTearDownChannel {
return `${channel}_teardown`;
}
private buildProxyListener<T>(listener: IpcListener<T>) {
return (event: Electron.IpcMainEvent, req: IpcRequest<T>) => {
const window = this.windows.getAppWindowFromWebContents(event.sender);
@@ -44,18 +48,21 @@ export class IpcService {
}
private connectStream(channel: string, window: AppWindow, observable: Observable<unknown>): void {
observable.subscribe(
data => {
this.send(channel, window, data);
},
error => {
const sub = observable.subscribe({
next: data => this.send(channel, window, data),
error: error => {
log.error(error);
this.send(this.getErrorChannel(channel), window, error);
},
() => {
this.send(this.getCompleteChannel(channel), window);
}
);
complete: () => this.send(this.getCompleteChannel(channel), window)
})
ipcMain.once(this.getTearDownChannel(channel), () => sub.unsubscribe());
sub.add(() => {
ipcMain.removeAllListeners(this.getTearDownChannel(channel));
});
}
public on<T>(channel: string, listener: IpcListener<T>): void {
+10 -1
View File
@@ -1,9 +1,10 @@
import { app, BrowserWindow, BrowserWindowConstructorOptions } from "electron";
import { app, BrowserWindow, BrowserWindowConstructorOptions, shell } from "electron";
import { resolveHtmlPath } from "../util";
import { UtilsService } from "./utils.service";
import { AppWindow } from "shared/models/window-manager/app-window.model";
import path from "path";
import { APP_NAME } from "../constants";
import { isValidUrl } from "../../shared/helpers/url.helpers";
export class WindowManagerService {
private static instance: WindowManagerService;
@@ -44,6 +45,14 @@ export class WindowManagerService {
public openWindow(windowType: AppWindow, options?: BrowserWindowConstructorOptions): Promise<BrowserWindow> {
const window = new BrowserWindow({ ...this.appWindowsOptions[windowType], ...this.baseWindowOption, ...options });
window.webContents.setWindowOpenHandler(({ url }) => {
if(isValidUrl(url)){
shell.openExternal(url);
}
return { action: "deny"}
})
const promise = window.loadURL(resolveHtmlPath(windowType));
window.removeMenu();
window.setMenu(null);
@@ -1,7 +1,5 @@
import { BSVersion } from "shared/bs-version.interface";
import { useState, memo } from "react";
import { BsDownloaderService } from "renderer/services/bs-downloader.service";
import { distinctUntilChanged, map } from "rxjs/operators";
import { useState, memo, ComponentProps } from "react";
import defaultImage from "../../../../assets/images/default-version-img.jpg";
import dateFormat from "dateformat";
import { BsmImage } from "../shared/bsm-image.component";
@@ -11,51 +9,38 @@ import { LinkOpenerService } from "renderer/services/link-opener.service";
import { motion } from "framer-motion";
import { GlowEffect } from "../shared/glow-effect.component";
import { useService } from "renderer/hooks/use-service.hook";
import { useObservable } from "renderer/hooks/use-observable.hook";
import equal from "fast-deep-equal";
export const AvailableVersionItem = memo(function AvailableVersionItem(props: { version: BSVersion }) {
const bsDownloaderService = useService(BsDownloaderService)
type Props = {
version: BSVersion;
selected: boolean;
onClick: ComponentProps<"li">["onClick"];
}
export const AvailableVersionItem = memo(function AvailableVersionItem({version, selected, onClick}: Props) {
const linkOpener = useService(LinkOpenerService)
const selected = useObservable(
bsDownloaderService.selectedBsVersion$.pipe(distinctUntilChanged(), map(version => version?.BSVersion === props.version.BSVersion)),
false
);
const [hovered, setHovered] = useState(false);
const t = useTranslation();
const formatedDate = (() => {
return dateFormat(+props.version.ReleaseDate * 1000, "ddd. d mmm yyyy");
})();
const toggleSelect = () => {
if (bsDownloaderService.isDownloading) {
return;
}
if (selected) {
bsDownloaderService.selectedBsVersion$.next(null);
} else {
bsDownloaderService.selectedBsVersion$.next(props.version);
}
};
const openReleasePage = () => {
linkOpener.open(props.version.ReleaseURL);
linkOpener.open(version.ReleaseURL);
};
const formatedDate = (() => dateFormat(+version.ReleaseDate * 1000, "ddd. d mmm yyyy"))();
return (
<motion.li className="group relative w-72 h-60 transition-transform active:scale-[.98]" onClick={toggleSelect} onHoverStart={() => setHovered(true)} onHoverEnd={() => setHovered(false)}>
<motion.li className="group relative w-72 h-60 transition-transform active:scale-[.98]" onClick={onClick} onHoverStart={() => setHovered(true)} onHoverEnd={() => setHovered(false)}>
<GlowEffect visible={hovered || selected} className="absolute" />
<div className={`relative flex flex-col overflow-hidden rounded-md w-72 h-60 cursor-pointer group-hover:shadow-none duration-300 bg-light-main-color-2 dark:bg-main-color-2 ${!selected && "shadow-lg shadow-gray-900"}`}>
<BsmImage image={props.version.ReleaseImg ? props.version.ReleaseImg : defaultImage} errorImage={defaultImage} placeholder={defaultImage} className="absolute top-0 right-0 w-full h-full opacity-40 blur-xl object-cover" loading="lazy" />
<BsmImage image={props.version.ReleaseImg ? props.version.ReleaseImg : defaultImage} errorImage={defaultImage} placeholder={defaultImage} className="bg-black w-full h-3/4 object-cover" loading="lazy" />
<BsmImage image={version.ReleaseImg ? version.ReleaseImg : defaultImage} errorImage={defaultImage} placeholder={defaultImage} className="absolute top-0 right-0 w-full h-full opacity-40 blur-xl object-cover" loading="lazy" />
<BsmImage image={version.ReleaseImg ? version.ReleaseImg : defaultImage} errorImage={defaultImage} placeholder={defaultImage} className="bg-black w-full h-3/4 object-cover" loading="lazy" />
<div className="z-[1] p-2 w-full flex items-center justify-between grow">
<div>
<h2 className="block text-xl font-bold text-white tracking-wider">{props.version.BSVersion}</h2>
<h2 className="block text-xl font-bold text-white tracking-wider">{version.BSVersion}</h2>
<span className="text-sm text-gray-700 dark:text-gray-400">{formatedDate}</span>
</div>
{props.version.ReleaseURL && (
{version.ReleaseURL && (
// eslint-disable-next-line jsx-a11y/anchor-is-valid -- link will be reworked
<a
onClickCapture={e => {
@@ -72,4 +57,4 @@ export const AvailableVersionItem = memo(function AvailableVersionItem(props: {
</div>
</motion.li>
);
});
}, equal);
@@ -1,22 +1,28 @@
import { BSVersionManagerService } from "renderer/services/bs-version-manager.service";
import { filter, map } from "rxjs/operators";
import { useContext } from "react";
import { AvailableVersionItem } from "./available-version-item.component";
import { useService } from "renderer/hooks/use-service.hook";
import { useObservable } from "renderer/hooks/use-observable.hook";
import { BSVersion } from "shared/bs-version.interface";
import { AvailableVersionsContext } from "renderer/pages/available-versions-list.components";
import equal from "fast-deep-equal";
export function AvailableVersionsSlide(props: { year: string }) {
const versionsService = useService(BSVersionManagerService);
const availableVersions = useObservable(
versionsService.availableVersions$.pipe(filter(versions => !!versions?.length), map(() => versionsService.getAvaibleVersionsOfYear(props.year))),
[]
);
type Props = {
versions: BSVersion[]
}
export function AvailableVersionsSlide({ versions }: Props) {
const context = useContext(AvailableVersionsContext);
const setSelectedVersion = (version: BSVersion) => {
if(equal(version, context.selectedVersion)){
return context.setSelectedVersion(null);
}
context.setSelectedVersion(version);
}
return (
<ol className="w-full flex items-start justify-center gap-6 shrink-0 content-start flex-wrap p-4 overflow-x-hidden overflow-y-scroll scrollbar-thin scrollbar-thumb-rounded-full scrollbar-thumb-neutral-900">
{availableVersions.map(version => (
<AvailableVersionItem key={version.BSManifest} version={version} />
{versions.map(version => (
<AvailableVersionItem key={version.BSManifest} version={version} selected={equal(version, context.selectedVersion)} onClick={() => setSelectedVersion(version)}/>
))}
</ol>
);
@@ -1,7 +1,6 @@
import { useState } from "react";
import { BSVersionManagerService } from "../../services/bs-version-manager.service";
import { AvailableVersionsSlide } from "./available-versions-slide.component";
import { filter, map } from "rxjs/operators";
import { TabNavBar } from "../shared/tab-nav-bar.component";
import { useService } from "renderer/hooks/use-service.hook";
import { useObservable } from "renderer/hooks/use-observable.hook";
@@ -9,22 +8,28 @@ import { useObservable } from "renderer/hooks/use-observable.hook";
export function AvailableVersionsSlider() {
const versionManagerService = useService(BSVersionManagerService);
const availableVersions = useObservable(versionManagerService.availableVersions$);
const [yearIndex, setYearIndex] = useState(0);
const availableYears = useObservable(
versionManagerService.availableVersions$.pipe(filter(versions => !!versions?.length), map(() => versionManagerService.getAvailableYears())),
[]
);
const availableYears = (() => {
if(!availableVersions?.length) { return []; }
return [...new Set(availableVersions.map(v => v.year))].sort((a, b) => b.localeCompare(a))
})();
const setSelectedYear = (index: number) => {
setYearIndex(index);
};
const getVersionOfYear = (year: string) => {
return availableVersions.filter(v => v.year === year).sort((a, b) => +b.ReleaseDate - +a.ReleaseDate);
};
return (
<div className="w-full h-fit max-h-full flex flex-col items-center grow min-h-0 gap-3">
<TabNavBar tabIndex={yearIndex} tabsText={availableYears} onTabChange={setSelectedYear} />
<ol className="w-full min-h-0 flex transition-transform duration-300" style={{ transform: `translate(${-(yearIndex * 100)}%, 0)` }}>
{availableYears.map(year => (
<AvailableVersionsSlide key={year} year={year} />
<AvailableVersionsSlide key={year} versions={getVersionOfYear(year)} />
))}
</ol>
</div>
@@ -38,6 +38,7 @@ export const LinkButton = motion(
!props.disabled && props.onClick?.();
}}
style={{ pointerEvents: props.disabled ? "none" : "auto" }}
tabIndex={-1}
>
<span className="absolute top-0 left-0 h-full w-full rounded-full brightness-50 opacity-75 dark:opacity-20 dark:filter-none" style={{ backgroundColor: linkedColor }} />
<BsmIcon className="p-1 absolute top-0 left-0 h-full w-full !bg-transparent -rotate-45 brightness-150" icon={props.linked ? "link" : "unlink"} style={{ color: linkedColor }} />
@@ -121,6 +121,7 @@ export function MapsPlaylistsPanel({ version, isActive }: Props) {
e.stopPropagation();
onClickAdd(index);
}}
tabIndex={-1}
>
<span className="absolute top-0 left-0 h-full w-full brightness-50 opacity-75 dark:opacity-20 dark:filter-none" style={{ backgroundColor: "currentcolor" }} />
<motion.div className="h-full p-0.5" variants={variants}>
@@ -1,13 +1,19 @@
import { useState } from "react";
import { useState, useEffect } from "react";
import { BsmButton } from "renderer/components/shared/bsm-button.component";
import { BsmImage } from "renderer/components/shared/bsm-image.component";
import { useTranslation } from "renderer/hooks/use-translation.hook";
import { ModalComponent, ModalExitCode, ModalService } from "renderer/services/modale.service";
import BeatImpatient from "../../../../../assets/images/apngs/beat-impatient.png";
import { WhyCredentialsModal } from "./why-credentials-modal.component";
import { useService } from "renderer/hooks/use-service.hook";
import { Observable } from "rxjs";
import { useObservable } from "renderer/hooks/use-observable.hook";
import { QRCodeSVG } from "qrcode.react";
import { BsmCheckbox } from "renderer/components/shared/bsm-checkbox.component";
import { BsmBasicSpinner } from "renderer/components/shared/bsm-basic-spinner/bsm-basic-spinner.component";
export const LoginModal: ModalComponent<{ username: string; password: string; stay: boolean }> = ({ resolver }) => {
export const LoginModal: ModalComponent<
{ username: string; password: string; stay: boolean, method: "form"|"qr" },
{ qrCode$: Observable<string>, logged$: Observable<string> }
> = ({ resolver, data }) => {
const modal = useService(ModalService);
@@ -15,13 +21,29 @@ export const LoginModal: ModalComponent<{ username: string; password: string; st
const [password, setPassword] = useState("");
const [stay, setStay] = useState(false);
const [showPassword, setShowPassword] = useState(false);
const qrCodeUrl = useObservable(data.qrCode$);
const t = useTranslation();
useEffect(() => {
const sub = data.logged$.subscribe({
next: logged => {
if(!logged) return;
// If the logged event is emitted, it means that the user is logged in by the QR code
resolver({ exitCode: ModalExitCode.COMPLETED, data: { username, password, stay, method: "qr" } });
},
error: () => resolver({ exitCode: ModalExitCode.NO_CHOICE}),
complete: () => resolver({ exitCode: ModalExitCode.NO_CHOICE})
});
return () => sub.unsubscribe();
}, []);
const loggin = () => {
if (!username || !password) {
return;
}
resolver({ exitCode: ModalExitCode.COMPLETED, data: { username, password, stay } });
resolver({ exitCode: ModalExitCode.COMPLETED, data: { username, password, stay, method: "form" } });
};
const whyCredentials = () => {
@@ -29,48 +51,48 @@ export const LoginModal: ModalComponent<{ username: string; password: string; st
};
return (
<form
className="max-w-xs"
onSubmit={e => {
e.preventDefault();
loggin();
}}
>
<h1 className="text-3xl uppercase tracking-wide w-full text-center text-gray-800 dark:text-gray-200">{t("modals.steam-login.title")}</h1>
<BsmImage className="mx-auto h-20" image={BeatImpatient} />
<div className="mb-2">
<label className="block font-bold cursor-pointer tracking-wide text-gray-800 dark:text-gray-200" htmlFor="username">
{t("modals.steam-login.inputs.username.label")}
</label>
<input className="w-full bg-light-main-color-1 dark:bg-main-color-1 px-1 py-[2px] rounded-md outline-none h-8" onChange={e => setUsername(e.target.value)} value={username} type="text" name="username" id="username" placeholder={t("modals.steam-login.inputs.username.placeholder")} />
</div>
<div className="mb-2 flex flex-col w-full">
<label className="block font-bold cursor-pointer tracking-wide text-gray-800 dark:text-gray-200" htmlFor="password">
{t("modals.steam-login.inputs.password.label")}
</label>
<div className="bg-light-main-color-1 dark:bg-main-color-1 rounded-md flex box-border h-8">
<input className="grow px-1 py-[2px] outline-none bg-transparent" onChange={e => setPassword(e.target.value)} value={password} type={showPassword ? "text" : "password"} name="password" id="password" placeholder={t("modals.steam-login.inputs.password.placeholder")} />
<BsmButton className="shrink-0 m-1 rounded-md p-0.5 !bg-light-main-color-3 dark:!bg-main-color-3" icon={showPassword ? "eye-cross" : "eye"} withBar={false} onClick={() => setShowPassword(prev => !prev)} />
<form className="w-[40rem] text-gray-800 dark:text-gray-200" onSubmit={e => {e.preventDefault(); loggin()}}>
<h1 className="text-3xl uppercase tracking-wide w-full text-center mb-5">{t("modals.steam-login.title")}</h1>
<div className="flex justify-center items-stretch gap-5 min-w-0">
<div className="grow flex flex-col gap-2">
<div>
<label className="block font-bold cursor-pointer tracking-wide" htmlFor="username">
{t("modals.steam-login.inputs.username.label")}
</label>
<input className="w-full bg-light-main-color-1 dark:bg-main-color-1 px-1 py-[2px] rounded-md outline-none h-9" onChange={e => setUsername(e.target.value)} value={username} type="text" name="username" id="username" placeholder={t("modals.steam-login.inputs.username.placeholder")} />
</div>
<div>
<label className="block font-bold cursor-pointer tracking-wide" htmlFor="password">
{t("modals.steam-login.inputs.password.label")}
</label>
<div className="bg-light-main-color-1 dark:bg-main-color-1 rounded-md flex box-border h-9">
<input className="grow px-1 py-[2px] outline-none bg-transparent" onChange={e => setPassword(e.target.value)} value={password} type={showPassword ? "text" : "password"} name="password" id="password" placeholder={t("modals.steam-login.inputs.password.placeholder")} />
<BsmButton className="shrink-0 m-1 rounded-md p-0.5 !bg-light-main-color-3 dark:!bg-main-color-3" icon={showPassword ? "eye-cross" : "eye"} withBar={false} onClick={() => setShowPassword(prev => !prev)} />
</div>
{password?.length > 64 && <span className="text-orange-700 dark:text-orange-400 text-xs whitespace-normal min-w-0">{t("modals.steam-login.inputs.password.max-length-warning")}</span>}
</div>
<div className="flex flex-row justify-start items-center gap-1.5 py-3">
<BsmCheckbox className="relative z-[1] w-6 aspect-square" checked={stay} onChange={enable => setStay(() => enable)}/>
<span>{t("modals.steam-login.inputs.stay")}</span>
</div>
<BsmButton typeColor="primary" className="rounded-md text-center transition-all h-10" type="submit" withBar={false} text="modals.steam-login.buttons.submit" />
<div className="grow flex justify-center items-center gap-1 flex-col">
<a className="flex justify-center items-center text-[.85rem] underline" href="https://help.steampowered.com/wizard/HelpWithLogin" target="_blank">{t("modals.steam-login.need-help-to-connect")}</a>
<span className="flex justify-center items-center text-[.85rem] underline cursor-pointer" onClick={whyCredentials}>{t("modals.steam-login.why-credentials")}</span>
</div>
</div>
<div className="flex flex-col max-w-[13rem]">
<span className="block font-bold cursor-pointer tracking-wide ">{t("modals.steam-login.inputs.qr.label")}</span>
<div className="w-52 h-52 p-3 bg-light-main-color-1 dark:bg-white rounded-md max-w-xs mb-1 flex items-center justify-center">
{(qrCodeUrl ?
<QRCodeSVG className="w-full h-full text-light-main-color-1 dark:text-white" value={qrCodeUrl} bgColor="currentColor" level="H"/> :
<BsmBasicSpinner className="w-full h-full p-11 text-neutral-300" />
)}
</div>
<span className="text-center whitespace-break-spaces text-[.85rem]">
{t("modals.steam-login.inputs.qr.note.use-the")}<a className="underline" href="https://store.steampowered.com/mobile" target="_blank">{t("modals.steam-login.inputs.qr.note.steam-mobile-app")}</a> {t("modals.steam-login.inputs.qr.note.to-connect-with-qr")}
</span>
</div>
{password?.length > 64 && <span className="text-orange-700 dark:text-orange-400 text-xs whitespace-normal max-w-full w-full overflow-hidden">{t("modals.steam-login.inputs.password.max-length-warning")}</span>}
</div>
<span onClick={whyCredentials} className="underline my-4 block cursor-pointer">
{t("modals.steam-login.why-credentials")}
</span>
<div className="grid grid-flow-col grid-cols-2 gap-4">
<BsmButton
typeColor="cancel"
className="rounded-md text-center transition-all"
onClick={() => {
resolver({ exitCode: ModalExitCode.CANCELED });
}}
withBar={false}
text="misc.cancel"
/>
<BsmButton typeColor="primary" className="rounded-md text-center transition-all" type="submit" withBar={false} text="modals.steam-login.buttons.submit" />
</div>
</form>
);
@@ -25,11 +25,9 @@ export const ShareFoldersModal: ModalComponent<void, BSVersion> = ({ data }) =>
const t = useTranslation();
const [folders, setFolders] = useState<string[]>([]);
const [folders, setFolders] = useState<string[]>(Array.from(new Set([...config.get<string[]>(SHARED_FOLDERS_KEY)]).values()));
useEffect(() => {
setFolders(prev => Array.from(new Set([...prev, ...config.get<string[]>(SHARED_FOLDERS_KEY)]).values()));
linker
.getLinkedFolders(data, { relative: true })
.toPromise()
@@ -0,0 +1,39 @@
import { ModalComponent, ModalExitCode } from "../../../services/modale.service";
import BeatWaiting from "../../../../../assets/images/apngs/beat-waiting.png";
import LoginMobileAuthImage from "../../../../../assets/images/steam/login_mobile_auth.png";
import { BsmImage } from "renderer/components/shared/bsm-image.component";
import { useTranslation } from "renderer/hooks/use-translation.hook";
import { Observable } from "rxjs";
import { useOnUpdate } from "renderer/hooks/use-on-update.hook";
export const SteamMobileApproveModal: ModalComponent<void, { logged$: Observable<unknown> }> = ({ resolver, data }) => {
const t = useTranslation();
useOnUpdate(() => {
const sub = data.logged$.subscribe({
next: () => resolver({ exitCode: ModalExitCode.COMPLETED }),
error: () => resolver({ exitCode: ModalExitCode.NO_CHOICE }),
complete: () => resolver({ exitCode: ModalExitCode.NO_CHOICE }),
});
return () => sub.unsubscribe();
}, []);
return (
<form className="max-w-md flex flex-col items-center">
<h1 className="text-3xl uppercase tracking-wide w-full text-center text-gray-800 dark:text-gray-200 m-0">{t("modals.steam-auth-approve.title")}</h1>
<p className="font-bold my-3">{t("modals.steam-auth-approve.protected-by-mobile-auth")}</p>
<div className="relative flex w-full bg-light-main-color-1 dark:bg-main-color-1 rounded-md gap-5">
<BsmImage className="w-fit ml-7 mt-5" image={LoginMobileAuthImage}/>
<div className="flex flex-col justify-center gap-5 pr-2">
<p className="text-lg">{t("modals.steam-auth-approve.use-steam-app-to-approve")}</p>
</div>
<BsmImage className="absolute bottom-1 right-1 w-10 h-10 spin-loading" image={BeatWaiting}/>
</div>
<a className="underline text-sm mt-2.5" href="https://help.steampowered.com/wizard/HelpWithLoginInfo?lost=8&issueid=402" target="_blank">{t("modals.steam-auth-approve.not-access-to-steam-app")}</a>
</form>
);
};
@@ -112,7 +112,7 @@ function ModelItemElement<T = unknown>(props: Props<T>) {
};
return (
<motion.li className={`relative flex-grow min-w-[16rem] h-64 cursor-pointer ${props.className ?? ""}`} onHoverStart={() => setHovered(() => true)} onHoverEnd={() => setHovered(() => false)}>
<motion.li className={`relative flex-grow min-w-[16rem] h-64 cursor-pointer text-gray-200 ${props.className ?? ""}`} onHoverStart={() => setHovered(() => true)} onHoverEnd={() => setHovered(() => false)}>
<GlowEffect visible={props.selected || hovered} />
<div className="absolute top-0 left-0 w-full h-full rounded-lg overflow-hidden blur-none bg-black shadow-sm shadow-black">
<div ref={ref} className="contents">
@@ -1,8 +1,8 @@
import { BSVersion } from "shared/bs-version.interface";
import { Link, useLocation } from "react-router-dom";
import { BsDownloaderService } from "renderer/services/bs-downloader.service";
import { useEffect, useState } from "react";
import { combineLatest, Subscription } from "rxjs";
import { useState } from "react";
import { distinctUntilChanged, map, of, Subscription, switchMap } from "rxjs";
import { BSLauncherService, LaunchMods } from "renderer/services/bs-launcher.service";
import { ConfigurationService } from "renderer/services/configuration.service";
import { BSUninstallerService } from "renderer/services/bs-uninstaller.service";
@@ -13,6 +13,8 @@ import { NavBarItem } from "./nav-bar-item.component";
import useFitText from "use-fit-text";
import Tippy from "@tippyjs/react";
import { useService } from "renderer/hooks/use-service.hook";
import equal from "fast-deep-equal";
import { useOnUpdate } from "renderer/hooks/use-on-update.hook";
export function BsVersionItem(props: { version: BSVersion }) {
const downloaderService = useService(BsDownloaderService);
@@ -24,10 +26,28 @@ export function BsVersionItem(props: { version: BSVersion }) {
const { state } = useLocation() as { state: BSVersion };
const { fontSize, ref } = useFitText();
const [downloading, setDownloading] = useState(false);
const [downloadPercent, setDownloadPercent] = useState(0);
const [isDownloading, setIsDownloading] = useState(false);
const [downloadProgress, setDownloadProgress] = useState(0);
const secondColor = useThemeColor("second-color");
useOnUpdate(() => {
const subs: Subscription[] = []
subs.push(downloaderService.currentBsVersionDownload$.pipe(map(download => equal(download, props.version)), distinctUntilChanged()).subscribe(isDownloading => {
setIsDownloading(() => isDownloading);
}));
subs.push(downloaderService.currentBsVersionDownload$.pipe(
map(download => equal(download, props.version)),
distinctUntilChanged(),
switchMap(isDownloading => isDownloading ? downloaderService.downloadProgress$ : of(0)),
).subscribe(progress => {
setDownloadProgress(() => progress);
}));
return () => subs.forEach(sub => sub.unsubscribe());
}, [props.version]);
const isActive = (): boolean => {
return props.version?.BSVersion === state?.BSVersion && props?.version.steam === state?.steam && props?.version.oculus === state?.oculus && props?.version.name === state?.name;
};
@@ -44,33 +64,12 @@ export function BsVersionItem(props: { version: BSVersion }) {
const cancel = () => {
const versionDownload = downloaderService.currentBsVersionDownload$.value;
const wasVerification = downloaderService.isVerification;
downloaderService.cancelDownload().then(async res => {
if (!res.success) {
return;
}
if (!wasVerification) {
bsUninstallerService.uninstall(versionDownload).then(res => res && verionManagerService.askInstalledVersions());
}
downloaderService.stopDownload().then(() => {
if(wasVerification){ return; }
bsUninstallerService.uninstall(versionDownload).then(res => res && verionManagerService.askInstalledVersions());
});
};
useEffect(() => {
const subs: Subscription[] = [];
const downloadSub = combineLatest([downloaderService.currentBsVersionDownload$, downloaderService.downloadProgress$]).subscribe(vals => {
if (vals[0]?.BSVersion === props.version.BSVersion && vals[0]?.steam === props.version.steam && vals[0].oculus === props.version.oculus && vals[0]?.name === props.version.name) {
setDownloading(true);
setDownloadPercent(vals[1]);
} else {
setDownloading(false);
setDownloadPercent(0);
}
});
subs.push(downloadSub);
return () => {
subs.forEach(s => s.unsubscribe());
};
}, []);
const renderIcon = () => {
const classes = "w-[19px] h-[19px] mr-[5px] shrink-0";
if (props.version.steam) {
@@ -100,7 +99,7 @@ export function BsVersionItem(props: { version: BSVersion }) {
};
return (
<NavBarItem onCancel={cancel} progress={downloading ? downloadPercent : 0} isActive={isActive() && !downloading} isDownloading={downloading}>
<NavBarItem onCancel={cancel} progress={downloadProgress} isActive={isActive() && !isDownloading} isDownloading={isDownloading}>
{props.version.name ? (
<Tippy content={props.version.BSVersion} placement="right-end" arrow={false} className="font-bold !bg-neutral-900" duration={[100, 0]} animation="shift-away-subtle">
<Link onDoubleClick={handleDoubleClick} to={`/bs-version/${props.version.BSVersion}`} state={props.version} className="w-full flex items-center justify-start content-center max-w-full">
@@ -72,7 +72,7 @@ export function BsmButton({ className, style, imgClassName, iconClassName, icon,
const handleClick = (e: MouseEvent<HTMLDivElement>) => !disabled && onClick?.(e);
return (
<div ref={ref} onClick={handleClick} title={t(title)} className={`${className} overflow-hidden cursor-pointer group ${!withBar && !disabled && (!!typeColor || !!color) && "hover:brightness-[1.15]"} ${disabled && "brightness-75 cursor-not-allowed"} ${renderTypeColor}`} style={{ ...style, backgroundColor: primaryColor || color }}>
<div ref={ref} onClick={handleClick} title={t(title)} className={`${className} overflow-hidden group ${!withBar && !disabled && (!!typeColor || !!color) && "hover:brightness-[1.15]"} ${disabled ? "brightness-75 cursor-not-allowed" : "cursor-pointer"} ${renderTypeColor}`} style={{ ...style, backgroundColor: primaryColor || color }}>
{image && <BsmImage image={image} className={imgClassName} />}
{icon && <BsmIcon icon={icon} className={iconClassName ?? "h-full w-full text-gray-800 dark:text-white"} style={{ color: iconColor || textColor }} />}
{text &&
@@ -52,6 +52,7 @@ import { VolumeUpIcon } from "./icons/volume-up-icon.component";
import { VolumeOffIcon } from "./icons/volume-off-icon.component";
import { VolumeDownIcon } from "./icons/volume-down-icon.component";
import { GermanIcon } from "./flags/german-icon.component";
import { RussianIcon } from "./flags/russian-icon.component";
import { MSModelType } from "shared/models/models/model-saber.model";
import { ModelTypeAvatarIcon } from "./icons/model-type-avatar-icon.component";
import { ModelTypeSaberIcon } from "./icons/model-type-saber-icon.component";
@@ -61,7 +62,7 @@ import { ChevronTopIcon } from "./icons/chevron-top-icon.component";
import { EyeCrossIcon } from "./icons/eye-cross-icon.component";
import { ShortcutIcon } from "./icons/shortcut-icon.component";
export type BsmIconType = BsvMapCharacteristic | MSModelType | ("settings" | "trash" | "favorite" | "folder" | "bsNote" | "check" | "three-dots" | "twitch" | "eye" | "play" | "checkCircleIcon" | "discord" | "info" | "eye-cross" | "terminal" | "desktop" | "oculus" | "add" | "cross" | "task" | "github" | "close" | "thumbUpFill" | "timerFill" | "pause" | "twitter" | "sync" | "chevron-top" | "copy" | "steam" | "edit" | "export" | "patreon" | "search" | "bsMapDifficulty" | "link" | "unlink" | "download" | "filter" | "mee6" | "volume-up" | "volume-off" | "volume-down" | "shortcut" | "fr-FR-flag" | "es-ES-flag" | "en-US-flag" | "en-EN-flag" | "de-DE-flag");
export type BsmIconType = BsvMapCharacteristic | MSModelType | ("settings" | "trash" | "favorite" | "folder" | "bsNote" | "check" | "three-dots" | "twitch" | "eye" | "play" | "checkCircleIcon" | "discord" | "info" | "eye-cross" | "terminal" | "desktop" | "oculus" | "add" | "cross" | "task" | "github" | "close" | "thumbUpFill" | "timerFill" | "pause" | "twitter" | "sync" | "chevron-top" | "copy" | "steam" | "edit" | "export" | "patreon" | "search" | "bsMapDifficulty" | "link" | "unlink" | "download" | "filter" | "mee6" | "volume-up" | "volume-off" | "volume-down" | "shortcut" | "fr-FR-flag" | "es-ES-flag" | "en-US-flag" | "en-EN-flag" | "de-DE-flag" | "ru-RU-flag");
export const BsmIcon = memo(({ className, icon, style }: { className?: string; icon: BsmIconType; style?: CSSProperties }) => {
// TODO : Very ugly very messy, need to find a better way to do this
@@ -112,6 +113,9 @@ export const BsmIcon = memo(({ className, icon, style }: { className?: string; i
if (icon === "de-DE-flag") {
return <GermanIcon className={className} style={style} />;
}
if (icon === "ru-RU-flag") {
return <RussianIcon className={className} style={style} />;
}
if (icon === "task") {
return <TaskIcon className={className} style={style} />;
}
@@ -0,0 +1,20 @@
import { CSSProperties } from "react";
export function RussianIcon(props: { className?: string; style?: CSSProperties }) {
return (
<svg xmlns="http://www.w3.org/2000/svg" width="71px" height="48px" viewBox="0 0 71 48" version="1.1" className={props.className} style={props.style}>
<defs />
<g id="Flags" stroke="none" strokeWidth="1" fill="none" fillRule="evenodd" transform="translate(-239.000000, -805.000000)">
<g transform="translate(70.000000, 70.000000)" fillRule="nonzero" id="Russian">
<g transform="translate(169.000000, 735.000000)">
<g id="Bolivia-9">
<path d="M0.52,7 L0.52,16 L70.52,16 L70.52,7 C70.52,3.33282926 67.5471707,0.36 63.88,0.36 L7.17,0.36 C5.40723053,0.357345224 3.71575038,1.05574249 2.46834517,2.3012719 C1.22093997,3.54680131 0.519998001,5.23722853 0.52,7 Z" id="Shape" fill="#FFF" />
<polygon id="Shape" fill="#4758A9" points="0.52 31.74 70.52 31.74 70.52 16.07 0.52 16.07" />
<path d="M0.52,40.76 C0.52,44.4271707 3.49282926,47.4 7.16,47.4 L63.88,47.4 C67.5471707,47.4 70.52,44.4271707 70.52,40.76 L70.52,31.76 L0.52,31.76 L0.52,40.76 Z" id="Shape" fill="#ED5565" />
</g>
</g>
</g>
</g>
</svg>
);
}
@@ -32,7 +32,7 @@ export default function TitleBar({ template = "index.html" }: { template: AppWin
return setPreviewVersion("BETA");
}
});
});
}, []);
const [maximized, setMaximized] = useState(false);
@@ -82,11 +82,19 @@ export function ModsSlide({ version, onDisclamerDecline }: { version: BSVersion;
}
const modsToInstall = modsSelected.filter(mod => {
const corespondingMod = modsAvailable.get(mod.category).find(availabeMod => availabeMod._id === mod._id);
if (lt(corespondingMod.version, mod.version)) {
const installedMod = modsInstalled.get(mod.category)?.find(installedMod => installedMod.name === mod.name);
if (corespondingMod?.version && lt(corespondingMod.version, mod.version)) {
return false;
}
if(installedMod?.version && lt(mod.version, installedMod?.version)){
return false;
}
return true;
});
modsManager.installMods(modsToInstall, version).then(() => {
loadMods();
});
@@ -3,7 +3,7 @@ export const defaultConfiguration: { [key in DefaultConfigKey]: any } = {
"second-color": "#ff4444",
theme: "os",
language: window.navigator.language.length <= 2 ? `${window.navigator.language}-${window.navigator.language.toLocaleUpperCase()}` : window.navigator.language,
supported_languages: ["en-US", "en-EN", "fr-FR", "es-ES", "de-DE"],
supported_languages: ["en-US", "en-EN", "fr-FR", "es-ES", "de-DE", "ru-RU"],
default_mods: ["SongCore", "WhyIsThereNoLeaderboard", "BeatSaverDownloader", "BeatSaverVoting", "PlaylistManager"],
"default-shared-folders": [
window.electron.path.join("Beat Saber_Data", "CustomLevels"),
+1
View File
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>BSManager</title>
<link rel="stylesheet" href="https://use.typekit.net/okr8ven.css">
<meta charset="utf-8" />
<meta
@@ -1,7 +1,7 @@
import { AvailableVersionsSlider } from "../components/available-versions/available-versions-slider.component";
import { BsDownloaderService } from "../services/bs-downloader.service";
import { Slideshow } from "renderer/components/slideshow/slideshow.component";
import { useState } from "react";
import { createContext, useMemo, useState } from "react";
import { BsmButton } from "renderer/components/shared/bsm-button.component";
import { AnimatePresence, motion } from "framer-motion";
import { useTranslation } from "renderer/hooks/use-translation.hook";
@@ -12,28 +12,32 @@ import { ModalExitCode, ModalService } from "renderer/services/modale.service";
import { ImportVersionModal } from "renderer/components/modal/modal-types/import-version-modal.component";
import { IpcService } from "renderer/services/ipc.service";
import { NotificationService } from "renderer/services/notification.service";
import { timer } from "rxjs";
import { lastValueFrom, map } from "rxjs";
import { useService } from "renderer/hooks/use-service.hook";
import { BSVersion } from "shared/bs-version.interface";
import { useObservable } from "renderer/hooks/use-observable.hook";
export const AvailableVersionsContext = createContext<{ selectedVersion: BSVersion; setSelectedVersion: (version: BSVersion) => void }>(null);
export function AvailableVersionsList() {
const bsDownloaderService = useService(BsDownloaderService);
const versionManagerService = useService(BSVersionManagerService);
const bsDownloader = useService(BsDownloaderService);
const versionManager = useService(BSVersionManagerService);
const progressBar = useService(ProgressBarService);
const modal = useService(ModalService);
const ipc = useService(IpcService);
const installer = useService(BsDownloaderService);
const notification = useService(NotificationService);
const versionSelected = useObservable(bsDownloaderService.selectedBsVersion$);
const [downloading, setDownloading] = useState(false);
const [selectedVersion, setSelectedVersion] = useState<BSVersion>(null);
const contextValue = useMemo(() => ({ selectedVersion, setSelectedVersion }), [selectedVersion]);
const downloading = useObservable(bsDownloader.currentBsVersionDownload$.pipe(map(v => !!v)));
const t = useTranslation();
const startDownload = () => {
setDownloading(() => true);
bsDownloaderService.download(versionSelected).finally(() => {
setDownloading(() => false);
});
bsDownloader.downloadBsVersion(selectedVersion)
.catch(() => {})
.finally(() => setSelectedVersion(null));
};
const importVersion = async () => {
@@ -47,7 +51,7 @@ export function AvailableVersionsList() {
return;
}
const folderRes = await ipc.sendV2<{ canceled: boolean; filePaths: string[] }>("choose-folder").toPromise();
const folderRes = await lastValueFrom(ipc.sendV2<{ canceled: boolean; filePaths: string[] }>("choose-folder"))
if (!folderRes || folderRes.canceled || !folderRes.filePaths?.length) {
return;
@@ -62,10 +66,9 @@ export function AvailableVersionsList() {
const imported = await installer.importVersion(toImport);
if (imported) {
versionManagerService.askInstalledVersions();
versionManager.askInstalledVersions();
notification.notifySuccess({ title: "notifications.bs-import-version.success.imported.title", duration: 3_000 });
progressBar.complete();
await timer(400).toPromise();
} else {
notification.notifyError({ title: "notifications.types.error", desc: "notifications.bs-import-version.errors.import-error.desc" });
}
@@ -75,13 +78,16 @@ export function AvailableVersionsList() {
return (
<div className="relative h-full w-full flex items-center flex-col pt-2">
<Slideshow className="absolute w-full h-full top-0" />
<h1 className="text-gray-100 text-2xl mb-4 z-[1]">{t("pages.available-versions.title")}</h1>
<AvailableVersionsSlider />
<AvailableVersionsContext.Provider value={contextValue}>
<AvailableVersionsSlider />
</AvailableVersionsContext.Provider>
<AnimatePresence>
{versionSelected && !downloading && (
{selectedVersion && !downloading && (
<motion.div initial={{ y: "150%" }} animate={{ y: "0%" }} exit={{ y: "150%" }} className="absolute bottom-5" onClick={startDownload}>
<BsmButton text="misc.download" className="relative text-gray-800 dark:text-gray-100 rounded-md text-3xl font-bold italic tracking-wide px-3 pb-2 pt-1 shadow-md shadow-black" />
</motion.div>
@@ -92,7 +98,7 @@ export function AvailableVersionsList() {
className="absolute top-5 right-5 h-9 w-9 bg-light-main-color-2 dark:bg-main-color-2 rounded-md"
icon="settings"
items={[
{ icon: "sync", text: "pages.available-versions.dropdown.refresh", onClick: () => versionManagerService.askAvailableVersions() },
{ icon: "sync", text: "pages.available-versions.dropdown.refresh", onClick: () => versionManager.askAvailableVersions() },
{ icon: "download", text: "pages.available-versions.dropdown.import-version", onClick: importVersion },
]}
/>
+12 -4
View File
@@ -34,6 +34,8 @@ import { VersionFolderLinkerService } from "renderer/services/version-folder-lin
import { useService } from "renderer/hooks/use-service.hook";
import { lastValueFrom } from "rxjs";
import { BsmException } from "shared/models/bsm-exception.model";
import { useObservable } from "renderer/hooks/use-observable.hook";
import { AuthUserService } from "renderer/services/auth-user.service";
export function SettingsPage() {
@@ -50,6 +52,7 @@ export function SettingsPage() {
const playlistsManager = useService(PlaylistsManagerService);
const modelsManager = useService(ModelsManagerService);
const versionLinker = useService(VersionFolderLinkerService);
const authService = useService(AuthUserService);
const { firstColor, secondColor } = useThemeColor();
@@ -66,6 +69,9 @@ export function SettingsPage() {
})
.sort((a, b) => a.text.localeCompare(b.text));
const nav = useNavigate();
const t = useTranslation();
const [themeIdSelected, setThemeIdSelected] = useState(themeItem.find(e => e.value === themeService.getTheme()).id);
const [languageSelected, setLanguageSelected] = useState(languagesItems.find(e => e.value === i18nService.currentLanguage).id);
const [installationFolder, setInstallationFolder] = useState(null);
@@ -73,13 +79,11 @@ export function SettingsPage() {
const [mapDeepLinksEnabled, setMapDeepLinksEnabled] = useState(false);
const [playlistsDeepLinkEnabled, setPlaylistsDeepLinkEnabled] = useState(false);
const [modelsDeepLinkEnabled, setModelsDeepLinkEnabled] = useState(false);
const [appVersion, setAppVersion] = useState("");
const nav = useNavigate();
const t = useTranslation();
const appVersion = useObservable(ipcService.sendV2<string>("current-version"));
const steamSessionExist = useObservable(authService.sessionExist$);
useEffect(() => {
loadInstallationFolder();
lastValueFrom(ipcService.sendV2<string>("current-version")).then(res => setAppVersion(res));
mapsManager.isDeepLinksEnabled().then(enabled => setMapDeepLinksEnabled(() => enabled));
playlistsManager.isDeepLinksEnabled().then(enabled => setPlaylistsDeepLinkEnabled(() => enabled));
modelsManager.isDeepLinksEnabled().then(enabled => setModelsDeepLinkEnabled(() => enabled));
@@ -203,6 +207,10 @@ export function SettingsPage() {
<BsmButton className="inline-block grow-0 bg-transparent sticky h-full w-full top-20 right-20 !m-0 rounded-full p-1" onClick={() => nav(-1)} icon="close" withBar={false} />
</div>
<SettingContainer title="pages.settings.steam.title" description="pages.settings.steam.description">
<BsmButton onClick={() => authService.deleteSteamSession()} className="w-fit px-3 py-[2px] text-white rounded-md" withBar={false} text="pages.settings.steam.logout" typeColor="error" disabled={!steamSessionExist}/>
</SettingContainer>
<SettingContainer title="pages.settings.appearance.title" description="pages.settings.appearance.description">
<div className="relative w-full h-8 bg-light-main-color-1 dark:bg-main-color-1 flex justify-center rounded-md py-1">
<SettingColorChooser color={firstColor} onChange={setFirstColorSetting} />
@@ -43,7 +43,7 @@ export function VersionViewer() {
navigate(`/bs-version/${version.BSVersion}`, { state: version });
};
const openFolder = () => ipcService.sendLazy("bs-version.open-folder", { args: state });
const verifyFiles = () => bsDownloaderService.download(state, true);
const verifyFiles = () => bsDownloaderService.verifyBsVersionFiles(state);
const uninstall = async () => {
const modalCompleted = await modalService.openModal(UninstallModal, state);
+230 -130
View File
@@ -1,7 +1,6 @@
import { DownloadEvent, DownloadInfo } from "main/services/bs-installer.service";
import { BehaviorSubject, Observable } from "rxjs";
import { distinctUntilChanged, filter, throttleTime } from "rxjs/operators";
import { IpcResponse } from "shared/models/ipc";
import { DownloadInfo } from "main/services/bs-installer.service";
import { BehaviorSubject, Observable, ReplaySubject, Subscription, lastValueFrom, throwError } from "rxjs";
import { distinctUntilChanged, filter, map, share, take, tap, throttleTime } from "rxjs/operators";
import { BSVersion } from "shared/bs-version.interface";
import { AuthUserService } from "./auth-user.service";
import { BSVersionManagerService } from "./bs-version-manager.service";
@@ -12,6 +11,9 @@ import { ProgressBarService } from "./progress-bar.service";
import { LoginModal } from "renderer/components/modal/modal-types/login-modal.component";
import { GuardModal } from "renderer/components/modal/modal-types/guard-modal.component";
import { LinkOpenerService } from "./link-opener.service";
import { DepotDownloaderErrorEvent, DepotDownloaderEvent, DepotDownloaderEventType, DepotDownloaderInfoEvent, DepotDownloaderWarningEvent } from "../../shared/models/depot-downloader.model";
import equal from "fast-deep-equal";
import { SteamMobileApproveModal } from "renderer/components/modal/modal-types/steam-mobile-approve-modal.component";
export class BsDownloaderService {
private static instance: BsDownloaderService;
@@ -24,11 +26,9 @@ export class BsDownloaderService {
private readonly notificationService: NotificationService;
private readonly linkOpener: LinkOpenerService;
private _isVerification: boolean = false;
public readonly currentBsVersionDownload$: BehaviorSubject<BSVersion> = new BehaviorSubject(null);
public readonly downloadProgress$: BehaviorSubject<number> = new BehaviorSubject(0);
public readonly selectedBsVersion$: BehaviorSubject<BSVersion> = new BehaviorSubject(null);
private readonly isVerification$ = new BehaviorSubject(false);
public readonly currentBsVersionDownload$ = new BehaviorSubject<BSVersion>(null);
public readonly downloadProgress$ = new BehaviorSubject(0);
public static getInstance(): BsDownloaderService {
if (!BsDownloaderService.instance) {
@@ -45,81 +45,19 @@ export class BsDownloaderService {
this.progressBarService = ProgressBarService.getInstance();
this.notificationService = NotificationService.getInstance();
this.linkOpener = LinkOpenerService.getInstance();
this.asignListerners();
}
private asignListerners(): void {
this.ipcService
.watch<number>("bs-download.[Progress]")
.pipe(distinctUntilChanged())
.subscribe(response => this.downloadProgress$.next(response.data));
this.ipcService
.watch<string>("bs-download.[SteamID]")
.pipe(filter(r => r.success && !!r.data))
.subscribe(response => this.authService.setSteamID(response.data));
this.ipcService
.watch<string>("bs-download.[Warning]")
.pipe(
filter(v => !!v && !!v.data),
distinctUntilChanged(),
throttleTime(10_000)
)
.subscribe(warning => {
this.notificationService.notifyWarning({ title: "notifications.types.warning", desc: `notifications.bs-download.warnings.msg.${warning.data}` });
});
this.ipcService
.watch<string>("bs-download.[Error]")
.pipe(
filter(v => !!v && !!v.data),
distinctUntilChanged(),
throttleTime(1000)
)
.subscribe(err => {
this.notificationService.notifyError({ title: "notifications.types.error", desc: `notifications.bs-download.errors.msg.${err.data}` });
});
this.ipcService.watch<void>("bs-download.[2FA]").subscribe(async response => {
if (!response.success) {
this.ipcService.sendLazy("bs-download.kill");
return;
this.currentBsVersionDownload$.pipe(distinctUntilChanged(equal)).subscribe(version => {
if(version) {
this.bsVersionManager.setInstalledVersions([...this.bsVersionManager.installedVersions$.value, version ]);
}
const res = await this.modalService.openModal(GuardModal);
if (res.exitCode !== ModalExitCode.COMPLETED) {
this.progressBarService.hide(true);
this.ipcService.sendLazy("bs-download.kill");
return;
}
this.ipcService.sendLazy("bs-download.[2FA]", { args: res.data });
});
this.ipcService.watch<BSVersion>("start-download-version").subscribe(res => {
this.currentBsVersionDownload$.next(res.data);
});
this.currentBsVersionDownload$.subscribe(version => {
if (version) {
this.bsVersionManager.setInstalledVersions([...this.bsVersionManager.installedVersions$.value, version]);
} else {
else {
this.bsVersionManager.askInstalledVersions();
}
});
}
private resetDownload(): void {
this.currentBsVersionDownload$.next(null);
this.downloadProgress$.next(0);
this.selectedBsVersion$.next(null);
}
public cancelDownload(): Promise<IpcResponse<boolean>> {
return this.ipcService.send<boolean>("bs-download.kill");
}
public isDotNet6Installed(): Promise<boolean> {
return this.ipcService.send<boolean>("is-dotnet-6-installed").then(res => res.success && res.data);
return lastValueFrom(this.ipcService.sendV2<boolean>("is-dotnet-6-installed"));
}
private async showDotNetNotInstalledError(): Promise<void> {
@@ -135,66 +73,16 @@ export class BsDownloaderService {
}
}
public async download(bsVersion: BSVersion, isVerification?: boolean, isFirstCall = true): Promise<IpcResponse<DownloadEvent>> {
// TODO : to remake cause we don't need recursion anymore (will be rework with qr code)
if (isFirstCall && !this.progressBarService.require()) {
return { success: false };
}
if (isFirstCall && !(await this.isDotNet6Installed())) {
await this.showDotNetNotInstalledError();
return { success: false };
}
this.progressBarService.show(this.downloadProgress$);
this._isVerification = isVerification;
let promise;
if (!this.authService.sessionExist()) {
const res = await this.modalService.openModal(LoginModal);
if (res.exitCode !== ModalExitCode.COMPLETED) {
this.progressBarService.hide(true);
return { success: false };
}
this.authService.setSteamSession(res.data.username, res.data.stay);
promise = this.ipcService.send<DownloadEvent, DownloadInfo>("bs-download.start", { args: { bsVersion, username: res.data.username, password: res.data.password, stay: res.data.stay, isVerification } });
} else {
promise = this.ipcService.send<DownloadEvent, DownloadInfo>("bs-download.start", { args: { bsVersion, username: this.authService.getSteamUsername(), isVerification } });
}
let res = await promise;
if (res.data?.type === "[Password]") {
this.authService.deleteSteamSession();
res = await this.download(bsVersion, isVerification, false);
}
this.progressBarService.hide(true);
this.resetDownload();
if (res.success && isFirstCall) {
this.notificationService.notifySuccess({ title: `notifications.bs-download.success.titles.${isVerification ? "verification-finished" : "download-success"}`, duration: 3000 });
} else if (res.data === "dotnet" && isFirstCall) {
await this.showDotNetNotInstalledError();
return res;
} else if (res.data && isFirstCall) {
this.notificationService.notifyError({ title: `notifications.types.error`, desc: `notifications.bs-download.errors.msg.${res.data}`, duration: 3000 });
}
return res;
}
public get isDownloading(): boolean {
return !!this.currentBsVersionDownload$.value;
}
public async getInstallationFolder(): Promise<string> {
const res = await this.ipcService.send<string>("bs-download.installation-folder");
return res.success ? res.data : "";
return lastValueFrom(this.ipcService.sendV2<string>("bs-download.installation-folder"));
}
public get isVerification(): boolean {
return this._isVerification;
return this.isVerification$.value;
}
public setInstallationFolder(path: string): Observable<string> {
@@ -202,7 +90,219 @@ export class BsDownloaderService {
}
public async importVersion(pathToImport: string): Promise<boolean> {
const res = await this.ipcService.send<void>("bs-download.import-version", { args: pathToImport });
return res.success;
return lastValueFrom(this.ipcService.sendV2<void>("bs-download.import-version", { args: pathToImport }))
.then(() => true)
.catch(() => false);
}
// ### Downloading
private handleInfoEvents(events$: Observable<DepotDownloaderEvent>): Subscription[] {
const subs: Subscription[] = [];
subs.push(events$.pipe(
filter(event => event.subType === DepotDownloaderInfoEvent.Start),
take(1),
map(event => event.data as string),
).subscribe(startData => {
const downloadVersion = JSON.parse(startData) as BSVersion;
if(typeof downloadVersion === "object" && downloadVersion?.BSVersion){
this.currentBsVersionDownload$.next(downloadVersion);
}
}));
subs.push(events$.pipe(
filter(event => event.subType === DepotDownloaderInfoEvent.Progress || event.subType === DepotDownloaderInfoEvent.Validated),
map(event => event.data as string),
).subscribe(progress => {
this.downloadProgress$.next(parseFloat(progress.replaceAll(",", ".")));
}));
subs.push(events$.pipe(
filter(event => event.subType === DepotDownloaderInfoEvent.MobileApp),
take(1),
).subscribe(async () => {
const logged$ = events$.pipe(filter(event => event.subType === DepotDownloaderInfoEvent.SteamID), take(1));
const res = await this.modalService.openModal(SteamMobileApproveModal, { logged$ });
if(res.exitCode !== ModalExitCode.COMPLETED){
return this.stopDownload();
}
}));
subs.push(events$.pipe(
filter(event => event.subType === DepotDownloaderInfoEvent.TwoFA || event.subType === DepotDownloaderInfoEvent.Guard),
take(1),
map(event => event.subType),
).subscribe(async () => {
const res = await this.modalService.openModal(GuardModal);
if(res.exitCode !== ModalExitCode.COMPLETED){
return this.stopDownload();
}
this.sendInput(res.data);
}));
subs.push(events$.pipe(
filter(event => event.subType === DepotDownloaderInfoEvent.Finished),
take(1),
).subscribe(() => {
if(this.isVerification){
return this.notificationService.notifySuccess({title: "notifications.bs-download.success.titles.verification-finished"});
}
return this.notificationService.notifySuccess({title: "notifications.bs-download.success.titles.download-success"});
}));
return subs;
}
private handleWarningEvents(events$: Observable<DepotDownloaderEvent>): Subscription[] {
const subs: Subscription[] = [];
const handledWarnings = Object.values(DepotDownloaderWarningEvent);
subs.push(events$.pipe(
filter(event => handledWarnings.includes(event.subType as DepotDownloaderWarningEvent)),
).subscribe(event => {
this.notificationService.notifyWarning({title: "notifications.types.warning", desc: `notifications.bs-download.warnings.msg.${event.subType}`});
}));
return subs;
}
private hanndleErrorEvent(errorEvent: DepotDownloaderEvent) {
const handledErrors = Object.values(DepotDownloaderErrorEvent);
if(handledErrors.includes(errorEvent?.subType as DepotDownloaderErrorEvent)){
return this.notificationService.notifyError({title: "notifications.types.error", desc: `notifications.bs-download.errors.msg.${errorEvent.subType}`, duration: 10_000});
}
return this.notificationService.notifyError({title: "notifications.types.error", desc: `notifications.bs-download.errors.msg.${DepotDownloaderErrorEvent.Unknown}`, duration: 10_000});
}
private wrapDownload(download$: Observable<DepotDownloaderEvent>, silent?: boolean): Observable<DepotDownloaderEvent> {
return new Observable<DepotDownloaderEvent>(sub => {
const downloadSub = download$.subscribe({next: n => sub.next(n), error: e => sub.error(e), complete: () => sub.complete()});
const subs = [
...this.handleInfoEvents(download$.pipe(filter(event => event.type === DepotDownloaderEventType.Info))),
...this.handleWarningEvents(download$.pipe(filter(event => event.type === DepotDownloaderEventType.Warning), throttleTime(10_000))),
];
return () => {
downloadSub.unsubscribe();
subs.forEach(sub => sub.unsubscribe());
}
}).pipe(
tap({
error: (e) => {
this.authService.deleteSteamSession();
!silent && this.hanndleErrorEvent(e)
}
}),
share({connector: () => new ReplaySubject(1)})
);
}
private tryAutoDownloadBsVersion(downloadInfo: DownloadInfo){
if(!this.authService.sessionExist()){
return throwError(() => new Error("No session"));
}
const infos: DownloadInfo = {...downloadInfo, username: this.authService.getSteamUsername()}
return this.wrapDownload(
this.ipcService.sendV2<DepotDownloaderEvent>("auto-download-bs-version", { args: infos }),
true
);
}
private startDownload(downloadInfo: DownloadInfo){
return this.wrapDownload(
this.ipcService.sendV2<DepotDownloaderEvent>("download-bs-version", { args: downloadInfo })
);
}
private startQrCodeDownload(downloadInfo: DownloadInfo){
return this.wrapDownload(
this.ipcService.sendV2<DepotDownloaderEvent>("download-bs-version-qr", { args: downloadInfo })
);
}
private doDownloadBsVersion(bsVersion: BSVersion, isVerification?: boolean): Promise<void>{
if(!this.progressBarService.require()){
return Promise.resolve();
}
this.progressBarService.show(this.downloadProgress$, true);
this.isVerification$.next(isVerification);
const downloadPromise = (async () => {
const haveDotNet = await this.isDotNet6Installed().catch(() => false);
if(!haveDotNet){
this.showDotNetNotInstalledError();
return Promise.reject(new Error("DotNet not installed"));
}
const downloadInfo: DownloadInfo = {bsVersion, isVerification}
const autoDownload = await lastValueFrom(this.tryAutoDownloadBsVersion(downloadInfo)).then(() => true).catch(() => false);
if(autoDownload){ return Promise.resolve(); }
const qrCodeDownload$ = this.startQrCodeDownload(downloadInfo);
const qrCode$ = qrCodeDownload$.pipe(filter(event => event.type === DepotDownloaderEventType.Info && event.subType === DepotDownloaderInfoEvent.QRCode), map(event => event.data as string));
const logged$ = qrCodeDownload$.pipe(filter(event => event.type === DepotDownloaderEventType.Info && event.subType === DepotDownloaderInfoEvent.SteamID), map(event => event.data as string), take(1));
const loginRes = await this.modalService.openModal(LoginModal, { qrCode$, logged$ });
if(loginRes.exitCode !== ModalExitCode.COMPLETED){
return Promise.resolve();
}
if(loginRes.data.stay){
this.authService.setSteamSession(loginRes.data.username);
}
const download$ = loginRes.data.method === "qr" ? qrCodeDownload$ : this.startDownload({...downloadInfo, username: loginRes.data.username, password: loginRes.data.password, stay: loginRes.data.stay});
return lastValueFrom(download$);
})();
// *** TEST EXPIRATION MOBILE APP APROVAL ***
return downloadPromise.then(() => {}).finally(() => {
this.downloadProgress$.next(0);
this.currentBsVersionDownload$.next(null);
this.progressBarService.hide(true);
this.isVerification$.next(false);
this.bsVersionManager.askAvailableVersions();
});
}
private sendInput(input: string){
return lastValueFrom(this.ipcService.sendV2<void>("send-input-bs-download", { args: input }));
}
public downloadBsVersion(version: BSVersion): Promise<BSVersion> {
return this.doDownloadBsVersion(version).then(() => version);
}
public verifyBsVersionFiles(version: BSVersion): Promise<BSVersion> {
return this.doDownloadBsVersion(version, true).then(() => version);
}
public verifyBsVersion(version: BSVersion): Promise<BSVersion> {
return this.doDownloadBsVersion(version, true).then(() => version);
}
public stopDownload(): Promise<void>{
return lastValueFrom(this.ipcService.sendV2<void>("stop-download-bs-version"));
}
}
@@ -64,18 +64,10 @@ export class BSVersionManagerService {
});
}
public getAvailableYears(): string[] {
return [...new Set(this.availableVersions$.value.map(v => v.year))].sort((a, b) => b.localeCompare(a));
}
public isVersionInstalled(version: BSVersion): boolean {
return !!this.getInstalledVersions().find(v => v.BSVersion === version.BSVersion && v.steam === version.steam && v.oculus === version.oculus);
}
public getAvaibleVersionsOfYear(year: string): BSVersion[] {
return this.availableVersions$.value.filter(v => v.year === year).sort((a, b) => +b.ReleaseDate - +a.ReleaseDate);
}
public async editVersion(version: BSVersion): Promise<BSVersion> {
const modalRes = await this.modalService.openModal(EditVersionModal, { version, clone: false });
if (modalRes.exitCode !== ModalExitCode.COMPLETED) {
+15 -11
View File
@@ -1,6 +1,7 @@
import { defaultIfEmpty, shareReplay } from "rxjs/operators";
import { Observable, identity } from "rxjs";
import { defaultIfEmpty, share } from "rxjs/operators";
import { Observable, ReplaySubject, identity } from "rxjs";
import { IpcRequest, IpcResponse } from "shared/models/ipc";
import { IpcCompleteChannel, IpcErrorChannel, IpcTearDownChannel } from "shared/models/ipc/ipc-response.interface";
export class IpcService {
private static instance: IpcService;
@@ -65,26 +66,29 @@ export class IpcService {
if (!request) {
request = { args: null, responceChannel: null };
}
if (!request.responceChannel) {
request.responceChannel = `${channel}_responce_${crypto.randomUUID()}`;
}
const completeChannel = `${request.responceChannel}_complete`;
const errorChannel = `${request.responceChannel}_error`;
const completeChannel: IpcCompleteChannel = `${request.responceChannel}_complete`;
const errorChannel: IpcErrorChannel = `${request.responceChannel}_error`;
const teardownChannel: IpcTearDownChannel = `${request.responceChannel}_teardown`;
const obs = new Observable<T>(observer => {
window.electron.ipcRenderer.on(request.responceChannel, (res: T) => observer.next(res));
window.electron.ipcRenderer.on(errorChannel, (err: Error) => observer.error(err));
window.electron.ipcRenderer.on(completeChannel, () => observer.complete());
}).pipe(defaultValue ? defaultIfEmpty(defaultValue) : identity, shareReplay(1));
window.electron.ipcRenderer.once(completeChannel, () => {
window.electron.ipcRenderer.removeAllListeners(request.responceChannel);
window.electron.ipcRenderer.removeAllListeners(errorChannel);
window.electron.ipcRenderer.removeAllListeners(completeChannel);
});
window.electron.ipcRenderer.sendMessage(channel, request);
window.electron.ipcRenderer.sendMessage(channel, request);
return () => {
window.electron.ipcRenderer.removeAllListeners(request.responceChannel);
window.electron.ipcRenderer.removeAllListeners(errorChannel);
window.electron.ipcRenderer.removeAllListeners(completeChannel);
window.electron.ipcRenderer.sendMessage(teardownChannel, null);
};
}).pipe(defaultValue ? defaultIfEmpty(defaultValue) : identity, share({connector: () => new ReplaySubject(1)}));
return obs;
}
@@ -0,0 +1,69 @@
export enum DepotDownloaderEventType {
Error = "Error",
Warning = "Warning",
Info = "Info",
}
export interface DepotDownloaderEvent<T = unknown> {
type: DepotDownloaderEventType;
subType: DepotDownloaderEventTypes;
data?: T;
}
export type DepotDownloaderEventTypes = DepotDownloaderErrorEvent | DepotDownloaderWarningEvent | DepotDownloaderInfoEvent;
export enum DepotDownloaderInfoEvent {
Start = "Start",
Password = "Password",
Guard = "Guard",
TwoFA = "2FA",
Progress = "Progress",
Validated = "Validated",
Finished = "Finished",
SteamID = "SteamID",
QRCode = "QRCode",
MobileApp = "MobileApp",
}
export enum DepotDownloaderErrorEvent {
Password = "Password",
InvalidCredentials = "InvalidCredentials",
NoManifest = "NoManifest",
DirectoryCreate = "DirectoryCreate",
NotAvailableApp = "NotAvailableApp",
DepotNotFound = "DepotNotFound",
NotCompleted = "NotCompleted",
InvalidManifest = "InvalidManifest",
NoValidKeys = "NoValidKey",
NoManifestCode = "NoManifestCode",
_401 = "401",
_404 = "404",
NoServer = "NoServer",
SteamLib = "SteamLib",
NotAllowed = "NotAllowed",
ConnectionTimeout = "ConnectionTimeout",
ConnectionError = "ConnectionError",
TokenRejected = "TokenRejected",
LicenceError = "LicenceError",
AccessDenied = "AccessDenied",
Unknown = "Unknown",
}
export enum DepotDownloaderWarningEvent {
ManifestChecksum = "ManifestChecksum",
ConnectionTimeout = "ConnectionTimeout",
Unknown = "Unknown",
}
export interface DepotDownloaderArgsOptions {
app: number|string,
depot: number|string,
manifest: number|string,
username?: string,
password?: string,
"remember-password"?: boolean,
dir: string,
validate?: boolean,
qr?: boolean,
}
@@ -6,5 +6,6 @@ export interface IpcResponse<T> {
success: boolean;
}
export type IpcErrorChannel = string & `${string}_error`;
export type IpcCompleteChannel = string & `${string}_complete`;
export type IpcErrorChannel = `${string}_error`;
export type IpcCompleteChannel = `${string}_complete`;
export type IpcTearDownChannel = `${string}_teardown`;