переделывание тестов

mROA.Codegen/SampleIncrementalSourceGenerator.cs

@@ -116,7 +116,7 @@ namespace {Namespace}
             foreach (var method in methodBody)
             {
                 var index = methods.Count;
-                methods.Add((namespaceName + "." + className, method));
+                methods.Add((namespaceName + "." + originalName, method));
                 var sb = new StringBuilder();
 
                 //Creating signature
@@ -230,6 +230,14 @@ public class CoCodegenMethodRepository :IMethodRepository
     {{
         return _methods;
     }}
+
+    public void Inject<T>(T dependency)
+    {{
+    }}
+
+    public void Bake()
+    {{
+    }}
 }}
 ";
         context.AddSource($"CoCodegenMethodRepository.g.cs", SourceText.From(coCodegenRepoCode, Encoding.UTF8));
@@ -237,10 +245,11 @@ public class CoCodegenMethodRepository :IMethodRepository
         var fronendRepoCode = @$"// <auto-generated/>
 using System.Collections.Frozen;
 
-namespace mROA.Implementation;
+namespace mROA.Codegen;
 
-public class FrontendContextRepository(ISerialisationModule.IFrontendSerialisationModule serialisationModule) : IContextRepository
+public class FrontendContextRepository : IContextRepository
 {{
+    private ISerialisationModule.IFrontendSerialisationModule _serialisationModule;
     private static readonly FrozenDictionary<Type, Type> _remoteTypes = new Dictionary<Type, Type> {{
         {string.Join(", \r\n\t\t", frontendContextRepo)}}}.ToFrozenDictionary();
     
@@ -263,7 +272,7 @@ public class FrontendContextRepository(ISerialisationModule.IFrontendSerialisati
     {{
         if (_remoteTypes.TryGetValue(typeof(T), out var remoteType))
         {{
-            var remote = (T)Activator.CreateInstance(remoteType, id, serialisationModule)!;
+            var remote = (T)Activator.CreateInstance(remoteType, id, _serialisationModule)!;
             return remote;
         }}
         throw new NotSupportedException();
@@ -271,7 +280,7 @@ public class FrontendContextRepository(ISerialisationModule.IFrontendSerialisati
 
     public object GetSingleObject(Type type)
     {{
-        return Activator.CreateInstance(_remoteTypes[type], -1, serialisationModule)!;
+        return Activator.CreateInstance(_remoteTypes[type], -1, _serialisationModule)!;
     }}
 
     public int GetObjectIndex(object o)
@@ -282,6 +291,16 @@ public class FrontendContextRepository(ISerialisationModule.IFrontendSerialisati
         }}
         throw new NotSupportedException();
     }}
+
+    public void Inject<T>(T dependency)
+    {{
+        if (dependency is ISerialisationModule.IFrontendSerialisationModule serialisationModule)
+            _serialisationModule = serialisationModule;
+    }}
+
+    public void Bake()
+    {{
+    }}
 }}
 ";
         context.AddSource("FrontendContextRepository.g.cs", SourceText.From(fronendRepoCode, Encoding.UTF8));

mROA.Codegen/obj/Debug/netstandard2.0/mROA.Codegen.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("mROA.Codegen")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ad2ef8e4b754b4cb2c5d3dbaa5c24f15201dd0f9")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fd1eda26618b8cebe94eaa0e27ce5e97353d2d09")]
 [assembly: System.Reflection.AssemblyProductAttribute("mROA.Codegen")]
 [assembly: System.Reflection.AssemblyTitleAttribute("mROA.Codegen")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

mROA.Codegen/obj/mROA.Codegen.csproj.nuget.g.props

@@ -5,18 +5,18 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Mikhail\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Mimm\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
     <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.12.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\Mikhail\.nuget\packages\" />
+    <SourceRoot Include="C:\Users\Mimm\.nuget\packages\" />
     <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <Import Project="$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.props')" />
   </ImportGroup>
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <PkgMicrosoft_CodeAnalysis_Analyzers Condition=" '$(PkgMicrosoft_CodeAnalysis_Analyzers)' == '' ">C:\Users\Mikhail\.nuget\packages\microsoft.codeanalysis.analyzers\3.3.4</PkgMicrosoft_CodeAnalysis_Analyzers>
+    <PkgMicrosoft_CodeAnalysis_Analyzers Condition=" '$(PkgMicrosoft_CodeAnalysis_Analyzers)' == '' ">C:\Users\Mimm\.nuget\packages\microsoft.codeanalysis.analyzers\3.3.4</PkgMicrosoft_CodeAnalysis_Analyzers>
   </PropertyGroup>
 </Project>

mROA.Example/Main.cs

@@ -1,7 +1,4 @@
-
 using System.Runtime.InteropServices;
-using mROA.Codegen;
-using mROA.Implementation.Test;
 
 namespace mROA.Example;
 
@@ -21,5 +18,6 @@ public class MainX
         var size = Marshal.SizeOf(typeof(T));
         var place = Marshal.AllocHGlobal(size);
         var pt = (T*)place;
+        return [];
     }
 }

mROA.Example/obj/Debug/net9.0/mROA.Example.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("mROA.Example")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ad2ef8e4b754b4cb2c5d3dbaa5c24f15201dd0f9")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fd1eda26618b8cebe94eaa0e27ce5e97353d2d09")]
 [assembly: System.Reflection.AssemblyProductAttribute("mROA.Example")]
 [assembly: System.Reflection.AssemblyTitleAttribute("mROA.Example")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

mROA.Example/obj/mROA.Example.csproj.nuget.g.props

@@ -5,12 +5,12 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Mikhail\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Mimm\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
     <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.12.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\Mikhail\.nuget\packages\" />
+    <SourceRoot Include="C:\Users\Mimm\.nuget\packages\" />
     <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
 </Project>

mROA.Test/FrontendFinalTest.cs

@@ -1,6 +1,8 @@
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
+using mROA.Abstract;
+using mROA.Codegen;
 using mROA.Example;
 using mROA.Implementation;
 
@@ -21,20 +23,32 @@ public class FrontendFinalTest
     [SetUp]
     public void Setup()
     {
-        var repo = new MethodRepository();
+        _methodRepository = new CoCodegenMethodRepository();
-        repo.CollectForAssembly(Assembly.GetExecutingAssembly());
-        _methodRepository = repo;
         var repo2 = new ContextRepository();
-        repo2.FillSingletons(Assembly.GetExecutingAssembly());
+        repo2.FillSingletons(typeof(ITestController).Assembly);
         _contextRepository = repo2;
+        
         _interactionModule = new StreamBasedInteractionModule();
 
-        _serialisationModule = new JsonSerialisationModule(_interactionModule, _methodRepository);
+        _serialisationModule = new JsonSerialisationModule();
 
-        _executeModule = new LaunchReadyExecutionModule(_methodRepository, _serialisationModule, _contextRepository);
+        _executeModule = new LaunchReadyExecutionModule();
+        
+        IInjectableModule[] backendModules = [_methodRepository, _contextRepository, _interactionModule, _serialisationModule, _executeModule];
+        
+        foreach (var backendModule in backendModules)
+        foreach (var injection in backendModules)
+            backendModule.Inject(injection);
 
         _frontendInteractionModule = new StreamBasedFrontendInteractionModule();
-        _frontendSerialisationModule = new JsonFrontendSerialisationModule(_frontendInteractionModule);
+        _frontendSerialisationModule = new JsonFrontendSerialisationModule();
+        _frontendContextRepository = new FrontendContextRepository();
+        
+        IInjectableModule[] frontendModules = [_frontendInteractionModule, _frontendSerialisationModule, _frontendContextRepository];
+
+        foreach (var backendModule in frontendModules)
+        foreach (var injection in frontendModules)
+            backendModule.Inject(injection);
         
         Task.Run(() =>
         {

mROA.Test/StreamTest.cs

@@ -1,66 +1,65 @@
-using System.Net;
+// using System.Net;
-using System.Net.Sockets;
+// using System.Net.Sockets;
-using System.Text.Json;
+// using System.Text.Json;
-using mROA.Implementation;
+// using mROA.Implementation;
-using mROA.Implementation.Test;
+//
-
+// namespace mROA.Test;
-namespace mROA.Test;
+//
-
+// public class StreamTest
-public class StreamTest
+// {
-{
+//     private StreamBasedInteractionModule _interactionModule;
-    private StreamBasedInteractionModule _interactionModule;
+//     private StreamBasedFrontendInteractionModule _frontendInteractionModule;
-    private StreamBasedFrontendInteractionModule _frontendInteractionModule;
+//     private JsonFrontendSerialisationModule _frontendSerialisationModule;
-    private JsonFrontendSerialisationModule _frontendSerialisationModule;
+//     private ISerialisationModule _serialisationModule;
-    private ISerialisationModule _serialisationModule;
+//     private IExecuteModule _executeModule;
-    private IExecuteModule _executeModule;
+//     bool isTestNotFinished = true;
-    bool isTestNotFinished = true;
+//
-
+//     [SetUp]
-    [SetUp]
+//     public void Setup()
-    public void Setup()
+//     {
-    {
+//         _interactionModule = new StreamBasedInteractionModule();
-        _interactionModule = new StreamBasedInteractionModule();
+//
-
+//         _serialisationModule = new JsonSerialisationModule(_interactionModule, new MockMethodRepository());
-        _serialisationModule = new JsonSerialisationModule(_interactionModule, new MockMethodRepository());
+//
-
+//         _executeModule = new MockExecModule();
-        _executeModule = new MockExecModule();
+//         _serialisationModule.SetExecuteModule(_executeModule);
-        _serialisationModule.SetExecuteModule(_executeModule);
+//
-
+//         _frontendInteractionModule = new StreamBasedFrontendInteractionModule();
-        _frontendInteractionModule = new StreamBasedFrontendInteractionModule();
+//         _frontendSerialisationModule = new JsonFrontendSerialisationModule(_frontendInteractionModule);
-        _frontendSerialisationModule = new JsonFrontendSerialisationModule(_frontendInteractionModule);
+//
-        
+//         Task.Run(() =>
-        Task.Run(() =>
+//         {
-        {
+//             TcpListener listener = new TcpListener(IPAddress.Loopback, 4567);
-            TcpListener listener = new TcpListener(IPAddress.Loopback, 4567);
+//             listener.Start();
-            listener.Start();
+//
-
+//             var stream = listener.AcceptTcpClient().GetStream();
-            var stream = listener.AcceptTcpClient().GetStream();
+//
-
+//             Console.WriteLine("Client connected");
-            Console.WriteLine("Client connected");
+//
-
+//             _interactionModule.RegisterSourse(stream);
-            _interactionModule.RegisterSourse(stream);
+//
-
+//             while (isTestNotFinished) ;
-            while (isTestNotFinished) ;
+//         });
-        });
+//     }
-    }
+//
-
+//     [Test]
-    [Test]
+//     public void StreamingTest()
-    public void StreamingTest()
+//     {
-    {
+//         var tcpClient = new TcpClient();
-        var tcpClient = new TcpClient();
+//         tcpClient.Connect(IPAddress.Loopback, 4567);
-        tcpClient.Connect(IPAddress.Loopback, 4567);
+//         _frontendInteractionModule.ServerStream = tcpClient.GetStream();
-        _frontendInteractionModule.ServerStream = tcpClient.GetStream();
+//
-        
+//         var req = new DefaultCallRequest { CommandId = 1, ObjectId = -1 };
-        var req = new DefaultCallRequest { CommandId = 1, ObjectId = -1 };
+//         _frontendSerialisationModule.PostCallRequest(req);
-        _frontendSerialisationModule.PostCallRequest(req);
+//         var res = ((JsonElement)_frontendSerialisationModule
-        var res = ((JsonElement)_frontendSerialisationModule.GetNextCommandExecution<FinalCommandExecution>(req.CallRequestId).GetAwaiter().GetResult().Result!).Deserialize<MockResult>();
+//                 .GetNextCommandExecution<FinalCommandExecution>(req.CallRequestId).GetAwaiter().GetResult().Result!)
-        isTestNotFinished = false;
+//             .Deserialize<MockResult>();
-        Assert.That(res.A == "wqer" && res.B == 5);
+//         isTestNotFinished = false;
-    }
+//         Assert.That(res.A == "wqer" && res.B == 5);
-
+//     }
-    [Test]
+//
-    public void RemoteObjectTest()
+//     [Test]
-    {
+//     public void RemoteObjectTest()
-        
+//     {
-    }
+//     }
-    
+// }
-}

mROA.Test/UnitTest1.cs

@@ -1,154 +1,154 @@
-using System.Diagnostics;
+// using System.Diagnostics;
-using System.Reflection;
+// using System.Reflection;
-using System.Text;
+// using System.Text;
-using System.Text.Json;
+// using System.Text.Json;
-using mROA.Example;
+// using mROA.Example;
-using mROA.Implementation;
+// using mROA.Implementation;
-using Newtonsoft.Json;
+// using Newtonsoft.Json;
-using JsonSerializer = System.Text.Json.JsonSerializer;
+// using JsonSerializer = System.Text.Json.JsonSerializer;
-
+//
-namespace mROA.Test;
+// namespace mROA.Test;
-
+//
-public class Tests
+// public class Tests
-{
+// {
-    private ProgramlyInteractionChanel _interactionModule;
+//     private ProgramlyInteractionChanel _interactionModule;
-    private ISerialisationModule _serialisationModule;
+//     private ISerialisationModule _serialisationModule;
-    private IExecuteModule _executeModule;
+//     private IExecuteModule _executeModule;
-    private IMethodRepository _methodRepository;
+//     private IMethodRepository _methodRepository;
-    private IContextRepository _contextRepository;
+//     private IContextRepository _contextRepository;
-
+//
-    private ITestController _testController;
+//     private ITestController _testController;
-
+//
-    [SetUp]
+//     [SetUp]
-    public void Setup()
+//     public void Setup()
-    {
+//     {
-        _interactionModule = new ProgramlyInteractionChanel();
+//         _interactionModule = new ProgramlyInteractionChanel();
-        var repo = new MethodRepository();
+//         var repo = new MethodRepository();
-        repo.CollectForAssembly(Assembly.GetExecutingAssembly());
+//         repo.CollectForAssembly(Assembly.GetExecutingAssembly());
-        _methodRepository = repo;
+//         _methodRepository = repo;
-        var repo2 = new ContextRepository();
+//         var repo2 = new ContextRepository();
-        repo2.FillSingletons(Assembly.GetExecutingAssembly());
+//         repo2.FillSingletons(Assembly.GetExecutingAssembly());
-        _contextRepository = repo2;
+//         _contextRepository = repo2;
-        _serialisationModule = new JsonSerialisationModule(_interactionModule, _methodRepository);
+//         _serialisationModule = new JsonSerialisationModule(_interactionModule, _methodRepository);
-
+//
-        _executeModule = new LaunchReadyExecutionModule(_methodRepository, _serialisationModule, _contextRepository);
+//         _executeModule = new LaunchReadyExecutionModule(_methodRepository, _serialisationModule, _contextRepository);
-        TransmissionConfig.DefaultContextRepository = _contextRepository;
+//         TransmissionConfig.DefaultContextRepository = _contextRepository;
-    }
+//     }
-
+//
-    [Test]
+//     [Test]
-    public void CommandPipelineTest()
+//     public void CommandPipelineTest()
-    {
+//     {
-        var sw = Stopwatch.StartNew();
+//         var sw = Stopwatch.StartNew();
-
+//
-        _interactionModule.PassCommand(132, """
+//         _interactionModule.PassCommand(132, """
-                                            {
+//                                             {
-                                              "RequestTypeId": 0,
+//                                               "RequestTypeId": 0,
-                                              "CommandId": 2
+//                                               "CommandId": 2
-                                            }
+//                                             }
-                                            """u8.ToArray());
+//                                             """u8.ToArray());
-        Assert.Pass(_interactionModule.OutputBuffer.Last());
+//         Assert.Pass(_interactionModule.OutputBuffer.Last());
-    }
+//     }
-
+//
-    [Test]
+//     [Test]
-    public void CommandPipelineTestAsync()
+//     public void CommandPipelineTestAsync()
-    {
+//     {
-        var sw = Stopwatch.StartNew();
+//         var sw = Stopwatch.StartNew();
-        _interactionModule.PassCommand(132, """
+//         _interactionModule.PassCommand(132, """
-                                            {
+//                                             {
-                                              "RequestTypeId": 0,
+//                                               "RequestTypeId": 0,
-                                              "CommandId": 3
+//                                               "CommandId": 3
-                                            }
+//                                             }
-                                            """u8.ToArray());
+//                                             """u8.ToArray());
-        while (_interactionModule.OutputBuffer.Count != 2) ;
+//         while (_interactionModule.OutputBuffer.Count != 2) ;
-
+//
-        Assert.Pass(_interactionModule.OutputBuffer.Last());
+//         Assert.Pass(_interactionModule.OutputBuffer.Last());
-    }
+//     }
-
+//
-    [Test]
+//     [Test]
-    public void MethodRegistrationTest()
+//     public void MethodRegistrationTest()
-    {
+//     {
-        var repo = new MethodRepository();
+//         var repo = new MethodRepository();
-        repo.CollectForAssembly(Assembly.GetExecutingAssembly());
+//         repo.CollectForAssembly(Assembly.GetExecutingAssembly());
-        Assert.That(repo.GetMethods().ToList().Count == 8);
+//         Assert.That(repo.GetMethods().ToList().Count == 8);
-    }
+//     }
-
+//
-    [Test]
+//     [Test]
-    public void ContextSupplyTest()
+//     public void ContextSupplyTest()
-    {
+//     {
-        var repo = new ContextRepository();
+//         var repo = new ContextRepository();
-        repo.FillSingletons(Assembly.GetExecutingAssembly());
+//         repo.FillSingletons(Assembly.GetExecutingAssembly());
-        var singleObject = repo.GetSingleObject(typeof(ITestController)) as ITestController;
+//         var singleObject = repo.GetSingleObject(typeof(ITestController)) as ITestController;
-        singleObject.B();
+//         singleObject.B();
-        Assert.That(singleObject.B() == 6);
+//         Assert.That(singleObject.B() == 6);
-    }
+//     }
-
+//
-    [Test]
+//     [Test]
-    public void TransmissionTest()
+//     public void TransmissionTest()
-    {
+//     {
-        _interactionModule.PassCommand(132, """
+//         _interactionModule.PassCommand(132, """
-                                            {
+//                                             {
-                                              "CommandId": 4
+//                                               "CommandId": 4
-                                            }
+//                                             }
-                                            """u8.ToArray());
+//                                             """u8.ToArray());
-        var response =
+//         var response =
-            JsonSerializer.Deserialize<TransmittedSharedObject<IContextRepository>>(
+//             JsonSerializer.Deserialize<TransmittedSharedObject<IContextRepository>>(
-                JsonSerializer.Deserialize<FinalCommandExecution>(_interactionModule.OutputBuffer.Last())
+//                 JsonSerializer.Deserialize<FinalCommandExecution>(_interactionModule.OutputBuffer.Last())
-                    ?.Result.ToString()
+//                     ?.Result.ToString()
-            );
+//             );
-
+//
-        _interactionModule.PassCommand(132, Encoding.UTF8.GetBytes(
+//         _interactionModule.PassCommand(132, Encoding.UTF8.GetBytes(
-            JsonSerializer.Serialize(new DefaultCallRequest { CommandId = 2, ObjectId = response.ContextId })));
+//             JsonSerializer.Serialize(new DefaultCallRequest { CommandId = 2, ObjectId = response.ContextId })));
-
+//
-        var firstFull = JsonDocument.Parse(_interactionModule.OutputBuffer.Last()).RootElement.GetProperty("Result")
+//         var firstFull = JsonDocument.Parse(_interactionModule.OutputBuffer.Last()).RootElement.GetProperty("Result")
-            .GetInt32();
+//             .GetInt32();
-
+//
-        _interactionModule.PassCommand(132, Encoding.UTF8.GetBytes(
+//         _interactionModule.PassCommand(132, Encoding.UTF8.GetBytes(
-            JsonSerializer.Serialize(new DefaultCallRequest { CommandId = 4, ObjectId = response.ContextId })));
+//             JsonSerializer.Serialize(new DefaultCallRequest { CommandId = 4, ObjectId = response.ContextId })));
-
+//
-        response =
+//         response =
-            JsonSerializer.Deserialize<TransmittedSharedObject<IContextRepository>>(
+//             JsonSerializer.Deserialize<TransmittedSharedObject<IContextRepository>>(
-                JsonSerializer.Deserialize<FinalCommandExecution>(_interactionModule.OutputBuffer.Last())
+//                 JsonSerializer.Deserialize<FinalCommandExecution>(_interactionModule.OutputBuffer.Last())
-                    ?.Result.ToString()
+//                     ?.Result.ToString()
-            );
+//             );
-
+//
-        _interactionModule.PassCommand(132, Encoding.UTF8.GetBytes(
+//         _interactionModule.PassCommand(132, Encoding.UTF8.GetBytes(
-            JsonSerializer.Serialize(new DefaultCallRequest { CommandId = 2, ObjectId = response.ContextId })));
+//             JsonSerializer.Serialize(new DefaultCallRequest { CommandId = 2, ObjectId = response.ContextId })));
-        _interactionModule.PassCommand(132, Encoding.UTF8.GetBytes(
+//         _interactionModule.PassCommand(132, Encoding.UTF8.GetBytes(
-            JsonSerializer.Serialize(new DefaultCallRequest { CommandId = 2, ObjectId = response.ContextId })));
+//             JsonSerializer.Serialize(new DefaultCallRequest { CommandId = 2, ObjectId = response.ContextId })));
-
+//
-        var secondFull = JsonDocument.Parse(_interactionModule.OutputBuffer.Last()).RootElement.GetProperty("Result")
+//         var secondFull = JsonDocument.Parse(_interactionModule.OutputBuffer.Last()).RootElement.GetProperty("Result")
-            .GetInt32();
+//             .GetInt32();
-
+//
-        Assert.That(firstFull == 456789 && secondFull == 6);
+//         Assert.That(firstFull == 456789 && secondFull == 6);
-    }
+//     }
-
+//
-    [Test]
+//     [Test]
-    public void LinkedObjectsAndParametersTest()
+//     public void LinkedObjectsAndParametersTest()
-    {
+//     {
-        _interactionModule.PassCommand(132, """
+//         _interactionModule.PassCommand(132, """
-                                            {
+//                                             {
-                                              "CommandId": 6
+//                                               "CommandId": 6
-                                            }
+//                                             }
-                                            """u8.ToArray());
+//                                             """u8.ToArray());
-        var response =
+//         var response =
-            JsonSerializer.Deserialize<TransmittedSharedObject<ITestParameter>>(
+//             JsonSerializer.Deserialize<TransmittedSharedObject<ITestParameter>>(
-                JsonSerializer.Deserialize<FinalCommandExecution>(_interactionModule.OutputBuffer.Last())
+//                 JsonSerializer.Deserialize<FinalCommandExecution>(_interactionModule.OutputBuffer.Last())
-                    ?.Result.ToString()
+//                     ?.Result.ToString()
-            );
+//             );
-        var x = response.ContextId;
+//         var x = response.ContextId;
-        _interactionModule.PassCommand(132,Encoding.UTF8.GetBytes(
+//         _interactionModule.PassCommand(132,Encoding.UTF8.GetBytes(
-            JsonSerializer.Serialize(new DefaultCallRequest
+//             JsonSerializer.Serialize(new DefaultCallRequest
-            {
+//             {
-                CommandId = 5,
+//                 CommandId = 5,
-                Parameter = new TestParameter
+//                 Parameter = new TestParameter
-                {
+//                 {
-                    A = 10,
+//                     A = 10,
-                    LinkedObject = new TransmittedSharedObject<ITestParameter> { ContextId = x }
+//                     LinkedObject = new TransmittedSharedObject<ITestParameter> { ContextId = x }
-                }
+//                 }
-            })));
+//             })));
-        
+//         
-        var finalResponse = JsonDocument.Parse(_interactionModule.OutputBuffer.Last()).RootElement.GetProperty("Result").GetInt32();
+//         var finalResponse = JsonDocument.Parse(_interactionModule.OutputBuffer.Last()).RootElement.GetProperty("Result").GetInt32();
-        
+//         
-        Assert.That(finalResponse, Is.EqualTo(20));
+//         Assert.That(finalResponse, Is.EqualTo(20));
-    }
+//     }
-}
+// }

mROA.Test/obj/Debug/net9.0/mROA.Test.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("mROA.Test")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ad2ef8e4b754b4cb2c5d3dbaa5c24f15201dd0f9")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fd1eda26618b8cebe94eaa0e27ce5e97353d2d09")]
 [assembly: System.Reflection.AssemblyProductAttribute("mROA.Test")]
 [assembly: System.Reflection.AssemblyTitleAttribute("mROA.Test")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

mROA.Test/obj/Release/net9.0/mROA.Test.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("mROA.Test")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2fac34a1ceac82d71c748b1421917d8fc2a60fa7")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fd1eda26618b8cebe94eaa0e27ce5e97353d2d09")]
 [assembly: System.Reflection.AssemblyProductAttribute("mROA.Test")]
 [assembly: System.Reflection.AssemblyTitleAttribute("mROA.Test")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

mROA.Test/obj/mROA.Test.csproj.nuget.g.props

@@ -5,12 +5,12 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Mikhail\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Mimm\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
     <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.12.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\Mikhail\.nuget\packages\" />
+    <SourceRoot Include="C:\Users\Mimm\.nuget\packages\" />
     <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
@@ -21,6 +21,6 @@
     <Import Project="$(NuGetPackageRoot)microsoft.net.test.sdk\17.12.0\build\netcoreapp3.1\Microsoft.NET.Test.Sdk.props" Condition="Exists('$(NuGetPackageRoot)microsoft.net.test.sdk\17.12.0\build\netcoreapp3.1\Microsoft.NET.Test.Sdk.props')" />
   </ImportGroup>
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <PkgNUnit_Analyzers Condition=" '$(PkgNUnit_Analyzers)' == '' ">C:\Users\Mikhail\.nuget\packages\nunit.analyzers\4.6.0</PkgNUnit_Analyzers>
+    <PkgNUnit_Analyzers Condition=" '$(PkgNUnit_Analyzers)' == '' ">C:\Users\Mimm\.nuget\packages\nunit.analyzers\4.6.0</PkgNUnit_Analyzers>
   </PropertyGroup>
 </Project>

mROA/Abstract/IContextRepository.cs

@@ -1,8 +1,9 @@
-using mROA.Implementation;
+using mROA.Abstract;
+using mROA.Implementation;
 
 namespace mROA;
 
-public interface IContextRepository
+public interface IContextRepository : IInjectableModule
 {
     int ResisterObject(object o);
     void ClearObject(int id);

mROA/Abstract/IInjectableModule.cs

@@ -2,5 +2,6 @@ namespace mROA.Abstract;
 
 public interface IInjectableModule
 {
-    public void Inject<T>(T dependency);
+    void Inject<T>(T dependency);
+    void Bake();
 }

mROA/Abstract/IInteractionModule.cs

@@ -4,10 +4,9 @@ namespace mROA;
 
 public interface IInteractionModule : IInjectableModule
 {
-    void SetMessageHandler(Action<int, byte[]> handler);
     void SendTo(int clientId, byte[] message);
     void RegisterSourse(Stream stream);
-    public interface IFrontendInteractionModule
+    public interface IFrontendInteractionModule : IInjectableModule
     {
         public Task<byte[]> ReceiveMessage();
         public void PostMessage(byte[] message);

mROA/Abstract/IMethodRepository.cs

@@ -1,8 +1,9 @@
 using System.Reflection;
+using mROA.Abstract;
 
 namespace mROA;
 
-public interface IMethodRepository
+public interface IMethodRepository : IInjectableModule
 {
     MethodInfo GetMethod(int id);
     int RegisterMethod(MethodInfo method);

mROA/Abstract/ISerialisationModule.cs

@@ -7,7 +7,7 @@ public interface ISerialisationModule : IInjectableModule
 {
     void HandleIncomingRequest(int clientId, byte[] command);
     void PostResponse(ICommandExecution call);
-    public interface IFrontendSerialisationModule
+    public interface IFrontendSerialisationModule : IInjectableModule
     {
         Task<T> GetNextCommandExecution<T>(Guid requestId) where T : ICommandExecution;
         Task<FinalCommandExecution<T>> GetFinalCommandExecution<T>(Guid requestId);

mROA/Implementation/Backend/JsonSerialisationModule.cs

@@ -9,13 +9,6 @@ public class JsonSerialisationModule : ISerialisationModule
     private IInteractionModule _dataSource;
     private IExecuteModule _executeModule;
     private IMethodRepository _methodRepository;
-    // public JsonSerialisationModule(IInteractionModule dataSource, IMethodRepository methodRepository)
-    // {
-    //     _dataSource = dataSource;
-    //     _methodRepository = methodRepository;
-    //     _dataSource.SetMessageHandler(HandleIncomingRequest);
-    // } 
-
     
     public void HandleIncomingRequest(int clientId, byte[] command)
     {
@@ -55,4 +48,8 @@ public class JsonSerialisationModule : ISerialisationModule
         if (dependency is IMethodRepository methodRepository)
             _methodRepository = methodRepository;
     }
+
+    public void Bake()
+    {
+    }
 }

mROA/Implementation/Backend/StreamBasedInteractionModule.cs

@@ -12,11 +12,6 @@ public class StreamBasedInteractionModule : IInteractionModule
         ListenTo((id, stream), _handler);
     }
 
-    public void SetMessageHandler(Action<int, byte[]> handler)
-    {
-        _handler = handler;
-    }
-
     public void SendTo(int clientId, byte[] message)
     {
         if (!_streams.TryGetValue(clientId, out var stream))
@@ -51,6 +46,13 @@ public class StreamBasedInteractionModule : IInteractionModule
 
     public void Inject<T>(T dependency)
     {
-        throw new NotImplementedException();
+        if (dependency is ISerialisationModule serialisationModule)
+        {
+            _handler = serialisationModule.HandleIncomingRequest;
+        }
+    }
+
+    public void Bake()
+    {
     }
 }

mROA/Implementation/ContextRepository.cs

@@ -85,4 +85,11 @@ public class ContextRepository : IContextRepository
         Array.Copy(_storage, nextStorage, _storage.Length);
         return _storage.Length;
     }
+    public void Inject<T>(T dependency)
+    {
+    }
+
+    public void Bake()
+    {
+    }
 }

mROA/Implementation/Frontend/FrontendContextRepository.cs

@@ -1,47 +1,59 @@
-using System.Collections.Frozen;
+// using System.Collections.Frozen;
-
+//
-namespace mROA.Implementation;
+// namespace mROA.Implementation;
-
+//
-public class FrontendContextRepository(Dictionary<Type, Type> remoteTypes, ISerialisationModule.IFrontendSerialisationModule serialisationModule) : IContextRepository
+// public class FrontendContextRepository(
-{
+//     Dictionary<Type, Type> remoteTypes,
-    private FrozenDictionary<Type, Type> _remoteTypes = remoteTypes.ToFrozenDictionary();
+//     ISerialisationModule.IFrontendSerialisationModule serialisationModule) : IContextRepository
-    
+// {
-    public int ResisterObject(object o)
+//     private FrozenDictionary<Type, Type> _remoteTypes = remoteTypes.ToFrozenDictionary();
-    {
+//
-        throw new NotSupportedException();
+//     public int ResisterObject(object o)
-    }
+//     {
-
+//         throw new NotSupportedException();
-    public void ClearObject(int id)
+//     }
-    {
+//
-        throw new NotSupportedException();
+//     public void ClearObject(int id)
-    }
+//     {
-
+//         throw new NotSupportedException();
-    public object GetObject(int id)
+//     }
-    {
+//
-        throw new NotSupportedException();
+//     public object GetObject(int id)
-    }
+//     {
-
+//         throw new NotSupportedException();
-    public T GetObject<T>(int id)
+//     }
-    {
+//
-        if (_remoteTypes.TryGetValue(typeof(T), out var remoteType))
+//     public T GetObject<T>(int id)
-        {
+//     {
-            var remote = (T)Activator.CreateInstance(remoteType, id, serialisationModule)!;
+//         if (_remoteTypes.TryGetValue(typeof(T), out var remoteType))
-            return remote;
+//         {
-        }
+//             var remote = (T)Activator.CreateInstance(remoteType, id, serialisationModule)!;
-        throw new NotSupportedException();
+//             return remote;
-    }
+//         }
-
+//
-    public object GetSingleObject(Type type)
+//         throw new NotSupportedException();
-    {
+//     }
-        return Activator.CreateInstance(remoteTypes[type], -1, serialisationModule)!;
+//
-    }
+//     public object GetSingleObject(Type type)
-
+//     {
-    public int GetObjectIndex(object o)
+//         return Activator.CreateInstance(remoteTypes[type], -1, serialisationModule)!;
-    {
+//     }
-        if (o is IRemoteObject remote)
+//
-        {
+//     public int GetObjectIndex(object o)
-            return remote.Id;
+//     {
-        }
+//         if (o is IRemoteObject remote)
-        throw new NotSupportedException();
+//         {
-    }
+//             return remote.Id;
-}
+//         }
+//
+//         throw new NotSupportedException();
+//     }
+//
+//     public void Inject<T>(T dependency)
+//     {
+//     }
+//
+//     public void Bake()
+//     {
+//     }
+// }

mROA/Implementation/Frontend/JsonFrontendSerialisationModule.cs

@@ -3,30 +3,34 @@ using System.Text.Json;
 
 namespace mROA.Implementation;
 
-public class JsonFrontendSerialisationModule(IInteractionModule.IFrontendInteractionModule interactionModule)
+public class JsonFrontendSerialisationModule
     : ISerialisationModule.IFrontendSerialisationModule
 {
+    private IInteractionModule.IFrontendInteractionModule _interactionModule;
+
     public async Task<T> GetNextCommandExecution<T>(Guid requestId) where T : ICommandExecution
     {
-        var receiveMessage = await interactionModule.ReceiveMessage();
+        var receiveMessage = await _interactionModule.ReceiveMessage();
         var parsed = JsonSerializer.Deserialize<T>(receiveMessage);
         while (parsed.CallRequestId != requestId)
         {
-            receiveMessage = await interactionModule.ReceiveMessage();
+            receiveMessage = await _interactionModule.ReceiveMessage();
             parsed = JsonSerializer.Deserialize<T>(receiveMessage);
         }
+
         return parsed;
     }
 
     public async Task<FinalCommandExecution<T>> GetFinalCommandExecution<T>(Guid requestId)
     {
-        var receiveMessage = await interactionModule.ReceiveMessage();
+        var receiveMessage = await _interactionModule.ReceiveMessage();
         var parsed = JsonSerializer.Deserialize<FinalCommandExecution<T>>(receiveMessage);
         while (parsed.CallRequestId != requestId)
         {
-            receiveMessage = await interactionModule.ReceiveMessage();
+            receiveMessage = await _interactionModule.ReceiveMessage();
             parsed = JsonSerializer.Deserialize<FinalCommandExecution<T>>(receiveMessage);
         }
+
         parsed.Result = parsed.Result! is JsonElement e ? e.Deserialize<T>() : (T)parsed.Result!;
         return parsed;
     }
@@ -34,6 +38,16 @@ public class JsonFrontendSerialisationModule(IInteractionModule.IFrontendInterac
     public void PostCallRequest(ICallRequest callRequest)
     {
         var post = JsonSerializer.Serialize(callRequest, callRequest.GetType());
-        interactionModule.PostMessage(Encoding.UTF8.GetBytes(post));
+        _interactionModule.PostMessage(Encoding.UTF8.GetBytes(post));
+    }
+
+    public void Inject<T>(T dependency)
+    {
+        if (dependency is IInteractionModule.IFrontendInteractionModule interactionModule)
+            _interactionModule = interactionModule;
+    }
+
+    public void Bake()
+    {
     }
 }

mROA/Implementation/Frontend/StreamBasedFrontendInteractionModule.cs

@@ -23,4 +23,11 @@ public class StreamBasedFrontendInteractionModule : IInteractionModule.IFrontend
         ServerStream.Write(BitConverter.GetBytes((ushort)message.Length), 0, sizeof(ushort));
         ServerStream.Write(message, 0, message.Length);
     }
+    public void Inject<T>(T dependency)
+    {
+    }
+
+    public void Bake()
+    {
+    }
 }

mROA/Implementation/LaunchReadyExecutionModule.cs

@@ -18,6 +18,10 @@ public class LaunchReadyExecutionModule : IExecuteModule
             _contextRepo = contextRepo;
     }
 
+    public void Bake()
+    {
+    }
+
     public ICommandExecution Execute(ICallRequest command)
     {
         var currentCommand = _methodRepo.GetMethod(command.CommandId);

mROA/Implementation/MethodRepository.cs

@@ -34,4 +34,11 @@ public class MethodRepository : IMethodRepository
                 RegisterMethod(method);
         }
     }
+    public void Inject<T>(T dependency)
+    {
+    }
+
+    public void Bake()
+    {
+    }
 }

mROA/obj/Debug/net9.0/mROA.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("mROA")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ad2ef8e4b754b4cb2c5d3dbaa5c24f15201dd0f9")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fd1eda26618b8cebe94eaa0e27ce5e97353d2d09")]
 [assembly: System.Reflection.AssemblyProductAttribute("mROA")]
 [assembly: System.Reflection.AssemblyTitleAttribute("mROA")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

mROA/obj/Debug/net9.0/mROA.GeneratedMSBuildEditorConfig.editorconfig

@@ -8,7 +8,7 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = mROA
-build_property.ProjectDir = C:\Users\Mikhail\Projects\VisualStudioProjects\mROA\mROA\
+build_property.ProjectDir = C:\Users\Mimm\Projects\VisualStudioProjects\mROA\mROA\
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 
 build_property.EffectiveAnalysisLevelStyle = 9.0

mROA/obj/mROA.csproj.nuget.g.props

@@ -5,12 +5,12 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Mikhail\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Mimm\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
     <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.12.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\Mikhail\.nuget\packages\" />
+    <SourceRoot Include="C:\Users\Mimm\.nuget\packages\" />
     <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
 </Project>