feat: Update to the latest Stl.Fusion.

Author: alexyakunin

docs/tutorial/Tutorial.csproj

@@ -16,8 +16,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Stl.Fusion.Client" Version="0.1.280" />
-    <PackageReference Include="Stl.Fusion.Server" Version="0.1.280" />
+    <PackageReference Include="Stl.Fusion.Client" Version="0.1.291" />
+    <PackageReference Include="Stl.Fusion.Server" Version="0.1.291" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20303.1" />
     <PackageReference Include="System.CommandLine.DragonFruit" Version="0.3.0-alpha.20303.1" />
   </ItemGroup>

src/Blazor/Client/Models/ChatState.cs

@@ -34,6 +34,7 @@ public Local Clone()
                 => (Local) MemberwiseClone();
         }
 
+        [LiveStateUpdater]
         public class Updater : ILiveStateUpdater<Local, ChatState>
         {
             protected IChatService Chat { get; }

src/Blazor/Client/Models/CompositionState.cs

@@ -27,6 +27,7 @@ public string Parameter {
             public ILiveState<Local, CompositionState>? LiveState { get; set; }
         }
 
+        [LiveStateUpdater]
         public class Updater : ILiveStateUpdater<Local, CompositionState>
         {
             protected ILocalComposerService LocalComposer { get; }

src/Blazor/Client/Models/ServerScreenState.cs

@@ -29,6 +29,7 @@ public int Width {
             public ILiveState<Local, ServerScreenState>? LiveState { get; set; }
         }
 
+        [LiveStateUpdater]
         public class Updater : ILiveStateUpdater<Local, ServerScreenState>
         {
             protected IScreenshotService Screenshot { get; }

src/Blazor/Client/Models/ServerTimeState.cs

@@ -10,6 +10,7 @@ public class ServerTimeState
     {
         public DateTime? Time { get; set; }
 
+        [LiveStateUpdater]
         public class Updater : ILiveStateUpdater<ServerTimeState>
         {
             protected ITimeService Time { get; }

src/Blazor/Client/Program.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
@@ -9,14 +10,15 @@
 using Stl.Fusion.Client;
 using Stl.Fusion.UI;
 using Stl.OS;
-using Samples.Blazor.Client.Services;
 using Samples.Blazor.Client.Models;
-using Samples.Blazor.Common.Services;
+using Stl.DependencyInjection;
 
 namespace Samples.Blazor.Client
 {
     public class Program
     {
+        public const string ClientSideScope = nameof(ClientSideScope);
+
         public static Task Main(string[] args)
         {
             if (OSInfo.Kind != OSKind.WebAssembly)
@@ -38,38 +40,28 @@ public static Task Main(string[] args)
 
         public static void ConfigureServices(IServiceCollection services, WebAssemblyHostBuilder builder)
         {
-            ConfigureSharedServices(services);
 
             var baseUri = new Uri(builder.HostEnvironment.BaseAddress);
+            var apiBaseUri = new Uri($"{baseUri}api/");
+            services.AddTransient(c => new HttpClient() { BaseAddress = apiBaseUri });
             services.AddFusionWebSocketClient((c, o) => {
                 o.BaseUri = baseUri;
                 // o.MessageLogLevel = LogLevel.Information;
             });
 
-            // Replica services
-            var apiBaseUri = new Uri($"{baseUri}api/");
-            services.AddTransient(c => new HttpClient() { BaseAddress = apiBaseUri });
-            services.AddReplicaService<ITimeClient>("time");
-            services.AddReplicaService<IScreenshotClient>("screenshot");
-            services.AddReplicaService<IChatClient>("chat");
-            services.AddReplicaService<IComposerClient>("composer");
-            // Client-side versions of server-side services
-            services.AddSingleton<ITimeService, ClientTimeService>();
-            services.AddSingleton<IScreenshotService, ClientScreenshotService>();
-            services.AddSingleton<IChatService, ClientChatService>();
-            services.AddSingleton<IComposerService, ClientComposerService>();
+            // This method registers services marked with any of ServiceAttributeBase descendants, including:
+            // [Service], [ComputedService], [RestEaseReplicaService], [LiveStateUpdater]
+            services.AddServices(ClientSideScope, Assembly.GetExecutingAssembly());
+            ConfigureSharedServices(services);
         }
 
         public static void ConfigureSharedServices(IServiceCollection services)
         {
-            // Computed services
-            services.AddComputedService<ILocalComposerService, LocalComposerService>();
-
             // Configuring live updaters
             services.AddSingleton(c => new UpdateDelayer.Options() {
                 Delay = TimeSpan.FromSeconds(0.1),
             });
-            services.AutoAddLiveState(typeof(Program).Assembly, (c, options) => {
+            services.AddSingleton<Action<IServiceProvider, LiveState.Options>>((c, options) => {
                 if (options is LiveState<ServerScreenState.Local, ServerScreenState>.Options) {
                     // Server Screen part always updates as quickly as it can
                     options.UpdateDelayer = new UpdateDelayer(new UpdateDelayer.Options() {
@@ -90,6 +82,9 @@ public static void ConfigureSharedServices(IServiceCollection services)
                 }
             });
 
+            // This method registers services marked with any of ServiceAttributeBase descendants, including:
+            // [Service], [ComputedService], [RestEaseReplicaService], [LiveStateUpdater]
+            services.AddServices(Assembly.GetExecutingAssembly());
         }
     }
 }

src/Blazor/Client/Samples.Blazor.Client.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.1" PrivateAssets="all" />
     -->
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.6" />
-    <PackageReference Include="Stl.Fusion.Client" Version="0.1.280" />
+    <PackageReference Include="Stl.Fusion.Blazor" Version="0.1.291" />
   </ItemGroup>
 
   <ItemGroup>

src/Blazor/Client/Services/ClientChatClient.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using RestEase;
+using Samples.Blazor.Common.Services;
+using Stl.Fusion.Bridge;
+using Stl.Fusion.Client;
+using Stl.Fusion.Client.RestEase;
+
+namespace Samples.Blazor.Client.Services
+{
+    [RestEaseReplicaService(typeof(ITimeService), Scope = Program.ClientSideScope)]
+    [BasePath("time")]
+    public interface ITimeClient : IRestEaseReplicaClient
+    {
+        [Get("get")]
+        Task<DateTime> GetTimeAsync(CancellationToken cancellationToken = default);
+    }
+
+    [RestEaseReplicaService(typeof(IScreenshotService), Scope = Program.ClientSideScope)]
+    [BasePath("screenshot")]
+    public interface IScreenshotClient : IRestEaseReplicaClient
+    {
+        [Get("get")]
+        Task<Screenshot> GetScreenshotAsync(int width, CancellationToken cancellationToken = default);
+    }
+
+    [RestEaseReplicaService(typeof(IChatService), Scope = Program.ClientSideScope)]
+    [BasePath("chat")]
+    public interface IChatClient : IRestEaseReplicaClient
+    {
+        // Writers
+        [Post("createUser"), ReplicaServiceMethod(false)]
+        Task<ChatUser> CreateUserAsync(string name, CancellationToken cancellationToken = default);
+        [Post("setUserName"), ReplicaServiceMethod(false)]
+        Task<ChatUser> SetUserNameAsync(long id, string name, CancellationToken cancellationToken = default);
+        [Post("addMessage"), ReplicaServiceMethod(false)]
+        Task<ChatMessage> AddMessageAsync(long userId, string text, CancellationToken cancellationToken = default);
+
+        // Readers
+        [Get("getUserCount")]
+        Task<long> GetUserCountAsync(CancellationToken cancellationToken = default);
+        [Get("getActiveUserCount")]
+        Task<long> GetActiveUserCountAsync(CancellationToken cancellationToken = default);
+        [Get("getUser")]
+        Task<ChatUser> GetUserAsync(long id, CancellationToken cancellationToken = default);
+        [Get("getChatTail")]
+        Task<ChatPage> GetChatTailAsync(int length, CancellationToken cancellationToken = default);
+        [Get("getChatPage")]
+        Task<ChatPage> GetChatPageAsync(long minMessageId, long maxMessageId, CancellationToken cancellationToken = default);
+    }
+
+    [RestEaseReplicaService(typeof(IComposerService), Scope = Program.ClientSideScope)]
+    [BasePath("composer")]
+    public interface IComposerClient : IRestEaseReplicaClient
+    {
+        [Get("get")]
+        Task<ComposedValue> GetComposedValueAsync(string? parameter, CancellationToken cancellationToken = default);
+    }
+}

src/Blazor/Client/Services/ClientComposerService.cs

@@ -8,6 +8,7 @@
 
 namespace Samples.Blazor.Client.Services
 {
+    [ComputedService(typeof(ILocalComposerService))]
     public class LocalComposerService : ILocalComposerService, IComputedService
     {
         protected ILogger Log { get; }