первый пул рефакторинга

Example.Backend/LoadTestImp.cs

@@ -1,5 +1,4 @@
 using Example.Shared;
-using mROA.Implementation;
 using mROA.Implementation.Attributes;
 
 namespace Example.Backend;

Example.Backend/PrinterFactory.cs

@@ -1,4 +1,3 @@
-using Example.Backend;
 using Example.Shared;
 using mROA.Implementation;
 using mROA.Implementation.Attributes;

Example.Frontend/Program.cs

@@ -1,4 +1,6 @@
-using System.Net;
+using System.Diagnostics;
+using System.Net;
+using System.Text;
 using Example.Frontend;
 using Example.Shared;
 using mROA.Codegen;
@@ -56,22 +58,21 @@ var names = factory.CollectAllNames();
 Thread.Sleep(100);
 
 Console.WriteLine(string.Join(", ", names));
-Console.ReadLine();
 
-// var page = await printer.Value.Print("Test Page", new CancellationToken());
-// var data = page.Value.GetData();
-// Console.WriteLine("Data : {0}", Encoding.UTF8.GetString(data));
-//
-// var loadSingleton = context.GetSingleObject(typeof(ILoadTest)) as ILoadTest;
-//
-// const int iterations = 10000;
-// var timer = Stopwatch.StartNew();
-// var x = 0;
-// for (int i = 0; i < iterations; i++)
-// {
-//     x = loadSingleton.Next(x);
-// }
-//
-// timer.Stop();
-// Console.WriteLine("X is {0}", x);
-// Console.WriteLine("Time : {0}", timer.Elapsed.TotalMilliseconds);
+var page = printer.Value.Print("Test Page", new CancellationToken()).GetAwaiter().GetResult();
+var data = page.Value.GetData();
+Console.WriteLine("Data : {0}", Encoding.UTF8.GetString(data));
+
+var loadSingleton = context.GetSingleObject(typeof(ILoadTest)) as ILoadTest;
+
+const int iterations = 10000;
+var timer = Stopwatch.StartNew();
+var x = 0;
+for (int i = 0; i < iterations; i++)
+{
+    x = loadSingleton.Next(x);
+}
+
+timer.Stop();
+Console.WriteLine("X is {0}", x);
+Console.WriteLine("Time : {0}", timer.Elapsed.TotalMilliseconds);

Example.Shared/ILoadTest.cs

@@ -1,5 +1,4 @@
-using mROA.Implementation;
-using mROA.Implementation.Attributes;
+using mROA.Implementation.Attributes;
 
 namespace Example.Shared;
 

Example.Shared/IPage.cs

@@ -1,4 +1,3 @@
-using mROA.Implementation;
 using mROA.Implementation.Attributes;
 
 namespace Example.Shared;

Example.Shared/IPrinterFactory.cs

@@ -1,5 +1,3 @@
-using System.Collections.Frozen;
-using mROA.Abstract;
 using mROA.Implementation;
 using mROA.Implementation.Attributes;
 

mROA.Benchmark/Program.cs

@@ -1,5 +1,4 @@
-using System.Collections.Immutable;
-using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Running;
 
 namespace mROA.Benchmark;

mROA/Abstract/ISerialisationModule.cs

@@ -1,4 +1,3 @@
-using System.Windows.Input;
 using mROA.Implementation;
 
 namespace mROA.Abstract;
@@ -24,8 +23,8 @@ public interface IRepresentationModule : IInjectableModule
     T GetMessage<T>(Guid? requestId = null, MessageType? messageType = null);
     Task<byte[]> GetRawMessage(Guid? requestId = null, MessageType? messageType = null);
     
-    Task PostCallMessageAsync<T>(Guid id, MessageType messageType, T payload);
+    Task PostCallMessageAsync<T>(Guid id, MessageType messageType, T payload) where T : notnull;
     Task PostCallMessageAsync(Guid id, MessageType messageType, object payload, Type payloadType);
-    void PostCallMessage<T>(Guid id, MessageType messageType, T payload);
+    void PostCallMessage<T>(Guid id, MessageType messageType, T payload) where T : notnull;
     void PostCallMessage(Guid id, MessageType messageType, object payload, Type payloadType); 
 }

mROA/Implementation/CommandExecution/ExceptionCommandExecution.cs

@@ -1,5 +1,4 @@
-using System.Text.Json;
-using mROA.Abstract;
+using mROA.Abstract;
 using mROA.Implementation.Frontend;
 
 namespace mROA.Implementation;

mROA/Implementation/CreativeSerializationModuleProducer.cs

@@ -1,6 +1,4 @@
 using mROA.Abstract;
-using mROA.Implementation.Backend;
-using mROA.Implementation.Frontend;
 
 namespace mROA.Implementation;
 

mROA/Implementation/Frontend/JsonFrontendSerialisationModule.cs

@@ -1,7 +1,3 @@
-using System.Text;
-using System.Text.Json;
-using mROA.Abstract;
-
 namespace mROA.Implementation.Frontend;
 
 // public class JsonFrontendSerialisationModule

mROA/Implementation/Frontend/NetworkFrontendBridge.cs

@@ -1,7 +1,5 @@
 using System.Net;
 using System.Net.Sockets;
-using System.Text;
-using System.Text.Json;
 using mROA.Abstract;
 
 namespace mROA.Implementation.Frontend;

mROA/Implementation/Frontend/StreamBasedFrontendInteractionModule.cs

@@ -1,5 +1,3 @@
-using mROA.Abstract;
-
 namespace mROA.Implementation.Frontend;
 
 // public class StreamBasedFrontendInteractionModule : IInteractionModule.IFrontendInteractionModule

mROA/Implementation/JsonSerializationToolkit.cs

@@ -26,12 +26,12 @@ public class JsonSerializationToolkit : ISerializationToolkit
 
     public T Cast<T>(object nonCasted)
     {
-        if (nonCasted is JsonElement jsonElement)
-            return jsonElement.Deserialize<T>()!;
-        if (nonCasted is T casted)
-            return casted;
-
-        throw new JsonException("Cannot cast object to type " + typeof(T).FullName);
+        return nonCasted switch
+        {
+            JsonElement jsonElement => jsonElement.Deserialize<T>()!,
+            T casted => casted,
+            _ => throw new JsonException("Cannot cast object to type " + typeof(T).FullName)
+        };
     }
 
     public object Cast(object nonCasted, Type type)

mROA/Implementation/NetworkMessage.cs

@@ -1,18 +1,17 @@
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using mROA.Abstract;
+using System.Text.Json.Serialization;
 
 namespace mROA.Implementation;
 
 public class NetworkMessage
 {
-    public Guid Id { get; set; }
+    public Guid Id { get; init; }
     [JsonConverter(typeof(JsonStringEnumConverter))]
-    public MessageType SchemaId { get; set; }
-    public byte[] Data { get; set; }
+    public MessageType SchemaId { get; init; }
+
+    public required byte[] Data { get; init; }
 }
 
 public enum MessageType
 {
-    Unknown, FinishedCommandExecution, ExceptionCommandExecution, AcyncCancelCommandExecution, CallRequest, IdAssigning 
+    Unknown, FinishedCommandExecution, ExceptionCommandExecution, AsyncCancelCommandExecution, CallRequest, IdAssigning 
 }

mROA/Implementation/NextGenerationInteractionModule.cs

@@ -1,5 +1,4 @@
-using System.Text;
-using mROA.Abstract;
+using mROA.Abstract;
 
 namespace mROA.Implementation;
 
@@ -11,7 +10,7 @@ public class NextGenerationInteractionModule : INextGenerationInteractionModule
     private Task<NetworkMessage>? _currentReceiving;
     private const int BufferSize = ushort.MaxValue;
     private readonly byte[] _buffer = new byte[BufferSize];
-    private List<NetworkMessage> _messageBuffer = [];
+    private readonly List<NetworkMessage> _messageBuffer = [];
 
 
     public void Inject<T>(T dependency)
@@ -32,13 +31,10 @@ public class NextGenerationInteractionModule : INextGenerationInteractionModule
     {
         // Console.WriteLine(_currentReceiving?.Status);
 
-        if (_currentReceiving == null)
-        {
-            _currentReceiving = Task.Run(GetNextMessage);
-            return _currentReceiving;
-        }
-
+        if (_currentReceiving != null) return _currentReceiving;
+        _currentReceiving = Task.Run(GetNextMessage);
         return _currentReceiving;
+
     }
 
     public async Task PostMessage(NetworkMessage message)
@@ -46,6 +42,9 @@ public class NextGenerationInteractionModule : INextGenerationInteractionModule
         if (BaseStream == null)
             throw new NullReferenceException("BaseStream is null");
 
+        if (_serialization == null)
+            throw new NullReferenceException("Serialization toolkit is not initialized");
+        
         // Console.WriteLine("Sending {0}", JsonSerializer.Serialize(message));
 
 

mROA/Implementation/RemoteContextRepository.cs

@@ -5,8 +5,8 @@ namespace mROA.Implementation;
 
 public class RemoteContextRepository : IContextRepository
 {
-    private IRepresentationModuleProducer _representationProducer;
-    public static FrozenDictionary<Type, Type> RemoteTypes;
+    private IRepresentationModuleProducer? _representationProducer;
+    public static FrozenDictionary<Type, Type> RemoteTypes = FrozenDictionary<Type, Type>.Empty;
     public int ResisterObject(object o)
     {
         throw new NotSupportedException();
@@ -24,16 +24,19 @@ public class RemoteContextRepository : IContextRepository
 
     public T GetObject<T>(int id)
     {
-        if (RemoteTypes.TryGetValue(typeof(T), out var remoteType))
-        {
-            var remote = (T)Activator.CreateInstance(remoteType, id, _representationProducer.Produce(TransmissionConfig.OwnershipRepository!.GetOwnershipId()))!;
-            return remote;
-        }
-        throw new NotSupportedException();
+        if (_representationProducer == null)
+            throw new NullReferenceException("representation producer is not initialized");
+        
+        if (!RemoteTypes.TryGetValue(typeof(T), out var remoteType)) throw new NotSupportedException();
+        var remote = (T)Activator.CreateInstance(remoteType, id, _representationProducer.Produce(TransmissionConfig.OwnershipRepository.GetOwnershipId()))!;
+        return remote;
     }
 
     public object GetSingleObject(Type type)
     {
+        if (_representationProducer == null)
+            throw new NullReferenceException("representation producer is not initialized");
+        
         return Activator.CreateInstance(RemoteTypes[type], -1, _representationProducer.Produce(TransmissionConfig.OwnershipRepository.GetOwnershipId()))!;
     }
 

mROA/Implementation/RemoteObjectBase.cs

@@ -1,32 +1,25 @@
-using mROA.Implementation;
+using mROA.Abstract;
+
 // ReSharper disable UnusedMember.Global
 
-namespace mROA.Abstract;
+namespace mROA.Implementation;
 
-public abstract class RemoteObjectBase
+public abstract class RemoteObjectBase(int id, IRepresentationModule representationModule)
 {
-    private readonly int _id;
-    private readonly IRepresentationModule _representationModule;
-    public int Id => _id;
-    public int OwnerId => _representationModule.Id;
+    public int Id => id;
+    public int OwnerId => representationModule.Id;
 
-    public RemoteObjectBase(int id, IRepresentationModule representationModule)
-    {
-        _id = id;
-        _representationModule = representationModule;
-    }
-
-    public async Task<T> GetResultAsync<T>(int methodId, object? parameter = default)
+    protected async Task<T> GetResultAsync<T>(int methodId, object? parameter = default)
     {
         var request = new DefaultCallRequest
-            { CommandId = methodId, ObjectId = _id, Parameter = parameter, ParameterType = parameter?.GetType() };
-        await _representationModule.PostCallMessageAsync(request.Id, MessageType.CallRequest, request);
+            { CommandId = methodId, ObjectId = id, Parameter = parameter, ParameterType = parameter?.GetType() };
+        await representationModule.PostCallMessageAsync(request.Id, MessageType.CallRequest, request);
 
         var successResponse =
-            _representationModule.GetMessageAsync<FinalCommandExecution<T>>(
+            representationModule.GetMessageAsync<FinalCommandExecution<T>>(
                 messageType: MessageType.FinishedCommandExecution, requestId: request.Id);
         var errorResponse =
-            _representationModule.GetMessageAsync<ExceptionCommandExecution>(
+            representationModule.GetMessageAsync<ExceptionCommandExecution>(
                 messageType: MessageType.ExceptionCommandExecution, requestId: request.Id);
         Task.WaitAny(successResponse, errorResponse);
 
@@ -36,17 +29,17 @@ public abstract class RemoteObjectBase
         throw errorResponse.Result.GetException();
     }
 
-    public async Task CallAsync(int methodId, object? parameter = default)
+    protected async Task CallAsync(int methodId, object? parameter = default)
     {
         var request = new DefaultCallRequest
-            { CommandId = methodId, ObjectId = _id, Parameter = parameter, ParameterType = parameter?.GetType() };
-        await _representationModule.PostCallMessageAsync(request.Id, MessageType.CallRequest, request);
+            { CommandId = methodId, ObjectId = id, Parameter = parameter, ParameterType = parameter?.GetType() };
+        await representationModule.PostCallMessageAsync(request.Id, MessageType.CallRequest, request);
 
         var successResponse =
-            _representationModule.GetMessageAsync<FinalCommandExecution>(
+            representationModule.GetMessageAsync<FinalCommandExecution>(
                 messageType: MessageType.FinishedCommandExecution, requestId: request.Id);
         var errorResponse =
-            _representationModule.GetMessageAsync<ExceptionCommandExecution>(
+            representationModule.GetMessageAsync<ExceptionCommandExecution>(
                 messageType: MessageType.ExceptionCommandExecution, requestId: request.Id);
 
         Task.WaitAny(successResponse, errorResponse);

mROA/Implementation/RepresentationModule.cs

@@ -1,12 +1,11 @@
-using System.Text.Json;
-using mROA.Abstract;
+using mROA.Abstract;
 
 namespace mROA.Implementation;
 
 public class RepresentationModule : IRepresentationModule
 {
-    private ISerializationToolkit _serialization;
-    private INextGenerationInteractionModule _interaction;
+    private ISerializationToolkit? _serialization;
+    private INextGenerationInteractionModule? _interaction;
 
     public void Inject<T>(T dependency)
     {
@@ -21,20 +20,29 @@ public class RepresentationModule : IRepresentationModule
         }
     }
 
-    public int Id => _interaction.ConnectionId;
+    public int Id => (_interaction ?? throw new NullReferenceException("Interaction is not initialized")).ConnectionId;
 
     public async Task<T> GetMessageAsync<T>(Guid? requestId, MessageType? messageType)
     {
+        if (_serialization == null)
+            throw new NullReferenceException("Serialization toolkit is not initialized");
+        
         return _serialization.Deserialize<T>(await GetRawMessage(requestId, messageType))!;
     }
 
     public T GetMessage<T>(Guid? requestId = null, MessageType? messageType = null)
     {
+        if (_serialization == null)
+            throw new NullReferenceException("Serialization toolkit is not initialized");
+        
         return _serialization.Deserialize<T>(GetRawMessage(requestId, messageType).GetAwaiter().GetResult())!;
     }
 
     public async Task<byte[]> GetRawMessage(Guid? requestId = null, MessageType? messageType = null)
     {
+        if (_interaction == null)
+            throw new NullReferenceException("Interaction toolkit is not initialized");
+        
         var fromBuffer =
             _interaction.UnhandledMessages.FirstOrDefault(message =>
                 (requestId is null || message.Id == requestId) &&
@@ -44,12 +52,11 @@ public class RepresentationModule : IRepresentationModule
             while (true)
             {
                 var message = await _interaction.GetNextMessageReceiving();
-                if ((requestId is null || message.Id == requestId) &&
-                    (messageType is null || message.SchemaId == messageType))
-                {
-                    _interaction.HandleMessage(message);
-                    return message.Data;
-                }
+                if ((requestId is not null && message.Id != requestId) ||
+                    (messageType is not null && message.SchemaId != messageType)) continue;
+                
+                _interaction.HandleMessage(message);
+                return message.Data;
             }
         }
 
@@ -57,18 +64,23 @@ public class RepresentationModule : IRepresentationModule
         return fromBuffer.Data;
     }
 
-    public async Task PostCallMessageAsync<T>(Guid id, MessageType messageType, T payload)
+    public async Task PostCallMessageAsync<T>(Guid id, MessageType messageType, T payload) where T : notnull
     {
         await PostCallMessageAsync(id, messageType, payload, typeof(T));
     }
 
     public async Task PostCallMessageAsync(Guid id, MessageType messageType, object payload, Type payloadType)
     {
+        if (_interaction == null)
+            throw new NullReferenceException("Interaction toolkit is not initialized");
+        if (_serialization == null)
+            throw new NullReferenceException("Serialization toolkit is not initialized");
+        
         await _interaction.PostMessage(new NetworkMessage
             { Id = id, SchemaId = messageType, Data = _serialization.Serialize(payload, payloadType) });
     }
 
-    public void PostCallMessage<T>(Guid id, MessageType messageType, T payload)
+    public void PostCallMessage<T>(Guid id, MessageType messageType, T payload) where T : notnull
     {
         PostCallMessageAsync(id, messageType, payload).GetAwaiter().GetResult();
     }

mROA/Implementation/SharedObject.cs

@@ -1,5 +1,7 @@
 using System.Text.Json.Serialization;
 using mROA.Abstract;
+// ReSharper disable UnusedMember.Global
+#pragma warning disable CS8618, CS9264
 
 namespace mROA.Implementation;
 
@@ -32,7 +34,7 @@ public static class TransmissionConfig
 public class SharedObject<T> where T : notnull
 {
     private IContextRepository GetDefaultContextRepository() =>
-        (OwnerId == TransmissionConfig.OwnershipRepository!.GetHostOwnershipId()
+        (OwnerId == TransmissionConfig.OwnershipRepository.GetHostOwnershipId()
             ? TransmissionConfig.RealContextRepository
             : TransmissionConfig.RemoteEndpointContextRepository) ??
         throw new NullReferenceException(
@@ -45,10 +47,10 @@ public class SharedObject<T> where T : notnull
     {
         get
         {
-            _ownerId = _ownerId == -1 ? TransmissionConfig.OwnershipRepository!.GetOwnershipId() : _ownerId;
+            _ownerId = _ownerId == -1 ? TransmissionConfig.OwnershipRepository.GetOwnershipId() : _ownerId;
             return _ownerId;
         }
-        set => _ownerId = value;
+        init => _ownerId = value;
     }
 
     // ReSharper disable once MemberCanBePrivate.Global
@@ -60,7 +62,7 @@ public class SharedObject<T> where T : notnull
             if (_contextId != -2)
                 return _contextId;
 
-            _contextId = TransmissionConfig.RealContextRepository!.GetObjectIndex(Value);
+            _contextId = TransmissionConfig.RealContextRepository.GetObjectIndex(Value);
             return _contextId;
         }
         init
@@ -70,9 +72,10 @@ public class SharedObject<T> where T : notnull
         }
     }
 
-    [JsonIgnore] public T Value { get; private set; }
+    [JsonIgnore] public T Value { get; private init; }
 
     // ReSharper disable once MemberCanBePrivate.Global
+    // ReSharper disable once UnusedMember.Global
     public SharedObject()
     {
     }
@@ -88,7 +91,7 @@ public class SharedObject<T> where T : notnull
             _contextId = ro.Id;
         }
         else
-            _ownerId = TransmissionConfig.OwnershipRepository!.GetHostOwnershipId();
+            _ownerId = TransmissionConfig.OwnershipRepository.GetHostOwnershipId();
     }
 
     public static implicit operator T(SharedObject<T> value) => value.Value;

mROA/Implementation/StaticRepresentationModuleProducer.cs

@@ -4,16 +4,18 @@ namespace mROA.Implementation;
 
 public class StaticRepresentationModuleProducer : IRepresentationModuleProducer
 {
-    private IRepresentationModule _reprModule;
+    private IRepresentationModule? _representationModule;
  
     public IRepresentationModule Produce(int ownership)
     {
-        return _reprModule;
+        if (_representationModule == null)
+            throw new NullReferenceException("The representation module is not initialized.");
+        return _representationModule;
     }
     
     public void Inject<T>(T dependency)
     {
         if (dependency is IRepresentationModule serialisationModule)
-            _reprModule = serialisationModule;
+            _representationModule = serialisationModule;
     }
 }