fix: RpcBenchmark

servicetitan · Dec 7, 2023 · 277d684 · 277d684
1 parent e32ce38
commit 277d684
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/src/RpcBenchmark/Client/Clients/ClientFactories.cs b/src/RpcBenchmark/Client/Clients/ClientFactories.cs
@@ -93,18 +93,9 @@ private IServiceCollection CreateBaseServiceCollection()
             var connection = new HubConnectionBuilder()
                 .WithUrl($"{BaseUrl}hubs/testService", options => {
                     options.Transports = HttpTransportType.WebSockets;
-                    options.WebSocketFactory = async (context, ct) => {
-                        var ws = new ClientWebSocket();
-                        ws.Options.HttpVersion = HttpVersion.Version11;
-                        ws.Options.RemoteCertificateValidationCallback = (_, _, _, _) => true;
-                        try {
-                            await ws.ConnectAsync(context.Uri, ct).ConfigureAwait(false);
-                            return ws;
-                        }
-                        catch {
-                            ws.Dispose();
-                            throw;
-                        }
+                    options.WebSocketConfiguration = ws => {
+                        ws.HttpVersion = HttpVersion.Version11;
+                        ws.RemoteCertificateValidationCallback = (_, _, _, _) => true;
                     };
                 })
                 .Build();

diff --git a/src/RpcBenchmark/CommandLine/ServerCommand.cs b/src/RpcBenchmark/CommandLine/ServerCommand.cs
@@ -40,7 +40,8 @@ public override async Task<int> RunAsync()
         // Core services
         var services = builder.Services;
         services.AddSignalR(hub => {
-            hub.MaximumParallelInvocationsPerClient = 100_000_000; // Can't be int.MaxValue!
+            hub.MaximumParallelInvocationsPerClient = 1000; // Can't be too high, otherwise SignalR fails!
+            hub.DisableImplicitFromServicesParameters = true;
         });
         var rpc = services.AddRpc();
         rpc.AddWebSocketServer();
@@ -83,6 +84,7 @@ public override async Task<int> RunAsync()
         app.MapGrpcService<GrpcTestService>();
         app.MapHub<TestHub>("hubs/testService", o => {
             o.Transports = HttpTransportType.WebSockets;
+            o.AllowStatefulReconnects = false;
         });
         app.MapMagicOnionService();
         app.MapStreamJsonRpcService<JsonRpcTestService>("stream-json-rpc");