preview 3

Author: LucHeart

LocalRelay/DeviceConnection.cs

@@ -1,16 +1,15 @@
 using System.Net;
 using System.Net.WebSockets;
-using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text.Json;
 using System.Threading.Channels;
 using System.Timers;
+using LucHeart.WebsocketLibrary;
 using Microsoft.Extensions.Logging;
 using OneOf;
 using OneOf.Types;
 using OpenShock.LocalRelay.Models.Backend;
 using OpenShock.LocalRelay.Utils;
-using OpenShock.SDK.CSharp.Live.LiveControlModels;
 using OpenShock.SDK.CSharp.Updatables;
 using OpenShock.SDK.CSharp.Utils;
 using OpenShock.Serialization.Gateway;
@@ -221,7 +220,7 @@ private async Task Reconnect()
     {
         _logger.LogWarning("Reconnecting in 3 seconds");
 
-        _state.Value = WebsocketConnectionState.Reconnecting;
+        _state.Value = WebsocketConnectionState.Connecting;
         _clientWebSocket?.Abort();
         _clientWebSocket?.Dispose();
         await Task.Delay(3000, _dispose.Token);
@@ -313,7 +312,7 @@ await _clientWebSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Normal cl
         }
 
         _logger.LogWarning("Lost websocket connection, trying to reconnect in 3 seconds");
-        _state.Value = WebsocketConnectionState.Reconnecting;
+        _state.Value = WebsocketConnectionState.Connecting;
 
         _clientWebSocket?.Abort();
         _clientWebSocket?.Dispose();

LocalRelay/LocalRelay.csproj

@@ -9,7 +9,7 @@
         <Company>OpenShock</Company>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <ApplicationTitle>LocalRelay</ApplicationTitle>
-        <Version>1.0.0-preview.2</Version>
+        <Version>1.0.0-preview.3</Version>
         <Product>LocalRelay</Product>
         <TargetFramework>net9.0</TargetFramework>
 
@@ -20,13 +20,13 @@
 
     <ItemGroup>
         <PackageReference Include="CircularBuffer" Version="1.4.0" />
-        <PackageReference Include="OpenShock.Desktop.ModuleBase" Version="1.0.0-preview.4" />
-        <PackageReference Include="OpenShock.SDK.CSharp" Version="0.0.34" />
-        <PackageReference Include="OpenShock.SDK.CSharp.Live" Version="0.0.33" />
+        <PackageReference Include="OpenShock.Desktop.ModuleBase" Version="1.0.0-preview.5" />
+        <PackageReference Include="OpenShock.SDK.CSharp" Version="0.0.38" />
+        <PackageReference Include="OpenShock.SDK.CSharp.Live" Version="0.0.38" />
         <PackageReference Include="OpenShock.Serialization.Flatbuffers" Version="1.0.0" />
-        <PackageReference Include="Serilog" Version="4.2.0" />
-        <PackageReference Include="System.IO.Ports" Version="9.0.3" />
-        <PackageReference Include="MudBlazor" Version="8.6.0" />
+        <PackageReference Include="Serilog" Version="4.3.0" />
+        <PackageReference Include="System.IO.Ports" Version="9.0.7" />
+        <PackageReference Include="MudBlazor" Version="8.9.0" />
         <PackageReference Include="Semver" Version="3.0.0" />
         <PackageReference Include="System.Reactive" Version="6.0.1" />
     </ItemGroup>

LocalRelay/Services/FlowManager.cs

@@ -1,14 +1,11 @@
-using Microsoft.Extensions.Logging;
-using OneOf;
-using OneOf.Types;
+using LucHeart.WebsocketLibrary;
+using Microsoft.Extensions.Logging;
 using OpenShock.Desktop.ModuleBase.Api;
 using OpenShock.Desktop.ModuleBase.Config;
 using OpenShock.LocalRelay.Config;
 using OpenShock.LocalRelay.Models.Serial;
 using OpenShock.MinimalEvents;
-using OpenShock.SDK.CSharp.Live.LiveControlModels;
 using OpenShock.SDK.CSharp.Updatables;
-using OpenShock.SDK.CSharp.Utils;
 using OpenShock.Serialization.Gateway;
 
 namespace OpenShock.LocalRelay.Services;

LocalRelay/Ui/Pages/Dash/Tabs/HubTab.razor

@@ -1,4 +1,5 @@
 @inject ILogger<SerialTab> Logger
+@using LucHeart.WebsocketLibrary
 @using Microsoft.Extensions.Logging
 @using OpenShock.Desktop.ModuleBase
 @using OpenShock.Desktop.ModuleBase.Api
@@ -47,9 +48,8 @@
         state switch
         {
             WebsocketConnectionState.Connected => Color.Success,
-            WebsocketConnectionState.Reconnecting => Color.Warning,
             WebsocketConnectionState.Connecting => Color.Warning,
-            WebsocketConnectionState.Disconnected => Color.Error,
+            WebsocketConnectionState.WaitingForReconnect => Color.Tertiary,
             _ => Color.Error
         };
 

LocalRelay/Utils/FlatbufferWebSocketUtils.cs

@@ -1,8 +1,8 @@
 using System.Buffers;
 using System.Net.WebSockets;
 using FlatSharp;
+using Microsoft.IO;
 using OneOf;
-using OpenShock.SDK.CSharp.Live.Utils;
 
 namespace OpenShock.LocalRelay.Utils;
 
@@ -13,6 +13,8 @@ public static class FlatbufferWebSocketUtils
 {
     private const uint MaxMessageSize = 512_000; // 512 000 bytes
 
+    public static readonly RecyclableMemoryStreamManager RecyclableMemory = new();
+    
     /// <summary>
     /// Receive a websocket message with the given FlatBuffer type
     /// </summary>
@@ -30,7 +32,7 @@ public static class FlatbufferWebSocketUtils
         try
         {
             ValueWebSocketReceiveResult result;
-            await using var message = JsonWebSocketUtils.RecyclableMemory.GetStream();
+            await using var message = RecyclableMemory.GetStream();
             var bytes = 0;
             do
             {
@@ -106,4 +108,25 @@ private static async Task SendFullMessageBytes(ReadOnlyMemory<byte> msg, WebSock
             await socket.SendAsync(buffer, WebSocketMessageType.Binary, doneBytes >= msg.Length, cancelToken);
         }
     }
+}
+
+public readonly struct WebsocketClosure;
+
+public readonly struct DeserializeFailed
+{
+    public Exception Exception { get; init; }
+    public string Message { get; init; }
+}
+
+public class MessageTooLongException : Exception
+{
+    /// <inheritdoc />
+    public MessageTooLongException()
+    {
+    }
+
+    /// <inheritdoc />
+    public MessageTooLongException(string message) : base(message)
+    {
+    }
 }