From 5cf80ec6f2ae69fe65b9a8e48a3d58eee1496517 Mon Sep 17 00:00:00 2001 From: shidorien Date: Sun, 2 Jun 2024 19:16:28 +0200 Subject: [PATCH 1/6] Update bs-versions.json and package-lock.json --- assets/jsons/bs-versions.json | 6 +++--- package-lock.json | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/jsons/bs-versions.json b/assets/jsons/bs-versions.json index 86d5eb65..549ff5de 100644 --- a/assets/jsons/bs-versions.json +++ b/assets/jsons/bs-versions.json @@ -680,7 +680,7 @@ "ReleaseImg": "https://clan.akamai.steamstatic.com/images/32055887/ae11d195bbe41a0f244d7b4d055a0ab89f88e5bb.png", "ReleaseDate": "1702309893", "year": "2023", - "recommended": true + "recommended": true }, { "BSVersion": "1.34.5", @@ -709,7 +709,7 @@ "ReleaseDate": "1709831174", "year": "2024" }, - { + { "BSVersion": "1.36.0", "BSManifest": "8533509040167838423", "OculusBinaryId": "6863072637125790", @@ -718,7 +718,7 @@ "ReleaseDate": "1712681263", "year": "2024" }, - { + { "BSVersion": "1.36.2", "BSManifest": "4832237377879752064", "OculusBinaryId": "6983660338400352", diff --git a/package-lock.json b/package-lock.json index bc8ebf9f..6cde69af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,10 +1,12 @@ { "name": "bs-manager", + "version": "1.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "bs-manager", + "version": "1.5.0", "hasInstallScript": true, "license": "MIT", "dependencies": { From 9ffa0db43ec76ad09fdb56f41a34969d56992d3a Mon Sep 17 00:00:00 2001 From: shidorien Date: Sun, 2 Jun 2024 19:16:39 +0200 Subject: [PATCH 2/6] Fix error handling in AutoUpdaterService and add error logging in SettingsPage --- src/renderer/pages/settings-page.component.tsx | 4 +++- src/renderer/services/auto-updater.service.ts | 2 +- src/renderer/windows/App.tsx | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/renderer/pages/settings-page.component.tsx b/src/renderer/pages/settings-page.component.tsx index 1b549c9c..56320077 100644 --- a/src/renderer/pages/settings-page.component.tsx +++ b/src/renderer/pages/settings-page.component.tsx @@ -41,6 +41,7 @@ import { OculusIcon } from "renderer/components/svgs/icons/oculus-icon.component import { BsDownloaderService } from "renderer/services/bs-version-download/bs-downloader.service"; import { AutoUpdaterService } from "renderer/services/auto-updater.service"; import BeatWaitingImg from "../../../assets/images/apngs/beat-waiting.png"; +import { logRenderError } from "renderer"; export function SettingsPage() { @@ -145,7 +146,8 @@ export function SettingsPage() { .then(() => { setIsChangelogAvailable(() => true); }) - .catch(() => { + .catch(Err => { + logRenderError(Err.message); setIsChangelogAvailable(() => false); }) .finally(() => { isChangelogResolved = true; }); diff --git a/src/renderer/services/auto-updater.service.ts b/src/renderer/services/auto-updater.service.ts index d88d90c9..1850dd39 100644 --- a/src/renderer/services/auto-updater.service.ts +++ b/src/renderer/services/auto-updater.service.ts @@ -104,7 +104,7 @@ export class AutoUpdaterService { } public async showChangelog(version:string): Promise{ - const changelog = await this.getChangelogVersion(version); + const changelog = await this.getChangelogVersion(version) this.modal.openModal(ChangelogModal, changelog); } diff --git a/src/renderer/windows/App.tsx b/src/renderer/windows/App.tsx index 9b542008..c94cc532 100644 --- a/src/renderer/windows/App.tsx +++ b/src/renderer/windows/App.tsx @@ -24,6 +24,7 @@ import { OsDiagnosticService } from "renderer/services/os-diagnostic.service"; import { useService } from "renderer/hooks/use-service.hook"; import { AutoUpdaterService } from "renderer/services/auto-updater.service"; import { gt, parse } from "semver" +import { logRenderError } from "renderer"; export default function App() { useService(OsDiagnosticService); @@ -50,7 +51,7 @@ export default function App() { autoUpdater.setLastAppVersion(appVersion); if (parse(lastAppVersion) && gt(appVersion, lastAppVersion)) { - autoUpdater.showChangelog(appVersion); + await autoUpdater.showChangelog(appVersion).catch(Err => logRenderError(Err.message)); } }; From 365818266cbb03f356d522ba8682c974125a8513 Mon Sep 17 00:00:00 2001 From: Shidorien Date: Tue, 4 Jun 2024 21:08:31 +0200 Subject: [PATCH 3/6] update translations for changelog not found messages --- assets/jsons/translations/de.json | 2 +- assets/jsons/translations/es.json | 2 +- assets/jsons/translations/fr.json | 2 +- assets/jsons/translations/ja.json | 2 +- assets/jsons/translations/ru.json | 2 +- assets/jsons/translations/zh-tw.json | 2 +- assets/jsons/translations/zh.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/jsons/translations/de.json b/assets/jsons/translations/de.json index db50b2b7..71e019c5 100644 --- a/assets/jsons/translations/de.json +++ b/assets/jsons/translations/de.json @@ -193,7 +193,7 @@ }, "changelogs": { "open" : "🚀 Neues im Changelog entdecken!", - "not_founds": "😕 Hoppla, kein Changelog zu sehen!" + "not-founds": "😕 Hoppla, kein Changelog zu sehen!" } } }, diff --git a/assets/jsons/translations/es.json b/assets/jsons/translations/es.json index a730b071..69402e55 100644 --- a/assets/jsons/translations/es.json +++ b/assets/jsons/translations/es.json @@ -193,7 +193,7 @@ }, "changelogs": { "open" : "🚀 ¡Descubre lo nuevo en el Changelog!", - "not_founds": "😕 Uy, ¡Changelog no encontrado!" + "not-founds": "😕 Uy, ¡Changelog no encontrado!" } } }, diff --git a/assets/jsons/translations/fr.json b/assets/jsons/translations/fr.json index e7b63bb1..4f872297 100644 --- a/assets/jsons/translations/fr.json +++ b/assets/jsons/translations/fr.json @@ -193,7 +193,7 @@ }, "changelogs": { "open" : "🚀 Jetez un œil au Changelog !", - "not_founds": "😕 Oups, Changelog introuvable !" + "not-founds": "😕 Oups, Changelog introuvable !" } } }, diff --git a/assets/jsons/translations/ja.json b/assets/jsons/translations/ja.json index 28c7f206..50197730 100644 --- a/assets/jsons/translations/ja.json +++ b/assets/jsons/translations/ja.json @@ -193,7 +193,7 @@ }, "changelogs": { "open" : "🚀 チェンジログを覗いてみて！", - "not_founds": "😕 あれ、チェンジログが見当たらない！" + "not-founds": "😕 あれ、チェンジログが見当たらない！" } } }, diff --git a/assets/jsons/translations/ru.json b/assets/jsons/translations/ru.json index b983dfc8..e1282caa 100644 --- a/assets/jsons/translations/ru.json +++ b/assets/jsons/translations/ru.json @@ -193,7 +193,7 @@ }, "changelogs": { "open" : "🚀 Изучаем Changelog!", - "not_founds": "😕 Ой, Changelog нигде не видно!" + "not-founds": "😕 Ой, Changelog нигде не видно!" } } }, diff --git a/assets/jsons/translations/zh-tw.json b/assets/jsons/translations/zh-tw.json index 34954213..bd3e19c7 100644 --- a/assets/jsons/translations/zh-tw.json +++ b/assets/jsons/translations/zh-tw.json @@ -193,7 +193,7 @@ }, "changelogs": { "open" : "🚀 探索更新日誌！", - "not_founds": "😕 噢，找不到更新日誌！" + "not-founds": "😕 噢，找不到更新日誌！" } } }, diff --git a/assets/jsons/translations/zh.json b/assets/jsons/translations/zh.json index 0460ab54..6233c1eb 100644 --- a/assets/jsons/translations/zh.json +++ b/assets/jsons/translations/zh.json @@ -193,7 +193,7 @@ }, "changelogs": { "open" : "🚀 探索更新日志！", - "not_founds": "😕 哎呀，找不到更新日志！" + "not-founds": "😕 哎呀，找不到更新日志！" } } }, From 8fefefd5ac3e3003483196365020f629c9894048 Mon Sep 17 00:00:00 2001 From: Shidorien Date: Tue, 4 Jun 2024 21:08:56 +0200 Subject: [PATCH 4/6] Update bs-versions.json with new version --- assets/jsons/bs-versions.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/assets/jsons/bs-versions.json b/assets/jsons/bs-versions.json index 549ff5de..27093c9a 100644 --- a/assets/jsons/bs-versions.json +++ b/assets/jsons/bs-versions.json @@ -726,5 +726,14 @@ "ReleaseImg": "https://clan.cloudflare.steamstatic.com/images//32055887/74541417f14dee210bcfd89eefeabd7c0cc27c7d.png", "ReleaseDate": "1715008020", "year": "2024" + }, + { + "BSVersion": "1.37.0", + "BSManifest": "7270690075584855288", + "OculusBinaryId": "7062062833893435", + "ReleaseURL": "https://store.steampowered.com/news/app/620980/view/4161968170153497460", + "ReleaseImg": "https://clan.akamai.steamstatic.com/images//32055887/f82d34c7582137a6748a28c5b02670ff4b235356.png", + "ReleaseDate": "1717513346", + "year": "2024" } ] \ No newline at end of file From a48db9800177b5b145eba0f9f1026280484a7f92 Mon Sep 17 00:00:00 2001 From: GaetanGrd <40648115+GaetanGrd@users.noreply.github.com> Date: Wed, 5 Jun 2024 14:29:21 +0200 Subject: [PATCH 5/6] Update auto-updater.service.ts --- src/renderer/services/auto-updater.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/services/auto-updater.service.ts b/src/renderer/services/auto-updater.service.ts index 1850dd39..d88d90c9 100644 --- a/src/renderer/services/auto-updater.service.ts +++ b/src/renderer/services/auto-updater.service.ts @@ -104,7 +104,7 @@ export class AutoUpdaterService { } public async showChangelog(version:string): Promise{ - const changelog = await this.getChangelogVersion(version) + const changelog = await this.getChangelogVersion(version); this.modal.openModal(ChangelogModal, changelog); } From bff512337303f21c98dc14efad9c461161fc1454 Mon Sep 17 00:00:00 2001 From: Shidorien Date: Wed, 5 Jun 2024 19:51:40 +0200 Subject: [PATCH 6/6] Fix error handling and logging in SettingsPage and AutoUpdaterService --- src/renderer/pages/settings-page.component.tsx | 4 ++-- src/renderer/windows/App.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/renderer/pages/settings-page.component.tsx b/src/renderer/pages/settings-page.component.tsx index 56320077..7353f62d 100644 --- a/src/renderer/pages/settings-page.component.tsx +++ b/src/renderer/pages/settings-page.component.tsx @@ -146,8 +146,8 @@ export function SettingsPage() { .then(() => { setIsChangelogAvailable(() => true); }) - .catch(Err => { - logRenderError(Err.message); + .catch(err => { + logRenderError(err); setIsChangelogAvailable(() => false); }) .finally(() => { isChangelogResolved = true; }); diff --git a/src/renderer/windows/App.tsx b/src/renderer/windows/App.tsx index c94cc532..e7a7e4c4 100644 --- a/src/renderer/windows/App.tsx +++ b/src/renderer/windows/App.tsx @@ -51,7 +51,7 @@ export default function App() { autoUpdater.setLastAppVersion(appVersion); if (parse(lastAppVersion) && gt(appVersion, lastAppVersion)) { - await autoUpdater.showChangelog(appVersion).catch(Err => logRenderError(Err.message)); + await autoUpdater.showChangelog(appVersion).catch(logRenderError); } };