Compare commits

...

18 Commits

Author SHA1 Message Date
MathieuG-P 7806dfb3b9 bumb to 1.4.0-alpha.2 2023-11-18 13:21:03 +01:00
MathieuG-P d7eb9807f3 nothing 2023-11-18 13:18:56 +01:00
MathieuG-P 713b50a49d Merge pull request #357 from Zagrios/bugfix/unable-to-start-oculus-version-after-moving-installation-path
[bugfix] Unable to start Oculus version after moving installation directory
2023-11-18 12:57:16 +01:00
MathieuG-P d74008b109 [bugfix] Unable to start Oculus version after moving installation path 2023-11-18 12:51:49 +01:00
MathieuG-P a837310518 [chore] add bunch of logs for mods installation 2023-11-18 00:15:55 +01:00
MathieuG-P 2b35226f07 Merge pull request #354 from Zagrios/feature/recommended-banner-best-moddable-version
[feature] Added "recommended" banner on the best modable version
2023-11-17 23:34:45 +01:00
MathieuG-P 8986b5fed9 [feature] thicken "recommended" banner 2023-11-17 23:30:42 +01:00
MathieuG-P 01d07db991 Merge pull request #356 from Zagrios/bugfix/unable-to-launch-oculus-version-after-staying-in-the-version-page-while-downloading
[bugfix] BS version page being downloaded was always recognized as a Steam version, preventing launching if it was an Oculus version
2023-11-17 23:26:54 +01:00
MathieuG-P 9948e9b073 [bugfix] BS version page being downloaded was always recognized as a Steam version, preventing launching if it was an Oculus version 2023-11-17 23:21:28 +01:00
MathieuG-P 77aaeb14c8 Merge pull request #355 from Zagrios/bugfix/prevent-being-able-to-launch-currently-downloading-version
Bugfix/prevent being able to launch currently downloading version
2023-11-17 21:56:32 +01:00
MathieuG-P 3db58391ad [bugfix] Prevent being able to launch downloading BS version 2023-11-17 21:52:36 +01:00
MathieuG-P 0fa298bc09 [chore] add logs for installed versions detection 2023-11-17 21:02:55 +01:00
MathieuG-P 8421288322 [feature] Added "recommended" banner on the best modable version 2023-11-17 20:25:42 +01:00
MathieuG-P 46ee9d33e6 Merge pull request #353 from Zagrios/bugfix/prioritise-ipv4-to-avoid-ipv6-issues
[bugfix] prioritise ipv4 to avoid ipv6 issues
2023-11-15 18:02:55 +01:00
MathieuG-P 811d7a9f5a Merge branch 'master' into bugfix/prioritise-ipv4-to-avoid-ipv6-issues 2023-11-15 17:59:06 +01:00
MathieuG-P 1a5507249b bumb to 1.4.0-alpha.1 2023-11-15 13:24:20 +01:00
MathieuG-P 819409bce1 [bugfix] fix wrong configuration https 2023-10-05 16:36:25 +02:00
MathieuG-P 788d1087ba [bugfix] use ipv4 agent to perform requests 2023-10-04 15:24:41 +02:00
23 changed files with 258 additions and 209 deletions
+75 -74
View File
@@ -2,7 +2,7 @@
{
"BSVersion": "0.10.1",
"BSManifest": "6316038906315325420",
"OculusBinaryId": "1392433784189730",
"OculusBinaryId": "1392433784189730",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1662268711472777795",
"ReleaseImg": "https://steamcdn-a.akamaihd.net/steamcommunity/public/images/clans/32055887/a6d2b9ce074e71458499defdb5ef83bc4b9b56bb.png",
"ReleaseDate": "1525201860",
@@ -11,7 +11,7 @@
{
"BSVersion": "0.10.2",
"BSManifest": "2542095265882143144",
"OculusBinaryId": "1401326316633810",
"OculusBinaryId": "1401326316633810",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3199123443061240805",
"ReleaseDate": "1526065860",
"year": "2018"
@@ -19,7 +19,7 @@
{
"BSVersion": "0.10.2p1",
"BSManifest": "5611588554149133260",
"OculusBinaryId": "1408948315871610",
"OculusBinaryId": "1408948315871610",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1660018815112331498",
"ReleaseDate": "1526843460",
"year": "2018"
@@ -33,7 +33,7 @@
{
"BSVersion": "0.11.0",
"BSManifest": "8700049030626148111",
"OculusBinaryId": "1480180522081722",
"OculusBinaryId": "1480180522081722",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1675787121569907303",
"ReleaseDate": "1532027460",
"year": "2018"
@@ -41,7 +41,7 @@
{
"BSVersion": "0.11.1",
"BSManifest": "6574193224879562324",
"OculusBinaryId": "1481807568585684",
"OculusBinaryId": "1481807568585684",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1675787121577641471",
"ReleaseDate": "1532113860",
"year": "2018"
@@ -49,7 +49,7 @@
{
"BSVersion": "0.11.2",
"BSManifest": "2707973953401625222",
"OculusBinaryId": "1529600877139686",
"OculusBinaryId": "1529600877139686",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1700559455389069835",
"ReleaseDate": "1534792260",
"year": "2018"
@@ -57,7 +57,7 @@
{
"BSVersion": "0.12.0",
"BSManifest": "6094599000655593822",
"OculusBinaryId": "1645858012180638",
"OculusBinaryId": "1645858012180638",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1708449632708343984",
"ReleaseDate": "1543349460",
"year": "2018"
@@ -65,7 +65,7 @@
{
"BSVersion": "0.12.0p1",
"BSManifest": "2068421223689664394",
"OculusBinaryId": "1648187958614310",
"OculusBinaryId": "1648187958614310",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1708450266986928520",
"ReleaseDate": "1543435860",
"year": "2018"
@@ -73,7 +73,7 @@
{
"BSVersion": "0.12.1",
"BSManifest": "2472041066434647526",
"OculusBinaryId": "1668279893271783",
"OculusBinaryId": "1668279893271783",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3142848113551335636",
"ReleaseImg": "https://steamcdn-a.akamaihd.net/steamcommunity/public/images/clans/32055887/9b4b1890f39a682c6f4a06f12a56965b7aee0b6c.jpg",
"ReleaseDate": "1544818260",
@@ -82,7 +82,7 @@
{
"BSVersion": "0.12.2",
"BSManifest": "5325635033564462932",
"OculusBinaryId": "1676445885788517",
"OculusBinaryId": "1676445885788517",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1708452169977638962",
"ReleaseImg": "https://steamcdn-a.akamaihd.net/steamcommunity/public/images/clans/32055887/82e2ce43df0e59337a79341c54ac2e5e12a5e7bc.jpg",
"ReleaseDate": "1545423060",
@@ -91,7 +91,7 @@
{
"BSVersion": "0.13.0",
"BSManifest": "3102409495238838111",
"OculusBinaryId": "1796264627139975",
"OculusBinaryId": "1796264627139975",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1809790777736470809",
"ReleaseImg": "https://steamcdn-a.akamaihd.net/steamcommunity/public/images/clans/32055887/8f2128973e6d221b4f00aedb5194417eadad9920.jpg",
"ReleaseDate": "1552594260",
@@ -107,7 +107,7 @@
{
"BSVersion": "0.13.1",
"BSManifest": "6033025349617217666",
"OculusBinaryId": "1823415097758261",
"OculusBinaryId": "1823415097758261",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1735482645687974657",
"ReleaseDate": "1554145860",
"year": "2019"
@@ -115,7 +115,7 @@
{
"BSVersion": "0.13.2",
"BSManifest": "6839388023573913446",
"OculusBinaryId": "1827595530673551",
"OculusBinaryId": "1827595530673551",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1779393376014546213",
"ReleaseDate": "1554405060",
"year": "2019"
@@ -123,7 +123,7 @@
{
"BSVersion": "1.0.0",
"BSManifest": "152937782137361764",
"OculusBinaryId": "1901720436594393",
"OculusBinaryId": "1901720436594393",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/2655347409592352590",
"ReleaseImg": "https://steamcdn-a.akamaihd.net/steamcommunity/public/images/clans/32055887/023ab2b6a2f811e2beea327ae3875da643101694.jpg",
"ReleaseDate": "1558465860",
@@ -132,7 +132,7 @@
{
"BSVersion": "1.0.1",
"BSManifest": "7950322551526208347",
"OculusBinaryId": "1910612422371861",
"OculusBinaryId": "1910612422371861",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1617268229025488499",
"ReleaseDate": "1558984260",
"year": "2019"
@@ -140,7 +140,7 @@
{
"BSVersion": "1.1.0",
"BSManifest": "1400454104881094752",
"OculusBinaryId": "1929327700500333",
"OculusBinaryId": "1929327700500333",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1606010497768610092",
"ReleaseDate": "1560193860",
"year": "2019"
@@ -155,7 +155,7 @@
{
"BSVersion": "1.2.0",
"BSManifest": "3820905673516362176",
"OculusBinaryId": "2007606406005795",
"OculusBinaryId": "2007606406005795",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3266717385279679846",
"ReleaseImg": "https://steamcdn-a.akamaihd.net/steamcommunity/public/images/clans/32055887/cd96e7e784bb8761ba8e8609285baa5e1aec0d85.jpg",
"ReleaseDate": "1564081860",
@@ -164,7 +164,7 @@
{
"BSVersion": "1.3.0",
"BSManifest": "2440312204809283162",
"OculusBinaryId": "2063391663760602",
"OculusBinaryId": "2063391663760602",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1602640407719691235",
"ReleaseImg": "https://steamcdn-a.akamaihd.net/steamcommunity/public/images/clans/32055887/7aec534fb70fafa582addd6cd52998ccc31adf57.jpg",
"ReleaseDate": "1567105860",
@@ -173,7 +173,7 @@
{
"BSVersion": "1.4.0",
"BSManifest": "3532596684905902618",
"OculusBinaryId": "2126093504157084",
"OculusBinaryId": "2126093504157084",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1595888090489865366",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/2998e47ebbc57552718bb95e233a3a43d598630f.png",
"ReleaseDate": "1567105860",
@@ -182,7 +182,7 @@
{
"BSVersion": "1.4.2",
"BSManifest": "1199049250928380207",
"OculusBinaryId": "2136904763075958",
"OculusBinaryId": "2136904763075958",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3172148783714663931",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/b35d93fe817cea38c92c266579395c1fcd275af2.jpg",
"ReleaseDate": "1570821060",
@@ -191,7 +191,7 @@
{
"BSVersion": "1.5.0",
"BSManifest": "2831333980042022356",
"OculusBinaryId": "2179706668795767",
"OculusBinaryId": "2179706668795767",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1604898551795379829",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/56dbb4a14b764ccea1de93625225b83de1636aee_400x225.jpg",
"ReleaseDate": "1573157460",
@@ -200,7 +200,7 @@
{
"BSVersion": "1.6.0",
"BSManifest": "1869974316274529288",
"OculusBinaryId": "2264419510324482",
"OculusBinaryId": "2264419510324482",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3462636667924814182",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/99a5ad752c76859e8697d75a140500195969fb2d.jpg",
"ReleaseDate": "1576267860",
@@ -209,7 +209,7 @@
{
"BSVersion": "1.6.1",
"BSManifest": "6122319670026856947",
"OculusBinaryId": "2313973998702366",
"OculusBinaryId": "2313973998702366",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1702855647517326143",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/5e54a041cc52674f03a4d7c5406f2bb42d1f379b_400x225.jpg",
"ReleaseDate": "1578427860",
@@ -218,7 +218,7 @@
{
"BSVersion": "1.6.2",
"BSManifest": "4932559146183937357",
"OculusBinaryId": "2319779251455174",
"OculusBinaryId": "2319779251455174",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1702857555888635029",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/5e54a041cc52674f03a4d7c5406f2bb42d1f379b_400x225.jpg",
"ReleaseDate": "1578600660",
@@ -227,7 +227,7 @@
{
"BSVersion": "1.7.0",
"BSManifest": "3516084911940449222",
"OculusBinaryId": "2355681587864940",
"OculusBinaryId": "2355681587864940",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/1708488968117071534",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/ddf8c11e64231bf86ff18f5bb7d81f7dec7bc655_400x225.png",
"ReleaseDate": "1580328660",
@@ -236,7 +236,7 @@
{
"BSVersion": "1.8.0",
"BSManifest": "3177969677109016846",
"OculusBinaryId": "2483396065093491",
"OculusBinaryId": "2483396065093491",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/2080040995048021450",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/ef301c5813a7f029156da357a997f17f80564a17_400x225.png",
"ReleaseDate": "1585253460",
@@ -245,7 +245,7 @@
{
"BSVersion": "1.9.0",
"BSManifest": "7885463693258878294",
"OculusBinaryId": "2509250149174749",
"OculusBinaryId": "2509250149174749",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/2194884053816491058",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/8b365e3fdd9e8494987ea92543114404f20db891.png",
"ReleaseDate": "1586459460",
@@ -254,7 +254,7 @@
{
"BSVersion": "1.9.1",
"BSManifest": "6222769774084748916",
"OculusBinaryId": "2555492557883841",
"OculusBinaryId": "2555492557883841",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/2196011856188103369",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/144427845aef04dbe4aa9dee62818f2d637e1f42_400x225.png",
"ReleaseDate": "1588705860",
@@ -263,7 +263,7 @@
{
"BSVersion": "1.10.0",
"BSManifest": "6711131863503994755",
"OculusBinaryId": "2611337982299298",
"OculusBinaryId": "2611337982299298",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/2179125258536373088",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/3a13e1c04c4f91a16c53fdb3a7662bcae60f48fa.png",
"ReleaseDate": "1590433860",
@@ -272,7 +272,7 @@
{
"BSVersion": "1.11.0",
"BSManifest": "1919603726987963829",
"OculusBinaryId": "2827873783979049",
"OculusBinaryId": "2827873783979049",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3961432516746159538",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/afba23a3fcc80b6d2c40d2acd9ab9a51be9d3eee.png",
"ReleaseDate": "1597691460",
@@ -281,14 +281,14 @@
{
"BSVersion": "1.11.1",
"BSManifest": "3268824881806146387",
"OculusBinaryId": "2844730055626755",
"OculusBinaryId": "2844730055626755",
"ReleaseDate": "1597950660",
"year": "2020"
},
{
"BSVersion": "1.12.1",
"BSManifest": "2928416283534881313",
"OculusBinaryId": "3002627316503694",
"OculusBinaryId": "3002627316503694",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/2889580787311737971",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/cb8f24404f10a177e0ff60473f9293c8fb9b5496.png",
"ReleaseDate": "1602616260",
@@ -297,7 +297,7 @@
{
"BSVersion": "1.12.2",
"BSManifest": "543439039654962432",
"OculusBinaryId": "3027756187324140",
"OculusBinaryId": "3027756187324140",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/5096345334644252275",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/56d1d6b2a2687530a5db221241cc4d7e4feefb4d.png",
"ReleaseDate": "1603134660",
@@ -306,7 +306,7 @@
{
"BSVersion": "1.13.0",
"BSManifest": "4635119747389290346",
"OculusBinaryId": "3087480618018363",
"OculusBinaryId": "3087480618018363",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/2903094755791760339",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/4ae946eda7c0bc9421c2afb7b33e965103924cb9.png",
"ReleaseDate": "1605211860",
@@ -315,7 +315,7 @@
{
"BSVersion": "1.13.2",
"BSManifest": "8571679771389514488",
"OculusBinaryId": "3259559474143809",
"OculusBinaryId": "3259559474143809",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3025824186763919109",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/70f13d02f95c7fadae92305474ae16ce1b99162e.jpg",
"ReleaseDate": "1611259860",
@@ -324,7 +324,7 @@
{
"BSVersion": "1.13.4",
"BSManifest": "1257277263145069282",
"OculusBinaryId": "3377183652381390",
"OculusBinaryId": "3377183652381390",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3020198491530803202",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/78643cb3c68591da1e69550300a6452390c3e797.png",
"ReleaseDate": "1615320660",
@@ -333,7 +333,7 @@
{
"BSVersion": "1.13.5",
"BSManifest": "7007516983116400336",
"OculusBinaryId": "3391815807584841",
"OculusBinaryId": "3391815807584841",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3021325027071201045",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/2611baaea1f0e49be4f611fed4a3cb5d155c8eb5.png",
"ReleaseDate": "1615579860",
@@ -342,7 +342,7 @@
{
"BSVersion": "1.14.0",
"BSManifest": "9218225910501819399",
"OculusBinaryId": "3405570192876069",
"OculusBinaryId": "3405570192876069",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3012318462417082617",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/51750f9885b9fe51df5820ba0e7f36c9b2154d22.png",
"ReleaseDate": "1616098260",
@@ -351,7 +351,7 @@
{
"BSVersion": "1.15.0",
"BSManifest": "7624554893344753887",
"OculusBinaryId": "3512427425523678",
"OculusBinaryId": "3512427425523678",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3041595663499101523",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/e8de2954a115e1961bdbfa3abab546d43dd653a4.png",
"ReleaseDate": "1619723460",
@@ -360,7 +360,7 @@
{
"BSVersion": "1.16.0",
"BSManifest": "3667184295685865706",
"OculusBinaryId": "3602735303159556",
"OculusBinaryId": "3602735303159556",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3001065803744427929",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/0ad20c1cf3d4e78aa8f28fd136f89f3683df2fb6.png",
"ReleaseDate": "1622142660",
@@ -369,7 +369,7 @@
{
"BSVersion": "1.16.1",
"BSManifest": "9201874499606445062",
"OculusBinaryId": "3608513445915075",
"OculusBinaryId": "3608513445915075",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3001065803748822093",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/522ca68fe0c4576f57189afdbb8107226cdcc819.png",
"ReleaseDate": "1622229060",
@@ -378,7 +378,7 @@
{
"BSVersion": "1.16.2",
"BSManifest": "3692829915208062825",
"OculusBinaryId": "3631747100258376",
"OculusBinaryId": "3631747100258376",
"ReleaseURL": "http://steamcommunity.com/games/620980/announcements/detail/3024710972645830369",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/7e81895079a84f1b85ddcee330aec7e5626fd2c6.png",
"ReleaseDate": "1623352260",
@@ -387,7 +387,7 @@
{
"BSVersion": "1.16.3",
"BSManifest": "6392596175313869009",
"OculusBinaryId": "3737896816310070",
"OculusBinaryId": "3737896816310070",
"ReleaseURL": "http://steamcommunity.com/games/620980/announcements/detail/5293402556388135977",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/34340f96abfa0203931ca312302ee0c19dc336c2.png",
"ReleaseDate": "1626808260",
@@ -396,7 +396,7 @@
{
"BSVersion": "1.16.4",
"BSManifest": "8820433629543698585",
"OculusBinaryId": "3759730617460023",
"OculusBinaryId": "3759730617460023",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/2965042081090310028",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/22b48a8e92eed7c4e471692124724a2f3ebc3f18.png",
"ReleaseDate": "1627326660",
@@ -405,7 +405,7 @@
{
"BSVersion": "1.17.0",
"BSManifest": "7826684224434229804",
"OculusBinaryId": "3858475637585520",
"OculusBinaryId": "3858475637585520",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/2945905042782366475",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/a789a030122442308376887039c244222b92c768.png",
"ReleaseDate": "1630437060",
@@ -414,7 +414,7 @@
{
"BSVersion": "1.17.1",
"BSManifest": "4668547658954826996",
"OculusBinaryId": "3894496013983482",
"OculusBinaryId": "3894496013983482",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/2947032120578243378",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/51561161026afcf3482bcbe2ea62a6d56e03a8d0.png",
"ReleaseDate": "1631214660",
@@ -423,7 +423,7 @@
{
"BSVersion": "1.18.0",
"BSManifest": "5599254819160454367",
"OculusBinaryId": "3926417640791319",
"OculusBinaryId": "3926417640791319",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/5570379635768010184",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/89a693714b3ee32d84d05bf62caca6f651a1dbec.png",
"ReleaseDate": "1632251460",
@@ -432,7 +432,7 @@
{
"BSVersion": "1.18.1",
"BSManifest": "8961661233382948062",
"OculusBinaryId": "3968051796627903",
"OculusBinaryId": "3968051796627903",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/2994322456166449763",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/a3a4511beadf811a56742fc234724ad14ab34749.png",
"ReleaseDate": "1633547460",
@@ -441,7 +441,7 @@
{
"BSVersion": "1.18.2",
"BSManifest": "6835596583028648427",
"OculusBinaryId": "4024867594279656",
"OculusBinaryId": "4024867594279656",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3026974832179662032",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/71994e941f3d2a8fbbe335fc717c136b5dc9f823.png",
"ReleaseDate": "1635189060",
@@ -450,7 +450,7 @@
{
"BSVersion": "1.18.3",
"BSManifest": "6558821762131072991",
"OculusBinaryId": "4042806399152442",
"OculusBinaryId": "4042806399152442",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3067508483705433949",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/7d79335af5e8ca560198e6a850e339bd7b430d9f.png",
"ReleaseDate": "1636056660",
@@ -459,7 +459,7 @@
{
"BSVersion": "1.19.0",
"BSManifest": "8948172000430595334",
"OculusBinaryId": "4132873813479033",
"OculusBinaryId": "4132873813479033",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3105792342251200877",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/537cf297a6f90b8bbe7baae92b6885f8fbf98d8c.png",
"ReleaseDate": "1639167060",
@@ -468,7 +468,7 @@
{
"BSVersion": "1.19.1",
"BSManifest": "1175216641760077721",
"OculusBinaryId": "4409301142502964",
"OculusBinaryId": "4409301142502964",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/5771929045825669047",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/908d3ebdf273ca6573c3c95898be22ff052ea014.png",
"ReleaseDate": "1644869460",
@@ -477,7 +477,7 @@
{
"BSVersion": "1.20.0",
"BSManifest": "4202491068770948196",
"OculusBinaryId": "4473099549456456",
"OculusBinaryId": "4473099549456456",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3096792662638975765",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/8dfcc668bc78674d7c1d010cee2a8153e0c0c2aa.png",
"ReleaseDate": "1646770260",
@@ -486,7 +486,7 @@
{
"BSVersion": "1.21.0",
"BSManifest": "3648558848715327622",
"OculusBinaryId": "4527595284006882",
"OculusBinaryId": "4527595284006882",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3180111792066790947",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/d854a4cc83b282acc191227a7759b4f5e6c6b085.png",
"ReleaseDate": "1648753860",
@@ -495,7 +495,7 @@
{
"BSVersion": "1.22.0",
"BSManifest": "4038188869828689801",
"OculusBinaryId": "4634406099992466",
"OculusBinaryId": "4634406099992466",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3181240878804806326",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/8486ec6eb3b6e28eaac59d414dd20bd18eed36d8.png",
"ReleaseDate": "1651777860",
@@ -504,7 +504,7 @@
{
"BSVersion": "1.22.1",
"BSManifest": "3771211058784167267",
"OculusBinaryId": "4660898857343190",
"OculusBinaryId": "4660898857343190",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3185745740381652029",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/bc9fea661f7f18616b6b2feb267cc3af0ea679c5.png",
"ReleaseDate": "1652987460",
@@ -513,7 +513,7 @@
{
"BSVersion": "1.23.0",
"BSManifest": "8051970117665729770",
"OculusBinaryId": "4681198518646557",
"OculusBinaryId": "4681198518646557",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3346751320551809488",
"ReleaseImg": "https://cdn.cloudflare.steamstatic.com/steamcommunity/public/images/clans//32055887/1623b6e0b864fdad8be08275c3bb126868eafe9b.png",
"ReleaseDate": "1655218980",
@@ -522,7 +522,7 @@
{
"BSVersion": "1.24.0",
"BSManifest": "649695825989344999",
"OculusBinaryId": "4793158617450546",
"OculusBinaryId": "4793158617450546",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/4719226562388423388",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans//32055887/82c29d674bc57596102a6b815f66e956f217e658.png",
"ReleaseDate": "1657810920",
@@ -531,7 +531,7 @@
{
"BSVersion": "1.24.1",
"BSManifest": "3141359577983993890",
"OculusBinaryId": "4962706317162441",
"OculusBinaryId": "4962706317162441",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/4719226562388423388",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans//32055887/82c29d674bc57596102a6b815f66e956f217e658.png",
"ReleaseDate": "1661864214",
@@ -540,7 +540,7 @@
{
"BSVersion": "1.25.0",
"BSManifest": "4529582051007915041",
"OculusBinaryId": "4996170620482677",
"OculusBinaryId": "4996170620482677",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3312985013538143172",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans//32055887/54ac649877eca25a2a6449662337e2c63c51bbcf.png",
"ReleaseDate": "1665068529",
@@ -549,7 +549,7 @@
{
"BSVersion": "1.25.1",
"BSManifest": "7372469314660649150",
"OculusBinaryId": "5074476459318759",
"OculusBinaryId": "5074476459318759",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/5346361068670142187",
"ReleaseImg": "https://cdn.cloudflare.steamstatic.com/steamcommunity/public/images/clans//32055887/52cbd15b5e226f509e051565f6e4935eb0e44e2c.png",
"ReleaseDate": "1665673269",
@@ -558,7 +558,7 @@
{
"BSVersion": "1.26.0",
"BSManifest": "3634450655207470002",
"OculusBinaryId": "5116093325157072",
"OculusBinaryId": "5116093325157072",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3414318646334948892",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans//32055887/d18ad9d7f45a5cc2a467d75f0bdf9d32b9141b14.png",
"ReleaseDate": "1667923560",
@@ -567,7 +567,7 @@
{
"BSVersion": "1.27.0",
"BSManifest": "3485516174915301618",
"OculusBinaryId": "5232077970225273",
"OculusBinaryId": "5232077970225273",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3629368753553708497",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans//32055887/d9ed8771498be7fc83721aaaaa5b15a08fbeadb1.png",
"ReleaseDate": "1670943003",
@@ -576,7 +576,7 @@
{
"BSVersion": "1.28.0",
"BSManifest": "7463243155526905423",
"OculusBinaryId": "5425534454212956",
"OculusBinaryId": "5425534454212956",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3666530358620442392",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans//32055887/8f978bbf292810004bca12523e76be8a7eec8c4e.png",
"ReleaseDate": "1677593822",
@@ -585,7 +585,7 @@
{
"BSVersion": "1.29.0",
"BSManifest": "3341527958186345367",
"OculusBinaryId": "5550538398379227",
"OculusBinaryId": "5550538398379227",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/6169409105082976092",
"ReleaseImg": "https://cdn.cloudflare.steamstatic.com/steamcommunity/public/images/clans//32055887/255fd49cd96042b97089f754609be291293e783f.png",
"ReleaseDate": "1680188760",
@@ -594,16 +594,17 @@
{
"BSVersion": "1.29.1",
"BSManifest": "886973241045584398",
"OculusBinaryId": "5581819385251128",
"OculusBinaryId": "5581819385251128",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/6169409105101272202",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/c328e407367e9914abaf92f609501877ee5abb63.png",
"ReleaseDate": "1680623885",
"year": "2023"
"year": "2023",
"recommended": true
},
{
"BSVersion": "1.29.4",
"BSManifest": "6291266771922375922",
"OculusBinaryId": "5659705544129178",
"OculusBinaryId": "5659705544129178",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3708194993422325380",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/9c3d476c03e4a2ac72ca5df016b7c94d242b41cb.png",
"ReleaseDate": "1683644991",
@@ -612,7 +613,7 @@
{
"BSVersion": "1.30.0",
"BSManifest": "7304715857122259127",
"OculusBinaryId": "5699848430114889",
"OculusBinaryId": "5699848430114889",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3725085394628677636",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans/32055887/cd56688ad716b544af14a61b2fbace9088478887.png",
"ReleaseDate": "1684965390",
@@ -621,7 +622,7 @@
{
"BSVersion": "1.30.2",
"BSManifest": "8042804988990059618",
"OculusBinaryId": "5770096269756771",
"OculusBinaryId": "5770096269756771",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3655280868312846230",
"ReleaseImg": "https://clan.akamai.steamstatic.com/images/32055887/6d78e092c54f411b36f2c0577d62eb1b25f91aa3.png",
"ReleaseDate": "1686668364",
@@ -630,7 +631,7 @@
{
"BSVersion": "1.31.0",
"BSManifest": "676582354127623831",
"OculusBinaryId": "5824747874291610",
"OculusBinaryId": "5824747874291610",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3674423070127121445",
"ReleaseImg": "https://clan.cloudflare.steamstatic.com/images/32055887/28993aecc56a75c52295fa07620f58cb0e4b09e8.png",
"ReleaseDate": "1688050646",
@@ -639,7 +640,7 @@
{
"BSVersion": "1.31.1",
"BSManifest": "5239818041644201119",
"OculusBinaryId": "6044391715660557",
"OculusBinaryId": "6044391715660557",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3664295677895178184",
"ReleaseImg": "https://clan.akamai.steamstatic.com/images/32055887/58621b3cb8bf42fcfbf3b97fe47aa91b290eea04.png",
"ReleaseDate": "1693824747",
@@ -648,7 +649,7 @@
{
"BSVersion": "1.32.0",
"BSManifest": "1660149393914874041",
"OculusBinaryId": "6168675063232221",
"OculusBinaryId": "6168675063232221",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3723971545002767483",
"ReleaseImg": "https://clan.cloudflare.steamstatic.com/images/32055887/02284793f06188caf740da66939679afc25415e4.png",
"ReleaseDate": "1696517680",
@@ -657,7 +658,7 @@
{
"BSVersion": "1.33.0",
"BSManifest": "706865160400890715",
"OculusBinaryId": "6255299197903140",
"OculusBinaryId": "6255299197903140",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3744239644488431243",
"ReleaseImg": "https://clan.akamai.steamstatic.com/images/32055887/cac079717d62489822af3a6e90679a570842f4ca.png",
"ReleaseDate": "1698678611",
+3 -1
View File
@@ -108,7 +108,9 @@
"dropdown": {
"refresh": "Aktualisieren Sie die Versionen",
"import-version": "Importiere eine Version"
}
},
"recommended": "empfohlen",
"recommended-tooltip": "Am modbarsten Version"
},
"settings": {
"steam-and-oculus": {
+3 -1
View File
@@ -108,7 +108,9 @@
"dropdown": {
"refresh": "Refresh versions",
"import-version": "Import a version"
}
},
"recommended": "recommended",
"recommended-tooltip": "Most modable version"
},
"settings": {
"steam-and-oculus": {
+3 -1
View File
@@ -107,7 +107,9 @@
"dropdown": {
"refresh": "Actualizar las versiones",
"import-version": "Importar una versión"
}
},
"recommended": "recomendada",
"recommended-tooltip": "Versión más modable"
},
"settings": {
"steam-and-oculus": {
+3 -1
View File
@@ -107,7 +107,9 @@
"dropdown": {
"refresh": "Actualiser les versions",
"import-version": "Importer une version"
}
},
"recommended": "recommandée",
"recommended-tooltip": "Version la plus modable"
},
"settings": {
"steam-and-oculus": {
+3 -1
View File
@@ -108,7 +108,9 @@
"dropdown": {
"refresh": "Обновить версии",
"import-version": "Импорт версии"
}
},
"recommended": "рекомендуемая",
"recommended-tooltip": "самая модифицируемая версия"
},
"settings": {
"steam-and-oculus": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "bs-manager",
"version": "1.3.2",
"version": "1.4.0-alpha.2",
"description": "BSManager",
"main": "./dist/main/main.js",
"author": {
@@ -2,6 +2,7 @@ import { LaunchOption } from "shared/models/bs-launch";
import { BSLocalVersionService } from "../bs-local-version.service";
import { ChildProcessWithoutNullStreams, SpawnOptionsWithoutStdio, spawn } from "child_process";
import path from "path";
import log from "electron-log";
export abstract class AbstractLauncherService {
@@ -39,6 +40,8 @@ export abstract class AbstractLauncherService {
spawnOptions.windowsVerbatimArguments = true;
}
log.info(`Launch BS exe at ${bsExePath} with args ${args?.join(" ")}`);
return spawn(bsExePath, args, spawnOptions);
}
@@ -51,28 +51,33 @@ export class OculusLauncherService extends AbstractLauncherService implements St
throw new Error("Oculus library not found, deleteBsSymlinks");
}
const libContents = await readdir(oculusLibPath, { withFileTypes: true});
const symlinks = (await Promise.all(libContents.map(async dirent => {
return (await lstat(path.join(oculusLibPath, dirent.name))).isSymbolicLink() ? dirent : null;
const libContents = await readdir(oculusLibPath);
const symlinks = (await Promise.all(libContents.map(async dir => {
return (await lstat(path.join(oculusLibPath, dir))).isSymbolicLink() ? dir : null;
}))).filter(Boolean);
const bsSymlinks = symlinks.filter(dirent => dirent.name.startsWith(OCULUS_BS_DIR));
const versionsFolderPath = await this.pathsService.versionsDirectory();
log.info("Symlinks found in Oculus library", symlinks);
const bsSymlinks = symlinks.filter(dirent => dirent.startsWith(OCULUS_BS_DIR));
// get only symlinks created by BSM (with metadata.config)
const bsmSymlinks = (await Promise.all(bsSymlinks.map(async symlink => {
const symlinkPath = path.join(oculusLibPath, symlink.name);
const targetPath = await readlink(symlinkPath).catch(err => { log.error(err); return undefined; });
const symlinkPath = path.join(oculusLibPath, symlink);
const targetPath = await readlink(symlinkPath).catch(err => log.error(err));
log.info("Oculus Symlink", symlink, "target", targetPath);
if(!targetPath){ return null; }
if(!targetPath.startsWith(versionsFolderPath)){ return null; }
const bsmVersionsDir = path.join(this.pathsService.INSTALLATION_FOLDER, this.pathsService.VERSIONS_FOLDER);
if(!targetPath.includes(bsmVersionsDir)){ return null; }
return symlink;
}))).filter(Boolean);
await Promise.all(bsmSymlinks.map(symlink => {
log.info("Deleting symlink", symlink.name);
return unlink(path.join(oculusLibPath, symlink.name));
log.info("Delete symlink", symlink);
return unlink(path.join(oculusLibPath, symlink));
}));
}
+32 -16
View File
@@ -11,9 +11,9 @@ import log from "electron-log";
import { OculusService } from "./oculus.service";
import { DownloadLinkType } from "shared/models/mods";
import sanitize from "sanitize-filename";
import { Progression, copyDirectoryWithJunctions, deleteFolder, ensurePathNotAlreadyExist, getFoldersInFolder, pathExist, rxCopy } from "../helpers/fs.helpers";
import { Progression, copyDirectoryWithJunctions, deleteFolder, ensurePathNotAlreadyExist, getFoldersInFolder, rxCopy } from "../helpers/fs.helpers";
import { FolderLinkerService } from "./folder-linker.service";
import { ReadStream, createReadStream, readFile, writeFile } from "fs-extra";
import { ReadStream, createReadStream, pathExists, readFile, writeFile } from "fs-extra";
import readline from "readline";
import { Observable, Subject, catchError, finalize, from, map, switchMap, throwError } from "rxjs";
import { BsStore } from "../../shared/models/bs-store.enum";
@@ -53,7 +53,10 @@ export class BSLocalVersionService {
private async getVersionFromGlobalGameManagerFile(versionFilePath: string): Promise<BSVersion> {
if(!(await pathExist(versionFilePath))){ return null; }
if(!(await pathExists(versionFilePath))){
log.info("globalgamemanagers file not found", versionFilePath);
return null;
}
const versionsDict = await this.remoteVersionService.getAvailableVersions();
@@ -81,6 +84,8 @@ export class BSLocalVersionService {
stream?.close();
}
log.info("unable to get version from globalgamemanagers file", versionFilePath);
return null;
}
@@ -92,6 +97,8 @@ export class BSLocalVersionService {
}
): Promise<BSVersion>{
log.info("getVersionOfBSFolder", bsPath, options);
if(!bsPath){ return null; }
const versionFilePath = path.join(bsPath, 'Beat Saber_Data', 'globalgamemanagers');
@@ -129,7 +136,7 @@ export class BSLocalVersionService {
const contents = await readFile(path.join(versionPath, this.METADATA_FILE), "utf-8");
return JSON.parse(contents);
})().catch(e => {
log.warn(e);
log.warn("Not a critical error", e);
return {};
}).then(metadata => ({...defaultMetadata, ...metadata}));
}
@@ -139,7 +146,7 @@ export class BSLocalVersionService {
const metadata = await this.getAllVersionMetadata(version);
return metadata?.[key];
})().catch(e => {
log.warn(e);
log.warn("Not a critical error", e);
return null;
}).then(value => (value ?? defaultValue) as T);
}
@@ -196,7 +203,7 @@ export class BSLocalVersionService {
*/
public async getInstalledVersionPath(version: BSVersion): Promise<string>{
const versionPath = await this.getVersionPath(version);
if(await pathExist(versionPath)){ return versionPath; }
if(await pathExists(versionPath)){ return versionPath; }
const versionFolders = await getFoldersInFolder(await this.installLocationService.versionsDirectory());
@@ -227,7 +234,7 @@ export class BSLocalVersionService {
private async getSteamVersion(): Promise<BSVersion> {
const steamBsFolder = await this.steamService.getGameFolder(BS_APP_ID, "Beat Saber");
if (!steamBsFolder || !(await pathExist(steamBsFolder))) {
if (!steamBsFolder || !(await pathExists(steamBsFolder))) {
return null;
}
@@ -247,26 +254,35 @@ export class BSLocalVersionService {
public async getInstalledVersions(): Promise<BSVersion[]> {
const versions: BSVersion[] = [];
const steamVersion = await this.getSteamVersion();
const steamVersion = await this.getSteamVersion().catch(e => {
log.error("unable to get original Steam version", e);
});
if (steamVersion) {
versions.push(steamVersion);
}
const oculusVersion = await this.getOculusVersion();
const oculusVersion = await this.getOculusVersion().catch(e => {
log.error("unable to get original Oculus version", e);
});
if (oculusVersion) {
versions.push(oculusVersion);
}
if (!(await pathExist(await this.installLocationService.versionsDirectory()))) {
if (!(await pathExists(await this.installLocationService.versionsDirectory()))) {
return versions;
}
const folderInInstallation = await getFoldersInFolder(await this.installLocationService.versionsDirectory());
for (const f of folderInInstallation) {
log.info("try get version from folder", f);
log.info("Finded versions folders", folderInInstallation);
const version = await this.getVersionOfBSFolder(f);
for (const f of folderInInstallation) {
const version = await this.getVersionOfBSFolder(f).catch(e => {
log.error("unable to get version of folder", f, e);
});
if(!version){ continue; }
@@ -283,7 +299,7 @@ export class BSLocalVersionService {
public async deleteVersion(version: BSVersion): Promise<boolean>{
if(version.steam || version.oculus){ return false; }
const versionFolder = await this.getVersionPath(version);
if(!(await pathExist(versionFolder))){ return true; }
if(!(await pathExists(versionFolder))){ return true; }
return deleteFolder(versionFolder)
.then(() => { return true; })
@@ -304,7 +320,7 @@ export class BSLocalVersionService {
return editedVersion;
}
if((await pathExist(newPath)) && newPath === oldPath){ throw {title: "VersionAlreadExist"} as BsmException; }
if((await pathExists(newPath)) && newPath === oldPath){ throw {title: "VersionAlreadExist"} as BsmException; }
return rename(oldPath, newPath).then(() => {
this.deleteCustomVersion(version);
@@ -328,7 +344,7 @@ export class BSLocalVersionService {
this.addCustomVersion(cloneVersion);
}
if(await pathExist(newPath)){ throw {title: "VersionAlreadExist"} as BsmException; }
if(await pathExists(newPath)){ throw {title: "VersionAlreadExist"} as BsmException; }
return copyDirectoryWithJunctions(originPath, newPath).then(() => {
this.addCustomVersion(cloneVersion);
@@ -108,7 +108,11 @@ export class BsOculusDownloaderService {
private async createDownloadVersion(version: BSVersion): Promise<{version: BSVersion, dest: string}>{
const dest = await ensurePathNotAlreadyExist(await this.versions.getVersionPath(version));
return {
version: {...version, ...(path.basename(dest) !== version.BSVersion && { name: path.basename(dest) })},
version: {
...version,
...(path.basename(dest) !== version.BSVersion && { name: path.basename(dest) }),
metadata: { store: BsStore.OCULUS }
},
dest
};
}
@@ -64,7 +64,11 @@ export class BsSteamDownloaderService {
const versionPath = await this.localVersionService.getVersionPath(downloadInfos.bsVersion);
const dest = downloadInfos.isVerification ? versionPath : await ensurePathNotAlreadyExist(versionPath);
const downloadVersion: BSVersion = { ...downloadInfos.bsVersion, ...(path.basename(dest) !== downloadInfos.bsVersion.BSVersion && { name: path.basename(dest) }) };
const downloadVersion: BSVersion = {
...downloadInfos.bsVersion,
...(path.basename(dest) !== downloadInfos.bsVersion.BSVersion && { name: path.basename(dest) }),
metadata: { store: BsStore.STEAM }
};
const depotDownloaderOptions: DepotDownloaderArgsOptions = {
app: BS_APP_ID,
@@ -13,8 +13,8 @@ export class InstallationLocationService {
return InstallationLocationService.instance;
}
private readonly INSTALLATION_FOLDER = "BSManager";
private readonly VERSIONS_FOLDER = "BSInstances";
public readonly INSTALLATION_FOLDER = "BSManager";
public readonly VERSIONS_FOLDER = "BSInstances";
private readonly SHARED_CONTENT_FOLDER = "SharedContent";
@@ -9,11 +9,13 @@ import { RequestService } from "../request.service";
import { spawn } from "child_process";
import { BS_EXECUTABLE } from "../../constants";
import log from "electron-log";
import { deleteFolder, pathExist, unlinkPath, ensureFolderExist } from "../../helpers/fs.helpers";
import { deleteFolder, pathExist, unlinkPath } from "../../helpers/fs.helpers";
import { lastValueFrom } from "rxjs";
import JSZip from "jszip";
import { extractZip } from "../../helpers/zip.helpers";
import recursiveReadDir from "recursive-readdir";
import { minToMs } from "../../../shared/helpers/time.helpers";
import { ensureDir } from "fs-extra";
export class BsModsManagerService {
private static instance: BsModsManagerService;
@@ -121,6 +123,8 @@ export class BsModsManagerService {
private async downloadZip(zipUrl: string): Promise<JSZip> {
zipUrl = path.join(this.beatModsApi.BEAT_MODS_URL, zipUrl);
log.info("Download mod zip", zipUrl);
const buffer = await lastValueFrom(this.requestService.downloadBuffer(zipUrl))
.then(progress => progress.data)
.catch(e => {
@@ -139,24 +143,33 @@ export class BsModsManagerService {
}
private async executeBSIPA(version: BSVersion, args: string[]): Promise<boolean> {
log.info("executeBSIPA", version?.BSVersion, args);
const versionPath = await this.bsLocalService.getVersionPath(version);
const ipaPath = path.join(versionPath, "IPA.exe");
const bsExePath = path.join(versionPath, BS_EXECUTABLE);
if (!(await pathExist(ipaPath)) || !(await pathExist(bsExePath))) {
log.error("IPA.exe or Beat Saber.exe not found");
return false;
}
return new Promise<boolean>(resolve => {
log.info("START IPA PROCESS", `start /wait /min "" "${ipaPath}" ${args.join(" ")}`);
const processIPA = spawn(`start /wait /min "" "${ipaPath}" ${args.join(" ")}`, { cwd: versionPath, detached: true, shell: true });
processIPA.once("exit", code => {
if (code === 0) {
log.info("Ipa process exist with code 0");
return resolve(true);
}
log.error("IPA PROCESS", "exit code", code);
log.error("Ipa process exist with non 0 code", code);
resolve(false);
});
setTimeout(() => resolve(false), 1 * 60 * 1000); // timeout 1min
setTimeout(() => {
log.info("Ipa process timeout");
resolve(false)
}, minToMs(1));
});
}
@@ -168,6 +181,7 @@ export class BsModsManagerService {
}
private async installMod(mod: Mod, version: BSVersion): Promise<boolean> {
log.info("INSTALL MOD", mod.name, "for version", `${version.BSVersion} - ${version.name}`);
this.utilsService.ipcSend<ModInstallProgression>("mod-installed", { success: true, data: { name: mod.name, progression: ((this.nbInstalledMods + 1) / this.nbModsToInstall) * 100 } });
const download = this.getModDownload(mod, version);
@@ -176,7 +190,9 @@ export class BsModsManagerService {
return false;
}
log.info("Start download mod zip", mod.name, download.url);
const zip = await this.downloadZip(download.url);
log.info("Mod zip download end", mod.name, download.url, !!zip);
if (!zip) {
return false;
@@ -192,7 +208,10 @@ export class BsModsManagerService {
const entryMd5 = crypto.createHash("md5").update(data).digest("hex");
return download.hashMd5.some(md5 => md5.hash === entryMd5) ? entry : undefined;
})
)
).catch(e => {
log.error("Error while checking mod zip entries", mod.name, e);
throw e;
})
).filter(entry => !!entry);
if (checkedEntries.length !== download.hashMd5.length) {
@@ -203,13 +222,16 @@ export class BsModsManagerService {
const isBSIPA = mod.name.toLowerCase() === "bsipa";
const destDir = isBSIPA ? verionPath : path.join(verionPath, ModsInstallFolder.PENDING);
await ensureFolderExist(destDir);
await ensureDir(destDir);
log.info("Start extracting mod zip", mod.name, "to", destDir);
const extracted = await extractZip(zip, destDir)
.then(() => true)
.catch(e => {
log.error("EXTRACT MOD ZIP", e);
log.error("Error while extracting mod zip", e);
return false;
});
log.info("Mod zip extraction end", mod.name, "to", destDir, "success:", extracted);
const res = isBSIPA
? extracted &&
+10 -5
View File
@@ -1,4 +1,4 @@
import { get } from "https";
import { Agent, get } from "https";
import { createWriteStream, unlink } from "fs";
import { Progression } from "main/helpers/fs.helpers";
import { Observable, shareReplay, tap } from "rxjs";
@@ -17,12 +17,17 @@ export class RequestService {
private constructor() {}
private get ipv4Agent(){
return new Agent({ family: 4 });
}
public async getJSON<T = unknown>(url: RequestInfo, options?: RequestInit): Promise<T> {
try {
const response = await fetch(url, options);
const response = await fetch(url, {...options, agent: this.ipv4Agent});
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status} ${response}`);
throw new Error(`HTTP error! status: ${response.status} ${url}`);
}
return await response.json();
@@ -45,7 +50,7 @@ export class RequestService {
});
file.on("error", err => unlink(dest, () => subscriber.error(err)));
const req = get(url, res => {
const req = get(url, { agent: this.ipv4Agent }, res => {
progress.total = parseInt(res.headers?.["content-length"] || "0", 10);
res.on("data", chunk => {
@@ -72,7 +77,7 @@ export class RequestService {
const allChunks: Buffer[] = [];
const req = get(url, res => {
const req = get(url, { agent: this.ipv4Agent }, res => {
progress.total = parseInt(res.headers?.["content-length"] || "0", 10);
res.on("data", chunk => {
@@ -1,7 +1,6 @@
import { ApiResult } from "renderer/models/api/api.model";
import { BsvMapDetail } from "shared/models/maps";
import { BsvPlaylist, BsvPlaylistPage, MapFilter, SearchParams, SearchResponse } from "shared/models/maps/beat-saver.model";
import fetch from "node-fetch";
import { RequestService } from "../../request.service";
export class BeatSaverApiService {
private static instance: BeatSaverApiService;
@@ -13,9 +12,13 @@ export class BeatSaverApiService {
return BeatSaverApiService.instance;
}
private readonly request: RequestService;
private readonly bsaverApiUrl = "https://beatsaver.com/api";
private constructor() {}
private constructor() {
this.request = RequestService.getInstance();
}
private mapFilterToUrlParams(filter: MapFilter): URLSearchParams {
if (!filter) {
@@ -68,15 +71,13 @@ export class BeatSaverApiService {
});
}
public async getMapsDetailsByHashs<T extends string>(hashs: T[]): Promise<ApiResult<Record<Lowercase<T>, BsvMapDetail>>> {
public async getMapsDetailsByHashs<T extends string>(hashs: T[]): Promise<Record<Lowercase<T>, BsvMapDetail>> {
if (hashs.length > 50) {
throw "too musch map hashs";
}
const paramsHashs = hashs.join(",");
const resp = await fetch(`${this.bsaverApiUrl}/maps/hash/${paramsHashs}`);
const data = (await resp.json()) as Record<Lowercase<T>, BsvMapDetail> | BsvMapDetail;
const data = await this.request.getJSON<Record<Lowercase<T>, BsvMapDetail> | BsvMapDetail>(`${this.bsaverApiUrl}/maps/hash/${paramsHashs}`);
if ((data as BsvMapDetail).id) {
const key = (data as BsvMapDetail).versions.at(0).hash.toLowerCase();
@@ -84,41 +85,24 @@ export class BeatSaverApiService {
[key]: data as BsvMapDetail,
} as Record<Lowercase<T>, BsvMapDetail>;
return { status: resp.status, data: parsedData };
return parsedData
}
return { status: resp.status, data: data as Record<Lowercase<T>, BsvMapDetail> };
return data as Record<Lowercase<T>, BsvMapDetail>;
}
public async getMapDetailsById(id: string): Promise<ApiResult<BsvMapDetail>> {
const res = await fetch(`${this.bsaverApiUrl}/maps/id/${id}`);
const data = (await res.json()) as BsvMapDetail;
return { status: res.status, data };
public async getMapDetailsById(id: string): Promise<BsvMapDetail> {
return this.request.getJSON<BsvMapDetail>(`${this.bsaverApiUrl}/maps/id/${id}`);
}
public async searchMaps(search: SearchParams): Promise<ApiResult<SearchResponse>> {
public async searchMaps(search: SearchParams): Promise<SearchResponse> {
const url = new URL(`${this.bsaverApiUrl}/search/text/${search?.page ?? 0}`);
url.search = this.searchParamsToUrlParams(search).toString();
const res = await fetch(url.toString());
if (!res.ok) {
return { status: res.status, data: null };
}
const data = await res.json();
return { status: res.status, data };
return this.request.getJSON<SearchResponse>(url.toString());
}
public async getPlaylistDetails(id: string): Promise<ApiResult<BsvPlaylist>> {
const res = await fetch(`${this.bsaverApiUrl}/playlists/id/${id}/0`);
const data = (await res.json()) as BsvPlaylistPage;
return { status: res.status, data: data.playlist };
public async getPlaylistDetails(id: string): Promise<BsvPlaylist> {
const res = await this.request.getJSON<BsvPlaylistPage>(`${this.bsaverApiUrl}/playlists/id/${id}/0`);
return res.playlist;
}
}
@@ -2,6 +2,7 @@ import { splitIntoChunk } from "../../../../shared/helpers/array.helpers";
import { BsvMapDetail } from "shared/models/maps";
import { BsvPlaylist, SearchParams } from "shared/models/maps/beat-saver.model";
import { BeatSaverApiService } from "./beat-saver-api.service";
import log from "electron-log";
export class BeatSaverService {
private static instance: BeatSaverService;
@@ -36,12 +37,10 @@ export class BeatSaverService {
chunkHash.map(async hashs => {
const res = await this.bsaverApi.getMapsDetailsByHashs(hashs);
if (res.status === 200) {
mapDetails.push(...Object.values<BsvMapDetail>(res.data).filter(detail => !!detail));
mapDetails.forEach(detail => {
this.cachedMapsDetails.set(detail.versions.at(0).hash.toLowerCase(), detail);
});
}
mapDetails.push(...Object.values<BsvMapDetail>(res).filter(detail => !!detail));
mapDetails.forEach(detail => {
this.cachedMapsDetails.set(detail.versions.at(0).hash.toLowerCase(), detail);
});
})
);
@@ -49,23 +48,22 @@ export class BeatSaverService {
}
public async getMapDetailsById(id: string): Promise<BsvMapDetail> {
const res = await this.bsaverApi.getMapDetailsById(id);
return res.data;
return this.bsaverApi.getMapDetailsById(id);
}
public searchMaps(search: SearchParams): Promise<BsvMapDetail[]> {
return this.bsaverApi
.searchMaps(search)
.then(res => {
return res.status === 200 ? res.data.docs : [];
return res.docs;
})
.catch(() => {
.catch(e => {
log.error(e);
return [];
});
}
public async getPlaylistPage(id: string): Promise<BsvPlaylist> {
const res = await this.bsaverApi.getPlaylistDetails(id);
return res.data;
return this.bsaverApi.getPlaylistDetails(id);
}
}
@@ -1,8 +1,8 @@
import fetch from "node-fetch";
import { ApiResult } from "renderer/models/api/api.model";
import { MSGetQuery, MSGetQueryFilter, MSGetResponse } from "../../../../shared/models/models/model-saber.model";
import { RequestService } from "../../request.service";
export class ModelSaberApiService {
private static instance: ModelSaberApiService;
public static getInstance(): ModelSaberApiService {
@@ -15,7 +15,11 @@ export class ModelSaberApiService {
private readonly API_URL = "https://modelsaber.com/api/v2/";
private readonly ENDPOINTS = { get: "get.php", types: "types.php" };
private constructor() {}
private readonly request: RequestService;
private constructor() {
this.request = RequestService.getInstance();
}
private parseFilters(filters: MSGetQueryFilter[]): string {
if (!filters) {
@@ -50,19 +54,10 @@ export class ModelSaberApiService {
return new URLSearchParams(searchParams);
}
public async searchModel(query: MSGetQuery): Promise<ApiResult<MSGetResponse>> {
public async searchModel(query: MSGetQuery): Promise<MSGetResponse> {
const url = new URL(this.ENDPOINTS.get, this.API_URL);
url.search = this.buildUrlQuery(query).toString();
const res = await fetch(url.toString());
if (!res.ok) {
return { data: null, status: res.status };
}
const data = (await res.json()) as MSGetResponse;
return { data, status: res.status };
return this.request.getJSON<MSGetResponse>(url.toString());
}
}
@@ -33,15 +33,11 @@ export class ModelSaberService {
try {
const res = await this.modelSaberApi.searchModel(query);
if (res.status !== 200) {
if (Object.keys(res).length === 0) {
return null;
}
if (Object.keys(res.data).length === 0) {
return null;
}
return res.data[`${id}`];
return res[`${id}`];
} catch (e) {
log.error(e);
return null;
@@ -63,15 +59,11 @@ export class ModelSaberService {
try {
const res = await this.modelSaberApi.searchModel(query);
if (res.status !== 200) {
if (Object.keys(res).length === 0) {
return null;
}
if (Object.keys(res.data).length === 0) {
return null;
}
const model = Array.from(Object.values(res.data)).at(0);
const model = Array.from(Object.values(res)).at(0);
model.name = striptags(model.name ?? "");
model.author = striptags(model.author ?? "");
@@ -89,11 +81,9 @@ export class ModelSaberService {
return new Observable<MSModel[]>(observer => {
(async () => {
const res = await this.modelSaberApi.searchModel(query);
if (res.status !== 200) {
observer.error(res.status);
}
observer.next(
Object.values(res.data).map(model => {
Object.values(res).map(model => {
if (!model?.name) {
return null;
}
@@ -8,6 +8,7 @@ import { motion } from "framer-motion";
import { GlowEffect } from "../shared/glow-effect.component";
import equal from "fast-deep-equal";
import { SteamIcon } from "../svgs/icons/steam-icon.component";
import { useConstant } from "renderer/hooks/use-constant.hook";
type Props = {
version: BSVersion;
@@ -17,15 +18,17 @@ type Props = {
export const AvailableVersionItem = memo(function AvailableVersionItem({version, selected, onClick}: Props) {
const [hovered, setHovered] = useState(false);
const t = useTranslation();
const formatedDate = (() => dateFormat(+version.ReleaseDate * 1000, "ddd. d mmm yyyy"))();
const [hovered, setHovered] = useState(false);
const formatedDate = useConstant(() => dateFormat(+version.ReleaseDate * 1000, "ddd. d mmm yyyy"));
return (
<motion.li className="group relative w-72 h-60 transition-transform active:scale-[.98]" onClick={onClick} onHoverStart={() => setHovered(true)} onHoverEnd={() => setHovered(false)}>
<motion.li className="group relative w-72 h-60 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"}`}>
{version.recommended && (
<span className="uppercase absolute -rotate-45 top-9 -left-[6.2rem] font-bold text-white bg-red-600 w-full text-center text-xs z-[1] shadow-sm shadow-black py-0.5" title={t("pages.available-versions.recommended-tooltip")}>{t("pages.available-versions.recommended")}</span>
)}
<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">
@@ -34,11 +37,7 @@ export const AvailableVersionItem = memo(function AvailableVersionItem({version,
<span className="text-sm text-gray-700 dark:text-gray-400">{formatedDate}</span>
</div>
{version.ReleaseURL && (
<a
href={version.ReleaseURL}
target="_blank"
className="flex flex-row justify-between items-center rounded-full bg-black bg-opacity-30 text-white pb-px hover:bg-opacity-50"
>
<a href={version.ReleaseURL} target="_blank" className="flex flex-row justify-between items-center rounded-full bg-black bg-opacity-30 text-white pb-px overflow-hidden hover:bg-opacity-50">
<SteamIcon className="w-[25px] h-[25px] transition-transform group-hover:rotate-[-360deg] duration-300" />
<span className="relative -left-px text-sm w-fit max-w-0 text-center overflow-hidden h-full whitespace-nowrap pb-[3px] transition-all group-hover:max-w-[200px] group-hover:px-1 duration-300">{t("pages.available-versions.steam-release")}</span>
</a>
@@ -1,7 +1,7 @@
import { BSVersion } from "shared/bs-version.interface";
import { Link, useLocation } from "react-router-dom";
import { useState } from "react";
import { distinctUntilChanged, lastValueFrom, map, of, Subscription, switchMap } from "rxjs";
import { distinctUntilChanged, lastValueFrom, map, of, Subscription, switchMap, take } 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";
@@ -55,7 +55,9 @@ export function BsVersionItem(props: { version: BSVersion }) {
return props.version?.BSVersion === state?.BSVersion && props?.version.steam === state?.steam && props?.version.oculus === state?.oculus && props?.version.name === state?.name;
};
const handleDoubleClick = () => {
const handleDoubleClick = async () => {
const downloadingVersion = await lastValueFrom(bsDownloader.downloadingVersion$.pipe(take(1)));
if(equal(downloadingVersion, props.version)){ return; }
const launch$ = launcherService.launch({
version: state,
oculus: !!configService.get<boolean>(LaunchMods.OCULUS_MOD),
@@ -12,6 +12,8 @@ import { BsmImage } from "renderer/components/shared/bsm-image.component";
import { useService } from "renderer/hooks/use-service.hook";
import { BsStore } from "shared/models/bs-store.enum";
import { lastValueFrom } from "rxjs";
import { BsDownloaderService } from "renderer/services/bs-version-download/bs-downloader.service";
import equal from "fast-deep-equal";
type Props = { version: BSVersion };
@@ -20,12 +22,14 @@ export function LaunchSlide({ version }: Props) {
const configService = useService(ConfigurationService);
const bsLauncherService = useService(BSLauncherService);
const bsDownloader = useService(BsDownloaderService);
const [oculusMode, setOculusMode] = useState(!!configService.get<boolean>(LaunchMods.OCULUS_MOD));
const [desktopMode, setDesktopMode] = useState(!!configService.get<boolean>(LaunchMods.DESKTOP_MOD));
const [debugMode, setDebugMode] = useState(!!configService.get<boolean>(LaunchMods.DEBUG_MOD));
const [advancedLaunch, setAdvancedLaunch] = useState(false);
const [additionalArgsString, setAdditionalArgsString] = useState<string>(configService.get<string>("additionnal-args") || "");
const versionDownloading = useObservable(bsDownloader.downloadingVersion$);
const versionRunning = useObservable(bsLauncherService.versionRunning$);
@@ -96,7 +100,13 @@ export function LaunchSlide({ version }: Props) {
</motion.div>
</div>
<div className='grow flex justify-center items-center'>
<BsmButton onClick={launch} active={JSON.stringify(version) === JSON.stringify(versionRunning)} className='relative -translate-y-1/2 text-5xl text-gray-800 dark:text-gray-200 font-bold tracking-wide pt-1 pb-3 px-7 rounded-lg shadow-md italic shadow-black active:scale-90 transition-transform' text="misc.launch"/>
<BsmButton
onClick={launch}
active={JSON.stringify(version) === JSON.stringify(versionRunning)}
className='relative -translate-y-1/2 text-5xl text-gray-800 dark:text-gray-200 font-bold tracking-wide pt-1 pb-3 px-7 rounded-lg shadow-md italic shadow-black active:scale-90 transition-transform'
text="misc.launch"
disabled={equal(version, versionDownloading)}
/>
</div>
</div>
);
+1
View File
@@ -17,6 +17,7 @@ export interface BSVersion extends PartialBSVersion {
color?: string; // TODO : Should be in metadata
OculusBinaryId?: string;
metadata?: BSVersionMetadata;
recommended?: boolean;
}
export interface BSVersionMetadata {