Merge pull request #835 from Cysharp/feature/MoveToInternal

Move internal classes under Internal namespace
Cysharp · Sep 19, 2024 · b282c8b · b282c8b
2 parents cc5654a + 1930ac7
commit b282c8b
Show file tree

Hide file tree

Showing 15 changed files with 131 additions and 90 deletions.
diff --git a/...gicOnion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/ClientHeartbeatEvent.cs b/...gicOnion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/ClientHeartbeatEvent.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace MagicOnion.Client
+{
+    /// <summary>
+    /// Represents a client heartbeat received event.
+    /// </summary>
+    public readonly struct ClientHeartbeatEvent
+    {
+        /// <summary>
+        /// Gets the round trip time (RTT) between client and server.
+        /// </summary>
+        public TimeSpan RoundTripTime { get; }
+
+        public ClientHeartbeatEvent(long roundTripTimeMs)
+        {
+            RoundTripTime = TimeSpan.FromMilliseconds(roundTripTimeMs);
+        }
+    }
+}
diff --git a/...ion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/ClientHeartbeatEvent.cs.meta b/...ion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/ClientHeartbeatEvent.cs.meta
diff --git a/...ent/StreamingHubClientHeartbeatManager.cs → ...nal/StreamingHubClientHeartbeatManager.cs b/...ent/StreamingHubClientHeartbeatManager.cs → ...nal/StreamingHubClientHeartbeatManager.cs
@@ -7,46 +7,8 @@
 using MagicOnion.Internal.Buffers;
 using MessagePack;
 
-namespace MagicOnion.Client
+namespace MagicOnion.Client.Internal
 {
-    /// <summary>
-    /// Represents a client heartbeat received event.
-    /// </summary>
-    public readonly struct ClientHeartbeatEvent
-    {
-        /// <summary>
-        /// Gets the round trip time (RTT) between client and server.
-        /// </summary>
-        public TimeSpan RoundTripTime { get; }
-
-        public ClientHeartbeatEvent(long roundTripTimeMs)
-        {
-            RoundTripTime = TimeSpan.FromMilliseconds(roundTripTimeMs);
-        }
-    }
-
-    /// <summary>
-    /// Represents a server heartbeat received event.
-    /// </summary>
-    public readonly struct ServerHeartbeatEvent
-    {
-        /// <summary>
-        /// Gets the server time at when the heartbeat was sent.
-        /// </summary>
-        public DateTimeOffset ServerTime { get; }
-
-        /// <summary>
-        /// Gets the metadata data. The data is only available during event processing.
-        /// </summary>
-        public ReadOnlyMemory<byte> Metadata { get; }
-
-        public ServerHeartbeatEvent(long serverTimeUnixMs, ReadOnlyMemory<byte> metadata)
-        {
-            ServerTime = DateTimeOffset.FromUnixTimeMilliseconds(serverTimeUnixMs);
-            Metadata = metadata;
-        }
-    }
-
     internal class StreamingHubClientHeartbeatManager : IAsyncDisposable
     {
         readonly object gate = new();
@@ -86,7 +48,7 @@ CancellationToken shutdownToken
 #endif
         )
         {
-            this.timeoutTokenSource = new(
+            timeoutTokenSource = new(
 #if NET8_0_OR_GREATER
                 Timeout.InfiniteTimeSpan, timeProvider
 #endif
@@ -97,7 +59,7 @@ CancellationToken shutdownToken
             this.onServerHeartbeatReceived = onServerHeartbeatReceived;
             this.onClientHeartbeatResponseReceived = onClientHeartbeatResponseReceived;
             this.synchronizationContext = synchronizationContext;
-            this.shutdownTokenSource = CancellationTokenSource.CreateLinkedTokenSource(shutdownToken, timeoutTokenSource.Token);
+            shutdownTokenSource = CancellationTokenSource.CreateLinkedTokenSource(shutdownToken, timeoutTokenSource.Token);
 #if NON_UNITY
             this.timeProvider = timeProvider;
 #endif
@@ -188,7 +150,7 @@ SendOrPostCallback ProcessClientHeartbeatResponseCore(Action<ClientHeartbeatEven
                 _ = reader.ReadMessageType();
                 var (sentSequence, clientSentAt) = reader.ReadClientHeartbeatResponse();
 
-                if (sentSequence == (sequence - 1)/* NOTE: Sequence already 1 advanced.*/)
+                if (sentSequence == sequence - 1/* NOTE: Sequence already 1 advanced.*/)
                 {
                     // Cancel the running timeout cancellation timer.
                     timeoutTokenSource.CancelAfter(Timeout.InfiniteTimeSpan);

diff --git a/...treamingHubClientHeartbeatManager.cs.meta → ...treamingHubClientHeartbeatManager.cs.meta b/...treamingHubClientHeartbeatManager.cs.meta → ...treamingHubClientHeartbeatManager.cs.meta
diff --git a/....Client/StreamingHubResponseTaskSource.cs → ...nternal/StreamingHubResponseTaskSource.cs b/....Client/StreamingHubResponseTaskSource.cs → ...nternal/StreamingHubResponseTaskSource.cs
@@ -4,15 +4,15 @@
 using System.Threading.Tasks;
 using System.Threading.Tasks.Sources;
 
-namespace MagicOnion.Client
+namespace MagicOnion.Client.Internal
 {
     internal class StreamingHubResponseTaskSourcePool<T> : ObjectPool<StreamingHubResponseTaskSource<T>>
     {
         public static StreamingHubResponseTaskSourcePool<T> Shared { get; } = new();
 
         public StreamingHubResponseTaskSourcePool()
             : base(static () => new StreamingHubResponseTaskSource<T>())
-        {}
+        { }
 
         public StreamingHubResponseTaskSource<T> RentOrCreate()
         {

diff --git a/...nt/StreamingHubResponseTaskSource.cs.meta → ...al/StreamingHubResponseTaskSource.cs.meta b/...nt/StreamingHubResponseTaskSource.cs.meta → ...al/StreamingHubResponseTaskSource.cs.meta
diff --git a/...gicOnion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/ServerHeartbeatEvent.cs b/...gicOnion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/ServerHeartbeatEvent.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace MagicOnion.Client
+{
+    /// <summary>
+    /// Represents a server heartbeat received event.
+    /// </summary>
+    public readonly struct ServerHeartbeatEvent
+    {
+        /// <summary>
+        /// Gets the server time at when the heartbeat was sent.
+        /// </summary>
+        public DateTimeOffset ServerTime { get; }
+
+        /// <summary>
+        /// Gets the metadata data. The data is only available during event processing.
+        /// </summary>
+        public ReadOnlyMemory<byte> Metadata { get; }
+
+        public ServerHeartbeatEvent(long serverTimeUnixMs, ReadOnlyMemory<byte> metadata)
+        {
+            ServerTime = DateTimeOffset.FromUnixTimeMilliseconds(serverTimeUnixMs);
+            Metadata = metadata;
+        }
+    }
+}
diff --git a/...ion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/ServerHeartbeatEvent.cs.meta b/...ion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/ServerHeartbeatEvent.cs.meta
diff --git a/...cOnion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/StreamingHubClientBase.cs b/...cOnion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/StreamingHubClientBase.cs
@@ -10,6 +10,7 @@
 using MagicOnion.Internal;
 using MagicOnion.Serialization;
 using MagicOnion.Internal.Buffers;
+using MagicOnion.Client.Internal;
 
 namespace MagicOnion.Client
 {

diff --git a/src/MagicOnion.Client/ClientHeartbeatEvent.cs b/src/MagicOnion.Client/ClientHeartbeatEvent.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace MagicOnion.Client
+{
+    /// <summary>
+    /// Represents a client heartbeat received event.
+    /// </summary>
+    public readonly struct ClientHeartbeatEvent
+    {
+        /// <summary>
+        /// Gets the round trip time (RTT) between client and server.
+        /// </summary>
+        public TimeSpan RoundTripTime { get; }
+
+        public ClientHeartbeatEvent(long roundTripTimeMs)
+        {
+            RoundTripTime = TimeSpan.FromMilliseconds(roundTripTimeMs);
+        }
+    }
+}
diff --git a/...ent/StreamingHubClientHeartbeatManager.cs → ...nal/StreamingHubClientHeartbeatManager.cs b/...ent/StreamingHubClientHeartbeatManager.cs → ...nal/StreamingHubClientHeartbeatManager.cs
@@ -7,46 +7,8 @@
 using MagicOnion.Internal.Buffers;
 using MessagePack;
 
-namespace MagicOnion.Client
+namespace MagicOnion.Client.Internal
 {
-    /// <summary>
-    /// Represents a client heartbeat received event.
-    /// </summary>
-    public readonly struct ClientHeartbeatEvent
-    {
-        /// <summary>
-        /// Gets the round trip time (RTT) between client and server.
-        /// </summary>
-        public TimeSpan RoundTripTime { get; }
-
-        public ClientHeartbeatEvent(long roundTripTimeMs)
-        {
-            RoundTripTime = TimeSpan.FromMilliseconds(roundTripTimeMs);
-        }
-    }
-
-    /// <summary>
-    /// Represents a server heartbeat received event.
-    /// </summary>
-    public readonly struct ServerHeartbeatEvent
-    {
-        /// <summary>
-        /// Gets the server time at when the heartbeat was sent.
-        /// </summary>
-        public DateTimeOffset ServerTime { get; }
-
-        /// <summary>
-        /// Gets the metadata data. The data is only available during event processing.
-        /// </summary>
-        public ReadOnlyMemory<byte> Metadata { get; }
-
-        public ServerHeartbeatEvent(long serverTimeUnixMs, ReadOnlyMemory<byte> metadata)
-        {
-            ServerTime = DateTimeOffset.FromUnixTimeMilliseconds(serverTimeUnixMs);
-            Metadata = metadata;
-        }
-    }
-
     internal class StreamingHubClientHeartbeatManager : IAsyncDisposable
     {
         readonly object gate = new();
@@ -86,7 +48,7 @@ CancellationToken shutdownToken
 #endif
         )
         {
-            this.timeoutTokenSource = new(
+            timeoutTokenSource = new(
 #if NET8_0_OR_GREATER
                 Timeout.InfiniteTimeSpan, timeProvider
 #endif
@@ -97,7 +59,7 @@ CancellationToken shutdownToken
             this.onServerHeartbeatReceived = onServerHeartbeatReceived;
             this.onClientHeartbeatResponseReceived = onClientHeartbeatResponseReceived;
             this.synchronizationContext = synchronizationContext;
-            this.shutdownTokenSource = CancellationTokenSource.CreateLinkedTokenSource(shutdownToken, timeoutTokenSource.Token);
+            shutdownTokenSource = CancellationTokenSource.CreateLinkedTokenSource(shutdownToken, timeoutTokenSource.Token);
 #if NON_UNITY
             this.timeProvider = timeProvider;
 #endif
@@ -188,7 +150,7 @@ SendOrPostCallback ProcessClientHeartbeatResponseCore(Action<ClientHeartbeatEven
                 _ = reader.ReadMessageType();
                 var (sentSequence, clientSentAt) = reader.ReadClientHeartbeatResponse();
 
-                if (sentSequence == (sequence - 1)/* NOTE: Sequence already 1 advanced.*/)
+                if (sentSequence == sequence - 1/* NOTE: Sequence already 1 advanced.*/)
                 {
                     // Cancel the running timeout cancellation timer.
                     timeoutTokenSource.CancelAfter(Timeout.InfiniteTimeSpan);

diff --git a/....Client/StreamingHubResponseTaskSource.cs → ...nternal/StreamingHubResponseTaskSource.cs b/....Client/StreamingHubResponseTaskSource.cs → ...nternal/StreamingHubResponseTaskSource.cs
@@ -4,15 +4,15 @@
 using System.Threading.Tasks;
 using System.Threading.Tasks.Sources;
 
-namespace MagicOnion.Client
+namespace MagicOnion.Client.Internal
 {
     internal class StreamingHubResponseTaskSourcePool<T> : ObjectPool<StreamingHubResponseTaskSource<T>>
     {
         public static StreamingHubResponseTaskSourcePool<T> Shared { get; } = new();
 
         public StreamingHubResponseTaskSourcePool()
             : base(static () => new StreamingHubResponseTaskSource<T>())
-        {}
+        { }
 
         public StreamingHubResponseTaskSource<T> RentOrCreate()
         {

diff --git a/src/MagicOnion.Client/ServerHeartbeatEvent.cs b/src/MagicOnion.Client/ServerHeartbeatEvent.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace MagicOnion.Client
+{
+    /// <summary>
+    /// Represents a server heartbeat received event.
+    /// </summary>
+    public readonly struct ServerHeartbeatEvent
+    {
+        /// <summary>
+        /// Gets the server time at when the heartbeat was sent.
+        /// </summary>
+        public DateTimeOffset ServerTime { get; }
+
+        /// <summary>
+        /// Gets the metadata data. The data is only available during event processing.
+        /// </summary>
+        public ReadOnlyMemory<byte> Metadata { get; }
+
+        public ServerHeartbeatEvent(long serverTimeUnixMs, ReadOnlyMemory<byte> metadata)
+        {
+            ServerTime = DateTimeOffset.FromUnixTimeMilliseconds(serverTimeUnixMs);
+            Metadata = metadata;
+        }
+    }
+}
diff --git a/src/MagicOnion.Client/StreamingHubClientBase.cs b/src/MagicOnion.Client/StreamingHubClientBase.cs
@@ -10,6 +10,7 @@
 using MagicOnion.Internal;
 using MagicOnion.Serialization;
 using MagicOnion.Internal.Buffers;
+using MagicOnion.Client.Internal;
 
 namespace MagicOnion.Client
 {

diff --git a/tests/MagicOnion.Client.Tests/StreamingHubClientHeartbeatManagerTest.cs b/tests/MagicOnion.Client.Tests/StreamingHubClientHeartbeatManagerTest.cs
@@ -1,6 +1,7 @@
 using System.Buffers;
 using System.Diagnostics;
 using System.Threading.Channels;
+using MagicOnion.Client.Internal;
 using MagicOnion.Internal;
 using Microsoft.Extensions.Time.Testing;