Use MagicOnion DynamicClient, except for Unity.

Cysharp · Aug 5, 2024 · 6f5993b · 6f5993b
1 parent 81b053e
commit 6f5993b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 13 deletions.
diff --git a/src/DFrame.Unity/Assets/Plugins/DFrame/Runtime/DFrameWorkerApp.cs b/src/DFrame.Unity/Assets/Plugins/DFrame/Runtime/DFrameWorkerApp.cs
@@ -14,6 +14,7 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using MagicOnion.Client.DynamicClient;
 using MagicOnion.Serialization.MessagePack;
 
 namespace DFrame
@@ -225,7 +226,6 @@ async Task ConnectAsync(CancellationToken applicationLifeTime)
 #if UNITY_2020_1_OR_NEWER
                 HttpHandler = new Cysharp.Net.Http.YetAnotherHttpHandler()
                 {
-                    Http2Only = true,
                     Http2KeepAliveInterval = options.HttpHandlerOptions.KeepAlivePingDelay,
                     Http2KeepAliveTimeout = options.HttpHandlerOptions.KeepAlivePingTimeout,
                 },
@@ -243,13 +243,18 @@ async Task ConnectAsync(CancellationToken applicationLifeTime)
 
             var callInvoker = channel.CreateCallInvoker();
             var callOption = new CallOptions(new Metadata { { "worker-id", workerId.ToString() } });
-            var connectTask = StreamingHubClient.ConnectAsync<IControllerHub, IWorkerReceiver>(callInvoker, this, option: callOption, serializerProvider: MessagePackMagicOnionSerializerProvider.Default.WithOptions(
 #if UNITY_2020_1_OR_NEWER
-                DFrameResolver.Options
+            var factoryProvider = MagicOnionDFrameGeneratedClientInitializer.StreamingHubClientFactoryProvider;
+            var serializerOptions = DFrameResolver.Options;
 #else
-                MessagePackSerializerOptions.Standard
+            var factoryProvider = DynamicStreamingHubClientFactoryProvider.Instance;
+            var serializerOptions = MessagePackSerializerOptions.Standard;
 #endif
-            ), factoryProvider: MagicOnionDFrameGeneratedClientInitializer.StreamingHubClientFactoryProvider);
+            var connectTask = StreamingHubClient.ConnectAsync<IControllerHub, IWorkerReceiver>(callInvoker, this,
+                option: callOption,
+                serializerProvider: MessagePackMagicOnionSerializerProvider.Default.WithOptions(serializerOptions),
+                factoryProvider: factoryProvider
+            );
             client = await connectTask.WaitAsync(connectTimeout);
 
             this.connectionLifeTime = CancellationTokenSource.CreateLinkedTokenSource(client!.WaitForDisconnect().ToCancellationToken(), applicationLifeTime);

diff --git a/...nity/Assets/Plugins/DFrame/Runtime/Internal/MagicOnionDFrameGeneratedClientInitializer.cs b/...nity/Assets/Plugins/DFrame/Runtime/Internal/MagicOnionDFrameGeneratedClientInitializer.cs
@@ -1,7 +1,9 @@
-using MagicOnion.Client;
+#if UNITY_2020_1_OR_NEWER
+using MagicOnion.Client;
 
 namespace DFrame.Internal
 {
     [MagicOnionClientGeneration(typeof(DFrame.IControllerHub), DisableAutoRegistration = true)]
     internal partial class MagicOnionDFrameGeneratedClientInitializer { }
-}
+}
+#endif
diff --git a/src/DFrame.Worker/DFrameWorkerApp.cs b/src/DFrame.Worker/DFrameWorkerApp.cs
@@ -14,6 +14,7 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using MagicOnion.Client.DynamicClient;
 using MagicOnion.Serialization.MessagePack;
 
 namespace DFrame
@@ -225,6 +226,7 @@ async Task ConnectAsync(CancellationToken applicationLifeTime)
 #if UNITY_2020_1_OR_NEWER
                 HttpHandler = new Cysharp.Net.Http.YetAnotherHttpHandler()
                 {
+                    Http2Only = true,
                     Http2KeepAliveInterval = options.HttpHandlerOptions.KeepAlivePingDelay,
                     Http2KeepAliveTimeout = options.HttpHandlerOptions.KeepAlivePingTimeout,
                 },
@@ -242,13 +244,18 @@ async Task ConnectAsync(CancellationToken applicationLifeTime)
 
             var callInvoker = channel.CreateCallInvoker();
             var callOption = new CallOptions(new Metadata { { "worker-id", workerId.ToString() } });
-            var connectTask = StreamingHubClient.ConnectAsync<IControllerHub, IWorkerReceiver>(callInvoker, this, option: callOption, serializerProvider: MessagePackMagicOnionSerializerProvider.Default.WithOptions(
 #if UNITY_2020_1_OR_NEWER
-                DFrameResolver.Options
+            var factoryProvider = MagicOnionDFrameGeneratedClientInitializer.StreamingHubClientFactoryProvider;
+            var serializerOptions = DFrameResolver.Options;
 #else
-                MessagePackSerializerOptions.Standard
+            var factoryProvider = DynamicStreamingHubClientFactoryProvider.Instance;
+            var serializerOptions = MessagePackSerializerOptions.Standard;
 #endif
-            ), factoryProvider: MagicOnionDFrameGeneratedClientInitializer.StreamingHubClientFactoryProvider);
+            var connectTask = StreamingHubClient.ConnectAsync<IControllerHub, IWorkerReceiver>(callInvoker, this,
+                option: callOption,
+                serializerProvider: MessagePackMagicOnionSerializerProvider.Default.WithOptions(serializerOptions),
+                factoryProvider: factoryProvider
+            );
             client = await connectTask.WaitAsync(connectTimeout);
 
             this.connectionLifeTime = CancellationTokenSource.CreateLinkedTokenSource(client!.WaitForDisconnect().ToCancellationToken(), applicationLifeTime);

diff --git a/src/DFrame.Worker/Internal/MagicOnionDFrameGeneratedClientInitializer.cs b/src/DFrame.Worker/Internal/MagicOnionDFrameGeneratedClientInitializer.cs
@@ -1,7 +1,9 @@
-using MagicOnion.Client;
+#if UNITY_2020_1_OR_NEWER
+using MagicOnion.Client;
 
 namespace DFrame.Internal
 {
     [MagicOnionClientGeneration(typeof(DFrame.IControllerHub), DisableAutoRegistration = true)]
     internal partial class MagicOnionDFrameGeneratedClientInitializer { }
-}
+}
+#endif