#162 SIGame: fix error while opening help

Fix other issues too.
VladimirKhil · Dec 2, 2023 · 3b3ee31 · 3b3ee31
1 parent 072cc6d
commit 3b3ee31
Show file tree

Hide file tree

Showing 25 changed files with 186 additions and 118 deletions.
diff --git a/deploy/SIGame.Setup/Product.wxs b/deploy/SIGame.Setup/Product.wxs
@@ -110,23 +110,23 @@
       <Component Guid="{1627896d-65da-47fa-9802-a3cfe67cb0aa}">
         <File KeyPath="yes" Source="..\dlls\$(var.Platform)\api-ms-win-core-winrt-l1-1-0.dll" />
       </Component>
-		<Component Guid="{4687DB8D-2AA3-46AD-8B85-A8469390E198}">
-			<File KeyPath="yes" Source="$(var.PublishFolder)runtimes\win-$(var.Platform)\native\WebView2Loader.dll" />
-		</Component>
-	    <Component Guid="{B6AFAEC8-30A0-4BD9-836A-920D1190DAF9}">
-		    <File KeyPath="yes" Source="$(var.PublishFolder)aspnetcorev2_inprocess.dll" />
-	    </Component>
-	    <Component Guid="{9E128CD4-80CB-4268-832B-C2D07E36E03D}">
-		    <File KeyPath="yes" Source="$(var.PublishFolder)appsettings.json" />
-	    </Component>
-	    <Component Guid="{84D30ED4-930D-436F-8287-A8FDB01860FA}">
-		    <File KeyPath="yes" Source="$(var.PublishFolder)appsettings.Production.json" />
-	    </Component>
+      <Component Guid="{4687DB8D-2AA3-46AD-8B85-A8469390E198}">
+		<File KeyPath="yes" Source="$(var.PublishFolder)runtimes\win-$(var.Platform)\native\WebView2Loader.dll" />
+	  </Component>
+	  <Component Guid="{B6AFAEC8-30A0-4BD9-836A-920D1190DAF9}">
+		<File KeyPath="yes" Source="$(var.PublishFolder)aspnetcorev2_inprocess.dll" />
+	  </Component>
+	  <Component Guid="{9E128CD4-80CB-4268-832B-C2D07E36E03D}">
+		<File KeyPath="yes" Source="$(var.PublishFolder)appsettings.json" />
+	  </Component>
+	  <Component Guid="{84D30ED4-930D-436F-8287-A8FDB01860FA}">
+		<File KeyPath="yes" Source="$(var.PublishFolder)appsettings.Production.json" />
+	  </Component>
       <Component Guid="{10301C79-C85C-4FD5-94D8-A23533BE7D79}">
-        <File KeyPath="yes" Source="$(var.PublishFolder)Help_ru.xps" />
+        <File KeyPath="yes" Source="$(var.PublishFolder)Help_ru.pdf" />
       </Component>
       <Component Guid="{ADDF321D-6B06-412B-8096-3911FF966799}">
-        <File KeyPath="yes" Source="$(var.PublishFolder)Help_en.xps" />
+        <File KeyPath="yes" Source="$(var.PublishFolder)Help_en.pdf" />
       </Component>
       <Component Id="RegistryPath" Guid="{b8ad70bb-c94c-4e11-af70-c6eaf427fb1c}">
         <RegistryValue

diff --git a/src/Common/SI.GameServer.Client/GameServerClient.cs b/src/Common/SI.GameServer.Client/GameServerClient.cs
@@ -235,7 +235,7 @@ public async Task OpenAsync(string userName, CancellationToken cancellationToken
                 {
                     options.AccessTokenProvider = () => Task.FromResult<string?>(Convert.ToBase64String(Encoding.UTF8.GetBytes(userName)));
                 })
-            .WithAutomaticReconnect()
+            .WithAutomaticReconnect(new ReconnectPolicy())
             .AddMessagePackProtocol()
             .Build();
 
@@ -387,4 +387,9 @@ private void OnUI(Action action)
     }
 
     private void MessageHandler_HttpSendProgress(object? sender, HttpProgressEventArgs e) => UploadProgress?.Invoke(e.ProgressPercentage);
+
+    private sealed class ReconnectPolicy : IRetryPolicy
+    {
+        public TimeSpan? NextRetryDelay(RetryContext retryContext) => TimeSpan.FromSeconds(5);
+    }
 }
diff --git a/src/Common/SI.GameServer.Client/SIHostClient.cs b/src/Common/SI.GameServer.Client/SIHostClient.cs
@@ -17,6 +17,8 @@ public sealed class SIHostClient : IGameClient
     private readonly HubConnection _connection;
     private readonly SIHostClientOptions _options;
 
+    private JoinGameRequest? _joinGameRequest;
+
     public event Action<Message>? IncomingMessage;
 
     public event Func<Exception?, Task>? Reconnecting;
@@ -28,22 +30,8 @@ public SIHostClient(HubConnection connection, SIHostClientOptions options)
         _connection = connection;
         _options = options;
 
-        _connection.Reconnecting += async e =>
-        {
-            if (Reconnecting != null)
-            {
-                await Reconnecting(e);
-            }
-        };
-
-        _connection.Reconnected += async s =>
-        {
-            if (Reconnected != null)
-            {
-                await Reconnected(s);
-            }
-        };
-
+        _connection.Reconnecting += OnReconnecting;
+        _connection.Reconnected += OnReconnected;
         _connection.Closed += OnConnectionClosedAsync;
 
         _connection.On<Message>("Receive", (message) => IncomingMessage?.Invoke(message));
@@ -56,6 +44,22 @@ public SIHostClient(HubConnection connection, SIHostClientOptions options)
         });
     }
 
+    private async Task OnReconnecting(Exception? ex)
+    {
+        if (Reconnecting != null)
+        {
+            await Reconnecting(ex);
+        }
+    }
+
+    private async Task OnReconnected(string? connectionId)
+    {
+        if (Reconnected != null)
+        {
+            await Reconnected(connectionId);
+        }
+    }
+
     public static async Task<SIHostClient> CreateAsync(SIHostClientOptions options, CancellationToken cancellationToken)
     {
         var serviceUri = options.ServiceUri?.ToString() ?? "";
@@ -67,7 +71,7 @@ public static async Task<SIHostClient> CreateAsync(SIHostClientOptions options,
 
         var connection = new HubConnectionBuilder()
             .WithUrl($"{serviceUri}sihost")
-                .WithAutomaticReconnect()
+                .WithAutomaticReconnect(new ReconnectPolicy())
                 .AddMessagePackProtocol()
                 .Build();
 
@@ -78,23 +82,70 @@ public static async Task<SIHostClient> CreateAsync(SIHostClientOptions options,
         return new SIHostClient(connection, options);
     }
 
-    public Task<JoinGameResponse> JoinGameAsync(
+    public async Task<JoinGameResponse> JoinGameAsync(
         JoinGameRequest joinGameRequest,
-        CancellationToken cancellationToken = default) =>
-        _connection.InvokeAsync<JoinGameResponse>("JoinGame", joinGameRequest, cancellationToken);
+        CancellationToken cancellationToken = default)
+    {
+        var response = await _connection.InvokeAsync<JoinGameResponse>("JoinGame", joinGameRequest, cancellationToken);
+
+        if (response.IsSuccess)
+        {
+            _joinGameRequest = joinGameRequest;
+        }
+
+        return response;
+    }
 
     public Task SendMessageAsync(Message message, CancellationToken cancellationToken = default) =>
-        _connection.InvokeAsync("SendMessage", message, cancellationToken);
+        _connection.SendAsync("SendMessage", message, cancellationToken);
 
     public Task LeaveGameAsync(CancellationToken cancellationToken = default) =>
-        _connection.InvokeAsync("LeaveGame", cancellationToken);
+        _connection.SendAsync("LeaveGame", cancellationToken);
 
-    private Task OnConnectionClosedAsync(Exception? exc)
+    private async Task OnConnectionClosedAsync(Exception? exc)
     {
-        // TODO: recreate connection and retry
+        if (await TryReconnectAsync())
+        {
+            return;
+        }
+
+        if (Closed != null)
+        {
+            await Closed(exc);
+        }
+    }
+
+    private async Task<bool> TryReconnectAsync()
+    {
+        if (_joinGameRequest == null)
+        {
+            return false;
+        }
 
-        return Closed != null ? Closed(exc) : Task.CompletedTask;
+        try
+        {
+            await Task.Delay(5000);
+            await _connection.StartAsync();
+            await JoinGameAsync(_joinGameRequest);
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        _connection.Reconnecting -= OnReconnecting;
+        _connection.Reconnected -= OnReconnected;
+        _connection.Closed -= OnConnectionClosedAsync;
+
+        await _connection.DisposeAsync();
     }
 
-    public ValueTask DisposeAsync() => _connection.DisposeAsync();
+    private sealed class ReconnectPolicy : IRetryPolicy
+    {
+        public TimeSpan? NextRetryDelay(RetryContext retryContext) => TimeSpan.FromSeconds(5);
+    }
 }
diff --git a/src/Common/SIUI.ViewModel/TableInfoViewModel.cs b/src/Common/SIUI.ViewModel/TableInfoViewModel.cs
@@ -366,7 +366,7 @@ public bool Enabled
     private double _volume = 0.5;
 
     /// <summary>
-    /// Sound volume level.
+    /// Sound volume level (from 0 to 1).
     /// </summary>
     public double Volume
     {

diff --git a/src/Common/SIUI/Behaviors/MediaController.cs b/src/Common/SIUI/Behaviors/MediaController.cs
@@ -8,6 +8,26 @@ namespace SIUI.Behaviors;
 
 public static class MediaController
 {
+    /// <summary>
+    /// Current volume level.
+    /// </summary>
+    public static double Volume { get; private set; } = 0.5;
+
+    static MediaController()
+    {
+        if (waveOutGetVolume(IntPtr.Zero, out uint dwVolume) == 0)
+        {
+            // Setting default volume level from mixer (dividing it by half because default volume is 0.5)
+            Volume = ((double)Math.Max(dwVolume >> 16, dwVolume & 0x0000FFFF)) / 0xFFFF / 2;
+        }
+    }
+
+    public static void UpdateVolume(double factor)
+    {
+        Volume *= factor;
+        _ = waveOutSetVolume(IntPtr.Zero, (uint)(0xFFFF * 2 * Volume));
+    }
+
     private static readonly DependencyPropertyDescriptor SourceDescriptor =
         DependencyPropertyDescriptor.FromProperty(MediaElement.SourceProperty, typeof(MediaElement));
 
@@ -29,12 +49,7 @@ public static void OnLoadHandlerChanged(DependencyObject d, DependencyPropertyCh
         }
 
         mediaElement.LoadedBehavior = MediaState.Manual;
-
-        if (waveOutGetVolume(IntPtr.Zero, out uint dwVolume) == 0)
-        {
-            // Setting default volume level from mixer (dividing it by half because default volume is 0.5)
-            mediaElement.Volume = ((double)Math.Max(dwVolume >> 16, dwVolume & 0x0000FFFF)) / 0xFFFF / 2;
-        }
+        mediaElement.Volume = Volume;
 
         void loaded(object? sender, EventArgs e2)
         {
@@ -113,7 +128,6 @@ void resumeHandler()
         void volumeChangedHandler(double volume)
         {
             mediaElement.Volume *= volume;
-            waveOutSetVolume(IntPtr.Zero, (uint)(0xFFFF * 2 * mediaElement.Volume));
         }
 
         tableInfo.MediaSeek += seekHandler;

diff --git a/src/SICore/SICore/Clients/Game/GameLogic.cs b/src/SICore/SICore/Clients/Game/GameLogic.cs
@@ -1632,9 +1632,11 @@ override protected void ExecuteTask(int taskId, int arg)
 
                     if (stop)
                     {
+                        _tasksHistory.AddLogEntry("Execution stopped");
                         return;
                     }
 
+                    _tasksHistory.AddLogEntry($"Execution proceed with task {newTask}");
                     task = newTask;
                 }
 

diff --git a/src/SICore/SICore/Clients/Player/Player.cs b/src/SICore/SICore/Clients/Player/Player.cs
@@ -31,7 +31,10 @@ public Player(Client client, Account personData, bool isHost, ILocalizer localiz
     {
         ClientData.PlayerDataExtensions.PressGameButton = new CustomCommand(arg =>
         {
-            _viewerActions.SendMessage(Messages.I);
+            var tryStartTime = ClientData.PlayerDataExtensions.TryStartTime;
+            var pressDuration = tryStartTime.HasValue ? (int)DateTimeOffset.UtcNow.Subtract(tryStartTime.Value).TotalMilliseconds : -1;
+
+            _viewerActions.SendMessageWithArgs(Messages.I, pressDuration);
             DisableGameButton(false);
             ReleaseGameButton();
         }) { CanBeExecuted = true };
@@ -282,6 +285,7 @@ protected override async ValueTask OnSystemMessageReceivedAsync(string[] mparams
                 case Messages.Try:
                     ClientData.PlayerDataExtensions.Pass.CanBeExecuted = true;
                     ClientData.PlayerDataExtensions.Apellate.CanBeExecuted = false;
+                    ClientData.PlayerDataExtensions.TryStartTime = DateTimeOffset.UtcNow;
                     break;
 
                 case Messages.YouTry:

diff --git a/src/SICore/SICore/Clients/Player/PlayerComputerLogic.cs b/src/SICore/SICore/Clients/Player/PlayerComputerLogic.cs
@@ -112,7 +112,7 @@ private int GetTimePercentage(int timerIndex)
         return (int)(100 * (now - timer.StartTime).TotalMilliseconds / (timer.EndTime - timer.StartTime).TotalMilliseconds);
     }
 
-    private void PressButton() => _viewerActions.PressGameButton();
+    private void PressButton() => _data.PlayerDataExtensions.PressGameButton.Execute(null);
 
     private void AnswerRight() => _viewerActions.SendMessage(Messages.IsRight, "+");
 

diff --git a/src/SICore/SICore/Clients/Player/PlayerData.cs b/src/SICore/SICore/Clients/Player/PlayerData.cs
@@ -117,6 +117,11 @@ public bool MyTry
         set { _myTry = value; OnPropertyChanged(); }
     }
 
+    /// <summary>
+    /// Defines time stamp when game buttons havebeen activated.
+    /// </summary>
+    public DateTimeOffset? TryStartTime { get; set; }
+
     public event Action? PressButton;
 
     public event PropertyChangedEventHandler? PropertyChanged;

diff --git a/src/SICore/SICore/Clients/Viewer/ViewerActions.cs b/src/SICore/SICore/Clients/Viewer/ViewerActions.cs
@@ -28,9 +28,4 @@ public void SendMessage(params string[] args) =>
 
     public void SendMessageWithArgs(params object[] args) =>
         Client.SendMessage(string.Join(Message.ArgsSeparator, args), receiver: NetworkConstants.GameName);
-
-    /// <summary>
-    /// Жмёт на игровую кнопку
-    /// </summary>
-    internal void PressGameButton() => SendMessage(Messages.I);
 }
diff --git a/src/SIGame/SIGame.ViewModel/Help_en.pdf b/src/SIGame/SIGame.ViewModel/Help_en.pdf
diff --git a/src/SIGame/SIGame.ViewModel/Help_en.xps b/src/SIGame/SIGame.ViewModel/Help_en.xps
diff --git a/src/SIGame/SIGame.ViewModel/Help_ru.pdf b/src/SIGame/SIGame.ViewModel/Help_ru.pdf
diff --git a/src/SIGame/SIGame.ViewModel/Help_ru.xps b/src/SIGame/SIGame.ViewModel/Help_ru.xps
diff --git a/src/SIGame/SIGame.ViewModel/PlatformSpecific/PlatformManager.cs b/src/SIGame/SIGame.ViewModel/PlatformSpecific/PlatformManager.cs
@@ -10,6 +10,8 @@ public abstract class PlatformManager : IUIThreadExecutor
 
     public IServiceProvider? ServiceProvider { get; set; }
 
+    public abstract double Volume { get; }
+
     protected PlatformManager()
     {
         Instance = this;
@@ -62,4 +64,6 @@ protected PlatformManager()
     public abstract void ShowDialogWindow(object dataContext, Action onClose);
 
     public abstract void CloseDialogWindow();
+
+    public abstract void UpdateVolume(double factor);
 }
diff --git a/src/SIGame/SIGame.ViewModel/SIGame.ViewModel.csproj b/src/SIGame/SIGame.ViewModel/SIGame.ViewModel.csproj
@@ -42,10 +42,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Help_en.xps">
+    <None Update="Help_en.pdf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Help_ru.xps">
+    <None Update="Help_ru.pdf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

diff --git a/src/SIGame/SIGame.ViewModel/ViewModel/GameCommands.cs b/src/SIGame/SIGame.ViewModel/ViewModel/GameCommands.cs
@@ -59,11 +59,9 @@ private static void OpenLogs_Executed(object? arg)
 
     private static void Comment_Executed(object? arg)
     {
-        var commentUri = Uri.EscapeDataString(Resources.FeedbackLink);
-
         try
         {
-            Browser.Open(commentUri);
+            Browser.Open(Resources.FeedbackLink);
         }
         catch (Exception exc)
         {

diff --git a/src/SIGame/SIGame.ViewModel/ViewModel/GameViewModel.cs b/src/SIGame/SIGame.ViewModel/ViewModel/GameViewModel.cs
@@ -95,10 +95,18 @@ public string? Ad
 
     public UserSettings UserSettings { get; }
 
+    /// <summary>
+    /// Sound volume level.
+    /// </summary>
     public double Volume
     {
         get => TInfo.Volume * 100;
-        set { TInfo.Volume = Math.Max(1, value) / 100; }
+        set
+        {
+            var currentValue = TInfo.Volume;
+            TInfo.Volume = Math.Min(100, Math.Max(1, value)) / 100;
+            PlatformManager.Instance.UpdateVolume(TInfo.Volume / currentValue);
+        }
     }
 
     /// <summary>
@@ -157,6 +165,8 @@ public GameViewModel(
         Host.Ad += Host_Ad;
         Host.IsPausedChanged += Host_IsPausedChanged;
 
+        TInfo.Volume = PlatformManager.Instance.Volume;
+
         UserSettings = userSettings;
 
         ChangePauseInGame = new CustomCommand(ChangePauseInGame_Executed) { CanBeExecuted = false };