diff --git a/.editorconfig b/.editorconfig index 391c4c7..6926598 100644 --- a/.editorconfig +++ b/.editorconfig @@ -83,6 +83,12 @@ dotnet_code_quality_unused_parameters = all:warning # Suppression preferences dotnet_remove_unnecessary_suppression_exclusions = none +dotnet_diagnostic.IDE0079.severity = warning # flag suppressions that are no longer needed - complements the line above + +# Unused code +dotnet_diagnostic.IDE0005.severity = warning # unused using directives - the actual ask; needs EnforceCodeStyleInBuild=true in csproj to fire during `dotnet build`, not just in the IDE +dotnet_diagnostic.IDE0051.severity = warning # private member is never used +dotnet_diagnostic.IDE0052.severity = warning # private member's value is never read (assigned but unused) # New line preferences dotnet_style_allow_multiple_blank_lines_experimental = false:warning @@ -144,8 +150,8 @@ csharp_style_prefer_range_operator = true:warning csharp_style_prefer_tuple_swap = true:warning csharp_style_prefer_utf8_string_literals = true csharp_style_throw_expression = true:warning -csharp_style_unused_value_assignment_preference = discard_variable -csharp_style_unused_value_expression_statement_preference = discard_variable +csharp_style_unused_value_assignment_preference = discard_variable:warning +csharp_style_unused_value_expression_statement_preference = discard_variable:warning # 'using' directive preferences csharp_using_directive_placement = outside_namespace:warning @@ -288,5 +294,8 @@ dotnet_naming_style.begin_s_.required_suffix = dotnet_naming_style.begin_s_.word_separator = dotnet_naming_style.begin_s_.capitalization = camel_case +# I don't want to comment every shit +dotnet_diagnostic.CS1591.severity = none + [*.{cs,vb}] dotnet_diagnostic.CA1873.severity = none diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml new file mode 100644 index 0000000..e14d7e9 --- /dev/null +++ b/.github/workflows/build-test.yml @@ -0,0 +1,37 @@ +name: build-test +on: + pull_request: + branches: [ main ] + +env: + DOTNET_VERSION: '11.0.x' + MAIN_PROJECT: 'Starlight.Launcher/Starlight.Launcher.csproj' + LOADER_PROJECT: 'Robust.Loader/Robust.Loader.csproj' + +jobs: + build: + strategy: + fail-fast: false + matrix: + include: + - os: windows-latest + rid: win-x64 + - os: ubuntu-latest + rid: linux-x64 + - os: macos-latest + rid: osx-arm64 + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + - uses: actions/setup-dotnet@v4 + with: + dotnet-quality: preview + dotnet-version: ${{ env.DOTNET_VERSION }} + - name: Build launcher + shell: bash + run: dotnet build ${{ env.MAIN_PROJECT }} -c Release -r ${{ matrix.rid }} + - name: Build loader + shell: bash + run: dotnet build ${{ env.LOADER_PROJECT }} -c Release -r ${{ matrix.rid }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 77850c8..9d3583a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,13 +1,10 @@ name: build-and-release - on: push: tags: ['v*'] workflow_dispatch: - permissions: contents: write - env: DOTNET_VERSION: '11.0.x' MAIN_PROJECT: 'Starlight.Launcher/Starlight.Launcher.csproj' @@ -22,48 +19,29 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive - - uses: actions/setup-dotnet@v4 with: dotnet-quality: preview dotnet-version: ${{ env.DOTNET_VERSION }} - - - name: Restore Workloads - shell: pwsh - run: | - dotnet workload restore ${{ env.MAIN_PROJECT }} - dotnet workload restore ${{ env.LOADER_PROJECT }} - - name: Resolve version id: ver shell: pwsh run: | $v = "${{ github.ref_name }}" -replace '^v','' echo "version=$v" >> $env:GITHUB_OUTPUT - - name: Publish (win-x64, self-contained) shell: pwsh run: | - dotnet publish ${{ env.MAIN_PROJECT }} -c Release -f net11.0-windows10.0.19041.0 -r win-x64 --self-contained true -p:WindowsAppSDKSelfContained=true -p:FullRelease=true -p:Version=${{ steps.ver.outputs.version }} -o publish/win-x64 + dotnet publish ${{ env.MAIN_PROJECT }} -c Release -r win-x64 --self-contained true -p:FullRelease=true -p:Version=${{ steps.ver.outputs.version }} -o publish/win-x64 dotnet publish ${{ env.LOADER_PROJECT }} -c Release -r win-x64 --self-contained true -p:Version=${{ steps.ver.outputs.version }} -o publish/win-x64/loader - - - name: Verify launcher output - shell: pwsh - run: | - Get-ChildItem Starlight.Launcher/bin/Release -Recurse | Select-Object FullName - - name: Inspect output shell: pwsh - run: | - Get-ChildItem publish/win-x64 -Recurse - + run: Get-ChildItem publish/win-x64 -Recurse - name: Download WebView2 bootstrapper shell: pwsh run: Invoke-WebRequest "https://go.microsoft.com/fwlink/p/?LinkId=2124703" -OutFile installer/MicrosoftEdgeWebview2Setup.exe - - name: Install Inno Setup run: choco install innosetup --no-progress -y - - name: Build installer shell: pwsh run: > @@ -73,14 +51,208 @@ jobs: /DExeName=${{ env.EXE_NAME }} "/DSourceDir=${{ github.workspace }}\publish\win-x64" installer\Starlight.iss - - uses: actions/upload-artifact@v4 with: name: windows-installer path: installer/Output/*.exe + linux: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + - uses: actions/setup-dotnet@v4 + with: + dotnet-quality: preview + dotnet-version: ${{ env.DOTNET_VERSION }} + - name: Resolve version + id: ver + run: | + v="${GITHUB_REF_NAME#v}" + echo "version=$v" >> "$GITHUB_OUTPUT" + - name: Publish (linux-x64, self-contained) + run: | + dotnet publish ${{ env.MAIN_PROJECT }} -c Release -r linux-x64 --self-contained true -p:FullRelease=true -p:Version=${{ steps.ver.outputs.version }} -o publish/linux-x64 + dotnet publish ${{ env.LOADER_PROJECT }} -c Release -r linux-x64 --self-contained true -p:Version=${{ steps.ver.outputs.version }} -o publish/linux-x64/loader + - name: Mark executables +x + run: | + chmod +x publish/linux-x64/Starlight.Launcher + chmod +x publish/linux-x64/loader/Robust.Loader + + - name: Package as tar.gz + run: tar -czf Starlight.Launcher-linux-x64-${{ steps.ver.outputs.version }}.tar.gz -C publish/linux-x64 . + - uses: actions/upload-artifact@v4 + with: + name: linux-tarball + path: Starlight.Launcher-linux-x64-*.tar.gz + + - name: Assemble .deb package tree + run: | + set -e + PKG_VERSION="${{ steps.ver.outputs.version }}" + PKG_ROOT="deb/starlight-launcher_${PKG_VERSION}_amd64" + + mkdir -p "$PKG_ROOT/DEBIAN" + mkdir -p "$PKG_ROOT/opt/starlight-launcher" + mkdir -p "$PKG_ROOT/usr/bin" + mkdir -p "$PKG_ROOT/usr/share/applications" + mkdir -p "$PKG_ROOT/usr/share/icons/hicolor/256x256/apps" + + cp -R publish/linux-x64/. "$PKG_ROOT/opt/starlight-launcher/" + chmod +x "$PKG_ROOT/opt/starlight-launcher/Starlight.Launcher" + chmod +x "$PKG_ROOT/opt/starlight-launcher/loader/Robust.Loader" + + ln -s /opt/starlight-launcher/Starlight.Launcher "$PKG_ROOT/usr/bin/starlight-launcher" + + cp PublishFiles/icon.png "$PKG_ROOT/usr/share/icons/hicolor/256x256/apps/starlight-launcher.png" || true + + cat > "$PKG_ROOT/usr/share/applications/starlight-launcher.desktop" << DESKTOP + [Desktop Entry] + Type=Application + Name=Starlight Launcher + Comment=Starlight Launcher for Space Station 14 + Exec=/opt/starlight-launcher/Starlight.Launcher %u + Icon=starlight-launcher + Terminal=false + Categories=Game; + MimeType=x-scheme-handler/starlight; + DESKTOP + + cat > "$PKG_ROOT/DEBIAN/control" << CONTROL + Package: starlight-launcher + Version: ${PKG_VERSION} + Section: games + Priority: optional + Architecture: amd64 + Maintainer: Starlight Team + Description: Starlight Launcher for Space Station 14 + A modern, cross-platform launcher built on Avalonia and Blazor. + CONTROL + + cat > "$PKG_ROOT/DEBIAN/postinst" << 'POSTINST' + #!/bin/sh + set -e + # Refreshes the desktop-file and MIME caches so the new app/association + # actually shows up without the user having to log out and back in. + update-desktop-database /usr/share/applications >/dev/null 2>&1 || true + gtk-update-icon-cache /usr/share/icons/hicolor >/dev/null 2>&1 || true + exit 0 + POSTINST + chmod 0755 "$PKG_ROOT/DEBIAN/postinst" + + - name: Build .deb + run: | + dpkg-deb --build --root-owner-group \ + "deb/starlight-launcher_${{ steps.ver.outputs.version }}_amd64" \ + "Starlight.Launcher-linux-x64-${{ steps.ver.outputs.version }}.deb" + + - uses: actions/upload-artifact@v4 + with: + name: linux-deb + path: Starlight.Launcher-*.deb + + - name: Build AppImage + run: | + set -e + APPDIR=AppDir + mkdir -p "$APPDIR/usr/bin" "$APPDIR/usr/share/applications" "$APPDIR/usr/share/icons/hicolor/256x256/apps" + + cp -R publish/linux-x64/. "$APPDIR/usr/bin/" + chmod +x "$APPDIR/usr/bin/Starlight.Launcher" + chmod +x "$APPDIR/usr/bin/loader/Robust.Loader" + + cp PublishFiles/icon.png "$APPDIR/usr/share/icons/hicolor/256x256/apps/starlight-launcher.png" || true + cp PublishFiles/icon.png "$APPDIR/starlight-launcher.png" || true + + cat > "$APPDIR/starlight-launcher.desktop" << DESKTOP + [Desktop Entry] + Type=Application + Name=Starlight Launcher + Exec=Starlight.Launcher %u + Icon=starlight-launcher + Categories=Game; + MimeType=x-scheme-handler/starlight; + DESKTOP + + cat > "$APPDIR/AppRun" << 'APPRUN' + #!/bin/sh + HERE="$(dirname "$(readlink -f "$0")")" + exec "$HERE/usr/bin/Starlight.Launcher" "$@" + APPRUN + chmod +x "$APPDIR/AppRun" + + wget -q https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage -O appimagetool + chmod +x appimagetool + + ./appimagetool --appimage-extract-and-run "$APPDIR" "Starlight.Launcher-linux-x64-${{ steps.ver.outputs.version }}.AppImage" + + - uses: actions/upload-artifact@v4 + with: + name: linux-appimage + path: Starlight.Launcher-*.AppImage + + macos: + runs-on: macos-latest + strategy: + matrix: + rid: [osx-x64, osx-arm64] + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + - uses: actions/setup-dotnet@v4 + with: + dotnet-quality: preview + dotnet-version: ${{ env.DOTNET_VERSION }} + - name: Resolve version + id: ver + run: | + v="${GITHUB_REF_NAME#v}" + echo "version=$v" >> "$GITHUB_OUTPUT" + - name: Publish (${{ matrix.rid }}, self-contained) + run: | + dotnet publish ${{ env.MAIN_PROJECT }} -c Release -r ${{ matrix.rid }} --self-contained true -p:FullRelease=true -p:Version=${{ steps.ver.outputs.version }} -o publish/${{ matrix.rid }} + dotnet publish ${{ env.LOADER_PROJECT }} -c Release -r ${{ matrix.rid }} --self-contained true -p:Version=${{ steps.ver.outputs.version }} -o publish/${{ matrix.rid }}/loader + - name: Assemble .app bundle + run: | + APP="Starlight Launcher.app" + mkdir -p "$APP/Contents/MacOS" "$APP/Contents/Resources" + cp -R publish/${{ matrix.rid }}/. "$APP/Contents/MacOS/" + chmod +x "$APP/Contents/MacOS/Starlight.Launcher" + chmod +x "$APP/Contents/MacOS/loader/Robust.Loader" + cp Starlight.Launcher/Resources/AppIcon/icon.icns "$APP/Contents/Resources/icon.icns" || true + cat > "$APP/Contents/Info.plist" < + + + + CFBundleExecutableStarlight.Launcher + CFBundleIdentifiercom.starlight.launcher + CFBundleNameStarlight Launcher + CFBundleShortVersionString${{ steps.ver.outputs.version }} + CFBundleIconFileicon.icns + CFBundlePackageTypeAPPL + LSMinimumSystemVersion12.0 + CFBundleURLTypes + + + CFBundleURLNamecom.starlight.launcher.protocol + CFBundleURLSchemesstarlight + + + + + PLIST + - name: Package + run: ditto -c -k --sequesterRsrc --keepParent "Starlight Launcher.app" Starlight.Launcher-${{ matrix.rid }}-${{ steps.ver.outputs.version }}.zip + - uses: actions/upload-artifact@v4 + with: + name: macos-${{ matrix.rid }}-build + path: Starlight.Launcher-${{ matrix.rid }}-*.zip + release: - needs: [windows] + needs: [windows, linux, macos] runs-on: ubuntu-latest steps: - uses: actions/download-artifact@v4 diff --git a/.gitignore b/.gitignore index d74b31c..e2f67fe 100644 --- a/.gitignore +++ b/.gitignore @@ -68,8 +68,4 @@ x86/ *.nuget.targets # Publish Web Output -*.[Pp]ublish.xml - - -# Custom manifest for localization -**/[Rr]esources/[Rr]aw/[Ll]ocale/[Mm]anifest.json \ No newline at end of file +*.[Pp]ublish.xml \ No newline at end of file diff --git a/LocalizationIndexer/LocalizationIndexer.csproj b/LocalizationIndexer/LocalizationIndexer.csproj deleted file mode 100644 index c9a7479..0000000 --- a/LocalizationIndexer/LocalizationIndexer.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - Exe - net11.0 - enable - enable - - \ No newline at end of file diff --git a/LocalizationIndexer/Program.cs b/LocalizationIndexer/Program.cs deleted file mode 100644 index c9a9950..0000000 --- a/LocalizationIndexer/Program.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Text.Json; - -var localeRoot = args[0]; -var outputFile = args[1]; - -var result = new Dictionary(); - -foreach (var dir in Directory.GetDirectories(localeRoot)) -{ - var localeId = Path.GetFileName(dir); - - var files = Directory.GetFiles(dir, "*.ftl", SearchOption.AllDirectories) - .Select(f => Path.GetRelativePath(dir, f).Replace('\\', '/')) - .OrderBy(x => x) - .ToArray(); - - if (files.Length > 0) - result[localeId] = files; -} - -await File.WriteAllTextAsync( - outputFile, - JsonSerializer.Serialize(result, new JsonSerializerOptions - { - WriteIndented = true - })); \ No newline at end of file diff --git a/PublishFiles/icon.png b/PublishFiles/icon.png new file mode 100644 index 0000000..4d28fdc Binary files /dev/null and b/PublishFiles/icon.png differ diff --git a/Robust.Launcher.Api/Api/AuthApi.cs b/Robust.Launcher.Api/Api/AuthApi.cs index 7cc45c4..99b7c10 100644 --- a/Robust.Launcher.Api/Api/AuthApi.cs +++ b/Robust.Launcher.Api/Api/AuthApi.cs @@ -14,17 +14,26 @@ namespace Robust.Launcher.Api.Api; +/// +/// Provides methods for interacting with the authentication API. +/// public sealed class AuthApi { private readonly HttpClient _httpClient; private readonly ILogger _logger; + /// + /// Initializes a new instance of the class. + /// public AuthApi(HttpClient http, ILogger logger) { _httpClient = http; _logger = logger; } + /// + /// Authenticates a user. + /// public async Task AuthenticateAsync(AuthenticateRequest request, UrlFallbackSet authSet) { try @@ -79,6 +88,9 @@ public async Task AuthenticateAsync(AuthenticateRequest requ } } + /// + /// Registers a new user account. + /// public async Task RegisterAsync(string username, string email, string password, UrlFallbackSet authSet) { try @@ -122,7 +134,9 @@ public async Task RegisterAsync(string username, string email, s } } - /// Any errors that occured + /// + /// Requests a password reset email. + /// public async Task ForgotPasswordAsync(string email, UrlFallbackSet authSet) { try @@ -152,6 +166,9 @@ public async Task RegisterAsync(string username, string email, s } } + /// + /// Requests a new account confirmation email. + /// public async Task ResendConfirmationAsync(string email, UrlFallbackSet authSet) { try @@ -182,10 +199,9 @@ public async Task RegisterAsync(string username, string email, s } } - /// Null if the server refused to refresh the token (it expired). - /// - /// Thrown if an unexpected error occured. - /// + /// + /// Refreshes an authentication token. + /// public async Task RefreshTokenAsync(string token, UrlFallbackSet authSet) { try @@ -231,6 +247,9 @@ public async Task RegisterAsync(string username, string email, s } } + /// + /// Logs out the specified authentication token. + /// public async Task LogoutTokenAsync(string token, UrlFallbackSet authSet) { try @@ -261,12 +280,8 @@ public async Task LogoutTokenAsync(string token, UrlFallbackSet authSet) } /// - /// Check if a token is still valid. + /// Checks whether an authentication token is still valid. /// - /// True if the token is still valid. - /// - /// Thrown if an unexpected error occured. - /// public async Task CheckTokenAsync(string token, UrlFallbackSet authSet) { try @@ -304,62 +319,130 @@ public async Task CheckTokenAsync(string token, UrlFallbackSet authSet) } } + /// + /// Represents an authentication request. + /// public sealed record AuthenticateRequest(string? Username, Guid? UserId, string Password, string? TfaCode = null) { + /// + /// Initializes an authentication request using a username. + /// public AuthenticateRequest(string username, string password) : this(username, null, password) { } + /// + /// Initializes an authentication request using a user ID. + /// public AuthenticateRequest(Guid userId, string password) : this(null, userId, password) { } } + /// + /// Represents a successful authentication response. + /// public sealed record AuthenticateResponse(string Token, string Username, Guid UserId, DateTimeOffset ExpireTime); + /// + /// Represents a failed authentication response. + /// public sealed record AuthenticateDenyResponse(string[] Errors, AuthenticateDenyResponseCode Code); + /// + /// Specifies the reason an authentication request was denied. + /// [JsonConverter(typeof(JsonStringEnumConverter))] public enum AuthenticateDenyResponseCode { - // @formatter:off + /// + /// No response + /// None = 0, + /// + /// Invalid credentials + /// InvalidCredentials = 1, + /// + /// Account needs confirmation via email + /// AccountUnconfirmed = 2, + /// + /// Account needs 2fa + /// TfaRequired = 3, + /// + /// Invalid 2fa + /// TfaInvalid = 4, + /// + /// Account banned + /// AccountLocked = 5, - - // Not actually from the API, but used internally. + /// + /// Unknown + /// UnknownError = -1, - // @formatter:on } + /// + /// Represents a user registration request. + /// public sealed record RegisterRequest(string Username, string Email, string Password); + /// + /// Represents a successful registration response. + /// public sealed record RegisterResponse(RegisterResponseStatus Status); + /// + /// Represents a failed registration response. + /// public sealed record RegisterResponseError(string[] Errors); + /// + /// Represents a password reset request. + /// public sealed record ResetPasswordRequest(string Email); + /// + /// Represents an account confirmation request. + /// public sealed record ResendConfirmationRequest(string Email); + /// + /// Represents a logout request. + /// public sealed record LogoutRequest(string Token); + /// + /// Represents a token refresh request. + /// public sealed record RefreshRequest(string Token); + /// + /// Represents a token refresh response. + /// public sealed record RefreshResponse(DateTimeOffset ExpireTime, string NewToken); } +/// +/// Represents the result of an authentication request. +/// public readonly struct AuthenticateResult { private readonly LoginInfo? _loginInfo; + /// + /// Gets the authentication failure code. + /// public AuthApi.AuthenticateDenyResponseCode Code { get; } + /// + /// Initializes a successful authentication result. + /// public AuthenticateResult(LoginInfo loginInfo) { _loginInfo = loginInfo; @@ -367,6 +450,9 @@ public AuthenticateResult(LoginInfo loginInfo) Code = default; } + /// + /// Initializes a failed authentication result. + /// public AuthenticateResult(string[] errors, AuthApi.AuthenticateDenyResponseCode code) { _loginInfo = null; @@ -374,55 +460,103 @@ public AuthenticateResult(string[] errors, AuthApi.AuthenticateDenyResponseCode Code = code; } + /// + /// Gets a value indicating whether the authentication succeeded. + /// public bool IsSuccess => _loginInfo != null; + /// + /// Gets the authenticated login information. + /// public LoginInfo LoginInfo => _loginInfo ?? throw new InvalidOperationException("This AuthenticateResult is not a success."); + /// + /// Gets the authentication errors. + /// [AllowNull] public string[] Errors => field ?? throw new InvalidOperationException("This AuthenticateResult is not a failure."); } +/// +/// Represents the result of a registration request. +/// public readonly struct RegisterResult { private readonly RegisterResponseStatus? _status; + /// + /// Initializes a successful registration result. + /// public RegisterResult(RegisterResponseStatus status) { _status = status; Errors = null; } + /// + /// Initializes a failed registration result. + /// public RegisterResult(string[] errors) { _status = null; Errors = errors; } + /// + /// Gets a value indicating whether the registration succeeded. + /// public bool IsSuccess => _status != null; + /// + /// Gets the registration status. + /// public RegisterResponseStatus Status => _status ?? throw new InvalidOperationException("This RegisterResult is not a success."); + /// + /// Gets the registration errors. + /// [AllowNull] public string[] Errors => field ?? throw new InvalidOperationException("This RegisterResult is not a failure."); } +/// +/// Specifies the result of a registration request. +/// public enum RegisterResponseStatus { + /// + /// Success + /// Registered, + /// + /// Needs confirmation via email + /// RegisteredNeedConfirmation } +/// +/// Represents an error that occurs while communicating with the authentication API. +/// [Serializable] public class AuthApiException : Exception { + /// + /// Initializes a new instance of the class. + /// public AuthApiException() { } + /// + /// Initializes a new instance of the class with the specified error message. + /// public AuthApiException(string message) : base(message) { } + /// + /// Initializes a new instance of the class with the specified error message and inner exception. + /// public AuthApiException(string message, Exception inner) : base(message, inner) { } diff --git a/Robust.Launcher.Api/Api/HubApi.cs b/Robust.Launcher.Api/Api/HubApi.cs index 89e5af3..a67a757 100644 --- a/Robust.Launcher.Api/Api/HubApi.cs +++ b/Robust.Launcher.Api/Api/HubApi.cs @@ -2,7 +2,6 @@ using Robust.Launcher.Api.Utility; using Microsoft.Extensions.Logging; using System; -using System.Linq; using System.Net.Http; using System.Net.Http.Json; using System.Text.Json; @@ -11,17 +10,26 @@ namespace Robust.Launcher.Api.Api; +/// +/// Provides methods for interacting with the hub API. +/// public sealed class HubApi { private readonly HttpClient _http; private readonly ILogger _logger; + /// + /// Initializes a new instance of the class. + /// public HubApi(HttpClient http, ILogger logger) { _http = http; _logger = logger; } + /// + /// Retrieves the list of available servers from the hub. + /// public async Task GetServers(UrlFallbackSet hubUri, CancellationToken cancel) { HubApiException? lastError = null; @@ -55,6 +63,9 @@ public async Task GetServers(UrlFallbackSet hubUri, Cancellat throw lastError ?? new HubApiException("No URLs in fallback set"); } + /// + /// Retrieves information about a server from the hub. + /// public async Task GetServerInfo( string serverAddress, string hubAddress, @@ -69,6 +80,9 @@ public async Task GetServerInfo( return await RequestJsonAsync(url, cancel).ConfigureAwait(false); } + /// + /// Sends a request and deserializes the JSON response. + /// private async Task RequestJsonAsync(string url, CancellationToken cancel) { HttpResponseMessage response; @@ -137,5 +151,8 @@ private async Task RequestJsonAsync(string url, CancellationToken cancel) } } + /// + /// Represents a server entry returned by the hub. + /// public sealed record ServerListEntry(string Address, ServerApi.ServerStatus StatusData); } diff --git a/Robust.Launcher.Api/Api/HubApiException.cs b/Robust.Launcher.Api/Api/HubApiException.cs index 2ed286b..1f4b498 100644 --- a/Robust.Launcher.Api/Api/HubApiException.cs +++ b/Robust.Launcher.Api/Api/HubApiException.cs @@ -3,14 +3,39 @@ namespace Robust.Launcher.Api.Api; +/// +/// Represents an error that occurs while communicating with the hub API. +/// public sealed class HubApiException : Exception { + /// + /// Gets the HTTP status code returned by the hub, if available. + /// public HttpStatusCode? StatusCode { get; } + + /// + /// Gets the suggested delay before retrying the request, if provided by the hub. + /// public TimeSpan? RetryAfter { get; } + + /// + /// Gets the URL of the request that caused the exception. + /// public string? RequestUrl { get; } + + /// + /// Gets a value indicating whether the request was rejected due to rate limiting. + /// public bool IsRateLimited => StatusCode == HttpStatusCode.TooManyRequests; + + /// + /// Gets a value indicating whether the request timed out. + /// public bool IsTimeout { get; } + /// + /// Initializes a new instance of the class. + /// public HubApiException( string message, HttpStatusCode? statusCode = null, @@ -25,4 +50,4 @@ public HubApiException( RequestUrl = requestUrl; IsTimeout = isTimeout; } -} \ No newline at end of file +} diff --git a/Robust.Launcher.Api/Api/ServerApi.cs b/Robust.Launcher.Api/Api/ServerApi.cs index 137d7cf..6506c83 100644 --- a/Robust.Launcher.Api/Api/ServerApi.cs +++ b/Robust.Launcher.Api/Api/ServerApi.cs @@ -4,9 +4,14 @@ namespace Robust.Launcher.Api.Api; +/// +/// Provides types and helpers for the game server API. +/// public static class ServerApi { - // https://docs.spacestation14.io/en/engine/http-api + /// + /// Represents the current status of a game server. + /// public sealed record ServerStatus( [property: JsonPropertyName("name")] string? Name, [property: JsonPropertyName("players")] @@ -17,6 +22,9 @@ public sealed record ServerStatus( [property: JsonPropertyName("run_level")] GameRunLevel? RunLevel, [property: JsonPropertyName("tags")] string[]? Tags); + /// + /// Represents the current state of the game round. + /// public enum GameRunLevel { PreRoundLobby = 0, @@ -25,20 +33,16 @@ public enum GameRunLevel } /// - /// Contains definitions for standard tags returned by game servers. + /// Provides constants and helper methods for standard server tags. /// public static class Tags { - // @formatter:off - - // Base tag definitions. public const string TagEighteenPlus = "18+"; public const string TagRegion = "region:"; public const string TagLanguage = "lang:"; public const string TagRolePlay = "rp:"; public const string TagNoTagInfer = "no_tag_infer"; - // Region tags. public const string RegionAfricaCentral = "af_c"; public const string RegionAfricaNorth = "af_n"; public const string RegionAfricaSouth = "af_s"; @@ -61,19 +65,29 @@ public static class Tags public const string RegionSouthAmericaSouth = "am_s_s"; public const string RegionSouthAmericaWest = "am_s_w"; - // RolePlay level tags. public const string RolePlayNone = "none"; public const string RolePlayLow = "low"; public const string RolePlayMedium = "med"; public const string RolePlayHigh = "high"; - // @formatter:on + /// + /// Attempts to extract the region value from a server tag. + /// public static bool TryRegion(string tag, [NotNullWhen(true)] out string? region) => TryTagPrefix(tag, TagRegion, out region); + /// + /// Attempts to extract the language value from a server tag. + /// public static bool TryLanguage(string tag, [NotNullWhen(true)] out string? language) => TryTagPrefix(tag, TagLanguage, out language); + /// + /// Attempts to extract the role-play level from a server tag. + /// public static bool TryRolePlay(string tag, [NotNullWhen(true)] out string? rolePlay) => TryTagPrefix(tag, TagRolePlay, out rolePlay); + /// + /// Attempts to extract the value of a tag with the specified prefix. + /// public static bool TryTagPrefix(string tag, string prefix, [NotNullWhen(true)] out string? value) { if (!tag.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) diff --git a/Robust.Launcher.Api/Models/ServerStatus/ServerStatusCache.cs b/Robust.Launcher.Api/Models/ServerStatus/ServerStatusCache.cs index 31ce8a1..33912fc 100644 --- a/Robust.Launcher.Api/Models/ServerStatus/ServerStatusCache.cs +++ b/Robust.Launcher.Api/Models/ServerStatus/ServerStatusCache.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Concurrent; -using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; @@ -36,6 +35,7 @@ public ServerStatusCache(HttpClient http, ILogger logger) /// This does NOT start fetching the data. /// /// The address of the server to fetch data for. + /// The address of the hub to fetch data for. public ServerStatusData GetStatusFor(string serverAddress, string? hubAddress = null) => _cachedData.GetOrAdd( serverAddress, @@ -68,7 +68,7 @@ private async void UpdateStatusFor(CacheReg reg) } finally { - reg.Semaphore.Release(); + _ = reg.Semaphore.Release(); } } @@ -134,7 +134,7 @@ public async Task UpdateStatusFor(ServerStatusData data, HttpClient http, Cancel HttpCompletionOption.ResponseHeadersRead, linkedToken.Token); - response.EnsureSuccessStatusCode(); + _ = response.EnsureSuccessStatusCode(); status = await response.Content .ReadFromJsonAsync(linkedToken.Token) @@ -222,19 +222,30 @@ public async Task UpdateInfoForCore(ServerStatusData data, Func _ = UpdateInfoForCore(statusData, async cancel => + { + var uriBuilder = new UriBuilder( + UriHelper.GetServerInfoAddress(statusData.Address)) { - var uriBuilder = new UriBuilder( - UriHelper.GetServerInfoAddress(statusData.Address)) - { - Query = "can_skip_build=1" - }; + Query = "can_skip_build=1" + }; + + var url = uriBuilder.ToString(); + + try + { + _logger.LogDebug( + "Updating server info. Address: {Address}, Url: {Url}", + statusData.Address, + url); - var url = uriBuilder.ToString(); + var result = await _http.GetFromJsonAsync( + url, + cancel); - try + if (result is null) { - _logger.LogDebug( - "Updating server info. Address: {Address}, Url: {Url}", - statusData.Address, - url); - - var result = await _http.GetFromJsonAsync( - url, - cancel); - - if (result is null) - { - _logger.LogWarning( - "Server info response was null. Address: {Address}", - statusData.Address); - } - else - { - _logger.LogDebug( - "Server info updated successfully. Address: {Address}", - statusData.Address); - } - - return result; + _logger.LogWarning( + "Server info response was null. Address: {Address}", + statusData.Address); } - catch (OperationCanceledException) + else { - _logger.LogInformation( - "Server info update cancelled. Address: {Address}", + _logger.LogDebug( + "Server info updated successfully. Address: {Address}", statusData.Address); - - throw; } - catch (HttpRequestException ex) - { - _logger.LogError( - ex, - "HTTP error while updating server info. Address: {Address}, Url: {Url}", - statusData.Address, - url); - throw; - } - catch (Exception ex) - { - _logger.LogError( - ex, - "Unexpected error while updating server info. Address: {Address}", - statusData.Address); + return result; + } + catch (OperationCanceledException) + { + _logger.LogInformation( + "Server info update cancelled. Address: {Address}", + statusData.Address); - throw; - } - }); + throw; + } + catch (HttpRequestException ex) + { + _logger.LogError( + ex, + "HTTP error while updating server info. Address: {Address}, Url: {Url}", + statusData.Address, + url); + + throw; + } + catch (Exception ex) + { + _logger.LogError( + ex, + "Unexpected error while updating server info. Address: {Address}", + statusData.Address); + + throw; + } + }); private sealed class CacheReg { diff --git a/Robust.Launcher.Api/Robust.Launcher.Api.csproj b/Robust.Launcher.Api/Robust.Launcher.Api.csproj index 88d1448..2d2e2d3 100644 --- a/Robust.Launcher.Api/Robust.Launcher.Api.csproj +++ b/Robust.Launcher.Api/Robust.Launcher.Api.csproj @@ -4,6 +4,7 @@ 1.0.0 enable true + true diff --git a/Robust.Launcher.Api/Utility/Blake2B.cs b/Robust.Launcher.Api/Utility/Blake2B.cs index a0e5ca8..9845971 100644 --- a/Robust.Launcher.Api/Utility/Blake2B.cs +++ b/Robust.Launcher.Api/Utility/Blake2B.cs @@ -12,7 +12,7 @@ public static byte[] HashStream(Stream stream, int outputLength) CryptoGenericHashBlake2B.State state; var pool = ArrayPool.Shared.Rent(65536); - CryptoGenericHashBlake2B.Init(ref state, ReadOnlySpan.Empty, outputLength); + _ = CryptoGenericHashBlake2B.Init(ref state, ReadOnlySpan.Empty, outputLength); while (true) { @@ -21,14 +21,14 @@ public static byte[] HashStream(Stream stream, int outputLength) break; var readData = pool.AsSpan(0, read); - CryptoGenericHashBlake2B.Update(ref state, readData); + _ = CryptoGenericHashBlake2B.Update(ref state, readData); } ArrayPool.Shared.Return(pool); var result = new byte[outputLength]; - CryptoGenericHashBlake2B.Final(ref state, result); + _ = CryptoGenericHashBlake2B.Final(ref state, result); return result; } -} \ No newline at end of file +} diff --git a/Robust.Launcher.Api/Utility/Blake2BHasherStream.cs b/Robust.Launcher.Api/Utility/Blake2BHasherStream.cs index 8358789..0a43d00 100644 --- a/Robust.Launcher.Api/Utility/Blake2BHasherStream.cs +++ b/Robust.Launcher.Api/Utility/Blake2BHasherStream.cs @@ -21,14 +21,14 @@ private Blake2BHasherStream(Stream wrapping, bool reader, ReadOnlySpan key WrappingStream = wrapping; _reader = reader; - CryptoGenericHashBlake2B.Init(ref State, key, outputLength); + _ = CryptoGenericHashBlake2B.Init(ref State, key, outputLength); } public byte[] Finish() { var result = new byte[OutputLength]; - CryptoGenericHashBlake2B.Final(ref State, result); + _ = CryptoGenericHashBlake2B.Final(ref State, result); return result; } @@ -65,7 +65,7 @@ public override int Read(byte[] buffer, int offset, int count) var read = WrappingStream.Read(buffer, offset, count); if (read > 0) - CryptoGenericHashBlake2B.Update(ref State, buffer.AsSpan(offset, read)); + _ = CryptoGenericHashBlake2B.Update(ref State, buffer.AsSpan(offset, read)); return read; } @@ -78,7 +78,7 @@ public override int Read(Span buffer) var read = WrappingStream.Read(buffer); if (read > 0) - CryptoGenericHashBlake2B.Update(ref State, buffer[..read]); + _ = CryptoGenericHashBlake2B.Update(ref State, buffer[..read]); return read; } @@ -91,7 +91,7 @@ public override async ValueTask ReadAsync(Memory buffer, Cancellation var read = await WrappingStream.ReadAsync(buffer, cancellationToken); if (read > 0) - CryptoGenericHashBlake2B.Update(ref State, buffer[..read].Span); + _ = CryptoGenericHashBlake2B.Update(ref State, buffer[..read].Span); return read; } @@ -106,7 +106,7 @@ public override void Write(byte[] buffer, int offset, int count) throw new InvalidOperationException(); WrappingStream.Write(buffer, offset, count); - CryptoGenericHashBlake2B.Update(ref State, buffer.AsSpan(offset, count)); + _ = CryptoGenericHashBlake2B.Update(ref State, buffer.AsSpan(offset, count)); } public override bool CanRead => _reader; @@ -119,4 +119,4 @@ public override long Position get => throw new NotSupportedException(); set => throw new NotSupportedException(); } -} \ No newline at end of file +} diff --git a/Robust.Launcher.Api/Utility/HappyEyeballsHttp.cs b/Robust.Launcher.Api/Utility/HappyEyeballsHttp.cs index c942217..202b912 100644 --- a/Robust.Launcher.Api/Utility/HappyEyeballsHttp.cs +++ b/Robust.Launcher.Api/Utility/HappyEyeballsHttp.cs @@ -238,7 +238,7 @@ private static IPAddress[] SortInterleaved(IPAddress[] addresses) else { // Faulted. Remove it. - tasks.Remove(completedTask); + _ = tasks.Remove(completedTask); } } diff --git a/Robust.Launcher.Api/Utility/Helpers.cs b/Robust.Launcher.Api/Utility/Helpers.cs index 21d9146..9370412 100644 --- a/Robust.Launcher.Api/Utility/Helpers.cs +++ b/Robust.Launcher.Api/Utility/Helpers.cs @@ -1,6 +1,5 @@ using System; using System.Buffers; -using System.Diagnostics; using System.IO; using System.IO.Compression; using System.Net.Http; @@ -67,7 +66,7 @@ public static unsafe void MarkDirectoryCompress(string path) var lpBytesReturned = 0u; var lpInBuffer = (short)Win.COMPRESSION_FORMAT_DEFAULT; - Win.DeviceIoControl( + _ = Win.DeviceIoControl( handle, FSCTL.FSCTL_SET_COMPRESSION, &lpInBuffer, @@ -77,14 +76,14 @@ public static unsafe void MarkDirectoryCompress(string path) &lpBytesReturned, null); - Win.CloseHandle(handle); + _ = Win.CloseHandle(handle); } } public static void EnsureDirectoryExists(string dir) { if (!Directory.Exists(dir)) - Directory.CreateDirectory(dir); + _ = Directory.CreateDirectory(dir); } public static async Task DownloadToStream(this HttpClient client, string uri, Stream stream, @@ -92,7 +91,7 @@ public static async Task DownloadToStream(this HttpClient client, string uri, St await Task.Run(async () => { using var response = await client.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead, cancel); - response.EnsureSuccessStatusCode(); + _ = response.EnsureSuccessStatusCode(); await using var contentStream = await response.Content.ReadAsStreamAsync(cancel); // await using var fileStream = new FileStream(filePath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.ReadWrite, 4096, useAsync: true); diff --git a/Robust.Launcher.Api/Utility/HttpSelfTest.cs b/Robust.Launcher.Api/Utility/HttpSelfTest.cs index b25b0ac..f9c54c9 100644 --- a/Robust.Launcher.Api/Utility/HttpSelfTest.cs +++ b/Robust.Launcher.Api/Utility/HttpSelfTest.cs @@ -230,13 +230,11 @@ private void Log(Direction direction, ReadOnlySpan data) var subData = data.Slice(chunkOffset, remainingSize); foreach (var b in subData) - { - sb.Append($"{b:X2} "); - } + _ = sb.Append($"{b:X2} "); _log($"{chunkOffset:X16} {sb}"); - sb.Clear(); + _ = sb.Clear(); } } diff --git a/Robust.Launcher.Api/Utility/HttpUtility.cs b/Robust.Launcher.Api/Utility/HttpUtility.cs index 62cb9bc..2afeaac 100644 --- a/Robust.Launcher.Api/Utility/HttpUtility.cs +++ b/Robust.Launcher.Api/Utility/HttpUtility.cs @@ -1,10 +1,8 @@ using System; using System.Diagnostics; using System.IO; -using System.Linq; using System.Net; using System.Net.Http; -using System.Net.Http.Headers; using System.Threading; using System.Threading.Tasks; @@ -116,4 +114,4 @@ protected override void Dispose(bool disposing) base.Dispose(disposing); } } -} \ No newline at end of file +} diff --git a/Robust.Launcher.Api/Utility/UrlFallbackSet.cs b/Robust.Launcher.Api/Utility/UrlFallbackSet.cs index 99d469e..9241e49 100644 --- a/Robust.Launcher.Api/Utility/UrlFallbackSet.cs +++ b/Robust.Launcher.Api/Utility/UrlFallbackSet.cs @@ -56,7 +56,7 @@ public UrlFallbackSet(string url, UrlFallbackSetStats? stats = null) public async Task GetFromJsonAsync(HttpClient client, CancellationToken cancel = default) where T : notnull { var msg = await GetAsync(client, cancel).ConfigureAwait(false); - msg.EnsureSuccessStatusCode(); + _ = msg.EnsureSuccessStatusCode(); return await msg.Content.ReadFromJsonAsync(cancel).ConfigureAwait(false); } @@ -64,7 +64,7 @@ public UrlFallbackSet(string url, UrlFallbackSetStats? stats = null) public async Task GetByteArrayAsync(HttpClient client, CancellationToken cancel = default) { var msg = await GetAsync(client, cancel).ConfigureAwait(false); - msg.EnsureSuccessStatusCode(); + _ = msg.EnsureSuccessStatusCode(); return await msg.Content.ReadAsByteArrayAsync(cancel).ConfigureAwait(false); } @@ -72,7 +72,7 @@ public async Task GetByteArrayAsync(HttpClient client, CancellationToken public async Task GetStringAsync(HttpClient client, CancellationToken cancel = default) { var msg = await GetAsync(client, cancel).ConfigureAwait(false); - msg.EnsureSuccessStatusCode(); + _ = msg.EnsureSuccessStatusCode(); return await msg.Content.ReadAsStringAsync(cancel).ConfigureAwait(false); } diff --git a/Robust.Loader/ContentDbFileApi.cs b/Robust.Loader/ContentDbFileApi.cs index 762c4cb..da3d231 100644 --- a/Robust.Loader/ContentDbFileApi.cs +++ b/Robust.Loader/ContentDbFileApi.cs @@ -41,7 +41,7 @@ public unsafe ContentDbFileApi(string contentDbPath, long version) // Make sure to have a read transaction on every database connection // so that the launcher can't delete anything from underneath us if the user does anything. - sqlite3_exec(db, "BEGIN"); + _ = sqlite3_exec(db, "BEGIN"); CheckThrowSqliteErr(db, err); @@ -61,7 +61,7 @@ public unsafe ContentDbFileApi(string contentDbPath, long version) null); CheckThrowSqliteErr(db, err); - sqlite3_exec(db, "BEGIN"); + _ = sqlite3_exec(db, "BEGIN"); _dbConnections.Add(new ConPoolEntry(db, ZSTD_createDCtx(), InitBlob())); } @@ -86,11 +86,11 @@ INSERT OR REPLACE INTO """, out var stmt); CheckThrowSqliteErr(db, err); - sqlite3_bind_int(stmt, 1, Environment.ProcessId); - sqlite3_bind_text(stmt, 2, Process.GetCurrentProcess().MainModule?.FileName ?? ""); - sqlite3_bind_int64(stmt, 3, contentVersion); + _ = sqlite3_bind_int(stmt, 1, Environment.ProcessId); + _ = sqlite3_bind_text(stmt, 2, Process.GetCurrentProcess().MainModule?.FileName ?? ""); + _ = sqlite3_bind_int64(stmt, 3, contentVersion); - sqlite3_step(stmt); + _ = sqlite3_step(stmt); stmt.Dispose(); } @@ -98,7 +98,7 @@ INSERT OR REPLACE INTO private static void ClearRunningClient(sqlite3 db) { // Ensure we are not in a transaction anymore. - sqlite3_exec(db, "ROLLBACK"); + _ = sqlite3_exec(db, "ROLLBACK"); var err = sqlite3_prepare_v2( db, @@ -108,9 +108,9 @@ DELETE FROM RunningClient """, out var stmt); CheckThrowSqliteErr(db, err); - sqlite3_bind_int(stmt, 1, Environment.ProcessId); + _ = sqlite3_bind_int(stmt, 1, Environment.ProcessId); - sqlite3_step(stmt); + _ = sqlite3_step(stmt); stmt.Dispose(); } @@ -128,7 +128,7 @@ private void LoadManifest(long version, sqlite3 db, out long initBlob) out var stmt); CheckThrowSqliteErr(db, err); - sqlite3_bind_int64(stmt, 1, version); + _ = sqlite3_bind_int64(stmt, 1, version); while ((err = sqlite3_step(stmt)) == SQLITE_ROW) { @@ -257,7 +257,7 @@ public bool TryOpen(string path, [NotNullWhen(true)] out Stream? stream) if (entry != null) _dbConnections.Add(entry); - _dbConnectionsSemaphore.Release(); + _ = _dbConnectionsSemaphore.Release(); } } @@ -302,7 +302,7 @@ private static unsafe void ReadBlobZStd(Span into, sqlite3_blob blob, sqli } finally { - ZSTD_DCtx_reset(context, ZSTD_ResetDirective.ZSTD_reset_session_only); + _ = ZSTD_DCtx_reset(context, ZSTD_ResetDirective.ZSTD_reset_session_only); ArrayPool.Shared.Return(buffer); } } @@ -323,4 +323,4 @@ public ConPoolEntry(sqlite3 connection, ZSTD_DCtx* decompressionContext, sqlite3 } public IEnumerable AllFiles => _files.Keys; -} \ No newline at end of file +} diff --git a/Robust.Loader/Program.cs b/Robust.Loader/Program.cs index 36a61c7..4ab5ce8 100644 --- a/Robust.Loader/Program.cs +++ b/Robust.Loader/Program.cs @@ -145,7 +145,7 @@ private bool TryOpenAssemblyStream(string name, [NotNullWhen(true)] out Stream? if (!_fileApi.TryOpen($"{name}.dll", out asm)) return false; - _fileApi.TryOpen($"{name}.pdb", out pdb); + _ = _fileApi.TryOpen($"{name}.pdb", out pdb); return true; } diff --git a/Robust.Loader/RedialApi.cs b/Robust.Loader/RedialApi.cs index b2d155a..16d7376 100644 --- a/Robust.Loader/RedialApi.cs +++ b/Robust.Loader/RedialApi.cs @@ -61,6 +61,6 @@ public void Redial(Uri uri, string text = "") startInfo.EnvironmentVariables.Remove(envVar); } - Process.Start(startInfo); + _ = Process.Start(startInfo); } } diff --git a/Robust.Loader/Robust.Loader.csproj b/Robust.Loader/Robust.Loader.csproj index d2042cb..e86ea72 100644 --- a/Robust.Loader/Robust.Loader.csproj +++ b/Robust.Loader/Robust.Loader.csproj @@ -4,6 +4,7 @@ WinExe enable true + true @@ -20,7 +21,7 @@ - + diff --git a/Starlight.Launcher.Analyzer/InjectInitStyleAnalyzer.cs b/Starlight.Launcher.Analyzer/InjectInitStyleAnalyzer.cs index b3c858c..705ea60 100644 --- a/Starlight.Launcher.Analyzer/InjectInitStyleAnalyzer.cs +++ b/Starlight.Launcher.Analyzer/InjectInitStyleAnalyzer.cs @@ -20,7 +20,7 @@ public sealed class InjectStyleAnalyzer : DiagnosticAnalyzer DiagnosticId, title: "[Inject] property style", #pragma warning disable RS1032 - messageFormat: "The [Inject] property '{0}' must be 'private ... = default!;'", + messageFormat: "The [Inject] property '{0}' must be private or protected and should have 'default!' as value!", #pragma warning restore RS1032 category: "Style", defaultSeverity: DiagnosticSeverity.Warning, diff --git a/Starlight.Launcher.Analyzer/InjectStyle.cs b/Starlight.Launcher.Analyzer/InjectStyle.cs index f5b765a..fc95c11 100644 --- a/Starlight.Launcher.Analyzer/InjectStyle.cs +++ b/Starlight.Launcher.Analyzer/InjectStyle.cs @@ -10,18 +10,16 @@ internal static class InjectStyle { public static bool IsCanonical(PropertyDeclarationSyntax p) { - var onlyPrivate = - p.Modifiers.Any(SyntaxKind.PrivateKeyword) && - !p.Modifiers.Any(SyntaxKind.PublicKeyword) && - !p.Modifiers.Any(SyntaxKind.ProtectedKeyword) && - !p.Modifiers.Any(SyntaxKind.InternalKeyword); + var onlyPrivateOrInternal = + (p.Modifiers.Any(SyntaxKind.PrivateKeyword) || p.Modifiers.Any(SyntaxKind.ProtectedKeyword)) + && !p.Modifiers.Any(SyntaxKind.PublicKeyword) && !p.Modifiers.Any(SyntaxKind.InternalKeyword); var defaultBang = p.Initializer?.Value is PostfixUnaryExpressionSyntax s && s.IsKind(SyntaxKind.SuppressNullableWarningExpression) && s.Operand.IsKind(SyntaxKind.DefaultLiteralExpression); - return onlyPrivate && defaultBang; + return onlyPrivateOrInternal && defaultBang; } public static PropertyDeclarationSyntax Canonicalize(PropertyDeclarationSyntax p) diff --git a/Starlight.Launcher.WebUI/Bridge/IBridge.Commands.cs b/Starlight.Launcher.WebUI/Bridge/IBridge.Commands.cs new file mode 100644 index 0000000..593a814 --- /dev/null +++ b/Starlight.Launcher.WebUI/Bridge/IBridge.Commands.cs @@ -0,0 +1,6 @@ +namespace Starlight.Launcher.WebUI.Bridge; + +public partial interface IBridge +{ + event Func? ConnectRequested; +} diff --git a/Starlight.Launcher.WebUI/Bridge/IBridge.Connector.cs b/Starlight.Launcher.WebUI/Bridge/IBridge.Connector.cs new file mode 100644 index 0000000..4467f0b --- /dev/null +++ b/Starlight.Launcher.WebUI/Bridge/IBridge.Connector.cs @@ -0,0 +1,28 @@ +using System.ComponentModel; +using Robust.Launcher.Api.Models; +using Starlight.Launcher.WebUI.Models.Connector; +using Starlight.Launcher.WebUI.Models.Helpers; + +namespace Starlight.Launcher.WebUI.Bridge; + +/// +/// Bridged parts from Connector.cs +/// +public partial interface IBridge +{ + ConnectionStatus GetConnectionStatus(); + + ServerPrivacyPolicyInfo? GetPrivacyPolicyInfo(); + + bool GetPrivacyPolicyDifferentVersion(); + + bool IsClientExitedBadly(); + + void LaunchContentBundle(IFileResult file, CancellationToken cancel = default); + + void Connect(string address, CancellationToken cancel = default); + + void ConfirmPrivacyPolicy(PrivacyPolicyAcceptResult result); + + event PropertyChangedEventHandler? ConnectionPropertyChanged; +} diff --git a/Starlight.Launcher.WebUI/Bridge/IBridge.DiscordAuthService.cs b/Starlight.Launcher.WebUI/Bridge/IBridge.DiscordAuthService.cs new file mode 100644 index 0000000..7ed4a88 --- /dev/null +++ b/Starlight.Launcher.WebUI/Bridge/IBridge.DiscordAuthService.cs @@ -0,0 +1,10 @@ +using Starlight.Launcher.WebUI.Models.Auth; + +namespace Starlight.Launcher.WebUI.Bridge; + +public partial interface IBridge +{ + Task LoginAsync(CancellationToken cancel = default); + + Task AttachToAccountAsync(LoggedInAccount account, CancellationToken cancel = default); +} diff --git a/Starlight.Launcher.WebUI/Bridge/IBridge.DiscordRichPresence.cs b/Starlight.Launcher.WebUI/Bridge/IBridge.DiscordRichPresence.cs new file mode 100644 index 0000000..9a10ab0 --- /dev/null +++ b/Starlight.Launcher.WebUI/Bridge/IBridge.DiscordRichPresence.cs @@ -0,0 +1,8 @@ +using Starlight.Launcher.WebUI.Models.DiscordRichPresence; + +namespace Starlight.Launcher.WebUI.Bridge; + +public partial interface IBridge +{ + void UpdatePresence(PresenceState state, string? serverName = null); +} diff --git a/Starlight.Launcher.WebUI/Bridge/IBridge.HubServerFetcher.cs b/Starlight.Launcher.WebUI/Bridge/IBridge.HubServerFetcher.cs new file mode 100644 index 0000000..f40e8b6 --- /dev/null +++ b/Starlight.Launcher.WebUI/Bridge/IBridge.HubServerFetcher.cs @@ -0,0 +1,18 @@ +using Robust.Launcher.Api.Models.ServerStatus; +using Starlight.Launcher.WebUI.Models.HubServerFetcher; + +namespace Starlight.Launcher.WebUI.Bridge; + +public partial interface IBridge +{ + event Action? ServersChanged; + event Action? StatusChanged; + + RefreshListStatus GetFetchStatus(); + + void UpdateInfoFor(ServerStatusData statusData); + + void RequestRefresh(); + + IReadOnlyList GetAllServers(); +} diff --git a/Starlight.Launcher.WebUI/Bridge/IBridge.LauncherUpdater.cs b/Starlight.Launcher.WebUI/Bridge/IBridge.LauncherUpdater.cs new file mode 100644 index 0000000..e99fb3f --- /dev/null +++ b/Starlight.Launcher.WebUI/Bridge/IBridge.LauncherUpdater.cs @@ -0,0 +1,27 @@ +using Starlight.Launcher.WebUI.Models.LauncherUpdater; + +namespace Starlight.Launcher.WebUI.Bridge; + +/// +/// Bridged parts from LauncherUpdater.cs +/// +public partial interface IBridge +{ + event Action<(long downloaded, long total)>? DownloadProgress; + + Task IsUpdateAvailable(); + + Task DownloadAsset(ReleaseAsset asset, CancellationToken ct = default); + + void RunInstallerAndExit(string downloadedPath); + + void CleanupOldInstallers(); + + bool ShouldShowChangelog(); + + Task> GetChangelogsToShow(); + + void MarkChangelogSeen(); + + string GetVersion(); +} diff --git a/Starlight.Launcher.WebUI/Bridge/IBridge.LoginManager.cs b/Starlight.Launcher.WebUI/Bridge/IBridge.LoginManager.cs new file mode 100644 index 0000000..251d1a3 --- /dev/null +++ b/Starlight.Launcher.WebUI/Bridge/IBridge.LoginManager.cs @@ -0,0 +1,26 @@ +using System.Collections.ObjectModel; +using Robust.Launcher.Api.Models.Data; +using Starlight.Launcher.WebUI.Models.Auth; + +namespace Starlight.Launcher.WebUI.Bridge; + +public partial interface IBridge +{ + event Action? LoginEntriesChanged; + + Guid? GetActiveAccountId(); + + void SetActiveAccountId(Guid? activeAccountId); + + LoggedInAccount? GetActiveAccount(); + + ReadOnlyObservableCollection GetLoginEntries(); + + Task UpdateSingleAccountStatus(LoggedInAccount account); + + void RemoveLogin(Guid userId); + + void LinkAuthToken(Guid oldUserID, Guid newUserId, LoginInfo authLogin); + + void AddFreshLogin(LoginInfo info); +} diff --git a/Starlight.Launcher.WebUI/Bridge/IBridge.ServerInfoLoader.cs b/Starlight.Launcher.WebUI/Bridge/IBridge.ServerInfoLoader.cs new file mode 100644 index 0000000..0f523fa --- /dev/null +++ b/Starlight.Launcher.WebUI/Bridge/IBridge.ServerInfoLoader.cs @@ -0,0 +1,8 @@ +using Robust.Launcher.Api.Models.ServerStatus; + +namespace Starlight.Launcher.WebUI.Bridge; + +public partial interface IBridge +{ + void Request(ServerStatusData? data); +} diff --git a/Starlight.Launcher.WebUI/Bridge/IBridge.Settings.cs b/Starlight.Launcher.WebUI/Bridge/IBridge.Settings.cs new file mode 100644 index 0000000..5f830f4 --- /dev/null +++ b/Starlight.Launcher.WebUI/Bridge/IBridge.Settings.cs @@ -0,0 +1,37 @@ +using Robust.Launcher.Api.Models.Data; +using Starlight.Launcher.WebUI.Models.Data; +using Starlight.Launcher.WebUI.Models.ServerStatus; +using Starlight.Launcher.WebUI.Models.Settings; + +namespace Starlight.Launcher.WebUI.Bridge; + +public partial interface IBridge +{ + event Action? FavoritesChanged; + + event Action? LoginsUnrecoverable; + + IReadOnlySet GetFavoriteAddressesSnapshot(); + + AppSettings GetSettings(); + + Task GetSettingsAsync(); + + List GetFavorites(); + + Task> GetFavoritesAsync(); + + Dictionary GetLogins(); + + Task> GetLoginsAsync(); + + void WriteSettings(AppSettings settings); + + Task WriteSettingsAsync(AppSettings settings); + + Task WriteFavoritesAsync(List favorites); + + void WriteLogins(Dictionary logins); + + Task CacheFilters(ServerListFilters filters); +} diff --git a/Starlight.Launcher.WebUI/Bridge/IBridge.Tray.cs b/Starlight.Launcher.WebUI/Bridge/IBridge.Tray.cs new file mode 100644 index 0000000..2f6b9fe --- /dev/null +++ b/Starlight.Launcher.WebUI/Bridge/IBridge.Tray.cs @@ -0,0 +1,6 @@ +namespace Starlight.Launcher.WebUI.Bridge; + +public partial interface IBridge +{ + void HideWindow(); +} diff --git a/Starlight.Launcher.WebUI/Bridge/IBridge.Updater.cs b/Starlight.Launcher.WebUI/Bridge/IBridge.Updater.cs new file mode 100644 index 0000000..ebf9e85 --- /dev/null +++ b/Starlight.Launcher.WebUI/Bridge/IBridge.Updater.cs @@ -0,0 +1,14 @@ +using Starlight.Launcher.WebUI.Models.Updater; + +namespace Starlight.Launcher.WebUI.Bridge; + +/// +/// Bridged parts from Updater.cs +/// +public partial interface IBridge +{ + /// Returns value from Updater.Progress/> + (long downloaded, long total, ProgressUnit unit)? GetUpdateProgress(); + + UpdateStatus GetUpdateStatus(); +} diff --git a/Starlight.Launcher.WebUI/Bridge/IBridge.cs b/Starlight.Launcher.WebUI/Bridge/IBridge.cs new file mode 100644 index 0000000..4ecd8ec --- /dev/null +++ b/Starlight.Launcher.WebUI/Bridge/IBridge.cs @@ -0,0 +1,12 @@ +using Starlight.Launcher.WebUI.Models.Helpers; + +namespace Starlight.Launcher.WebUI.Bridge; + +public partial interface IBridge +{ + void OpenBrowser(string url); + + Task PickFileAsync( + string filter = "Content bundles / replays\0*.zip;*.rt\0All Files\0*.*\0\0", + CancellationToken cancel = default); +} diff --git a/Starlight.Launcher.WebUI/Components/App.razor b/Starlight.Launcher.WebUI/Components/App.razor new file mode 100644 index 0000000..586c5e5 --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/App.razor @@ -0,0 +1,49 @@ + + + + + + + Starlight.Launcher + + + + + + + + + + + + + + + + +
+ +
+
+
Starlight
+ +
Loading…
+
+
+ +
+ An unhandled error has occurred. + Reload + 🗙 +
+ + + + + + + + diff --git a/Starlight.Launcher.WebUI/Components/Atoms/Auth/AccountListView.razor b/Starlight.Launcher.WebUI/Components/Atoms/Auth/AccountListView.razor new file mode 100644 index 0000000..d919d0e --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Atoms/Auth/AccountListView.razor @@ -0,0 +1,136 @@ +@using Robust.Launcher.Api.Models +@using Starlight.Launcher.WebUI.Models.Auth; +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedComponentBase + + @L["auth-menu-accounts-mode"] + +@if (_bridge.GetLoginEntries().Count == 0) +{ + + + @L["auth-menu-no-accounts"] + + @L["auth-menu-no-accounts-hint"] + + +} +else +{ + + @foreach (var account in _bridge.GetLoginEntries()) + { + var acc = account; + var isActive = _bridge.GetActiveAccountId() == acc.UserId; + + + + + + + + + + @acc.LoginInfo.Username + + @if (isActive) + { + + @L["auth-menu-active-chip"] + + } + @if (acc.LoginInfo.Token != null) + { + + + + } + else + { + + + + } + @if (acc.LoginInfo.DiscordToken != null) + { + + + + } + + + + + + @StatusLabel(acc.Status) + + + + + @if (acc.Status == AccountLoginStatus.Expired) + { + + @L["auth-menu-login-again-button"] + + } + else + { + + @L["auth-menu-select-button"] + + } + + + @if (acc.Status != AccountLoginStatus.Expired + && acc.LoginInfo.Token != null + && acc.LoginInfo.DiscordToken == null) + { + + @L["auth-menu-link-discord-button"] + + } + @if (acc.Status != AccountLoginStatus.Expired && acc.LoginInfo.Token == null && acc.LoginInfo.DiscordToken != null) + { + + @L["auth-menu-link-account-button"] + + } + + @L["auth-menu-delete-account-button"] + + + + + + } + +} + + + @L["auth-menu-add-account-button"] + diff --git a/Starlight.Launcher.WebUI/Components/Atoms/Auth/AccountListView.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/Auth/AccountListView.razor.cs new file mode 100644 index 0000000..c6d6af5 --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Atoms/Auth/AccountListView.razor.cs @@ -0,0 +1,74 @@ +using Microsoft.AspNetCore.Components; +using MudBlazor; +using Robust.Launcher.Api.Api; +using Robust.Launcher.Api.Models; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Localization; +using Starlight.Launcher.WebUI.Models.Auth; + +namespace Starlight.Launcher.WebUI.Components.Atoms.Auth; + +public partial class AccountListView : LocalizedComponentBase +{ + [Parameter, EditorRequired] public Action? OnAccountRelogin { get; set; } + [Parameter, EditorRequired] public Action? OnDiscordLink { get; set; } + [Parameter, EditorRequired] public Action? OnLink { get; set; } + [Parameter, EditorRequired] public Action? OnSignIn { get; set; } + [Inject] private IBridge _bridge { get; set; } = default!; + [Inject] private ISnackbar _snackbar { get; set; } = default!; + + private bool Busy; + + private static string StatusCssVar(AccountLoginStatus s) => s switch + { + AccountLoginStatus.Available => "success", + AccountLoginStatus.Expired => "warning", + AccountLoginStatus.Unsure => "info", + _ => "surface" + }; + + private string StatusLabel(AccountLoginStatus s) => s switch + { + AccountLoginStatus.Available => L["auth-menu-online-status"], + AccountLoginStatus.Expired => L["auth-menu-expired-status"], + AccountLoginStatus.Unsure => L["auth-menu-unsure-status"], + _ => s.ToString() + }; + + private void RemoveAccount(LoggedInAccount account) + { + _bridge.RemoveLogin(account.UserId); + _ = _snackbar.Add(L.GetString("auth-menu-account-deleted", ("account", account.LoginInfo.Username)), Severity.Info); + } + + private async Task SelectAccount(LoggedInAccount account) + { + Busy = true; + await InvokeAsync(StateHasChanged); + try + { + try + { + await _bridge.UpdateSingleAccountStatus(account); + } + catch (AuthApiException ex) + { + _ = _snackbar.Add(L.GetString("auth-menu-token-verify-warning", ("ex", ex.Message)), Severity.Warning); + } + + if (account.Status == AccountLoginStatus.Expired) + { + _ = _snackbar.Add(L["auth-menu-session-expired-warning"], Severity.Warning); + OnAccountRelogin?.Invoke(account); + return; + } + + _bridge.SetActiveAccountId(account.UserId); + } + finally + { + Busy = false; + await InvokeAsync(StateHasChanged); + } + } +} diff --git a/Starlight.Launcher.WebUI/Components/Atoms/Auth/AccountListView.razor.css b/Starlight.Launcher.WebUI/Components/Atoms/Auth/AccountListView.razor.css new file mode 100644 index 0000000..e067b2d --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Atoms/Auth/AccountListView.razor.css @@ -0,0 +1,89 @@ +.empty-state { + position: relative; + text-align: center; +} + + .empty-state::before { + content: ""; + position: absolute; + top: -8px; + left: 50%; + transform: translateX(-50%); + width: 140px; + height: 140px; + border-radius: 50%; + background: radial-gradient(circle, color-mix(in srgb, var(--starlight-accent-1) 28%, transparent), color-mix(in srgb, var(--starlight-accent-2) 12%, transparent) 55%, transparent 75%); + filter: blur(4px); + z-index: 0; + } + +.empty-icon { + position: relative; + z-index: 1; + font-size: 4rem !important; + opacity: .65; + filter: drop-shadow(0 0 14px color-mix(in srgb, var(--starlight-accent-1) 35%, transparent)); +} + +.account-row { + position: relative; + padding: 14px !important; + margin-bottom: 10px !important; + border-radius: 16px; + border: 1px solid var(--mud-palette-lines-inputs, rgba(255,255,255,.07)); + background: linear-gradient(180deg, color-mix(in srgb, var(--mud-palette-text-primary) 4.5%, transparent), color-mix(in srgb, var(--mud-palette-text-primary) 1.5%, transparent)); + overflow: hidden; + transition: background .18s ease, border-color .18s ease, transform .18s ease, box-shadow .18s ease; +} + + .account-row:hover { + background: linear-gradient(180deg, color-mix(in srgb, var(--mud-palette-text-primary) 7.5%, transparent), color-mix(in srgb, var(--mud-palette-text-primary) 2.5%, transparent)); + border-color: color-mix(in srgb, var(--starlight-accent-1) 35%, transparent); + transform: translateY(-2px); + box-shadow: 0 10px 26px -12px color-mix(in srgb, var(--starlight-accent-1) 35%, transparent), 0 0 0 1px color-mix(in srgb, var(--mud-palette-text-primary) 5%, transparent) inset; + } + + .account-row:last-child { + margin-bottom: 0 !important; + } + +.account-row-active { + border-color: color-mix(in srgb, var(--starlight-accent-1) 50%, transparent); + background: linear-gradient(180deg, color-mix(in srgb, var(--starlight-accent-1) 10%, transparent), color-mix(in srgb, var(--starlight-accent-2) 4%, transparent)); +} + + .account-row-active::before { + content: ""; + position: absolute; + left: 0; + top: 8px; + bottom: 8px; + width: 3px; + border-radius: 3px; + background: linear-gradient(180deg, var(--starlight-accent-1), var(--starlight-accent-2)); + box-shadow: 0 0 10px 1px color-mix(in srgb, var(--starlight-accent-1) 60%, transparent); + } + +.status-dot { + width: 9px; + height: 9px; + border-radius: 50%; + display: inline-block; + flex: 0 0 auto; + transition: box-shadow .2s ease; +} + +.account-avatar { + background: linear-gradient(135deg, var(--starlight-accent-1), var(--starlight-accent-2)) !important; + box-shadow: 0 0 0 2px color-mix(in srgb, var(--mud-palette-text-primary) 8%, transparent), 0 4px 14px -4px color-mix(in srgb, var(--starlight-accent-1) 55%, transparent); + font-weight: 600; +} + +.row-menu-btn { + border-radius: 10px; + transition: background .15s ease; +} + + .row-menu-btn:hover { + background: color-mix(in srgb, var(--mud-palette-text-primary) 7%, transparent); + } diff --git a/Starlight.Launcher.WebUI/Components/Atoms/Auth/ForgotPasswordView.razor b/Starlight.Launcher.WebUI/Components/Atoms/Auth/ForgotPasswordView.razor new file mode 100644 index 0000000..42489ca --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Atoms/Auth/ForgotPasswordView.razor @@ -0,0 +1,57 @@ +@using Starlight.Launcher.WebUI.Components.Pages +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedComponentBase + + + + @L["auth-menu-forgotpassword"] + + +@if (Success) +{ + + @L["auth-menu-forgotpassword-alert"] + + + @L["auth-menu-signin"] + + return; +} + +@L["auth-menu-enter-email-label"] + + + +@if (!string.IsNullOrEmpty(Error)) +{ + @Error +} + + + @if (Busy) + { + + @L["auth-menu-forgotpassword-status-busy"] + } + else + { + @L["auth-menu-forgotpassword-status-wait"] + } + diff --git a/Starlight.Launcher.WebUI/Components/Atoms/Auth/ForgotPasswordView.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/Auth/ForgotPasswordView.razor.cs new file mode 100644 index 0000000..70e688a --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Atoms/Auth/ForgotPasswordView.razor.cs @@ -0,0 +1,54 @@ +using Microsoft.AspNetCore.Components; +using Robust.Launcher.Api.Api; +using Robust.Launcher.Api.Utility; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Components.Pages; +using Starlight.Launcher.WebUI.Localization; + +namespace Starlight.Launcher.WebUI.Components.Atoms.Auth; + +public partial class ForgotPasswordView : LocalizedComponentBase +{ + [Parameter, EditorRequired] public Action? OnModeSwitch { get; set; } + + [Inject] private AuthApi _authApi { get; set; } = default!; + [Inject] private IBridge _bridge { get; set; } = default!; + + private bool Busy; + private string Email = ""; + private string? Error; + private bool Success; + + private async Task DoForgotPassword() + { + Error = null; + + if ((await _bridge.GetSettingsAsync()).SelectedAuthServer is not { } authServer) + { + Error = L["auth-menu-no-server-error"]; + return; + } + + if (string.IsNullOrWhiteSpace(Email) || !Email.Contains('@')) + { + Error = L["auth-menu-forgot-notvalid-email-error"]; + return; + } + + Busy = true; + await InvokeAsync(StateHasChanged); + try + { + var errors = await _authApi.ForgotPasswordAsync(Email, new UrlFallbackSet(authServer)); + if (errors == null) + Success = true; + else + Error = string.Join("\n", errors); + } + finally + { + Busy = false; + await InvokeAsync(StateHasChanged); + } + } +} diff --git a/Starlight.Launcher.WebUI/Components/Atoms/Auth/ForgotPasswordView.razor.css b/Starlight.Launcher.WebUI/Components/Atoms/Auth/ForgotPasswordView.razor.css new file mode 100644 index 0000000..db2f91b --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Atoms/Auth/ForgotPasswordView.razor.css @@ -0,0 +1,15 @@ +.success-alert { + animation: success-pop .3s ease; +} + +@keyframes success-pop { + from { + opacity: 0; + transform: translateY(6px) scale(.98); + } + + to { + opacity: 1; + transform: none; + } +} diff --git a/Starlight.Launcher.WebUI/Components/Atoms/Auth/LinkAccountView.razor b/Starlight.Launcher.WebUI/Components/Atoms/Auth/LinkAccountView.razor new file mode 100644 index 0000000..1941282 --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Atoms/Auth/LinkAccountView.razor @@ -0,0 +1,50 @@ +@using Starlight.Launcher.WebUI.Components.Pages +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedComponentBase + + + + @L["auth-menu-link-account-title"] + + + + @L["auth-menu-link-account-hint"] + + + + + + +@if (TfaRequired) +{ + +} + +@if (!string.IsNullOrEmpty(Error)) +{ + @Error +} + + + @if (Busy) + { + + @L["auth-menu-link-account-busy"] + } + else + { + @L["auth-menu-link-account-confirm"] + } + diff --git a/Starlight.Launcher.WebUI/Components/Atoms/Auth/LinkAccountView.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/Auth/LinkAccountView.razor.cs new file mode 100644 index 0000000..b35c0e8 --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Atoms/Auth/LinkAccountView.razor.cs @@ -0,0 +1,98 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Web; +using MudBlazor; +using Robust.Launcher.Api.Api; +using Robust.Launcher.Api.Utility; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Components.Pages; +using Starlight.Launcher.WebUI.Localization; + +namespace Starlight.Launcher.WebUI.Components.Atoms.Auth; + +public partial class LinkAccountView : LocalizedComponentBase +{ + [Parameter, EditorRequired] public Action? OnModeSwitch { get; set; } + [Parameter, EditorRequired] public string Username { get; set; } + [Parameter, EditorRequired] public Guid? UserId { get; set; } + + [Inject] private IBridge _bridge { get; set; } = default!; + [Inject] private AuthApi _authApi { get; set; } = default!; + [Inject] private ISnackbar _snackbar { get; set; } = default!; + + private bool Busy; + private string Password = ""; + private string TfaCode = ""; + private bool TfaRequired; + + private string? Error; + + private async Task OnLinkKey(KeyboardEventArgs e) + { + if (e.Key == "Enter" && !Busy) + await DoLinkAccount(); + } + + private async Task DoLinkAccount() + { + Error = null; + + if (string.IsNullOrWhiteSpace(Username) || string.IsNullOrEmpty(Password)) + { + Error = L["auth-menu-enter-info-error"]; + return; + } + + if ((await _bridge.GetSettingsAsync()).SelectedAuthServer is not { } authServer) + { + Error = L["auth-menu-no-server-error"]; + return; + } + + Busy = true; + await InvokeAsync(StateHasChanged); + try + { + var request = new AuthApi.AuthenticateRequest( + Username, null, Password, + TfaRequired ? TfaCode : null); + + var result = await _authApi.AuthenticateAsync(request, new UrlFallbackSet(authServer)); + + if (result.IsSuccess && UserId != null) + { + _bridge.LinkAuthToken(UserId.Value, result.LoginInfo.UserId, result.LoginInfo); + + _ = _snackbar.Add(L.GetString("auth-menu-account-linked", ("account", result.LoginInfo.Username)), Severity.Success); + + OnModeSwitch?.Invoke(Mode.AccountList); + return; + } + + switch (result.Code) + { + case AuthApi.AuthenticateDenyResponseCode.InvalidCredentials: + Error = L["auth-menu-incorrect-info-error"]; + break; + case AuthApi.AuthenticateDenyResponseCode.TfaRequired: + TfaRequired = true; + Error = L["auth-menu-tfa-required-error"]; + break; + case AuthApi.AuthenticateDenyResponseCode.TfaInvalid: + TfaRequired = true; + Error = L["auth-menu-tfa-invalid-error"]; + break; + case AuthApi.AuthenticateDenyResponseCode.AccountLocked: + Error = L["auth-menu-account-blocked-error"]; + break; + default: + Error = string.Join("\n", result.Errors); + break; + } + } + finally + { + Busy = false; + await InvokeAsync(StateHasChanged); + } + } +} diff --git a/Starlight.Launcher.WebUI/Components/Atoms/Auth/SignInView.razor b/Starlight.Launcher.WebUI/Components/Atoms/Auth/SignInView.razor new file mode 100644 index 0000000..cfaa138 --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Atoms/Auth/SignInView.razor @@ -0,0 +1,105 @@ +@using Starlight.Launcher.WebUI.Components.Pages +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedComponentBase + + + @if (_bridge.GetLoginEntries().Count > 0) + { + + } + + + @(RelogUserId.HasValue ? L["auth-menu-signin-login-again"] : L["auth-menu-signin-login"]) + + + + + + + +@if (TfaRequired) +{ + +} + +@if (!string.IsNullOrEmpty(Error)) +{ + @Error +} + +@if (ShowResend) +{ + + @L["auth-menu-resend-confirmation"] + +} + + + @if (Busy) + { + + @L["auth-menu-signin-status-busy"] + } + else + { + @L["auth-menu-signin-status-wait"] + } + + + + + @L["auth-menu-signin-method-discord"] + + + + + @L["auth-menu-signin-forgot-password"] + + + @L["auth-menu-registration"] + + diff --git a/Starlight.Launcher.WebUI/Components/Atoms/Auth/SignInView.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/Auth/SignInView.razor.cs new file mode 100644 index 0000000..addbd3a --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Atoms/Auth/SignInView.razor.cs @@ -0,0 +1,183 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Web; +using MudBlazor; +using Robust.Launcher.Api.Api; +using Robust.Launcher.Api.Utility; +using Serilog; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Components.Pages; +using Starlight.Launcher.WebUI.Localization; +using Starlight.Launcher.WebUI.Models.DiscordAuthService; + +namespace Starlight.Launcher.WebUI.Components.Atoms.Auth; + +public partial class SignInView : LocalizedComponentBase +{ + [Parameter, EditorRequired] public Action? OnModeSwitch { get; set; } + [Parameter] public Guid? RelogUserId { get; set; } + [Parameter] public string Username { get; set; } = ""; + + [Inject] private AuthApi _authApi { get; set; } = default!; + [Inject] private ISnackbar _snackbar { get; set; } = default!; + + private bool Busy; + + private string Password = ""; + private string TfaCode = ""; + private bool TfaRequired; + private string? Error; + private bool ShowResend; + private bool Pwd; + [Inject] private IBridge _bridge { get; set; } = default!; + + private async Task OnSignInKey(KeyboardEventArgs e) + { + if (e.Key == "Enter" && !Busy) + await DoSignIn(); + } + + private async Task DoSignIn() + { + Error = null; + ShowResend = false; + + if (string.IsNullOrWhiteSpace(Username) || string.IsNullOrEmpty(Password)) + { + Error = L["auth-menu-enter-info-error"]; + return; + } + + if ((await _bridge.GetSettingsAsync()).SelectedAuthServer is not { } authServer) + { + Error = L["auth-menu-no-server-error"]; + return; + } + + Busy = true; + await InvokeAsync(StateHasChanged); + try + { + AuthApi.AuthenticateRequest request; + if (RelogUserId.HasValue) + { + request = new AuthApi.AuthenticateRequest( + null, RelogUserId.Value, Password, + TfaRequired ? TfaCode : null); + } + else + { + request = new AuthApi.AuthenticateRequest( + Username, null, Password, + TfaRequired ? TfaCode : null); + } + + var result = await _authApi.AuthenticateAsync(request, new UrlFallbackSet(authServer)); + + if (result.IsSuccess) + { + _bridge.AddFreshLogin(result.LoginInfo); + _bridge.SetActiveAccountId(result.LoginInfo.UserId); + _ = _snackbar.Add(L.GetString("auth-menu-welcome-message", ("username", result.LoginInfo.Username)), Severity.Success); + OnModeSwitch?.Invoke(Mode.AccountList); + return; + } + + switch (result.Code) + { + case AuthApi.AuthenticateDenyResponseCode.InvalidCredentials: + Error = L["auth-menu-incorrect-info-error"]; + break; + + case AuthApi.AuthenticateDenyResponseCode.AccountUnconfirmed: + Error = L["auth-menu-unconfirmed-info-error"]; + ShowResend = true; + break; + + case AuthApi.AuthenticateDenyResponseCode.TfaRequired: + TfaRequired = true; + Error = L["auth-menu-tfa-required-error"]; + break; + + case AuthApi.AuthenticateDenyResponseCode.TfaInvalid: + TfaRequired = true; + Error = L["auth-menu-tfa-invalid-error"]; + break; + + case AuthApi.AuthenticateDenyResponseCode.AccountLocked: + Error = L["auth-menu-account-blocked-error"]; + break; + + default: + Error = string.Join("\n", result.Errors); + break; + } + } + finally + { + Busy = false; + await InvokeAsync(StateHasChanged); + } + } + + private async Task LoginWithDiscord() + { + Busy = true; + Error = null; + await InvokeAsync(StateHasChanged); + try + { + _ = await _bridge.LoginAsync(); + OnModeSwitch?.Invoke(Mode.AccountList); + } + catch (OperationCanceledException) + { + Error = L["auth-menu-discord-login-error"]; + } + catch (DiscordAuthException ex) + { + Error = ex.Message; + } + catch (Exception ex) + { + Log.Warning(ex, "Discord login failed"); + Error = L["auth-menu-discord-connect-fail"]; + } + finally + { + Busy = false; + await InvokeAsync(StateHasChanged); + } + } + + private async Task ResendConfirmation() + { + if ((await _bridge.GetSettingsAsync()).SelectedAuthServer is not { } authServer) + { + _ = _snackbar.Add(L["auth-menu-no-server-error"], Severity.Error); + return; + } + + Busy = true; + await InvokeAsync(StateHasChanged); + try + { + if (Username.Contains('@')) + { + var errors = await _authApi.ResendConfirmationAsync(Username, new UrlFallbackSet(authServer)); + if (errors == null) + _ = _snackbar.Add(L.GetString("auth-menu-email-resent"), Severity.Success); + else + _ = _snackbar.Add(string.Join("\n", errors), Severity.Error); + } + else + { + _ = _snackbar.Add(L["auth-menu-email-resent-info"], Severity.Warning); + } + } + finally + { + Busy = false; + await InvokeAsync(StateHasChanged); + } + } +} diff --git a/Starlight.Launcher.WebUI/Components/Atoms/Auth/SignInView.razor.css b/Starlight.Launcher.WebUI/Components/Atoms/Auth/SignInView.razor.css new file mode 100644 index 0000000..6f42e82 --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Atoms/Auth/SignInView.razor.css @@ -0,0 +1,13 @@ +.discord-btn { + border-color: rgba(88,101,242,.35) !important; + color: #C7C9FB !important; + background: rgba(88,101,242,.06); + transition: background .18s ease, border-color .18s ease, box-shadow .18s ease, transform .15s ease; +} + + .discord-btn:hover:not(.mud-disabled) { + background: rgba(88,101,242,.16); + border-color: rgba(88,101,242,.65); + box-shadow: 0 8px 20px -10px rgba(88,101,242,.5); + transform: translateY(-1px); + } diff --git a/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ChangelogDialog.razor b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ChangelogDialog.razor new file mode 100644 index 0000000..f6ee4ec --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ChangelogDialog.razor @@ -0,0 +1,82 @@ +@using Starlight.Launcher.WebUI.Localization +@inherits LocalizedComponentBase + + + + + + @L["changelog-title"] + + + + @if (Entries.Count == 0) + { + @L["changelog-empty"] + } + else + { + + + @for (var i = 0; i < Entries.Count; i++) + { + var entry = Entries[i]; + var isLatest = i == 0; + + + + + + v@(entry.Version) + + @if (isLatest) + { + + @L["changelog-latest"] + + } + + + + @if (string.IsNullOrWhiteSpace(entry.Notes)) + { + @L["changelog-empty"] + } + else + { +
+ +
+ } + + + } + + + } + + + + @L["changelog-close"] + + + + + diff --git a/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ChangelogDialog.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ChangelogDialog.razor.cs new file mode 100644 index 0000000..5494e24 --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ChangelogDialog.razor.cs @@ -0,0 +1,14 @@ +using Microsoft.AspNetCore.Components; +using MudBlazor; +using Starlight.Launcher.WebUI.Models.LauncherUpdater; + +namespace Starlight.Launcher.WebUI.Components.Atoms.Dialogs; + +public partial class ChangelogDialog +{ + [CascadingParameter] private IMudDialogInstance _mudDialog { get; set; } = default!; + + [Parameter] public IReadOnlyList Entries { get; set; } = Array.Empty(); + + private void Close() => _mudDialog.Close(); +} diff --git a/Starlight.Launcher/Components/Atoms/Dialogs/ConnectingDialog.razor b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ConnectingDialog.razor similarity index 85% rename from Starlight.Launcher/Components/Atoms/Dialogs/ConnectingDialog.razor rename to Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ConnectingDialog.razor index a652b28..6d44e84 100644 --- a/Starlight.Launcher/Components/Atoms/Dialogs/ConnectingDialog.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ConnectingDialog.razor @@ -1,5 +1,7 @@ -@using Starlight.Launcher.Services -@using static Starlight.Launcher.Services.Connector +@using Starlight.Launcher.WebUI.Models.Connector +@using Starlight.Launcher.WebUI.Localization + +@inherits LocalizedComponentBase @@ -10,11 +12,11 @@
- @switch (_connector.Status) + @switch (_bridge.GetConnectionStatus()) { case ConnectionStatus.AwaitingPrivacyPolicyAcceptance: This server requires you to accept its privacy policy before connecting. - @if (_connector.PrivacyPolicyInfo is { } pp) + @if (_bridge.GetPrivacyPolicyInfo() is { } pp) {
@@ -31,7 +33,7 @@ } } - @if (_connector.PrivacyPolicyDifferentVersion) + @if (_bridge.GetPrivacyPolicyDifferentVersion()) { The policy has changed since you last accepted it. @@ -45,7 +47,7 @@ @_statusText break; - case ConnectionStatus.ClientExited when _connector.ClientExitedBadly: + case ConnectionStatus.ClientExited when _bridge.IsClientExitedBadly(): The game closed unexpectedly. break; @@ -76,7 +78,7 @@ }
- @if (_isByteProgress && _updater.Progress is { total: > 0 } p) + @if (_isByteProgress && _bridge.GetUpdateProgress() is { total: > 0 } p) {
@Format(p.downloaded) / @Format(p.total) @@ -94,7 +96,7 @@
- @if (_connector.Status == ConnectionStatus.AwaitingPrivacyPolicyAcceptance) + @if (_bridge.GetConnectionStatus() == ConnectionStatus.AwaitingPrivacyPolicyAcceptance) { Decline @_localization["general-close"] + @L["general-close"] } else { - @_localization["general-cancel"] + @L["general-cancel"] } diff --git a/Starlight.Launcher/Components/Atoms/Dialogs/ConnectingDialog.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ConnectingDialog.razor.cs similarity index 73% rename from Starlight.Launcher/Components/Atoms/Dialogs/ConnectingDialog.razor.cs rename to Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ConnectingDialog.razor.cs index c1d2a67..0e63981 100644 --- a/Starlight.Launcher/Components/Atoms/Dialogs/ConnectingDialog.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ConnectingDialog.razor.cs @@ -2,23 +2,22 @@ using System.Globalization; using Microsoft.AspNetCore.Components; using MudBlazor; -using Starlight.Launcher.Services; -using Starlight.Launcher.Services.Localization; -using static Starlight.Launcher.Services.Connector; -using static Starlight.Launcher.Services.Updater; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Localization; +using Starlight.Launcher.WebUI.Models.Connector; +using Starlight.Launcher.WebUI.Models.Helpers; +using Starlight.Launcher.WebUI.Models.Updater; -namespace Starlight.Launcher.Components.Atoms.Dialogs; +namespace Starlight.Launcher.WebUI.Components.Atoms.Dialogs; -public sealed partial class ConnectingDialog : ComponentBase, IDisposable +public sealed partial class ConnectingDialog : LocalizedComponentBase, IDisposable { - [Inject] private LocalizationManager _localization { get; set; } = default!; - [Inject] private Connector _connector { get; set; } = default!; - [Inject] private Updater _updater { get; set; } = default!; + [Inject] private IBridge _bridge { get; set; } = default!; [CascadingParameter] private IMudDialogInstance _mudDialog { get; set; } = default!; [Parameter] public string Address { get; set; } = ""; - [Parameter] public FileResult? ContentBundle { get; set; } + [Parameter] public IFileResult? ContentBundle { get; set; } [Parameter] public string? Title { get; set; } = null; @@ -32,25 +31,21 @@ public sealed partial class ConnectingDialog : ComponentBase, IDisposable private bool _haveSpeed; private UpdateStatus _lastUpdateStatus; - private string _title => ContentBundle is { } f - ? $"Launching {f.FileName}" - : $"Connecting to {Title ?? Address}"; - private string _titleIcon => ContentBundle is not null ? Icons.Material.Filled.Inventory2 : Icons.Material.Filled.Dns; private double _percent => - _updater.Progress is { total: > 0 } p ? (double)p.downloaded / p.total * 100.0 : 0; + _bridge.GetUpdateProgress() is { total: > 0 } p ? (double)p.downloaded / p.total * 100.0 : 0; private string _percentCss => _percent.ToString("0.##", CultureInfo.InvariantCulture); private bool _hasDeterminateProgress => - _connector.Status == ConnectionStatus.Updating && _updater.Progress is { total: > 0 }; + _bridge.GetConnectionStatus() == ConnectionStatus.Updating && _bridge.GetUpdateProgress() is { total: > 0 }; // Only these phases report progress as real bytes — gate byte/speed display on them. private bool _isByteProgress => - _connector.Status == ConnectionStatus.Updating && _updater.Status is + _bridge.GetConnectionStatus() == ConnectionStatus.Updating && _bridge.GetUpdateStatus() is UpdateStatus.DownloadingEngineVersion or UpdateStatus.DownloadingEngineModules or UpdateStatus.DownloadingClientUpdate; @@ -60,7 +55,7 @@ private string? _eta get { if (!_haveSpeed || _smoothedBytesPerSec <= 1) return null; - if (_updater.Progress is not { total: > 0 } p) return null; + if (_bridge.GetUpdateProgress() is not { total: > 0 } p) return null; var remaining = p.total - p.downloaded; if (remaining <= 0) return null; @@ -75,17 +70,17 @@ private string? _eta } } - private bool _isTerminal => _connector.Status is + private bool _isTerminal => _bridge.GetConnectionStatus() is ConnectionStatus.ConnectionFailed or ConnectionStatus.UpdateError or ConnectionStatus.NotAContentBundle or ConnectionStatus.Cancelled or ConnectionStatus.ClientExited; - private string _statusText => _connector.Status switch + private string _statusText => _bridge.GetConnectionStatus() switch { ConnectionStatus.Connecting => "Contacting server…", - ConnectionStatus.Updating => _updater.Status switch + ConnectionStatus.Updating => _bridge.GetUpdateStatus() switch { UpdateStatus.DownloadingEngineVersion => "Downloading engine…", UpdateStatus.DownloadingEngineModules => "Downloading engine modules…", @@ -107,25 +102,25 @@ or ConnectionStatus.Cancelled protected override void OnInitialized() { - _connector.PropertyChanged += OnConnectorChanged; + _bridge.ConnectionPropertyChanged += OnConnectorChanged; _pollTimer = new Timer(_ => { SampleSpeed(); - InvokeAsync(StateHasChanged); + _ = InvokeAsync(StateHasChanged); }, null, TimeSpan.Zero, TimeSpan.FromMilliseconds(250)); // Fire-and-forget: Status drives the UI from here on. if (ContentBundle is { } bundle) - _connector.LaunchContentBundle(bundle, _cts.Token); + _bridge.LaunchContentBundle(bundle, _cts.Token); else - _connector.Connect(Address, _cts.Token); + _bridge.Connect(Address, _cts.Token); } // Recompute speed from the displayed counter so the two can never disagree. private void SampleSpeed() { - if (!_isByteProgress || _updater.Progress is not { total: > 0 } p) + if (!_isByteProgress || _bridge.GetUpdateProgress() is not { total: > 0 } p) { _haveSpeed = false; _smoothedBytesPerSec = 0; @@ -136,9 +131,9 @@ private void SampleSpeed() var now = DateTime.UtcNow; // Reset on phase change or when the counter restarts (new download). - if (_updater.Status != _lastUpdateStatus || p.downloaded < _lastDownloaded) + if (_bridge.GetUpdateStatus() != _lastUpdateStatus || p.downloaded < _lastDownloaded) { - _lastUpdateStatus = _updater.Status; + _lastUpdateStatus = _bridge.GetUpdateStatus(); _lastDownloaded = p.downloaded; _lastSampleUtc = now; _haveSpeed = false; @@ -164,13 +159,13 @@ private void SampleSpeed() private void OnConnectorChanged(object? sender, PropertyChangedEventArgs e) => InvokeAsync(() => { - if (_connector.Status == ConnectionStatus.ClientRunning) + if (_bridge.GetConnectionStatus() == ConnectionStatus.ClientRunning) _mudDialog.Close(); StateHasChanged(); }); - private void Decide(PrivacyPolicyAcceptResult result) => _connector.ConfirmPrivacyPolicy(result); + private void Decide(PrivacyPolicyAcceptResult result) => _bridge.ConfirmPrivacyPolicy(result); private void Cancel() { @@ -193,12 +188,14 @@ private static string Format(long bytes) return $"{v:0.#} {units[i]}"; } - public void Dispose() + public override void Dispose() { - _connector.PropertyChanged -= OnConnectorChanged; + base.Dispose(); + + _bridge.ConnectionPropertyChanged -= OnConnectorChanged; _pollTimer?.Dispose(); - if (_connector.Status != ConnectionStatus.ClientRunning) + if (_bridge.GetConnectionStatus() != ConnectionStatus.ClientRunning) { if (!_cts.IsCancellationRequested) _cts.Cancel(); diff --git a/Starlight.Launcher/Components/Atoms/Dialogs/ConnectingDialog.razor.css b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ConnectingDialog.razor.css similarity index 100% rename from Starlight.Launcher/Components/Atoms/Dialogs/ConnectingDialog.razor.css rename to Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ConnectingDialog.razor.css diff --git a/Starlight.Launcher/Components/Atoms/Dialogs/ConnectingDialogHost.razor b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ConnectingDialogHost.razor similarity index 77% rename from Starlight.Launcher/Components/Atoms/Dialogs/ConnectingDialogHost.razor rename to Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ConnectingDialogHost.razor index 44b3fa9..2bbc1f5 100644 --- a/Starlight.Launcher/Components/Atoms/Dialogs/ConnectingDialogHost.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/ConnectingDialogHost.razor @@ -1,11 +1,12 @@ +@using Starlight.Launcher.WebUI.Bridge; + @implements IDisposable -@using Starlight.Launcher.Services @inject IDialogService DialogService -@inject LauncherCommands Commands +@inject IBridge Bridge @code { protected override void OnInitialized() - => Commands.ConnectRequested += OnConnectRequested; + => Bridge.ConnectRequested += OnConnectRequested; private Task OnConnectRequested(string address) => InvokeAsync(async () => { @@ -25,5 +26,5 @@ await DialogService.ShowAsync("Connecting", parameters, options); }); - public void Dispose() => Commands.ConnectRequested -= OnConnectRequested; + public void Dispose() => Bridge.ConnectRequested -= OnConnectRequested; } diff --git a/Starlight.Launcher/Components/Atoms/Dialogs/DirectConnectDialog.razor b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/DirectConnectDialog.razor similarity index 100% rename from Starlight.Launcher/Components/Atoms/Dialogs/DirectConnectDialog.razor rename to Starlight.Launcher.WebUI/Components/Atoms/Dialogs/DirectConnectDialog.razor diff --git a/Starlight.Launcher/Components/Atoms/Dialogs/DirectConnectDialog.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/DirectConnectDialog.razor.cs similarity index 92% rename from Starlight.Launcher/Components/Atoms/Dialogs/DirectConnectDialog.razor.cs rename to Starlight.Launcher.WebUI/Components/Atoms/Dialogs/DirectConnectDialog.razor.cs index d77a1cc..d446a2e 100644 --- a/Starlight.Launcher/Components/Atoms/Dialogs/DirectConnectDialog.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/DirectConnectDialog.razor.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Components.Web; using MudBlazor; -namespace Starlight.Launcher.Components.Atoms.Dialogs; +namespace Starlight.Launcher.WebUI.Components.Atoms.Dialogs; public partial class DirectConnectDialog : ComponentBase { diff --git a/Starlight.Launcher/Components/Atoms/Dialogs/LauncherUpdateDialog.razor b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/LauncherUpdateDialog.razor similarity index 98% rename from Starlight.Launcher/Components/Atoms/Dialogs/LauncherUpdateDialog.razor rename to Starlight.Launcher.WebUI/Components/Atoms/Dialogs/LauncherUpdateDialog.razor index e95cbb5..f95f911 100644 --- a/Starlight.Launcher/Components/Atoms/Dialogs/LauncherUpdateDialog.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/LauncherUpdateDialog.razor @@ -1,5 +1,3 @@ -@using Starlight.Launcher.Services -
diff --git a/Starlight.Launcher/Components/Atoms/Dialogs/LauncherUpdateDialog.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/LauncherUpdateDialog.razor.cs similarity index 88% rename from Starlight.Launcher/Components/Atoms/Dialogs/LauncherUpdateDialog.razor.cs rename to Starlight.Launcher.WebUI/Components/Atoms/Dialogs/LauncherUpdateDialog.razor.cs index b818588..a7e747d 100644 --- a/Starlight.Launcher/Components/Atoms/Dialogs/LauncherUpdateDialog.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/LauncherUpdateDialog.razor.cs @@ -1,16 +1,17 @@ using System.Globalization; using Microsoft.AspNetCore.Components; using MudBlazor; -using Starlight.Launcher.Services; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Models.LauncherUpdater; -namespace Starlight.Launcher.Components.Atoms.Dialogs; +namespace Starlight.Launcher.WebUI.Components.Atoms.Dialogs; public sealed partial class LauncherUpdateDialog : ComponentBase, IDisposable { - [Inject] private LauncherUpdater _launcherUpdater { get; set; } = default!; + [Inject] private IBridge _bridge { get; set; } = default!; [CascadingParameter] private IMudDialogInstance _mudDialog { get; set; } = default!; - [Parameter] public LauncherUpdater.ReleaseAsset Asset { get; set; } = default!; + [Parameter] public ReleaseAsset Asset { get; set; } = default!; private enum Phase { Downloading, Done, Failed } private Phase _phase = Phase.Downloading; @@ -53,12 +54,12 @@ private string? _eta protected override void OnInitialized() { - _launcherUpdater.DownloadProgress += OnProgress; + _bridge.DownloadProgress += OnProgress; _pollTimer = new Timer(_ => { SampleSpeed(); - InvokeAsync(StateHasChanged); + _ = InvokeAsync(StateHasChanged); }, null, TimeSpan.Zero, TimeSpan.FromMilliseconds(250)); _ = RunAsync(); @@ -68,7 +69,7 @@ private async Task RunAsync() { try { - var path = await _launcherUpdater.DownloadAsset(Asset, _cts.Token); + var path = await _bridge.DownloadAsset(Asset, _cts.Token); _phase = Phase.Done; await InvokeAsync(StateHasChanged); @@ -76,7 +77,7 @@ private async Task RunAsync() // Small pause so the user sees "complete" before we vanish. await Task.Delay(800, _cts.Token); - LauncherUpdater.RunInstallerAndExit(path); + _bridge.RunInstallerAndExit(path); } catch (OperationCanceledException) { @@ -164,7 +165,7 @@ private static string Format(long bytes) public void Dispose() { - _launcherUpdater.DownloadProgress -= OnProgress; + _bridge.DownloadProgress -= OnProgress; _pollTimer?.Dispose(); if (!_cts.IsCancellationRequested) diff --git a/Starlight.Launcher/Components/Atoms/Dialogs/LauncherUpdateDialog.razor.css b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/LauncherUpdateDialog.razor.css similarity index 100% rename from Starlight.Launcher/Components/Atoms/Dialogs/LauncherUpdateDialog.razor.css rename to Starlight.Launcher.WebUI/Components/Atoms/Dialogs/LauncherUpdateDialog.razor.css diff --git a/Starlight.Launcher/Components/Atoms/Dialogs/LoginsUnrecoverableDialog.razor b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/LoginsUnrecoverableDialog.razor similarity index 73% rename from Starlight.Launcher/Components/Atoms/Dialogs/LoginsUnrecoverableDialog.razor rename to Starlight.Launcher.WebUI/Components/Atoms/Dialogs/LoginsUnrecoverableDialog.razor index 7c3e3b3..9d54846 100644 --- a/Starlight.Launcher/Components/Atoms/Dialogs/LoginsUnrecoverableDialog.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/LoginsUnrecoverableDialog.razor @@ -1,10 +1,12 @@ -@using Starlight.Launcher.Services.Localization +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedComponentBase - @_localization["logins-unrecoverable-dialog-title"] + @L["logins-unrecoverable-dialog-title"] @@ -20,15 +22,13 @@ - @_localization["logins-unrecoverable-dialog-confirm"] + @L["logins-unrecoverable-dialog-confirm"] @code { - [Inject] private LocalizationManager _localization { get; set; } = default!; - [Parameter] public IEnumerable Logins { get; set; } = []; diff --git a/Starlight.Launcher/Components/Atoms/Dialogs/NoAccountDialog.razor b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/NoAccountDialog.razor similarity index 87% rename from Starlight.Launcher/Components/Atoms/Dialogs/NoAccountDialog.razor rename to Starlight.Launcher.WebUI/Components/Atoms/Dialogs/NoAccountDialog.razor index 996bfb7..c79a6f2 100644 --- a/Starlight.Launcher/Components/Atoms/Dialogs/NoAccountDialog.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/Dialogs/NoAccountDialog.razor @@ -1,5 +1,6 @@ -@using Starlight.Launcher.Services.Localization -@inject LocalizationManager Localization +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedComponentBase @@ -8,7 +9,7 @@ Color="Color.Primary" Size="Size.Large" /> - @Localization["no-account-dialog-title"] + @L["no-account-dialog-title"]
@@ -20,7 +21,7 @@ Color="Color.Info" Size="Size.Medium" /> - @Localization["no-account-dialog-description"] + @L["no-account-dialog-description"] @@ -29,13 +30,13 @@ - @Localization["general-cancel"] + @L["general-cancel"] - @Localization["general-ok"] + @L["general-ok"]
diff --git a/Starlight.Launcher/Components/Atoms/HorizontalNavBar.razor b/Starlight.Launcher.WebUI/Components/Atoms/HorizontalNavBar.razor similarity index 81% rename from Starlight.Launcher/Components/Atoms/HorizontalNavBar.razor rename to Starlight.Launcher.WebUI/Components/Atoms/HorizontalNavBar.razor index 2076afb..f630734 100644 --- a/Starlight.Launcher/Components/Atoms/HorizontalNavBar.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/HorizontalNavBar.razor @@ -1,26 +1,30 @@ +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedComponentBase +
- @_localization["main-layout-home-tab"] + @L["main-layout-home-tab"]
- @_localization["main-layout-servers-tab"] + @L["main-layout-servers-tab"]
- @_localization["main-layout-hub-tab"] + @L["main-layout-hub-tab"]
- @_localization["main-layout-settings-tab"] + @L["main-layout-settings-tab"]
diff --git a/Starlight.Launcher/Components/Atoms/HorizontalNavBar.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/HorizontalNavBar.razor.cs similarity index 73% rename from Starlight.Launcher/Components/Atoms/HorizontalNavBar.razor.cs rename to Starlight.Launcher.WebUI/Components/Atoms/HorizontalNavBar.razor.cs index 04838f3..7f6a599 100644 --- a/Starlight.Launcher/Components/Atoms/HorizontalNavBar.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Atoms/HorizontalNavBar.razor.cs @@ -1,12 +1,11 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Routing; -using Starlight.Launcher.Services.Localization; +using Starlight.Launcher.WebUI.Localization; -namespace Starlight.Launcher.Components.Atoms; +namespace Starlight.Launcher.WebUI.Components.Atoms; -public sealed partial class HorizontalNavBar : ComponentBase, IDisposable +public sealed partial class HorizontalNavBar : LocalizedComponentBase, IDisposable { - [Inject] private LocalizationManager _localization { get; set; } = default!; [Inject] private NavigationManager _navigation { get; set; } = default!; private bool IsActive(string href, NavLinkMatch match = NavLinkMatch.Prefix) @@ -27,5 +26,10 @@ private void OnLocationChanged(object? sender, LocationChangedEventArgs e) protected override void OnInitialized() => _navigation.LocationChanged += OnLocationChanged; - public void Dispose() => _navigation.LocationChanged -= OnLocationChanged; + public override void Dispose() + { + base.Dispose(); + + _navigation.LocationChanged -= OnLocationChanged; + } } diff --git a/Starlight.Launcher.WebUI/Components/Atoms/HorizontalNavBar.razor.css b/Starlight.Launcher.WebUI/Components/Atoms/HorizontalNavBar.razor.css new file mode 100644 index 0000000..669ab35 --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Atoms/HorizontalNavBar.razor.css @@ -0,0 +1,55 @@ +.bottom-nav { + display: flex; + justify-content: space-between; + align-items: center; + width: 100%; + max-width: 520px; + height: 100%; + margin: 0 auto; + padding: 0 8px; + box-sizing: border-box; +} + +.bottom-nav-item { + flex: 0 0 auto; + height: auto; + padding: 8px 18px; + border-radius: 999px; + text-decoration: none; + color: var(--mud-palette-text-secondary); + transition: color 150ms ease, background-color 150ms ease; +} + + .bottom-nav-item:hover { + color: var(--mud-palette-text-primary); + background: var(--mud-palette-action-default-hover); + } + + .bottom-nav-item:hover span { + color: var(--mud-palette-text-primary); + } + + .bottom-nav-item.active { + background: color-mix(in srgb, var(--mud-palette-primary) 12%, transparent); + } + + .bottom-nav-item.active span { + color: var(--mud-palette-primary); + } + +.nav-inner { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + height: 100%; + gap: 8px; +} + +.bottom-nav-item span { + font-size: 0.9rem; + font-weight: 500; + line-height: 1; + color: var(--mud-palette-text-secondary); + transition: color 150ms ease; +} diff --git a/Starlight.Launcher/Components/Atoms/ServerList/SearchBar.razor b/Starlight.Launcher.WebUI/Components/Atoms/ServerList/SearchBar.razor similarity index 82% rename from Starlight.Launcher/Components/Atoms/ServerList/SearchBar.razor rename to Starlight.Launcher.WebUI/Components/Atoms/ServerList/SearchBar.razor index d058d3e..a04df15 100644 --- a/Starlight.Launcher/Components/Atoms/ServerList/SearchBar.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/ServerList/SearchBar.razor @@ -1,4 +1,7 @@ -@using Starlight.Launcher.Models.ServerStatus +@using Starlight.Launcher.WebUI.Models.ServerStatus; +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedComponentBase
@@ -6,7 +9,7 @@ - @_localization["servers-list-search-bar-players"] - @_localization["servers-list-search-bar-name"] - @_localization["servers-list-search-bar-ping"] + @L["servers-list-search-bar-players"] + @L["servers-list-search-bar-name"] + @L["servers-list-search-bar-ping"]
@@ -32,28 +35,28 @@ class="server-toolbar__chip @(Filters.HideEmpty ? "is-active" : "")" aria-pressed="@Filters.HideEmpty" @onclick="ToggleHideEmpty"> - @_localization["server-list-hide-empty"] + @L["server-list-hide-empty"]
diff --git a/Starlight.Launcher/Components/Atoms/ServerList/SearchBar.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/ServerList/SearchBar.razor.cs similarity index 87% rename from Starlight.Launcher/Components/Atoms/ServerList/SearchBar.razor.cs rename to Starlight.Launcher.WebUI/Components/Atoms/ServerList/SearchBar.razor.cs index 4e70d1b..5ddf845 100644 --- a/Starlight.Launcher/Components/Atoms/ServerList/SearchBar.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Atoms/ServerList/SearchBar.razor.cs @@ -1,13 +1,12 @@ using Microsoft.AspNetCore.Components; -using Starlight.Launcher.Models.ServerStatus; -using Starlight.Launcher.Services.Localization; -using Starlight.Launcher.Services.ServerStatus; +using Starlight.Launcher.WebUI.Localization; +using Starlight.Launcher.WebUI.Models.HubServerFetcher; +using Starlight.Launcher.WebUI.Models.ServerStatus; -namespace Starlight.Launcher.Components.Atoms.ServerList; +namespace Starlight.Launcher.WebUI.Components.Atoms.ServerList; -public partial class SearchBar : ComponentBase +public partial class SearchBar : LocalizedComponentBase { - [Inject] private LocalizationManager _localization { get; set; } = default!; [Parameter, EditorRequired] public ServerListFilters Filters { get; set; } = null!; [Parameter] public int TotalCount { get; set; } [Parameter] public int FilteredCount { get; set; } diff --git a/Starlight.Launcher/Components/Atoms/ServerList/SearchBar.razor.css b/Starlight.Launcher.WebUI/Components/Atoms/ServerList/SearchBar.razor.css similarity index 100% rename from Starlight.Launcher/Components/Atoms/ServerList/SearchBar.razor.css rename to Starlight.Launcher.WebUI/Components/Atoms/ServerList/SearchBar.razor.css diff --git a/Starlight.Launcher/Components/Atoms/ServerList/ServerItem.razor b/Starlight.Launcher.WebUI/Components/Atoms/ServerList/ServerItem.razor similarity index 95% rename from Starlight.Launcher/Components/Atoms/ServerList/ServerItem.razor rename to Starlight.Launcher.WebUI/Components/Atoms/ServerList/ServerItem.razor index ba2b98d..c17d6af 100644 --- a/Starlight.Launcher/Components/Atoms/ServerList/ServerItem.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/ServerList/ServerItem.razor @@ -1,4 +1,7 @@ @using Robust.Launcher.Api.Models.ServerStatus +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedComponentBase
@@ -65,12 +68,12 @@ - @_localization["servers-list-item-play"] + @L["servers-list-item-play"]
- + diff --git a/Starlight.Launcher/Components/Atoms/ServerList/ServerItem.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/ServerList/ServerItem.razor.cs similarity index 73% rename from Starlight.Launcher/Components/Atoms/ServerList/ServerItem.razor.cs rename to Starlight.Launcher.WebUI/Components/Atoms/ServerList/ServerItem.razor.cs index 0e91e29..dc3e0b3 100644 --- a/Starlight.Launcher/Components/Atoms/ServerList/ServerItem.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Atoms/ServerList/ServerItem.razor.cs @@ -1,28 +1,23 @@ -using Microsoft.AspNetCore.Components; -using Microsoft.Extensions.Logging; -using MudBlazor; +using MudBlazor; using Robust.Launcher.Api.Models.ServerStatus; -using Starlight.Launcher.Components.Atoms.Dialogs; -using Starlight.Launcher.Components.Pages; -using Starlight.Launcher.Services; -using Starlight.Launcher.Services.Auth; -using Starlight.Launcher.Services.Localization; -using Starlight.Launcher.Services.ServerStatus; +using Starlight.Launcher.WebUI.Components.Atoms.Dialogs; +using Starlight.Launcher.WebUI.Components.Pages; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Services; +using Starlight.Launcher.WebUI.Localization; +using Microsoft.AspNetCore.Components; -namespace Starlight.Launcher.Components.Atoms.ServerList; +namespace Starlight.Launcher.WebUI.Components.Atoms.ServerList; -public partial class ServerItem : ComponentBase, IDisposable +public partial class ServerItem : LocalizedComponentBase, IDisposable { - [Inject] private LocalizationManager _localization { get; set; } = default!; - [Inject] private ServerInfoLoader _infoLoader { get; set; } = default!; + [Inject] private IBridge _bridge { get; set; } = default!; [Inject] private IDialogService _dialogService { get; set; } = default!; - [Inject] private LoginManager _loginManager { get; set; } = default!; [Inject] private UiTicker _ticker { get; set; } = default!; [Parameter, EditorRequired] public ServerStatusData Data { get; set; } = default!; [Parameter] public EventCallback OnInfoNeeded { get; set; } [Parameter] public EventCallback OnFavorites { get; set; } [Parameter] public bool IsInFavorites { get; set; } = false; - [Inject] private ILogger _logger { get; set; } = default!; private bool _expanded = false; @@ -65,7 +60,7 @@ protected override void OnAfterRender(bool firstRender) { base.OnAfterRender(firstRender); if (firstRender) - _infoLoader.Request(Data); + _bridge.Request(Data); } private async void OnDataChanged() @@ -76,8 +71,12 @@ private async void OnDataChanged() private async Task HandleClick() { - if (string.IsNullOrEmpty(Data.Description) && Data.StatusInfo == ServerStatusInfoCode.Fetched) - _infoLoader.Request(Data); + var needsFetch = Data.Status == ServerStatusCode.Online && + (Data.StatusInfo is ServerStatusInfoCode.NotFetched or ServerStatusInfoCode.Error + || (string.IsNullOrEmpty(Data.Description) && Data.StatusInfo == ServerStatusInfoCode.Fetched)); + + if (needsFetch) + _bridge.Request(Data); _expanded = !_expanded; await Task.CompletedTask; @@ -85,21 +84,12 @@ private async Task HandleClick() private async Task HandleFavorites() => await OnFavorites.InvokeAsync(Data); - private async Task OnInfoClick(string Url) - { - try - { - await Browser.OpenAsync(Url, BrowserLaunchMode.SystemPreferred); - } - catch (Exception ex) - { - _logger.LogError(ex, $"Failed to open URL {Url}"); - } - } + private void OnInfoClick(string Url) + => _bridge.OpenBrowser(Url); private async Task Play() { - if (_loginManager.ActiveAccount == null) + if (_bridge.GetActiveAccount() == null) { var noaccountParams = new DialogParameters { @@ -116,7 +106,7 @@ private async Task Play() FullWidth = true }; - await _dialogService.ShowAsync(_localization["no-account-dialog-title"], noaccountParams, noaccountOptions); + _ = await _dialogService.ShowAsync(L["no-account-dialog-title"], noaccountParams, noaccountOptions); } else { @@ -135,7 +125,7 @@ private async Task Play() FullWidth = true }; - await _dialogService.ShowAsync("Connecting", parameters, options); + _ = await _dialogService.ShowAsync("Connecting", parameters, options); } } @@ -169,8 +159,8 @@ private string? _roundTime private string? _roundStatusText => Data.RoundStatus switch { - GameRoundStatus.InLobby => _localization["servers-list-item-round-lobby"], - GameRoundStatus.InRound => _localization["servers-list-item-round-in-round"], + GameRoundStatus.InLobby => L["servers-list-item-round-lobby"], + GameRoundStatus.InRound => L["servers-list-item-round-in-round"], _ => null, }; @@ -200,8 +190,10 @@ private string? _roundTime return icon; } - public void Dispose() + public override void Dispose() { + base.Dispose(); + _ticker.Tick -= OnTick; Data.Changed -= OnDataChanged; } diff --git a/Starlight.Launcher/Components/Atoms/ServerList/ServerItem.razor.css b/Starlight.Launcher.WebUI/Components/Atoms/ServerList/ServerItem.razor.css similarity index 100% rename from Starlight.Launcher/Components/Atoms/ServerList/ServerItem.razor.css rename to Starlight.Launcher.WebUI/Components/Atoms/ServerList/ServerItem.razor.css diff --git a/Starlight.Launcher/Components/Atoms/ServerList/TagsBar.razor b/Starlight.Launcher.WebUI/Components/Atoms/ServerList/TagsBar.razor similarity index 87% rename from Starlight.Launcher/Components/Atoms/ServerList/TagsBar.razor rename to Starlight.Launcher.WebUI/Components/Atoms/ServerList/TagsBar.razor index 1382590..bf84575 100644 --- a/Starlight.Launcher/Components/Atoms/ServerList/TagsBar.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/ServerList/TagsBar.razor @@ -1,3 +1,7 @@ +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedComponentBase +
@@ -6,7 +10,7 @@ @if (AvailableRPTags.Count > 0) { @@ -20,7 +24,7 @@ @if (AvailableLangTags.Count > 0) { @@ -34,7 +38,7 @@ @if (AvailableRegionTags.Count > 0) { @@ -54,7 +58,7 @@ StartIcon="@Icons.Material.Filled.Clear" OnClick="ClearTagFilters" Class="server-toolbar__clear-btn"> - @_localization["servers-list-tags-bar-clear-filters"] + @L["servers-list-tags-bar-clear-filters"]
diff --git a/Starlight.Launcher/Components/Atoms/ServerList/TagsBar.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/ServerList/TagsBar.razor.cs similarity index 86% rename from Starlight.Launcher/Components/Atoms/ServerList/TagsBar.razor.cs rename to Starlight.Launcher.WebUI/Components/Atoms/ServerList/TagsBar.razor.cs index 39001e9..30cd7f8 100644 --- a/Starlight.Launcher/Components/Atoms/ServerList/TagsBar.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Atoms/ServerList/TagsBar.razor.cs @@ -1,12 +1,11 @@ using Microsoft.AspNetCore.Components; -using Starlight.Launcher.Models.ServerStatus; -using Starlight.Launcher.Services.Localization; +using Starlight.Launcher.WebUI.Localization; +using Starlight.Launcher.WebUI.Models.ServerStatus; -namespace Starlight.Launcher.Components.Atoms.ServerList; +namespace Starlight.Launcher.WebUI.Components.Atoms.ServerList; -public partial class TagsBar : ComponentBase +public partial class TagsBar : LocalizedComponentBase { - [Inject] private LocalizationManager _localization { get; set; } = default!; [Parameter, EditorRequired] public ServerListFilters Filters { get; set; } = null!; [Parameter] public IReadOnlyList AvailableRPTags { get; set; } = Array.Empty(); [Parameter] public IReadOnlyList AvailableLangTags { get; set; } = Array.Empty(); diff --git a/Starlight.Launcher/Components/Atoms/ServerList/TagsBar.razor.css b/Starlight.Launcher.WebUI/Components/Atoms/ServerList/TagsBar.razor.css similarity index 100% rename from Starlight.Launcher/Components/Atoms/ServerList/TagsBar.razor.css rename to Starlight.Launcher.WebUI/Components/Atoms/ServerList/TagsBar.razor.css diff --git a/Starlight.Launcher/Components/Atoms/Settings/AlertDialog.razor b/Starlight.Launcher.WebUI/Components/Atoms/Settings/AlertDialog.razor similarity index 59% rename from Starlight.Launcher/Components/Atoms/Settings/AlertDialog.razor rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/AlertDialog.razor index 8f8c0de..524d683 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/AlertDialog.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/AlertDialog.razor @@ -1,15 +1,16 @@ -@using Starlight.Launcher.Services.Localization -@inject LocalizationManager Localization +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedComponentBase - @Localization["settings-development-tab-alert-description"] + @L["settings-development-tab-alert-description"] - @Localization["general-cancel"] - @Localization["general-ok"] + @L["general-cancel"] + @L["general-ok"] diff --git a/Starlight.Launcher/Components/Atoms/Settings/AlternativeListOption.razor b/Starlight.Launcher.WebUI/Components/Atoms/Settings/AlternativeListOption.razor similarity index 85% rename from Starlight.Launcher/Components/Atoms/Settings/AlternativeListOption.razor rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/AlternativeListOption.razor index f256472..67672c7 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/AlternativeListOption.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/AlternativeListOption.razor @@ -1,6 +1,12 @@ - +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedComponentBase + +
- +
+ +
@Title @@ -51,21 +57,21 @@ Validation="@(new Func(ValidateUrl))" Class="flex-grow-1" /> - + - + - + Value { get; set; } = []; [Parameter] public EventCallback> ValueChanged { get; set; } diff --git a/Starlight.Launcher/Components/Atoms/Settings/AlternativeSelectorListOption.razor b/Starlight.Launcher.WebUI/Components/Atoms/Settings/AlternativeSelectorListOption.razor similarity index 86% rename from Starlight.Launcher/Components/Atoms/Settings/AlternativeSelectorListOption.razor rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/AlternativeSelectorListOption.razor index 58c9590..bf01c56 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/AlternativeSelectorListOption.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/AlternativeSelectorListOption.razor @@ -1,6 +1,12 @@ - +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedComponentBase + +
- +
+ +
@Title @@ -33,7 +39,7 @@ var value = Values[index];
- + - + Values { get; set; } = []; [Parameter] public EventCallback> ValuesChanged { get; set; } @@ -56,7 +55,6 @@ private async Task RemoveAt(int index) Values.RemoveAt(index); - // Корректируем индекс выбранного элемента после удаления. if (_selectedIndex == index) _selectedIndex = -1; else if (_selectedIndex > index) diff --git a/Starlight.Launcher/Components/Atoms/Settings/BoolOption.razor b/Starlight.Launcher.WebUI/Components/Atoms/Settings/BoolOption.razor similarity index 68% rename from Starlight.Launcher/Components/Atoms/Settings/BoolOption.razor rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/BoolOption.razor index 5165908..8628d19 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/BoolOption.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/BoolOption.razor @@ -1,6 +1,8 @@ - +
- +
+ +
@Title @@ -12,4 +14,4 @@ ValueChanged="OnValueChanged" Color="Color.Primary" />
- \ No newline at end of file + diff --git a/Starlight.Launcher/Components/Atoms/Settings/BoolOption.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/Settings/BoolOption.razor.cs similarity index 95% rename from Starlight.Launcher/Components/Atoms/Settings/BoolOption.razor.cs rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/BoolOption.razor.cs index 6057c5c..269ecf7 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/BoolOption.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/BoolOption.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace Starlight.Launcher.Components.Atoms.Settings; +namespace Starlight.Launcher.WebUI.Components.Atoms.Settings; public partial class BoolOption : ComponentBase { @@ -34,4 +34,4 @@ private async Task OnValueChanged(bool value) SelfValueControlAction?.Invoke(value); } } -} \ No newline at end of file +} diff --git a/Starlight.Launcher/Components/Atoms/Settings/EnumOption.razor b/Starlight.Launcher.WebUI/Components/Atoms/Settings/EnumOption.razor similarity index 77% rename from Starlight.Launcher/Components/Atoms/Settings/EnumOption.razor rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/EnumOption.razor index 5a42c8a..3072bc3 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/EnumOption.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/EnumOption.razor @@ -1,6 +1,8 @@ - +
- +
+ +
@Title @@ -16,4 +18,4 @@ }
- \ No newline at end of file + diff --git a/Starlight.Launcher/Components/Atoms/Settings/EnumOption.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/Settings/EnumOption.razor.cs similarity index 95% rename from Starlight.Launcher/Components/Atoms/Settings/EnumOption.razor.cs rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/EnumOption.razor.cs index 5d4ef7e..de90e0f 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/EnumOption.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/EnumOption.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace Starlight.Launcher.Components.Atoms.Settings; +namespace Starlight.Launcher.WebUI.Components.Atoms.Settings; public partial class EnumOption : ComponentBase { @@ -35,4 +35,4 @@ private async Task OnValueChanged(int value) SelfValueControlAction?.Invoke(value); } } -} \ No newline at end of file +} diff --git a/Starlight.Launcher/Components/Atoms/Settings/FieldOption.razor b/Starlight.Launcher.WebUI/Components/Atoms/Settings/FieldOption.razor similarity index 72% rename from Starlight.Launcher/Components/Atoms/Settings/FieldOption.razor rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/FieldOption.razor index 28b5076..49cadf1 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/FieldOption.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/FieldOption.razor @@ -1,6 +1,8 @@ - +
- +
+ +
@Title @@ -13,4 +15,4 @@ ValueChanged="OnValueChanged" Label="Label" HelperText="Helper" HelperTextOnFocus="HelperOnFocus" Variant="Variant.Outlined" /> - \ No newline at end of file + diff --git a/Starlight.Launcher/Components/Atoms/Settings/FieldOption.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/Settings/FieldOption.razor.cs similarity index 95% rename from Starlight.Launcher/Components/Atoms/Settings/FieldOption.razor.cs rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/FieldOption.razor.cs index a94b15c..b83d110 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/FieldOption.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/FieldOption.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace Starlight.Launcher.Components.Atoms.Settings; +namespace Starlight.Launcher.WebUI.Components.Atoms.Settings; public partial class FieldOption : ComponentBase { diff --git a/Starlight.Launcher/Components/Atoms/Settings/FilePathOption.razor b/Starlight.Launcher.WebUI/Components/Atoms/Settings/FilePathOption.razor similarity index 75% rename from Starlight.Launcher/Components/Atoms/Settings/FilePathOption.razor rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/FilePathOption.razor index 83c4365..26366fa 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/FilePathOption.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/FilePathOption.razor @@ -1,6 +1,12 @@ - +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedComponentBase + +
- +
+ +
@Title @@ -8,7 +14,7 @@
- + @if (ShowOpenButton) { - + diff --git a/Starlight.Launcher/Components/Atoms/Settings/FilePathOption.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/Settings/FilePathOption.razor.cs similarity index 77% rename from Starlight.Launcher/Components/Atoms/Settings/FilePathOption.razor.cs rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/FilePathOption.razor.cs index 0734203..7a1dc16 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/FilePathOption.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/FilePathOption.razor.cs @@ -1,15 +1,14 @@ -using System.Diagnostics; using Microsoft.AspNetCore.Components; -using Robust.Launcher.Api.Models.Data; -using Starlight.Launcher.Services; -using Starlight.Launcher.Services.Localization; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Localization; +using Starlight.Launcher.WebUI.Models.Helpers; +using Starlight.Launcher.WebUI.Services; -namespace Starlight.Launcher.Components.Atoms.Settings; +namespace Starlight.Launcher.WebUI.Components.Atoms.Settings; -public partial class FilePathOption : ComponentBase +public partial class FilePathOption : LocalizedComponentBase { - [Inject] private IFileDialogService _fileDialog { get; set; } = default!; - [Inject] private LocalizationManager _localization { get; set; } = default!; + [Inject] private IBridge _bridge { get; set; } = default!; [Parameter] public string Value { get; set; } = ""; [Parameter] public EventCallback ValueChanged { get; set; } @@ -42,7 +41,7 @@ public partial class FilePathOption : ComponentBase /// Custom picker. When null, falls back to the injected /// 's default file dialog. /// - [Parameter] public Func>? PickAction { get; set; } + [Parameter] public Func>? PickAction { get; set; } protected override async Task OnInitializedAsync() { @@ -52,11 +51,7 @@ protected override async Task OnInitializedAsync() Value = await SelfValueControlInitialization.Invoke(); } - private async Task OpenFolderAsync() => Process.Start(new ProcessStartInfo - { - FileName = Value, - UseShellExecute = true - }); + private async Task OpenFolderAsync() => _bridge.OpenBrowser(Value); private Task OnValueChanged(string value) => ApplyValueAsync(value); @@ -64,7 +59,7 @@ private async Task BrowseAsync() { var result = PickAction is not null ? await PickAction.Invoke() - : await _fileDialog.PickFileAsync(); + : await _bridge.PickFileAsync(); if (result is null || string.IsNullOrEmpty(result.FullPath)) return; diff --git a/Starlight.Launcher/Components/Atoms/Settings/NumericFieldOption.razor b/Starlight.Launcher.WebUI/Components/Atoms/Settings/NumericFieldOption.razor similarity index 66% rename from Starlight.Launcher/Components/Atoms/Settings/NumericFieldOption.razor rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/NumericFieldOption.razor index 8debd41..3bf7e5d 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/NumericFieldOption.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/NumericFieldOption.razor @@ -1,6 +1,8 @@ - +
- +
+ +
@Title @@ -11,4 +13,4 @@ Value="Value" ValueChanged="OnValueChanged" />
- \ No newline at end of file + diff --git a/Starlight.Launcher/Components/Atoms/Settings/NumericFieldOption.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/Settings/NumericFieldOption.razor.cs similarity index 95% rename from Starlight.Launcher/Components/Atoms/Settings/NumericFieldOption.razor.cs rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/NumericFieldOption.razor.cs index 6494b95..dcd60d6 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/NumericFieldOption.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/NumericFieldOption.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace Starlight.Launcher.Components.Atoms.Settings; +namespace Starlight.Launcher.WebUI.Components.Atoms.Settings; public partial class NumericFieldOption : ComponentBase { diff --git a/Starlight.Launcher/Components/Atoms/Settings/SelectorListOption.razor b/Starlight.Launcher.WebUI/Components/Atoms/Settings/SelectorListOption.razor similarity index 79% rename from Starlight.Launcher/Components/Atoms/Settings/SelectorListOption.razor rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/SelectorListOption.razor index 3329307..3ce2fb9 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/SelectorListOption.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/SelectorListOption.razor @@ -1,6 +1,8 @@ - +
- +
+ +
@Title @@ -20,4 +22,4 @@ }
- \ No newline at end of file + diff --git a/Starlight.Launcher/Components/Atoms/Settings/SelectorListOption.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/Settings/SelectorListOption.razor.cs similarity index 96% rename from Starlight.Launcher/Components/Atoms/Settings/SelectorListOption.razor.cs rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/SelectorListOption.razor.cs index 94d6ba7..5479cc1 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/SelectorListOption.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/SelectorListOption.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace Starlight.Launcher.Components.Atoms.Settings; +namespace Starlight.Launcher.WebUI.Components.Atoms.Settings; public partial class SelectorListOption : ComponentBase { @@ -38,4 +38,4 @@ private async Task OnValueChanged(string? value) SelfValueControlAction?.Invoke(value); } } -} \ No newline at end of file +} diff --git a/Starlight.Launcher/Components/Atoms/Settings/TimeSpanOption.razor b/Starlight.Launcher.WebUI/Components/Atoms/Settings/TimeSpanOption.razor similarity index 81% rename from Starlight.Launcher/Components/Atoms/Settings/TimeSpanOption.razor rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/TimeSpanOption.razor index aa6b9e5..2f8fc09 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/TimeSpanOption.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/TimeSpanOption.razor @@ -1,6 +1,8 @@ - +
- +
+ +
@Title @Description @@ -12,4 +14,4 @@
- \ No newline at end of file + diff --git a/Starlight.Launcher/Components/Atoms/Settings/TimeSpanOption.razor.cs b/Starlight.Launcher.WebUI/Components/Atoms/Settings/TimeSpanOption.razor.cs similarity index 97% rename from Starlight.Launcher/Components/Atoms/Settings/TimeSpanOption.razor.cs rename to Starlight.Launcher.WebUI/Components/Atoms/Settings/TimeSpanOption.razor.cs index 4723e19..5ec6833 100644 --- a/Starlight.Launcher/Components/Atoms/Settings/TimeSpanOption.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Atoms/Settings/TimeSpanOption.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace Starlight.Launcher.Components.Atoms.Settings; +namespace Starlight.Launcher.WebUI.Components.Atoms.Settings; public partial class TimeSpanOption : ComponentBase { diff --git a/Starlight.Launcher/Components/Atoms/VerticalNavBar.razor b/Starlight.Launcher.WebUI/Components/Atoms/VerticalNavBar.razor similarity index 71% rename from Starlight.Launcher/Components/Atoms/VerticalNavBar.razor rename to Starlight.Launcher.WebUI/Components/Atoms/VerticalNavBar.razor index c493008..d572431 100644 --- a/Starlight.Launcher/Components/Atoms/VerticalNavBar.razor +++ b/Starlight.Launcher.WebUI/Components/Atoms/VerticalNavBar.razor @@ -1,24 +1,30 @@ +@using Starlight.Launcher.WebUI.Localization; +@using Starlight.Launcher.WebUI.Bridge; +@inject IBridge Bridge; + +@inherits LocalizedComponentBase + STARLIGHT - @MainLayout.GetVersion() + @Bridge.GetVersion() - @_localization["main-layout-home-tab"] + @L["main-layout-home-tab"] - @_localization["main-layout-servers-tab"] + @L["main-layout-servers-tab"] - @_localization["main-layout-hub-tab"] + @L["main-layout-hub-tab"] - @_localization["main-layout-settings-tab"] + @L["main-layout-settings-tab"] - @_localization["main-layout-auth-tab"] + @L["main-layout-auth-tab"] diff --git a/Starlight.Launcher/Components/Layout/MainLayout.razor b/Starlight.Launcher.WebUI/Components/Layout/MainLayout.razor similarity index 87% rename from Starlight.Launcher/Components/Layout/MainLayout.razor rename to Starlight.Launcher.WebUI/Components/Layout/MainLayout.razor index 8d2b305..ec2aef5 100644 --- a/Starlight.Launcher/Components/Layout/MainLayout.razor +++ b/Starlight.Launcher.WebUI/Components/Layout/MainLayout.razor @@ -1,6 +1,8 @@ -@using Starlight.Launcher.Components.Atoms.Dialogs -@using Starlight.Launcher.Models.Data -@inherits LayoutComponentBase +@using Starlight.Launcher.WebUI.Components.Atoms.Dialogs +@using Starlight.Launcher.WebUI.Models.Data +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedLayoutBase @@ -13,10 +15,10 @@ { STARLIGHT - @GetVersion() + @_bridge.GetVersion() - + } @@ -51,13 +53,13 @@ @if (_elementPosition == ElementPosition.Top) { - + STARLIGHT - @GetVersion() + @_bridge.GetVersion() } else if (_elementPosition == ElementPosition.Bottom) diff --git a/Starlight.Launcher/Components/Layout/MainLayout.razor.cs b/Starlight.Launcher.WebUI/Components/Layout/MainLayout.razor.cs similarity index 64% rename from Starlight.Launcher/Components/Layout/MainLayout.razor.cs rename to Starlight.Launcher.WebUI/Components/Layout/MainLayout.razor.cs index 5c00ccb..636a44f 100644 --- a/Starlight.Launcher/Components/Layout/MainLayout.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Layout/MainLayout.razor.cs @@ -1,42 +1,33 @@ -using System.Diagnostics; -using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Routing; using Microsoft.AspNetCore.Components.Web; using Microsoft.JSInterop; using MudBlazor; using MudBlazor.Services; -using Starlight.Launcher.Components.Atoms.Dialogs; -using Starlight.Launcher.Models.Data; -using Starlight.Launcher.Services; -using Starlight.Launcher.Services.Discord; -using Starlight.Launcher.Services.Localization; -using Starlight.Launcher.Services.Settings; -using Starlight.Launcher.Services.State; +using Starlight.Launcher.WebUI.Components.Atoms.Dialogs; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Models.Data; +using Starlight.Launcher.WebUI.Models.Settings; +using Starlight.Launcher.WebUI.Services; +using Starlight.Launcher.WebUI.Localization; +using Starlight.Launcher.WebUI.Models.DiscordRichPresence; -using AppTheme = Starlight.Launcher.Models.Settings.AppTheme; +namespace Starlight.Launcher.WebUI.Components.Layout; -namespace Starlight.Launcher.Components.Layout; - -public partial class MainLayout : LayoutComponentBase, IAsyncDisposable, IBrowserViewportObserver +public partial class MainLayout : LocalizedLayoutBase, IAsyncDisposable, IBrowserViewportObserver { [Inject] private IJSRuntime _jS { get; set; } = default!; - [Inject] private SettingsService _settings { get; set; } = default!; - [Inject] private LocalizationManager _localization { get; set; } = default!; - [Inject] private AppState _state { get; set; } = default!; [Inject] private IBrowserViewportService _browserViewportService { get; set; } = default!; - [Inject] private INativeTray _tray { get; set; } = default!; + [Inject] private IBridge _bridge { get; set; } = default!; [Inject] private NavigationManager _navigation { get; set; } = default!; - [Inject] private DiscordRichPresence _presence { get; set; } = default!; - [Inject] private LauncherUpdater _launcherUpdater { get; set; } = default!; [Inject] private ISnackbar _snackbar { get; set; } = default!; [Inject] private IDialogService _dialogService { get; set; } = default!; + [Inject] private AppState _state { get; set; } = default!; Guid IBrowserViewportObserver.Id { get; } = Guid.NewGuid(); private bool _isSmallScreen = false; - public static string GetVersion() => LauncherUpdater.GetVersion(); - private static string ToDataTheme(AppTheme t, bool systemPrefersDark) => t switch { AppTheme.EmeraldLight => "emerald-light", @@ -49,6 +40,11 @@ public partial class MainLayout : LayoutComponentBase, IAsyncDisposable, IBrowse AppTheme.VioletLight => "violet-light", AppTheme.VioletDark => "violet-dark", AppTheme.OceanLight => "ocean-light", + AppTheme.OceanDark => "ocean-dark", + AppTheme.CitrusLight => "citrus-light", + AppTheme.CitrusDark => "citrus-dark", + AppTheme.SlateLight => "slate-light", + AppTheme.SlateDark => "slate-dark", AppTheme.System => systemPrefersDark ? "emerald-dark" : "emerald-light", _ => "emerald-light" }; @@ -60,36 +56,35 @@ public partial class MainLayout : LayoutComponentBase, IAsyncDisposable, IBrowse protected override async Task OnInitializedAsync() { - var settings = await _settings.GetSettingsAsync(); - await ApplyThemeAsync(); + var settings = await _bridge.GetSettingsAsync(); _elementPosition = settings.Navigation; _state.OnChange += AppCalledRepaint; _navigation.LocationChanged += OnLocationChanged; - _settings.LoginsUnrecoverable += OnLoginsUnrecover; + _bridge.LoginsUnrecoverable += OnLoginsUnrecover; if (settings.CollapseInTrayOnStart) - _tray.HideWindow(); // If layout is initialized - window exists, so we can hide it right away if the user wants that. + _bridge.HideWindow(); // If layout is initialized - window exists, so we can hide it right away if the user wants that. - _launcherUpdater.CleanupOldInstallers(); + _bridge.CleanupOldInstallers(); await ShowChangelogIfNeeded(); await CheckUpdate(); } private void OnLoginsUnrecover() => _snackbar.Add( - _localization["settings-logins-unrecoverable"], + L["settings-logins-unrecoverable"], Severity.Error, config => { - config.Action = _localization["settings-logins-unrecoverable-action"]; + config.Action = L["settings-logins-unrecoverable-action"]; config.ActionColor = MudBlazor.Color.Primary; - config.OnClick = _ => + config.OnClick = __ => { - _dialogService.ShowAsync( + _ = _dialogService.ShowAsync( null, new DialogParameters { - { nameof(LoginsUnrecoverableDialog.Logins), _settings.GetLogins() } + { nameof(LoginsUnrecoverableDialog.Logins), _bridge.GetLogins() } }, new DialogOptions { @@ -103,24 +98,22 @@ private void OnLoginsUnrecover() => private async Task ShowChangelogIfNeeded() { - if (!_launcherUpdater.ShouldShowChangelog()) + if (!_bridge.ShouldShowChangelog()) return; - var notes = await _launcherUpdater.GetChangelogForCurrentVersion(); - var version = LauncherUpdater.GetVersion(); + var entries = await _bridge.GetChangelogsToShow(); - _launcherUpdater.MarkChangelogSeen(); + _bridge.MarkChangelogSeen(); - if (string.IsNullOrWhiteSpace(notes)) + if (entries.Count == 0) return; var parameters = new DialogParameters { - { x => x.Version, version }, - { x => x.Notes, notes! } + { x => x.Entries, entries } }; - await _dialogService.ShowAsync( + _ = await _dialogService.ShowAsync( null, parameters, new DialogOptions @@ -134,18 +127,18 @@ await _dialogService.ShowAsync( private async Task CheckUpdate() { - var info = await _launcherUpdater.IsUpdateAvailable(); + var info = await _bridge.IsUpdateAvailable(); if (!info.IsUpdateAvailable) return; - _snackbar.Add( - _localization.GetString("settings-menu-update-found", ("latest", info.LatestVersion)), + _ = _snackbar.Add( + L.GetString("settings-menu-update-found", ("latest", info.LatestVersion)), Severity.Warning, config => { - config.Action = _localization["settings-menu-update-download"]; + config.Action = L["settings-menu-update-download"]; config.ActionColor = MudBlazor.Color.Primary; - config.OnClick = _ => + config.OnClick = __ => { if (info.Asset is { } asset) { @@ -153,7 +146,7 @@ private async Task CheckUpdate() { { x => x.Asset, asset } }; - _dialogService.ShowAsync( + _ = _dialogService.ShowAsync( null, parameters, new DialogOptions @@ -166,11 +159,7 @@ private async Task CheckUpdate() else { // No installer for this OS in the release — fall back to the release page. - Process.Start(new ProcessStartInfo - { - FileName = info.ReleasePageUrl, - UseShellExecute = true - }); + _bridge.OpenBrowser(info.ReleasePageUrl); } return Task.CompletedTask; }; @@ -183,32 +172,32 @@ private void OnLocationChanged(object? sender, LocationChangedEventArgs e) switch (uri.AbsolutePath) { case "/servers": - _presence.UpdatePresence(PresenceState.SearchingServers); + _bridge.UpdatePresence(PresenceState.SearchingServers); break; case "/settings": - _presence.UpdatePresence(PresenceState.SettingUp); + _bridge.UpdatePresence(PresenceState.SettingUp); break; default: - _presence.UpdatePresence(PresenceState.Idle); + _bridge.UpdatePresence(PresenceState.Idle); break; } } private async Task ApplyThemeAsync() { - var settings = await _settings.GetSettingsAsync(); + var settings = await _bridge.GetSettingsAsync(); var prefersDark = await _jS.InvokeAsync("appTheme.prefersDark"); var themeName = ToDataTheme(settings.Theme, prefersDark); await _jS.InvokeVoidAsync("appTheme.set", themeName); } private void AppCalledRepaint() => _ = InvokeAsync((async () => - { - var settings = await _settings.GetSettingsAsync(); - await ApplyThemeAsync(); - _elementPosition = settings.Navigation; - StateHasChanged(); - })); + { + var settings = await _bridge.GetSettingsAsync(); + await ApplyThemeAsync(); + _elementPosition = settings.Navigation; + StateHasChanged(); + })); public async ValueTask DisposeAsync() { @@ -222,6 +211,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender) { if (firstRender) { + await ApplyThemeAsync(); await _browserViewportService.SubscribeAsync(this, fireImmediately: true); await _jS.InvokeVoidAsync("eval", "document.getElementById('app')?.classList.add('loaded')"); } diff --git a/Starlight.Launcher/Components/Layout/MainLayout.razor.css b/Starlight.Launcher.WebUI/Components/Layout/MainLayout.razor.css similarity index 100% rename from Starlight.Launcher/Components/Layout/MainLayout.razor.css rename to Starlight.Launcher.WebUI/Components/Layout/MainLayout.razor.css diff --git a/Starlight.Launcher.WebUI/Components/Pages/Auth.razor b/Starlight.Launcher.WebUI/Components/Pages/Auth.razor new file mode 100644 index 0000000..c639dd9 --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Pages/Auth.razor @@ -0,0 +1,62 @@ +@page "/auth" +@using Starlight.Launcher.WebUI.Components.Atoms.Auth +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedComponentBase + +
+ + +
+ @switch (_mode) + { + case Mode.AccountList: + + break; + + case Mode.SignIn: + + break; + + case Mode.Register: + + + @L["auth-menu-registration"] + + + +
+
+ +
+ + @L["auth-menu-registration-disabled-title"] + + + @L["auth-menu-registration-disabled-hint"] + + + @L["auth-menu-registration-back-to-signin"] + +
+ break; + + case Mode.ForgotPassword: + + break; + + case Mode.LinkAccount: + + break; + } +
+ + +
diff --git a/Starlight.Launcher.WebUI/Components/Pages/Auth.razor.cs b/Starlight.Launcher.WebUI/Components/Pages/Auth.razor.cs new file mode 100644 index 0000000..814ff00 --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Pages/Auth.razor.cs @@ -0,0 +1,125 @@ +using Microsoft.AspNetCore.Components; +using MudBlazor; +using Serilog; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Localization; +using Starlight.Launcher.WebUI.Models.Auth; +using Starlight.Launcher.WebUI.Models.DiscordAuthService; + +namespace Starlight.Launcher.WebUI.Components.Pages; + +public partial class Auth : LocalizedComponentBase, IDisposable +{ + [Inject] private IBridge _bridge { get; set; } = default!; + [Inject] private NavigationManager _nav { get; set; } = default!; + [Inject] private ISnackbar _snackbar { get; set; } = default!; + + private Mode _mode = Mode.AccountList; + private bool _busy; + + private Guid? _linkUserId; + private string _linkUsername = ""; + + private string _signInUsername = ""; + private Guid? _relogUserId; + + protected override void OnInitialized() + { + _bridge.LoginEntriesChanged += OnLoginsChanged; + + if (_bridge.GetLoginEntries().Count == 0) + { + _mode = Mode.SignIn; + StateHasChanged(); + } + } + + private void OnLoginsChanged() => InvokeAsync(StateHasChanged); + + public override void Dispose() + { + base.Dispose(); + _bridge.LoginEntriesChanged -= OnLoginsChanged; + } + + private async Task BeginRelogin(LoggedInAccount account) + { + if (account.LoginInfo.DiscordToken != null && account.LoginInfo.Token == null) + { + await ReloginDiscord(account); + return; + } + + _relogUserId = account.UserId; + _signInUsername = account.LoginInfo.Username; + _mode = Mode.SignIn; + StateHasChanged(); + } + + private void LinkAccount(LoggedInAccount account) + { + _linkUserId = account.UserId; + _linkUsername = account.LoginInfo.Username; + _mode = Mode.LinkAccount; + StateHasChanged(); + } + + private Task LinkDiscord(LoggedInAccount account) => + RunDiscordAttach(account, L.GetString("auth-menu-linked-status", ("account", account.LoginInfo.Username))); + + private Task ReloginDiscord(LoggedInAccount account) => + RunDiscordAttach(account, L["auth-menu-discord-renewed"], navigateHome: true); + + private async Task RunDiscordAttach(LoggedInAccount account, string success, bool navigateHome = false) + { + _busy = true; + await InvokeAsync(StateHasChanged); + try + { + await _bridge.AttachToAccountAsync(account); + _ = _snackbar.Add(success, Severity.Success); + if (navigateHome) + { + _bridge.SetActiveAccountId(account.UserId); + _nav.NavigateTo("/"); + } + } + catch (OperationCanceledException) + { + _ = _snackbar.Add(L["auth-menu-discord-login-error"], Severity.Warning); + } + catch (DiscordAuthException ex) + { + _ = _snackbar.Add(ex.Message, Severity.Error); + } + catch (Exception ex) + { + Log.Warning(ex, "Discord attach failed"); + _ = _snackbar.Add(L["auth-menu-discord-connect-fail"], Severity.Error); + } + finally + { + _busy = false; + await InvokeAsync(StateHasChanged); + } + } + + private void SwitchMode(Mode mode) + { + if (mode == Mode.SignIn) { _signInUsername = ""; } + //if (mode == Mode.Register) { _registerErrors = null; _registerSuccessMessage = null; } + + _mode = mode; + + StateHasChanged(); + } +} + +public enum Mode +{ + AccountList, + SignIn, + Register, + ForgotPassword, + LinkAccount +} diff --git a/Starlight.Launcher.WebUI/Components/Pages/Auth.razor.css b/Starlight.Launcher.WebUI/Components/Pages/Auth.razor.css new file mode 100644 index 0000000..2254186 --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Pages/Auth.razor.css @@ -0,0 +1,180 @@ +html, body { + margin: 0; + padding: 0; +} + +.auth-bg { + position: relative; + z-index: 1; + overflow-y: hidden; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + box-sizing: border-box; + padding: 48px 16px; + background: oklch(var(--c-bg)); + isolation: isolate; +} + + .auth-bg::before { + content: ""; + pointer-events: none; + position: absolute; + inset: -20%; + z-index: -2; + background: radial-gradient(38% 30% at 22% 28%, oklch(from oklch(var(--c-secondary)) calc(l + 0.08) c h / 0.30), transparent 70%), radial-gradient(32% 26% at 78% 22%, oklch(from oklch(var(--c-tertiary)) calc(l + 0.10) c h / 0.24), transparent 70%), radial-gradient(40% 34% at 55% 82%, oklch(from oklch(var(--c-secondary)) calc(l + 0.04) c h / 0.20), transparent 70%); + animation: nebula-drift 42s ease-in-out infinite alternate; + will-change: transform; + } + +@keyframes nebula-drift { + 0% { + transform: translate3d(-2%, -1%, 0) scale(1); + } + + 50% { + transform: translate3d(2%, 2%, 0) scale(1.06); + } + + 100% { + transform: translate3d(-1%, 2%, 0) scale(1); + } +} + +.auth-bg::after { + content: ""; + pointer-events: none; + position: absolute; + inset: 0; + z-index: -1; + --star: oklch(from oklch(var(--c-text)) l c h); + background-image: radial-gradient(1.5px 1.5px at 12% 18%, oklch(from var(--star) l c h / .9), transparent), radial-gradient(2px 2px at 68% 12%, oklch(from var(--star) l c h / .8), transparent), radial-gradient(1.5px 1.5px at 34% 42%, oklch(from var(--star) l c h / 1), transparent), radial-gradient(2.5px 2.5px at 82% 38%, oklch(from var(--star) l c h / .7), transparent), radial-gradient(1.5px 1.5px at 6% 64%, oklch(from var(--star) l c h / .9), transparent), radial-gradient(2px 2px at 47% 71%, oklch(from var(--star) l c h / .85), transparent), radial-gradient(3px 3px at 91% 68%, oklch(from var(--star) l c h / .8), transparent), radial-gradient(1.5px 1.5px at 21% 88%, oklch(from var(--star) l c h / .75), transparent), radial-gradient(2px 2px at 60% 92%, oklch(from var(--star) l c h / .9), transparent), radial-gradient(1.5px 1.5px at 75% 8%, oklch(from var(--star) l c h / .65), transparent); + background-repeat: no-repeat; + background-size: 100% 100%; + opacity: .85; + animation: star-twinkle 5s ease-in-out infinite alternate; +} + +@keyframes star-twinkle { + from { + opacity: .55; + } + + to { + opacity: .95; + } +} + +@media (prefers-reduced-motion: reduce) { + .auth-bg::before, + .auth-bg::after, + .auth-wrapper, + .auth-card { + animation: none !important; + } +} + +.auth-wrapper { + position: relative; + animation: card-rise .5s cubic-bezier(.16,1,.3,1) both; +} + +@keyframes card-rise { + from { + opacity: 0; + transform: translateY(18px) scale(.98); + } + + to { + opacity: 1; + transform: none; + } +} + +.auth-card { + position: relative; + width: 100%; + max-height: calc(100vh - 96px); + overflow-y: auto; + border-radius: 20px; + background: linear-gradient(180deg, color-mix(in srgb, var(--mud-palette-text-primary) 8%, transparent), transparent 35%), color-mix(in srgb, var(--mud-palette-surface) 82%, transparent); + backdrop-filter: blur(18px) saturate(140%); + border: 1px solid var(--mud-palette-lines-inputs, rgba(255,255,255,.10)); + box-shadow: 0 1px 0 color-mix(in srgb, var(--mud-palette-text-primary) 10%, transparent) inset, 0 0 0 1px color-mix(in srgb, var(--mud-palette-text-primary) 3%, transparent) inset, 0 30px 80px rgba(0,0,0,.55), 0 0 140px -40px color-mix(in srgb, var(--starlight-accent-1) 45%, transparent); + transition: transform .25s ease, box-shadow .25s ease, border-color .25s ease; + scrollbar-width: thin; + scrollbar-color: color-mix(in srgb, var(--starlight-accent-1) 50%, transparent) transparent; +} + + .auth-card:hover { + transform: translateY(-3px); + box-shadow: 0 1px 0 color-mix(in srgb, var(--mud-palette-text-primary) 14%, transparent) inset, 0 0 0 1px color-mix(in srgb, var(--mud-palette-text-primary) 5%, transparent) inset, 0 40px 100px rgba(0,0,0,.6), 0 0 170px -30px color-mix(in srgb, var(--starlight-accent-2) 40%, transparent); + border-color: color-mix(in srgb, var(--mud-palette-text-primary) 14%, transparent); + } + + .auth-card::before { + content: ""; + position: absolute; + top: 0; + left: 0; + right: 0; + height: 3px; + border-radius: 20px 20px 0 0; + background: linear-gradient(90deg, var(--starlight-accent-1), var(--starlight-accent-2)); + box-shadow: 0 0 16px 1px color-mix(in srgb, var(--starlight-accent-1) 65%, transparent), 0 0 24px 4px color-mix(in srgb, var(--starlight-accent-2) 35%, transparent); + opacity: .9; + } + + .auth-card::-webkit-scrollbar { + width: 8px; + } + + .auth-card::-webkit-scrollbar-track { + background: transparent; + } + + .auth-card::-webkit-scrollbar-thumb { + background: linear-gradient(180deg, var(--starlight-accent-1), var(--starlight-accent-2)); + border-radius: 8px; + } + +.mode-fade { + animation: fadeUp .25s ease; +} + +@keyframes fadeUp { + from { + opacity: 0; + transform: translateY(8px); + } + + to { + opacity: 1; + transform: none; + } +} + +.reg-disabled { + text-align: center; + padding: 24px 8px 8px; +} + +.reg-disabled-badge { + position: relative; + width: 84px; + height: 84px; + margin: 0 auto 20px; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + background: radial-gradient(circle at 35% 30%, color-mix(in srgb, var(--starlight-accent-1) 35%, transparent), color-mix(in srgb, var(--starlight-accent-2) 12%, transparent) 55%, transparent 75%); + box-shadow: 0 0 40px -8px color-mix(in srgb, var(--starlight-accent-1) 50%, transparent), inset 0 0 0 1px color-mix(in srgb, var(--mud-palette-text-primary) 8%, transparent); +} + +.reg-disabled-icon { + font-size: 2.75rem !important; + opacity: .65; + filter: drop-shadow(0 0 12px color-mix(in srgb, var(--starlight-accent-1) 40%, transparent)); +} diff --git a/Starlight.Launcher/Components/Pages/Home.razor b/Starlight.Launcher.WebUI/Components/Pages/Home.razor similarity index 84% rename from Starlight.Launcher/Components/Pages/Home.razor rename to Starlight.Launcher.WebUI/Components/Pages/Home.razor index 3316eed..c2ba4fa 100644 --- a/Starlight.Launcher/Components/Pages/Home.razor +++ b/Starlight.Launcher.WebUI/Components/Pages/Home.razor @@ -1,7 +1,10 @@ @page "/" -@using Starlight.Launcher.Components.Atoms.ServerList +@using Starlight.Launcher.WebUI.Components.Atoms.ServerList +@using Starlight.Launcher.WebUI.Localization @using MudBlazor +@inherits LocalizedComponentBase +
@@ -9,12 +12,12 @@ - @_localization["home-menu-dirrect-connect"] + @L["home-menu-dirrect-connect"] - @_localization["home-menu-load-replay"] + @L["home-menu-load-replay"] diff --git a/Starlight.Launcher/Components/Pages/Home.razor.cs b/Starlight.Launcher.WebUI/Components/Pages/Home.razor.cs similarity index 63% rename from Starlight.Launcher/Components/Pages/Home.razor.cs rename to Starlight.Launcher.WebUI/Components/Pages/Home.razor.cs index 8314ee9..2ada131 100644 --- a/Starlight.Launcher/Components/Pages/Home.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Pages/Home.razor.cs @@ -1,34 +1,30 @@ using Microsoft.AspNetCore.Components; using MudBlazor; using Robust.Launcher.Api.Models.ServerStatus; -using Starlight.Launcher.Components.Atoms.Dialogs; -using Starlight.Launcher.Models.Data; -using Starlight.Launcher.Services; -using Starlight.Launcher.Services.Localization; -using Starlight.Launcher.Services.ServerStatus; -using Starlight.Launcher.Services.Settings; +using Starlight.Launcher.WebUI.Components.Atoms.Dialogs; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Localization; +using Starlight.Launcher.WebUI.Models.Data; +using Starlight.Launcher.WebUI.Models.HubServerFetcher; -namespace Starlight.Launcher.Components.Pages; +namespace Starlight.Launcher.WebUI.Components.Pages; -public partial class Home : ComponentBase, IDisposable +public partial class Home : LocalizedComponentBase, IDisposable { - [Inject] private SettingsService _settings { get; set; } = default!; - [Inject] private HubServerFetcher _fetcher { get; set; } = default!; + [Inject] private IBridge _bridge { get; set; } = default!; [Inject] private ServerStatusCache _statusCache { get; set; } = default!; - [Inject] private Connector _connector { get; set; } = default!; [Inject] private IDialogService _dialogService { get; set; } = default!; - [Inject] private IFileDialogService _fileDialog { get; set; } = default!; - [Inject] private LocalizationManager _localization { get; set; } = default!; private List _favoriteServers { get; set; } = null!; private readonly CancellationTokenSource _disposeCts = new(); private int _rebuildScheduled; - public void Dispose() + public override void Dispose() { - _settings.FavoritesChanged -= HandleFavorites; - _fetcher.ServersChanged -= OnServersChanged; - _fetcher.StatusChanged -= OnStatusChanged; + base.Dispose(); + _bridge.FavoritesChanged -= HandleFavorites; + _bridge.ServersChanged -= OnServersChanged; + _bridge.StatusChanged -= OnStatusChanged; _disposeCts.Cancel(); _disposeCts.Dispose(); GC.SuppressFinalize(this); @@ -38,10 +34,10 @@ public void Dispose() protected override async Task OnInitializedAsync() { - UpdateFavorites(await _settings.GetFavoritesAsync()); - _settings.FavoritesChanged += HandleFavorites; - _fetcher.ServersChanged += OnServersChanged; - _fetcher.StatusChanged += OnStatusChanged; + UpdateFavorites(await _bridge.GetFavoritesAsync()); + _bridge.FavoritesChanged += HandleFavorites; + _bridge.ServersChanged += OnServersChanged; + _bridge.StatusChanged += OnStatusChanged; await base.OnInitializedAsync(); } @@ -55,13 +51,13 @@ private async void OnServersChanged() await Task.Delay(200, _disposeCts.Token); await InvokeAsync(() => { - Interlocked.Exchange(ref _rebuildScheduled, 0); - UpdateFavorites(_settings.GetFavorites()); + _ = Interlocked.Exchange(ref _rebuildScheduled, 0); + UpdateFavorites(_bridge.GetFavorites()); StateHasChanged(); }); } - catch (OperationCanceledException) { Interlocked.Exchange(ref _rebuildScheduled, 0); } - catch (ObjectDisposedException) { Interlocked.Exchange(ref _rebuildScheduled, 0); } + catch (OperationCanceledException) { _ = Interlocked.Exchange(ref _rebuildScheduled, 0); } + catch (ObjectDisposedException) { _ = Interlocked.Exchange(ref _rebuildScheduled, 0); } } private async void OnStatusChanged(RefreshListStatus _) @@ -78,7 +74,7 @@ private void UpdateFavorites(List servers) _favoriteServers = servers.Select(x => { var data = _statusCache.GetStatusFor(x.Address, x.HubAddress); - _statusCache.TryInitialUpdateStatus(data); + _ = _statusCache.TryInitialUpdateStatus(data); data.Changed += OnServerDataChanged; return data; }).ToList(); @@ -96,7 +92,7 @@ private async void HandleFavorites() { await InvokeAsync(async () => { - UpdateFavorites(await _settings.GetFavoritesAsync()); + UpdateFavorites(await _bridge.GetFavoritesAsync()); StateHasChanged(); }); } @@ -105,23 +101,23 @@ await InvokeAsync(async () => private async Task HandleFavorite(ServerStatusData server) { - var favorites = _settings.GetFavorites(); + var favorites = _bridge.GetFavorites(); var alreadyExist = favorites.FirstOrDefault(x => x.Address == server.Address); if ((alreadyExist == null || alreadyExist == default) && server.HubAddress != null) { favorites.Add(new FavoriteServer(server.Name, server.Address, server.HubAddress)); - await _settings.WriteFavoritesAsync(favorites); + await _bridge.WriteFavoritesAsync(favorites); } else if (alreadyExist != null) { - favorites.Remove(alreadyExist); - await _settings.WriteFavoritesAsync(favorites); + _ = favorites.Remove(alreadyExist); + await _bridge.WriteFavoritesAsync(favorites); } } private void HandleInfoNeeded(ServerStatusData server) - => ((IServerSource)_fetcher).UpdateInfoFor(server); + => _bridge.UpdateInfoFor(server); private async Task OpenDirectConnect() { @@ -142,21 +138,36 @@ private async Task OpenDirectConnect() private async Task LoadReplay() { - var file = await _fileDialog.PickFileAsync(); + var file = await _bridge.PickFileAsync(); if (file is null) return; - _connector.LaunchContentBundle(file); + var parameters = new DialogParameters + { + { x => x.ContentBundle, file }, + { x => x.Title, file.FileName } + }; + + var options = new DialogOptions + { + BackdropClick = false, + CloseOnEscapeKey = false, + CloseButton = false, + MaxWidth = MaxWidth.ExtraSmall, + FullWidth = true + }; + + _ = await _dialogService.ShowAsync("Loading replay", parameters, options); } private async Task AddDirectFavorite(string address) { - var favorites = _settings.GetFavorites(); + var favorites = _bridge.GetFavorites(); if (favorites.Any(x => x.Address == address)) return; favorites.Add(new FavoriteServer(address, address, "")); - await _settings.WriteFavoritesAsync(favorites); + await _bridge.WriteFavoritesAsync(favorites); } private Task ShowConnecting(Action> configure) { diff --git a/Starlight.Launcher/Components/Pages/Home.razor.css b/Starlight.Launcher.WebUI/Components/Pages/Home.razor.css similarity index 100% rename from Starlight.Launcher/Components/Pages/Home.razor.css rename to Starlight.Launcher.WebUI/Components/Pages/Home.razor.css diff --git a/Starlight.Launcher/Components/Pages/NotFound.razor b/Starlight.Launcher.WebUI/Components/Pages/NotFound.razor similarity index 100% rename from Starlight.Launcher/Components/Pages/NotFound.razor rename to Starlight.Launcher.WebUI/Components/Pages/NotFound.razor diff --git a/Starlight.Launcher/Components/Pages/NullLinkHub.razor b/Starlight.Launcher.WebUI/Components/Pages/NullLinkHub.razor similarity index 95% rename from Starlight.Launcher/Components/Pages/NullLinkHub.razor rename to Starlight.Launcher.WebUI/Components/Pages/NullLinkHub.razor index 41ffd9d..b69a0fd 100644 --- a/Starlight.Launcher/Components/Pages/NullLinkHub.razor +++ b/Starlight.Launcher.WebUI/Components/Pages/NullLinkHub.razor @@ -1,4 +1,7 @@ @page "/hub" +@using Starlight.Launcher.WebUI.Localization; + +@inherits LocalizedComponentBase
@@ -11,7 +14,7 @@
- @_localization["hub-menu-title"] + @L["hub-menu-title"] @if (_servers is not null) { @@ -35,7 +38,7 @@
- + - @_localization["hub-menu-server-list-empty"] + @L["hub-menu-server-list-empty"] } else @@ -85,7 +88,7 @@ @ParseDescription(server.Title) @if (server.IsAdultOnly) { - @_localization["hub-menu-server-adult-tag"] + @L["hub-menu-server-adult-tag"] } @@ -140,7 +143,7 @@ StartIcon="@Icons.Material.Filled.Login" Disabled="@(server.Status == ServerStatus.Offline)" OnClick="@(() => Connect(server))"> - @_localization["hub-menu-server-connect-button"] + @L["hub-menu-server-connect-button"] ? _servers; private string? _error; private CancellationTokenSource? _cts; @@ -34,7 +32,7 @@ protected override async Task OnInitializedAsync() await LoadAsync(_cts.Token); _ = PollLoopAsync(_cts.Token); - _settings.FavoritesChanged += OnFavoritesChanged; + _bridge.FavoritesChanged += OnFavoritesChanged; } private async Task PollLoopAsync(CancellationToken token) @@ -67,7 +65,7 @@ private async Task LoadAsync(CancellationToken token) { try { - var baseUrl = _settings.GetSettings().StarlightAPIUrl; + var baseUrl = _bridge.GetSettings().StarlightAPIUrl; var url = new Uri(new Uri(baseUrl), "api/servers"); var result = await _client.GetFromJsonAsync>(url, token); @@ -102,7 +100,7 @@ private async Task Connect(ServerListItem server) FullWidth = true }; - await _dialog.ShowAsync("Connecting", parameters, options); + _ = await _dialog.ShowAsync("Connecting", parameters, options); } private bool IsFavorite(ServerListItem server) @@ -110,18 +108,18 @@ private bool IsFavorite(ServerListItem server) private async Task ToggleFavorite(ServerListItem server) { - var favorites = _settings.GetFavorites(); + var favorites = _bridge.GetFavorites(); var alreadyExist = favorites.FirstOrDefault(x => x.Address == server.ConnectionString); if (alreadyExist is null or default(FavoriteServer?)) { favorites.Add(new FavoriteServer(server.Title, server.ConnectionString, "")); - await _settings.WriteFavoritesAsync(favorites); + await _bridge.WriteFavoritesAsync(favorites); } else if (alreadyExist != null) { - favorites.Remove(alreadyExist); - await _settings.WriteFavoritesAsync(favorites); + _ = favorites.Remove(alreadyExist); + await _bridge.WriteFavoritesAsync(favorites); } } @@ -131,7 +129,7 @@ private async void OnFavoritesChanged() { await InvokeAsync(() => { - _favoriteAddresses = _settings.GetFavoriteAddressesSnapshot(); + _favoriteAddresses = _bridge.GetFavoriteAddressesSnapshot(); StateHasChanged(); }); } @@ -203,7 +201,7 @@ public async ValueTask DisposeAsync() _cts.Dispose(); } - _settings.FavoritesChanged -= OnFavoritesChanged; + _bridge.FavoritesChanged -= OnFavoritesChanged; } private static MarkupString ParseDescription(string? text) diff --git a/Starlight.Launcher/Components/Pages/NullLinkHub.razor.css b/Starlight.Launcher.WebUI/Components/Pages/NullLinkHub.razor.css similarity index 100% rename from Starlight.Launcher/Components/Pages/NullLinkHub.razor.css rename to Starlight.Launcher.WebUI/Components/Pages/NullLinkHub.razor.css diff --git a/Starlight.Launcher/Components/Pages/Servers.razor b/Starlight.Launcher.WebUI/Components/Pages/Servers.razor similarity index 66% rename from Starlight.Launcher/Components/Pages/Servers.razor rename to Starlight.Launcher.WebUI/Components/Pages/Servers.razor index ff052fd..abe7565 100644 --- a/Starlight.Launcher/Components/Pages/Servers.razor +++ b/Starlight.Launcher.WebUI/Components/Pages/Servers.razor @@ -1,28 +1,30 @@ -@using Starlight.Launcher.Components.Atoms.ServerList -@using Starlight.Launcher.Models.Data -@using Starlight.Launcher.Services.ServerStatus +@using Starlight.Launcher.WebUI.Components.Atoms.ServerList +@using Starlight.Launcher.WebUI.Models.HubServerFetcher; +@using Starlight.Launcher.WebUI.Models.Data; +@using Starlight.Launcher.WebUI.Localization @page "/servers" @implements IDisposable +@inherits LocalizedComponentBase
- @if (_fetcher.Status == RefreshListStatus.NotUpdated || _fetcher.Status == RefreshListStatus.UpdatingMaster) + @if (_bridge.GetFetchStatus() == RefreshListStatus.NotUpdated || _bridge.GetFetchStatus() == RefreshListStatus.UpdatingMaster) {
- @_localization["servers-menu-loading"] + @L["servers-menu-loading"]
} - else if (_fetcher.Status == RefreshListStatus.Error && _totalCount == 0) + else if (_bridge.GetFetchStatus() == RefreshListStatus.Error && _totalCount == 0) {
- @_localization["servers-menu-fetch-failed"] + @L["servers-menu-fetch-failed"] - @_localization["servers-menu-try-again"] + @L["servers-menu-try-again"]
} @@ -33,7 +35,7 @@
@if (!_bottomSearch && _searchBarPosition == ElementPosition.Top) { - + } @if (_tagsBarPosition == ElementPosition.Top) { @@ -41,7 +43,7 @@ } @if (_bottomSearch && _searchBarPosition == ElementPosition.Top) { - + }
} @@ -52,7 +54,7 @@ }
- @if (_fetcher.Status == RefreshListStatus.PartialError) + @if (_bridge.GetFetchStatus() == RefreshListStatus.PartialError) { - @_localization["servers-menu-cant-reach-hubs"] + @L["servers-menu-cant-reach-hubs"] } @if (_filteredServers.Count == 0) @@ -78,12 +80,12 @@
- @(_totalCount == 0 ? _localization["servers-menu-no-online-servers"] : _localization["servers-menu-no-matched-servers"]) + @(_totalCount == 0 ? L["servers-menu-no-online-servers"] : L["servers-menu-no-matched-servers"]) @if (_totalCount > 0) { - @_localization["servers-menu-clear-filters"] + @L["servers-menu-clear-filters"] }
@@ -109,7 +111,7 @@ } @@ -128,7 +130,7 @@
@if (!_bottomSearch && _searchBarPosition == ElementPosition.Bottom) { - + } @if (_tagsBarPosition == ElementPosition.Bottom) { @@ -136,7 +138,7 @@ } @if (_bottomSearch && _searchBarPosition == ElementPosition.Bottom) { - + }
} diff --git a/Starlight.Launcher/Components/Pages/Servers.razor.cs b/Starlight.Launcher.WebUI/Components/Pages/Servers.razor.cs similarity index 85% rename from Starlight.Launcher/Components/Pages/Servers.razor.cs rename to Starlight.Launcher.WebUI/Components/Pages/Servers.razor.cs index de870ce..abfc0b3 100644 --- a/Starlight.Launcher/Components/Pages/Servers.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Pages/Servers.razor.cs @@ -1,25 +1,23 @@ using Microsoft.AspNetCore.Components; using Robust.Launcher.Api.Models.ServerStatus; -using Starlight.Launcher.Models.Data; -using Starlight.Launcher.Models.ServerStatus; -using Starlight.Launcher.Services.Localization; -using Starlight.Launcher.Services.ServerStatus; -using Starlight.Launcher.Services.Settings; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Localization; +using Starlight.Launcher.WebUI.Models.Data; +using Starlight.Launcher.WebUI.Models.HubServerFetcher; +using Starlight.Launcher.WebUI.Models.ServerStatus; using System.Collections.Concurrent; using System.Globalization; -namespace Starlight.Launcher.Components.Pages; +namespace Starlight.Launcher.WebUI.Components.Pages; -public partial class Servers : ComponentBase, IDisposable +public partial class Servers : LocalizedComponentBase, IDisposable { private const int ServerRefreshThrottleMs = 200; private const int FilterDebounceMs = 150; private const int FilterPersistDelayMs = 500; [Inject] private ServerStatusCache _cache { get; set; } = default!; - [Inject] private SettingsService _settings { get; set; } = default!; - [Inject] private HubServerFetcher _fetcher { get; set; } = default!; - [Inject] private LocalizationManager _localization { get; set; } = default!; + [Inject] private IBridge _bridge { get; set; } = default!; private ServerListFilters _filters = new(); private readonly CancellationTokenSource _disposeCts = new(); @@ -42,7 +40,7 @@ public partial class Servers : ComponentBase, IDisposable protected override async Task OnInitializedAsync() { - var settings = await _settings.GetSettingsAsync(); + var settings = await _bridge.GetSettingsAsync(); _bottomSearch = settings.ServerListToolbarBottomSearch; _searchBarPosition = settings.ServerListToolBarSearchPosition; _tagsBarPosition = settings.ServerListToolBarBottomTagsPosition; @@ -51,11 +49,11 @@ protected override async Task OnInitializedAsync() _filters.TagsExpanded = settings.ServerListToolBarTagsBarOpen; _filters.Changed += OnFiltersChanged; - _favoriteAddresses = _settings.GetFavoriteAddressesSnapshot(); - _settings.FavoritesChanged += OnFavoritesChanged; + _favoriteAddresses = _bridge.GetFavoriteAddressesSnapshot(); + _bridge.FavoritesChanged += OnFavoritesChanged; - _fetcher.ServersChanged += OnServersChanged; - _fetcher.StatusChanged += OnStatusChanged; + _bridge.ServersChanged += OnServersChanged; + _bridge.StatusChanged += OnStatusChanged; RebuildFromFetcher(); } @@ -70,13 +68,13 @@ private async void OnServersChanged() await Task.Delay(ServerRefreshThrottleMs, _disposeCts.Token); await InvokeAsync(() => { - Interlocked.Exchange(ref _rebuildScheduled, 0); + _ = Interlocked.Exchange(ref _rebuildScheduled, 0); RebuildFromFetcher(); StateHasChanged(); }); } - catch (OperationCanceledException) { Interlocked.Exchange(ref _rebuildScheduled, 0); } - catch (ObjectDisposedException) { Interlocked.Exchange(ref _rebuildScheduled, 0); } + catch (OperationCanceledException) { _ = Interlocked.Exchange(ref _rebuildScheduled, 0); } + catch (ObjectDisposedException) { _ = Interlocked.Exchange(ref _rebuildScheduled, 0); } } private async void OnStatusChanged(RefreshListStatus _) @@ -91,7 +89,7 @@ private async void OnFavoritesChanged() { await InvokeAsync(() => { - _favoriteAddresses = _settings.GetFavoriteAddressesSnapshot(); + _favoriteAddresses = _bridge.GetFavoriteAddressesSnapshot(); StateHasChanged(); }); } @@ -117,7 +115,7 @@ await InvokeAsync(() => }); await Task.Delay(FilterPersistDelayMs, token); - await _settings.CacheFilters(_filters); + await _bridge.CacheFilters(_filters); } catch (OperationCanceledException) { } catch (ObjectDisposedException) { } @@ -125,7 +123,7 @@ await InvokeAsync(() => private void RebuildFromFetcher() { - _allServers = _fetcher.AllServers; + _allServers = _bridge.GetAllServers(); _totalCount = _allServers.Count; ExtractTags(_allServers, out _availableRPTags, out _availableLangTags, out _availableRegionTags); ApplyFilters(); @@ -179,7 +177,7 @@ private void ApplyFilters() _filteredServers = [.. query]; } - private void HandleRefresh() => _fetcher.RequestRefresh(); + private void HandleRefresh() => _bridge.RequestRefresh(); private void ClearFilters() { @@ -194,25 +192,25 @@ private void ClearFilters() private async Task HandleFavorite(ServerStatusData server) { - var favorites = _settings.GetFavorites(); + var favorites = _bridge.GetFavorites(); var alreadyExist = favorites.FirstOrDefault(x => x.Address == server.Address); if ((alreadyExist == null || alreadyExist == default) && server.HubAddress != null) { favorites.Add(new FavoriteServer(server.Name, server.Address, server.HubAddress)); - await _settings.WriteFavoritesAsync(favorites); + await _bridge.WriteFavoritesAsync(favorites); } else if (alreadyExist != null) { - favorites.Remove(alreadyExist); - await _settings.WriteFavoritesAsync(favorites); + _ = favorites.Remove(alreadyExist); + await _bridge.WriteFavoritesAsync(favorites); } } private void HandleInfoNeeded(ServerStatusData server) { - ((IServerSource)_fetcher).UpdateInfoFor(server); - _cache.TryInitialPing(server); + _bridge.UpdateInfoFor(server); + _ = _cache.TryInitialPing(server); } private static void ExtractTags(IEnumerable servers, out IReadOnlyList rpTags, out IReadOnlyList langTags, out IReadOnlyList regionTags) @@ -336,13 +334,14 @@ private static bool IsAdult(ServerStatusData s) return false; } - public void Dispose() + public override void Dispose() { + base.Dispose(); GC.SuppressFinalize(this); - _fetcher.ServersChanged -= OnServersChanged; - _fetcher.StatusChanged -= OnStatusChanged; + _bridge.ServersChanged -= OnServersChanged; + _bridge.StatusChanged -= OnStatusChanged; _filters.Changed -= OnFiltersChanged; - _settings.FavoritesChanged -= OnFavoritesChanged; + _bridge.FavoritesChanged -= OnFavoritesChanged; _disposeCts.Cancel(); _disposeCts.Dispose(); _filterCts?.Dispose(); diff --git a/Starlight.Launcher/Components/Pages/Servers.razor.css b/Starlight.Launcher.WebUI/Components/Pages/Servers.razor.css similarity index 100% rename from Starlight.Launcher/Components/Pages/Servers.razor.css rename to Starlight.Launcher.WebUI/Components/Pages/Servers.razor.css diff --git a/Starlight.Launcher.WebUI/Components/Pages/Settings.razor b/Starlight.Launcher.WebUI/Components/Pages/Settings.razor new file mode 100644 index 0000000..3d5340f --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Pages/Settings.razor @@ -0,0 +1,80 @@ +@page "/settings" + +@using System.Globalization +@using Starlight.Launcher.WebUI.Components.Atoms.Settings +@using Starlight.Launcher.WebUI.Models.Data +@using Starlight.Launcher.WebUI.Models.Settings +@using Starlight.Launcher.WebUI.Localization + +@inherits LocalizedComponentBase + +
+ +
+ + + + @L["settings-menu-general-category"] + + + + + @L["settings-menu-update-option"] + + + + + + @L["settings-menu-general-category"] + + + + + + + + @L["settings-menu-general-category"] + + + + @L["settings-menu-server-list-category"] + + + + + @L["settings-menu-tray-category"] + + + + + + + + + + + @L["settings-menu-general-category"] + + + + + + + + + + + +
+ + @L["settings-menu-reset-option"] + +
+
diff --git a/Starlight.Launcher/Components/Pages/Settings.razor.cs b/Starlight.Launcher.WebUI/Components/Pages/Settings.razor.cs similarity index 62% rename from Starlight.Launcher/Components/Pages/Settings.razor.cs rename to Starlight.Launcher.WebUI/Components/Pages/Settings.razor.cs index 3a01879..a6f81e0 100644 --- a/Starlight.Launcher/Components/Pages/Settings.razor.cs +++ b/Starlight.Launcher.WebUI/Components/Pages/Settings.razor.cs @@ -1,26 +1,22 @@ -using System.Diagnostics; -using System.Globalization; +using System.Globalization; using Microsoft.AspNetCore.Components; using MudBlazor; -using Starlight.Launcher.Components.Atoms.Dialogs; -using Starlight.Launcher.Components.Atoms.Settings; -using Starlight.Launcher.Models.Settings; -using Starlight.Launcher.Services; -using Starlight.Launcher.Services.Localization; -using Starlight.Launcher.Services.Settings; -using Starlight.Launcher.Services.State; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Components.Atoms.Dialogs; +using Starlight.Launcher.WebUI.Components.Atoms.Settings; +using Starlight.Launcher.WebUI.Localization; +using Starlight.Launcher.WebUI.Models.Settings; +using Starlight.Launcher.WebUI.Services; -namespace Starlight.Launcher.Components.Pages; +namespace Starlight.Launcher.WebUI.Components.Pages; -public partial class Settings : ComponentBase, IDisposable +public partial class Settings : LocalizedComponentBase, IDisposable { - [Inject] private LocalizationManager _localization { get; set; } = default!; - [Inject] private SettingsService _settings { get; set; } = default!; + [Inject] private IBridge _bridge { get; set; } = default!; [Inject] private AppState _state { get; set; } = default!; [Inject] private IDialogService _dialog { get; set; } = default!; [Inject] private IFileDialogService _fileDialog { get; set; } = default!; [Inject] private NavigationManager _navigation { get; set; } = default!; - [Inject] private LauncherUpdater _launcherUpdater { get; set; } = default!; [Inject] private ISnackbar _snackbar { get; set; } = default!; private List _availableLanguages = []; @@ -35,27 +31,28 @@ public partial class Settings : ComponentBase, IDisposable protected override async Task OnInitializedAsync() { - var settings = await _settings.GetSettingsAsync(); - _availableLanguages = _localization.EnumarateAllLoadedLanguages().Select(x => new CultureInfo(x).Name).ToList(); - _state.OnChange += OnStateChanged; + var settings = await _bridge.GetSettingsAsync(); + _availableLanguages = L.EnumarateAllLoadedLanguages().Select(x => new CultureInfo(x).Name).ToList(); await base.OnInitializedAsync(); } private async Task OnResetSettings() { var confirmed = await _dialog.ShowMessageBoxAsync( - _localization["settings-menu-reset-confirm-title"], - _localization["settings-menu-reset-confirm-text"], - yesText: _localization["settings-menu-reset-confirm-yes"], - cancelText: _localization["settings-menu-reset-confirm-cancel"]); + L["settings-menu-reset-confirm-title"], + L["settings-menu-reset-confirm-text"], + yesText: L["settings-menu-reset-confirm-yes"], + cancelText: L["settings-menu-reset-confirm-cancel"]); if (confirmed != true) return; - var settings = new AppSettings(); - settings.LastSeenChangelogVersion = LauncherUpdater.GetVersion(); + var settings = new AppSettings + { + LastSeenChangelogVersion = _bridge.GetVersion() + }; - await _settings.WriteSettingsAsync(settings); + await _bridge.WriteSettingsAsync(settings); _appSettingsCache = null; _state.CallUpdate(); @@ -65,21 +62,21 @@ private async Task OnResetSettings() private async Task CheckUpdate() { - var info = await _launcherUpdater.IsUpdateAvailable(); + var info = await _bridge.IsUpdateAvailable(); if (!info.IsUpdateAvailable) { - _snackbar.Add(_localization["settings-menu-update-latest"], Severity.Success); + _ = _snackbar.Add(L["settings-menu-update-latest"], Severity.Success); return; } - _snackbar.Add( - _localization.GetString("settings-menu-update-found", ("latest", info.LatestVersion)), + _ = _snackbar.Add( + L.GetString("settings-menu-update-found", ("latest", info.LatestVersion)), Severity.Warning, config => { - config.Action = _localization["settings-menu-update-download"]; + config.Action = L["settings-menu-update-download"]; config.ActionColor = MudBlazor.Color.Primary; - config.OnClick = _ => + config.OnClick = __ => { if (info.Asset is { } asset) { @@ -87,7 +84,7 @@ private async Task CheckUpdate() { { x => x.Asset, asset } }; - _dialog.ShowAsync( + _ = _dialog.ShowAsync( null, parameters, new DialogOptions @@ -100,20 +97,13 @@ private async Task CheckUpdate() else { // No installer for this OS in the release — fall back to the release page. - Process.Start(new ProcessStartInfo - { - FileName = info.ReleasePageUrl, - UseShellExecute = true - }); + _bridge.OpenBrowser(info.ReleasePageUrl); } return Task.CompletedTask; }; }); } - private void OnStateChanged() - => StateHasChanged(); - private async void OnActivePanelIndexChanged(int value) { var index = _tabs.Panels.Select((value, index) => (value, index)).FirstOrDefault(x => ReferenceEquals(x.value, _developmentTab)).index; @@ -128,13 +118,13 @@ private async void OnActivePanelIndexChanged(int value) BackdropClick = false, }; - var settings = await _settings.GetSettingsAsync(); + var settings = await _bridge.GetSettingsAsync(); if (!settings.DevPolicyAccepted) { - var dialog = await _dialog.ShowAsync(_localization["settings-development-tab-alert-title"], options); + var dialog = await _dialog.ShowAsync(L["settings-development-tab-alert-title"], options); if (dialog.Dialog is AlertDialog alert) { - alert.OnSuccess += async () => await _settings.WriteSettingsAsync(await _settings.GetSettingsAsync() with { DevPolicyAccepted = true }); + alert.OnSuccess += async () => await _bridge.WriteSettingsAsync(await _bridge.GetSettingsAsync() with { DevPolicyAccepted = true }); alert.OnCancel += async () => await _tabs.ActivatePanelAsync(_generalTab); } } @@ -145,10 +135,10 @@ private Task OnLanguageChanged(string? value, Action? setLocal, Func update) { if (value is not null && _availableLanguages.Contains(value)) - _localization.SwitchLanguage(value?.ToString() ?? string.Empty); + L.SwitchLanguage(value?.ToString() ?? string.Empty); setLocal?.Invoke(value); - return UpdateSetting(s => update(s, value), true); + return UpdateSetting(s => update(s, value)); } private Task OnSettingChanged(T value, Action? setLocal, Func update, bool callWindowUpdate = false) @@ -159,9 +149,9 @@ private Task OnSettingChanged(T value, Action? setLocal, Func update, bool callWindowUpdate = false) { - var settings = await _settings.GetSettingsAsync(); + var settings = await _bridge.GetSettingsAsync(); var newSettings = update(settings); - await _settings.WriteSettingsAsync(newSettings); + await _bridge.WriteSettingsAsync(newSettings); if (callWindowUpdate) _state.CallUpdate(); } @@ -176,7 +166,7 @@ private async Task FetchSettings(Func func) } else { - settings = await _settings.GetSettingsAsync(); + settings = await _bridge.GetSettingsAsync(); _appSettingsCache = settings; _lastCacheUpdate = DateTime.Now; } @@ -194,10 +184,4 @@ private static List ConvertToHubList(List<(string Url, long Priority)> list return hubUris; } - - public void Dispose() - { - _state.OnChange -= OnStateChanged; - GC.SuppressFinalize(this); - } } diff --git a/Starlight.Launcher.WebUI/Components/Pages/Settings.razor.css b/Starlight.Launcher.WebUI/Components/Pages/Settings.razor.css new file mode 100644 index 0000000..c09e8eb --- /dev/null +++ b/Starlight.Launcher.WebUI/Components/Pages/Settings.razor.css @@ -0,0 +1,31 @@ +.settings-page { + display: flex; + flex-direction: column; + flex: 1 1 auto; + min-height: 0; + position: relative; +} + +.settings-reset-button { + position: fixed; + right: 36px; + bottom: 32px; + z-index: 100; + border-radius: 12px !important; + background: color-mix(in srgb, var(--mud-palette-error) 10%, transparent) !important; + backdrop-filter: blur(14px); + -webkit-backdrop-filter: blur(14px); + border-color: color-mix(in srgb, var(--mud-palette-error) 35%, transparent) !important; +} + + .settings-reset-button:hover { + background: color-mix(in srgb, var(--mud-palette-error) 18%, transparent) !important; + } + +.mud-main-content.has-bottom-nav .settings-reset-button { + bottom: calc(32px + var(--bottom-nav-height)); +} + +.mud-tabs-tabbar { + border-radius: 10px; +} diff --git a/Starlight.Launcher/Components/Routes.razor b/Starlight.Launcher.WebUI/Components/Routes.razor similarity index 68% rename from Starlight.Launcher/Components/Routes.razor rename to Starlight.Launcher.WebUI/Components/Routes.razor index 9059591..267dcd1 100644 --- a/Starlight.Launcher/Components/Routes.razor +++ b/Starlight.Launcher.WebUI/Components/Routes.razor @@ -1,4 +1,4 @@ - + diff --git a/Starlight.Launcher.WebUI/Localization/ILocalizationManager.cs b/Starlight.Launcher.WebUI/Localization/ILocalizationManager.cs new file mode 100644 index 0000000..2ecddbb --- /dev/null +++ b/Starlight.Launcher.WebUI/Localization/ILocalizationManager.cs @@ -0,0 +1,22 @@ +using System.Globalization; + +namespace Starlight.Launcher.WebUI.Localization; + +public interface ILocalizationManager +{ + event Action? Changed; + + string this[string key] { get; } + + string GetString(string key); + + string GetString(string key, params (string, object?)[] args); + + void SwitchLanguage(string cultureName); + + void SwitchLanguage(CultureInfo? culture); + + List EnumarateAllLoadedLanguages(); + + Task Initialize(); +} diff --git a/Starlight.Launcher.WebUI/Localization/LocalizedComponentBase.cs b/Starlight.Launcher.WebUI/Localization/LocalizedComponentBase.cs new file mode 100644 index 0000000..ae37b60 --- /dev/null +++ b/Starlight.Launcher.WebUI/Localization/LocalizedComponentBase.cs @@ -0,0 +1,19 @@ +using Microsoft.AspNetCore.Components; + +namespace Starlight.Launcher.WebUI.Localization; + +/// +/// Base for components that localize text. Use cL[id]c in markup; the component +/// +/// re-renders automatically when localization reloads. +/// +public abstract class LocalizedComponentBase : ComponentBase, IDisposable +{ + [Inject] protected ILocalizationManager L { get; set; } = default!; + + protected override void OnInitialized() => L.Changed += OnLocalizationChanged; + + private void OnLocalizationChanged() => InvokeAsync(StateHasChanged); + + public virtual void Dispose() => L.Changed -= OnLocalizationChanged; +} diff --git a/Starlight.Launcher.WebUI/Localization/LocalizedLayoutBase.cs b/Starlight.Launcher.WebUI/Localization/LocalizedLayoutBase.cs new file mode 100644 index 0000000..2529f4c --- /dev/null +++ b/Starlight.Launcher.WebUI/Localization/LocalizedLayoutBase.cs @@ -0,0 +1,17 @@ +using Microsoft.AspNetCore.Components; + +namespace Starlight.Launcher.WebUI.Localization; + +/// +/// Same as just for layouts. +/// +public abstract class LocalizedLayoutBase : LayoutComponentBase, IDisposable +{ + [Inject] protected ILocalizationManager L { get; set; } = default!; + + protected override void OnInitialized() => L.Changed += OnLocalizationChanged; + + private void OnLocalizationChanged() => InvokeAsync(StateHasChanged); + + public virtual void Dispose() => L.Changed -= OnLocalizationChanged; +} diff --git a/Starlight.Launcher/Models/LoggedInAccount.cs b/Starlight.Launcher.WebUI/Models/Auth/LoggedInAccount.cs similarity index 81% rename from Starlight.Launcher/Models/LoggedInAccount.cs rename to Starlight.Launcher.WebUI/Models/Auth/LoggedInAccount.cs index 9480fae..f939936 100644 --- a/Starlight.Launcher/Models/LoggedInAccount.cs +++ b/Starlight.Launcher.WebUI/Models/Auth/LoggedInAccount.cs @@ -1,8 +1,8 @@ using Robust.Launcher.Api.Models; using Robust.Launcher.Api.Models.Data; -using Starlight.Launcher.Models.Helpers; +using Starlight.Launcher.WebUI.Models.Helpers; -namespace Starlight.Launcher.Api.Models; +namespace Starlight.Launcher.WebUI.Models.Auth; public abstract class LoggedInAccount : ObservableObject { diff --git a/Starlight.Launcher.WebUI/Models/Connector/ConnectionStatus.cs b/Starlight.Launcher.WebUI/Models/Connector/ConnectionStatus.cs new file mode 100644 index 0000000..e28c12d --- /dev/null +++ b/Starlight.Launcher.WebUI/Models/Connector/ConnectionStatus.cs @@ -0,0 +1,16 @@ +namespace Starlight.Launcher.WebUI.Models.Connector; + +public enum ConnectionStatus +{ + None, + Updating, + UpdateError, + Connecting, + AwaitingPrivacyPolicyAcceptance, + ConnectionFailed, + StartingClient, + ClientRunning, + ClientExited, + Cancelled, + NotAContentBundle +} diff --git a/Starlight.Launcher.WebUI/Models/Connector/PrivacyPolicyAcceptResult.cs b/Starlight.Launcher.WebUI/Models/Connector/PrivacyPolicyAcceptResult.cs new file mode 100644 index 0000000..43cf74c --- /dev/null +++ b/Starlight.Launcher.WebUI/Models/Connector/PrivacyPolicyAcceptResult.cs @@ -0,0 +1,7 @@ +namespace Starlight.Launcher.WebUI.Models.Connector; + +public enum PrivacyPolicyAcceptResult +{ + Denied, + Accepted, +} diff --git a/Starlight.Launcher/Models/Data/AcceptedPrivacyPolicy.cs b/Starlight.Launcher.WebUI/Models/Data/AcceptedPrivacyPolicy.cs similarity index 82% rename from Starlight.Launcher/Models/Data/AcceptedPrivacyPolicy.cs rename to Starlight.Launcher.WebUI/Models/Data/AcceptedPrivacyPolicy.cs index 2c242b9..8479052 100644 --- a/Starlight.Launcher/Models/Data/AcceptedPrivacyPolicy.cs +++ b/Starlight.Launcher.WebUI/Models/Data/AcceptedPrivacyPolicy.cs @@ -1,8 +1,8 @@ -namespace Starlight.Launcher.Models.Data; +namespace Starlight.Launcher.WebUI.Models.Data; public record AcceptedPrivacyPolicy { public required string Version { get; init; } public DateTimeOffset AcceptedTime { get; init; } = DateTimeOffset.UtcNow; public DateTimeOffset LastConnected { get; init; } = DateTimeOffset.UtcNow; -} \ No newline at end of file +} diff --git a/Starlight.Launcher/Models/Data/ElementPosition.cs b/Starlight.Launcher.WebUI/Models/Data/ElementPosition.cs similarity index 59% rename from Starlight.Launcher/Models/Data/ElementPosition.cs rename to Starlight.Launcher.WebUI/Models/Data/ElementPosition.cs index 4975350..604545b 100644 --- a/Starlight.Launcher/Models/Data/ElementPosition.cs +++ b/Starlight.Launcher.WebUI/Models/Data/ElementPosition.cs @@ -1,4 +1,4 @@ -namespace Starlight.Launcher.Models.Data; +namespace Starlight.Launcher.WebUI.Models.Data; public enum ElementPosition { diff --git a/Starlight.Launcher/Models/Data/FavoriteServer.cs b/Starlight.Launcher.WebUI/Models/Data/FavoriteServer.cs similarity index 82% rename from Starlight.Launcher/Models/Data/FavoriteServer.cs rename to Starlight.Launcher.WebUI/Models/Data/FavoriteServer.cs index 170e727..560bcfb 100644 --- a/Starlight.Launcher/Models/Data/FavoriteServer.cs +++ b/Starlight.Launcher.WebUI/Models/Data/FavoriteServer.cs @@ -1,4 +1,4 @@ -namespace Starlight.Launcher.Models.Data; +namespace Starlight.Launcher.WebUI.Models.Data; public record FavoriteServer(string? Name, string Address, string HubAddress) { diff --git a/Starlight.Launcher/Models/RobustCdn.cs b/Starlight.Launcher.WebUI/Models/Data/RobustCdn.cs similarity index 95% rename from Starlight.Launcher/Models/RobustCdn.cs rename to Starlight.Launcher.WebUI/Models/Data/RobustCdn.cs index 3912910..2024f56 100644 --- a/Starlight.Launcher/Models/RobustCdn.cs +++ b/Starlight.Launcher.WebUI/Models/Data/RobustCdn.cs @@ -1,6 +1,6 @@ using Robust.Launcher.Api.Utility; -namespace Starlight.Launcher.Models; +namespace Starlight.Launcher.WebUI.Models.Data; public sealed class RobustCdn { diff --git a/Starlight.Launcher.WebUI/Models/DiscordAuthService/DiscordAuthException.cs b/Starlight.Launcher.WebUI/Models/DiscordAuthService/DiscordAuthException.cs new file mode 100644 index 0000000..6a5f1a3 --- /dev/null +++ b/Starlight.Launcher.WebUI/Models/DiscordAuthService/DiscordAuthException.cs @@ -0,0 +1,3 @@ +namespace Starlight.Launcher.WebUI.Models.DiscordAuthService; + +public sealed class DiscordAuthException(string message) : Exception(message); diff --git a/Starlight.Launcher.WebUI/Models/DiscordAuthService/HandoffResult.cs b/Starlight.Launcher.WebUI/Models/DiscordAuthService/HandoffResult.cs new file mode 100644 index 0000000..4cb00c5 --- /dev/null +++ b/Starlight.Launcher.WebUI/Models/DiscordAuthService/HandoffResult.cs @@ -0,0 +1,3 @@ +namespace Starlight.Launcher.WebUI.Models.DiscordAuthService; + +public sealed record HandoffResult(string Token, string? RefreshToken, string? SessionId); diff --git a/Starlight.Launcher.WebUI/Models/DiscordRichPresence/PresenceState.cs b/Starlight.Launcher.WebUI/Models/DiscordRichPresence/PresenceState.cs new file mode 100644 index 0000000..64513c1 --- /dev/null +++ b/Starlight.Launcher.WebUI/Models/DiscordRichPresence/PresenceState.cs @@ -0,0 +1,10 @@ +namespace Starlight.Launcher.WebUI.Models.DiscordRichPresence; + +public enum PresenceState +{ + Idle, // Home screen, not doing anything + SearchingServers, // Browsing server list + SettingUp, // Configuring settings, etc. + DownloadingContent, + LaunchingGame +} diff --git a/Starlight.Launcher.WebUI/Models/Helpers/IFileResult.cs b/Starlight.Launcher.WebUI/Models/Helpers/IFileResult.cs new file mode 100644 index 0000000..7890bc4 --- /dev/null +++ b/Starlight.Launcher.WebUI/Models/Helpers/IFileResult.cs @@ -0,0 +1,12 @@ +namespace Starlight.Launcher.WebUI.Models.Helpers; + +public interface IFileResult +{ + string FileName { get; init; } + + string FullPath { get; init; } + + Task OpenReadAsync(); + + Task OpenWriteAsync(); +} diff --git a/Starlight.Launcher/Models/Helpers/ObservableObject.cs b/Starlight.Launcher.WebUI/Models/Helpers/ObservableObject.cs similarity index 93% rename from Starlight.Launcher/Models/Helpers/ObservableObject.cs rename to Starlight.Launcher.WebUI/Models/Helpers/ObservableObject.cs index 09ca16b..751162e 100644 --- a/Starlight.Launcher/Models/Helpers/ObservableObject.cs +++ b/Starlight.Launcher.WebUI/Models/Helpers/ObservableObject.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using System.Runtime.CompilerServices; -namespace Starlight.Launcher.Models.Helpers; +namespace Starlight.Launcher.WebUI.Models.Helpers; public abstract class ObservableObject : INotifyPropertyChanged { diff --git a/Starlight.Launcher.WebUI/Models/HubServerFetcher/HubServerListEntry.cs b/Starlight.Launcher.WebUI/Models/HubServerFetcher/HubServerListEntry.cs new file mode 100644 index 0000000..981d719 --- /dev/null +++ b/Starlight.Launcher.WebUI/Models/HubServerFetcher/HubServerListEntry.cs @@ -0,0 +1,5 @@ +using Robust.Launcher.Api.Api; + +namespace Starlight.Launcher.WebUI.Models.HubServerFetcher; + +public sealed record HubServerListEntry(string Address, string HubAddress, ServerApi.ServerStatus StatusData); diff --git a/Starlight.Launcher.WebUI/Models/HubServerFetcher/RefreshListStatus.cs b/Starlight.Launcher.WebUI/Models/HubServerFetcher/RefreshListStatus.cs new file mode 100644 index 0000000..7a51a62 --- /dev/null +++ b/Starlight.Launcher.WebUI/Models/HubServerFetcher/RefreshListStatus.cs @@ -0,0 +1,29 @@ +namespace Starlight.Launcher.WebUI.Models.HubServerFetcher; + +public enum RefreshListStatus +{ + /// + /// Hasn't started updating yet? + /// + NotUpdated, + + /// + /// Fetching master server list. + /// + UpdatingMaster, + + /// + /// Fetched information from ALL servers from the hub. + /// + Updated, + + /// + /// A connection error occured when fetching from at least one hub. + /// + PartialError, + + /// + /// An error occured. + /// + Error, +} diff --git a/Starlight.Launcher.WebUI/Models/LauncherUpdater/ChangelogEntry.cs b/Starlight.Launcher.WebUI/Models/LauncherUpdater/ChangelogEntry.cs new file mode 100644 index 0000000..4268665 --- /dev/null +++ b/Starlight.Launcher.WebUI/Models/LauncherUpdater/ChangelogEntry.cs @@ -0,0 +1,3 @@ +namespace Starlight.Launcher.WebUI.Models.LauncherUpdater; + +public sealed record ChangelogEntry(string Version, string? Notes); diff --git a/Starlight.Launcher.WebUI/Models/LauncherUpdater/ReleaseAsset.cs b/Starlight.Launcher.WebUI/Models/LauncherUpdater/ReleaseAsset.cs new file mode 100644 index 0000000..a5881ae --- /dev/null +++ b/Starlight.Launcher.WebUI/Models/LauncherUpdater/ReleaseAsset.cs @@ -0,0 +1,3 @@ +namespace Starlight.Launcher.WebUI.Models.LauncherUpdater; + +public sealed record ReleaseAsset(string Name, string DownloadUrl, long Size); diff --git a/Starlight.Launcher.WebUI/Models/LauncherUpdater/UpdateInfo.cs b/Starlight.Launcher.WebUI/Models/LauncherUpdater/UpdateInfo.cs new file mode 100644 index 0000000..b8d7670 --- /dev/null +++ b/Starlight.Launcher.WebUI/Models/LauncherUpdater/UpdateInfo.cs @@ -0,0 +1,9 @@ +namespace Starlight.Launcher.WebUI.Models.LauncherUpdater; + +public sealed record UpdateInfo( + bool IsUpdateAvailable, + string CurrentVersion, + string LatestVersion, + string ReleasePageUrl, + string ReleaseNotes, + ReleaseAsset? Asset); diff --git a/Starlight.Launcher/Models/ServerStatus/ServerListFilters.cs b/Starlight.Launcher.WebUI/Models/ServerStatus/ServerListFilters.cs similarity index 93% rename from Starlight.Launcher/Models/ServerStatus/ServerListFilters.cs rename to Starlight.Launcher.WebUI/Models/ServerStatus/ServerListFilters.cs index cf1271e..bca35d3 100644 --- a/Starlight.Launcher/Models/ServerStatus/ServerListFilters.cs +++ b/Starlight.Launcher.WebUI/Models/ServerStatus/ServerListFilters.cs @@ -1,4 +1,4 @@ -namespace Starlight.Launcher.Models.ServerStatus; +namespace Starlight.Launcher.WebUI.Models.ServerStatus; public sealed class ServerListFilters { @@ -22,4 +22,4 @@ public enum ServerSortMode Players, Name, Ping, -} \ No newline at end of file +} diff --git a/Starlight.Launcher/Models/Settings/AppSettings.Paths.cs b/Starlight.Launcher.WebUI/Models/Settings/AppSettings.Paths.cs similarity index 82% rename from Starlight.Launcher/Models/Settings/AppSettings.Paths.cs rename to Starlight.Launcher.WebUI/Models/Settings/AppSettings.Paths.cs index 16b0752..d012319 100644 --- a/Starlight.Launcher/Models/Settings/AppSettings.Paths.cs +++ b/Starlight.Launcher.WebUI/Models/Settings/AppSettings.Paths.cs @@ -1,8 +1,8 @@ -using Robust.Launcher.Api.Utility; -using System.Collections.Immutable; +using System.Collections.Immutable; using System.Text.Json.Serialization; +using Starlight.Launcher.WebUI.Models.Data; -namespace Starlight.Launcher.Models.Settings; +namespace Starlight.Launcher.WebUI.Models.Settings; public partial record AppSettings { @@ -11,7 +11,16 @@ public partial record AppSettings /// /// Base directory for all launcher data. This is currently the one "real" hardcoded path. /// - public string DirLauncherData { get; init; } = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Starlight.Launcher"); + public string DirLauncherData { get; init; } = GetDefaultDataDirectory(); + + private static string GetDefaultDataDirectory() + { + var baseDir = OperatingSystem.IsMacOS() + ? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), "Library", "Application Support") + : Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); + + return Path.Combine(baseDir, "Starlight.Launcher"); + } /// /// Where the launcher itself is installed. Used to locate the loader/engine (release builds). diff --git a/Starlight.Launcher/Models/Settings/AppSettings.cs b/Starlight.Launcher.WebUI/Models/Settings/AppSettings.cs similarity index 97% rename from Starlight.Launcher/Models/Settings/AppSettings.cs rename to Starlight.Launcher.WebUI/Models/Settings/AppSettings.cs index 86a0f0c..2b8e7f0 100644 --- a/Starlight.Launcher/Models/Settings/AppSettings.cs +++ b/Starlight.Launcher.WebUI/Models/Settings/AppSettings.cs @@ -1,7 +1,7 @@ -using Starlight.Launcher.Models.Data; -using Starlight.Launcher.Models.ServerStatus; +using Starlight.Launcher.WebUI.Models.Data; +using Starlight.Launcher.WebUI.Models.ServerStatus; -namespace Starlight.Launcher.Models.Settings; +namespace Starlight.Launcher.WebUI.Models.Settings; public partial record AppSettings { diff --git a/Starlight.Launcher/Models/Settings/AppTheme.cs b/Starlight.Launcher.WebUI/Models/Settings/AppTheme.cs similarity index 60% rename from Starlight.Launcher/Models/Settings/AppTheme.cs rename to Starlight.Launcher.WebUI/Models/Settings/AppTheme.cs index 4107964..6d94163 100644 --- a/Starlight.Launcher/Models/Settings/AppTheme.cs +++ b/Starlight.Launcher.WebUI/Models/Settings/AppTheme.cs @@ -1,4 +1,4 @@ -namespace Starlight.Launcher.Models.Settings; +namespace Starlight.Launcher.WebUI.Models.Settings; public enum AppTheme { @@ -13,4 +13,9 @@ public enum AppTheme VioletLight = 8, VioletDark = 9, OceanLight = 10, + OceanDark = 11, + CitrusLight = 12, + CitrusDark = 13, + SlateLight = 14, + SlateDark = 15, } diff --git a/Starlight.Launcher/Models/Settings/Hub.cs b/Starlight.Launcher.WebUI/Models/Settings/Hub.cs similarity index 68% rename from Starlight.Launcher/Models/Settings/Hub.cs rename to Starlight.Launcher.WebUI/Models/Settings/Hub.cs index 0134a57..8a8cbd9 100644 --- a/Starlight.Launcher/Models/Settings/Hub.cs +++ b/Starlight.Launcher.WebUI/Models/Settings/Hub.cs @@ -1,8 +1,8 @@ -namespace Starlight.Launcher.Models.Settings; +namespace Starlight.Launcher.WebUI.Models.Settings; public record Hub { public required Uri HubUri { get; set; } public required long Priority { get; set; } -} \ No newline at end of file +} diff --git a/Starlight.Launcher.WebUI/Models/Updater/ProgressUnit.cs b/Starlight.Launcher.WebUI/Models/Updater/ProgressUnit.cs new file mode 100644 index 0000000..628da38 --- /dev/null +++ b/Starlight.Launcher.WebUI/Models/Updater/ProgressUnit.cs @@ -0,0 +1,7 @@ +namespace Starlight.Launcher.WebUI.Models.Updater; + +public enum ProgressUnit +{ + None, + Bytes, +} diff --git a/Starlight.Launcher.WebUI/Models/Updater/UpdateStatus.cs b/Starlight.Launcher.WebUI/Models/Updater/UpdateStatus.cs new file mode 100644 index 0000000..54b40ab --- /dev/null +++ b/Starlight.Launcher.WebUI/Models/Updater/UpdateStatus.cs @@ -0,0 +1,19 @@ +namespace Starlight.Launcher.WebUI.Models.Updater; + +public enum UpdateStatus +{ + CheckingClientUpdate, + CheckingEngineModules, + DownloadingEngineVersion, + DownloadingEngineModules, + FetchingClientManifest, + DownloadingClientUpdate, + Verifying, + CommittingDownload, + LoadingIntoDb, + CullingEngine, + CullingContent, + Ready, + Error, + LoadingContentBundle, +} diff --git a/Starlight.Launcher.WebUI/Services/AppState.cs b/Starlight.Launcher.WebUI/Services/AppState.cs new file mode 100644 index 0000000..ba564eb --- /dev/null +++ b/Starlight.Launcher.WebUI/Services/AppState.cs @@ -0,0 +1,8 @@ +namespace Starlight.Launcher.WebUI.Services; + +public class AppState +{ + public event Action? OnChange; + + public void CallUpdate() => OnChange?.Invoke(); +} diff --git a/Starlight.Launcher.WebUI/Services/IFileDialogService.cs b/Starlight.Launcher.WebUI/Services/IFileDialogService.cs new file mode 100644 index 0000000..7b2b5a2 --- /dev/null +++ b/Starlight.Launcher.WebUI/Services/IFileDialogService.cs @@ -0,0 +1,9 @@ +using Starlight.Launcher.WebUI.Models.Helpers; + +namespace Starlight.Launcher.WebUI.Services; + +public interface IFileDialogService +{ + Task PickFileAsync(string filter = "Content bundles / replays\0*.zip;*.rt\0All Files\0*.*\0\0", CancellationToken cancel = default); + Task PickFolderAsync(CancellationToken cancel = default); +} diff --git a/Starlight.Launcher/Services/UiTicker.cs b/Starlight.Launcher.WebUI/Services/UiTicker.cs similarity index 97% rename from Starlight.Launcher/Services/UiTicker.cs rename to Starlight.Launcher.WebUI/Services/UiTicker.cs index 326c1fd..5b3b799 100644 --- a/Starlight.Launcher/Services/UiTicker.cs +++ b/Starlight.Launcher.WebUI/Services/UiTicker.cs @@ -1,4 +1,4 @@ -namespace Starlight.Launcher.Services; +namespace Starlight.Launcher.WebUI.Services; public sealed class UiTicker : IDisposable { diff --git a/Starlight.Launcher.WebUI/Services/WebHostFactory.cs b/Starlight.Launcher.WebUI/Services/WebHostFactory.cs new file mode 100644 index 0000000..eaa2340 --- /dev/null +++ b/Starlight.Launcher.WebUI/Services/WebHostFactory.cs @@ -0,0 +1,62 @@ +using System.Net; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Hosting.Server.Features; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using MudBlazor.Services; +using Starlight.Launcher.WebUI.Components; + +namespace Starlight.Launcher.WebUI; + +public static class WebHostFactory +{ + public static WebApplication Create(Action? configureServices = null) + { + var builder = WebApplication.CreateBuilder(new WebApplicationOptions + { + ContentRootPath = AppContext.BaseDirectory, + EnvironmentName = Environments.Production, + }); + + _ = builder.WebHost.UseKestrel(o => o.Listen(IPAddress.Loopback, 0)); + + _ = builder.WebHost.UseStaticWebAssets(); + + _ = builder.Services.AddRazorComponents().AddInteractiveServerComponents(); + + _ = builder.Services.Configure(options => options.ShutdownTimeout = TimeSpan.FromSeconds(2)); + + _ = builder.Services.AddMudServices(); + + configureServices?.Invoke(builder.Services); + + var app = builder.Build(); + + var env = app.Services.GetRequiredService(); + + if (!app.Environment.IsDevelopment()) + _ = app.UseExceptionHandler("/Error"); + + _ = app.UseStaticFiles(); + _ = app.UseAntiforgery(); + + _ = app.MapRazorComponents() + .AddInteractiveServerRenderMode(); + + return app; + } + + public static Uri GetListenAddress(WebApplication app) + { + var feature = app.Services + .GetRequiredService() + .Features.Get(); + + var address = feature?.Addresses.FirstOrDefault() + ?? throw new InvalidOperationException("Kestrel didn't report a bound address."); + + return new Uri(address); + } +} diff --git a/Starlight.Launcher.WebUI/Starlight.Launcher.WebUI.csproj b/Starlight.Launcher.WebUI/Starlight.Launcher.WebUI.csproj new file mode 100644 index 0000000..bda914d --- /dev/null +++ b/Starlight.Launcher.WebUI/Starlight.Launcher.WebUI.csproj @@ -0,0 +1,32 @@ + + + net11.0 + 14 + enable + true + enable + false + Starlight.Launcher.WebUI + / + true + + + + + + + + + + + + + + + + + + + + + diff --git a/Starlight.Launcher/Components/_Imports.razor b/Starlight.Launcher.WebUI/_Imports.razor similarity index 52% rename from Starlight.Launcher/Components/_Imports.razor rename to Starlight.Launcher.WebUI/_Imports.razor index 21aa800..4926c4d 100644 --- a/Starlight.Launcher/Components/_Imports.razor +++ b/Starlight.Launcher.WebUI/_Imports.razor @@ -4,9 +4,10 @@ @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web @using Microsoft.AspNetCore.Components.Web.Virtualization +@using static Microsoft.AspNetCore.Components.Web.RenderMode @using Microsoft.JSInterop -@using Starlight.Launcher -@using Starlight.Launcher.Components -@using Starlight.Launcher.Components.Layout -@using Starlight.Launcher.Components.Atoms -@using MudBlazor \ No newline at end of file +@using Starlight.Launcher.WebUI +@using Starlight.Launcher.WebUI.Components +@using Starlight.Launcher.WebUI.Components.Layout +@using Starlight.Launcher.WebUI.Components.Atoms +@using MudBlazor diff --git a/Starlight.Launcher/wwwroot/app.css b/Starlight.Launcher.WebUI/wwwroot/app.css similarity index 68% rename from Starlight.Launcher/wwwroot/app.css rename to Starlight.Launcher.WebUI/wwwroot/app.css index 1098024..90fc639 100644 --- a/Starlight.Launcher/wwwroot/app.css +++ b/Starlight.Launcher.WebUI/wwwroot/app.css @@ -1,3 +1,39 @@ +html, +body { + margin: 0; + width: 100%; + height: 100%; + overflow: hidden; +} + +#high { + height: 100%; +} + +body { + display: flex; + flex-direction: column; +} + +.mud-layout { + display: flex; + flex-direction: column; + height: 100vh; +} + +.mud-main-content { + flex: 1; + min-height: 0; +} + +#app { + display: flex; + flex-direction: column; + flex: 1; + min-height: 0; + height: 100%; +} + @font-face { font-family: 'Inter'; src: url('/fonts/Inter_18pt-Light.ttf') format('truetype'); @@ -122,6 +158,8 @@ :root { --bottom-nav-height: 64px; + --starlight-accent-1: oklch(var(--c-secondary)); + --starlight-accent-2: oklch(var(--c-tertiary)); } /* ============================================= @@ -258,16 +296,6 @@ h1:focus { background-color: var(--mud-palette-action-default-hover); } -.mud-main-content { - height: 100vh; - overflow: hidden; -} - - .mud-main-content.has-bottom-nav .mud-main-content { - height: calc(100vh - var(--bottom-nav-height)); - max-height: calc(100vh - var(--bottom-nav-height)); - } - .mud-main-content.has-bottom-nav .settings-tabs-panels > .mud-tab-panel { padding-bottom: var(--bottom-nav-height); } @@ -280,18 +308,12 @@ h1:focus { overflow: hidden; } -.mud-main-content.has-bottom-nav .server-page { - height: calc(100% - var(--bottom-nav-height)); +.server-page { + display: flex; + flex-direction: column; + min-height: 0; } - .mud-main-content:has(.settings-page) > .settings-page { - flex: 1 1 auto; - min-height: 0; - display: flex; - flex-direction: column; - overflow: hidden; - } - .mud-tabs.settings-tabs { flex: 1 1 auto; min-height: 0; @@ -307,6 +329,8 @@ h1:focus { } .settings-tabs-panels > .mud-tab-panel { + display: flex !important; + flex-direction: column; flex: 1 1 auto; min-height: 0; overflow-y: auto; @@ -431,11 +455,6 @@ h1:focus { justify-content: flex-end; } -#app { - min-height: 100vh; - background-color: oklch(var(--c-bg)); -} - .sl-splash { position: fixed; inset: 0; @@ -486,7 +505,7 @@ h1:focus { 0%, 100% { opacity: 0.4; } - + 50% { opacity: 1; } @@ -501,3 +520,157 @@ h1:focus { animation: none; } } + +.settings-tabs-panels > .mud-tab-panel { + padding-top: 20px; +} + +.mud-tabs.settings-tabs .mud-tabs-toolbar { + border-radius: 16px 16px 0 0; + background: oklch(from oklch(var(--c-bg)) calc(l + 0.02) c h / 0.6); + backdrop-filter: blur(20px); + -webkit-backdrop-filter: blur(20px); + border-bottom: 1px solid oklch(from oklch(var(--c-primary)) l c h / 0.10); +} + +.mud-tabs.settings-tabs { + background: transparent; +} + +.sl-option-card { + border-radius: 14px !important; + border: 1px solid oklch(from oklch(var(--c-primary)) l c h / 0.12) !important; + background: oklch(from oklch(var(--c-bg)) calc(l + 0.03) c h / 0.55) !important; + backdrop-filter: blur(14px); + -webkit-backdrop-filter: blur(14px); + transition: border-color 160ms ease, background-color 160ms ease, transform 160ms ease; + margin-top: 6px; +} + + .sl-option-card:hover { + border-color: oklch(from oklch(var(--c-primary)) l c h / 0.28) !important; + background: oklch(from oklch(var(--c-bg)) calc(l + 0.05) c h / 0.68) !important; + transform: translateY(-1px); + } + +.sl-option-icon { + display: inline-flex; + align-items: center; + justify-content: center; + width: 40px; + height: 40px; + border-radius: 10px; + background: oklch(from oklch(var(--c-primary)) l c h / 0.12); + color: oklch(var(--c-primary)); + flex-shrink: 0; +} + +.mud-tab-panel::-webkit-scrollbar { + width: 8px; +} + +.mud-tab-panel::-webkit-scrollbar-track { + background: transparent; +} + +.mud-tab-panel::-webkit-scrollbar-thumb { + background: var(--mud-palette-action-disabled-background); + border-radius: 4px; +} + + .mud-tab-panel::-webkit-scrollbar-thumb:hover { + background: var(--mud-palette-action-disabled); + } + +.cta-btn-primary { + background: linear-gradient(90deg, var(--starlight-accent-1), var(--starlight-accent-2)) !important; + color: var(--mud-palette-white, #fff) !important; + box-shadow: 0 6px 20px -8px color-mix(in srgb, var(--starlight-accent-1) 60%, transparent); + transition: box-shadow .2s ease, transform .15s ease; +} + + .cta-btn-primary:hover:not(.mud-disabled) { + box-shadow: 0 10px 26px -8px color-mix(in srgb, var(--starlight-accent-2) 55%, transparent); + transform: translateY(-1px); + } + +.cta-btn-warning { + background: linear-gradient(90deg, var(--mud-palette-warning), color-mix(in srgb, var(--mud-palette-warning) 55%, white)) !important; + color: color-mix(in srgb, var(--mud-palette-warning) 18%, black) !important; + box-shadow: 0 6px 20px -8px color-mix(in srgb, var(--mud-palette-warning) 55%, transparent); + transition: box-shadow .2s ease, transform .15s ease; +} + + .cta-btn-warning:hover:not(.mud-disabled) { + box-shadow: 0 10px 26px -8px color-mix(in srgb, var(--mud-palette-warning) 70%, transparent); + transform: translateY(-1px); + } + +.active-chip { + background: linear-gradient(90deg, var(--starlight-accent-1), var(--starlight-accent-2)) !important; + color: var(--mud-palette-white, #fff) !important; + box-shadow: 0 0 10px -2px color-mix(in srgb, var(--starlight-accent-1) 60%, transparent); +} + +.auth-field .mud-input-outlined-border { + border-color: var(--mud-palette-lines-inputs, rgba(255,255,255,.15)) !important; + transition: border-color .15s ease, box-shadow .15s ease; +} + +.auth-field .mud-input-outlined:hover .mud-input-outlined-border { + border-color: color-mix(in srgb, var(--starlight-accent-1) 45%, transparent) !important; +} + +.auth-field .mud-input:focus-within .mud-input-outlined-border { + border-color: var(--starlight-accent-1) !important; + box-shadow: 0 0 0 3px color-mix(in srgb, var(--starlight-accent-1) 15%, transparent); +} + +.auth-field .mud-input-label.mud-input-label-inputcontrol { + + .mud-shrink ~ & { + color: var(--starlight-accent-2) !important; + } + + .mud-input:focus-within ~ & { + color: var(--starlight-accent-2) !important; + } +} + +.icon-btn-ghost:hover { + background: color-mix(in srgb, var(--starlight-accent-1) 12%, transparent) !important; +} + +.auth-link-btn { + color: var(--mud-palette-text-secondary) !important; + transition: color .15s ease; +} + + .auth-link-btn:hover:not(.mud-disabled) { + color: var(--starlight-accent-2) !important; + } + +.error-alert, +.success-alert { + border-radius: 12px !important; + backdrop-filter: blur(6px); +} + +.error-alert { + background: color-mix(in srgb, var(--mud-palette-error) 10%, transparent) !important; + border: 1px solid color-mix(in srgb, var(--mud-palette-error) 35%, transparent) !important; + box-shadow: 0 0 20px -8px color-mix(in srgb, var(--mud-palette-error) 35%, transparent); +} + +.success-alert { + background: color-mix(in srgb, var(--mud-palette-success) 10%, transparent) !important; + border: 1px solid color-mix(in srgb, var(--mud-palette-success) 35%, transparent) !important; + box-shadow: 0 0 20px -8px color-mix(in srgb, var(--mud-palette-success) 35%, transparent); +} + +.starlight-divider { + opacity: .6; + height: 1px !important; + border: none !important; + background: linear-gradient(90deg, transparent, color-mix(in srgb, var(--starlight-accent-1) 50%, transparent), color-mix(in srgb, var(--starlight-accent-2) 50%, transparent), transparent) !important; +} diff --git a/Starlight.Launcher/wwwroot/css/themes.css b/Starlight.Launcher.WebUI/wwwroot/css/themes.css similarity index 81% rename from Starlight.Launcher/wwwroot/css/themes.css rename to Starlight.Launcher.WebUI/wwwroot/css/themes.css index cd9fe10..5e8039d 100644 --- a/Starlight.Launcher/wwwroot/css/themes.css +++ b/Starlight.Launcher.WebUI/wwwroot/css/themes.css @@ -353,6 +353,176 @@ color-scheme: light; } +[data-theme="citrus-light"] { + --c-primary-l: 0.57; + --c-primary-c: 0.15; + --c-primary-h: 132; + --c-secondary-l: 0.58; + --c-secondary-c: 0.11; + --c-secondary-h: 195; + --c-tertiary-l: 0.56; + --c-tertiary-c: 0.13; + --c-tertiary-h: 275; + --c-success-l: 0.58; + --c-success-c: 0.13; + --c-success-h: 158; + --c-warning-l: 0.80; + --c-warning-c: 0.15; + --c-warning-h: 78; + --c-error-l: 0.56; + --c-error-c: 0.19; + --c-error-h: 25; + --c-info-l: 0.58; + --c-info-c: 0.12; + --c-info-h: 235; + --c-bg-l: 0.985; + --c-bg-c: 0.008; + --c-bg-h: 128; + --c-surface-l: 1; + --c-surface-c: 0; + --c-surface-h: 0; + --c-text-l: 0.24; + --c-text-c: 0.016; + --c-text-h: 140; + color-scheme: light; +} + +[data-theme="citrus-dark"] { + --c-primary-l: 0.80; + --c-primary-c: 0.16; + --c-primary-h: 133; + --c-secondary-l: 0.78; + --c-secondary-c: 0.11; + --c-secondary-h: 195; + --c-tertiary-l: 0.76; + --c-tertiary-c: 0.12; + --c-tertiary-h: 278; + --c-success-l: 0.76; + --c-success-c: 0.14; + --c-success-h: 158; + --c-warning-l: 0.84; + --c-warning-c: 0.14; + --c-warning-h: 80; + --c-error-l: 0.70; + --c-error-c: 0.17; + --c-error-h: 25; + --c-info-l: 0.78; + --c-info-c: 0.12; + --c-info-h: 235; + --c-bg-l: 0.16; + --c-bg-c: 0.014; + --c-bg-h: 140; + --c-surface-l: 0.20; + --c-surface-c: 0.014; + --c-surface-h: 140; + --c-text-l: 0.93; + --c-text-c: 0.012; + --c-text-h: 135; + color-scheme: dark; +} + +[data-theme="slate-light"] { + --c-primary-l: 0.48; + --c-primary-c: 0.04; + --c-primary-h: 250; + --c-secondary-l: 0.56; + --c-secondary-c: 0.07; + --c-secondary-h: 265; + --c-tertiary-l: 0.58; + --c-tertiary-c: 0.09; + --c-tertiary-h: 200; + --c-success-l: 0.58; + --c-success-c: 0.13; + --c-success-h: 158; + --c-warning-l: 0.80; + --c-warning-c: 0.15; + --c-warning-h: 80; + --c-error-l: 0.56; + --c-error-c: 0.19; + --c-error-h: 25; + --c-info-l: 0.58; + --c-info-c: 0.12; + --c-info-h: 235; + --c-bg-l: 0.98; + --c-bg-c: 0.004; + --c-bg-h: 250; + --c-surface-l: 1; + --c-surface-c: 0; + --c-surface-h: 0; + --c-text-l: 0.22; + --c-text-c: 0.010; + --c-text-h: 250; + color-scheme: light; +} + +[data-theme="slate-dark"] { + --c-primary-l: 0.78; + --c-primary-c: 0.03; + --c-primary-h: 250; + --c-secondary-l: 0.72; + --c-secondary-c: 0.05; + --c-secondary-h: 265; + --c-tertiary-l: 0.76; + --c-tertiary-c: 0.07; + --c-tertiary-h: 200; + --c-success-l: 0.76; + --c-success-c: 0.14; + --c-success-h: 158; + --c-warning-l: 0.84; + --c-warning-c: 0.14; + --c-warning-h: 80; + --c-error-l: 0.70; + --c-error-c: 0.17; + --c-error-h: 22; + --c-info-l: 0.78; + --c-info-c: 0.12; + --c-info-h: 235; + --c-bg-l: 0.16; + --c-bg-c: 0.006; + --c-bg-h: 250; + --c-surface-l: 0.20; + --c-surface-c: 0.006; + --c-surface-h: 250; + --c-text-l: 0.93; + --c-text-c: 0.008; + --c-text-h: 250; + color-scheme: dark; +} + +[data-theme="ocean-dark"] { + --c-primary-l: 0.76; + --c-primary-c: 0.12; + --c-primary-h: 205; + --c-secondary-l: 0.76; + --c-secondary-c: 0.12; + --c-secondary-h: 250; + --c-tertiary-l: 0.78; + --c-tertiary-c: 0.10; + --c-tertiary-h: 175; + --c-success-l: 0.76; + --c-success-c: 0.14; + --c-success-h: 158; + --c-warning-l: 0.84; + --c-warning-c: 0.14; + --c-warning-h: 80; + --c-error-l: 0.70; + --c-error-c: 0.17; + --c-error-h: 25; + --c-info-l: 0.78; + --c-info-c: 0.12; + --c-info-h: 235; + --c-bg-l: 0.16; + --c-bg-c: 0.016; + --c-bg-h: 220; + --c-surface-l: 0.20; + --c-surface-c: 0.016; + --c-surface-h: 220; + --c-text-l: 0.93; + --c-text-c: 0.012; + --c-text-h: 215; + color-scheme: dark; +} + :root { /* PRIMARY */ --mud-palette-primary: oklch(var(--c-primary)); diff --git a/Starlight.Launcher/wwwroot/fonts/CormorantGaramond-Bold.ttf b/Starlight.Launcher.WebUI/wwwroot/fonts/CormorantGaramond-Bold.ttf similarity index 100% rename from Starlight.Launcher/wwwroot/fonts/CormorantGaramond-Bold.ttf rename to Starlight.Launcher.WebUI/wwwroot/fonts/CormorantGaramond-Bold.ttf diff --git a/Starlight.Launcher/wwwroot/fonts/CormorantGaramond-Medium.ttf b/Starlight.Launcher.WebUI/wwwroot/fonts/CormorantGaramond-Medium.ttf similarity index 100% rename from Starlight.Launcher/wwwroot/fonts/CormorantGaramond-Medium.ttf rename to Starlight.Launcher.WebUI/wwwroot/fonts/CormorantGaramond-Medium.ttf diff --git a/Starlight.Launcher/wwwroot/fonts/CormorantGaramond-Regular.ttf b/Starlight.Launcher.WebUI/wwwroot/fonts/CormorantGaramond-Regular.ttf similarity index 100% rename from Starlight.Launcher/wwwroot/fonts/CormorantGaramond-Regular.ttf rename to Starlight.Launcher.WebUI/wwwroot/fonts/CormorantGaramond-Regular.ttf diff --git a/Starlight.Launcher/wwwroot/fonts/CormorantGaramond-SemiBold.ttf b/Starlight.Launcher.WebUI/wwwroot/fonts/CormorantGaramond-SemiBold.ttf similarity index 100% rename from Starlight.Launcher/wwwroot/fonts/CormorantGaramond-SemiBold.ttf rename to Starlight.Launcher.WebUI/wwwroot/fonts/CormorantGaramond-SemiBold.ttf diff --git a/Starlight.Launcher/wwwroot/fonts/Inter_18pt-Bold.ttf b/Starlight.Launcher.WebUI/wwwroot/fonts/Inter_18pt-Bold.ttf similarity index 100% rename from Starlight.Launcher/wwwroot/fonts/Inter_18pt-Bold.ttf rename to Starlight.Launcher.WebUI/wwwroot/fonts/Inter_18pt-Bold.ttf diff --git a/Starlight.Launcher/wwwroot/fonts/Inter_18pt-Light.ttf b/Starlight.Launcher.WebUI/wwwroot/fonts/Inter_18pt-Light.ttf similarity index 100% rename from Starlight.Launcher/wwwroot/fonts/Inter_18pt-Light.ttf rename to Starlight.Launcher.WebUI/wwwroot/fonts/Inter_18pt-Light.ttf diff --git a/Starlight.Launcher/wwwroot/fonts/Inter_18pt-Medium.ttf b/Starlight.Launcher.WebUI/wwwroot/fonts/Inter_18pt-Medium.ttf similarity index 100% rename from Starlight.Launcher/wwwroot/fonts/Inter_18pt-Medium.ttf rename to Starlight.Launcher.WebUI/wwwroot/fonts/Inter_18pt-Medium.ttf diff --git a/Starlight.Launcher/wwwroot/fonts/Inter_18pt-Regular.ttf b/Starlight.Launcher.WebUI/wwwroot/fonts/Inter_18pt-Regular.ttf similarity index 100% rename from Starlight.Launcher/wwwroot/fonts/Inter_18pt-Regular.ttf rename to Starlight.Launcher.WebUI/wwwroot/fonts/Inter_18pt-Regular.ttf diff --git a/Starlight.Launcher/wwwroot/index.html b/Starlight.Launcher.WebUI/wwwroot/index.html similarity index 100% rename from Starlight.Launcher/wwwroot/index.html rename to Starlight.Launcher.WebUI/wwwroot/index.html diff --git a/Starlight.Launcher/wwwroot/js/animated-lines.js b/Starlight.Launcher.WebUI/wwwroot/js/animated-lines.js similarity index 100% rename from Starlight.Launcher/wwwroot/js/animated-lines.js rename to Starlight.Launcher.WebUI/wwwroot/js/animated-lines.js diff --git a/Starlight.Launcher/wwwroot/js/scripts.js b/Starlight.Launcher.WebUI/wwwroot/js/scripts.js similarity index 100% rename from Starlight.Launcher/wwwroot/js/scripts.js rename to Starlight.Launcher.WebUI/wwwroot/js/scripts.js diff --git a/Starlight.Launcher/wwwroot/js/smooth-corners.js b/Starlight.Launcher.WebUI/wwwroot/js/smooth-corners.js similarity index 100% rename from Starlight.Launcher/wwwroot/js/smooth-corners.js rename to Starlight.Launcher.WebUI/wwwroot/js/smooth-corners.js diff --git a/Starlight.Launcher/wwwroot/js/theme.js b/Starlight.Launcher.WebUI/wwwroot/js/theme.js similarity index 100% rename from Starlight.Launcher/wwwroot/js/theme.js rename to Starlight.Launcher.WebUI/wwwroot/js/theme.js diff --git a/Starlight.Launcher/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/Starlight.Launcher.WebUI/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css similarity index 100% rename from Starlight.Launcher/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css rename to Starlight.Launcher.WebUI/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css diff --git a/Starlight.Launcher/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/Starlight.Launcher.WebUI/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from Starlight.Launcher/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename to Starlight.Launcher.WebUI/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/Starlight.Launcher.slnx b/Starlight.Launcher.slnx index c72b23a..7d37795 100644 --- a/Starlight.Launcher.slnx +++ b/Starlight.Launcher.slnx @@ -1,8 +1,8 @@ - + diff --git a/Starlight.Launcher/App.axaml b/Starlight.Launcher/App.axaml new file mode 100644 index 0000000..f722f15 --- /dev/null +++ b/Starlight.Launcher/App.axaml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + diff --git a/Starlight.Launcher/App.axaml.cs b/Starlight.Launcher/App.axaml.cs new file mode 100644 index 0000000..8fc5398 --- /dev/null +++ b/Starlight.Launcher/App.axaml.cs @@ -0,0 +1,158 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Markup.Xaml; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Robust.Launcher.Api.Api; +using Robust.Launcher.Api.Models.ServerStatus; +using Robust.Launcher.Api.Utility; +using Serilog; +using Starlight.Launcher.Services; +using Starlight.Launcher.Services.Auth; +using Starlight.Launcher.Services.Bridge; +using Starlight.Launcher.Services.Discord; +using Starlight.Launcher.Services.EngineManager; +using Starlight.Launcher.Services.Localization; +using Starlight.Launcher.Services.ServerStatus; +using Starlight.Launcher.Services.Settings; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Localization; +using Starlight.Launcher.WebUI.Services; + +namespace Starlight.Launcher; + +public partial class App : Application +{ + internal static LauncherMessaging? PendingMessaging { get; set; } + + public static IServiceProvider Services { get; private set; } = default!; + + private EmbeddedBlazorHost? _blazorHost; + + public override void Initialize() => AvaloniaXamlLoader.Load(this); + + public override async void OnFrameworkInitializationCompleted() + { + if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) + { + var services = new ServiceCollection(); + RegisterServices(services); + Services = services.BuildServiceProvider(); + + _blazorHost = new EmbeddedBlazorHost(); + await _blazorHost.StartAsync(Services); + + await Services.GetRequiredService().Initialize(); + if (OperatingSystem.IsWindows()) + Services.GetRequiredService().Initialize(); + + var settings = Services.GetRequiredService(); + _ = Task.Run(async () => await settings.InitializeLoginsAsync()); + + Services.GetRequiredService().RequestInitialUpdate(); + _ = Task.Run(async () => Services.GetRequiredService().InitializeAsync()); + Services.GetRequiredService().Initialize(); + Services.GetRequiredService().Initialize(); + + var commands = Services.GetRequiredService(); + var messaging = Services.GetRequiredService(); + commands.RunCommandTask(); + messaging.StartServerTask(commands); + + var window = new MainWindow(_blazorHost.Url) { Title = "Starlight.Launcher" }; + + var flushing = false; + + desktop.ShutdownRequested += async (_, e) => + { + if (flushing) return; + flushing = true; + + e.Cancel = true; + + commands.Shutdown(); + messaging.StopAndWait(); + await _blazorHost.DisposeAsync(); + + await settings.FlushPendingSavesAsync(); + desktop.Shutdown(); + }; + + window.Closing += (_ , e) => + { + if (settings.GetSettings().CollapseInTrayOnClose) + { + e.Cancel = true; + Avalonia.Threading.Dispatcher.UIThread.Post(Services.GetRequiredService().HideWindow); + } + }; + + WindowState previousState = window.WindowState; + + window.PropertyChanged += (_, e) => + { + if (e.Property != Window.WindowStateProperty) + return; + + var current = window.WindowState; + + if (previousState != WindowState.Minimized && + current == WindowState.Minimized) + { + if (settings.GetSettings().CollapseInTrayOnMinimize) + Services.GetRequiredService().HideWindow(); + } + + previousState = current; + }; + + desktop.MainWindow = window; + } + + base.OnFrameworkInitializationCompleted(); + } + + private static void RegisterServices(IServiceCollection services) + { + _ = services.AddLogging(b => b.ClearProviders().AddSerilog(Serilog.Log.Logger)); + + if (OperatingSystem.IsWindows()) + _ = services.AddSingleton(); + else + _ = services.AddSingleton(); + + _ = services.AddSingleton(); + _ = services.AddSingleton(); + + _ = services.AddSingleton(); + _ = services.AddSingleton(); + _ = services.AddSingleton(); + _ = services.AddSingleton(PendingMessaging ?? new LauncherMessaging()); + _ = services.AddSingleton(); + + var httpClient = HappyEyeballsHttp.CreateHttpClient(); + _ = services.AddSingleton(httpClient); + _ = services.AddSingleton(); + _ = services.AddSingleton(); + _ = services.AddSingleton(); + _ = services.AddSingleton(); + _ = services.AddSingleton(sp => + { + var fetcher = sp.GetRequiredService(); + return new ServerInfoLoader(fetcher.UpdateInfoForAsync); + }); + _ = services.AddSingleton(); + _ = services.AddSingleton(); + _ = services.AddSingleton(); + _ = services.AddSingleton(); + _ = services.AddSingleton(); + _ = services.AddSingleton(); + _ = services.AddSingleton(); + _ = services.AddTransient(); + _ = services.AddSingleton(); + _ = services.AddSingleton(); + _ = services.AddSingleton(); + _ = services.AddSingleton(); // Service for UI refresh. + } +} diff --git a/Starlight.Launcher/App.xaml b/Starlight.Launcher/App.xaml deleted file mode 100644 index 90cd08b..0000000 --- a/Starlight.Launcher/App.xaml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/Starlight.Launcher/App.xaml.cs b/Starlight.Launcher/App.xaml.cs deleted file mode 100644 index bfc0f4c..0000000 --- a/Starlight.Launcher/App.xaml.cs +++ /dev/null @@ -1,64 +0,0 @@ -using Starlight.Launcher.Services; -using Starlight.Launcher.Services.Auth; -using Starlight.Launcher.Services.State; -using System.Runtime.InteropServices; - -namespace Starlight.Launcher; - -public partial class App : Application -{ - private readonly LauncherCommands _commands; - private readonly LauncherMessaging _messaging; - private readonly AppState _state; - public App(LauncherCommands commands, LauncherMessaging messaging, AppState state) - { - InitializeComponent(); - - _commands = commands; - _messaging = messaging; - _state = state; - - _commands.RunCommandTask(); - _messaging.StartServerTask(commands); - } - - protected override Window CreateWindow(IActivationState? activationState) - { - var window = new Window(new MainPage(_state)) { Title = "Starlight.Launcher" }; - - window.Destroying += (_, _) => - { - _commands.Shutdown(); - _messaging.StopAndWait(); - }; - window.Stopped += (s, e) => _state.NotifyPaused(); - window.Resumed += (s, e) => _state.NotifyResumed(); - - return window; - } - - protected override void OnAppLinkRequestReceived(Uri uri) - { - base.OnAppLinkRequestReceived(uri); - - if (IsDiscordAuthLink(uri)) - { - IPlatformApplication.Current!.Services - .GetRequiredService() - .HandleDeepLink(uri); - return; - } - - var serverUri = ExtractConnectUri(uri); - if (serverUri is not null) - { - _ = _commands.QueueCommand(LauncherCommands.ConstructConnectCommand(serverUri)); - } - } - - private static bool IsDiscordAuthLink(Uri uri) => - uri.Host.Equals("discord", StringComparison.OrdinalIgnoreCase) || - uri.AbsolutePath.Contains("auth", StringComparison.OrdinalIgnoreCase); - - private static Uri? ExtractConnectUri(Uri uri) => uri; -} diff --git a/Starlight.Launcher/Components/Atoms/Dialogs/ChangelogDialog.razor b/Starlight.Launcher/Components/Atoms/Dialogs/ChangelogDialog.razor deleted file mode 100644 index 48d9d68..0000000 --- a/Starlight.Launcher/Components/Atoms/Dialogs/ChangelogDialog.razor +++ /dev/null @@ -1,26 +0,0 @@ -@using Starlight.Launcher.Services.Localization - - - - - @_localization.GetString("changelog-title", ("version", Version)) - - - - - @if (string.IsNullOrWhiteSpace(Notes)) - { - @_localization["changelog-empty"] - } - else - { - - } - - - - - @_localization["changelog-close"] - - - diff --git a/Starlight.Launcher/Components/Atoms/Dialogs/ChangelogDialog.razor.cs b/Starlight.Launcher/Components/Atoms/Dialogs/ChangelogDialog.razor.cs deleted file mode 100644 index fdf8976..0000000 --- a/Starlight.Launcher/Components/Atoms/Dialogs/ChangelogDialog.razor.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Microsoft.AspNetCore.Components; -using MudBlazor; -using Starlight.Launcher.Services.Localization; - -namespace Starlight.Launcher.Components.Atoms.Dialogs; - -public partial class ChangelogDialog -{ - [CascadingParameter] private IMudDialogInstance MudDialog { get; set; } = default!; - [Inject] private LocalizationManager _localization { get; set; } = default!; - - [Parameter] public string Version { get; set; } = ""; - [Parameter] public string Notes { get; set; } = ""; - - private void Close() => MudDialog.Close(); -} diff --git a/Starlight.Launcher/Components/Atoms/HorizontalNavBar.razor.css b/Starlight.Launcher/Components/Atoms/HorizontalNavBar.razor.css deleted file mode 100644 index 773ac6a..0000000 --- a/Starlight.Launcher/Components/Atoms/HorizontalNavBar.razor.css +++ /dev/null @@ -1,43 +0,0 @@ -.bottom-nav { - display: flex; - justify-content: space-around; - align-items: center; - width: 100%; - height: 100%; -} - -.bottom-nav-item span { - font-size: 0.72rem; - line-height: 1; - text-align: center; - color: var(--mud-palette-text-secondary); -} - -.bottom-nav-item { - flex: 1; - height: 100%; - text-decoration: none; - color: var(--mud-palette-text-secondary); - transition: color 150ms ease; -} - - .bottom-nav-item:hover { - color: var(--mud-palette-text-primary); - } - - .bottom-nav-item:hover span { - color: var(--mud-palette-text-primary); - } - - .bottom-nav-item.active span { - color: var(--mud-palette-primary); - } - -.nav-inner { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - height: 100%; - gap: 2px; -} \ No newline at end of file diff --git a/Starlight.Launcher/Components/Atoms/VerticalNavBar.razor.cs b/Starlight.Launcher/Components/Atoms/VerticalNavBar.razor.cs deleted file mode 100644 index f03875f..0000000 --- a/Starlight.Launcher/Components/Atoms/VerticalNavBar.razor.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Microsoft.AspNetCore.Components; -using Starlight.Launcher.Services.Localization; - -namespace Starlight.Launcher.Components.Atoms; - -public sealed partial class VerticalNavBar : ComponentBase -{ - [Inject] private LocalizationManager _localization { get; set; } = default!; -} diff --git a/Starlight.Launcher/Components/Pages/Auth.razor b/Starlight.Launcher/Components/Pages/Auth.razor deleted file mode 100644 index 41a8648..0000000 --- a/Starlight.Launcher/Components/Pages/Auth.razor +++ /dev/null @@ -1,445 +0,0 @@ -@page "/auth" -@using Robust.Launcher.Api.Models -@using Starlight.Launcher.Api.Models - -
- - -
- @switch (_mode) - { - case Mode.AccountList: - @_localization["auth-menu-accounts-mode"] - - @if (_loginManager.Logins.Count == 0) - { - - - @_localization["auth-menu-no-accounts"] - - @_localization["auth-menu-no-accounts-hint"] - - - } - else - { - - @foreach (var account in _loginManager.Logins) - { - var acc = account; - var isActive = _loginManager.ActiveAccountId == acc.UserId; - - - - } - - } - - - @_localization["auth-menu-add-account-button"] - - break; - - case Mode.SignIn: - - @if (_loginManager.Logins.Count > 0) - { - - } - - - @(_relogUserId.HasValue ? _localization["auth-menu-signin-login-again"] : _localization["auth-menu-signin-login"]) - - - - - - - - @if (_signInTfaRequired) - { - - } - - @if (!string.IsNullOrEmpty(_signInError)) - { - @_signInError - } - - @if (_signInShowResend) - { - - @_localization["auth-menu-resend-confirmation"] - - } - - - @if (_busy) - { - - @_localization["auth-menu-signin-status-busy"] - } - else - { - @_localization["auth-menu-signin-status-wait"] - } - - - - - @_localization["auth-menu-signin-method-discord"] - - - - - @_localization["auth-menu-signin-forgot-password"] - - - @_localization["auth-menu-registration"] - - - break; - - case Mode.Register: - - - @_localization["auth-menu-registration"] - - - @if (!RegistrationEnabled) - { -
-
- -
- - @_localization["auth-menu-registration-disabled-title"] - - - @_localization["auth-menu-registration-disabled-hint"] - - - @_localization["auth-menu-registration-back-to-signin"] - -
- } - else - { - @if (_registerSuccessMessage != null) - { - @_registerSuccessMessage - - @_localization["auth-menu-registration-signin"] - - return; - } - - - - - - - - - - @if (_registerErrors != null && _registerErrors.Length > 0) - { - - @foreach (var err in _registerErrors) - { -
@err
- } - - } - - - @if (_busy) - { - - @_localization["auth-menu-registration-status-busy"] - } - else - { - @_localization["auth-menu-registration-status-wait"] - } - - } - break; - - case Mode.ForgotPassword: - - - @_localization["auth-menu-forgotpassword"] - - - @if (_forgotSuccess) - { - - @_localization["auth-menu-forgotpassword-alert"] - - - @_localization["auth-menu-signin"] - - return; - } - - @_localization["auth-menu-enter-email-label"] - - - - @if (!string.IsNullOrEmpty(_forgotError)) - { - @_forgotError - } - - - @if (_busy) - { - - @_localization["auth-menu-forgotpassword-status-busy"] - } - else - { - @_localization["auth-menu-forgotpassword-status-wait"] - } - - break; - - case Mode.LinkAccount: - - - @_localization["auth-menu-link-account-title"] - - - - @_localization["auth-menu-link-account-hint"] - - - - - - - @if (_linkTfaRequired) - { - - } - - @if (!string.IsNullOrEmpty(_linkError)) - { - @_linkError - } - - - @if (_busy) - { - - @_localization["auth-menu-link-account-busy"] - } - else - { - @_localization["auth-menu-link-account-confirm"] - } - - break; - } -
- - -
diff --git a/Starlight.Launcher/Components/Pages/Auth.razor.cs b/Starlight.Launcher/Components/Pages/Auth.razor.cs deleted file mode 100644 index 71287ba..0000000 --- a/Starlight.Launcher/Components/Pages/Auth.razor.cs +++ /dev/null @@ -1,541 +0,0 @@ -using Microsoft.AspNetCore.Components; -using Microsoft.AspNetCore.Components.Web; -using MudBlazor; -using Robust.Launcher.Api.Api; -using Robust.Launcher.Api.Models; -using Robust.Launcher.Api.Utility; -using Serilog; -using Starlight.Launcher.Api.Models; -using Starlight.Launcher.Services.Auth; -using Starlight.Launcher.Services.Localization; -using Starlight.Launcher.Services.Settings; - -namespace Starlight.Launcher.Components.Pages; - -public partial class Auth : ComponentBase, IDisposable -{ - [Inject] private LoginManager _loginManager { get; set; } = default!; - [Inject] private SettingsService _settings { get; set; } = default!; - [Inject] private AuthApi _authApi { get; set; } = default!; - [Inject] private NavigationManager _nav { get; set; } = default!; - [Inject] private DiscordAuthService _discordAuth { get; set; } = default!; - [Inject] private ISnackbar _snackbar { get; set; } = default!; - [Inject] private LocalizationManager _localization { get; set; } = default!; - - private enum Mode - { - AccountList, - SignIn, - Register, - ForgotPassword, - LinkAccount - } - - private Mode _mode = Mode.AccountList; - private bool _busy; - - private string _signInUsername = ""; - private string _signInPassword = ""; - private string _signInTfaCode = ""; - private bool _signInTfaRequired; - private string? _signInError; - private bool _signInShowResend; - private bool _showPwd; - - private string _registerUsername = ""; - private string _registerEmail = ""; - private string _registerPassword = ""; - private string _registerPasswordConfirm = ""; - private string[]? _registerErrors; - private string? _registerSuccessMessage; - - private string _forgotEmail = ""; - private string? _forgotError; - private bool _forgotSuccess; - - private Guid? _linkUserId; - private string _linkUsername = ""; - private string _linkPassword = ""; - private string _linkTfaCode = ""; - private bool _linkTfaRequired; - private string? _linkError; - - private Guid? _relogUserId; - - private const bool RegistrationEnabled = false; - - protected override void OnInitialized() - { - _loginManager.LoginsChanged += OnLoginsChanged; - - if (_loginManager.Logins.Count == 0) - _mode = Mode.SignIn; - } - - private void OnLoginsChanged() => InvokeAsync(StateHasChanged); - - public void Dispose() => _loginManager.LoginsChanged -= OnLoginsChanged; - - private async Task SelectAccount(LoggedInAccount account) - { - _busy = true; - try - { - try - { - await _loginManager.UpdateSingleAccountStatus(account); - } - catch (AuthApiException ex) - { - _snackbar.Add(_localization.GetString("auth-menu-token-verify-warning", ("ex", ex.Message)), Severity.Warning); - } - - if (account.Status == AccountLoginStatus.Expired) - { - _snackbar.Add(_localization["auth-menu-session-expired-warning"], Severity.Warning); - await BeginRelogin(account); - return; - } - - _loginManager.ActiveAccountId = account.UserId; - _nav.NavigateTo("/"); - } - finally - { - _busy = false; - } - } - - private void RemoveAccount(LoggedInAccount account) - { - _loginManager.RemoveLogin(account.UserId); - _snackbar.Add(_localization.GetString("auth-menu-account-deleted", ("account", account.LoginInfo.Username)), Severity.Info); - } - - private void GoToSignIn() - { - ResetSignInForm(); - _mode = Mode.SignIn; - } - - private async Task BeginRelogin(LoggedInAccount account) - { - if (account.LoginInfo.DiscordToken != null && account.LoginInfo.Token == null) - { - await ReloginDiscord(account); - return; - } - - ResetSignInForm(); - _relogUserId = account.UserId; - _signInUsername = account.LoginInfo.Username; - _mode = Mode.SignIn; - } - - private string StatusLabel(AccountLoginStatus s) => s switch - { - AccountLoginStatus.Available => _localization["auth-menu-online-status"], - AccountLoginStatus.Expired => _localization["auth-menu-expired-status"], - AccountLoginStatus.Unsure => _localization["auth-menu-unsure-status"], - _ => s.ToString() - }; - - private MudBlazor.Color StatusColor(AccountLoginStatus s) => s switch - { - AccountLoginStatus.Available => MudBlazor.Color.Success, - AccountLoginStatus.Expired => MudBlazor.Color.Warning, - AccountLoginStatus.Unsure => MudBlazor.Color.Surface, - _ => MudBlazor.Color.Default - }; - - private void LinkAccount(LoggedInAccount account) - { - _linkUserId = account.UserId; - _linkUsername = account.LoginInfo.Username; - _linkPassword = ""; - _linkTfaCode = ""; - _linkTfaRequired = false; - _linkError = null; - _mode = Mode.LinkAccount; - } - - private async Task OnLinkKey(KeyboardEventArgs e) - { - if (e.Key == "Enter" && !_busy) - await DoLinkAccount(); - } - - private async Task DoLinkAccount() - { - _linkError = null; - - if (string.IsNullOrWhiteSpace(_linkUsername) || string.IsNullOrEmpty(_linkPassword)) - { - _linkError = _localization["auth-menu-enter-info-error"]; - return; - } - - if ((await _settings.GetSettingsAsync()).SelectedAuthServer is not { } authServer) - { - _linkError = _localization["auth-menu-no-server-error"]; - return; - } - - _busy = true; - try - { - var request = new AuthApi.AuthenticateRequest( - _linkUsername, null, _linkPassword, - _linkTfaRequired ? _linkTfaCode : null); - - var result = await _authApi.AuthenticateAsync(request, new UrlFallbackSet(authServer)); - - if (result.IsSuccess && _linkUserId != null) - { - _loginManager.LinkAuthToken(_linkUserId.Value, result.LoginInfo.UserId, result.LoginInfo); - - _snackbar.Add(_localization.GetString("auth-menu-account-linked", ("account", result.LoginInfo.Username)), Severity.Success); - - BackToAccountList(); - return; - } - - switch (result.Code) - { - case AuthApi.AuthenticateDenyResponseCode.InvalidCredentials: - _linkError = _localization["auth-menu-incorrect-info-error"]; - break; - case AuthApi.AuthenticateDenyResponseCode.TfaRequired: - _linkTfaRequired = true; - _linkError = _localization["auth-menu-tfa-required-error"]; - break; - case AuthApi.AuthenticateDenyResponseCode.TfaInvalid: - _linkTfaRequired = true; - _linkError = _localization["auth-menu-tfa-invalid-error"]; - break; - case AuthApi.AuthenticateDenyResponseCode.AccountLocked: - _linkError = _localization["auth-menu-account-blocked-error"]; - break; - default: - _linkError = string.Join("\n", result.Errors); - break; - } - } - finally - { - _busy = false; - } - } - - private Task LinkDiscord(LoggedInAccount account) => - RunDiscordAttach(account, _localization.GetString("auth-menu-linked-status", ("account", account.LoginInfo.Username))); - - private Task ReloginDiscord(LoggedInAccount account) => - RunDiscordAttach(account, _localization["auth-menu-discord-renewed"], navigateHome: true); - - private async Task RunDiscordAttach(LoggedInAccount account, string success, bool navigateHome = false) - { - _busy = true; - await InvokeAsync(StateHasChanged); - try - { - await _discordAuth.AttachToAccountAsync(account); - _snackbar.Add(success, Severity.Success); - if (navigateHome) - { - _loginManager.ActiveAccountId = account.UserId; - _nav.NavigateTo("/"); - } - } - catch (OperationCanceledException) - { - _snackbar.Add(_localization["auth-menu-discord-login-error"], Severity.Warning); - } - catch (DiscordAuthException ex) - { - _snackbar.Add(ex.Message, Severity.Error); - } - catch (Exception ex) - { - Log.Warning(ex, "Discord attach failed"); - _snackbar.Add(_localization["auth-menu-discord-connect-fail"], Severity.Error); - } - finally - { - _busy = false; - await InvokeAsync(StateHasChanged); - } - } - - private async Task OnSignInKey(KeyboardEventArgs e) - { - if (e.Key == "Enter" && !_busy) - await DoSignIn(); - } - - private async Task LoginWithDiscord() - { - _busy = true; - _signInError = null; - await InvokeAsync(StateHasChanged); - try - { - await _discordAuth.LoginAsync(); - _nav.NavigateTo("/"); - } - catch (OperationCanceledException) - { - _signInError = _localization["auth-menu-discord-login-error"]; - } - catch (DiscordAuthException ex) - { - _signInError = ex.Message; - } - catch (Exception ex) - { - Log.Warning(ex, "Discord login failed"); - _signInError = _localization["auth-menu-discord-connect-fail"]; - } - finally - { - _busy = false; - await InvokeAsync(StateHasChanged); - } - } - - private async Task DoSignIn() - { - _signInError = null; - _signInShowResend = false; - - if (string.IsNullOrWhiteSpace(_signInUsername) || string.IsNullOrEmpty(_signInPassword)) - { - _signInError = _localization["auth-menu-enter-info-error"]; - return; - } - - if ((await _settings.GetSettingsAsync()).SelectedAuthServer is not { } authServer) - { - _signInError = _localization["auth-menu-no-server-error"]; - return; - } - - _busy = true; - try - { - AuthApi.AuthenticateRequest request; - if (_relogUserId.HasValue) - { - request = new AuthApi.AuthenticateRequest( - null, _relogUserId.Value, _signInPassword, - _signInTfaRequired ? _signInTfaCode : null); - } - else - { - request = new AuthApi.AuthenticateRequest( - _signInUsername, null, _signInPassword, - _signInTfaRequired ? _signInTfaCode : null); - } - - var result = await _authApi.AuthenticateAsync(request, new UrlFallbackSet(authServer)); - - if (result.IsSuccess) - { - _loginManager.AddFreshLogin(result.LoginInfo); - _loginManager.ActiveAccountId = result.LoginInfo.UserId; - _snackbar.Add(_localization.GetString("auth-menu-welcome-message", ("username", result.LoginInfo.Username)), Severity.Success); - _nav.NavigateTo("/"); - return; - } - - switch (result.Code) - { - case AuthApi.AuthenticateDenyResponseCode.InvalidCredentials: - _signInError = _localization["auth-menu-incorrect-info-error"]; - break; - - case AuthApi.AuthenticateDenyResponseCode.AccountUnconfirmed: - _signInError = _localization["auth-menu-unconfirmed-info-error"]; - _signInShowResend = true; - break; - - case AuthApi.AuthenticateDenyResponseCode.TfaRequired: - _signInTfaRequired = true; - _signInError = _localization["auth-menu-tfa-required-error"]; - break; - - case AuthApi.AuthenticateDenyResponseCode.TfaInvalid: - _signInTfaRequired = true; - _signInError = _localization["auth-menu-tfa-invalid-error"]; - break; - - case AuthApi.AuthenticateDenyResponseCode.AccountLocked: - _signInError = _localization["auth-menu-account-blocked-error"]; - break; - - default: - _signInError = string.Join("\n", result.Errors); - break; - } - } - finally - { - _busy = false; - } - } - - private async Task ResendConfirmation() - { - if ((await _settings.GetSettingsAsync()).SelectedAuthServer is not { } authServer) - { - _snackbar.Add(_localization["auth-menu-no-server-error"], Severity.Error); - return; - } - - _busy = true; - try - { - if (_signInUsername.Contains('@')) - { - var errors = await _authApi.ResendConfirmationAsync(_signInUsername, new UrlFallbackSet(authServer)); - if (errors == null) - _snackbar.Add(_localization.GetString("auth-menu-email-resent"), Severity.Success); - else - _snackbar.Add(string.Join("\n", errors), Severity.Error); - } - else - { - _snackbar.Add(_localization["auth-menu-email-resent-info"], Severity.Warning); - } - } - finally - { - _busy = false; - } - } - - private void ResetSignInForm() - { - _signInUsername = ""; - _signInPassword = ""; - _signInTfaCode = ""; - _signInTfaRequired = false; - _signInError = null; - _signInShowResend = false; - _relogUserId = null; - } - - private void BackToAccountList() - { - ResetSignInForm(); - _mode = Mode.AccountList; - } - - private async Task DoRegister() - { - if (!RegistrationEnabled) - return; - - _registerErrors = null; - _registerSuccessMessage = null; - - var authServer = (await _settings.GetSettingsAsync()).SelectedAuthServer; - - var validationErrors = new List(); - if (authServer == null) - validationErrors.Add(_localization["auth-menu-no-server-error"]); - if (string.IsNullOrWhiteSpace(_registerUsername)) - validationErrors.Add(_localization["auth-menu-register-username-missing"]); - if (string.IsNullOrWhiteSpace(_registerEmail) || !_registerEmail.Contains('@')) - validationErrors.Add(_localization["auth-menu-register-invalid-email"]); - if (_registerPassword.Length < 8) - validationErrors.Add(_localization["auth-menu-register-too-short-pass"]); - if (_registerPassword != _registerPasswordConfirm) - validationErrors.Add(_localization["auth-menu-register-dont-match-pass"]); - - if (validationErrors.Count > 0) - { - _registerErrors = validationErrors.ToArray(); - return; - } - - _busy = true; - try - { - var result = await _authApi.RegisterAsync(_registerUsername, _registerEmail, _registerPassword, new UrlFallbackSet(authServer!)); - - if (!result.IsSuccess) - { - _registerErrors = result.Errors; - return; - } - - _registerSuccessMessage = result.Status switch - { - RegisterResponseStatus.Registered => - _localization["auth-menu-register-success"], - RegisterResponseStatus.RegisteredNeedConfirmation => _localization.GetString("auth-menu-register-required-confirmation", ("email", _registerEmail)), - _ => _localization["auth-menu-register-success"] - }; - - _registerPassword = ""; - _registerPasswordConfirm = ""; - } - finally - { - _busy = false; - } - } - - private async Task DoForgotPassword() - { - _forgotError = null; - - if ((await _settings.GetSettingsAsync()).SelectedAuthServer is not { } authServer) - { - _forgotError = _localization["auth-menu-no-server-error"]; - return; - } - - if (string.IsNullOrWhiteSpace(_forgotEmail) || !_forgotEmail.Contains('@')) - { - _forgotError = _localization["auth-menu-forgot-notvalid-email-error"]; - return; - } - - _busy = true; - try - { - var errors = await _authApi.ForgotPasswordAsync(_forgotEmail, new UrlFallbackSet(authServer)); - if (errors == null) - { - _forgotSuccess = true; - } - else - { - _forgotError = string.Join("\n", errors); - } - } - finally - { - _busy = false; - } - } - - private static string StatusCssVar(AccountLoginStatus s) => s switch - { - AccountLoginStatus.Available => "success", - AccountLoginStatus.Expired => "warning", - AccountLoginStatus.Unsure => "info", - _ => "surface" - }; - - private void SwitchMode(Mode mode) - { - if (mode == Mode.SignIn) ResetSignInForm(); - if (mode == Mode.Register) { _registerErrors = null; _registerSuccessMessage = null; } - if (mode == Mode.ForgotPassword) { _forgotError = null; _forgotSuccess = false; } - - _mode = mode; - } -} diff --git a/Starlight.Launcher/Components/Pages/Auth.razor.css b/Starlight.Launcher/Components/Pages/Auth.razor.css deleted file mode 100644 index e681ba0..0000000 --- a/Starlight.Launcher/Components/Pages/Auth.razor.css +++ /dev/null @@ -1,147 +0,0 @@ -html, body { - margin: 0; - padding: 0; -} - -.auth-bg { - position: relative; - z-index: 1; - overflow-y: auto; - height: 100%; - display: flex; - align-items: center; - justify-content: center; - box-sizing: border-box; - padding: 48px 16px; - background: radial-gradient(1200px 600px at 70% -10%, oklch(from oklch(var(--c-secondary)) calc(l + 0.10) c h / 0.28), transparent), radial-gradient(900px 500px at 10% 110%, oklch(from oklch(var(--c-tertiary)) calc(l + 0.10) c h / 0.20), transparent), oklch(var(--c-bg)); -} - - .auth-bg::before { - content: ""; - pointer-events: none; - position: absolute; - inset: 0; - --star: oklch(from oklch(var(--c-text)) l c h); - background-image: radial-gradient(2px 2px at 25% 15%, oklch(from var(--star) l c h / .9), transparent), radial-gradient(3px 3px at 75% 35%, oklch(from var(--star) l c h / .8), transparent), radial-gradient(2px 2px at 50% 65%, oklch(from var(--star) l c h / 1), transparent), radial-gradient(4px 4px at 15% 85%, oklch(from var(--star) l c h / .7), transparent), radial-gradient(3px 3px at 88% 78%, oklch(from var(--star) l c h / .9), transparent); - background-repeat: repeat; - background-size: 320px 320px; - opacity: .8; - animation: twinkle 6s ease-in-out infinite alternate, drift 140s linear infinite; - } - - .auth-bg::after { - content: ""; - pointer-events: none; - position: absolute; - inset: 0; - --star: oklch(from oklch(var(--c-text)) l c h); - background-image: radial-gradient(4px 4px at 15% 20%, oklch(from var(--star) l c h / .85), transparent), radial-gradient(3px 3px at 70% 25%, oklch(from var(--star) l c h / .85), transparent), radial-gradient(5px 5px at 80% 70%, oklch(from var(--star) l c h / .85), transparent), radial-gradient(4px 4px at 30% 80%, oklch(from var(--star) l c h / .85), transparent); - background-repeat: repeat; - background-size: 480px 480px; - opacity: .8; - animation: twinkle-big 7s ease-in-out infinite alternate, drift 90s linear infinite reverse; - } - -@keyframes twinkle { - from { - opacity: .2 - } - - to { - opacity: .8 - } -} - -@keyframes twinkle-big { - from { - opacity: .3 - } - - to { - opacity: .9 - } -} - - -@keyframes drift { - from { - background-position: 0 0; - } - - to { - background-position: 0 -320px; - } -} - -.auth-card { - position: relative; - width: 100%; - max-height: calc(100vh - 96px); - overflow-y: auto; - border-radius: 20px; - background: rgba(20, 24, 41, .78); - backdrop-filter: blur(14px); - border: 1px solid rgba(255,255,255,.08); - box-shadow: 0 20px 60px rgba(0,0,0,.45); - transition: transform .2s ease, box-shadow .2s ease; -} - - .auth-card:hover { - transform: translateY(-2px); - box-shadow: 0 28px 70px rgba(0,0,0,.55); - } - - .auth-card::before { - content: ""; - position: absolute; - top: 0; - left: 0; - right: 0; - height: 3px; - border-radius: 20px 20px 0 0; - background: linear-gradient(90deg, rgba(124,92,255,1), rgba(34,211,238,1)); - opacity: .85; - } - -.mode-fade { - animation: fadeUp .25s ease; -} - -@keyframes fadeUp { - from { - opacity: 0; - transform: translateY(8px); - } - - to { - opacity: 1; - transform: none; - } -} - - -.empty-state { - text-align: center; -} - -.empty-icon { - font-size: 4rem !important; - opacity: .3; -} - -.account-row { - transition: background .15s ease; - border-radius: 12px; -} - - .account-row:hover { - background: rgba(255,255,255,.04); - } - -.status-dot { - width: 8px; - height: 8px; - border-radius: 50%; - display: inline-block; - flex: 0 0 auto; -} diff --git a/Starlight.Launcher/Components/Pages/Settings.razor b/Starlight.Launcher/Components/Pages/Settings.razor deleted file mode 100644 index 29e8776..0000000 --- a/Starlight.Launcher/Components/Pages/Settings.razor +++ /dev/null @@ -1,76 +0,0 @@ -@using System.Globalization -@using AppTheme = Starlight.Launcher.Models.Settings.AppTheme; -@using Starlight.Launcher.Components.Atoms.Settings -@using Starlight.Launcher.Models.Data - -@page "/settings" - -
- -
-
- - @_localization["settings-menu-reset-option"] - -
- - - - - @_localization["settings-menu-general-category"] - - - - - @_localization["settings-menu-update-option"] - - - - - - @_localization["settings-menu-general-category"] - - - - - - - - @_localization["settings-menu-general-category"] - - - - @_localization["settings-menu-server-list-category"] - - - - - @_localization["settings-menu-tray-category"] - - - - - - - - - - - @_localization["settings-menu-general-category"] - - - - - - - - - - -
diff --git a/Starlight.Launcher/Components/Pages/Settings.razor.css b/Starlight.Launcher/Components/Pages/Settings.razor.css deleted file mode 100644 index e46aa5c..0000000 --- a/Starlight.Launcher/Components/Pages/Settings.razor.css +++ /dev/null @@ -1,16 +0,0 @@ -.settings-page { - height: 100%; - overflow: hidden; - position: relative; -} - -.settings-reset-button { - position: absolute; - bottom: 32px; - right: 32px; - z-index: 15; -} - -.mud-main-content.has-bottom-nav .settings-reset-button { - bottom: calc(32px + var(--bottom-nav-height)); -} diff --git a/Starlight.Launcher/Utility/HttpUtility.cs b/Starlight.Launcher/Helpers/HttpUtility.cs similarity index 65% rename from Starlight.Launcher/Utility/HttpUtility.cs rename to Starlight.Launcher/Helpers/HttpUtility.cs index 103b708..c6f9059 100644 --- a/Starlight.Launcher/Utility/HttpUtility.cs +++ b/Starlight.Launcher/Helpers/HttpUtility.cs @@ -3,10 +3,16 @@ namespace Starlight.Launcher.Utility; +/// +/// Provides helper methods for sending and receiving Zstandard-compressed HTTP content. +/// public static class HttpUtility { private static readonly StringWithQualityHeaderValue _zStdHeader = new("zstd", 1); + /// + /// Sends an HTTP request and automatically wraps Zstandard-compressed responses. + /// public static async Task SendZStdAsync( this HttpClient client, HttpRequestMessage message, @@ -25,12 +31,21 @@ public static async Task SendZStdAsync( return response; } + /// + /// Represents HTTP content that is transparently decompressed using Zstandard. + /// public sealed class ZStdHttpContent : DecompressedContent { + /// + /// Initializes a new instance of the class. + /// public ZStdHttpContent(HttpContent originalContent) : base(originalContent) { } + /// + /// Creates a stream that decompresses Zstandard-compressed content. + /// protected override Stream GetDecompressedStream(Stream originalStream) => new ZStdDecompressStream(originalStream); } } diff --git a/Starlight.Launcher/Utility/ZStd.cs b/Starlight.Launcher/Helpers/ZStd.cs similarity index 61% rename from Starlight.Launcher/Utility/ZStd.cs rename to Starlight.Launcher/Helpers/ZStd.cs index b241e0f..cdb62ca 100644 --- a/Starlight.Launcher/Utility/ZStd.cs +++ b/Starlight.Launcher/Helpers/ZStd.cs @@ -1,42 +1,62 @@ -using System.Buffers; using System; +using System.Buffers; using System.IO; -using System.Threading.Tasks; using System.Runtime.InteropServices; -using SharpZstd.Interop; -using static SharpZstd.Interop.Zstd; using System.Threading; +using System.Threading.Tasks; +using SharpZstd.Interop; namespace Starlight.Launcher.Utility; +/// +/// Provides helper methods for Zstandard compression. +/// public static class ZStd { - public static int CompressBound(int length) => (int)ZSTD_compressBound((nuint)length); + /// + /// Returns the maximum compressed size for the specified input length. + /// + public static int CompressBound(int length) => (int)Zstd.ZSTD_compressBound((nuint)length); } +/// +/// Represents a reusable Zstandard compression context. +/// public sealed unsafe partial class ZStdCCtx : IDisposable { + /// + /// Current compression context for this class. + /// public ZSTD_CCtx* Context { get; private set; } private bool _disposed => Context == null; - public ZStdCCtx() => Context = ZSTD_createCCtx(); + /// + /// Initializes a new compression context. + /// + public ZStdCCtx() => Context = Zstd.ZSTD_createCCtx(); + /// + /// Sets a compression parameter for this context. + /// public void SetParameter(ZSTD_cParameter parameter, int value) { CheckDisposed(); - ZSTD_CCtx_setParameter(Context, parameter, value); + _ = Zstd.ZSTD_CCtx_setParameter(Context, parameter, value); } - public int Compress(Span destination, Span source, int compressionLevel = ZSTD_CLEVEL_DEFAULT) + /// + /// Compresses the source data into the destination buffer. + /// + public int Compress(Span destination, Span source, int compressionLevel = 3) { CheckDisposed(); fixed (byte* dst = destination) fixed (byte* src = source) { - var ret = ZSTD_compressCCtx( + var ret = Zstd.ZSTD_compressCCtx( Context, dst, (nuint)destination.Length, src, (nuint)source.Length, @@ -47,17 +67,23 @@ public int Compress(Span destination, Span source, int compressionLe } } + /// + /// Releases the unmanaged compression context. + /// ~ZStdCCtx() { Dispose(); } + /// + /// Releases the unmanaged compression context. + /// public void Dispose() { if (_disposed) return; - ZSTD_freeCCtx(Context); + _ = Zstd.ZSTD_freeCCtx(Context); Context = null; GC.SuppressFinalize(this); } @@ -65,21 +91,36 @@ public void Dispose() private void CheckDisposed() => ObjectDisposedException.ThrowIf(_disposed, nameof(ZStdCCtx)); } +/// +/// Represents a reusable Zstandard decompression context. +/// public sealed unsafe partial class ZStdDCtx : IDisposable { + /// + /// Current decompression context for this class + /// public ZSTD_DCtx* Context { get; private set; } private bool _disposed => Context == null; - public ZStdDCtx() => Context = ZSTD_createDCtx(); + /// + /// Initializes a new decompression context. + /// + public ZStdDCtx() => Context = Zstd.ZSTD_createDCtx(); + /// + /// Sets a decompression parameter for this context. + /// public void SetParameter(ZSTD_dParameter parameter, int value) { CheckDisposed(); - ZSTD_DCtx_setParameter(Context, parameter, value); + _ = Zstd.ZSTD_DCtx_setParameter(Context, parameter, value); } + /// + /// Decompresses the source data into the destination buffer. + /// public int Decompress(Span destination, Span source) { CheckDisposed(); @@ -87,24 +128,30 @@ public int Decompress(Span destination, Span source) fixed (byte* dst = destination) fixed (byte* src = source) { - var ret = ZSTD_decompressDCtx(Context, dst, (nuint)destination.Length, src, (nuint)source.Length); + var ret = Zstd.ZSTD_decompressDCtx(Context, dst, (nuint)destination.Length, src, (nuint)source.Length); ZStdException.ThrowIfError(ret); return (int)ret; } } + /// + /// Releases the unmanaged decompression context. + /// ~ZStdDCtx() { Dispose(); } + /// + /// Releases the unmanaged decompression context. + /// public void Dispose() { if (_disposed) return; - ZSTD_freeDCtx(Context); + _ = Zstd.ZSTD_freeDCtx(Context); Context = null; GC.SuppressFinalize(this); } @@ -112,30 +159,51 @@ public void Dispose() private void CheckDisposed() => ObjectDisposedException.ThrowIf(_disposed, nameof(ZStdDCtx)); } +/// +/// Represents an exception thrown by the Zstandard library. +/// [Serializable] public class ZStdException : Exception { + /// + /// Initializes a new ZStd exception. + /// public ZStdException() { } + /// + /// Initializes a new ZStd exception. + /// public ZStdException(string message) : base(message) { } + /// + /// Initializes a new ZStd exception. + /// public ZStdException(string message, Exception inner) : base(message, inner) { } - public static unsafe ZStdException FromCode(nuint code) => new(Marshal.PtrToStringUTF8((IntPtr)ZSTD_getErrorName(code))!); + /// + /// Creates an exception from a Zstandard error code. + /// + public static unsafe ZStdException FromCode(nuint code) => new(Marshal.PtrToStringUTF8((IntPtr)Zstd.ZSTD_getErrorName(code))!); + /// + /// Throws a if the specified result represents an error. + /// public static void ThrowIfError(nuint code) { - if (ZSTD_isError(code) != 0) + if (Zstd.ZSTD_isError(code) != 0) throw FromCode(code); } } +/// +/// Provides a stream that decompresses Zstandard-compressed data while reading. +/// public sealed class ZStdDecompressStream : Stream { private readonly Stream _baseStream; @@ -146,21 +214,27 @@ public sealed class ZStdDecompressStream : Stream private int _bufferSize; private bool _disposed; + /// + /// Initializes a new decompression stream. + /// public unsafe ZStdDecompressStream(Stream baseStream, bool ownStream = true) { _baseStream = baseStream; _ownStream = ownStream; - _ctx = ZSTD_createDCtx(); - _buffer = ArrayPool.Shared.Rent((int)ZSTD_DStreamInSize()); + _ctx = Zstd.ZSTD_createDCtx(); + _buffer = ArrayPool.Shared.Rent((int)Zstd.ZSTD_DStreamInSize()); } + /// + /// Releases the resources used by the stream. + /// protected override unsafe void Dispose(bool disposing) { if (_disposed) return; _disposed = true; - ZSTD_freeDCtx(_ctx); + _ = Zstd.ZSTD_freeDCtx(_ctx); if (disposing) { @@ -171,20 +245,32 @@ protected override unsafe void Dispose(bool disposing) } } + /// + /// Flushes the underlying stream. + /// public override void Flush() { ThrowIfDisposed(); _baseStream.Flush(); } + /// + /// Reads and decompresses data into the specified buffer. + /// public override int Read(byte[] buffer, int offset, int count) => Read(buffer.AsSpan(offset, count)); + /// + /// Reads and decompresses a single byte. + /// public override int ReadByte() { Span buf = stackalloc byte[1]; return Read(buf) == 0 ? -1 : buf[0]; } + /// + /// Reads and decompresses data into the specified buffer. + /// public override unsafe int Read(Span buffer) { ThrowIfDisposed(); @@ -204,7 +290,7 @@ public override unsafe int Read(Span buffer) { var outputBuf = new ZSTD_outBuffer { dst = outputPtr, pos = 0, size = (nuint)buffer.Length }; var inputBuf = new ZSTD_inBuffer { src = inputPtr, pos = (nuint)_bufferPos, size = (nuint)_bufferSize }; - var ret = ZSTD_decompressStream(_ctx, &outputBuf, &inputBuf); + var ret = Zstd.ZSTD_decompressStream(_ctx, &outputBuf, &inputBuf); _bufferPos = (int)inputBuf.pos; ZStdException.ThrowIfError(ret); @@ -215,6 +301,9 @@ public override unsafe int Read(Span buffer) } while (true); } + /// + /// Asynchronously reads and decompresses data into the specified buffer. + /// public override async ValueTask ReadAsync( Memory buffer, CancellationToken cancellationToken = default) @@ -251,7 +340,7 @@ static unsafe nuint DecompressChunk(ZStdDecompressStream stream, Span buff inputBuf.pos = (nuint)stream._bufferPos; inputBuf.size = (nuint)stream._bufferSize; - var ret = ZSTD_decompressStream(stream._ctx, &outputBuf, &inputBuf); + var ret = Zstd.ZSTD_decompressStream(stream._ctx, &outputBuf, &inputBuf); stream._bufferPos = (int)inputBuf.pos; ZStdException.ThrowIfError(ret); @@ -261,17 +350,44 @@ static unsafe nuint DecompressChunk(ZStdDecompressStream stream, Span buff } } + /// + /// Currently not supported. + /// public override long Seek(long offset, SeekOrigin origin) => throw new NotSupportedException(); + /// + /// Currently not supported. + /// public override void SetLength(long value) => throw new NotSupportedException(); + /// + /// Currently not supported. + /// public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException(); + /// + /// Stream access parameter which determines read access. + /// public override bool CanRead => true; + + /// + /// Stream access parameter which determines seek access. + /// public override bool CanSeek => false; + + /// + /// Stream access parameter which determines write access. + /// public override bool CanWrite => false; + + /// + /// Currently not supported. + /// public override long Length => throw new NotSupportedException(); + /// + /// Currently not supported. + /// public override long Position { get => throw new NotSupportedException(); @@ -285,6 +401,9 @@ private void ThrowIfDisposed() } } +/// +/// Provides a stream that compresses data using Zstandard while writing. +/// public sealed class ZStdCompressStream : Stream { private readonly Stream _baseStream; @@ -294,18 +413,30 @@ public sealed class ZStdCompressStream : Stream private int _bufferPos; private bool _disposed; + /// + /// Initializes a new compression stream. + /// public unsafe ZStdCompressStream(Stream baseStream, bool ownStream = true) { - _ctx = ZSTD_createCCtx(); + _ctx = Zstd.ZSTD_createCCtx(); _baseStream = baseStream; _ownStream = ownStream; - _buffer = ArrayPool.Shared.Rent((int)ZSTD_CStreamOutSize()); + _buffer = ArrayPool.Shared.Rent((int)Zstd.ZSTD_CStreamOutSize()); } + /// + /// Flushes all pending compressed data to the underlying stream. + /// public override void Flush() => FlushInternal(ZSTD_EndDirective.ZSTD_e_flush); + /// + /// Finalizes the compression stream and writes all remaining compressed data. + /// public void FlushEnd() => FlushInternal(ZSTD_EndDirective.ZSTD_e_end); + /// + /// Flushes pending compressed data according to the specified Zstandard directive. + /// private unsafe void FlushInternal(ZSTD_EndDirective directive) { fixed (byte* outPtr = _buffer) @@ -319,7 +450,7 @@ private unsafe void FlushInternal(ZSTD_EndDirective directive) while (true) { - var err = ZSTD_compressStream2(_ctx, &outBuf, &inBuf, directive); + var err = Zstd.ZSTD_compressStream2(_ctx, &outBuf, &inBuf, directive); ZStdException.ThrowIfError(err); _bufferPos = (int)outBuf.pos; @@ -335,14 +466,29 @@ private unsafe void FlushInternal(ZSTD_EndDirective directive) _baseStream.Flush(); } + /// + /// Currently not supported + /// public override int Read(byte[] buffer, int offset, int count) => throw new NotSupportedException(); + /// + /// Currently not supported + /// public override long Seek(long offset, SeekOrigin origin) => throw new NotSupportedException(); + /// + /// Currently not supported + /// public override void SetLength(long value) => throw new NotSupportedException(); + /// + /// Compresses the specified data and appends it to the compression stream. + /// public override void Write(byte[] buffer, int offset, int count) => Write(buffer.AsSpan(offset, count)); + /// + /// Compresses the specified data and appends it to the compression stream. + /// public override unsafe void Write(ReadOnlySpan buffer) { ThrowIfDisposed(); @@ -362,7 +508,7 @@ public override unsafe void Write(ReadOnlySpan buffer) while (true) { - var err = ZSTD_compressStream2(_ctx, &outBuf, &inBuf, ZSTD_EndDirective.ZSTD_e_continue); + var err = Zstd.ZSTD_compressStream2(_ctx, &outBuf, &inBuf, ZSTD_EndDirective.ZSTD_e_continue); ZStdException.ThrowIfError(err); _bufferPos = (int)outBuf.pos; @@ -377,17 +523,38 @@ public override unsafe void Write(ReadOnlySpan buffer) } } + /// + /// Stream access parameter which determines read access. + /// public override bool CanRead => false; + + /// + /// Stream access parameter which determines seek access. + /// public override bool CanSeek => false; + + /// + /// Stream access parameter which determines write access. + /// public override bool CanWrite => true; + + /// + /// Currently not supported + /// public override long Length => throw new NotSupportedException(); + /// + /// Currently not supported + /// public override long Position { get => throw new NotSupportedException(); set => throw new NotSupportedException(); } + /// + /// Releases the resources used by the stream. + /// protected override unsafe void Dispose(bool disposing) { base.Dispose(disposing); @@ -396,7 +563,7 @@ protected override unsafe void Dispose(bool disposing) return; _disposed = true; - ZSTD_freeCCtx(_ctx); + _ = Zstd.ZSTD_freeCCtx(_ctx); if (disposing) { diff --git a/Starlight.Launcher/MainPage.xaml b/Starlight.Launcher/MainPage.xaml deleted file mode 100644 index e984720..0000000 --- a/Starlight.Launcher/MainPage.xaml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/Starlight.Launcher/MainPage.xaml.cs b/Starlight.Launcher/MainPage.xaml.cs deleted file mode 100644 index 8a3cb58..0000000 --- a/Starlight.Launcher/MainPage.xaml.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Starlight.Launcher.Services.State; - -namespace Starlight.Launcher; - -public partial class MainPage : ContentPage -{ - public MainPage(AppState appState) - { - InitializeComponent(); - - appState.Paused += () => MainThread.BeginInvokeOnMainThread(blazorWebView.PauseWebView); - appState.Resumed += () => MainThread.BeginInvokeOnMainThread(blazorWebView.ResumeWebView); - } -} diff --git a/Starlight.Launcher/MainWindow.axaml b/Starlight.Launcher/MainWindow.axaml new file mode 100644 index 0000000..1c6be89 --- /dev/null +++ b/Starlight.Launcher/MainWindow.axaml @@ -0,0 +1,8 @@ + + + + + diff --git a/Starlight.Launcher/MainWindow.axaml.cs b/Starlight.Launcher/MainWindow.axaml.cs new file mode 100644 index 0000000..2fd8970 --- /dev/null +++ b/Starlight.Launcher/MainWindow.axaml.cs @@ -0,0 +1,34 @@ +using Avalonia.Controls; +using Avalonia.Markup.Xaml; +using Avalonia.Platform; + +namespace Starlight.Launcher; + +public partial class MainWindow : Window +{ + private readonly NativeWebView _web; + + public MainWindow() : this(null) { } + + public MainWindow(Uri? blazorUrl) + { + InitializeComponent(); + + _web = this.FindControl("Web") + ?? throw new InvalidOperationException("WebView not found."); + + if (OperatingSystem.IsLinux()) + { + _web.EnvironmentRequested += (_, args) => + { + if (args is LinuxWpeWebViewEnvironmentRequestedEventArgs wpeArgs) + wpeArgs.PreferWebKitGtkInstead = true; + }; + } + + if (blazorUrl is not null) + _web.Source = blazorUrl; + } + + private void InitializeComponent() => AvaloniaXamlLoader.Load(this); +} diff --git a/Starlight.Launcher/MauiProgram.cs b/Starlight.Launcher/MauiProgram.cs deleted file mode 100644 index bc7bcac..0000000 --- a/Starlight.Launcher/MauiProgram.cs +++ /dev/null @@ -1,162 +0,0 @@ -using Microsoft.Extensions.Logging; -using MudBlazor; -using MudBlazor.Services; -using Robust.Launcher.Api.Api; -using Robust.Launcher.Api.Models.ServerStatus; -using Robust.Launcher.Api.Utility; -using Serilog; -using Starlight.Launcher.Services; -using Starlight.Launcher.Services.Auth; -using Starlight.Launcher.Services.Discord; -using Starlight.Launcher.Services.EngineManager; -using Starlight.Launcher.Services.Localization; -using Starlight.Launcher.Services.ServerStatus; -using Starlight.Launcher.Services.Settings; -using Starlight.Launcher.Services.State; - -namespace Starlight.Launcher; - -public static class MauiProgram -{ - public static MauiApp CreateMauiApp() - { - try - { -#if DEBUG && WINDOWS - ConsoleHelper.CreateConsole(); -#endif - -#if WINDOWS - var userData = Path.Combine( - Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), - "Starlight.Launcher", "WebView2"); - Directory.CreateDirectory(userData); - Environment.SetEnvironmentVariable("WEBVIEW2_USER_DATA_FOLDER", userData); -#endif - - var builder = MauiApp.CreateBuilder(); - - var logger = new LoggerConfiguration() - .WriteTo.Console() - .WriteTo.File(Path.Combine(FileSystem.Current.AppDataDirectory, "log.txt"), rollingInterval: RollingInterval.Day).CreateLogger(); - - Log.Logger = logger; - - builder.Logging.ClearProviders(); - builder.Logging.AddSerilog(logger); - - var messaging = new LauncherMessaging(); - string[] commands = { LauncherCommands.PingCommand }; - var commandSendAnyway = false; - var args = Environment.GetCommandLineArgs().Skip(1).ToArray(); - if (args.Length == 1) - { - if (Uri.TryCreate(args[0], UriKind.Absolute, out var result)) - { - commands = new string[] - { LauncherCommands.BlankReasonCommand, LauncherCommands.ConstructConnectCommand(result) }; - commandSendAnyway = true; - } - } - else if (args.Length >= 2) - { - if (args[0] == "--commands") - { - commands = new string[args.Length - 1]; - for (var i = 0; i < commands.Length; i++) - commands[i] = args[i + 1]; - commandSendAnyway = true; - } - } - - if (messaging.SendCommandsOrClaim(commands, commandSendAnyway)) - Environment.Exit(0); - - builder - .UseMauiApp() - .ConfigureFonts(fonts => - { - fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); - fonts.AddFont("CormorantGaramond-Regular.ttf", "Cormorant Garamond"); - }); - -#if WINDOWS - builder.Services.AddSingleton(); -#elif MACCATALYST - builder.Services.AddSingleton(); - // #elif (Avalonia backend) → builder.Services.AddSingleton(); -#endif - -#if WINDOWS - builder.Services.AddSingleton(); -#endif - //builder.Services.AddSingleton(); Linux - - builder.Services.AddSingleton(); - - builder.Services.AddSingleton(); - -#if WINDOWS - builder.Services.AddSingleton(); -#elif MACCATALYST - builder.Services.AddSingleton(); -#endif - - builder.Services.AddSingleton(); - - builder.Services.AddSingleton(messaging); - builder.Services.AddSingleton(); - - var httpClient = HappyEyeballsHttp.CreateHttpClient(); - builder.Services.AddSingleton(httpClient); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - builder.Services.AddTransient(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(sp => - { - var fetcher = sp.GetRequiredService(); - return new ServerInfoLoader(fetcher.UpdateInfoForAsync); - }); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - builder.Services.AddTransient(); - builder.Services.AddSingleton(); - builder.Services.AddSingleton(); - builder.Services.AddMauiBlazorWebView(); - builder.Services.AddMudServices(); - builder.Services.AddMudMarkdownServices(); - -#if DEBUG - builder.Services.AddBlazorWebViewDeveloperTools(); -#endif - - var app = builder.Build(); - -#if WINDOWS - app.Services.GetRequiredService().Initialize(); -#endif - app.Services.GetRequiredService().RequestInitialUpdate(); - app.Services.GetRequiredService().Initialize(); - app.Services.GetRequiredService().Initialize(); - app.Services.GetRequiredService().Initialize(); - - return app; - } - catch (Exception ex) - { - var text = ex.ToString(); - System.Diagnostics.Debug.WriteLine(text); - File.WriteAllText( - Path.Combine(FileSystem.Current.AppDataDirectory, "startup-crash.txt"), text); - throw; - } - } -} diff --git a/Starlight.Launcher/Models/Data/LocalizationsManifest.cs b/Starlight.Launcher/Models/Data/LocalizationsManifest.cs deleted file mode 100644 index 8e13a88..0000000 --- a/Starlight.Launcher/Models/Data/LocalizationsManifest.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Starlight.Launcher.Models.Data; - -/// -/// Index of all available localizations contained in json files in "Resources/Localization" directory. -/// Key is localization name, value is paths to ftl files with localization data. -/// -public sealed class LocalizationsManifest : Dictionary>; \ No newline at end of file diff --git a/Starlight.Launcher/Models/Helpers/FileResult.cs b/Starlight.Launcher/Models/Helpers/FileResult.cs new file mode 100644 index 0000000..47d9fe8 --- /dev/null +++ b/Starlight.Launcher/Models/Helpers/FileResult.cs @@ -0,0 +1,27 @@ +using Starlight.Launcher.WebUI.Models.Helpers; + +namespace Starlight.Launcher.Models.Helpers; + +public sealed class FileResult : IFileResult +{ + public string FileName { get; init; } + public string FullPath { get; init; } + + public FileResult(string fullPath) + { + FullPath = fullPath; + FileName = Path.GetFileName(fullPath); + } + + public Task OpenReadAsync() => + Task.FromResult(File.OpenRead(FullPath)); + + public Task OpenWriteAsync() + { + var directory = Path.GetDirectoryName(FullPath); + if (!string.IsNullOrEmpty(directory)) + _ = Directory.CreateDirectory(directory); + + return Task.FromResult(File.Open(FullPath, FileMode.OpenOrCreate, FileAccess.Write)); + } +} diff --git a/Starlight.Launcher/Models/Tray.cs b/Starlight.Launcher/Models/Tray/TrayMenuItem.cs similarity index 63% rename from Starlight.Launcher/Models/Tray.cs rename to Starlight.Launcher/Models/Tray/TrayMenuItem.cs index 8b0e817..73c0311 100644 --- a/Starlight.Launcher/Models/Tray.cs +++ b/Starlight.Launcher/Models/Tray/TrayMenuItem.cs @@ -1,8 +1,6 @@ -namespace Starlight.Launcher.Models; +namespace Starlight.Launcher.Models.Tray; public sealed record TrayMenuItem(string Text, Action? Invoke = null, bool IsSeparator = false) { public static TrayMenuItem Separator => new(string.Empty, IsSeparator: true); } - -public sealed record TrayOptions(string Tooltip, string IconPath); \ No newline at end of file diff --git a/Starlight.Launcher/Models/Tray/TrayOptions.cs b/Starlight.Launcher/Models/Tray/TrayOptions.cs new file mode 100644 index 0000000..60904bf --- /dev/null +++ b/Starlight.Launcher/Models/Tray/TrayOptions.cs @@ -0,0 +1,3 @@ +namespace Starlight.Launcher.Models.Tray; + +public sealed record TrayOptions(string Tooltip, string IconPath); diff --git a/Starlight.Launcher/Platforms/Android/AndroidManifest.xml b/Starlight.Launcher/Platforms/Android/AndroidManifest.xml deleted file mode 100644 index dbf9e7e..0000000 --- a/Starlight.Launcher/Platforms/Android/AndroidManifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Starlight.Launcher/Platforms/Android/MainActivity.cs b/Starlight.Launcher/Platforms/Android/MainActivity.cs deleted file mode 100644 index c738b07..0000000 --- a/Starlight.Launcher/Platforms/Android/MainActivity.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Android.App; -using Android.Content.PM; -using Android.OS; - -namespace Starlight.Launcher -{ - [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)] - public class MainActivity : MauiAppCompatActivity - { - } -} diff --git a/Starlight.Launcher/Platforms/Android/MainApplication.cs b/Starlight.Launcher/Platforms/Android/MainApplication.cs deleted file mode 100644 index 9078b32..0000000 --- a/Starlight.Launcher/Platforms/Android/MainApplication.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Android.App; -using Android.Runtime; - -namespace Starlight.Launcher -{ - [Application] - public class MainApplication : MauiApplication - { - public MainApplication(IntPtr handle, JniHandleOwnership ownership) - : base(handle, ownership) - { - } - - protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); - } -} diff --git a/Starlight.Launcher/Platforms/Android/Resources/values/colors.xml b/Starlight.Launcher/Platforms/Android/Resources/values/colors.xml deleted file mode 100644 index c04d749..0000000 --- a/Starlight.Launcher/Platforms/Android/Resources/values/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - #512BD4 - #2B0B98 - #2B0B98 - \ No newline at end of file diff --git a/Starlight.Launcher/Platforms/Linux/Services/Settings/FileKeyProvider.cs b/Starlight.Launcher/Platforms/Linux/Services/Settings/FileKeyProvider.cs deleted file mode 100644 index eafc2ae..0000000 --- a/Starlight.Launcher/Platforms/Linux/Services/Settings/FileKeyProvider.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* -using System.Security.Cryptography; - -public sealed class FileKeyProvider : ILoginKeyProvider -{ - private readonly string _keyPath = Path.Combine(FileSystem.AppDataDirectory, "logins.key"); - - public async Task GetOrCreateKeyAsync() - { - if (File.Exists(_keyPath)) - return Convert.FromBase64String(await File.ReadAllTextAsync(_keyPath)); - - var key = RandomNumberGenerator.GetBytes(32); - Directory.CreateDirectory(Path.GetDirectoryName(_keyPath)!); - - var tmp = _keyPath + ".tmp"; - await File.WriteAllTextAsync(tmp, Convert.ToBase64String(key)); - if (OperatingSystem.IsLinux()) - File.SetUnixFileMode(tmp, UnixFileMode.UserRead | UnixFileMode.UserWrite); - File.Move(tmp, _keyPath, true); - return key; - } -} -*/ diff --git a/Starlight.Launcher/Platforms/MacCatalyst/AppDelegate.cs b/Starlight.Launcher/Platforms/MacCatalyst/AppDelegate.cs deleted file mode 100644 index c007e04..0000000 --- a/Starlight.Launcher/Platforms/MacCatalyst/AppDelegate.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Foundation; - -namespace Starlight.Launcher; - -[Register("AppDelegate")] -public class AppDelegate : MauiUIApplicationDelegate -{ - protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); -} diff --git a/Starlight.Launcher/Platforms/MacCatalyst/Entitlements.plist b/Starlight.Launcher/Platforms/MacCatalyst/Entitlements.plist deleted file mode 100644 index de4adc9..0000000 --- a/Starlight.Launcher/Platforms/MacCatalyst/Entitlements.plist +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - com.apple.security.app-sandbox - - - com.apple.security.network.client - - - - diff --git a/Starlight.Launcher/Platforms/MacCatalyst/Info.plist b/Starlight.Launcher/Platforms/MacCatalyst/Info.plist deleted file mode 100644 index ce010ef..0000000 --- a/Starlight.Launcher/Platforms/MacCatalyst/Info.plist +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - UIDeviceFamily - - 2 - - UIRequiredDeviceCapabilities - - arm64 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - CFBundleURLTypes - - - CFBundleURLName - starlight - CFBundleURLSchemes - - starlight - - - - XSAppIconAssets - Assets.xcassets/appicon.appiconset - - diff --git a/Starlight.Launcher/Platforms/MacCatalyst/Program.cs b/Starlight.Launcher/Platforms/MacCatalyst/Program.cs deleted file mode 100644 index 511e0ba..0000000 --- a/Starlight.Launcher/Platforms/MacCatalyst/Program.cs +++ /dev/null @@ -1,13 +0,0 @@ -using ObjCRuntime; -using UIKit; - -namespace Starlight.Launcher; - -public class Program -{ - // This is the main entry point of the application. - static void Main(string[] args) => - // if you want to use a different Application Delegate class from "AppDelegate" - // you can specify it here. - UIApplication.Main(args, null, typeof(AppDelegate)); -} diff --git a/Starlight.Launcher/Platforms/MacCatalyst/Services/FileDialog.cs b/Starlight.Launcher/Platforms/MacCatalyst/Services/FileDialog.cs deleted file mode 100644 index 0e1f72f..0000000 --- a/Starlight.Launcher/Platforms/MacCatalyst/Services/FileDialog.cs +++ /dev/null @@ -1,119 +0,0 @@ -using Foundation; -using UIKit; -using UniformTypeIdentifiers; - -namespace Starlight.Launcher.Services; - -public sealed class MacFileDialogService : IFileDialogService -{ - public Task PickFileAsync(string filter, CancellationToken cancel = default) - => PickAsync(BuildFileTypes(), asCopy: true, cancel); - - public Task PickFolderAsync(CancellationToken cancel = default) - => PickAsync(new[] { UTTypes.Folder }, asCopy: false, cancel); - - private static Task PickAsync(UTType[] types, bool asCopy, CancellationToken cancel) - { - var tcs = new TaskCompletionSource(); - - UIApplication.SharedApplication.InvokeOnMainThread(() => - { - try { ShowPicker(tcs, types, asCopy, cancel); } - catch (Exception ex) { tcs.TrySetException(ex); } - }); - - return tcs.Task; - } - - private static UTType[] BuildFileTypes() - { - var types = new List { UTTypes.Zip }; - if (UTType.CreateFromExtension("rt") is { } rt) - types.Add(rt); - return types.ToArray(); - } - - private static void ShowPicker( - TaskCompletionSource tcs, - UTType[] types, - bool asCopy, - CancellationToken cancel) - { - var presenter = GetTopViewController(); - if (presenter is null) - { - tcs.TrySetResult(null); - return; - } - - var picker = new UIDocumentPickerViewController(types, asCopy: asCopy) - { - AllowsMultipleSelection = false, - ShouldShowFileExtensions = true, - }; - - var del = new PickerDelegate(tcs, scoped: !asCopy); - picker.Delegate = del; - - var reg = cancel.Register(() => UIApplication.SharedApplication.InvokeOnMainThread(() => - { - picker.DismissViewController(true, null); - tcs.TrySetResult(null); - })); - - tcs.Task.ContinueWith(_ => - { - GC.KeepAlive(del); - reg.Dispose(); - }, TaskScheduler.Default); - - presenter.PresentViewController(picker, true, null); - } - - private static UIViewController? GetTopViewController() - { - var window = UIApplication.SharedApplication.ConnectedScenes - .ToArray() - .OfType() - .SelectMany(s => s.Windows) - .FirstOrDefault(w => w.IsKeyWindow); - - var vc = window?.RootViewController; - while (vc?.PresentedViewController is { } presented) - vc = presented; - - return vc; - } - - private sealed class PickerDelegate : UIDocumentPickerDelegate - { - private readonly TaskCompletionSource _tcs; - private readonly bool _scoped; - - public PickerDelegate(TaskCompletionSource tcs, bool scoped) - { - _tcs = tcs; - _scoped = scoped; - } - - public override void DidPickDocument(UIDocumentPickerViewController controller, NSUrl[] urls) - { - if (urls.FirstOrDefault() is not { } url || url.Path is not { Length: > 0 } path) - { - _tcs.TrySetResult(null); - return; - } - - if (_scoped) - { - url.StartAccessingSecurityScopedResource(); - url.StopAccessingSecurityScopedResource(); - } - - _tcs.TrySetResult(new FileResult(path)); - } - - public override void WasCancelled(UIDocumentPickerViewController controller) - => _tcs.TrySetResult(null); - } -} diff --git a/Starlight.Launcher/Platforms/MacCatalyst/Services/LauncherCommands.cs b/Starlight.Launcher/Platforms/MacCatalyst/Services/LauncherCommands.cs deleted file mode 100644 index 0e0ae3b..0000000 --- a/Starlight.Launcher/Platforms/MacCatalyst/Services/LauncherCommands.cs +++ /dev/null @@ -1,12 +0,0 @@ -using UIKit; - -namespace Starlight.Launcher.Services; - -public partial class LauncherCommands -{ - partial void ActivateWindowPlatform(Window window) - { - if (window.Handler?.PlatformView is UIWindow uiWindow) - uiWindow.MakeKeyAndVisible(); - } -} diff --git a/Starlight.Launcher/Platforms/MacCatalyst/Services/Tray.cs b/Starlight.Launcher/Platforms/MacCatalyst/Services/Tray.cs deleted file mode 100644 index 83a5958..0000000 --- a/Starlight.Launcher/Platforms/MacCatalyst/Services/Tray.cs +++ /dev/null @@ -1,122 +0,0 @@ -using Foundation; -using ObjCRuntime; -using Starlight.Launcher.Models; -using System.Runtime.InteropServices; - -namespace Starlight.Launcher.Services; - -public sealed class MacTray : NSObject, INativeTray -{ - [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")] - static extern IntPtr Send(IntPtr r, IntPtr sel); - [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")] - static extern IntPtr Send(IntPtr r, IntPtr sel, IntPtr a); - [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")] - static extern IntPtr SendCG(IntPtr r, IntPtr sel, double a); - [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")] - static extern IntPtr Send3(IntPtr r, IntPtr sel, IntPtr a, IntPtr b, IntPtr c); - [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")] - static extern void SendB(IntPtr r, IntPtr sel, byte a); - - [DllImport("/usr/lib/libSystem.dylib")] - static extern IntPtr dlopen(string path, int mode); - - const double NSVariableStatusItemLength = -1.0; - const int RTLD_NOW = 2; - - private readonly List _actions = new(); - private IntPtr _statusItem; - -#pragma warning disable CS0067 - public event EventHandler? IconActivated; // Can't be used on Mac Catalyst, but we need it to satisfy the interface. -#pragma warning restore CS0067 - public bool IsWindowVisible { get; private set; } = true; - - static MacTray() => dlopen("/System/Library/Frameworks/AppKit.framework/AppKit", RTLD_NOW); - - public void Initialize(TrayOptions o, IReadOnlyList menu) - { - var bar = Send(Class.GetHandle("NSStatusBar"), Selector.GetHandle("systemStatusBar")); - - _statusItem = SendCG(bar, Selector.GetHandle("statusItemWithLength:"), NSVariableStatusItemLength); - - var button = Send(_statusItem, Selector.GetHandle("button")); - Send(button, Selector.GetHandle("setTitle:"), new NSString("●").Handle); - if (!string.IsNullOrEmpty(o.Tooltip)) - Send(button, Selector.GetHandle("setToolTip:"), new NSString(o.Tooltip).Handle); - - var nsMenu = Send(Send(Class.GetHandle("NSMenu"), Selector.GetHandle("alloc")), - Selector.GetHandle("init")); - - var onMenuSel = Selector.GetHandle("onMenu:"); - for (int i = 0; i < menu.Count; i++) - { - _actions.Add(menu[i].Invoke); - - IntPtr item; - if (menu[i].IsSeparator) - { - item = Send(Class.GetHandle("NSMenuItem"), Selector.GetHandle("separatorItem")); - } - else - { - var alloc = Send(Class.GetHandle("NSMenuItem"), Selector.GetHandle("alloc")); - item = Send3(alloc, Selector.GetHandle("initWithTitle:action:keyEquivalent:"), - new NSString(menu[i].Text).Handle, - onMenuSel, - new NSString(string.Empty).Handle); - - Send(item, Selector.GetHandle("setTarget:"), Handle); - Send(item, Selector.GetHandle("setTag:"), (IntPtr)i); - } - - Send(nsMenu, Selector.GetHandle("addItem:"), item); - if (!menu[i].IsSeparator) - Send(item, Selector.GetHandle("release")); - } - - Send(_statusItem, Selector.GetHandle("setMenu:"), nsMenu); - Send(nsMenu, Selector.GetHandle("release")); - } - - [Export("onMenu:")] - public void OnMenu(NSObject sender) - { - var tag = (int)Send(sender.Handle, Selector.GetHandle("tag")).ToInt64(); - if (tag >= 0 && tag < _actions.Count) - _actions[tag]?.Invoke(); - } - - public void ShowWindow() - { - var app = Send(Class.GetHandle("NSApplication"), Selector.GetHandle("sharedApplication")); - Send(app, Selector.GetHandle("setActivationPolicy:"), (IntPtr)0); - SendB(app, Selector.GetHandle("activateIgnoringOtherApps:"), 1); - IsWindowVisible = true; - } - - public void HideWindow() - { - var app = Send(Class.GetHandle("NSApplication"), Selector.GetHandle("sharedApplication")); - Send(app, Selector.GetHandle("setActivationPolicy:"), (IntPtr)1); - IsWindowVisible = false; - } - - public void UpdateTooltip(string t) - { - if (_statusItem == IntPtr.Zero) return; - var button = Send(_statusItem, Selector.GetHandle("button")); - Send(button, Selector.GetHandle("setToolTip:"), new NSString(t ?? string.Empty).Handle); - } - - protected override void Dispose(bool d) - { - if (_statusItem != IntPtr.Zero) - { - var bar = Send(Class.GetHandle("NSStatusBar"), Selector.GetHandle("systemStatusBar")); - Send(bar, Selector.GetHandle("removeStatusItem:"), _statusItem); - _statusItem = IntPtr.Zero; - } - base.Dispose(d); - } -} diff --git a/Starlight.Launcher/Platforms/Windows/App.xaml b/Starlight.Launcher/Platforms/Windows/App.xaml deleted file mode 100644 index 87e8b73..0000000 --- a/Starlight.Launcher/Platforms/Windows/App.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/Starlight.Launcher/Platforms/Windows/App.xaml.cs b/Starlight.Launcher/Platforms/Windows/App.xaml.cs deleted file mode 100644 index 99cf0f1..0000000 --- a/Starlight.Launcher/Platforms/Windows/App.xaml.cs +++ /dev/null @@ -1,212 +0,0 @@ -using System.Runtime.InteropServices; -using Microsoft.Maui.Platform; -using Microsoft.UI.Windowing; -using Microsoft.Windows.AppLifecycle; -using Serilog; -using Starlight.Launcher.Services; -using Starlight.Launcher.Services.Auth; -using Starlight.Launcher.Services.Settings; -using Windows.ApplicationModel.Activation; - -// To learn more about WinUI, the WinUI project structure, -// and more about our project templates, see: http://aka.ms/winui-project-info. - -namespace Starlight.Launcher.WinUI; - -/// -/// Provides application-specific behavior to supplement the default Application class. -/// -public partial class App : MauiWinUIApplication -{ - private const string ProtocolScheme = "starlight"; - - /// - /// Initializes the singleton application object. This is the first line of authored code - /// executed, and as such is the logical equivalent of main() or WinMain(). - /// - public App() - { - InitializeComponent(); - - Microsoft.Maui.Handlers.WindowHandler.Mapper.AppendToMapping(nameof(IWindow), (handler, view) => - { - var nativeWindow = handler.PlatformView; - var appWindow = nativeWindow.GetAppWindow(); - - nativeWindow.ExtendsContentIntoTitleBar = true; - nativeWindow.SetTitleBar(null); - - var settings = handler.MauiContext?.Services.GetRequiredService(); - var tray = handler.MauiContext?.Services.GetRequiredService(); - - if (appWindow is not null) - { - appWindow.Closing += (sender, args) => - { - if (settings?.GetSettings().CollapseInTrayOnClose == true) - { - args.Cancel = true; - tray?.HideWindow(); - } - }; - - appWindow.Changed += (sender, args) => - { - if (sender.Presenter is OverlappedPresenter presenter) - { - if (presenter.State == OverlappedPresenterState.Minimized) - { - if (settings?.GetSettings().CollapseInTrayOnMinimize == true) - { - tray?.HideWindow(); - } - } - } - }; - } - }); - } - - private static void RegisterProtocol() - { - try - { - var exe = Environment.ProcessPath!; - - ActivationRegistrationManager.RegisterForProtocolActivation( - scheme: ProtocolScheme, - logo: $"{exe},0", - displayName: "Starlight Protocol", - exePath: exe); - } - catch (Exception ex) - { - Log.Warning(ex, "Failed to register starlight protocol"); - } - } - - protected override async void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) - { - RegisterProtocol(); - - var instance = AppInstance.FindOrRegisterForKey("starlight-main"); - var activated = AppInstance.GetCurrent().GetActivatedEventArgs(); - - if (!instance.IsCurrent) - { - await instance.RedirectActivationToAsync(activated); - return; - } - - instance.Activated += (_, e) => HandleProtocol(e, warm: true); - - HandleProtocol(activated, warm: false); - - base.OnLaunched(args); - } - - [DllImport("shell32.dll", SetLastError = true)] - private static extern IntPtr CommandLineToArgvW( - [MarshalAs(UnmanagedType.LPWStr)] string lpCmdLine, out int pNumArgs); - - [DllImport("kernel32.dll")] - private static extern IntPtr LocalFree(IntPtr hMem); - - private static string[] SplitCommandLine(string commandLine) - { - var ptr = CommandLineToArgvW(commandLine, out var argc); - if (ptr == IntPtr.Zero) return Array.Empty(); - try - { - var args = new string[argc]; - for (var i = 0; i < argc; i++) - { - var p = Marshal.ReadIntPtr(ptr, i * IntPtr.Size); - args[i] = Marshal.PtrToStringUni(p) ?? ""; - } - return args; - } - finally - { - LocalFree(ptr); - } - } - - private static string[]? ExtractCommands(string? raw) - { - if (string.IsNullOrWhiteSpace(raw)) return null; - - var argv = SplitCommandLine(raw); - var idx = Array.IndexOf(argv, "--commands"); - if (idx < 0 || idx + 1 >= argv.Length) return null; - - return argv[(idx + 1)..]; - } - - private static void HandleProtocol(AppActivationArguments? e, bool warm) - { - var services = IPlatformApplication.Current?.Services; - if (services is null) return; - - switch (e?.Kind) - { - case ExtendedActivationKind.Protocol when e.Data is IProtocolActivatedEventArgs p: - { - Log.Information("Protocol URI: {uri}", p.Uri); - - services.GetRequiredService() - .HandleDeepLink(p.Uri); - - break; - } - - case ExtendedActivationKind.Launch: - { - var launch = (ILaunchActivatedEventArgs?)e.Data; - var raw = launch?.Arguments; - - var uri = ExtractStarlightUri(raw); - if (uri != null) - { - services.GetRequiredService() - .HandleDeepLink(uri); - return; - } - - if (warm) - { - var commands = ExtractCommands(raw); - if (commands is { Length: > 0 }) - { - var lc = services.GetRequiredService(); - foreach (var c in commands) - _ = lc.QueueCommand(c); - } - } - - break; - } - } - } - - private static Uri? ExtractStarlightUri(string? raw) - { - if (string.IsNullOrWhiteSpace(raw)) - return null; - - var args = SplitCommandLine(raw); - - foreach (var arg in args) - { - if (Uri.TryCreate(arg, UriKind.Absolute, out var uri) && - uri.Scheme.Equals(ProtocolScheme, StringComparison.OrdinalIgnoreCase)) - { - return uri; - } - } - - return null; - } - - protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); -} diff --git a/Starlight.Launcher/Platforms/Windows/Package.appxmanifest b/Starlight.Launcher/Platforms/Windows/Package.appxmanifest deleted file mode 100644 index 63579bf..0000000 --- a/Starlight.Launcher/Platforms/Windows/Package.appxmanifest +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - $placeholder$ - Starlight - $placeholder$.png - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Starlight.Launcher/Platforms/Windows/Services/FileDialog.cs b/Starlight.Launcher/Platforms/Windows/Services/FileDialog.cs deleted file mode 100644 index 07d716c..0000000 --- a/Starlight.Launcher/Platforms/Windows/Services/FileDialog.cs +++ /dev/null @@ -1,190 +0,0 @@ -using System.Runtime.InteropServices; - -namespace Starlight.Launcher.Services; - -public sealed class WindowsFileDialogService : IFileDialogService -{ - public Task PickFileAsync(string filter, CancellationToken cancel = default) - => RunSta(() => ShowFileDialog(filter)); - - public Task PickFolderAsync(CancellationToken cancel = default) - => RunSta(ShowFolderDialog); - - private static Task RunSta(Func show) - { - var tcs = new TaskCompletionSource(); - - var thread = new Thread(() => - { - try { tcs.SetResult(show()); } - catch (Exception ex) { tcs.SetException(ex); } - }); - - thread.SetApartmentState(ApartmentState.STA); - thread.Start(); - - return tcs.Task; - } - - private static FileResult? ShowFileDialog(string filter = "Content bundles / replays\0*.zip;*.rt\0All Files\0*.*\0\0") - { - var buffer = Marshal.AllocHGlobal(1024 * sizeof(char)); - - try - { - Marshal.WriteInt16(buffer, 0); - - var ofn = new OpenFileName - { - lStructSize = Marshal.SizeOf(), - lpstrFilter = filter, - lpstrFile = buffer, - nMaxFile = 1024, - lpstrTitle = "Select file", - Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_NOCHANGEDIR, - }; - - if (!GetOpenFileNameW(ref ofn)) - return null; - - var path = Marshal.PtrToStringUni(buffer) ?? string.Empty; - return new FileResult(path); - } - finally - { - Marshal.FreeHGlobal(buffer); - } - } - - private static FileResult? ShowFolderDialog() - { - var clsid = new Guid("DBC80044-A445-435B-BC74-9C25C1C588A9"); // CLSID_FileOpenDialog - var iid = typeof(IFileDialog).GUID; // IID_IFileDialog - - var hrCreate = CoCreateInstance(ref clsid, IntPtr.Zero, CLSCTX_INPROC_SERVER, ref iid, out var obj); - if (hrCreate != 0) - Marshal.ThrowExceptionForHR(hrCreate); - - var dialog = (IFileDialog)obj; - try - { - dialog.GetOptions(out var options); - dialog.SetOptions(options | FOS_PICKFOLDERS | FOS_FORCEFILESYSTEM | FOS_PATHMUSTEXIST); - dialog.SetTitle("Select a folder"); - - const int ERROR_CANCELLED = unchecked((int)0x800704C7); - var hr = dialog.Show(IntPtr.Zero); - if (hr == ERROR_CANCELLED) - return null; - if (hr != 0) - Marshal.ThrowExceptionForHR(hr); - - dialog.GetResult(out var item); - try - { - item.GetDisplayName(SIGDN_FILESYSPATH, out var path); - return string.IsNullOrEmpty(path) ? null : new FileResult(path); - } - finally - { - Marshal.ReleaseComObject(item); - } - } - finally - { - Marshal.ReleaseComObject(dialog); - } - } - - private const int OFN_FILEMUSTEXIST = 0x00001000; - private const int OFN_PATHMUSTEXIST = 0x00000800; - private const int OFN_NOCHANGEDIR = 0x00000008; - - private const uint FOS_PICKFOLDERS = 0x00000020; - private const uint FOS_FORCEFILESYSTEM = 0x00000040; - private const uint FOS_PATHMUSTEXIST = 0x00000800; - private const uint SIGDN_FILESYSPATH = 0x80058000; - private const uint CLSCTX_INPROC_SERVER = 0x1; - - [DllImport("ole32.dll", ExactSpelling = true)] - private static extern int CoCreateInstance( - ref Guid rclsid, - IntPtr pUnkOuter, - uint dwClsContext, - ref Guid riid, - [MarshalAs(UnmanagedType.Interface)] out object ppv); - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] - private struct OpenFileName - { - public int lStructSize; - public IntPtr hwndOwner; - public IntPtr hInstance; - public string? lpstrFilter; - public string? lpstrCustomFilter; - public int nMaxCustFilter; - public int nFilterIndex; - public IntPtr lpstrFile; - public int nMaxFile; - public string? lpstrFileTitle; - public int nMaxFileTitle; - public string? lpstrInitialDir; - public string? lpstrTitle; - public int Flags; - public short nFileOffset; - public short nFileExtension; - public string? lpstrDefExt; - public IntPtr lCustData; - public IntPtr lpfnHook; - public string? lpTemplateName; - public IntPtr pvReserved; - public int dwReserved; - public int flagsEx; - } - - [DllImport("comdlg32.dll", CharSet = CharSet.Unicode, SetLastError = true)] - private static extern bool GetOpenFileNameW(ref OpenFileName ofn); - - [ComImport] - [Guid("42f85136-db7e-439c-85f1-e4075d135fc8")] // IID_IFileDialog - [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] - private interface IFileDialog - { - [PreserveSig] int Show(IntPtr parent); - void SetFileTypes(uint cFileTypes, IntPtr rgFilterSpec); - void SetFileTypeIndex(uint iFileType); - void GetFileTypeIndex(out uint piFileType); - void Advise(IntPtr pfde, out uint pdwCookie); - void Unadvise(uint dwCookie); - void SetOptions(uint fos); - void GetOptions(out uint pfos); - void SetDefaultFolder(IShellItem psi); - void SetFolder(IShellItem psi); - void GetFolder(out IShellItem ppsi); - void GetCurrentSelection(out IShellItem ppsi); - void SetFileName([MarshalAs(UnmanagedType.LPWStr)] string pszName); - void GetFileName([MarshalAs(UnmanagedType.LPWStr)] out string pszName); - void SetTitle([MarshalAs(UnmanagedType.LPWStr)] string pszTitle); - void SetOkButtonLabel([MarshalAs(UnmanagedType.LPWStr)] string pszText); - void SetFileNameLabel([MarshalAs(UnmanagedType.LPWStr)] string pszLabel); - void GetResult(out IShellItem ppsi); - void AddPlace(IShellItem psi, int fdap); - void SetDefaultExtension([MarshalAs(UnmanagedType.LPWStr)] string pszDefaultExtension); - void Close([MarshalAs(UnmanagedType.Error)] int hr); - void SetClientGuid(ref Guid guid); - void ClearClientData(); - void SetFilter(IntPtr pFilter); - } - - [ComImport] - [Guid("43826d1e-e718-42ee-bc55-a1e261c37bfe")] // IID_IShellItem - [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] - private interface IShellItem - { - void BindToHandler(IntPtr pbc, ref Guid bhid, ref Guid riid, out IntPtr ppv); - void GetParent(out IShellItem ppsi); - void GetDisplayName(uint sigdnName, [MarshalAs(UnmanagedType.LPWStr)] out string ppszName); - void GetAttributes(uint sfgaoMask, out uint psfgaoAttribs); - void Compare(IShellItem psi, uint hint, out int piOrder); - } -} diff --git a/Starlight.Launcher/Platforms/Windows/Services/LauncherCommands.cs b/Starlight.Launcher/Platforms/Windows/Services/LauncherCommands.cs deleted file mode 100644 index 95f9dd0..0000000 --- a/Starlight.Launcher/Platforms/Windows/Services/LauncherCommands.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Runtime.InteropServices; - -namespace Starlight.Launcher.Services; - -public partial class LauncherCommands -{ - [DllImport("user32.dll")] - private static extern bool SetForegroundWindow(IntPtr hWnd); - - [DllImport("user32.dll")] - private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow); - - private const int SW_RESTORE = 9; - - partial void ActivateWindowPlatform(Window window) - { - if (window.Handler?.PlatformView is not Microsoft.UI.Xaml.Window nativeWindow) - return; - - var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(nativeWindow); - if (hwnd == IntPtr.Zero) - return; - - ShowWindow(hwnd, SW_RESTORE); - SetForegroundWindow(hwnd); - } -} diff --git a/Starlight.Launcher/Platforms/Windows/Services/Settings/DpapiKeyProvider.cs b/Starlight.Launcher/Platforms/Windows/Services/Settings/DpapiKeyProvider.cs index 1382889..ca90bb1 100644 --- a/Starlight.Launcher/Platforms/Windows/Services/Settings/DpapiKeyProvider.cs +++ b/Starlight.Launcher/Platforms/Windows/Services/Settings/DpapiKeyProvider.cs @@ -1,3 +1,4 @@ +using System.Runtime.InteropServices; using System.Security.Cryptography; using Microsoft.Extensions.Logging; @@ -16,7 +17,10 @@ public sealed class DpapiKeyProvider : ILoginKeyProvider public async Task GetOrCreateKeyAsync(string keyPath) { - Directory.CreateDirectory(Path.GetDirectoryName(keyPath)!); + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + throw new Exception("Windows methods isn't supported on Linux or MAC!"); + + _ = Directory.CreateDirectory(Path.GetDirectoryName(keyPath)!); if (!File.Exists(keyPath) && File.Exists(_legacyKeyPath)) { @@ -57,6 +61,9 @@ public async Task GetOrCreateKeyAsync(string keyPath) private async Task CreateAndStoreAsync(string keyPath) { + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + throw new Exception("Windows methods isn't supported on Linux or MAC!"); + var newKey = RandomNumberGenerator.GetBytes(32); var blob = ProtectedData.Protect(newKey, _entropy, DataProtectionScope.CurrentUser); var tmp = keyPath + ".tmp"; diff --git a/Starlight.Launcher/Platforms/Windows/Services/Tray.cs b/Starlight.Launcher/Platforms/Windows/Services/Tray.cs deleted file mode 100644 index e7efafb..0000000 --- a/Starlight.Launcher/Platforms/Windows/Services/Tray.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Runtime.Versioning; -using CommunityToolkit.Mvvm.Input; -using H.NotifyIcon; -using Microsoft.UI.Xaml.Media.Imaging; -using Starlight.Launcher.Models; - -namespace Starlight.Launcher.Services; - -[SupportedOSPlatform("windows5.1.2600")] -public sealed partial class WindowsTray : INativeTray -{ - private TaskbarIcon? _icon; - private MauiWinUIWindow? _win => Application.Current!.Windows[0].Handler!.PlatformView! as MauiWinUIWindow; - - public event EventHandler? IconActivated; - public bool IsWindowVisible => _win?.AppWindow.IsVisible == true; - - public void Initialize(TrayOptions o, IReadOnlyList menu) - { - var flyout = new Microsoft.UI.Xaml.Controls.MenuFlyout(); - foreach (var m in menu) - { - if (m.IsSeparator) { flyout.Items.Add(new Microsoft.UI.Xaml.Controls.MenuFlyoutSeparator()); continue; } - var mi = new Microsoft.UI.Xaml.Controls.MenuFlyoutItem { Text = m.Text }; - mi.Click += (_, _) => m.Invoke?.Invoke(); - flyout.Items.Add(mi); - } - - _icon = new TaskbarIcon - { - ToolTipText = o.Tooltip, - IconSource = new BitmapImage(new Uri($"ms-appx:///{o.IconPath}")), - ContextFlyout = flyout, - LeftClickCommand = new RelayCommand(() => IconActivated?.Invoke(this, EventArgs.Empty)) - }; - _icon.ForceCreate(); - } - - public void ShowWindow() { _win?.AppWindow.Show(); _win?.Activate(); } - public void HideWindow() => _win?.AppWindow.Hide(); - public void UpdateTooltip(string t) => _icon?.ToolTipText = t; - public void Dispose() => _icon?.Dispose(); -} diff --git a/Starlight.Launcher/Platforms/Windows/app.manifest b/Starlight.Launcher/Platforms/Windows/app.manifest deleted file mode 100644 index fbf3621..0000000 --- a/Starlight.Launcher/Platforms/Windows/app.manifest +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - true/PM - PerMonitorV2, PerMonitor - - true - - - diff --git a/Starlight.Launcher/Platforms/iOS/AppDelegate.cs b/Starlight.Launcher/Platforms/iOS/AppDelegate.cs deleted file mode 100644 index 15fb47e..0000000 --- a/Starlight.Launcher/Platforms/iOS/AppDelegate.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Foundation; - -namespace Starlight.Launcher -{ - [Register("AppDelegate")] - public class AppDelegate : MauiUIApplicationDelegate - { - protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); - } -} diff --git a/Starlight.Launcher/Platforms/iOS/Info.plist b/Starlight.Launcher/Platforms/iOS/Info.plist deleted file mode 100644 index ecb7f71..0000000 --- a/Starlight.Launcher/Platforms/iOS/Info.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - LSRequiresIPhoneOS - - UIDeviceFamily - - 1 - 2 - - UIRequiredDeviceCapabilities - - arm64 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - XSAppIconAssets - Assets.xcassets/appicon.appiconset - - diff --git a/Starlight.Launcher/Platforms/iOS/Program.cs b/Starlight.Launcher/Platforms/iOS/Program.cs deleted file mode 100644 index c0811f7..0000000 --- a/Starlight.Launcher/Platforms/iOS/Program.cs +++ /dev/null @@ -1,16 +0,0 @@ -using ObjCRuntime; -using UIKit; - -namespace Starlight.Launcher -{ - public class Program - { - // This is the main entry point of the application. - static void Main(string[] args) - { - // if you want to use a different Application Delegate class from "AppDelegate" - // you can specify it here. - UIApplication.Main(args, null, typeof(AppDelegate)); - } - } -} diff --git a/Starlight.Launcher/Platforms/iOS/Resources/PrivacyInfo.xcprivacy b/Starlight.Launcher/Platforms/iOS/Resources/PrivacyInfo.xcprivacy deleted file mode 100644 index 24ab3b4..0000000 --- a/Starlight.Launcher/Platforms/iOS/Resources/PrivacyInfo.xcprivacy +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - NSPrivacyAccessedAPITypes - - - NSPrivacyAccessedAPIType - NSPrivacyAccessedAPICategoryFileTimestamp - NSPrivacyAccessedAPITypeReasons - - C617.1 - - - - NSPrivacyAccessedAPIType - NSPrivacyAccessedAPICategorySystemBootTime - NSPrivacyAccessedAPITypeReasons - - 35F9.1 - - - - NSPrivacyAccessedAPIType - NSPrivacyAccessedAPICategoryDiskSpace - NSPrivacyAccessedAPITypeReasons - - E174.1 - - - - - - diff --git a/Starlight.Launcher/Program.cs b/Starlight.Launcher/Program.cs new file mode 100644 index 0000000..44b0a2f --- /dev/null +++ b/Starlight.Launcher/Program.cs @@ -0,0 +1,107 @@ +using Avalonia; +using Serilog; +using Starlight.Launcher.Services; + +namespace Starlight.Launcher; + +internal static class Program +{ + [STAThread] + public static int Main(string[] args) + { + + try + { +#if DEBUG + if (OperatingSystem.IsWindows()) + ConsoleHelper.CreateConsole(); + + Console.WriteLine($"argv: [{string.Join(", ", args.Select(a => $"\"{a}\""))}]"); +#endif + + if (OperatingSystem.IsWindows()) + ProtocolRegistration.RegisterWindows(); + else if (OperatingSystem.IsLinux()) + ProtocolRegistration.RegisterLinux(); + + if (OperatingSystem.IsWindows()) + { + var userData = Path.Combine(AppPaths.AppDataDirectory, "WebView2"); + Directory.CreateDirectory(userData); + Environment.SetEnvironmentVariable("WEBVIEW2_USER_DATA_FOLDER", userData); + } + + var logger = new LoggerConfiguration() + .WriteTo.Console() + .WriteTo.File(Path.Combine(AppPaths.AppDataDirectory, "log.txt"), rollingInterval: RollingInterval.Day) + .CreateLogger(); + Log.Logger = logger; + + var messaging = new LauncherMessaging(); + var messages = new[] { LauncherActivationMessage.Ping() }; + var sendAnyway = false; + + if (args.Length == 1) + { + if (Uri.TryCreate(args[0], UriKind.Absolute, out var uri)) + { + var classified = LauncherUriRouter.Classify(uri); + logger.Information("Classified activation URI {uri} as {kind}", uri, classified.Kind); + messages = new[] { classified }; + sendAnyway = true; + } + else + { + logger.Warning("Got exactly one argv entry but it didn't parse as a URI: {arg}", args[0]); + } + } + + logger.Information("IPC: sending/claiming with {@Messages}", messages); + + if (messaging.SendMessagesOrClaim(messages, sendAnyway)) + return 0; + + App.PendingMessaging = messaging; + + return BuildAvaloniaApp().StartWithClassicDesktopLifetime(args); + } + catch (Exception ex) + { + var text = ex.ToString(); + System.Diagnostics.Debug.WriteLine(text); + try + { + File.WriteAllText(Path.Combine(AppPaths.AppDataDirectory, "startup-crash.txt"), text); + } + catch + { + /* best effort - don't let logging failure mask the real crash */ + } + + throw; + } + } + + public static AppBuilder BuildAvaloniaApp() => + AppBuilder.Configure() + .UsePlatformDetect() + .WithInterFont() + .LogToTrace(); +} + +internal static class AppPaths +{ + public static string AppDataDirectory + { + get + { + var baseDir = OperatingSystem.IsMacOS() + ? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), "Library", "Application Support") + : Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); + + var dir = Path.Combine(baseDir, "Starlight.Launcher"); + _ = Directory.CreateDirectory(dir); + return dir; + } + } +} diff --git a/Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/Dialog/changelog-dialog.ftl b/Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/Dialog/changelog-dialog.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/Dialog/changelog-dialog.ftl rename to Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/Dialog/changelog-dialog.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/Dialog/logins-unrecoveralbe-dialog.ftl b/Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/Dialog/logins-unrecoveralbe-dialog.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/Dialog/logins-unrecoveralbe-dialog.ftl rename to Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/Dialog/logins-unrecoveralbe-dialog.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/no-account-dialog.ftl b/Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/no-account-dialog.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/no-account-dialog.ftl rename to Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/no-account-dialog.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/servers-list-item.ftl b/Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/servers-list-item.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/servers-list-item.ftl rename to Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/servers-list-item.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/servers-list-search-bar.ftl b/Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/servers-list-search-bar.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/servers-list-search-bar.ftl rename to Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/servers-list-search-bar.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/servers-list-tags-bar.ftl b/Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/servers-list-tags-bar.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/servers-list-tags-bar.ftl rename to Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/servers-list-tags-bar.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/settings-alternative-list-option.ftl b/Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/settings-alternative-list-option.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/settings-alternative-list-option.ftl rename to Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/settings-alternative-list-option.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/settings-alternative-selector-list-option.ftl b/Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/settings-alternative-selector-list-option.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/settings-alternative-selector-list-option.ftl rename to Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/settings-alternative-selector-list-option.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/settings-file-path-option-tooltip.ftl b/Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/settings-file-path-option-tooltip.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Atoms/settings-file-path-option-tooltip.ftl rename to Starlight.Launcher/Resources/Locale/en-US/UI/Atoms/settings-file-path-option-tooltip.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Layout/main.ftl b/Starlight.Launcher/Resources/Locale/en-US/UI/Layout/main.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Layout/main.ftl rename to Starlight.Launcher/Resources/Locale/en-US/UI/Layout/main.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Pages/auth.ftl b/Starlight.Launcher/Resources/Locale/en-US/UI/Pages/auth.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Pages/auth.ftl rename to Starlight.Launcher/Resources/Locale/en-US/UI/Pages/auth.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Pages/home.ftl b/Starlight.Launcher/Resources/Locale/en-US/UI/Pages/home.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Pages/home.ftl rename to Starlight.Launcher/Resources/Locale/en-US/UI/Pages/home.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Pages/hub.ftl b/Starlight.Launcher/Resources/Locale/en-US/UI/Pages/hub.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Pages/hub.ftl rename to Starlight.Launcher/Resources/Locale/en-US/UI/Pages/hub.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Pages/servers.ftl b/Starlight.Launcher/Resources/Locale/en-US/UI/Pages/servers.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Pages/servers.ftl rename to Starlight.Launcher/Resources/Locale/en-US/UI/Pages/servers.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Pages/settings.ftl b/Starlight.Launcher/Resources/Locale/en-US/UI/Pages/settings.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/en-US/UI/Pages/settings.ftl rename to Starlight.Launcher/Resources/Locale/en-US/UI/Pages/settings.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/en-US/UI/general.ftl b/Starlight.Launcher/Resources/Locale/en-US/UI/general.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/en-US/UI/general.ftl rename to Starlight.Launcher/Resources/Locale/en-US/UI/general.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/servers-list-item.ftl b/Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/servers-list-item.ftl similarity index 97% rename from Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/servers-list-item.ftl rename to Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/servers-list-item.ftl index 8bd9133..44f377d 100644 --- a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/servers-list-item.ftl +++ b/Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/servers-list-item.ftl @@ -1,4 +1,4 @@ -servers-list-item-favorites = Aggiungi ai preferiti -servers-list-item-play = Avvia -servers-list-item-round-in-round = Round in corso -servers-list-item-round-lobby = Nella lobby +servers-list-item-favorites = Aggiungi ai preferiti +servers-list-item-play = Avvia +servers-list-item-round-in-round = Round in corso +servers-list-item-round-lobby = Nella lobby diff --git a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/servers-list-search-bar.ftl b/Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/servers-list-search-bar.ftl similarity index 97% rename from Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/servers-list-search-bar.ftl rename to Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/servers-list-search-bar.ftl index 9198d71..3e0ac19 100644 --- a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/servers-list-search-bar.ftl +++ b/Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/servers-list-search-bar.ftl @@ -1,8 +1,8 @@ -servers-list-search-bar-placeholder = Cerca server... -servers-list-search-bar-players = Giocatori -servers-list-search-bar-name = Nome -servers-list-search-bar-ping = Ping -server-list-hide-empty = Nascondi vuoti -server-list-hide-full = Nascondi pieni -server-list-hide-adult = Nascondi 18+ +servers-list-search-bar-placeholder = Cerca server... +servers-list-search-bar-players = Giocatori +servers-list-search-bar-name = Nome +servers-list-search-bar-ping = Ping +server-list-hide-empty = Nascondi vuoti +server-list-hide-full = Nascondi pieni +server-list-hide-adult = Nascondi 18+ server-list-only-adult = Mostra solo 18+ \ No newline at end of file diff --git a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/servers-list-tags-bar.ftl b/Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/servers-list-tags-bar.ftl similarity index 98% rename from Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/servers-list-tags-bar.ftl rename to Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/servers-list-tags-bar.ftl index e6f3d1d..372ee33 100644 --- a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/servers-list-tags-bar.ftl +++ b/Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/servers-list-tags-bar.ftl @@ -1,4 +1,4 @@ -servers-list-tags-bar-rp-tags-label = Tag RP -servers-list-tags-bar-lang-tags-label = Tag lingua -servers-list-tags-bar-region-tags-label = Tags regione +servers-list-tags-bar-rp-tags-label = Tag RP +servers-list-tags-bar-lang-tags-label = Tag lingua +servers-list-tags-bar-region-tags-label = Tags regione servers-list-tags-bar-clear-filters = Cancella filtri \ No newline at end of file diff --git a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/settings-alternative-list-option.ftl b/Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/settings-alternative-list-option.ftl similarity index 98% rename from Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/settings-alternative-list-option.ftl rename to Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/settings-alternative-list-option.ftl index 9171181..4a622ec 100644 --- a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/settings-alternative-list-option.ftl +++ b/Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/settings-alternative-list-option.ftl @@ -1,3 +1,3 @@ -settings-alternative-list-option-move-up = Sposta su -settings-alternative-list-option-move-down = Sposta giù +settings-alternative-list-option-move-up = Sposta su +settings-alternative-list-option-move-down = Sposta giù settings-alternative-list-option-remove = Rimuovi \ No newline at end of file diff --git a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/settings-alternative-selector-list-option.ftl b/Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/settings-alternative-selector-list-option.ftl similarity index 98% rename from Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/settings-alternative-selector-list-option.ftl rename to Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/settings-alternative-selector-list-option.ftl index 44a59d6..b429f13 100644 --- a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/settings-alternative-selector-list-option.ftl +++ b/Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/settings-alternative-selector-list-option.ftl @@ -1,2 +1,2 @@ -settings-alternative-selector-list-option-select = Seleziona -settings-alternative-selector-list-option-remove = Rimuovi +settings-alternative-selector-list-option-select = Seleziona +settings-alternative-selector-list-option-remove = Rimuovi diff --git a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/settings-file-path-option-tooltip.ftl b/Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/settings-file-path-option-tooltip.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Atoms/settings-file-path-option-tooltip.ftl rename to Starlight.Launcher/Resources/Locale/it-IT/UI/Atoms/settings-file-path-option-tooltip.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Layout/main.ftl b/Starlight.Launcher/Resources/Locale/it-IT/UI/Layout/main.ftl similarity index 97% rename from Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Layout/main.ftl rename to Starlight.Launcher/Resources/Locale/it-IT/UI/Layout/main.ftl index 8b12658..315e560 100644 --- a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Layout/main.ftl +++ b/Starlight.Launcher/Resources/Locale/it-IT/UI/Layout/main.ftl @@ -1,5 +1,5 @@ -main-layout-home-tab = Home -main-layout-servers-tab = Server -main-layout-hub-tab = Hub NullLink -main-layout-settings-tab = Impostazioni +main-layout-home-tab = Home +main-layout-servers-tab = Server +main-layout-hub-tab = Hub NullLink +main-layout-settings-tab = Impostazioni main-layout-auth-tab = Autenticazione \ No newline at end of file diff --git a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Pages/auth.ftl b/Starlight.Launcher/Resources/Locale/it-IT/UI/Pages/auth.ftl similarity index 97% rename from Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Pages/auth.ftl rename to Starlight.Launcher/Resources/Locale/it-IT/UI/Pages/auth.ftl index ada1b7b..12c7f02 100644 --- a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Pages/auth.ftl +++ b/Starlight.Launcher/Resources/Locale/it-IT/UI/Pages/auth.ftl @@ -1,92 +1,92 @@ -# Errors/Warnings - -auth-menu-token-verify-warning = Impossibile verificare il token: { $ex } -auth-menu-session-expired-warning = Sessione scaduta. Accedi di nuovo. -auth-menu-discord-login-error = Login con discord scaduto o annullato. -auth-menu-discord-connect-fail = Impossibile connettersi a discord. -auth-menu-enter-info-error = Inserisci username e password. -auth-menu-incorrect-info-error = Username o password non corretti. -auth-menu-unconfirmed-info-error = Il tuo account non è verificato. Controlla la tua email. -auth-menu-tfa-required-error = Inserisci il codice di autenticazione a due fattori. -auth-menu-account-blocked-error = Account bloccato. -auth-menu-forgot-notvalid-email-error = Inserisci un email valida. - -auth-menu-register-username-missing = Inserisci il tuo username -auth-menu-register-invalid-email = Inserisci un indirizzo email valido -auth-menu-register-too-short-pass = La password deve contenere almeno 8 caratteri -auth-menu-register-dont-match-pass = Le password non coincidono - -# Snackbars(not including errors/warnings) - -auth-menu-account-deleted = Account { $account } eliminato. -auth-menu-linked-status = Discord collegato a { $account }. -auth-menu-discord-renewed = Sessione Discord aggiornata. -auth-menu-welcome-message = Bentornato/a, { $username }! -auth-menu-email-resent = Un altra email è stata spedita. -auth-menu-email-resent-info = Per ri-mandare, inserisci il tuo indirizzo email nel campo username. -auth-menu-register-success = Registrazione avvenuta con successo! Ora puoi accedere. -auth-menu-register-required-confirmation = Registrazione avvenuta con successo! Un email è stata mandata a { $email } per confermare il tuo account. - -# Statuses - -auth-menu-online-status = Online -auth-menu-expired-status = Sessione scaduta -auth-menu-unsure-status = Verificando... - -# Account List - -auth-menu-accounts-mode = Account -auth-menu-active-chip = Attivo -auth-menu-no-accounts = Non hai aggiunto nessun account. -auth-menu-no-accounts-hint = Usa "Aggiungi Account" per accedere o registrarti -auth-menu-discord-linked-tooltip = Discord collegato -auth-menu-login-again-button = Accedi di nuovo -auth-menu-select-button = Seleziona -auth-menu-link-discord-button = Collega a Discord -auth-menu-add-account-button = Aggiungi Account -auth-menu-delete-account-button = Elimina Account - -# SignIn - -auth-menu-signin-login-again = Accedi di nuovo -auth-menu-signin-login = Accedi -auth-menu-signin-status-busy = Accedi... -auth-menu-signin-status-wait = Accedi - -# General Entries - -auth-menu-username-label = Username -auth-menu-email-label = Email -auth-menu-password-label = Password -auth-menu-confirm-label = Conferma Password -auth-menu-2fa-label = Codice 2FA -auth-menu-resend-confirmation = Ri-manda email ti conferma -auth-menu-signin-method-discord = Accedi con discord -auth-menu-signin-forgot-password = Password dimenticata? -auth-menu-signin = Accedi - -# Registration - -auth-menu-registration = Registrati -auth-menu-registration-status-busy = Registrazione... -auth-menu-registration-status-wait = Registrati - -# ForgotPassword - -auth-menu-forgotpassword = Recupero Password -auth-menu-forgotpassword-alert = Se un account collegato a questo indirizzo email esiste, le istruzioni per il recupero della password sono state mandate. -auth-menu-enter-email-label = Inserisci l'indirizzo email associato al tuo account. -auth-menu-forgotpassword-status-busy = Invio... -auth-menu-forgotpassword-status-wait = Invia - -# Link - -auth-menu-can-play-no-discord = Giocabile senza discord -auth-menu-link-account-button = Collega account -auth-menu-needs-discord = Richiede autenticazione via Discord -auth-menu-link-account-title = Collegamento account -auth-menu-link-account-hint = Accedi con il tuo account del server di autenticazione per giocare senza Discord -auth-menu-link-account-confirm = Collega -auth-menu-link-account-busy = Collegamento... -auth-menu-account-linked = L'account { $account } è collegato - +# Errors/Warnings + +auth-menu-token-verify-warning = Impossibile verificare il token: { $ex } +auth-menu-session-expired-warning = Sessione scaduta. Accedi di nuovo. +auth-menu-discord-login-error = Login con discord scaduto o annullato. +auth-menu-discord-connect-fail = Impossibile connettersi a discord. +auth-menu-enter-info-error = Inserisci username e password. +auth-menu-incorrect-info-error = Username o password non corretti. +auth-menu-unconfirmed-info-error = Il tuo account non è verificato. Controlla la tua email. +auth-menu-tfa-required-error = Inserisci il codice di autenticazione a due fattori. +auth-menu-account-blocked-error = Account bloccato. +auth-menu-forgot-notvalid-email-error = Inserisci un email valida. + +auth-menu-register-username-missing = Inserisci il tuo username +auth-menu-register-invalid-email = Inserisci un indirizzo email valido +auth-menu-register-too-short-pass = La password deve contenere almeno 8 caratteri +auth-menu-register-dont-match-pass = Le password non coincidono + +# Snackbars(not including errors/warnings) + +auth-menu-account-deleted = Account { $account } eliminato. +auth-menu-linked-status = Discord collegato a { $account }. +auth-menu-discord-renewed = Sessione Discord aggiornata. +auth-menu-welcome-message = Bentornato/a, { $username }! +auth-menu-email-resent = Un altra email è stata spedita. +auth-menu-email-resent-info = Per ri-mandare, inserisci il tuo indirizzo email nel campo username. +auth-menu-register-success = Registrazione avvenuta con successo! Ora puoi accedere. +auth-menu-register-required-confirmation = Registrazione avvenuta con successo! Un email è stata mandata a { $email } per confermare il tuo account. + +# Statuses + +auth-menu-online-status = Online +auth-menu-expired-status = Sessione scaduta +auth-menu-unsure-status = Verificando... + +# Account List + +auth-menu-accounts-mode = Account +auth-menu-active-chip = Attivo +auth-menu-no-accounts = Non hai aggiunto nessun account. +auth-menu-no-accounts-hint = Usa "Aggiungi Account" per accedere o registrarti +auth-menu-discord-linked-tooltip = Discord collegato +auth-menu-login-again-button = Accedi di nuovo +auth-menu-select-button = Seleziona +auth-menu-link-discord-button = Collega a Discord +auth-menu-add-account-button = Aggiungi Account +auth-menu-delete-account-button = Elimina Account + +# SignIn + +auth-menu-signin-login-again = Accedi di nuovo +auth-menu-signin-login = Accedi +auth-menu-signin-status-busy = Accedi... +auth-menu-signin-status-wait = Accedi + +# General Entries + +auth-menu-username-label = Username +auth-menu-email-label = Email +auth-menu-password-label = Password +auth-menu-confirm-label = Conferma Password +auth-menu-2fa-label = Codice 2FA +auth-menu-resend-confirmation = Ri-manda email ti conferma +auth-menu-signin-method-discord = Accedi con discord +auth-menu-signin-forgot-password = Password dimenticata? +auth-menu-signin = Accedi + +# Registration + +auth-menu-registration = Registrati +auth-menu-registration-status-busy = Registrazione... +auth-menu-registration-status-wait = Registrati + +# ForgotPassword + +auth-menu-forgotpassword = Recupero Password +auth-menu-forgotpassword-alert = Se un account collegato a questo indirizzo email esiste, le istruzioni per il recupero della password sono state mandate. +auth-menu-enter-email-label = Inserisci l'indirizzo email associato al tuo account. +auth-menu-forgotpassword-status-busy = Invio... +auth-menu-forgotpassword-status-wait = Invia + +# Link + +auth-menu-can-play-no-discord = Giocabile senza discord +auth-menu-link-account-button = Collega account +auth-menu-needs-discord = Richiede autenticazione via Discord +auth-menu-link-account-title = Collegamento account +auth-menu-link-account-hint = Accedi con il tuo account del server di autenticazione per giocare senza Discord +auth-menu-link-account-confirm = Collega +auth-menu-link-account-busy = Collegamento... +auth-menu-account-linked = L'account { $account } è collegato + diff --git a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Pages/home.ftl b/Starlight.Launcher/Resources/Locale/it-IT/UI/Pages/home.ftl similarity index 98% rename from Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Pages/home.ftl rename to Starlight.Launcher/Resources/Locale/it-IT/UI/Pages/home.ftl index 4923aee..a5e3340 100644 --- a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Pages/home.ftl +++ b/Starlight.Launcher/Resources/Locale/it-IT/UI/Pages/home.ftl @@ -1,2 +1,2 @@ -home-menu-dirrect-connect = Connessione diretta +home-menu-dirrect-connect = Connessione diretta home-menu-load-replay = Carica Replay \ No newline at end of file diff --git a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Pages/hub.ftl b/Starlight.Launcher/Resources/Locale/it-IT/UI/Pages/hub.ftl similarity index 97% rename from Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Pages/hub.ftl rename to Starlight.Launcher/Resources/Locale/it-IT/UI/Pages/hub.ftl index 0bcf1b7..9a427df 100644 --- a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Pages/hub.ftl +++ b/Starlight.Launcher/Resources/Locale/it-IT/UI/Pages/hub.ftl @@ -1,5 +1,5 @@ -hub-menu-title = Hub -hub-menu-server-list-empty = La lista di server è vuota. -hub-menu-server-adult-tag = 18+ -hub-menu-server-connect-button = Connetti +hub-menu-title = Hub +hub-menu-server-list-empty = La lista di server è vuota. +hub-menu-server-adult-tag = 18+ +hub-menu-server-connect-button = Connetti hub-menu-refresh = Aggiorna \ No newline at end of file diff --git a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Pages/servers.ftl b/Starlight.Launcher/Resources/Locale/it-IT/UI/Pages/servers.ftl similarity index 98% rename from Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Pages/servers.ftl rename to Starlight.Launcher/Resources/Locale/it-IT/UI/Pages/servers.ftl index d3e7393..1fcbdb2 100644 --- a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Pages/servers.ftl +++ b/Starlight.Launcher/Resources/Locale/it-IT/UI/Pages/servers.ftl @@ -1,9 +1,9 @@ -# General - -servers-menu-loading = Caricamento server… -servers-menu-fetch-failed = Impossibile recuperare la lista dei server -servers-menu-try-again = Riprova -servers-menu-cant-reach-hubs = Certe hub sono irraggiungibili. La lista potrebbe essere incompleta. -servers-menu-no-online-servers = Non ci sono server online. -servers-menu-no-matched-servers = Nessun server corrisponde ai tuoi filtri. +# General + +servers-menu-loading = Caricamento server… +servers-menu-fetch-failed = Impossibile recuperare la lista dei server +servers-menu-try-again = Riprova +servers-menu-cant-reach-hubs = Certe hub sono irraggiungibili. La lista potrebbe essere incompleta. +servers-menu-no-online-servers = Non ci sono server online. +servers-menu-no-matched-servers = Nessun server corrisponde ai tuoi filtri. servers-menu-clear-filters = Cancella filtri \ No newline at end of file diff --git a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Pages/settings.ftl b/Starlight.Launcher/Resources/Locale/it-IT/UI/Pages/settings.ftl similarity index 98% rename from Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Pages/settings.ftl rename to Starlight.Launcher/Resources/Locale/it-IT/UI/Pages/settings.ftl index 1e30fc8..428d496 100644 --- a/Starlight.Launcher/Resources/Raw/Locale/it-IT/UI/Pages/settings.ftl +++ b/Starlight.Launcher/Resources/Locale/it-IT/UI/Pages/settings.ftl @@ -1,106 +1,106 @@ -# Categories - -settings-menu-general-category = Generale -settings-menu-servers-category = Server -settings-menu-appearance-category = Aspetto -settings-menu-server-list-category = Lista server -settings-menu-tray-category = Tray -settings-menu-development-category = Sviluppatore - -# General - -settings-menu-reset-option = Ripristina impostazioni -settings-menu-reset-confirm-title = Ripristina alle impostazioni predefinite -settings-menu-reset-confirm-text = Vuoi ripristinare le impostazioni ai valori predefiniti? -settings-menu-reset-confirm-yes = Si -settings-menu-reset-confirm-cancel = Annulla - -settings-menu-language-option = Lingua -settings-menu-language-option-description = Seleziona la lingua per l'app. -settings-menu-language-option-system = Sistema - -settings-menu-multiple-clients-option = Impedisci client multipli -settings-menu-multiple-clients-option-description = Impedisce il gioco di avviarsi in più finestre alla volta. - -settings-menu-data-folder-option = Cartella dati -settings-menu-data-folder-option-description = Seleziona la cartella che verrà usata per salvare i dati. - -settings-menu-deauth-onchange-option = Disconnetti su cambio -settings-menu-deauth-onchange-option-description = Vuoi essere disconesso dall'account attuale quando cambi server di autenticazione? - -# Servers - -settings-menu-hub-list-option = Lista Hub -settings-menu-hub-list-option-description = Gestisci la lista delle hub. -settings-menu-hub-list-option-add-tooltip = Aggiungi hub -settings-menu-hub-list-option-empty-values = Nessuna hub configurata. Premi + per aggiungerne una. -settings-menu-hub-list-option-text-label = Indirizzo dell'hub - -settings-menu-auth-list-option = Lista server di autenticazione -settings-menu-auth-list-option-description = Gestisci la lista di autenticazioni e cambia il server di autenticazione selezionato -settings-menu-auth-list-option-add-tooltip = Aggiungi server di autenticazione -settings-menu-auth-list-option-empty-values = Nessun server di autenticazione configurato. Premi + per aggiungerne uno. -settings-menu-auth-list-option-text-label = Indirizzo (URL) server di autenticazione - -# Appearance - -settings-menu-theme-option = Tema -settings-menu-theme-option-description = Seleziona un tema per l'app. - -settings-menu-navigation-bar-option = Posizione barra di navigazione -settings-menu-navigation-bar-option-description = Selezione la posizione della barra di navigazione. - -settings-menu-discord-presence-option = Discord Presence -settings-menu-discord-presence-option-description = Mostra il tuo stato su discord. (Necessita Riavvio) - -settings-menu-bottom-search-option = Ricerca sotto -settings-menu-bottom-search-option-description = Posiziona la barra di ricerca al di sotto della barra degli strumenti(quando la barra tag e ricerca sono insieme). - -settings-menu-bottom-search-bar-option = Barra di ricerca sotto -settings-menu-bottom-search-bar-option-description = Posiziona la barra di ricerca sotto la lista dei server. - -settings-menu-bottom-tags-bar-option = Barra dei tag sotto -settings-menu-bottom-tags-bar-option-description = Posiziona la barra dei tag sotto la lista dei server. - -settings-menu-tags-bar-open-option = Barra dei tag aperta -settings-menu-tags-bar-open-option-description = Vuoi che la barra dei tag sia aperta fin da subito? - -# Tray - -settings-menu-tray-collapse-start-option = Nascondi all'avvio -settings-menu-tray-collapse-start-option-description = L'app si avvia minimizzata nella barra delle applicazioni. - -settings-menu-tray-collapse-run-option = Nascondi in gioco -settings-menu-tray-collapse-run-option-description = Minimizza l'app nella barra delle applicazioni mentre sei in gioco. - -settings-menu-tray-uncollapse-end-option = Ingrandisci a fine gioco -settings-menu-tray-uncollapse-end-option-description = Riapre l'all dalla barra delle applicazioni quando chiudi il gioco. - -settings-menu-tray-collapse-close-option = Nascondi su chiusura -settings-menu-tray-collapse-close-option-description = Minimizza l'app nella barra delle applicazioni quando la chiudi. - -settings-menu-tray-collapse-minimize-option = Nascondi su Riduci a icona -settings-menu-tray-collapse-minimize-option-description = Minimizza l'app nella barra delle applicazioni quando la riduci a icona. - -# Development(Advanced) - -settings-menu-development-gles-option = Modalità Compatibilità (GLES2) -settings-menu-development-gles-option-description = Abilita la modalità compatibilità per i dispositivi con hardware grafico più vecchio. Può ridurre le prestazioni sui sistemi moderni. - -settings-menu-development-signing-option = Disabilita Engine Signature Verification -settings-menu-development-signing-option-description = Disabilita il controllo della firma sui file del motore. Funzione intesa per scopi di sviluppo e potrebbe porre rischi di sicurezza se abilitata in luoghi di produzione.(Funziona solo con configurazioni di debug) - -settings-menu-development-engine-override-option = Override Motore -settings-menu-development-engine-override-option-description = Sovrascrive il percorso di eseguibili predefinito del motore. Funzione intesa per scopi di sviluppo e potrebbe causare problemi se impostata incorrettamente. - -settings-menu-development-engine-override-path-option = Percorso Override Motore -settings-menu-development-engine-override-path-option-description = Il percorso per il file eseguibile da usare quando Override Motore è abilitato. Dovrebbe indicare un file eseguibile del motore valido. - -settings-menu-development-robust-manifest-cache-time-option = Robust Manifest Cache Time -settings-menu-development-robust-manifest-cache-time-option-description = Seleziona il tempo per cui conservare i dati del manifesto. - -settings-menu-development-max-versions-option = Max Versions -settings-menu-development-max-versions-option-description = Seleziona il numero massimo di versioni da mantenere nella cronologia delle versioni. Le versioni più vecchie saranno rimosse quando questo limite viene superato. - -settings-menu-development-max-fork-versions-option = Max Fork Versions -settings-menu-development-max-fork-versions-option-description = Seleziona il numero massimo di versioni Fork da mantenere nella cronologia delle versioni. Le versioni Fork più vecchie saranno rimosse quando questo limite viene superato. +# Categories + +settings-menu-general-category = Generale +settings-menu-servers-category = Server +settings-menu-appearance-category = Aspetto +settings-menu-server-list-category = Lista server +settings-menu-tray-category = Tray +settings-menu-development-category = Sviluppatore + +# General + +settings-menu-reset-option = Ripristina impostazioni +settings-menu-reset-confirm-title = Ripristina alle impostazioni predefinite +settings-menu-reset-confirm-text = Vuoi ripristinare le impostazioni ai valori predefiniti? +settings-menu-reset-confirm-yes = Si +settings-menu-reset-confirm-cancel = Annulla + +settings-menu-language-option = Lingua +settings-menu-language-option-description = Seleziona la lingua per l'app. +settings-menu-language-option-system = Sistema + +settings-menu-multiple-clients-option = Impedisci client multipli +settings-menu-multiple-clients-option-description = Impedisce il gioco di avviarsi in più finestre alla volta. + +settings-menu-data-folder-option = Cartella dati +settings-menu-data-folder-option-description = Seleziona la cartella che verrà usata per salvare i dati. + +settings-menu-deauth-onchange-option = Disconnetti su cambio +settings-menu-deauth-onchange-option-description = Vuoi essere disconesso dall'account attuale quando cambi server di autenticazione? + +# Servers + +settings-menu-hub-list-option = Lista Hub +settings-menu-hub-list-option-description = Gestisci la lista delle hub. +settings-menu-hub-list-option-add-tooltip = Aggiungi hub +settings-menu-hub-list-option-empty-values = Nessuna hub configurata. Premi + per aggiungerne una. +settings-menu-hub-list-option-text-label = Indirizzo dell'hub + +settings-menu-auth-list-option = Lista server di autenticazione +settings-menu-auth-list-option-description = Gestisci la lista di autenticazioni e cambia il server di autenticazione selezionato +settings-menu-auth-list-option-add-tooltip = Aggiungi server di autenticazione +settings-menu-auth-list-option-empty-values = Nessun server di autenticazione configurato. Premi + per aggiungerne uno. +settings-menu-auth-list-option-text-label = Indirizzo (URL) server di autenticazione + +# Appearance + +settings-menu-theme-option = Tema +settings-menu-theme-option-description = Seleziona un tema per l'app. + +settings-menu-navigation-bar-option = Posizione barra di navigazione +settings-menu-navigation-bar-option-description = Selezione la posizione della barra di navigazione. + +settings-menu-discord-presence-option = Discord Presence +settings-menu-discord-presence-option-description = Mostra il tuo stato su discord. (Necessita Riavvio) + +settings-menu-bottom-search-option = Ricerca sotto +settings-menu-bottom-search-option-description = Posiziona la barra di ricerca al di sotto della barra degli strumenti(quando la barra tag e ricerca sono insieme). + +settings-menu-bottom-search-bar-option = Barra di ricerca sotto +settings-menu-bottom-search-bar-option-description = Posiziona la barra di ricerca sotto la lista dei server. + +settings-menu-bottom-tags-bar-option = Barra dei tag sotto +settings-menu-bottom-tags-bar-option-description = Posiziona la barra dei tag sotto la lista dei server. + +settings-menu-tags-bar-open-option = Barra dei tag aperta +settings-menu-tags-bar-open-option-description = Vuoi che la barra dei tag sia aperta fin da subito? + +# Tray + +settings-menu-tray-collapse-start-option = Nascondi all'avvio +settings-menu-tray-collapse-start-option-description = L'app si avvia minimizzata nella barra delle applicazioni. + +settings-menu-tray-collapse-run-option = Nascondi in gioco +settings-menu-tray-collapse-run-option-description = Minimizza l'app nella barra delle applicazioni mentre sei in gioco. + +settings-menu-tray-uncollapse-end-option = Ingrandisci a fine gioco +settings-menu-tray-uncollapse-end-option-description = Riapre l'all dalla barra delle applicazioni quando chiudi il gioco. + +settings-menu-tray-collapse-close-option = Nascondi su chiusura +settings-menu-tray-collapse-close-option-description = Minimizza l'app nella barra delle applicazioni quando la chiudi. + +settings-menu-tray-collapse-minimize-option = Nascondi su Riduci a icona +settings-menu-tray-collapse-minimize-option-description = Minimizza l'app nella barra delle applicazioni quando la riduci a icona. + +# Development(Advanced) + +settings-menu-development-gles-option = Modalità Compatibilità (GLES2) +settings-menu-development-gles-option-description = Abilita la modalità compatibilità per i dispositivi con hardware grafico più vecchio. Può ridurre le prestazioni sui sistemi moderni. + +settings-menu-development-signing-option = Disabilita Engine Signature Verification +settings-menu-development-signing-option-description = Disabilita il controllo della firma sui file del motore. Funzione intesa per scopi di sviluppo e potrebbe porre rischi di sicurezza se abilitata in luoghi di produzione.(Funziona solo con configurazioni di debug) + +settings-menu-development-engine-override-option = Override Motore +settings-menu-development-engine-override-option-description = Sovrascrive il percorso di eseguibili predefinito del motore. Funzione intesa per scopi di sviluppo e potrebbe causare problemi se impostata incorrettamente. + +settings-menu-development-engine-override-path-option = Percorso Override Motore +settings-menu-development-engine-override-path-option-description = Il percorso per il file eseguibile da usare quando Override Motore è abilitato. Dovrebbe indicare un file eseguibile del motore valido. + +settings-menu-development-robust-manifest-cache-time-option = Robust Manifest Cache Time +settings-menu-development-robust-manifest-cache-time-option-description = Seleziona il tempo per cui conservare i dati del manifesto. + +settings-menu-development-max-versions-option = Max Versions +settings-menu-development-max-versions-option-description = Seleziona il numero massimo di versioni da mantenere nella cronologia delle versioni. Le versioni più vecchie saranno rimosse quando questo limite viene superato. + +settings-menu-development-max-fork-versions-option = Max Fork Versions +settings-menu-development-max-fork-versions-option-description = Seleziona il numero massimo di versioni Fork da mantenere nella cronologia delle versioni. Le versioni Fork più vecchie saranno rimosse quando questo limite viene superato. diff --git a/Starlight.Launcher/Resources/Raw/Locale/manifest.json b/Starlight.Launcher/Resources/Locale/manifest.json similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/manifest.json rename to Starlight.Launcher/Resources/Locale/manifest.json diff --git a/Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Atoms/servers-list-item.ftl b/Starlight.Launcher/Resources/Locale/ru-RU/UI/Atoms/servers-list-item.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Atoms/servers-list-item.ftl rename to Starlight.Launcher/Resources/Locale/ru-RU/UI/Atoms/servers-list-item.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Atoms/servers-list-search-bar.ftl b/Starlight.Launcher/Resources/Locale/ru-RU/UI/Atoms/servers-list-search-bar.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Atoms/servers-list-search-bar.ftl rename to Starlight.Launcher/Resources/Locale/ru-RU/UI/Atoms/servers-list-search-bar.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Atoms/servers-list-tags-bar.ftl b/Starlight.Launcher/Resources/Locale/ru-RU/UI/Atoms/servers-list-tags-bar.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Atoms/servers-list-tags-bar.ftl rename to Starlight.Launcher/Resources/Locale/ru-RU/UI/Atoms/servers-list-tags-bar.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Atoms/settings-alternative-list-option.ftl b/Starlight.Launcher/Resources/Locale/ru-RU/UI/Atoms/settings-alternative-list-option.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Atoms/settings-alternative-list-option.ftl rename to Starlight.Launcher/Resources/Locale/ru-RU/UI/Atoms/settings-alternative-list-option.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Layout/main.ftl b/Starlight.Launcher/Resources/Locale/ru-RU/UI/Layout/main.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Layout/main.ftl rename to Starlight.Launcher/Resources/Locale/ru-RU/UI/Layout/main.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Pages/auth.ftl b/Starlight.Launcher/Resources/Locale/ru-RU/UI/Pages/auth.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Pages/auth.ftl rename to Starlight.Launcher/Resources/Locale/ru-RU/UI/Pages/auth.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Pages/home.ftl b/Starlight.Launcher/Resources/Locale/ru-RU/UI/Pages/home.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Pages/home.ftl rename to Starlight.Launcher/Resources/Locale/ru-RU/UI/Pages/home.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Pages/hub.ftl b/Starlight.Launcher/Resources/Locale/ru-RU/UI/Pages/hub.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Pages/hub.ftl rename to Starlight.Launcher/Resources/Locale/ru-RU/UI/Pages/hub.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Pages/servers.ftl b/Starlight.Launcher/Resources/Locale/ru-RU/UI/Pages/servers.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Pages/servers.ftl rename to Starlight.Launcher/Resources/Locale/ru-RU/UI/Pages/servers.ftl diff --git a/Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Pages/settings.ftl b/Starlight.Launcher/Resources/Locale/ru-RU/UI/Pages/settings.ftl similarity index 100% rename from Starlight.Launcher/Resources/Raw/Locale/ru-RU/UI/Pages/settings.ftl rename to Starlight.Launcher/Resources/Locale/ru-RU/UI/Pages/settings.ftl diff --git a/Starlight.Launcher/Resources/Raw/AboutAssets.txt b/Starlight.Launcher/Resources/Raw/AboutAssets.txt deleted file mode 100644 index 6de1c15..0000000 --- a/Starlight.Launcher/Resources/Raw/AboutAssets.txt +++ /dev/null @@ -1,15 +0,0 @@ -Any raw assets you want to be deployed with your application can be placed in -this directory (and child directories). Deployment of the asset to your application -is automatically handled by the following `MauiAsset` Build Action within your `.csproj`. - - - -These files will be deployed with your package and will be accessible using Essentials: - - async Task LoadMauiAsset() - { - using var stream = await FileSystem.OpenAppPackageFileAsync("AboutAssets.txt"); - using var reader = new StreamReader(stream); - - var contents = reader.ReadToEnd(); - } diff --git a/Starlight.Launcher/Services/Auth/DiscordAuthService.cs b/Starlight.Launcher/Services/Auth/DiscordAuthService.cs index bc67ece..e6c9225 100644 --- a/Starlight.Launcher/Services/Auth/DiscordAuthService.cs +++ b/Starlight.Launcher/Services/Auth/DiscordAuthService.cs @@ -1,11 +1,12 @@ -using Microsoft.Maui.ApplicationModel; -using Robust.Launcher.Api.Models; -using Robust.Launcher.Api.Models.Data; -using Serilog; -using Starlight.Launcher.Api.Models; using System.Collections.Concurrent; +using System.Diagnostics; using System.Security.Cryptography; using System.Web; +using Robust.Launcher.Api.Models; +using Robust.Launcher.Api.Models.Data; +using Serilog; +using Starlight.Launcher.WebUI.Models.Auth; +using Starlight.Launcher.WebUI.Models.DiscordAuthService; namespace Starlight.Launcher.Services.Auth; @@ -22,8 +23,18 @@ public sealed class DiscordAuthService(StarlightAuthApi api, LoginManager loginM _pending[state] = tcs; try { - if (!await Browser.Default.OpenAsync(api.BuildLauncherLoginUrl(state), BrowserLaunchMode.SystemPreferred)) + try + { + _ = Process.Start(new ProcessStartInfo + { + FileName = api.BuildLauncherLoginUrl(state).ToString(), + UseShellExecute = true + }); + } + catch + { throw new DiscordAuthException("Unable to open the browser to log in."); + } using var timeoutCts = CancellationTokenSource.CreateLinkedTokenSource(cancel); timeoutCts.CancelAfter(_flowTimeout); @@ -38,7 +49,7 @@ public sealed class DiscordAuthService(StarlightAuthApi api, LoginManager loginM } finally { - _pending.TryRemove(state, out _); + _ = _pending.TryRemove(state, out _); } } @@ -87,11 +98,11 @@ public async Task AttachToAccountAsync(LoggedInAccount account, CancellationToke loginManager.ActiveAccountId = newLoginInfo.UserId; } - public bool HandleDeepLink(Uri uri) + public void HandleDeepLink(Uri uri) { if (!uri.Scheme.Equals("starlight", StringComparison.OrdinalIgnoreCase) || !uri.Host.Equals("auth", StringComparison.OrdinalIgnoreCase)) - return false; + return; var query = HttpUtility.ParseQueryString(uri.Query); var state = query["state"]; @@ -99,25 +110,24 @@ public bool HandleDeepLink(Uri uri) if (string.IsNullOrEmpty(state) || !_pending.TryRemove(state, out var tcs)) { Log.Warning("Discord deep link with an unknown state"); - return false; + return; } var error = query["error"]; if (!string.IsNullOrEmpty(error)) { - tcs.TrySetException(new DiscordAuthException(MapError(error))); - return true; + _ = tcs.TrySetException(new DiscordAuthException(MapError(error))); + return; } var token = query["token"]; if (string.IsNullOrEmpty(token)) { - tcs.TrySetException(new DiscordAuthException("No token in the response.")); - return true; + _ = tcs.TrySetException(new DiscordAuthException("No token in the response.")); + return; } - tcs.TrySetResult(new HandoffResult(token, query["refresh"], query["session"])); - return true; + _ = tcs.TrySetResult(new HandoffResult(token, query["refresh"], query["session"])); } private static string MapError(string error) => error switch @@ -133,7 +143,3 @@ private static string GenerateState() return Convert.ToHexString(bytes); } } - -public sealed record HandoffResult(string Token, string? RefreshToken, string? SessionId); - -public sealed class DiscordAuthException(string message) : Exception(message); diff --git a/Starlight.Launcher/Services/Auth/FileKeyProvider.cs b/Starlight.Launcher/Services/Auth/FileKeyProvider.cs new file mode 100644 index 0000000..45d43f7 --- /dev/null +++ b/Starlight.Launcher/Services/Auth/FileKeyProvider.cs @@ -0,0 +1,58 @@ +using System.Security.Cryptography; +using Microsoft.Extensions.Logging; + +namespace Starlight.Launcher.Services.Settings; + +public sealed class FileKeyProvider : ILoginKeyProvider +{ + private readonly ILogger _logger; + + public FileKeyProvider(ILogger logger) => _logger = logger; + + public async Task GetOrCreateKeyAsync(string keyPath) + { + _ = Directory.CreateDirectory(Path.GetDirectoryName(keyPath)!); + + if (File.Exists(keyPath)) + { + try + { + var text = await File.ReadAllTextAsync(keyPath); + var key = Convert.FromBase64String(text); + _logger.LogInformation("Loaded login key from {path} fp={fp}", keyPath, Fp(key)); + return key; + } + catch (Exception ex) when (ex is FormatException or IOException or UnauthorizedAccessException) + { + _logger.LogError(ex, "Login key at {path} is unusable; regenerating (re-auth required).", keyPath); + TryDelete(keyPath); + } + } + + return await CreateAndStoreAsync(keyPath); + } + + private async Task CreateAndStoreAsync(string keyPath) + { + var newKey = RandomNumberGenerator.GetBytes(32); + + var tmp = keyPath + ".tmp"; + await File.WriteAllTextAsync(tmp, Convert.ToBase64String(newKey)); + + if (!OperatingSystem.IsWindows()) + File.SetUnixFileMode(tmp, UnixFileMode.UserRead | UnixFileMode.UserWrite); + + File.Move(tmp, keyPath, true); + + _logger.LogWarning("Generated NEW login key at {path} fp={fp}", keyPath, Fp(newKey)); + return newKey; + } + + private void TryDelete(string path) + { + try { if (File.Exists(path)) File.Delete(path); } + catch (Exception ex) { _logger.LogWarning(ex, "Failed to delete key file {path}", path); } + } + + private static string Fp(byte[] key) => Convert.ToHexString(SHA256.HashData(key))[..8]; +} diff --git a/Starlight.Launcher/Services/Auth/LoginManager.cs b/Starlight.Launcher/Services/Auth/LoginManager.cs index 88e1e6c..692a6b3 100644 --- a/Starlight.Launcher/Services/Auth/LoginManager.cs +++ b/Starlight.Launcher/Services/Auth/LoginManager.cs @@ -1,11 +1,12 @@ +using Avalonia.Threading; using Robust.Launcher.Api.Api; using Robust.Launcher.Api.Models; using Robust.Launcher.Api.Models.Data; using Robust.Launcher.Api.Utility; using Serilog; -using Starlight.Launcher.Api.Models; -using Starlight.Launcher.Models.Helpers; using Starlight.Launcher.Services.Settings; +using Starlight.Launcher.WebUI.Models.Auth; +using Starlight.Launcher.WebUI.Models.Helpers; using System.Collections.ObjectModel; namespace Starlight.Launcher.Services.Auth; @@ -15,7 +16,6 @@ public sealed partial class LoginManager : ObservableObject, IAsyncDisposable private readonly AuthApi _authApi; private readonly StarlightAuthApi _starlightAuthApi; private readonly SettingsService _settings; - private readonly IDispatcher _dispatcher; public static readonly TimeSpan TokenRefreshInterval = TimeSpan.FromMinutes(5); @@ -32,6 +32,8 @@ public sealed partial class LoginManager : ObservableObject, IAsyncDisposable public event Action? LoginsChanged; + private volatile bool _initialized; + public Guid? ActiveAccountId { get => _activeLoginId; @@ -72,28 +74,14 @@ public LoggedInAccount? ActiveAccount set => ActiveAccountId = value?.UserId; } - public LoginManager(AuthApi authApi, SettingsService settings, IDispatcher dispatcher, StarlightAuthApi starlightAuthApi) + public LoginManager(AuthApi authApi, SettingsService settings, StarlightAuthApi starlightAuthApi) { _authApi = authApi; _settings = settings; - _dispatcher = dispatcher; _starlightAuthApi = starlightAuthApi; Logins = new ReadOnlyObservableCollection(_loginsView); - foreach (var loginInfo in _settings.GetLogins().Values) - { - var data = new ActiveLoginData(loginInfo); - _logins[loginInfo.UserId] = data; - _loginsView.Add(data); - } - - var selectedId = _settings.GetSettings().SelectedLoginId; - if (selectedId.HasValue && _logins.ContainsKey(selectedId.Value)) - { - _activeLoginId = selectedId; - } - _settings.LoginsChanged += OnSettingsLoginsChanged; } @@ -118,6 +106,9 @@ public void LinkAuthToken(Guid oldUserID, Guid newUserId, LoginInfo authLogin) private void OnSettingsLoginsChanged() { + if (!_initialized) + return; + var current = _settings.GetLogins(); List toRemoveFromView = new(); @@ -155,7 +146,7 @@ private void OnSettingsLoginsChanged() DispatchToUi(() => { foreach (var d in toRemoveFromView) - _loginsView.Remove(d); + _ = _loginsView.Remove(d); foreach (var d in toAddToView) _loginsView.Add(d); }); @@ -167,14 +158,35 @@ private void OnSettingsLoginsChanged() OnPropertyChanged(nameof(ActiveAccount)); } - public void Initialize() + public async Task InitializeAsync() { + await _settings.WaitForLoginsLoadedAsync(); + + foreach (var loginInfo in await _settings.GetLoginsAsync()) + { + var data = new ActiveLoginData(loginInfo.Value); + _logins[loginInfo.Key] = data; + _loginsView.Add(data); + } + + var selectedId = (await _settings.GetSettingsAsync()).SelectedLoginId; + if (selectedId.HasValue && _logins.ContainsKey(selectedId.Value)) + { + _activeLoginId = selectedId; + } + FixStoredDiscordUsernames(); + _initialized = true; + _cts = new CancellationTokenSource(); _refreshTask = RunRefreshLoop(_cts.Token); - Task.Run(async () => await RefreshAllTokens()); + _ = Task.Run(async () => + { + try { await RefreshAllTokens(); } + catch (Exception ex) { Log.Warning(ex, "Initial token refresh failed"); } + }); } private async Task RunRefreshLoop(CancellationToken cancellationToken) @@ -399,6 +411,12 @@ private async Task UpdateSingleAccountStatus(ActiveLoginData data) private void PersistLogins() { + if (!_initialized) + { + Log.Warning("Skipped PersistLogins before initial load completed"); + return; + } + Dictionary snapshot; lock (_loginsLock) { @@ -407,13 +425,7 @@ private void PersistLogins() _settings.WriteLogins(snapshot); } - private void DispatchToUi(Action action) - { - if (_dispatcher.IsDispatchRequired) - _dispatcher.Dispatch(action); - else - action(); - } + private void DispatchToUi(Action action) => Dispatcher.UIThread.Post(action); public async ValueTask DisposeAsync() { diff --git a/Starlight.Launcher/Services/Auth/StarlightAuthApi.cs b/Starlight.Launcher/Services/Auth/StarlightAuthApi.cs index f3fbb38..e8fbb48 100644 --- a/Starlight.Launcher/Services/Auth/StarlightAuthApi.cs +++ b/Starlight.Launcher/Services/Auth/StarlightAuthApi.cs @@ -1,4 +1,5 @@ using Starlight.Launcher.Services.Settings; +using Starlight.Launcher.WebUI.Models.DiscordAuthService; using System.Net; using System.Net.Http.Headers; using System.Net.Http.Json; @@ -56,7 +57,7 @@ public async Task ValidateDiscordToken(string discordToken) if (resp.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.BadRequest) return null; // expired / revoked / reuse_detected -> re-login - resp.EnsureSuccessStatusCode(); + _ = resp.EnsureSuccessStatusCode(); return await resp.Content.ReadFromJsonAsync(cancellationToken: cancel); } } diff --git a/Starlight.Launcher/Services/Auth/UsernameModerator.cs b/Starlight.Launcher/Services/Auth/UsernameModerator.cs index 4b9fc61..f0fb20e 100644 --- a/Starlight.Launcher/Services/Auth/UsernameModerator.cs +++ b/Starlight.Launcher/Services/Auth/UsernameModerator.cs @@ -94,11 +94,11 @@ private static string Clean(string s) if (pendingSpace) { - sb.Append(' '); + _ = sb.Append(' '); pendingSpace = false; } - sb.Append(rune.ToString()); + _ = sb.Append(rune.ToString()); } return sb.ToString(); @@ -126,13 +126,12 @@ private static string KeepAscii(string s) foreach (var rune in s.EnumerateRunes()) { int v = rune.Value; - bool keep = v is (>= 'a' and <= 'z') or (>= 'A' and <= 'Z') or (>= '0' and <= '9') - || v is '_' or '-' or '.'; + bool keep = v is (>= 'a' and <= 'z') or (>= 'A' and <= 'Z') or (>= '0' and <= '9') or '_' or '-' or '.'; if (keep) { - if (pendingSpace) { sb.Append(' '); pendingSpace = false; } - sb.Append((char)v); + if (pendingSpace) { _ = sb.Append(' '); pendingSpace = false; } + _ = sb.Append((char)v); } else if (v == ' ') { @@ -173,7 +172,7 @@ private static string Clamp(string s) foreach (var rune in s.EnumerateRunes()) { if (n++ == MaxLength) break; - sb.Append(rune.ToString()); + _ = sb.Append(rune.ToString()); } return sb.ToString().TrimEnd(); } diff --git a/Starlight.Launcher/Services/Bridge/Bridge.Commands.cs b/Starlight.Launcher/Services/Bridge/Bridge.Commands.cs new file mode 100644 index 0000000..858a74e --- /dev/null +++ b/Starlight.Launcher/Services/Bridge/Bridge.Commands.cs @@ -0,0 +1,13 @@ + +using Starlight.Launcher.WebUI.Bridge; + +namespace Starlight.Launcher.Services.Bridge; + +public sealed partial class Bridge : IBridge +{ + public event Func? ConnectRequested + { + add => _commands.ConnectRequested += value; + remove => _commands.ConnectRequested -= value; + } +} diff --git a/Starlight.Launcher/Services/Bridge/Bridge.Connector.cs b/Starlight.Launcher/Services/Bridge/Bridge.Connector.cs new file mode 100644 index 0000000..70f3d57 --- /dev/null +++ b/Starlight.Launcher/Services/Bridge/Bridge.Connector.cs @@ -0,0 +1,30 @@ +using System.ComponentModel; +using Robust.Launcher.Api.Models; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Models.Connector; +using Starlight.Launcher.WebUI.Models.Helpers; + +namespace Starlight.Launcher.Services.Bridge; + +public sealed partial class Bridge : IBridge +{ + public event PropertyChangedEventHandler? ConnectionPropertyChanged + { + add => _connector.PropertyChanged += value; + remove => _connector.PropertyChanged -= value; + } + + public ConnectionStatus GetConnectionStatus() => _connector.Status; + + public ServerPrivacyPolicyInfo? GetPrivacyPolicyInfo() => _connector.PrivacyPolicyInfo; + + public bool GetPrivacyPolicyDifferentVersion() => _connector.PrivacyPolicyDifferentVersion; + + public bool IsClientExitedBadly() => _connector.ClientExitedBadly; + + public void LaunchContentBundle(IFileResult file, CancellationToken cancel = default) => _connector.LaunchContentBundle(file, cancel); + + public void Connect(string address, CancellationToken cancel = default) => _connector.Connect(address, cancel); + + public void ConfirmPrivacyPolicy(PrivacyPolicyAcceptResult result) => _connector.ConfirmPrivacyPolicy(result); +} diff --git a/Starlight.Launcher/Services/Bridge/Bridge.DiscordAuthService.cs b/Starlight.Launcher/Services/Bridge/Bridge.DiscordAuthService.cs new file mode 100644 index 0000000..a07f2e5 --- /dev/null +++ b/Starlight.Launcher/Services/Bridge/Bridge.DiscordAuthService.cs @@ -0,0 +1,12 @@ + +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Models.Auth; + +namespace Starlight.Launcher.Services.Bridge; + +public sealed partial class Bridge : IBridge +{ + public async Task LoginAsync(CancellationToken cancel = default) => await _discordAuth.LoginAsync(cancel); + + public async Task AttachToAccountAsync(LoggedInAccount account, CancellationToken cancel = default) => await _discordAuth.AttachToAccountAsync(account, cancel); +} diff --git a/Starlight.Launcher/Services/Bridge/Bridge.DiscordRichPresence.cs b/Starlight.Launcher/Services/Bridge/Bridge.DiscordRichPresence.cs new file mode 100644 index 0000000..22f04b8 --- /dev/null +++ b/Starlight.Launcher/Services/Bridge/Bridge.DiscordRichPresence.cs @@ -0,0 +1,10 @@ + +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Models.DiscordRichPresence; + +namespace Starlight.Launcher.Services.Bridge; + +public sealed partial class Bridge : IBridge +{ + public void UpdatePresence(PresenceState state, string? serverName = null) => _discordRichPresence.UpdatePresence(state, serverName); +} diff --git a/Starlight.Launcher/Services/Bridge/Bridge.HubServerFetcher.cs b/Starlight.Launcher/Services/Bridge/Bridge.HubServerFetcher.cs new file mode 100644 index 0000000..9cea117 --- /dev/null +++ b/Starlight.Launcher/Services/Bridge/Bridge.HubServerFetcher.cs @@ -0,0 +1,29 @@ + +using Robust.Launcher.Api.Models.ServerStatus; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Models.HubServerFetcher; + +namespace Starlight.Launcher.Services.Bridge; + +public sealed partial class Bridge : IBridge +{ + public event Action? ServersChanged + { + add => _hubServerFetcher.ServersChanged += value; + remove => _hubServerFetcher.ServersChanged -= value; + } + + public event Action? StatusChanged + { + add => _hubServerFetcher.StatusChanged += value; + remove => _hubServerFetcher.StatusChanged -= value; + } + + public RefreshListStatus GetFetchStatus() => _hubServerFetcher.Status; + + public void UpdateInfoFor(ServerStatusData statusData) => ((IServerSource)_hubServerFetcher).UpdateInfoFor(statusData); + + public void RequestRefresh() => _hubServerFetcher.RequestRefresh(); + + public IReadOnlyList GetAllServers() => _hubServerFetcher.AllServers; +} diff --git a/Starlight.Launcher/Services/Bridge/Bridge.LauncherUpdater.cs b/Starlight.Launcher/Services/Bridge/Bridge.LauncherUpdater.cs new file mode 100644 index 0000000..7415b2d --- /dev/null +++ b/Starlight.Launcher/Services/Bridge/Bridge.LauncherUpdater.cs @@ -0,0 +1,36 @@ +using System.Runtime.InteropServices; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Models.LauncherUpdater; + +namespace Starlight.Launcher.Services.Bridge; + +public sealed partial class Bridge : IBridge +{ + public event Action<(long downloaded, long total)>? DownloadProgress + { + add => _launcherUpdater.DownloadProgress += value; + remove => _launcherUpdater.DownloadProgress -= value; + } + + public async Task IsUpdateAvailable() => await _launcherUpdater.IsUpdateAvailable(); + + public async Task DownloadAsset(ReleaseAsset asset, CancellationToken ct = default) => await _launcherUpdater.DownloadAsset(asset, ct); + + public void RunInstallerAndExit(string downloadedPath) + { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + LauncherUpdater.RunInstallerAndExit(downloadedPath, _settings.GetSettings().DirLauncherInstall); + else + LauncherUpdater.RunInstallerAndExit(downloadedPath, LauncherUpdater.GetMacAppBundleRoot(AppContext.BaseDirectory)); + } + + public void CleanupOldInstallers() => _launcherUpdater.CleanupOldInstallers(); + + public bool ShouldShowChangelog() => _launcherUpdater.ShouldShowChangelog(); + + public async Task> GetChangelogsToShow() => await _launcherUpdater.GetChangelogsToShow(); + + public void MarkChangelogSeen() => _launcherUpdater.MarkChangelogSeen(); + + public string GetVersion() => LauncherUpdater.GetVersion(); +} diff --git a/Starlight.Launcher/Services/Bridge/Bridge.LoginManager.cs b/Starlight.Launcher/Services/Bridge/Bridge.LoginManager.cs new file mode 100644 index 0000000..dc9da46 --- /dev/null +++ b/Starlight.Launcher/Services/Bridge/Bridge.LoginManager.cs @@ -0,0 +1,31 @@ +using System.Collections.ObjectModel; +using Robust.Launcher.Api.Models.Data; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Models.Auth; + +namespace Starlight.Launcher.Services.Bridge; + +public sealed partial class Bridge : IBridge +{ + public event Action? LoginEntriesChanged + { + add => _loginManager.LoginsChanged += value; + remove => _loginManager.LoginsChanged -= value; + } + + public Guid? GetActiveAccountId() => _loginManager.ActiveAccountId; + + public void SetActiveAccountId(Guid? activeAccountId) => _loginManager.ActiveAccountId = activeAccountId; + + public LoggedInAccount? GetActiveAccount() => _loginManager.ActiveAccount; + + public ReadOnlyObservableCollection GetLoginEntries() => _loginManager.Logins; + + public async Task UpdateSingleAccountStatus(LoggedInAccount account) => await _loginManager.UpdateSingleAccountStatus(account); + + public void RemoveLogin(Guid userId) => _loginManager.RemoveLogin(userId); + + public void LinkAuthToken(Guid oldUserID, Guid newUserId, LoginInfo authLogin) => _loginManager.LinkAuthToken(oldUserID, newUserId, authLogin); + + public void AddFreshLogin(LoginInfo info) => _loginManager.AddFreshLogin(info); +} diff --git a/Starlight.Launcher/Services/Bridge/Bridge.ServerInfoLoader.cs b/Starlight.Launcher/Services/Bridge/Bridge.ServerInfoLoader.cs new file mode 100644 index 0000000..a0a157c --- /dev/null +++ b/Starlight.Launcher/Services/Bridge/Bridge.ServerInfoLoader.cs @@ -0,0 +1,9 @@ +using Robust.Launcher.Api.Models.ServerStatus; +using Starlight.Launcher.WebUI.Bridge; + +namespace Starlight.Launcher.Services.Bridge; + +public sealed partial class Bridge : IBridge +{ + public void Request(ServerStatusData? data) => _serverInfoLoader.Request(data); +} diff --git a/Starlight.Launcher/Services/Bridge/Bridge.Settings.cs b/Starlight.Launcher/Services/Bridge/Bridge.Settings.cs new file mode 100644 index 0000000..1278d5f --- /dev/null +++ b/Starlight.Launcher/Services/Bridge/Bridge.Settings.cs @@ -0,0 +1,47 @@ +using Robust.Launcher.Api.Models.Data; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Models.Data; +using Starlight.Launcher.WebUI.Models.ServerStatus; +using Starlight.Launcher.WebUI.Models.Settings; + +namespace Starlight.Launcher.Services.Bridge; + +public sealed partial class Bridge : IBridge +{ + public event Action? FavoritesChanged + { + add => _settings.FavoritesChanged += value; + remove => _settings.FavoritesChanged -= value; + } + + public event Action? LoginsUnrecoverable + { + add => _settings.LoginsUnrecoverable += value; + remove => _settings.LoginsUnrecoverable -= value; + } + + public IReadOnlySet GetFavoriteAddressesSnapshot() => _settings.GetFavoriteAddressesSnapshot(); + + public AppSettings GetSettings() => _settings.GetSettings(); + + public async Task GetSettingsAsync() => await _settings.GetSettingsAsync(); + + public List GetFavorites() => _settings.GetFavorites(); + + public async Task> GetFavoritesAsync() => await _settings.GetFavoritesAsync(); + + public Dictionary GetLogins() => _settings.GetLogins(); + + public async Task> GetLoginsAsync() => await _settings.GetLoginsAsync(); + + public void WriteSettings(AppSettings settings) => _settings.WriteSettings(settings); + + public async Task WriteSettingsAsync(AppSettings settings) => await _settings.WriteSettingsAsync(settings); + + public async Task WriteFavoritesAsync(List favorites) => await _settings.WriteFavoritesAsync(favorites); + + public void WriteLogins(Dictionary logins) => _settings.WriteLogins(logins); + + public async Task CacheFilters(ServerListFilters filters) => await _settings.CacheFilters(filters); + +} diff --git a/Starlight.Launcher/Services/Bridge/Bridge.Tray.cs b/Starlight.Launcher/Services/Bridge/Bridge.Tray.cs new file mode 100644 index 0000000..4f3ce36 --- /dev/null +++ b/Starlight.Launcher/Services/Bridge/Bridge.Tray.cs @@ -0,0 +1,10 @@ + +using Avalonia.Threading; +using Starlight.Launcher.WebUI.Bridge; + +namespace Starlight.Launcher.Services.Bridge; + +public sealed partial class Bridge : IBridge +{ + public void HideWindow() => Dispatcher.UIThread.Post(_tray.HideWindow); +} diff --git a/Starlight.Launcher/Services/Bridge/Bridge.Updater.cs b/Starlight.Launcher/Services/Bridge/Bridge.Updater.cs new file mode 100644 index 0000000..4814301 --- /dev/null +++ b/Starlight.Launcher/Services/Bridge/Bridge.Updater.cs @@ -0,0 +1,12 @@ + +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Models.Updater; + +namespace Starlight.Launcher.Services.Bridge; + +public sealed partial class Bridge : IBridge +{ + public (long downloaded, long total, ProgressUnit unit)? GetUpdateProgress() => _updater.Progress; + + public UpdateStatus GetUpdateStatus() => _updater.Status; +} diff --git a/Starlight.Launcher/Services/Bridge/Bridge.cs b/Starlight.Launcher/Services/Bridge/Bridge.cs new file mode 100644 index 0000000..55ee066 --- /dev/null +++ b/Starlight.Launcher/Services/Bridge/Bridge.cs @@ -0,0 +1,57 @@ +using System.Diagnostics; +using Avalonia.Threading; +using Starlight.Launcher.Services.Auth; +using Starlight.Launcher.Services.Discord; +using Starlight.Launcher.Services.ServerStatus; +using Starlight.Launcher.Services.Settings; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Models.Helpers; +using Starlight.Launcher.WebUI.Services; + +namespace Starlight.Launcher.Services.Bridge; + +public sealed partial class Bridge : IBridge +{ + private readonly LauncherCommands _commands; + private readonly Connector _connector; + private readonly DiscordAuthService _discordAuth; + private readonly DiscordRichPresence _discordRichPresence; + private readonly HubServerFetcher _hubServerFetcher; + private readonly LauncherUpdater _launcherUpdater; + private readonly LoginManager _loginManager; + private readonly ServerInfoLoader _serverInfoLoader; + private readonly SettingsService _settings; + private readonly Updater _updater; + private readonly IFileDialogService _fileDialog; + private readonly INativeTray _tray; + + public Bridge(LauncherCommands commands, Connector connector, DiscordAuthService discordAuth, + DiscordRichPresence discordRichPresence, HubServerFetcher hubServerFetcher, LauncherUpdater launcherUpdater, + LoginManager loginManager, ServerInfoLoader serverInfoLoader, SettingsService settings, Updater updater, + IFileDialogService fileDialog, INativeTray tray) + { + _commands = commands; + _connector = connector; + _discordAuth = discordAuth; + _discordRichPresence = discordRichPresence; + _hubServerFetcher = hubServerFetcher; + _launcherUpdater = launcherUpdater; + _loginManager = loginManager; + _serverInfoLoader = serverInfoLoader; + _settings = settings; + _updater = updater; + _fileDialog = fileDialog; + _tray = tray; + } + + public void OpenBrowser(string url) => + Process.Start(new ProcessStartInfo + { + FileName = url, + UseShellExecute = true + }); + + public async Task PickFileAsync( + string filter = "Content bundles / replays\0*.zip;*.rt\0All Files\0*.*\0\0", + CancellationToken cancel = default) => await Dispatcher.UIThread.InvokeAsync(async () => await _fileDialog.PickFileAsync()); +} diff --git a/Starlight.Launcher/Services/ContentManagement/ContentManager.cs b/Starlight.Launcher/Services/ContentManagement/ContentManager.cs index 5aaf8c4..7a4d5cb 100644 --- a/Starlight.Launcher/Services/ContentManagement/ContentManager.cs +++ b/Starlight.Launcher/Services/ContentManagement/ContentManager.cs @@ -21,7 +21,7 @@ public void Initialize() // I tried to set this from inside the migrations but didn't work, rip. // Anyways: enabling WAL mode here so that downloading new files doesn't lock up if your game is running. - con.Execute("PRAGMA journal_mode=WAL"); + _ = con.Execute("PRAGMA journal_mode=WAL"); Log.Debug("Migrating content database..."); @@ -53,12 +53,12 @@ public async Task ClearAll() return false; } - con.Execute("DELETE FROM InterruptedDownload"); - con.Execute("DELETE FROM ContentVersion"); - con.Execute("DELETE FROM Content"); + _ = con.Execute("DELETE FROM InterruptedDownload"); + _ = con.Execute("DELETE FROM ContentVersion"); + _ = con.Execute("DELETE FROM Content"); transact.Commit(); - con.Execute("VACUUM"); + _ = con.Execute("VACUUM"); return true; } catch (Exception e) @@ -141,7 +141,7 @@ public static List GetRunningClientVersions(SqliteConnection con) { Log.Debug("Removing died client {Pid} from RunningClient", pid); - con.Execute("DELETE FROM RunningClient WHERE ProcessId = @ProcessId", new + _ = con.Execute("DELETE FROM RunningClient WHERE ProcessId = @ProcessId", new { ProcessId = pid }); diff --git a/Starlight.Launcher/Services/DeepLink/LauncherActivation.cs b/Starlight.Launcher/Services/DeepLink/LauncherActivation.cs new file mode 100644 index 0000000..ba751c1 --- /dev/null +++ b/Starlight.Launcher/Services/DeepLink/LauncherActivation.cs @@ -0,0 +1,25 @@ +namespace Starlight.Launcher.Services; + +public enum LauncherActivationKind +{ + Ping, + Connect, + DiscordAuth, + RedialWait, +} + +public sealed record LauncherActivationMessage(LauncherActivationKind Kind, string? Payload = null, string? Reason = null) +{ + public static LauncherActivationMessage Ping() => new(LauncherActivationKind.Ping); + public static LauncherActivationMessage RedialWait() => new(LauncherActivationKind.RedialWait); + public static LauncherActivationMessage Connect(Uri uri, string? reason = null) => new(LauncherActivationKind.Connect, uri.ToString(), reason); + public static LauncherActivationMessage DiscordAuth(Uri uri) => new(LauncherActivationKind.DiscordAuth, uri.ToString()); +} + +public static class LauncherUriRouter +{ + public static LauncherActivationMessage Classify(Uri uri) => + uri.Host.Equals("auth", StringComparison.OrdinalIgnoreCase) + ? LauncherActivationMessage.DiscordAuth(uri) + : LauncherActivationMessage.Connect(uri); +} diff --git a/Starlight.Launcher/Services/DeepLink/LauncherCommands.cs b/Starlight.Launcher/Services/DeepLink/LauncherCommands.cs new file mode 100644 index 0000000..fc82d2c --- /dev/null +++ b/Starlight.Launcher/Services/DeepLink/LauncherCommands.cs @@ -0,0 +1,142 @@ +using System.Threading.Channels; +using Avalonia; +using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Threading; +using Microsoft.Extensions.Logging; +using Robust.Launcher.Api.Models; +using Starlight.Launcher.Services.Auth; +using Starlight.Launcher.WebUI.Models.Auth; + +namespace Starlight.Launcher.Services; + +public partial class LauncherCommands +{ + private readonly ILogger _logger; + private readonly LoginManager _loginManager; + private readonly Connector _connector; + private readonly DiscordAuthService _discordAuth; + public readonly Channel CommandChannel; + + public event Func? ConnectRequested; + + public LauncherCommands(ILogger logger, LoginManager loginManager, Connector connector, DiscordAuthService discordAuth) + { + _logger = logger; + _loginManager = loginManager; + _connector = connector; + _discordAuth = discordAuth; + + CommandChannel = Channel.CreateUnbounded(); + } + + private void ActivateWindow() + { + if (Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktopLifetime || desktopLifetime.MainWindow is not { } window) + { + _logger.LogWarning("ActivateWindow: can't find active window!!!"); + return; + } + + Dispatcher.UIThread.Post(() => + { + window.Show(); + window.Activate(); + }); + } + + private async Task Connect(string address, string? reason) + { + LoggedInAccount? activeAccount; + while (true) + { + activeAccount = _loginManager.ActiveAccount; + + if (activeAccount == null || activeAccount.Status == AccountLoginStatus.Unsure) + await Task.Delay(1000); + else + break; + } + + if (activeAccount!.Status != AccountLoginStatus.Available) + { + _logger.LogWarning("Dropping connect command: Account not available"); + return; + } + + if (_connector.ActiveLaunches > 0) + { + _logger.LogWarning("Dropping connect command: Busy connecting to a server"); + return; + } + + // Note that we don't want to activate the window for something we'll requeue again and again. + ActivateWindow(); + _logger.LogInformation("Connect command: \"{Address}\", \"{Reason}\"", address, reason); + + var handler = ConnectRequested; + if (handler is null) + { + _logger.LogError("Connect: no UI handler subscribed to ConnectRequested"); + return; + } + + await handler(address); + } + + public async ValueTask QueueMessage(LauncherActivationMessage message) => await CommandChannel.Writer.WriteAsync(message); + + public void Shutdown() => CommandChannel.Writer.Complete(); + + public async void RunCommandTask() + { + var reader = CommandChannel.Reader; + while (await reader.WaitToReadAsync()) + { + var message = await reader.ReadAsync(); + try + { + await Dispatch(message); + } + catch (Exception e) + { + _logger.LogError(e, "Exception while processing activation message {Kind}", message.Kind); + } + } + } + + private async Task Dispatch(LauncherActivationMessage message) + { + _logger.LogDebug("Activation message: {Kind} payload={Payload}", message.Kind, message.Payload); + + switch (message) + { + case { Kind: LauncherActivationKind.Ping }: + ActivateWindow(); + break; + + case { Kind: LauncherActivationKind.RedialWait }: + await Task.Delay(1000); + break; + + case { Kind: LauncherActivationKind.Connect, Payload: { } address }: + await Connect(address, message.Reason); + break; + + case { Kind: LauncherActivationKind.DiscordAuth, Payload: { } uriString }: + if (Uri.TryCreate(uriString, UriKind.Absolute, out var uri)) + { + _logger.LogInformation("Dispatching Discord auth deep link: {uri}", uri); + _discordAuth.HandleDeepLink(uri); + } + else + { + _logger.LogError("Bad auth deep link payload: {Payload}", uriString); + } + break; + + default: + _logger.LogError("Unhandled or malformed activation message: {@Message}", message); + break; + } + } +} diff --git a/Starlight.Launcher/Services/DeepLink/LauncherMessageing.cs b/Starlight.Launcher/Services/DeepLink/LauncherMessageing.cs new file mode 100644 index 0000000..a6588c5 --- /dev/null +++ b/Starlight.Launcher/Services/DeepLink/LauncherMessageing.cs @@ -0,0 +1,155 @@ +using System.IO.Pipes; +using System.Text; +using System.Text.Json; +using Serilog; + +namespace Starlight.Launcher.Services; + +public class LauncherMessaging +{ + private LauncherActivationMessage[] _initialMessages = Array.Empty(); + private NamedPipeServerStream? _pipeServer; + private readonly CancellationTokenSource _pipeServerSelfDestruct = new(); + private static readonly Encoding _noBomUtf8 = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false); + private Task? _serverTask; + + public bool SendMessagesOrClaim(LauncherActivationMessage[] messages, bool sendAnyway = true) + { + var actualPipeName = "Starlight.Launcher.CommandPipe"; + + if (OperatingSystem.IsLinux() && Environment.GetEnvironmentVariable("XDG_RUNTIME_DIR") is { } runtimeDir && !string.IsNullOrEmpty(runtimeDir)) + actualPipeName = Path.Combine(runtimeDir, actualPipeName); + else if (!OperatingSystem.IsMacOS()) + actualPipeName += "_" + Convert.ToHexString(Encoding.UTF8.GetBytes(Environment.UserName)); + + try + { + using (var client = new NamedPipeClientStream(".", actualPipeName, PipeDirection.InOut, PipeOptions.CurrentUserOnly)) + { + client.Connect(150); + + using var writer = new StreamWriter(client, _noBomUtf8, leaveOpen: true) { AutoFlush = true }; + foreach (var message in messages) + { + var json = JsonSerializer.Serialize(message); + Console.WriteLine($"IPC: relaying {json} to existing instance"); + writer.WriteLine(json); + } + } + Console.WriteLine($"IPC: relayed {messages.Length} message(s) to the existing instance"); + return true; + } + catch (Exception ex) + { + // Must use Console since Serilog isn't wired up yet in pre-init context. + Console.WriteLine($"IPC: no existing instance reachable ({ex.GetType().Name}), becoming primary"); + } + + try + { + _pipeServer = new NamedPipeServerStream(actualPipeName, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, PipeOptions.Asynchronous | PipeOptions.CurrentUserOnly); + } + catch (Exception e) + { + Console.WriteLine($"IPC: pipe server could not be created: {e}"); + } + + if (sendAnyway) + _initialMessages = messages; + + return false; + } + + public void StartServerTask(LauncherCommands lc) => _serverTask = ServerTask(lc); + + public void StopAndWait() + { + _pipeServerSelfDestruct.Cancel(); + + _pipeServer?.Dispose(); + + if (_serverTask == null) + return; + + try + { + _serverTask.Wait(); + } + catch (OperationCanceledException) + { + } + catch (AggregateException ex) when ( + ex.InnerExceptions.All(e => e is OperationCanceledException or ObjectDisposedException)) + { + } + } + + private async Task ServerTask(LauncherCommands lc) + { + var token = _pipeServerSelfDestruct.Token; + + foreach (var message in _initialMessages) + { + Log.Information("IPC: queueing initial activation message {@Message}", message); + await lc.QueueMessage(message); + } + + if (_pipeServer == null) return; + + try + { + while (true) + { + await _pipeServer.WaitForConnectionAsync(token).ConfigureAwait(false); + if (token.IsCancellationRequested) break; + + var reader = new StreamReader(_pipeServer, _noBomUtf8, detectEncodingFromByteOrderMarks: true); + + try + { + while (true) + { + var line = await reader.ReadLineAsync().WaitAsync(token).ConfigureAwait(false); + if (line is null) break; + + line = line.TrimStart('\uFEFF'); + + Log.Information("IPC: received raw line: {line}", line); + + LauncherActivationMessage? message; + try + { + message = JsonSerializer.Deserialize(line); + } + catch (Exception ex) + { + Log.Warning(ex, "IPC: failed to deserialize line, ignoring"); + continue; + } + + if (message is not null) + await lc.QueueMessage(message); + } + + _pipeServer.Disconnect(); + } + catch (OperationCanceledException) + { + throw; + } + catch (Exception e) + { + Log.Warning(e, "IPC: exception during a connection"); + } + } + } + catch (OperationCanceledException) + { + // fine, we're shutting down + } + finally + { + await _pipeServer.DisposeAsync(); + } + } +} diff --git a/Starlight.Launcher/Services/DeepLink/ProtocolRegistration.cs b/Starlight.Launcher/Services/DeepLink/ProtocolRegistration.cs new file mode 100644 index 0000000..5170d1e --- /dev/null +++ b/Starlight.Launcher/Services/DeepLink/ProtocolRegistration.cs @@ -0,0 +1,120 @@ +using System.Diagnostics; +using Microsoft.Win32; +using Serilog; + +namespace Starlight.Launcher; + +internal static class ProtocolRegistration +{ + private const string Scheme = "starlight"; + private const string ProgId = "Starlight.Launcher.Protocol"; + private const string AppRegName = "Starlight.Launcher"; + + public static void RegisterWindows() + { + if (!OperatingSystem.IsWindows()) + return; + + try + { + var exePath = Environment.ProcessPath; + if (exePath is null) + return; + + using (var progIdKey = Registry.CurrentUser.CreateSubKey($@"Software\Classes\{ProgId}")) + { + progIdKey!.SetValue("", "Starlight Launcher Protocol"); + using var iconKey = progIdKey.CreateSubKey("DefaultIcon"); + iconKey!.SetValue("", $"\"{exePath}\",0"); + using var commandKey = progIdKey.CreateSubKey(@"shell\open\command"); + commandKey!.SetValue("", $"\"{exePath}\" \"%1\""); + } + + using (var capsKey = Registry.CurrentUser.CreateSubKey($@"Software\{AppRegName}\Capabilities")) + { + capsKey!.SetValue("ApplicationName", "Starlight Launcher"); + capsKey.SetValue("ApplicationDescription", "Starlight Launcher"); + using var urlAssoc = capsKey.CreateSubKey("URLAssociations"); + urlAssoc!.SetValue(Scheme, ProgId); + } + + using (var registeredApps = Registry.CurrentUser.CreateSubKey(@"Software\RegisteredApplications")) + { + registeredApps!.SetValue(AppRegName, $@"Software\{AppRegName}\Capabilities"); + } + + using var schemeKey = Registry.CurrentUser.CreateSubKey($@"Software\Classes\{Scheme}"); + schemeKey!.SetValue("", $"URL:{Scheme} Protocol"); + schemeKey.SetValue("URL Protocol", ""); + using var directIconKey = schemeKey.CreateSubKey("DefaultIcon"); + directIconKey!.SetValue("", $"\"{exePath}\",0"); + using var directCommandKey = schemeKey.CreateSubKey(@"shell\open\command"); + directCommandKey!.SetValue("", $"\"{exePath}\" \"%1\""); + } + catch (Exception ex) + { + Log.Warning(ex, "Failed to register {scheme} protocol handler (Windows)", Scheme); + } + } + + public static void RegisterLinux() + { + if (!OperatingSystem.IsLinux()) + return; + + try + { + var exePath = Environment.GetEnvironmentVariable("APPIMAGE") ?? Environment.ProcessPath; + if (exePath is null) + return; + + var desktopDir = Path.Combine( + Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), + "applications"); + _ = Directory.CreateDirectory(desktopDir); + + var desktopPath = Path.Combine(desktopDir, "starlight-launcher.desktop"); + + var desktopContent = + "[Desktop Entry]\n" + + "Type=Application\n" + + "Name=Starlight Launcher\n" + + "Comment=Starlight Launcher for Space Station 14\n" + + $"Exec=\"{exePath}\" %u\n" + + "Terminal=false\n" + + "Categories=Game;\n" + + "MimeType=x-scheme-handler/starlight;\n"; + + if (File.Exists(desktopPath) && File.ReadAllText(desktopPath) == desktopContent) + return; + + File.WriteAllText(desktopPath, desktopContent); + + RunBestEffort("update-desktop-database", desktopDir); + RunBestEffort("xdg-mime", "default starlight-launcher.desktop x-scheme-handler/starlight"); + } + catch (Exception ex) + { + Log.Warning(ex, "Failed to self-register {scheme} protocol handler (Linux)", Scheme); + } + } + + private static void RunBestEffort(string fileName, string args) + { + try + { + using var p = Process.Start(new ProcessStartInfo + { + FileName = fileName, + Arguments = args, + UseShellExecute = false, + RedirectStandardOutput = true, + RedirectStandardError = true, + }); + _ = p?.WaitForExit(5000); + } + catch + { + } + } +} diff --git a/Starlight.Launcher/Services/Discord/DiscordRichPresence.cs b/Starlight.Launcher/Services/Discord/DiscordRichPresence.cs index 0a79121..50c04e6 100644 --- a/Starlight.Launcher/Services/Discord/DiscordRichPresence.cs +++ b/Starlight.Launcher/Services/Discord/DiscordRichPresence.cs @@ -1,6 +1,7 @@ using DiscordRPC; using Serilog; using Starlight.Launcher.Services.Settings; +using Starlight.Launcher.WebUI.Models.DiscordRichPresence; namespace Starlight.Launcher.Services.Discord; @@ -14,8 +15,6 @@ public sealed partial class DiscordRichPresence : IDisposable private readonly DateTime _startedAt = DateTime.UtcNow; - private DateTime _lastUpdate; - public DiscordRichPresence(SettingsService settingsService) { var settings = settingsService.GetSettings(); @@ -39,7 +38,7 @@ public DiscordRichPresence(SettingsService settingsService) public void Initialize() { - _client?.Initialize(); + _ = _client?.Initialize(); UpdatePresence(CurrentPresenceState); // Initial presence update to set the starting state } @@ -80,16 +79,6 @@ public void UpdatePresence(PresenceState state, string? serverName = null) }; CurrentPresenceState = state; _currentServerName = serverName ?? _currentServerName; - _lastUpdate = DateTime.UtcNow; _client.SetPresence(presence); } } - -public enum PresenceState -{ - Idle, // Home screen, not doing anything - SearchingServers, // Browsing server list - SettingUp, // Configuring settings, etc. - DownloadingContent, - LaunchingGame -} diff --git a/Starlight.Launcher/Services/EngineManager/EngineManagerDynamic.Manifest.cs b/Starlight.Launcher/Services/EngineManager/EngineManagerDynamic.Manifest.cs index cb74cb0..c97b527 100644 --- a/Starlight.Launcher/Services/EngineManager/EngineManagerDynamic.Manifest.cs +++ b/Starlight.Launcher/Services/EngineManager/EngineManagerDynamic.Manifest.cs @@ -1,6 +1,6 @@ using Serilog; -using Starlight.Launcher.Models; -using Starlight.Launcher.Models.Settings; +using Starlight.Launcher.WebUI.Models.Data; +using Starlight.Launcher.WebUI.Models.Settings; using System.Diagnostics; using System.Text.Json.Serialization; @@ -39,7 +39,7 @@ public sealed partial class EngineManagerDynamic } finally { - _manifestSemaphore.Release(); + _ = _manifestSemaphore.Release(); } } diff --git a/Starlight.Launcher/Services/EngineManager/EngineManagerDynamic.cs b/Starlight.Launcher/Services/EngineManager/EngineManagerDynamic.cs index 9fd7fbc..47085f1 100644 --- a/Starlight.Launcher/Services/EngineManager/EngineManagerDynamic.cs +++ b/Starlight.Launcher/Services/EngineManager/EngineManagerDynamic.cs @@ -8,8 +8,8 @@ using Robust.Launcher.Api.Models.Data; using Robust.Launcher.Api.Utility; using Serilog; -using Starlight.Launcher.Models.Settings; using Starlight.Launcher.Services.Settings; +using Starlight.Launcher.WebUI.Models.Settings; namespace Starlight.Launcher.Services.EngineManager; @@ -172,7 +172,7 @@ private bool VerifyAgainstAnyCdn(FileStream stream, string signature) { foreach (var cdn in AppSettings.RobustCdns) { - stream.Seek(0, SeekOrigin.Begin); + _ = stream.Seek(0, SeekOrigin.Begin); if (VerifySignature(stream, signature, cdn.PublicKey)) return true; } @@ -460,11 +460,11 @@ public async Task DoEngineCullMaybeAsync(SqliteConnection contenCon) { if (name == "Robust" && await GetVersionInfo(version) is { } redirect) { - modulesUsed.Add(("Robust", redirect.Version)); + _ = modulesUsed.Add(("Robust", redirect.Version)); } else { - modulesUsed.Add((name, version)); + _ = modulesUsed.Add((name, version)); } } diff --git a/Starlight.Launcher/Services/FileDialog.cs b/Starlight.Launcher/Services/FileDialog.cs deleted file mode 100644 index 4e2a86b..0000000 --- a/Starlight.Launcher/Services/FileDialog.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Starlight.Launcher.Services; - -public interface IFileDialogService -{ - Task PickFileAsync(string filter = "Content bundles / replays\0*.zip;*.rt\0All Files\0*.*\0\0", CancellationToken cancel = default); - Task PickFolderAsync(CancellationToken cancel = default); -} diff --git a/Starlight.Launcher/Services/Connector.cs b/Starlight.Launcher/Services/GameLaunch/Connector.cs similarity index 96% rename from Starlight.Launcher/Services/Connector.cs rename to Starlight.Launcher/Services/GameLaunch/Connector.cs index c9a653c..8dc48e5 100644 --- a/Starlight.Launcher/Services/Connector.cs +++ b/Starlight.Launcher/Services/GameLaunch/Connector.cs @@ -1,22 +1,24 @@ -using CommunityToolkit.Mvvm.ComponentModel; -using H.NotifyIcon.Core; +using System.Diagnostics; +using System.IO.Compression; +using System.Net.Http.Json; +using System.Runtime.InteropServices; +using System.Text; +using System.Text.Json; +using System.Text.Json.Serialization; +using Avalonia.Threading; using Robust.Launcher.Api.Models; using Robust.Launcher.Api.Models.Data; using Robust.Launcher.Api.Utility; using Serilog; -using Starlight.Launcher.Models.Settings; using Starlight.Launcher.Services.Auth; using Starlight.Launcher.Services.Discord; using Starlight.Launcher.Services.EngineManager; using Starlight.Launcher.Services.Settings; -using System.Diagnostics; -using System.IO.Compression; -using System.Net.Http.Json; -using System.Runtime.InteropServices; -using System.Text; -using System.Text.Json; -using System.Text.Json.Serialization; -using TerraFX.Interop.Windows; +using Starlight.Launcher.WebUI.Models.Connector; +using Starlight.Launcher.WebUI.Models.DiscordRichPresence; +using Starlight.Launcher.WebUI.Models.Helpers; +using Starlight.Launcher.WebUI.Models.Settings; +using Starlight.Launcher.WebUI.Services; namespace Starlight.Launcher.Services; @@ -53,13 +55,13 @@ public Connector(Updater updater, IEngineManager engineManager, HttpClient http, public ConnectionStatus Status { get; - private set => SetProperty(ref field, value); + private set => SetField(ref field, value); } = ConnectionStatus.None; public bool ClientExitedBadly { get; - private set => SetProperty(ref field, value); + private set => SetField(ref field, value); } public ServerPrivacyPolicyInfo? PrivacyPolicyInfo { get; private set; } @@ -67,7 +69,7 @@ public bool ClientExitedBadly public bool PrivacyPolicyDifferentVersion { get; - private set => SetProperty(ref field, value); + private set => SetField(ref field, value); } private bool TryBeginLaunch() @@ -76,7 +78,7 @@ private bool TryBeginLaunch() if (others > 0 && _settings.GetSettings().PreventMultipleClients) { - Interlocked.Decrement(ref _activeLaunches); + _ = Interlocked.Decrement(ref _activeLaunches); return false; } @@ -114,7 +116,7 @@ public async void Connect(string address, CancellationToken cancel = default) } } - public async void LaunchContentBundle(FileResult file, CancellationToken cancel = default) + public async void LaunchContentBundle(IFileResult file, CancellationToken cancel = default) { if (!TryBeginLaunch()) { @@ -141,6 +143,7 @@ public async void LaunchContentBundle(FileResult file, CancellationToken cancel finally { Cleanup(); + EndLaunch(); } } @@ -237,7 +240,7 @@ private void Cleanup() PrivacyPolicyDifferentVersion = default; } - private async Task LaunchContentBundleInternal(FileResult file, CancellationToken cancel) + private async Task LaunchContentBundleInternal(IFileResult file, CancellationToken cancel) { Status = ConnectionStatus.Updating; @@ -246,7 +249,7 @@ private async Task LaunchContentBundleInternal(FileResult file, CancellationToke { var zipHash = await Task.Run(() => Updater.HashFileSha256(zipStream), cancel); - zipStream.Seek(0, SeekOrigin.Begin); + _ = zipStream.Seek(0, SeekOrigin.Begin); using var zipFile = new ZipArchive(zipStream, ZipArchiveMode.Read); @@ -341,7 +344,7 @@ private async Task LaunchClientWrap( var waitClient = clientProc.WaitForExitAsync(cancel); var waitDelay = Task.Delay(300, cancel); - await Task.WhenAny(waitDelay, waitClient); + _ = await Task.WhenAny(waitDelay, waitClient); if (!clientProc.HasExited) { @@ -349,14 +352,14 @@ private async Task LaunchClientWrap( var settings = _settings.GetSettings(); if (settings.CollapseInTrayAfterRun) - _tray.HideWindow(); + Dispatcher.UIThread.Post(_tray.HideWindow); _presence.UpdatePresence(PresenceState.Idle); await waitClient; if (settings.UnCollapseFromTrayAfterEnd) - _tray.ShowWindow(); + Dispatcher.UIThread.Post(_tray.ShowWindow); return; } @@ -633,13 +636,13 @@ private async Task InstallContentBundleAsync( startInfo.ArgumentList.Add(arg); var commandBuilder = new StringBuilder(); - commandBuilder.Append(startInfo.FileName); + _ = commandBuilder.Append(startInfo.FileName); for (var i = 0; i < startInfo.ArgumentList.Count; i++) { var arg = startInfo.ArgumentList[i]; - commandBuilder.Append($" [{i}] {arg}"); + _ = commandBuilder.Append($" [{i}] {arg}"); } Log.Debug("Launch command: {LaunchCommand}", commandBuilder.ToString()); @@ -762,7 +765,7 @@ private async Task GetLoaderStartInfo() #endif basePath = Path.GetFullPath(Path.Combine( settings.DirLauncherInstall, - "..", "..", "..", "..", "..", + "..", "..", "..", "..", "Robust.Loader", "bin", BuildConfiguration, "net10.0")); } @@ -851,21 +854,6 @@ private async Task GetLoaderStartInfo() } #pragma warning restore 162 - public enum ConnectionStatus - { - None, - Updating, - UpdateError, - Connecting, - AwaitingPrivacyPolicyAcceptance, - ConnectionFailed, - StartingClient, - ClientRunning, - ClientExited, - Cancelled, - NotAContentBundle - } - private sealed class ConnectException : Exception { public ConnectionStatus Status { get; } @@ -917,9 +905,3 @@ public sealed record ContentBundleBaseBuild( [property: JsonPropertyName("manifest_url")] string? ManifestUrl, [property: JsonPropertyName("manifest_hash")] string? ManifestHash ); - -public enum PrivacyPolicyAcceptResult -{ - Denied, - Accepted, -} diff --git a/Starlight.Launcher/Services/Migrator.cs b/Starlight.Launcher/Services/GameLaunch/Migrator.cs similarity index 96% rename from Starlight.Launcher/Services/Migrator.cs rename to Starlight.Launcher/Services/GameLaunch/Migrator.cs index 379a0d7..b37ba98 100644 --- a/Starlight.Launcher/Services/Migrator.cs +++ b/Starlight.Launcher/Services/GameLaunch/Migrator.cs @@ -17,7 +17,7 @@ public static bool Migrate(SqliteConnection connection, string prefix) using var transaction = connection.BeginTransaction(); - connection.Execute(@" + _ = connection.Execute(@" CREATE TABLE IF NOT EXISTS SchemaVersions( SchemaVersionID INTEGER PRIMARY KEY, ScriptName TEXT NOT NULL, @@ -42,9 +42,9 @@ Applied DATETIME NOT NULL { var code = script.Up(connection); - connection.Execute(code); + _ = connection.Execute(code); - connection.Execute( + _ = connection.Execute( "INSERT INTO SchemaVersions(ScriptName, Applied) VALUES (@Script, datetime('now'))", new { Script = name }); diff --git a/Starlight.Launcher/Services/Updater.Manifest.cs b/Starlight.Launcher/Services/GameLaunch/Updater.Manifest.cs similarity index 97% rename from Starlight.Launcher/Services/Updater.Manifest.cs rename to Starlight.Launcher/Services/GameLaunch/Updater.Manifest.cs index 6fd7da1..397b8cf 100644 --- a/Starlight.Launcher/Services/Updater.Manifest.cs +++ b/Starlight.Launcher/Services/GameLaunch/Updater.Manifest.cs @@ -6,6 +6,7 @@ using SpaceWizards.Sodium; using SQLitePCL; using Starlight.Launcher.Utility; +using Starlight.Launcher.WebUI.Models.Updater; using System.Buffers.Binary; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; @@ -88,7 +89,7 @@ private async Task ManifestFetchContentManifest( var request = new HttpRequestMessage(HttpMethod.Get, buildInfo.ManifestUrl); var manifestResp = await _http.SendZStdAsync(request, HttpCompletionOption.ResponseHeadersRead, cancel); - manifestResp.EnsureSuccessStatusCode(); + _ = manifestResp.EnsureSuccessStatusCode(); var manifest = Blake2BHasherStream.CreateReader( await manifestResp.Content.ReadAsStreamAsync(cancel), @@ -169,7 +170,7 @@ private static List ManifestCalculateFilesToDownload( // Does not exist in DB. We need to download it. toDownload.Add(i); // A blob can appear multiple times in the manifest. Avoid downloading it twice. - queuedHashes.Add(key); + _ = queuedHashes.Add(key); } } @@ -218,7 +219,7 @@ private async Task ManifestDownloadMissingContent( request.Headers.AcceptEncoding.Add(new StringWithQualityHeaderValue("zstd")); var response = await _http.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancel); - response.EnsureSuccessStatusCode(); + _ = response.EnsureSuccessStatusCode(); var stream = await response.Content.ReadAsStreamAsync(cancel); var bandwidthStream = new BandwidthStream(stream); @@ -328,7 +329,7 @@ RETURNING Id } swBlake.Start(); - CryptoGenericHashBlake2B.Hash(hash, data.Span, ReadOnlySpan.Empty); + _ = CryptoGenericHashBlake2B.Hash(hash, data.Span, ReadOnlySpan.Empty); swBlake.Stop(); /* @@ -370,7 +371,7 @@ RETURNING Id stmtInsertContent.BindInt(db, 3, (int)compression); // @Compression stmtInsertContent.BindInt(db, 4, writeData.Length); // @DataSize - stmtInsertContent.Step(db); + _ = stmtInsertContent.Step(db); var rowId = raw.sqlite3_column_int64(stmtInsertContent, 0); @@ -410,7 +411,7 @@ private async Task CheckManifestDownloadServerProtocolVersions(string url, Cance var request = new HttpRequestMessage(HttpMethod.Options, url); var resp = await _http.SendAsync(request, cancel); - resp.EnsureSuccessStatusCode(); + _ = resp.EnsureSuccessStatusCode(); if (!resp.Headers.TryGetValues("X-Robust-Download-Min-Protocol", out var minHeaders) || !resp.Headers.TryGetValues("X-Robust-Download-Max-Protocol", out var maxHeaders)) @@ -462,7 +463,7 @@ private static void ManifestFillContentManifest( stmtInsertContentManifest.BindString(db, 2, entry.Path); stmtInsertContentManifest.BindInt64(db, 3, contentId); - stmtInsertContentManifest.Step(db); + _ = stmtInsertContentManifest.Step(db); stmtInsertContentManifest.Reset(db); } } diff --git a/Starlight.Launcher/Services/Updater.Zip.cs b/Starlight.Launcher/Services/GameLaunch/Updater.Zip.cs similarity index 97% rename from Starlight.Launcher/Services/Updater.Zip.cs rename to Starlight.Launcher/Services/GameLaunch/Updater.Zip.cs index 2f1e97c..8de6d0c 100644 --- a/Starlight.Launcher/Services/Updater.Zip.cs +++ b/Starlight.Launcher/Services/GameLaunch/Updater.Zip.cs @@ -6,6 +6,7 @@ using Serilog; using SharpZstd.Interop; using Starlight.Launcher.Utility; +using Starlight.Launcher.WebUI.Models.Updater; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.IO.Compression; @@ -34,12 +35,12 @@ private async Task ZipDownloadNewVersion( var zipHash = await ZipUpdateDownloadContent(tempFile, buildInfo, cancel); - con.Execute("UPDATE ContentVersion SET ZipHash=@ZipHash WHERE Id=@Version", + _ = con.Execute("UPDATE ContentVersion SET ZipHash=@ZipHash WHERE Id=@Version", new { ZipHash = zipHash, Version = versionId }); Status = UpdateStatus.LoadingIntoDb; - tempFile.Seek(0, SeekOrigin.Begin); + _ = tempFile.Seek(0, SeekOrigin.Begin); // File downloaded, time to dump this into the DB. @@ -211,7 +212,7 @@ private void ZipIngest( } } - con.Execute( + _ = con.Execute( "INSERT INTO ContentManifest(VersionId, Path, ContentId) VALUES (@VersionId, @Path, @ContentId)", new { @@ -230,4 +231,4 @@ private void ZipIngest( totalSize); Log.Debug("New files: {NewFilesCount}", newFileCount); } -} \ No newline at end of file +} diff --git a/Starlight.Launcher/Services/Updater.cs b/Starlight.Launcher/Services/GameLaunch/Updater.cs similarity index 95% rename from Starlight.Launcher/Services/Updater.cs rename to Starlight.Launcher/Services/GameLaunch/Updater.cs index 62696db..3232c69 100644 --- a/Starlight.Launcher/Services/Updater.cs +++ b/Starlight.Launcher/Services/GameLaunch/Updater.cs @@ -1,3 +1,4 @@ +using Avalonia.Threading; using Dapper; using Microsoft.Data.Sqlite; using Robust.Launcher.Api.Models; @@ -7,6 +8,8 @@ using Starlight.Launcher.Services.Discord; using Starlight.Launcher.Services.EngineManager; using Starlight.Launcher.Services.Settings; +using Starlight.Launcher.WebUI.Models.DiscordRichPresence; +using Starlight.Launcher.WebUI.Models.Updater; using System.Diagnostics.CodeAnalysis; using System.IO.Compression; using System.Numerics; @@ -33,17 +36,15 @@ public sealed partial class Updater private readonly IEngineManager _engineManager; private readonly HttpClient _http; - private readonly IDispatcher _dispatcher; private readonly SettingsService _settings; private readonly ContentManager _manager; private readonly DiscordRichPresence _presence; private bool _updating; - public Updater(IEngineManager engineManager, HttpClient http, IDispatcher dispatcher, SettingsService settings, ContentManager manager, DiscordRichPresence presence) + public Updater(IEngineManager engineManager, HttpClient http, SettingsService settings, ContentManager manager, DiscordRichPresence presence) { _engineManager = engineManager; _http = http; - _dispatcher = dispatcher; _settings = settings; _manager = manager; _presence = presence; @@ -192,7 +193,7 @@ private async Task InstallContentBundle( ); // Copy base build manifest into new version - con.Execute( + _ = con.Execute( @"INSERT INTO ContentManifest (VersionId, Path, ContentId) SELECT @NewVersion, Path, ContentId FROM ContentManifest @@ -212,7 +213,7 @@ FROM ContentManifest // Insert real manifest hash into the database. var manifestHash = GenerateContentManifestHash(con, versionId); - con.Execute("UPDATE ContentVersion SET Hash = @Hash WHERE Id = @Version", + _ = con.Execute("UPDATE ContentVersion SET Hash = @Hash WHERE Id = @Version", new { Hash = manifestHash, Version = versionId }); Log.Debug("Manifest hash of new version is {Hash}", Convert.ToHexString(manifestHash)); @@ -271,7 +272,7 @@ private async Task InstallEnginesForVersion( Status = UpdateStatus.DownloadingEngineModules; var manifest = await moduleManifest.Value; - await _engineManager.DownloadModuleIfNecessary( + _ = await _engineManager.DownloadModuleIfNecessary( name, version, manifest, @@ -341,7 +342,7 @@ private void CullOldContentVersions(SqliteConnection con) else { Log.Debug("Culling version {ForkId}/{ForkVersion}", version.ForkId, version.ForkVersion); - con.Execute("DELETE FROM ContentVersion WHERE Id = @Id", new { version.Id }); + _ = con.Execute("DELETE FROM ContentVersion WHERE Id = @Id", new { version.Id }); anythingRemoved = true; } } @@ -520,7 +521,7 @@ RETURNING Id foreach (var contentId in state.DownloadedContentEntries) { - con.Execute(""" + _ = con.Execute(""" INSERT INTO InterruptedDownloadContent(InterruptedDownloadId, ContentId) VALUES (@DownloadId, @ContentId) """, @@ -531,9 +532,7 @@ INSERT INTO InterruptedDownloadContent(InterruptedDownloadId, ContentId) private static void ClearIncompleteTransactedState(SqliteConnection con, TransactedDownloadState state) { if (state.MadeContentVersion is { } contentVersion) - { - con.Execute("DELETE FROM ContentVersion WHERE Id = @Id", new { Id = contentVersion }); - } + _ = con.Execute("DELETE FROM ContentVersion WHERE Id = @Id", new { Id = contentVersion }); } [SuppressMessage("ReSharper", "MethodHasAsyncOverload")] @@ -576,7 +575,7 @@ private static async Task DuplicateExistingVersion( }); // Copy entire manifest over. - con.Execute(@" + _ = con.Execute(@" INSERT INTO ContentManifest (VersionId, Path, ContentId) SELECT @NewVersion, Path, ContentId FROM ContentManifest @@ -589,7 +588,7 @@ FROM ContentManifest if (changedEngineVersion) { - con.Execute(@" + _ = con.Execute(@" INSERT INTO ContentEngineDependency (VersionId, ModuleName, ModuleVersion) VALUES (@VersionId, 'Robust', @EngineVersion)", new @@ -615,7 +614,7 @@ FROM ContentEngineDependency { var version = IEngineManager.ResolveEngineModuleVersion(manifest, module, engineVersion); - con.Execute(@" + _ = con.Execute(@" INSERT INTO ContentEngineDependency(VersionId, ModuleName, ModuleVersion) VALUES (@Version, @ModName, @EngineVersion)", new @@ -630,7 +629,7 @@ INSERT INTO ContentEngineDependency(VersionId, ModuleName, ModuleVersion) else { // Copy module dependencies. - con.Execute(@" + _ = con.Execute(@" INSERT INTO ContentEngineDependency (VersionId, ModuleName, ModuleVersion) SELECT @NewVersion, ModuleName, ModuleVersion FROM ContentEngineDependency @@ -686,21 +685,15 @@ private async Task DownloadNewVersion( if (!string.IsNullOrEmpty(buildInfo.ManifestUrl) && !string.IsNullOrEmpty(buildInfo.ManifestDownloadUrl) && !string.IsNullOrEmpty(buildInfo.ManifestHash)) - { manifestHash = await ManifestDownloadNewVersion(buildInfo, con, versionId, state, cancel); - } else if (buildInfo.DownloadUrl != null) - { manifestHash = await ZipDownloadNewVersion(buildInfo, con, versionId, cancel); - } else - { throw new InvalidOperationException("No download information provided at all!"); - } Log.Debug("Manifest hash: {ManifestHash}", Convert.ToHexString(manifestHash)); - con.Execute( + _ = con.Execute( "UPDATE ContentVersion SET Hash = @Hash WHERE Id = @Id", new { Hash = manifestHash, Id = versionId }); @@ -718,7 +711,7 @@ private static async Task ResolveContentDependencies( Lazy> moduleManifest) { // Engine version. - con.Execute( + _ = con.Execute( @"INSERT INTO ContentEngineDependency(VersionId, ModuleName, ModuleVersion) VALUES (@Version, 'Robust', @EngineVersion)", new @@ -744,7 +737,7 @@ private static async Task ResolveContentDependencies( { var version = IEngineManager.ResolveEngineModuleVersion(manifest, module, engineVersion); - con.Execute( + _ = con.Execute( @"INSERT INTO ContentEngineDependency(VersionId, ModuleName, ModuleVersion) VALUES (@Version, @ModName, @ModVersion)", new @@ -801,7 +794,7 @@ ORDER BY manifestWriter.Flush(); - manifestStream.Seek(0, SeekOrigin.Begin); + _ = manifestStream.Seek(0, SeekOrigin.Begin); return Blake2B.HashStream(manifestStream, 32); } @@ -817,7 +810,7 @@ private async Task InstallEngineVersionIfMissing(string engineVer, Cance return changedVersion; } - private void DownloadProgressCallback(long downloaded, long total) => _dispatcher.Dispatch(() => Progress = (downloaded, total, ProgressUnit.Bytes)); + private void DownloadProgressCallback(long downloaded, long total) => Dispatcher.UIThread.Post(() => Progress = (downloaded, total, ProgressUnit.Bytes)); internal static byte[] HashFileSha256(Stream stream) { @@ -852,30 +845,6 @@ public sealed class ResourceManifestData public bool MultiWindow = false; } - public enum UpdateStatus - { - CheckingClientUpdate, - CheckingEngineModules, - DownloadingEngineVersion, - DownloadingEngineModules, - FetchingClientManifest, - DownloadingClientUpdate, - Verifying, - CommittingDownload, - LoadingIntoDb, - CullingEngine, - CullingContent, - Ready, - Error, - LoadingContentBundle, - } - - public enum ProgressUnit - { - None, - Bytes, - } - private sealed class TransactedDownloadState { public readonly List DownloadedContentEntries = []; diff --git a/Starlight.Launcher/Services/LauncherCommands.cs b/Starlight.Launcher/Services/LauncherCommands.cs deleted file mode 100644 index 9b7918b..0000000 --- a/Starlight.Launcher/Services/LauncherCommands.cs +++ /dev/null @@ -1,175 +0,0 @@ -using System.Text; -using System.Threading.Channels; -using MudBlazor; -using Robust.Launcher.Api.Models; -using Serilog; -using Starlight.Launcher.Api.Models; -using Starlight.Launcher.Components.Atoms.Dialogs; -using Starlight.Launcher.Services.Auth; - -namespace Starlight.Launcher.Services; - -public partial class LauncherCommands -{ - private static string s_reason = ""; - - private readonly LoginManager _loginManager; - private readonly Connector _connector; - public readonly Channel CommandChannel; - - public event Func? ConnectRequested; - - public LauncherCommands(LoginManager loginManager, Connector connector) - { - _loginManager = loginManager; - _connector = connector; - - CommandChannel = Channel.CreateUnbounded(); - } - - private void ActivateWindow() - { - var window = Application.Current?.Windows.FirstOrDefault(); - if (window is null) - { - Log.Warning("ActivateWindow: can't find active window!!!"); - return; - } - - if (MainThread.IsMainThread) - ActivateWindowPlatform(window); - else - MainThread.BeginInvokeOnMainThread(() => ActivateWindowPlatform(window)); - } - - partial void ActivateWindowPlatform(Window window); - - private async Task Connect(string param) - { - var reason = s_reason == "" ? null : s_reason; - // Sanity-check the connection. - - LoggedInAccount? activeAccount = null; - while (true) - { - activeAccount = _loginManager.ActiveAccount; - - if ((activeAccount == null) || (activeAccount.Status == AccountLoginStatus.Unsure)) - { - await Task.Delay(1000); - } - else - { - break; - } - } - - if (activeAccount!.Status != AccountLoginStatus.Available) - { - Log.Warning($"Dropping connect command: Account not available"); - return; - } - - // Drop the command if we are already connecting. - if (_connector.ActiveLaunches > 0) - { - Log.Warning($"Dropping connect command: Busy connecting to a server"); - return; - } - // Note that we don't want to activate the window for something we'll requeue again and again. - ActivateWindow(); - Log.Information($"Connect command: \"{param}\", \"{reason}\""); - - var handler = ConnectRequested; - if (handler is null) - { - Log.Error("Connect: no UI handler subscribed to ConnectRequested"); - return; - } - - await handler(param); - } - - public async ValueTask QueueCommand(string cmd) => await CommandChannel.Writer.WriteAsync(cmd); - - public void Shutdown() => CommandChannel.Writer.Complete(); - - public async void RunCommandTask() - { - var reader = CommandChannel.Reader; - while (await reader.WaitToReadAsync()) - { - var cmd = await reader.ReadAsync(); - try - { - await RunSingleCommand(cmd); - } - catch (Exception e) - { - Log.Error(e, "Exception while processing launcher command {Command}", cmd); - } - } - } - - private async Task RunSingleCommand(string cmd) - { - Log.Debug($"Launcher command: {cmd}"); - - string? GetUntrustedTextField() - { - try - { - return Encoding.UTF8.GetString(Convert.FromHexString(cmd[1..])); - } - catch (Exception ex) - { - Log.Error($"Failed to parse untrusted text field: {ex}"); - return null; - } - } - - if (cmd == PingCommand) - { - // Yup! - ActivateWindow(); - } - else if (cmd == RedialWaitCommand) - { - // Redialling wait - await Task.Delay(1000); - } - else if (cmd.StartsWith("R")) - { - // Reason (encoded in UTF-8 and then into hex for safety) - s_reason = GetUntrustedTextField() ?? ""; - } - else if (cmd.StartsWith("r")) - { - // Reason (no encoding) - s_reason = cmd[1..]; - } - else if (cmd.StartsWith("C")) - { - // Uri (encoded in UTF-8 and then into hex for safety) - var uri = GetUntrustedTextField(); - if (uri != null) - await Connect(uri); - } - else if (cmd.StartsWith("c")) - { - // Used by the "pass URI as argument" logic, doesn't need to bother with safety measures - await Connect(cmd[1..]); - } - else - { - Log.Error($"Unhandled launcher command: {cmd}"); - } - } - - // Command constructors - - public const string PingCommand = ":Ping"; - public const string RedialWaitCommand = ":RedialWait"; - public const string BlankReasonCommand = "r"; - public static string ConstructConnectCommand(Uri uri) => "c" + uri.ToString(); -} diff --git a/Starlight.Launcher/Services/LauncherMessageing.cs b/Starlight.Launcher/Services/LauncherMessageing.cs deleted file mode 100644 index b8466df..0000000 --- a/Starlight.Launcher/Services/LauncherMessageing.cs +++ /dev/null @@ -1,172 +0,0 @@ -using System.IO.Pipes; -using System.Text; -using Serilog; - -namespace Starlight.Launcher.Services; - -public class LauncherMessaging -{ - /// - /// Initial commands that are fed into the launcher commands system on startup of the launcher. - /// - private string[] _initialCommands = Array.Empty(); - - /// - /// *The* pipe server stream. - /// - private NamedPipeServerStream? _pipeServer; - - /// - /// Cancellation token used to safely shut down the pipe server. - /// - private readonly CancellationTokenSource _pipeServerSelfDestruct = new(); - - private Task? _serverTask; - - /// - /// Either sends a command (a string containing anything except a carriage return or newline) to the primary launcher process, - /// or claims the primary launcher process, provides a hook for commands, and then passes the sent command to that hook. - /// Returns true if the command was sent elsewhere (and the application should shutdown now). - /// Returns false if we are the primary launcher process. - /// This function should only ever be called once. - /// This occurs before Avalonia init. - /// - /// The sent command. - /// If true, when claimed, the hook is given the command immediately for later processing. - public bool SendCommandsOrClaim(string[] commands, bool sendAnyway = true) - { - // Verify command matches rules - foreach (var command in commands) - { - if (command.Contains('\n') || command.Contains('\r')) - throw new ArgumentOutOfRangeException(nameof(command), "No newlines are allowed in a launcher IPC command."); - } - - var actualPipeName = "Starlight.Launcher.CommandPipe"; - - // NOTE: On Unix, NamedPipeStream allows passing full rooted file paths. - if (OperatingSystem.IsLinux() && Environment.GetEnvironmentVariable("XDG_RUNTIME_DIR") is { } runtimeDir && !string.IsNullOrEmpty(runtimeDir)) - { - // Use XDG_RUNTIME_DIR to store the pipe if available. - actualPipeName = Path.Combine(runtimeDir, actualPipeName); - } - else if (!OperatingSystem.IsMacOS()) - { - // Pipes use TMPDIR on macOS which is user-specific, so we don't need to give them a funny name to avoid multi-user problems. - // On other platforms, throw the user name along with the pipe name to avoid any conflicts. - actualPipeName += "_" + Convert.ToHexString(Encoding.UTF8.GetBytes(Environment.UserName)); - } - - // Must use Console since we are in pre-init context. Better than nothing if this somehow misdetects. - - // So during testing on Linux, I found that NamedPipeServerStream does NOT have it's "mutex" semantics. - // Don't know who to blame for this, don't care, let's just try connecting first. - try - { - using (var client = new NamedPipeClientStream(".", actualPipeName, PipeDirection.InOut, PipeOptions.CurrentUserOnly)) - { - // If we are waiting more than 5 seconds something has gone HORRIBLY wrong and we should just let the launcher start. - client.Connect(150); - // Command is newline-terminated. - byte[] commandEncoded = Encoding.UTF8.GetBytes(string.Join('\n', commands) + "\n"); - client.Write(commandEncoded); - } - Console.WriteLine("Passed commands to primary launcher"); - return true; - } - catch (Exception) - { - // Ok, so we're server (we hope) - Console.WriteLine("We are primary launcher (or primary launcher is out for lunch)"); - } - - // Try to create server - try - { - _pipeServer = new NamedPipeServerStream(actualPipeName, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, PipeOptions.Asynchronous | PipeOptions.CurrentUserOnly); - } - catch (Exception e) - { - Console.WriteLine($"Pipe server: Could not be created: {e}"); - } - - if (sendAnyway) - { - _initialCommands = commands; - } - return false; - } - - public void StartServerTask(LauncherCommands lc) => _serverTask = ServerTask(lc); - - public void StopAndWait() - { - _pipeServerSelfDestruct.Cancel(); - try - { - _serverTask?.Wait(TimeSpan.FromSeconds(2)); - } - catch (AggregateException) { } - } - - /// - /// This is the actual async server task, responsible for making everything else someone else's problem. - /// This occurs post-Avalonia-init. - /// - private async Task ServerTask(LauncherCommands lc) - { - var token = _pipeServerSelfDestruct.Token; - // Handle initial commands before actually doing server stuff (as there may be no server). - foreach (string s in _initialCommands) - { - await lc.QueueCommand(s); - } - - // Actual server code - if (_pipeServer == null) return; - // With the pipe server created, we can move on - // Note we can't just close the StreamReader per-connection. - // It would close the underlying pipe server (breaking everything). - var sr = new StreamReader(_pipeServer, Encoding.UTF8); - try - { - while (true) - { - await _pipeServer.WaitForConnectionAsync(token).ConfigureAwait(false); - if (token.IsCancellationRequested) break; - try - { - while (true) - { - var line = await sr.ReadLineAsync().WaitAsync(token).ConfigureAwait(false); - - if (line is null) - break; - - await lc.QueueCommand(line); - } - - _pipeServer.Disconnect(); - } - catch (OperationCanceledException) - { - // Rethrow outside loop. - throw; - } - catch (Exception e) - { - // Not much we can do here. - Log.Warning($"Pipe server: Exception during a connection: {e}"); - } - } - } - catch (OperationCanceledException) - { - // We're gucci - } - finally - { - await _pipeServer.DisposeAsync(); - } - } -} diff --git a/Starlight.Launcher/Services/LauncherUpdater.cs b/Starlight.Launcher/Services/LauncherUpdater.cs deleted file mode 100644 index 3e4a97e..0000000 --- a/Starlight.Launcher/Services/LauncherUpdater.cs +++ /dev/null @@ -1,241 +0,0 @@ -using System.Diagnostics; -using System.Runtime.InteropServices; -using System.Text.Json; -using Starlight.Launcher.Services.Settings; - -namespace Starlight.Launcher.Services; - -public partial class LauncherUpdater -{ - private readonly SettingsService _settings; - - public LauncherUpdater(SettingsService settings) => _settings = settings; - - public static string GetVersion() => Environment.ProcessPath == null - ? "" - : FileVersionInfo.GetVersionInfo(Environment.ProcessPath).ProductVersion?.Split('+')[0] ?? ""; - - public sealed record ReleaseAsset(string Name, string DownloadUrl, long Size); - - public sealed record UpdateInfo( - bool IsUpdateAvailable, - string CurrentVersion, - string LatestVersion, - string ReleasePageUrl, - string ReleaseNotes, - ReleaseAsset? Asset); - - // Progress reporting for the download. (downloaded, total) — total == 0 means unknown. - public event Action<(long downloaded, long total)>? DownloadProgress; - - public async Task IsUpdateAvailable() - { - var (tagName, htmlUrl, body, assets) = await GetLatestRelease(); - var currentVersion = NormalizeVersion(GetVersion()); - var latestVersion = NormalizeVersion(tagName); - - Console.WriteLine($"Current version: {currentVersion}"); - Console.WriteLine($"Latest version: {latestVersion}"); - - var asset = PickAssetForCurrentOs(assets); - - return new UpdateInfo( - !string.Equals(currentVersion, latestVersion, StringComparison.OrdinalIgnoreCase), - currentVersion, - latestVersion, - htmlUrl ?? string.Empty, - body ?? string.Empty, - asset); - } - - /// - /// True if the currently running version differs from the last version - /// for which we showed the changelog. Used to show "what's new" after an update. - /// - public bool ShouldShowChangelog() - { - var current = NormalizeVersion(GetVersion()); - if (string.IsNullOrEmpty(current)) - return false; - - var lastSeen = NormalizeVersion(_settings.GetSettings().LastSeenChangelogVersion); - return !string.Equals(current, lastSeen, StringComparison.OrdinalIgnoreCase); - } - - public void MarkChangelogSeen() - { - var settings = _settings.GetSettings(); - settings.LastSeenChangelogVersion = NormalizeVersion(GetVersion()); - _settings.WriteSettings(settings); - } - - public async Task GetChangelogForCurrentVersion() - { - var current = NormalizeVersion(GetVersion()); - if (string.IsNullOrEmpty(current)) - return null; - - using var httpClient = new HttpClient(); - httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("Starlight.Launcher"); - - foreach (var tag in new[] { $"v{current}", current }) - { - using var response = await httpClient.GetAsync( - $"https://api.github.com/repos/ss14Starlight/Starlight.Launcher/releases/tags/{tag}", - HttpCompletionOption.ResponseHeadersRead); - if (!response.IsSuccessStatusCode) - continue; - - var json = await response.Content.ReadAsStringAsync(); - using var doc = JsonDocument.Parse(json); - if (doc.RootElement.TryGetProperty("body", out var b)) - return b.GetString(); - } - return null; - } - - private static string NormalizeVersion(string? version) - => version?.Trim().TrimStart('v', 'V') ?? string.Empty; - - // OS-specific asset selection. Today only Windows; the switch makes adding Linux/Mac trivial later. - private static ReleaseAsset? PickAssetForCurrentOs(IReadOnlyList assets) - { - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - // e.g. "Starlight.Launcher-1.1.2-setup.exe" - return assets.FirstOrDefault(a => - a.Name.EndsWith(".exe", StringComparison.OrdinalIgnoreCase) && - a.Name.Contains("setup", StringComparison.OrdinalIgnoreCase)); - } - - // TODO Linux: return assets.FirstOrDefault(a => a.Name.EndsWith(".AppImage", ...)); - // TODO macOS: return assets.FirstOrDefault(a => a.Name.EndsWith(".dmg", ...)); - return null; - } - - private async Task<(string? TagName, string? HtmlUrl, string? Body, IReadOnlyList Assets)> GetLatestRelease() - { - using var httpClient = new HttpClient(); - httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("Starlight.Launcher"); - - using var response = await httpClient.GetAsync( - "https://api.github.com/repos/ss14Starlight/Starlight.Launcher/releases/latest", - HttpCompletionOption.ResponseHeadersRead); - response.EnsureSuccessStatusCode(); - - string responseBody = await response.Content.ReadAsStringAsync(); - using var document = JsonDocument.Parse(responseBody); - - document.RootElement.TryGetProperty("tag_name", out var tagName); - document.RootElement.TryGetProperty("html_url", out var htmlUrl); - document.RootElement.TryGetProperty("body", out var body); - - var assets = new List(); - if (document.RootElement.TryGetProperty("assets", out var assetsEl) && - assetsEl.ValueKind == JsonValueKind.Array) - { - foreach (var a in assetsEl.EnumerateArray()) - { - var name = a.TryGetProperty("name", out var n) ? n.GetString() : null; - var url = a.TryGetProperty("browser_download_url", out var u) ? u.GetString() : null; - long size = a.TryGetProperty("size", out var s) && s.TryGetInt64(out var sv) ? sv : 0; - - if (!string.IsNullOrWhiteSpace(name) && !string.IsNullOrWhiteSpace(url)) - assets.Add(new ReleaseAsset(name, url, size)); - } - } - - return (tagName.GetString(), htmlUrl.GetString(), body.GetString(), assets); - } - - /// - /// Downloads the asset to the launcher data folder and returns the local path. - /// - public async Task DownloadAsset(ReleaseAsset asset, CancellationToken ct = default) - { - var dir = GetUpdateFolder(); - Directory.CreateDirectory(dir); - var path = Path.Combine(dir, asset.Name); - - using var httpClient = new HttpClient(); - httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("Starlight.Launcher"); - - using var response = await httpClient.GetAsync( - asset.DownloadUrl, HttpCompletionOption.ResponseHeadersRead, ct); - response.EnsureSuccessStatusCode(); - - // Content-Length can be null; fall back to the size from the API. - var total = response.Content.Headers.ContentLength ?? (asset.Size > 0 ? asset.Size : 0); - - await using var src = await response.Content.ReadAsStreamAsync(ct); - await using var dst = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None); - - var buffer = new byte[81920]; - long downloaded = 0; - int read; - DownloadProgress?.Invoke((0, total)); - - while ((read = await src.ReadAsync(buffer, ct)) > 0) - { - await dst.WriteAsync(buffer.AsMemory(0, read), ct); - downloaded += read; - DownloadProgress?.Invoke((downloaded, total)); - } - - return path; - } - - private string GetUpdateFolder() => Path.Combine(_settings.GetSettings().DirLauncherData, "updates"); - - // Removes previously downloaded installers. Call on launcher startup: - // at that point any installer from a past update is already unlocked. - public void CleanupOldInstallers() - { - try - { - var dir = GetUpdateFolder(); - if (!Directory.Exists(dir)) - return; - - foreach (var file in Directory.EnumerateFiles(dir)) - { - try - { - File.Delete(file); - } - catch (IOException) - { - // File still locked (rare) — skip it, we'll get it next launch. - } - catch (UnauthorizedAccessException) - { - // Same idea — don't let one stubborn file break startup. - } - } - } - catch (Exception ex) - { - // Cleanup must never crash startup. - Console.WriteLine($"Installer cleanup failed: {ex.Message}"); - } - } - - /// - /// Starts the installer and asks the app to exit so it isn't locked during install. - /// - public static void RunInstallerAndExit(string installerPath) - { - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - Process.Start(new ProcessStartInfo - { - FileName = installerPath, - UseShellExecute = true - }); - } - // TODO Linux/macOS: chmod +x the AppImage / open the .dmg, etc. - - // Give the OS a beat, then exit so the installer can replace files. - Environment.Exit(0); - } -} diff --git a/Starlight.Launcher/Services/Localization/LocalizationInitializer.cs b/Starlight.Launcher/Services/Localization/LocalizationInitializer.cs deleted file mode 100644 index 38ad264..0000000 --- a/Starlight.Launcher/Services/Localization/LocalizationInitializer.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Microsoft.Extensions.Logging; -using Starlight.Launcher.Services.Settings; -using Starlight.Launcher.Services.State; - -namespace Starlight.Launcher.Services.Localization; - -public partial class LocalizationInitializer : IMauiInitializeService -{ - public void Initialize(IServiceProvider services) - { - var localizationManager = services.GetRequiredService(); - var state = services.GetRequiredService(); - var settingsService = services.GetRequiredService(); - var logger = services.GetRequiredService>(); - - Task.Run(async () => await localizationManager.Initialize(logger, settingsService, state)); - } -} diff --git a/Starlight.Launcher/Services/Localization/LocalizationManager.cs b/Starlight.Launcher/Services/Localization/LocalizationManager.cs index 09c5da7..72a6b89 100644 --- a/Starlight.Launcher/Services/Localization/LocalizationManager.cs +++ b/Starlight.Launcher/Services/Localization/LocalizationManager.cs @@ -1,52 +1,52 @@ -using Linguini.Bundle; +using System.Globalization; +using System.Reflection; +using System.Text; +using Linguini.Bundle; using Linguini.Bundle.Builder; using Linguini.Shared.Types.Bundle; using Linguini.Syntax.Parser; using Microsoft.Extensions.Logging; -using Starlight.Launcher.Models.Data; using Starlight.Launcher.Services.Settings; -using Starlight.Launcher.Services.State; -using System.Globalization; -using System.Text; -using System.Text.Json; +using Starlight.Launcher.WebUI.Localization; namespace Starlight.Launcher.Services.Localization; -public sealed class LocalizationManager +public sealed class LocalizationManager : ILocalizationManager { private const string DefaultLocale = "en-US"; - private const string PathToManifest = "Locale/manifest.json"; - private ILogger? _logger; - private LocalizationsManifest _localizationsManifest = new(); - private FluentBundle? _currentBundle; + private Assembly _assembly => typeof(LocalizationManager).Assembly; - private AppState? _state; + private readonly ILogger _logger; + private readonly SettingsService _settings; + private readonly Dictionary> _resourcesByCulture = new(); + private FluentBundle? _currentBundle; public CultureInfo SystemCulture { get; private set; } = CultureInfo.InvariantCulture; public string this[string key] => GetString(key); - public async Task Initialize(ILogger logger, SettingsService settings, AppState state) + public event Action? Changed; + + public LocalizationManager(ILogger logger, SettingsService settings) { _logger = logger; - _state = state; + _settings = settings; + } + + public async Task Initialize() + { var currentLocale = CultureInfo.CurrentUICulture; try { - using var stream = await FileSystem.OpenAppPackageFileAsync(PathToManifest); - using var reader = new StreamReader(stream); - - var content = await reader.ReadToEndAsync(); - var manifest = JsonSerializer.Deserialize(content); - _localizationsManifest = manifest ?? new(); + IndexResources(); SystemCulture = MatchCultureAgainstAvailable(currentLocale) ?? new CultureInfo(DefaultLocale); #if DEBUG _logger.LogDebug("Found system culture {SystemCulture} for current culture {CurrentCulture}", SystemCulture.Name, currentLocale.Name); #endif - var selectedLocale = settings.GetSettings().SelectedLanguage; + var selectedLocale = _settings.GetSettings().SelectedLanguage; if (string.IsNullOrEmpty(selectedLocale)) { _logger.LogInformation("No locale saved in settings, using system culture"); @@ -58,21 +58,17 @@ public async Task Initialize(ILogger logger, SettingsServic await LoadCulture(new CultureInfo(selectedLocale)); } } - catch (FileNotFoundException) - { - _logger?.LogCritical("Can't find localization manifest file {PathToManifest}", PathToManifest); - } catch (Exception ex) { - _logger?.LogError(ex, "Failed to initialize localization: {Exception}", ex); + _logger.LogError(ex, "Failed to initialize localization: {Exception}", ex); } } private async Task LoadCulture(CultureInfo culture) { - if (!_localizationsManifest.ContainsKey(culture.Name)) + if (!_resourcesByCulture.ContainsKey(culture.Name)) { - _logger?.LogWarning("Culture {Culture} is not available, falling back to default", culture.Name); + _logger.LogWarning("Culture {Culture} is not available, falling back to default", culture.Name); culture = new CultureInfo(DefaultLocale); } @@ -89,7 +85,7 @@ private async Task LoadCulture(CultureInfo culture) } public List EnumarateAllLoadedLanguages() - => _localizationsManifest.Keys.ToList(); + => _resourcesByCulture.Keys.ToList(); public string GetString(string key) { @@ -132,31 +128,44 @@ private async Task AddLanguage(FluentBundle bundle, CultureInfo culture) if (!culture.Parent.Equals(CultureInfo.InvariantCulture)) await AddLanguage(bundle, culture.Parent); - if (!_localizationsManifest.ContainsKey(culture.Name)) + if (!_resourcesByCulture.TryGetValue(culture.Name, out var resources)) return; - var path = $"Locale/{culture.Name}"; // Path to folder with FTL FILES. - var countFiles = 0; - try + + foreach (var resource in resources) { - foreach (var file in _localizationsManifest[culture.Name]) + try { - using var stream = await FileSystem.OpenAppPackageFileAsync(Path.Combine(path, file)); + using var stream = _assembly.GetManifestResourceStream(resource); + + if (stream == null) + continue; + using var reader = new StreamReader(stream, Encoding.UTF8); - var resources = LinguiniParser.FromTextReader(reader, file).Parse(); - foreach (var error in resources.Errors) + + var parsed = LinguiniParser + .FromTextReader(reader, resource) + .Parse(); + + foreach (var error in parsed.Errors) { - _logger?.LogError("Failed to parse localization file {File} for culture {Culture}: {Error}", file, culture.Name, error.Message); + _logger?.LogError( + "Failed to parse {File}: {Error}", + resource, + error.Message); } - bundle.AddResourceOverriding(resources); + + bundle.AddResourceOverriding(parsed); + countFiles++; } - } - catch (Exception ex) - { - _logger?.LogError(ex, "Failed to load localization for culture {Culture} from path {Path}", culture.Name, path); - return; + catch (Exception ex) + { + _logger?.LogError(ex, + "Failed to load resource {Resource}", + resource); + } } _logger?.LogInformation("Loaded {Count} localization files for culture {Culture}", countFiles, culture.Name); @@ -166,11 +175,11 @@ public void SwitchLanguage(string cultureName) { try { - if (!_localizationsManifest.ContainsKey(cultureName)) + if (!_resourcesByCulture.ContainsKey(cultureName)) throw new ArgumentException($"Culture {cultureName} is not available"); var culture = new CultureInfo(cultureName); SwitchLanguage(culture); - _state?.CallUpdate(); + Changed?.Invoke(); } catch (Exception ex) { @@ -185,7 +194,7 @@ public void SwitchLanguage(CultureInfo? culture) private CultureInfo? MatchCultureAgainstAvailable(CultureInfo culture) { foreach (var parent in EnumerateParents(culture)) - if (_localizationsManifest.ContainsKey(parent.Name)) + if (_resourcesByCulture.ContainsKey(parent.Name)) return parent; return null; } @@ -198,4 +207,27 @@ private static IEnumerable EnumerateParents(CultureInfo culture) culture = culture.Parent; } } + + private void IndexResources() + { + _resourcesByCulture.Clear(); + + foreach (var resource in _assembly.GetManifestResourceNames()) + { + var separator = resource.IndexOfAny(['\\', '/']); + + if (separator == -1) + continue; + + var culture = resource[..separator]; + + if (!_resourcesByCulture.TryGetValue(culture, out var list)) + { + list = []; + _resourcesByCulture[culture] = list; + } + + list.Add(resource); + } + } } diff --git a/Starlight.Launcher/Services/ServerStatus/HubServerFetcher.cs b/Starlight.Launcher/Services/ServerStatus/HubServerFetcher.cs index 31823ef..b315fa8 100644 --- a/Starlight.Launcher/Services/ServerStatus/HubServerFetcher.cs +++ b/Starlight.Launcher/Services/ServerStatus/HubServerFetcher.cs @@ -3,6 +3,7 @@ using Robust.Launcher.Api.Utility; using Serilog; using Starlight.Launcher.Services.Settings; +using Starlight.Launcher.WebUI.Models.HubServerFetcher; using System.Collections.Concurrent; using System.Diagnostics; @@ -73,7 +74,7 @@ public void RequestInitialUpdate() } finally { - _lock.Release(); + _ = _lock.Release(); } } @@ -141,7 +142,7 @@ private async Task RefreshServerList(CancellationToken cancel) foreach (var (task, _) in requests) { - try { await task.ConfigureAwait(false); } + try { _ = await task.ConfigureAwait(false); } catch { } } @@ -164,8 +165,11 @@ private async Task RefreshServerList(CancellationToken cancel) foreach (var entry in hubEntries) { + if (entry.Address == null) + continue; + var maybeNewEntry = new HubServerListEntry(entry.Address, hub.AbsoluteUri, entry.StatusData); - if (entry.Address != null && !entries.TryAdd(entry.Address, maybeNewEntry)) + if (!entries.TryAdd(entry.Address, maybeNewEntry)) { Log.Verbose("Skipping {Entry} from {ThisHub}: already from {PreviousHub}", entry.Address, hub.AbsoluteUri, entries[entry.Address].HubAddress); @@ -244,13 +248,13 @@ await _cache.UpdateInfoForCore( } finally { - throttle.Release(); + _ = throttle.Release(); } }).ConfigureAwait(false); } catch (HubApiException ex) when (ex.IsRateLimited) { - SetHubBackoff(hubAddress, ex.RetryAfter); + _ = SetHubBackoff(hubAddress, ex.RetryAfter); Log.Warning("GetServerInfo for {Address} hit 429 on {Hub}", statusData.Address, hubAddress); statusData.StatusInfo = ServerStatusInfoCode.Error; @@ -285,7 +289,7 @@ private bool IsHubBackedOff(string hubAddress, out TimeSpan remaining) remaining = until - DateTimeOffset.UtcNow; if (remaining > TimeSpan.Zero) return true; - _hubBackoffUntil.Remove(hubAddress); + _ = _hubBackoffUntil.Remove(hubAddress); } } remaining = TimeSpan.Zero; @@ -354,7 +358,7 @@ private void HandleHubFailure(Task task, Uri hub, CancellationToken cancel) { if (hubEx.IsRateLimited) { - SetHubBackoff(hub.AbsoluteUri, hubEx.RetryAfter); + _ = SetHubBackoff(hub.AbsoluteUri, hubEx.RetryAfter); Log.Warning("Hub {Hub} returned 429 (Retry-After: {RetryAfter})", hub, hubEx.RetryAfter); } @@ -367,7 +371,7 @@ private void HandleHubFailure(Task task, Uri hub, CancellationToken cancel) { Log.Warning(hubEx, "Hub {Hub} failed: status={Status}", hub, hubEx.StatusCode); if ((int?)hubEx.StatusCode >= 500) - SetHubBackoff(hub.AbsoluteUri); + _ = SetHubBackoff(hub.AbsoluteUri); } } else @@ -408,8 +412,8 @@ private void ResetHubFailures(string hubAddress) { lock (_backoffLock) { - _hubFailCount.Remove(hubAddress); - _hubBackoffUntil.Remove(hubAddress); + _ = _hubFailCount.Remove(hubAddress); + _ = _hubBackoffUntil.Remove(hubAddress); } } @@ -447,37 +451,3 @@ public void Dispose() #endregion } - -#region Models - -public enum RefreshListStatus -{ - /// - /// Hasn't started updating yet? - /// - NotUpdated, - - /// - /// Fetching master server list. - /// - UpdatingMaster, - - /// - /// Fetched information from ALL servers from the hub. - /// - Updated, - - /// - /// A connection error occured when fetching from at least one hub. - /// - PartialError, - - /// - /// An error occured. - /// - Error, -} - -public sealed record HubServerListEntry(string Address, string HubAddress, ServerApi.ServerStatus StatusData); - -#endregion diff --git a/Starlight.Launcher/Services/ServerStatus/ServerInfoLoader.cs b/Starlight.Launcher/Services/ServerStatus/ServerInfoLoader.cs index a7bd02b..2e82645 100644 --- a/Starlight.Launcher/Services/ServerStatus/ServerInfoLoader.cs +++ b/Starlight.Launcher/Services/ServerStatus/ServerInfoLoader.cs @@ -31,7 +31,7 @@ public void Request(ServerStatusData? data) return; if (!_queue.Writer.TryWrite(data)) - _inFlight.TryRemove(data.Address, out _); + _ = _inFlight.TryRemove(data.Address, out _); } private async Task PumpAsync(CancellationToken token) @@ -66,7 +66,7 @@ private async Task ProcessAsync(ServerStatusData data) public void Dispose() { _cts.Cancel(); - _queue.Writer.TryComplete(); + _ = _queue.Writer.TryComplete(); try { _cts.Dispose(); } catch { } try { _gate.Dispose(); } catch { } } diff --git a/Starlight.Launcher/Services/Settings/LauncherUpdater.cs b/Starlight.Launcher/Services/Settings/LauncherUpdater.cs new file mode 100644 index 0000000..d4869eb --- /dev/null +++ b/Starlight.Launcher/Services/Settings/LauncherUpdater.cs @@ -0,0 +1,351 @@ +using System.Diagnostics; +using System.Formats.Tar; +using System.IO.Compression; +using System.Reflection; +using System.Runtime.InteropServices; +using System.Text.Json; +using Starlight.Launcher.Services.Settings; +using Starlight.Launcher.WebUI.Models.LauncherUpdater; + +namespace Starlight.Launcher.Services; + +public partial class LauncherUpdater +{ + private readonly SettingsService _settings; + + public LauncherUpdater(SettingsService settings) => _settings = settings; + + public static string GetVersion() + { + var assembly = Assembly.GetExecutingAssembly(); + var infoVersion = assembly + .GetCustomAttribute() + ?.InformationalVersion; + + var version = infoVersion ?? assembly.GetName().Version?.ToString() ?? ""; + return version.Split('+')[0]; + } + + public event Action<(long downloaded, long total)>? DownloadProgress; + + public async Task IsUpdateAvailable() + { + var currentVersion = NormalizeVersion(GetVersion()); + var current = ParseVersion(currentVersion); + + var releases = await GetReleases(); + + var (Release, Parsed) = releases + .Select(r => (Release: r, Parsed: ParseVersion(NormalizeVersion(r.TagName)))) + .Where(r => r.Parsed is not null) + .OrderByDescending(r => r.Parsed) + .FirstOrDefault(); + + if (Release is null) + return new UpdateInfo(false, currentVersion, string.Empty, string.Empty, string.Empty, null); + + var latestVersion = NormalizeVersion(Release.TagName); + var isNewer = current is null || Parsed! > current; + + var asset = isNewer ? PickAssetForCurrentOs(Release.Assets) : null; + + return new UpdateInfo( + isNewer, + currentVersion, + latestVersion, + Release.HtmlUrl, + Release.Body ?? string.Empty, + asset); + } + + public bool ShouldShowChangelog() + { + var current = NormalizeVersion(GetVersion()); + if (string.IsNullOrEmpty(current)) + return false; + + var lastSeen = NormalizeVersion(_settings.GetSettings().LastSeenChangelogVersion); + return !string.Equals(current, lastSeen, StringComparison.OrdinalIgnoreCase); + } + + public void MarkChangelogSeen() + { + var settings = _settings.GetSettings(); + settings.LastSeenChangelogVersion = NormalizeVersion(GetVersion()); + _settings.WriteSettings(settings); + } + + public async Task> GetChangelogsToShow() + { + var lastSeen = ParseVersion(NormalizeVersion(_settings.GetSettings().LastSeenChangelogVersion)); + var current = ParseVersion(NormalizeVersion(GetVersion())); + + var releases = await GetReleases(); + + return releases + .Select(r => (r.TagName, r.Body, Parsed: ParseVersion(NormalizeVersion(r.TagName)))) + .Where(r => r.Parsed is not null) + .Where(r => lastSeen is null || r.Parsed! > lastSeen) + .Where(r => current is null || r.Parsed! <= current) + .OrderByDescending(r => r.Parsed) + .Select(r => new ChangelogEntry(NormalizeVersion(r.TagName), r.Body)) + .ToList(); + } + + private sealed record GhReleaseInfo(string TagName, string HtmlUrl, string? Body, IReadOnlyList Assets); + + private async Task> GetReleases() + { + using var httpClient = new HttpClient(); + httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("Starlight.Launcher"); + + try + { + using var response = await httpClient.GetAsync( + "https://api.github.com/repos/ss14Starlight/Starlight.Launcher/releases?per_page=50", + HttpCompletionOption.ResponseHeadersRead); + _ = response.EnsureSuccessStatusCode(); + + var json = await response.Content.ReadAsStringAsync(); + using var document = JsonDocument.Parse(json); + + var result = new List(); + foreach (var el in document.RootElement.EnumerateArray()) + { + var tag = el.TryGetProperty("tag_name", out var t) ? t.GetString() : null; + if (string.IsNullOrWhiteSpace(tag)) + continue; + + var htmlUrl = el.TryGetProperty("html_url", out var h) ? h.GetString() : null; + var body = el.TryGetProperty("body", out var b) ? b.GetString() : null; + + var assets = new List(); + if (el.TryGetProperty("assets", out var assetsEl) && assetsEl.ValueKind == JsonValueKind.Array) + { + foreach (var a in assetsEl.EnumerateArray()) + { + var name = a.TryGetProperty("name", out var n) ? n.GetString() : null; + var url = a.TryGetProperty("browser_download_url", out var u) ? u.GetString() : null; + long size = a.TryGetProperty("size", out var s) && s.TryGetInt64(out var sv) ? sv : 0; + + if (!string.IsNullOrWhiteSpace(name) && !string.IsNullOrWhiteSpace(url)) + assets.Add(new ReleaseAsset(name, url, size)); + } + } + + result.Add(new GhReleaseInfo(tag!, htmlUrl ?? "", body, assets)); + } + + return result; + } + catch + { + return Array.Empty(); + } + } + + private static string NormalizeVersion(string? version) + => version?.Trim().TrimStart('v', 'V') ?? string.Empty; + + private static Version? ParseVersion(string? raw) + { + if (string.IsNullOrWhiteSpace(raw)) + return null; + + var core = raw.Split('-')[0].Split('+')[0]; + return Version.TryParse(core, out var v) ? v : null; + } + + private static ReleaseAsset? PickAssetForCurrentOs(IReadOnlyList assets) + { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + return assets.FirstOrDefault(a => + a.Name.EndsWith(".exe", StringComparison.OrdinalIgnoreCase) && + a.Name.Contains("setup", StringComparison.OrdinalIgnoreCase)); + } + + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + return assets.FirstOrDefault(a => + a.Name.Contains("linux-x64", StringComparison.OrdinalIgnoreCase) && + a.Name.EndsWith(".AppImage", StringComparison.OrdinalIgnoreCase)); + } + + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + var rid = RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? "osx-arm64" : "osx-x64"; + return assets.FirstOrDefault(a => + a.Name.Contains(rid, StringComparison.OrdinalIgnoreCase) && + a.Name.EndsWith(".zip", StringComparison.OrdinalIgnoreCase)); + } + + return null; + } + + /// + /// Downloads the asset to the launcher data folder and returns the local path. + /// + public async Task DownloadAsset(ReleaseAsset asset, CancellationToken ct = default) + { + var dir = GetUpdateFolder(); + _ = Directory.CreateDirectory(dir); + var path = Path.Combine(dir, asset.Name); + + using var httpClient = new HttpClient(); + httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("Starlight.Launcher"); + + using var response = await httpClient.GetAsync( + asset.DownloadUrl, HttpCompletionOption.ResponseHeadersRead, ct); + _ = response.EnsureSuccessStatusCode(); + + var total = response.Content.Headers.ContentLength ?? (asset.Size > 0 ? asset.Size : 0); + + await using var src = await response.Content.ReadAsStreamAsync(ct); + await using var dst = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None); + + var buffer = new byte[81920]; + long downloaded = 0; + int read; + DownloadProgress?.Invoke((0, total)); + + while ((read = await src.ReadAsync(buffer, ct)) > 0) + { + await dst.WriteAsync(buffer.AsMemory(0, read), ct); + downloaded += read; + DownloadProgress?.Invoke((downloaded, total)); + } + + return path; + } + + private string GetUpdateFolder() => Path.Combine(_settings.GetSettings().DirLauncherData, "updates"); + + // Removes previously downloaded installers. Call on launcher startup: + // at that point any installer from a past update is already unlocked. + public void CleanupOldInstallers() + { + try + { + var dir = GetUpdateFolder(); + if (!Directory.Exists(dir)) + return; + + foreach (var file in Directory.EnumerateFiles(dir)) + { + try + { + File.Delete(file); + } + catch (IOException) + { + } + catch (UnauthorizedAccessException) + { + } + } + } + catch (Exception ex) + { + Console.WriteLine($"Installer cleanup failed: {ex.Message}"); + } + } + + /// + /// Starts the update and asks the app to exit so files aren't locked during install. + /// + public static void RunInstallerAndExit(string downloadedPath, string installDir) + { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + _ = Process.Start(new ProcessStartInfo + { + FileName = downloadedPath, + UseShellExecute = true + }); + Environment.Exit(0); + return; + } + + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + { + RunLinuxUpdate(downloadedPath, installDir); + return; + } + + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + RunMacUpdate(downloadedPath, installDir); + return; + } + + Environment.Exit(0); + } + + public static string GetMacAppBundleRoot(string baseDirectory) => + Path.GetFullPath(Path.Combine(baseDirectory, "..", "..")); + + private static void RunLinuxUpdate(string archivePath, string installDir) + { + var stagingDir = Path.Combine(Path.GetTempPath(), "starlight-update-" + Guid.NewGuid()); + _ = Directory.CreateDirectory(stagingDir); + + using (var fileStream = File.OpenRead(archivePath)) + using (var gzip = new GZipStream(fileStream, CompressionMode.Decompress)) + TarFile.ExtractToDirectory(gzip, stagingDir, overwriteFiles: true); + + var pid = Environment.ProcessId; + var exePath = Environment.ProcessPath!; + + var script = $""" + #!/bin/sh + while kill -0 {pid} 2>/dev/null; do sleep 0.2; done + rm -rf "{installDir}" + mv "{stagingDir}" "{installDir}" + chmod +x "{installDir}/Starlight.Launcher" + exec "{exePath}" + """; + + RunDetachedShellScript(script); + Environment.Exit(0); + } + + private static void RunMacUpdate(string zipPath, string appBundlePath) + { + var stagingDir = Path.Combine(Path.GetTempPath(), "starlight-update-" + Guid.NewGuid()); + ZipFile.ExtractToDirectory(zipPath, stagingDir, overwriteFiles: true); + + var newAppPath = Path.Combine(stagingDir, "Starlight Launcher.app"); + var pid = Environment.ProcessId; + + var script = $""" + #!/bin/sh + while kill -0 {pid} 2>/dev/null; do sleep 0.2; done + rm -rf "{appBundlePath}" + mv "{newAppPath}" "{appBundlePath}" + xattr -cr "{appBundlePath}" 2>/dev/null + open "{appBundlePath}" + """; + + RunDetachedShellScript(script); + Environment.Exit(0); + } + + private static void RunDetachedShellScript(string script) + { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + return; + + var scriptPath = Path.Combine(Path.GetTempPath(), $"starlight-update-{Guid.NewGuid()}.sh"); + File.WriteAllText(scriptPath, script); + File.SetUnixFileMode(scriptPath, + UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute); + + _ = Process.Start(new ProcessStartInfo + { + FileName = "/bin/sh", + ArgumentList = { scriptPath }, + UseShellExecute = false, + }); + } +} diff --git a/Starlight.Launcher/Services/Settings/SettingsService.Encrypting.cs b/Starlight.Launcher/Services/Settings/SettingsService.Encrypting.cs index 91c79bf..de6771a 100644 --- a/Starlight.Launcher/Services/Settings/SettingsService.Encrypting.cs +++ b/Starlight.Launcher/Services/Settings/SettingsService.Encrypting.cs @@ -18,7 +18,7 @@ private async Task GetLoginKeyAsync() { return _loginKey ??= await _keyProvider.GetOrCreateKeyAsync(_loginKeyPath); } - finally { _keyLock.Release(); } + finally { _ = _keyLock.Release(); } } private static readonly byte[] _magic = "SLE1"u8.ToArray(); // Starlight Logins Encrypted v1 @@ -58,6 +58,7 @@ private async Task DecryptAsync(byte[] data) using var aes = new AesGcm(key, TagSize); aes.Decrypt(nonce, cipher, tag, plaintext); + return plaintext; } } diff --git a/Starlight.Launcher/Services/Settings/SettingsService.EngineInstallations.cs b/Starlight.Launcher/Services/Settings/SettingsService.EngineInstallations.cs index 517b78d..b4df9b2 100644 --- a/Starlight.Launcher/Services/Settings/SettingsService.EngineInstallations.cs +++ b/Starlight.Launcher/Services/Settings/SettingsService.EngineInstallations.cs @@ -13,7 +13,7 @@ public Dictionary GetEngines() } finally { - _enginesLock.Release(); + _ = _enginesLock.Release(); } } @@ -26,7 +26,7 @@ public void AddInstalledEngine(InstalledEngineVersion version) } finally { - _enginesLock.Release(); + _ = _enginesLock.Release(); } EnginesChanged?.Invoke(); @@ -39,11 +39,11 @@ public void RemoveInstalledEngine(string version) _enginesLock.Wait(); try { - _engineInstallations.Remove(version); + _ = _engineInstallations.Remove(version); } finally { - _enginesLock.Release(); + _ = _enginesLock.Release(); } EnginesChanged?.Invoke(); @@ -60,7 +60,7 @@ public void WriteEngines(Dictionary engines) } finally { - _enginesLock.Release(); + _ = _enginesLock.Release(); } EnginesChanged?.Invoke(); @@ -77,7 +77,7 @@ public async Task> GetEnginesAsync() } finally { - _enginesLock.Release(); + _ = _enginesLock.Release(); } } @@ -90,7 +90,7 @@ public async Task WriteEnginesAsync(Dictionary e } finally { - _enginesLock.Release(); + _ = _enginesLock.Release(); } EnginesChanged?.Invoke(); diff --git a/Starlight.Launcher/Services/Settings/SettingsService.EngineModules.cs b/Starlight.Launcher/Services/Settings/SettingsService.EngineModules.cs index 1d0b92d..73b9892 100644 --- a/Starlight.Launcher/Services/Settings/SettingsService.EngineModules.cs +++ b/Starlight.Launcher/Services/Settings/SettingsService.EngineModules.cs @@ -13,7 +13,7 @@ sealed partial class SettingsService } finally { - _modulesLock.Release(); + _ = _modulesLock.Release(); } } @@ -22,11 +22,11 @@ public void AddInstalledModule(InstalledEngineModule module) _modulesLock.Wait(); try { - _engineModules.Add((module.Version, module.Name)); + _ = _engineModules.Add((module.Version, module.Name)); } finally { - _modulesLock.Release(); + _ = _modulesLock.Release(); } ModulesChanged?.Invoke(); @@ -39,11 +39,11 @@ public void RemoveInstalledModule((string, string) module) _modulesLock.Wait(); try { - _engineModules.Remove(module); + _ = _engineModules.Remove(module); } finally { - _modulesLock.Release(); + _ = _modulesLock.Release(); } EnginesChanged?.Invoke(); @@ -60,7 +60,7 @@ public void WriteModules(HashSet<(string, string)> modules) } finally { - _modulesLock.Release(); + _ = _modulesLock.Release(); } ModulesChanged?.Invoke(); @@ -77,7 +77,7 @@ public void WriteModules(HashSet<(string, string)> modules) } finally { - _modulesLock.Release(); + _ = _modulesLock.Release(); } } @@ -90,7 +90,7 @@ public async Task WriteModulesAsync(HashSet<(string, string)> modules) } finally { - _modulesLock.Release(); + _ = _modulesLock.Release(); } ModulesChanged?.Invoke(); diff --git a/Starlight.Launcher/Services/Settings/SettingsService.Favorites.cs b/Starlight.Launcher/Services/Settings/SettingsService.Favorites.cs index 860e8ec..1fb9ea1 100644 --- a/Starlight.Launcher/Services/Settings/SettingsService.Favorites.cs +++ b/Starlight.Launcher/Services/Settings/SettingsService.Favorites.cs @@ -1,4 +1,4 @@ -using Starlight.Launcher.Models.Data; +using Starlight.Launcher.WebUI.Models.Data; namespace Starlight.Launcher.Services.Settings; @@ -13,7 +13,7 @@ public List GetFavorites() } finally { - _favoritesLock.Release(); + _ = _favoritesLock.Release(); } } @@ -27,7 +27,7 @@ public void WriteFavorites(List favorites) } finally { - _favoritesLock.Release(); + _ = _favoritesLock.Release(); } FavoritesChanged?.Invoke(); @@ -44,7 +44,7 @@ public async Task> GetFavoritesAsync() } finally { - _favoritesLock.Release(); + _ = _favoritesLock.Release(); } } @@ -58,7 +58,7 @@ public async Task WriteFavoritesAsync(List favorites) } finally { - _favoritesLock.Release(); + _ = _favoritesLock.Release(); } FavoritesChanged?.Invoke(); diff --git a/Starlight.Launcher/Services/Settings/SettingsService.Logins.cs b/Starlight.Launcher/Services/Settings/SettingsService.Logins.cs index f5accb2..67f3dd4 100644 --- a/Starlight.Launcher/Services/Settings/SettingsService.Logins.cs +++ b/Starlight.Launcher/Services/Settings/SettingsService.Logins.cs @@ -9,15 +9,27 @@ namespace Starlight.Launcher.Services.Settings; public sealed partial class SettingsService { private volatile bool _loginsLoaded; + private readonly TaskCompletionSource _loginsLoadedTcs = new(TaskCreationOptions.RunContinuationsAsynchronously); public event Action? LoginsUnrecoverable; + public Task WaitForLoginsLoadedAsync() => _loginsLoadedTcs.Task; + public async Task InitializeLoginsAsync() { var loaded = await LoadLoginsAsync(); await _loginsLock.WaitAsync(); - try { _logins = loaded; } - finally { _loginsLock.Release(); } + try + { + foreach (var (id, info) in loaded) + if (!_logins.ContainsKey(id)) + _logins[id] = info; + } + finally { _ = _loginsLock.Release(); } _loginsLoaded = true; + _ = _loginsLoadedTcs.TrySetResult(); + + ScheduleSaveInternal(ref _loginsSaveCts, SaveLoginsEncryptedAsync, "logins"); + LoginsChanged?.Invoke(); } public Dictionary GetLogins() @@ -29,7 +41,7 @@ public Dictionary GetLogins() } finally { - _loginsLock.Release(); + _ = _loginsLock.Release(); } } @@ -49,7 +61,7 @@ public void UpdateLogin(LoginInfo login) } finally { - _loginsLock.Release(); + _ = _loginsLock.Release(); } LoginsChanged?.Invoke(); @@ -66,7 +78,7 @@ public void WriteLogins(Dictionary logins) } finally { - _loginsLock.Release(); + _ = _loginsLock.Release(); } LoginsChanged?.Invoke(); @@ -83,7 +95,7 @@ public async Task> GetLoginsAsync() } finally { - _loginsLock.Release(); + _ = _loginsLock.Release(); } } @@ -96,7 +108,7 @@ public async Task WriteLoginsAsync(Dictionary logins) } finally { - _loginsLock.Release(); + _ = _loginsLock.Release(); } LoginsChanged?.Invoke(); @@ -106,7 +118,7 @@ public async Task WriteLoginsAsync(Dictionary logins) private static async Task WriteBytesSafeAsync(byte[] content, string dir, string filePath) { - Directory.CreateDirectory(dir); + _ = Directory.CreateDirectory(dir); var tempFile = filePath + ".tmp"; await File.WriteAllBytesAsync(tempFile, content); File.Move(tempFile, filePath, true); @@ -120,17 +132,24 @@ private async Task SaveLoginsEncryptedAsync() return; } - await _loginsLock.WaitAsync(); try { await WriteLoginsCoreAsync(); } catch (Exception ex) { _logger.LogError(ex, "Failed to save encrypted logins"); } - finally { _loginsLock.Release(); } } private async Task WriteLoginsCoreAsync() { - var json = JsonSerializer.Serialize(_logins.Values, _jsonOptions); - var encrypted = await EncryptAsync(Encoding.UTF8.GetBytes(json)); - await WriteBytesSafeAsync(encrypted, Path.GetDirectoryName(_loginsPath)!, _loginsPath); + await _loginsLock.WaitAsync(); + try + { + var json = JsonSerializer.Serialize(_logins.Values, _jsonOptions); + var encrypted = await EncryptAsync(Encoding.UTF8.GetBytes(json)); + _logger.LogInformation("Successfully encrypted {Number} logins!", _logins.Count); + await WriteBytesSafeAsync(encrypted, Path.GetDirectoryName(_loginsPath)!, _loginsPath); + } + finally + { + _ = _loginsLock.Release(); + } } private async Task> LoadLoginsAsync() @@ -146,6 +165,9 @@ private async Task> LoadLoginsAsync() { var json = Encoding.UTF8.GetString(await DecryptAsync(raw)); var list = JsonSerializer.Deserialize>(json) ?? new(); + + _logger.LogInformation("Successfully loaded {Number} logins from file {File}!", list.Count, _loginsPath); + return list.ToDictionary(x => x.UserId); } catch (CryptographicException ex) @@ -162,10 +184,15 @@ private async Task> LoadLoginsAsync() { var json = Encoding.UTF8.GetString(raw); var list = JsonSerializer.Deserialize>(json) ?? new(); - _logins = list.ToDictionary(x => x.UserId); await _loginsLock.WaitAsync(); - try { await WriteLoginsCoreAsync(); } - finally { _loginsLock.Release(); } + + try { _logins = list.ToDictionary(x => x.UserId); } + finally { _ = _loginsLock.Release(); } + + await WriteLoginsCoreAsync(); + + _logger.LogInformation("Successfuly loaded logins from file {File}!", _loginsPath); + return _logins; } catch (Exception ex) diff --git a/Starlight.Launcher/Services/Settings/SettingsService.PrivacyPolicy.cs b/Starlight.Launcher/Services/Settings/SettingsService.PrivacyPolicy.cs index d79fd30..cd9f5ad 100644 --- a/Starlight.Launcher/Services/Settings/SettingsService.PrivacyPolicy.cs +++ b/Starlight.Launcher/Services/Settings/SettingsService.PrivacyPolicy.cs @@ -1,4 +1,4 @@ -using Starlight.Launcher.Models.Data; +using Starlight.Launcher.WebUI.Models.Data; namespace Starlight.Launcher.Services.Settings; @@ -20,7 +20,7 @@ public bool HasAcceptedPrivacyPolicy(string identifier, out string? acceptedVers } finally { - _settingsLock.Release(); + _ = _settingsLock.Release(); } } @@ -36,7 +36,7 @@ public void AcceptPrivacyPolicy(string identifier, string version) } finally { - _settingsLock.Release(); + _ = _settingsLock.Release(); } ScheduleSaveInternal(ref _settingsSaveCts, () => SaveJsonAsync(_filePath, _settingsLock, _settings), "settings"); @@ -52,7 +52,7 @@ public void UpdateConnectedToPrivacyPolicy(string identifier) } finally { - _settingsLock.Release(); + _ = _settingsLock.Release(); } ScheduleSaveInternal(ref _settingsSaveCts, () => SaveJsonAsync(_filePath, _settingsLock, _settings), "settings"); diff --git a/Starlight.Launcher/Services/Settings/SettingsService.Subscriptions.cs b/Starlight.Launcher/Services/Settings/SettingsService.Subscriptions.cs index 235c4da..5025908 100644 --- a/Starlight.Launcher/Services/Settings/SettingsService.Subscriptions.cs +++ b/Starlight.Launcher/Services/Settings/SettingsService.Subscriptions.cs @@ -1,4 +1,4 @@ -using Starlight.Launcher.Models.Settings; +using Starlight.Launcher.WebUI.Models.Settings; namespace Starlight.Launcher.Services.Settings; @@ -65,7 +65,7 @@ public void Dispose() var s = Interlocked.Exchange(ref _sub, null); if (s is null) return; lock (owner._settingsSubsLock) - owner._settingsSubs.Remove(s); + _ = owner._settingsSubs.Remove(s); } } } diff --git a/Starlight.Launcher/Services/Settings/SettingsService.cs b/Starlight.Launcher/Services/Settings/SettingsService.cs index 5524e62..955058f 100644 --- a/Starlight.Launcher/Services/Settings/SettingsService.cs +++ b/Starlight.Launcher/Services/Settings/SettingsService.cs @@ -1,9 +1,10 @@ +using System.Collections.Concurrent; +using System.Text.Json; using Microsoft.Extensions.Logging; using Robust.Launcher.Api.Models.Data; -using Starlight.Launcher.Models.Data; -using Starlight.Launcher.Models.ServerStatus; -using Starlight.Launcher.Models.Settings; -using System.Text.Json; +using Starlight.Launcher.WebUI.Models.Data; +using Starlight.Launcher.WebUI.Models.ServerStatus; +using Starlight.Launcher.WebUI.Models.Settings; namespace Starlight.Launcher.Services.Settings; @@ -56,6 +57,8 @@ public sealed partial class SettingsService : IAsyncDisposable WriteIndented = true }; + private readonly ConcurrentDictionary _pendingSaves = new(); + #endregion public SettingsService(ILogger logger, ILoginKeyProvider keyProvider) @@ -69,7 +72,6 @@ public SettingsService(ILogger logger, ILoginKeyProvider keyPro _favoritesPath = Path.Combine(_settings.DirLauncherData, "favorites.json"); _enginesPath = Path.Combine(_settings.DirLauncherData, "engines.json"); _modulesPath = Path.Combine(_settings.DirLauncherData, "modules.json"); - Task.Run(() => InitializeLoginsAsync()); _favorites = LoadJson(_favoritesPath, new List()); _engineInstallations = LoadJson(_enginesPath, new List()).ToDictionary(x => x.Version); _engineModules = LoadJson(_modulesPath, new HashSet<(string Version, string Name)>()); @@ -90,7 +92,7 @@ private void ScheduleSaveInternal( var delay = _settings.SaveIntervalMs; - _ = Task.Run(async () => + var task = Task.Run(async () => { try { @@ -103,6 +105,8 @@ private void ScheduleSaveInternal( _logger.LogError(ex, "Auto-save failed for {what}", what); } }); + + _pendingSaves[what] = task; } private async Task SaveJsonAsync(string path, SemaphoreSlim slim, T obj) @@ -141,7 +145,7 @@ public async Task SaveAllAsync() private static async Task WriteFileSafeAsync(string content, string dir, string filePath) { - Directory.CreateDirectory(dir); + _ = Directory.CreateDirectory(dir); var tempFile = filePath + ".tmp"; await File.WriteAllTextAsync(tempFile, content); @@ -164,7 +168,7 @@ public AppSettings GetSettings() } finally { - _settingsLock.Release(); + _ = _settingsLock.Release(); } } @@ -184,7 +188,7 @@ public void WriteSettings(AppSettings settings) } finally { - _settingsLock.Release(); + _ = _settingsLock.Release(); } NotifySettingsChanged(old, settings); @@ -207,7 +211,7 @@ public async Task GetSettingsAsync() } finally { - _settingsLock.Release(); + _ = _settingsLock.Release(); } } @@ -225,7 +229,7 @@ public async Task WriteSettingsAsync(AppSettings settings) } finally { - _settingsLock.Release(); + _ = _settingsLock.Release(); } NotifySettingsChanged(old, settings); @@ -252,6 +256,14 @@ public async ValueTask DisposeAsync() GC.SuppressFinalize(this); } + public async Task FlushPendingSavesAsync() + { + await SaveAllAsync(); + var pending = _pendingSaves.Values.ToArray(); + try { await Task.WhenAll(pending); } + catch { } + } + public async Task CacheFilters(ServerListFilters filters) { AppSettings old, updated; @@ -262,7 +274,7 @@ public async Task CacheFilters(ServerListFilters filters) updated = _settings with { CachedFilters = filters }; _settings = updated; } - finally { _settingsLock.Release(); } + finally { _ = _settingsLock.Release(); } NotifySettingsChanged(old, updated); ScheduleSaveInternal(ref _settingsSaveCts, () => SaveJsonAsync(_filePath, _settingsLock, _settings), "settings"); diff --git a/Starlight.Launcher/Services/State/AppState.cs b/Starlight.Launcher/Services/State/AppState.cs deleted file mode 100644 index 4601088..0000000 --- a/Starlight.Launcher/Services/State/AppState.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Starlight.Launcher.Services.State; - -public class AppState -{ - - public event Action? OnChange; - public event Action? Paused; - public event Action? Resumed; - - public void CallUpdate() => OnChange?.Invoke(); - public void NotifyPaused() => Paused?.Invoke(); - public void NotifyResumed() => Resumed?.Invoke(); -} diff --git a/Starlight.Launcher/Services/Tray.cs b/Starlight.Launcher/Services/Tray.cs deleted file mode 100644 index adb0cf2..0000000 --- a/Starlight.Launcher/Services/Tray.cs +++ /dev/null @@ -1,35 +0,0 @@ -using Starlight.Launcher.Models; -using Starlight.Launcher.Services.Settings; - -namespace Starlight.Launcher.Services; - -public interface INativeTray : IDisposable -{ - void Initialize(TrayOptions options, IReadOnlyList menu); - void ShowWindow(); - void HideWindow(); - void UpdateTooltip(string text); - bool IsWindowVisible { get; } - event EventHandler? IconActivated; -} - -public sealed class TrayCoordinator -{ - private readonly INativeTray _tray; - - public TrayCoordinator(INativeTray tray) => _tray = tray; - - public void Initialize() - { - var menu = new List - { - new("Open", () => _tray.ShowWindow()), - TrayMenuItem.Separator, - new("Quit", QuitApp), - }; - _tray.Initialize(new TrayOptions("STARLIGHT.LAUNCHER", "Resources/AppIcon/icon.ico"), menu); - _tray.IconActivated += (_, _) => _tray.ShowWindow(); - } - - private void QuitApp() => Application.Current?.Quit(); -} diff --git a/Starlight.Launcher/Services/Tray/AvaloniaTray.cs b/Starlight.Launcher/Services/Tray/AvaloniaTray.cs new file mode 100644 index 0000000..cc929a1 --- /dev/null +++ b/Starlight.Launcher/Services/Tray/AvaloniaTray.cs @@ -0,0 +1,86 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Platform; +using Starlight.Launcher.Models.Tray; +using Starlight.Launcher.Models.Tray; +using Starlight.Launcher.WebUI.Services; + +namespace Starlight.Launcher.Services; + +public sealed class AvaloniaTray : INativeTray +{ + private TrayIcon? _trayIcon; + + public event EventHandler? IconActivated; + + public bool IsWindowVisible => GetWindow()?.IsVisible == true; + + public void Initialize(TrayOptions options, IReadOnlyList menu) + { + var nativeMenu = new NativeMenu(); + foreach (var item in menu) + { + if (item.IsSeparator) + { + nativeMenu.Items.Add(new NativeMenuItemSeparator()); + continue; + } + + var nativeItem = new NativeMenuItem(item.Text); + nativeItem.Click += (_, _) => item.Invoke?.Invoke(); + nativeMenu.Items.Add(nativeItem); + } + + _trayIcon = new TrayIcon + { + ToolTipText = options.Tooltip, + Icon = LoadIcon(options.IconPath), + Menu = nativeMenu, + }; + _trayIcon.Clicked += (_, _) => IconActivated?.Invoke(this, EventArgs.Empty); + + var icons = TrayIcon.GetIcons(Application.Current!) ?? new TrayIcons(); + icons.Add(_trayIcon); + TrayIcon.SetIcons(Application.Current!, icons); + } + + public void ShowWindow() + { + var window = GetWindow(); + if (window is null) return; + + window.Show(); + window.WindowState = WindowState.Normal; + window.Activate(); + } + + public void HideWindow() => GetWindow()?.Hide(); + + public void UpdateTooltip(string text) => _trayIcon?.ToolTipText = text; + + public void Dispose() + { + if (_trayIcon is null) return; + + _ = TrayIcon.GetIcons(Application.Current!)?.Remove(_trayIcon); + _trayIcon.Dispose(); + _trayIcon = null; + } + + private static Window? GetWindow() => + (Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow; + + private static WindowIcon? LoadIcon(string iconPath) + { + try + { + using var stream = AssetLoader.Open(new Uri($"avares://Starlight.Launcher/{iconPath}")); + return new WindowIcon(stream); + } + catch + { + return null; + } + } +} diff --git a/Starlight.Launcher/Services/Tray/INativeTray.cs b/Starlight.Launcher/Services/Tray/INativeTray.cs new file mode 100644 index 0000000..d49fb41 --- /dev/null +++ b/Starlight.Launcher/Services/Tray/INativeTray.cs @@ -0,0 +1,13 @@ +using Starlight.Launcher.Models.Tray; + +namespace Starlight.Launcher.Services; + +public interface INativeTray : IDisposable +{ + void Initialize(TrayOptions options, IReadOnlyList menu); + void ShowWindow(); + void HideWindow(); + void UpdateTooltip(string text); + bool IsWindowVisible { get; } + event EventHandler? IconActivated; +} diff --git a/Starlight.Launcher/Services/Tray/Tray.cs b/Starlight.Launcher/Services/Tray/Tray.cs new file mode 100644 index 0000000..6cec12b --- /dev/null +++ b/Starlight.Launcher/Services/Tray/Tray.cs @@ -0,0 +1,44 @@ +using Avalonia; +using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Threading; +using Starlight.Launcher.Models.Tray; +using Starlight.Launcher.WebUI.Services; + +namespace Starlight.Launcher.Services; + +/// +/// Coordinates initialization and interaction with the system tray. +/// +public sealed class TrayCoordinator +{ + private readonly INativeTray _tray; + + /// + /// Initializes a new instance of the class. + /// + public TrayCoordinator(INativeTray tray) => _tray = tray; + + /// + /// Initializes the system tray icon and its menu. + /// + public void Initialize() + { + var menu = new List + { + new("Open", () => Dispatcher.UIThread.Post(_tray.ShowWindow)), + TrayMenuItem.Separator, + new("Quit", QuitApp), + }; + _tray.Initialize(new TrayOptions("STARLIGHT.LAUNCHER", "Resources/AppIcon/icon.ico"), menu); + _tray.IconActivated += (_, _) => Dispatcher.UIThread.Post(_tray.ShowWindow); + } + + /// + /// Shuts down the application. + /// + private static void QuitApp() + { + if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) + desktop.Shutdown(); + } +} diff --git a/Starlight.Launcher/Services/WebUI/AvaloniaFileDialogService.cs b/Starlight.Launcher/Services/WebUI/AvaloniaFileDialogService.cs new file mode 100644 index 0000000..d516cbd --- /dev/null +++ b/Starlight.Launcher/Services/WebUI/AvaloniaFileDialogService.cs @@ -0,0 +1,147 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Platform.Storage; +using Microsoft.Extensions.Logging; +using Starlight.Launcher.Models.Helpers; +using Starlight.Launcher.WebUI.Models.Helpers; +using Starlight.Launcher.WebUI.Services; + +namespace Starlight.Launcher.Services; + +/// +/// Provides file and folder picker dialogs using Avalonia's storage API. +/// +public sealed class AvaloniaFileDialogService : IFileDialogService +{ + private readonly ILogger _logger; + + /// + /// Initializes a new instance of the class. + /// + public AvaloniaFileDialogService(ILogger logger) => _logger = logger; + + /// + /// Displays a file picker dialog and returns the selected file. + /// + public async Task PickFileAsync( + string filter = "Content bundles / replays\0*.zip;*.rt\0All Files\0*.*\0\0", + CancellationToken cancel = default) + { + var topLevel = GetTopLevel(); + if (topLevel is null) + { + _logger.LogWarning("PickFileAsync: no TopLevel/MainWindow available"); + return null; + } + + cancel.ThrowIfCancellationRequested(); + + _logger.LogInformation( + "CanOpen={CanOpen}, CanPickFolder={CanPickFolder}", + topLevel.StorageProvider.CanOpen, + topLevel.StorageProvider.CanPickFolder); + + try + { + var pickerTask = topLevel.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions + { + Title = "Select file", + AllowMultiple = false, + FileTypeFilter = ParseWin32Filter(filter), + }); + + var timeoutTask = Task.Delay(TimeSpan.FromSeconds(30), cancel); + var completed = await Task.WhenAny(pickerTask, timeoutTask); + + if (completed == timeoutTask) + { + _logger.LogWarning("PickFileAsync: OpenFilePickerAsync did not return within 30s. "); + return null; + } + + var results = await pickerTask; + _logger.LogInformation("PickFileAsync: picker returned {Count} result(s)", results.Count); + + var path = results.FirstOrDefault()?.TryGetLocalPath(); + return path is null ? null : new FileResult(path); + } + catch (Exception ex) + { + _logger.LogError(ex, "PickFileAsync failed"); + return null; + } + } + + /// + /// Displays a folder picker dialog and returns the selected folder. + /// + public async Task PickFolderAsync(CancellationToken cancel = default) + { + var topLevel = GetTopLevel(); + if (topLevel is null) + { + _logger.LogWarning("PickFolderAsync: no TopLevel/MainWindow available"); + return null; + } + + _logger.LogInformation( + "CanOpen={CanOpen}, CanPickFolder={CanPickFolder}", + topLevel.StorageProvider.CanOpen, + topLevel.StorageProvider.CanPickFolder); + + cancel.ThrowIfCancellationRequested(); + + try + { + var pickerTask = topLevel.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions + { + Title = "Select a folder", + AllowMultiple = false, + }); + + var timeoutTask = Task.Delay(TimeSpan.FromSeconds(30), cancel); + var completed = await Task.WhenAny(pickerTask, timeoutTask); + + if (completed == timeoutTask) + { + _logger.LogWarning("PickFolderAsync: OpenFolderPickerAsync did not return within 30s"); + return null; + } + + var results = await pickerTask; + _logger.LogInformation("PickFolderAsync: picker returned {Count} result(s)", results.Count); + + var path = results.FirstOrDefault()?.TryGetLocalPath(); + return path is null ? null : new FileResult(path); + } + catch (Exception ex) + { + _logger.LogError(ex, "PickFolderAsync failed"); + return null; + } + } + + /// + /// Gets the application's main window. + /// + private static TopLevel? GetTopLevel() => + (Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow; + + /// + /// Converts a Win32-style file filter string into Avalonia file picker filters. + /// + private static FilePickerFileType[] ParseWin32Filter(string filter) + { + var parts = filter.Split('\0', StringSplitOptions.RemoveEmptyEntries); + var types = new List(); + + for (var i = 0; i + 1 < parts.Length; i += 2) + { + var patterns = parts[i + 1].Split(';', StringSplitOptions.RemoveEmptyEntries); + types.Add(new FilePickerFileType(parts[i]) { Patterns = patterns }); + } + + return types.ToArray(); + } +} diff --git a/Starlight.Launcher/Services/WebUI/EmbeddedBlazorHost.cs b/Starlight.Launcher/Services/WebUI/EmbeddedBlazorHost.cs new file mode 100644 index 0000000..434ad39 --- /dev/null +++ b/Starlight.Launcher/Services/WebUI/EmbeddedBlazorHost.cs @@ -0,0 +1,65 @@ +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; +using Robust.Launcher.Api.Api; +using Robust.Launcher.Api.Models.ServerStatus; +using Starlight.Launcher.Services.Auth; +using Starlight.Launcher.Services.Settings; +using Starlight.Launcher.WebUI; +using Starlight.Launcher.WebUI.Bridge; +using Starlight.Launcher.WebUI.Localization; +using Starlight.Launcher.WebUI.Services; + +namespace Starlight.Launcher.Services; + +/// +/// Hosts the embedded Blazor web application. +/// +public sealed class EmbeddedBlazorHost : IAsyncDisposable +{ + private WebApplication? _app; + + /// + /// Target url for embedded blazor host + /// + public Uri? Url { get; private set; } + + /// + /// Starts the embedded Blazor host. + /// + public async Task StartAsync(IServiceProvider nativeServices) + { + _app = WebHostFactory.Create( + configureServices: services => + { + // Only re-expose what your .razor components actually @inject - trim + _ = services.AddSingleton(nativeServices.GetRequiredService()); + _ = services.AddSingleton(nativeServices.GetRequiredService()); + _ = services.AddSingleton(nativeServices.GetRequiredService()); + _ = services.AddSingleton(nativeServices.GetRequiredService()); + _ = services.AddSingleton(nativeServices.GetRequiredService()); + _ = services.AddSingleton(nativeServices.GetRequiredService()); + _ = services.AddSingleton(nativeServices.GetRequiredService()); + _ = services.AddSingleton(nativeServices.GetRequiredService()); + _ = services.AddSingleton(nativeServices.GetRequiredService()); + _ = services.AddSingleton(nativeServices.GetRequiredService()); + _ = services.AddSingleton(nativeServices.GetRequiredService()); + _ = services.AddSingleton(nativeServices.GetRequiredService()); + _ = services.AddSingleton(nativeServices.GetRequiredService()); + _ = services.AddSingleton(nativeServices.GetRequiredService()); + _ = services.AddSingleton(nativeServices.GetRequiredService()); + _ = services.AddSingleton(nativeServices.GetRequiredService()); + }); + + await _app.StartAsync(); + Url = WebHostFactory.GetListenAddress(_app); + } + + /// + /// Stops the embedded Blazor host and releases its resources. + /// + public async ValueTask DisposeAsync() + { + if (_app is not null) + await _app.StopAsync(); + } +} diff --git a/Starlight.Launcher/Starlight.Launcher.csproj b/Starlight.Launcher/Starlight.Launcher.csproj index 0f875dc..f5a474f 100644 --- a/Starlight.Launcher/Starlight.Launcher.csproj +++ b/Starlight.Launcher/Starlight.Launcher.csproj @@ -1,87 +1,43 @@ - + + Exe + net11.0 + Starlight.Launcher + enable + enable + true + Resources\AppIcon\icon.ico + true + true - + + WinExe - + - net11.0-maccatalyst + FULL_RELEASE + DEVELOPMENT + $(BuildFlavor);$(DefineConstants) - - $(TargetFrameworks);net11.0-windows10.0.19041.0 - - FULL_RELEASE - DEVELOPMENT - - $(BuildFlavor);$(DefineConstants) + 12.1.0 + true - - - - - Starlight.Launcher - true - true - enable - - false - enable - false - - Starlight.Launcher - - com.starlight.launcher - Starlight - - None - - 17.0 - 10.0.19041.0 - 10.0.19041.0 - en-US - true - 2.4.1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -89,19 +45,87 @@ - + + packages\Avalonia.Controls.WebView.dll + + + packages\Avalonia.Controls.WebView.Core.dll + + + + + + - + + + + + + + + + + + + + + + + + + + - - - PreserveNewest - - + + + + + - - + + + <_BlazorFrameworkJs>$(PkgMicrosoft_AspNetCore_App_Internal_Assets)/staticwebassets/_framework/blazor.web.js + <_MudBlazorFrameworkCSS>$(PkgMudBlazor)/staticwebassets/MudBlazor.min.css + <_MudBlazorFrameworkJs>$(PkgMudBlazor)/staticwebassets/MudBlazor.min.js + <_MudBlazorMarkdownFrameworkJs>$(PkgMudBlazor_Markdown)/staticwebassets/MudBlazor.Markdown.min.js + <_MudBlazorMarkdownFrameworkCSS>$(PkgMudBlazor_Markdown)/staticwebassets/MudBlazor.Markdown.min.css + + + <_WebUiContentAssets Include="$(MSBuildThisFileDirectory)../Starlight.Launcher.WebUI/wwwroot/**/*" /> + <_WebUiScopedCssBundle Include="$(MSBuildThisFileDirectory)../Starlight.Launcher.WebUI/obj/$(Configuration)/net11.0/scopedcss/bundle/Starlight.Launcher.WebUI.styles.css" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/Starlight.Launcher/Utility/WebViewExtensions.cs b/Starlight.Launcher/Utility/WebViewExtensions.cs deleted file mode 100644 index 3b02b8d..0000000 --- a/Starlight.Launcher/Utility/WebViewExtensions.cs +++ /dev/null @@ -1,72 +0,0 @@ -using Microsoft.AspNetCore.Components.WebView.Maui; -using Microsoft.Maui.Controls; - -#if WINDOWS -using Microsoft.UI.Xaml.Controls; -using Microsoft.Web.WebView2.Core; -#elif MACCATALYST -using WebKit; -#endif - -namespace Starlight.Launcher; - -public static class WebViewExtensions -{ - public static void PauseWebView(this BlazorWebView webView) - { - var platformView = webView.Handler?.PlatformView; - if (platformView is null) return; - -#if WINDOWS - if (platformView is WebView2 wv2 && wv2.CoreWebView2 is not null) - { - _ = wv2.CoreWebView2.TrySuspendAsync(); - wv2.CoreWebView2.MemoryUsageTargetLevel = CoreWebView2MemoryUsageTargetLevel.Low; - } -#elif MACCATALYST - if (platformView is WKWebView wk) - { - wk.SetAllMediaPlaybackSuspended(true, null); - wk.EvaluateJavaScript(PauseJs, null); - } -#endif - } - - public static void ResumeWebView(this BlazorWebView webView) - { - var platformView = webView.Handler?.PlatformView; - if (platformView is null) return; - -#if WINDOWS - if (platformView is WebView2 wv2 && wv2.CoreWebView2 is not null) - { - wv2.CoreWebView2.Resume(); - wv2.CoreWebView2.MemoryUsageTargetLevel = CoreWebView2MemoryUsageTargetLevel.Normal; - } -#elif MACCATALYST - if (platformView is WKWebView wk) - { - wk.SetAllMediaPlaybackSuspended(false, null); - wk.EvaluateJavaScript(ResumeJs, null); - } -#endif - } - -#if MACCATALYST - const string PauseJs = @" - (function(){ - if (window.__wvPaused) return; - window.__wvPaused = true; - document.querySelectorAll('video,audio').forEach(m => m.pause()); - window.__origRAF = window.requestAnimationFrame; - window.requestAnimationFrame = function(){ return 0; }; - })();"; - - const string ResumeJs = @" - (function(){ - if (!window.__wvPaused) return; - window.__wvPaused = false; - if (window.__origRAF) window.requestAnimationFrame = window.__origRAF; - })();"; -#endif -} diff --git a/Starlight.Launcher/packages/Avalonia.Controls.WebView.Core.dll b/Starlight.Launcher/packages/Avalonia.Controls.WebView.Core.dll new file mode 100644 index 0000000..1727ecb Binary files /dev/null and b/Starlight.Launcher/packages/Avalonia.Controls.WebView.Core.dll differ diff --git a/Starlight.Launcher/packages/Avalonia.Controls.WebView.dll b/Starlight.Launcher/packages/Avalonia.Controls.WebView.dll new file mode 100644 index 0000000..b7c6ec0 Binary files /dev/null and b/Starlight.Launcher/packages/Avalonia.Controls.WebView.dll differ diff --git a/installer/Starlight.iss b/installer/Starlight.iss index 8aa8bea..296c3da 100644 --- a/installer/Starlight.iss +++ b/installer/Starlight.iss @@ -5,7 +5,7 @@ AppVersion={#AppVersion} DefaultDirName={autopf}\{#AppName} DefaultGroupName={#AppName} OutputDir=Output -OutputBaseFilename={#AppName}-{#AppVersion}-setup +OutputBaseFilename={#AppName}-win-x64-{#AppVersion}-setup Compression=lzma2 SolidCompression=yes ArchitecturesInstallIn64BitMode=x64compatible diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..8dea290 --- /dev/null +++ b/nuget.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/packages/avalonia-feed/Avalonia.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.12.1.0-starlight.nupkg new file mode 100644 index 0000000..7a2ebd4 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Android.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Android.12.1.0-starlight.nupkg new file mode 100644 index 0000000..2987a38 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Android.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Browser.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Browser.12.1.0-starlight.nupkg new file mode 100644 index 0000000..5504d36 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Browser.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Controls.ColorPicker.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Controls.ColorPicker.12.1.0-starlight.nupkg new file mode 100644 index 0000000..10146d0 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Controls.ColorPicker.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Desktop.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Desktop.12.1.0-starlight.nupkg new file mode 100644 index 0000000..12a4f46 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Desktop.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Fonts.Inter.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Fonts.Inter.12.1.0-starlight.nupkg new file mode 100644 index 0000000..656a419 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Fonts.Inter.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.FreeDesktop.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.FreeDesktop.12.1.0-starlight.nupkg new file mode 100644 index 0000000..0015382 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.FreeDesktop.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.FreeDesktop.AtSpi.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.FreeDesktop.AtSpi.12.1.0-starlight.nupkg new file mode 100644 index 0000000..a98e781 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.FreeDesktop.AtSpi.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.HarfBuzz.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.HarfBuzz.12.1.0-starlight.nupkg new file mode 100644 index 0000000..b5a6ecb Binary files /dev/null and b/packages/avalonia-feed/Avalonia.HarfBuzz.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Headless.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Headless.12.1.0-starlight.nupkg new file mode 100644 index 0000000..e77ffaf Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Headless.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Headless.NUnit.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Headless.NUnit.12.1.0-starlight.nupkg new file mode 100644 index 0000000..2010415 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Headless.NUnit.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Headless.Vnc.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Headless.Vnc.12.1.0-starlight.nupkg new file mode 100644 index 0000000..87d2670 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Headless.Vnc.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Headless.XUnit.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Headless.XUnit.12.1.0-starlight.nupkg new file mode 100644 index 0000000..1084279 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Headless.XUnit.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.LinuxFramebuffer.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.LinuxFramebuffer.12.1.0-starlight.nupkg new file mode 100644 index 0000000..687fab7 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.LinuxFramebuffer.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Markup.Xaml.Loader.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Markup.Xaml.Loader.12.1.0-starlight.nupkg new file mode 100644 index 0000000..a3a8064 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Markup.Xaml.Loader.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Native.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Native.12.1.0-starlight.nupkg new file mode 100644 index 0000000..8350948 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Native.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Remote.Protocol.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Remote.Protocol.12.1.0-starlight.nupkg new file mode 100644 index 0000000..e36df28 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Remote.Protocol.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Skia.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Skia.12.1.0-starlight.nupkg new file mode 100644 index 0000000..f0eb036 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Skia.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Themes.Fluent.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Themes.Fluent.12.1.0-starlight.nupkg new file mode 100644 index 0000000..6680a62 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Themes.Fluent.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Themes.Simple.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Themes.Simple.12.1.0-starlight.nupkg new file mode 100644 index 0000000..eb1e11b Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Themes.Simple.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Wayland.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Wayland.12.1.0-starlight.nupkg new file mode 100644 index 0000000..faeaf9b Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Wayland.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Win32.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Win32.12.1.0-starlight.nupkg new file mode 100644 index 0000000..807a75e Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Win32.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.Win32.Interoperability.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.Win32.Interoperability.12.1.0-starlight.nupkg new file mode 100644 index 0000000..f9cdf85 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.Win32.Interoperability.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.WinUI.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.WinUI.12.1.0-starlight.nupkg new file mode 100644 index 0000000..8cdf314 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.WinUI.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.X11.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.X11.12.1.0-starlight.nupkg new file mode 100644 index 0000000..4005f6d Binary files /dev/null and b/packages/avalonia-feed/Avalonia.X11.12.1.0-starlight.nupkg differ diff --git a/packages/avalonia-feed/Avalonia.iOS.12.1.0-starlight.nupkg b/packages/avalonia-feed/Avalonia.iOS.12.1.0-starlight.nupkg new file mode 100644 index 0000000..918fa04 Binary files /dev/null and b/packages/avalonia-feed/Avalonia.iOS.12.1.0-starlight.nupkg differ