Merge pull request #699 from Cysharp/feature/CleanupShared

Cleanup MagicOnion.Shared project
Cysharp · Oct 26, 2023 · 0620a27 · 0620a27
2 parents 6330993 + 566129b
commit 0620a27
Show file tree

Hide file tree

Showing 112 changed files with 323 additions and 1,213 deletions.
diff --git a/perf/SourceGeneratorPerf/SourceGeneratorPerf/CompilationHelper.cs b/perf/SourceGeneratorPerf/SourceGeneratorPerf/CompilationHelper.cs
@@ -27,7 +27,7 @@ public static (Compilation Compilation, SemanticModel SemanticModel) Create(stri
             MetadataReference.CreateFromFile(typeof(MessagePack.MessagePackObjectAttribute).Assembly.Location), // MessagePack.Annotations
             MetadataReference.CreateFromFile(typeof(MagicOnion.IService<>).Assembly.Location), // MagicOnion.Abstractions
             MetadataReference.CreateFromFile(typeof(MagicOnion.Client.MagicOnionClient).Assembly.Location), // MagicOnion.Client
-            MetadataReference.CreateFromFile(typeof(MagicOnion.GrpcMethodHelper).Assembly.Location), // MagicOnion.Shared
+            MetadataReference.CreateFromFile(typeof(MagicOnion.Internal.GrpcMethodHelper).Assembly.Location), // MagicOnion.Shared
         };
         var compilationOptions = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary);
 

diff --git a/src/MagicOnion.Client.SourceGenerator/CodeGen/StaticStreamingHubClientGenerator.cs b/src/MagicOnion.Client.SourceGenerator/CodeGen/StaticStreamingHubClientGenerator.cs
@@ -118,7 +118,7 @@ static void EmitConstructor(StreamingHubClientBuildContext ctx)
                             public {{ctx.Hub.GetClientFullName()}}(global::Grpc.Core.CallInvoker callInvoker, global::System.String host, global::Grpc.Core.CallOptions options, global::MagicOnion.Serialization.IMagicOnionSerializerProvider serializerProvider, global::MagicOnion.Client.IMagicOnionClientLogger logger)
                                 : base(callInvoker, host, options, serializerProvider, logger)
                             {
-                                var marshaller = global::MagicOnion.MagicOnionMarshallers.ThroughMarshaller;
+                                var marshaller = global::MagicOnion.Internal.MagicOnionMarshallers.ThroughMarshaller;
                                 DuplexStreamingAsyncMethod = new global::Grpc.Core.Method<global::System.Byte[], global::System.Byte[]>(global::Grpc.Core.MethodType.DuplexStreaming, "{{ctx.Hub.ServiceType.Name}}", "Connect", marshaller, marshaller);
                             }
             """);

diff --git a/.../Assets/Scripts/MagicOnion/MagicOnion.Client/DynamicClient/DynamicClientAssemblyHolder.cs b/.../Assets/Scripts/MagicOnion/MagicOnion.Client/DynamicClient/DynamicClientAssemblyHolder.cs
@@ -1,5 +1,5 @@
 #if NON_UNITY || ((!ENABLE_IL2CPP || UNITY_EDITOR) && !NET_STANDARD_2_0)
-using MagicOnion.Utils;
+using MagicOnion.Internal.Reflection;
 
 namespace MagicOnion.Client.DynamicClient
 {

diff --git a/...ts/Scripts/MagicOnion/MagicOnion.Client/DynamicClient/DynamicStreamingHubClientBuilder.cs b/...ts/Scripts/MagicOnion/MagicOnion.Client/DynamicClient/DynamicStreamingHubClientBuilder.cs
@@ -1,9 +1,10 @@
 #if NON_UNITY || ((!ENABLE_IL2CPP || UNITY_EDITOR) && !NET_STANDARD_2_0)
 
 using Grpc.Core;
+using MagicOnion.Internal;
+using MagicOnion.Internal.Reflection;
 using MagicOnion.Serialization;
 using MagicOnion.Server.Hubs;
-using MagicOnion.Utils;
 using MessagePack;
 using System;
 using System.Collections.Generic;
@@ -372,7 +373,7 @@ static void DefineMethods(TypeBuilder typeBuilder, Type interfaceType, Type rece
                         }
                         else
                         {
-                            var deserializeType = BroadcasterHelper.dynamicArgumentTupleTypes[parameters.Length - 2]
+                            var deserializeType = BroadcasterHelper.DynamicArgumentTupleTypes[parameters.Length - 2]
                                 .MakeGenericType(parameters.Select(x => x.ParameterType).ToArray());
                             var lc = il.DeclareLocal(deserializeType);
 

diff --git a/...Onion.Client/MagicOnion.Shared/Utils.meta → ...MagicOnion.Client/Internal/Threading.meta b/...Onion.Client/MagicOnion.Shared/Utils.meta → ...MagicOnion.Client/Internal/Threading.meta
diff --git a/...ion.Client/MagicOnion.Shared/AsyncLock.cs → ...on.Client/Internal/Threading/AsyncLock.cs b/...ion.Client/MagicOnion.Shared/AsyncLock.cs → ...on.Client/Internal/Threading/AsyncLock.cs
@@ -2,26 +2,20 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace MagicOnion
+namespace MagicOnion.Client.Internal.Threading
 {
-    public class AsyncLock
+    internal class AsyncLock
     {
         readonly SemaphoreSlim semaphore;
 
-#if NON_UNITY
         public static readonly ValueTask<LockReleaser> EmptyLock = new ValueTask<LockReleaser>(new LockReleaser(null));
-#endif
 
         public AsyncLock()
         {
             this.semaphore = new SemaphoreSlim(1, 1);
         }
 
-#if NON_UNITY
         public async ValueTask<LockReleaser> LockAsync()
-#else
-        public async Task<LockReleaser> LockAsync()
-#endif
         {
             await semaphore.WaitAsync().ConfigureAwait(false);
             return new LockReleaser(semaphore);

diff --git a/...lient/MagicOnion.Shared/AsyncLock.cs.meta → ...ient/Internal/Threading/AsyncLock.cs.meta b/...lient/MagicOnion.Shared/AsyncLock.cs.meta → ...ient/Internal/Threading/AsyncLock.cs.meta
diff --git a/...on.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/Internal/Threading/Tasks.meta b/...on.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/Internal/Threading/Tasks.meta
diff --git a/...on.Shared/Utils/TaskCompletionSourceEx.cs → ...Threading/Tasks/TaskCompletionSourceEx.cs b/...on.Shared/Utils/TaskCompletionSourceEx.cs → ...Threading/Tasks/TaskCompletionSourceEx.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace MagicOnion.Utils
+namespace MagicOnion.Client.Internal.Threading.Tasks
 {
     internal interface ITaskCompletion
     {

diff --git a/...ared/Utils/TaskCompletionSourceEx.cs.meta → ...ding/Tasks/TaskCompletionSourceEx.cs.meta b/...ared/Utils/TaskCompletionSourceEx.cs.meta → ...ding/Tasks/TaskCompletionSourceEx.cs.meta
diff --git a/...nt/MagicOnion.Shared/BroadcasterHelper.cs → ...nion.Shared/Internal/BroadcasterHelper.cs b/...nt/MagicOnion.Shared/BroadcasterHelper.cs → ...nion.Shared/Internal/BroadcasterHelper.cs
@@ -1,15 +1,16 @@
-using MagicOnion.Utils;
+using MagicOnion.Server.Hubs;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Threading.Tasks;
 
-namespace MagicOnion.Server.Hubs
+namespace MagicOnion.Internal
 {
     public static class BroadcasterHelper
     {
-        internal static readonly Type[] dynamicArgumentTupleTypes = typeof(DynamicArgumentTuple<,>).GetTypeInfo().Assembly
+        internal static Type[] DynamicArgumentTupleTypes { get; } = typeof(DynamicArgumentTuple<,>)
+            .GetTypeInfo()
+            .Assembly
             .GetTypes()
             .Where(x => x.Name.StartsWith("DynamicArgumentTuple") && !x.Name.Contains("Formatter"))
             .OrderBy(x => x.GetGenericArguments().Length)

diff --git a/...gicOnion.Shared/BroadcasterHelper.cs.meta → ...Shared/Internal/BroadcasterHelper.cs.meta b/...gicOnion.Shared/BroadcasterHelper.cs.meta → ...Shared/Internal/BroadcasterHelper.cs.meta
diff --git a/...Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/MagicOnion.Shared/Internal/Buffers.meta b/...Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/MagicOnion.Shared/Internal/Buffers.meta
diff --git a/...ion.Shared/Utils/ArrayPoolBufferWriter.cs → ...Internal/Buffers/ArrayPoolBufferWriter.cs b/...ion.Shared/Utils/ArrayPoolBufferWriter.cs → ...Internal/Buffers/ArrayPoolBufferWriter.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Buffers;
-using System.Diagnostics.CodeAnalysis;
 
-namespace MagicOnion.Utils
+namespace MagicOnion.Internal.Buffers
 {
     internal sealed class ArrayPoolBufferWriter : IBufferWriter<byte>, IDisposable
     {

diff --git a/...hared/Utils/ArrayPoolBufferWriter.cs.meta → ...nal/Buffers/ArrayPoolBufferWriter.cs.meta b/...hared/Utils/ArrayPoolBufferWriter.cs.meta → ...nal/Buffers/ArrayPoolBufferWriter.cs.meta
diff --git a/src/MagicOnion.Shared/Utils/FNV1A32.cs → ...ent/MagicOnion.Shared/Internal/FNV1A32.cs b/src/MagicOnion.Shared/Utils/FNV1A32.cs → ...ent/MagicOnion.Shared/Internal/FNV1A32.cs
@@ -1,6 +1,6 @@
-using System.Text;
+using System.Text;
 
-namespace MagicOnion.Utils
+namespace MagicOnion.Internal
 {
     public static class FNV1A32
     {

diff --git a/...t/MagicOnion.Shared/Utils/FNV1A32.cs.meta → ...agicOnion.Shared/Internal/FNV1A32.cs.meta b/...t/MagicOnion.Shared/Utils/FNV1A32.cs.meta → ...agicOnion.Shared/Internal/FNV1A32.cs.meta
diff --git a/src/MagicOnion.Shared/GrpcMethodHelper.cs → ...Onion.Shared/Internal/GrpcMethodHelper.cs b/src/MagicOnion.Shared/GrpcMethodHelper.cs → ...Onion.Shared/Internal/GrpcMethodHelper.cs
@@ -2,11 +2,10 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using Grpc.Core;
-using MagicOnion.Internal;
 using MagicOnion.Serialization;
 using MessagePack;
 
-namespace MagicOnion
+namespace MagicOnion.Internal
 {
     public static class GrpcMethodHelper
     {
@@ -60,7 +59,7 @@ public static MagicOnionMethod<Nil, TResponse, Box<Nil>, TRawResponse> CreateMet
             //             so as a special case we do not serialize/deserialize and always convert to a fixed values.
             var isMethodResponseTypeBoxed = typeof(TResponse).IsValueType;
             var responseMarshaller = isMethodResponseTypeBoxed
-                ? (object)CreateBoxedMarshaller<TResponse>(messageSerializer)
+                ? CreateBoxedMarshaller<TResponse>(messageSerializer)
                 : (object)CreateMarshaller<TResponse>(messageSerializer);
 
             return new MagicOnionMethod<Nil, TResponse, Box<Nil>, TRawResponse>(new Method<Box<Nil>, TRawResponse>(
@@ -82,10 +81,10 @@ public static MagicOnionMethod<TRequest, TResponse, TRawRequest, TRawResponse> C
             var isMethodResponseTypeBoxed = typeof(TResponse).IsValueType;
 
             var requestMarshaller = isMethodRequestTypeBoxed
-                ? (object)CreateBoxedMarshaller<TRequest>(messageSerializer)
+                ? CreateBoxedMarshaller<TRequest>(messageSerializer)
                 : (object)CreateMarshaller<TRequest>(messageSerializer);
             var responseMarshaller = isMethodResponseTypeBoxed
-                ? (object)CreateBoxedMarshaller<TResponse>(messageSerializer)
+                ? CreateBoxedMarshaller<TResponse>(messageSerializer)
                 : (object)CreateMarshaller<TResponse>(messageSerializer);
 
             return new MagicOnionMethod<TRequest, TResponse, TRawRequest, TRawResponse>(new Method<TRawRequest, TRawResponse>(
@@ -103,7 +102,7 @@ public static MagicOnionMethod<TRequest, TResponse, TRawRequest, TRawResponse> C
         public static Marshaller<Box<Nil>> IgnoreNilMarshaller { get; } = new Marshaller<Box<Nil>>(
                 serializer: (obj, ctx) =>
                 {
-                    ReadOnlySpan<byte> unsafeNilBytes = new [] { MessagePackCode.Nil };
+                    ReadOnlySpan<byte> unsafeNilBytes = new[] { MessagePackCode.Nil };
 
                     var writer = ctx.GetBufferWriter();
                     var buffer = writer.GetSpan(unsafeNilBytes.Length); // Write `Nil` as `byte[]` to the buffer.

diff --git a/...agicOnion.Shared/GrpcMethodHelper.cs.meta → ....Shared/Internal/GrpcMethodHelper.cs.meta b/...agicOnion.Shared/GrpcMethodHelper.cs.meta → ....Shared/Internal/GrpcMethodHelper.cs.meta
diff --git a/...agicOnion.Shared/MagicOnionMarshallers.cs → ....Shared/Internal/MagicOnionMarshallers.cs b/...agicOnion.Shared/MagicOnionMarshallers.cs → ....Shared/Internal/MagicOnionMarshallers.cs
@@ -1,13 +1,10 @@
 using Grpc.Core;
 using MessagePack;
-using MessagePack.Formatters;
 using System;
 using System.Linq;
 using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
 
-namespace MagicOnion
+namespace MagicOnion.Internal
 {
     // invoke from dynamic methods so must be public
     public static class MagicOnionMarshallers

diff --git a/...nion.Shared/MagicOnionMarshallers.cs.meta → ...ed/Internal/MagicOnionMarshallers.cs.meta b/...nion.Shared/MagicOnionMarshallers.cs.meta → ...ed/Internal/MagicOnionMarshallers.cs.meta
diff --git a/...ty/Assets/Scripts/MagicOnion/MagicOnion.Client/MagicOnion.Shared/Internal/Reflection.meta b/...ty/Assets/Scripts/MagicOnion/MagicOnion.Client/MagicOnion.Shared/Internal/Reflection.meta
diff --git a/...agicOnion.Shared/Utils/DynamicAssembly.cs → ...ed/Internal/Reflection/DynamicAssembly.cs b/...agicOnion.Shared/Utils/DynamicAssembly.cs → ...ed/Internal/Reflection/DynamicAssembly.cs
@@ -5,7 +5,7 @@
 using System.Reflection.Emit;
 using System.Runtime.CompilerServices;
 
-namespace MagicOnion.Utils
+namespace MagicOnion.Internal.Reflection
 {
 #if ENABLE_SAVE_ASSEMBLY
     public
@@ -32,14 +32,14 @@ public DynamicAssembly(string moduleName)
             this.assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName(moduleName), AssemblyBuilderAccess.RunAndSave);
             this.moduleBuilder = assemblyBuilder.DefineDynamicModule(moduleName, moduleName + ".dll");
 #else
-            this.assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName(moduleName), AssemblyBuilderAccess.Run);
-            this.moduleBuilder = assemblyBuilder.DefineDynamicModule(moduleName);
+            assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName(moduleName), AssemblyBuilderAccess.Run);
+            moduleBuilder = assemblyBuilder.DefineDynamicModule(moduleName);
 #endif
 
             // HACK: Allow access to `internal` classes from dynamically generated assembly.
             // https://www.strathweb.com/2018/10/no-internalvisibleto-no-problem-bypassing-c-visibility-rules-with-roslyn/
-            this.assemblyBuilder.SetCustomAttribute(new CustomAttributeBuilder(typeof(IgnoresAccessChecksToAttribute).GetConstructor(new[] { typeof(string) })!, new[] { "MagicOnion.Client" }));
-            this.assemblyBuilder.SetCustomAttribute(new CustomAttributeBuilder(typeof(IgnoresAccessChecksToAttribute).GetConstructor(new[] { typeof(string) })!, new[] { "MagicOnion.Server" }));
+            assemblyBuilder.SetCustomAttribute(new CustomAttributeBuilder(typeof(IgnoresAccessChecksToAttribute).GetConstructor(new[] { typeof(string) })!, new[] { "MagicOnion.Client" }));
+            assemblyBuilder.SetCustomAttribute(new CustomAttributeBuilder(typeof(IgnoresAccessChecksToAttribute).GetConstructor(new[] { typeof(string) })!, new[] { "MagicOnion.Server" }));
         }
 
         // requires lock on mono environment(for example, UnityEditor). see: https://github.com/neuecc/MessagePack-CSharp/issues/161

diff --git a/...nion.Shared/Utils/DynamicAssembly.cs.meta → ...ternal/Reflection/DynamicAssembly.cs.meta b/...nion.Shared/Utils/DynamicAssembly.cs.meta → ...ternal/Reflection/DynamicAssembly.cs.meta
diff --git a/...ion.Shared/Utils/ILGeneratorExtensions.cs → ...ernal/Reflection/ILGeneratorExtensions.cs b/...ion.Shared/Utils/ILGeneratorExtensions.cs → ...ernal/Reflection/ILGeneratorExtensions.cs
@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Reflection.Emit;
 
-namespace MagicOnion.Utils
+namespace MagicOnion.Internal.Reflection
 {
     // full list of can create optimize helper -> https://github.com/kevin-montrose/Sigil#automated-opcode-choice
 
@@ -161,7 +161,7 @@ public static void EmitNullReturn(this ILGenerator il)
 
         public static void EmitThrowNotimplemented(this ILGenerator il)
         {
-            il.Emit(OpCodes.Newobj, typeof(System.NotImplementedException).GetConstructor(Type.EmptyTypes)!);
+            il.Emit(OpCodes.Newobj, typeof(NotImplementedException).GetConstructor(Type.EmptyTypes)!);
             il.Emit(OpCodes.Throw);
         }
     }

diff --git a/...hared/Utils/ILGeneratorExtensions.cs.meta → .../Reflection/ILGeneratorExtensions.cs.meta b/...hared/Utils/ILGeneratorExtensions.cs.meta → .../Reflection/ILGeneratorExtensions.cs.meta
diff --git a/...ity/Assets/Scripts/MagicOnion/MagicOnion.Client/MagicOnion.Shared/Utils/AsyncLocalShim.cs b/...ity/Assets/Scripts/MagicOnion/MagicOnion.Client/MagicOnion.Shared/Utils/AsyncLocalShim.cs
diff --git a/...ssets/Scripts/MagicOnion/MagicOnion.Client/MagicOnion.Shared/Utils/AsyncLocalShim.cs.meta b/...ssets/Scripts/MagicOnion/MagicOnion.Client/MagicOnion.Shared/Utils/AsyncLocalShim.cs.meta