micialware/mROA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

билдится на старом дотнете

Browse Source
This commit is contained in:
micialware
2025-02-20 16:10:09 +03:00
parent 5af9408a9a
commit 50fd3e7b73
69 changed files with 1990 additions and 1675 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Example.Backend/Example.Backend.csproj
+4 -2
View File
@@ -2,9 +2,11 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<TargetFramework>netstandard2.1</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>9</LangVersion>
</PropertyGroup>
<ItemGroup>
Example.Backend/LoadTestImp.cs
+5 -3
View File
@@ -1,8 +1,9 @@
using Example.Shared;
using System;
using Example.Shared;
using mROA.Implementation.Attributes;
namespace Example.Backend;
namespace Example.Backend
{
[SharedObjectSingleton]
public class LoadTestImp : ILoadTest
{
@@ -26,3 +27,4 @@ public class LoadTestImp : ILoadTest
throw new NotImplementedException();
}
}
}
Example.Backend/Page.cs
+3 -2
View File
@@ -1,8 +1,8 @@
using System.Text;
using Example.Shared;
namespace Example.Backend;
namespace Example.Backend
{
public class Page : IPage
{
public string Text;
@@ -11,3 +11,4 @@ public class Page : IPage
return Encoding.UTF8.GetBytes(Text);
}
}
}
Example.Backend/Printer.cs
+5 -3
View File
@@ -1,9 +1,10 @@
using System.Threading;
using System.Threading.Tasks;
using Example.Shared;
using mROA.Implementation;
namespace Example.Backend;
namespace Example.Backend
{
public class Printer : IPrinter
{
public string Name;
@@ -18,3 +19,4 @@ public class Printer : IPrinter
return new Page {Text = text};
}
}
}
Example.Backend/PrinterFactory.cs
+7 -3
View File
@@ -1,13 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Example.Shared;
using mROA.Implementation;
using mROA.Implementation.Attributes;
namespace Example.Backend;
namespace Example.Backend
{
[SharedObjectSingleton]
public class PrinterFactory : IPrinterFactory
{
private List<IPrinter> _printers = new();
private List<IPrinter> _printers = new List<IPrinter>();
public SharedObject<IPrinter> Create(string printerName)
{
@@ -38,3 +41,4 @@ public class PrinterFactory : IPrinterFactory
return _printers.Select(i => i.GetName()).ToArray();
}
}
}
Example.Backend/Program.cs
+8 -2
View File
@@ -7,7 +7,10 @@ using mROA.Implementation.Backend;
using mROA.Implementation.Bootstrap;
using mROA.Implementation.Frontend;
class Program
{
public static void Main(string[] args)
{
var builder = new FullMixBuilder();
builder.UseJsonSerialisation();
builder.Modules.Add(new BackendIdentityGenerator());
@@ -28,7 +31,8 @@ builder.Modules.Add(new MultiClientContextRepository(i =>
return repo;
}));
builder.SetupMethodsRepository(new CoCodegenMethodRepository());
builder.Modules.Add(new CreativeRepresentationModuleProducer([builder.GetModule<JsonSerializationToolkit>()!],
builder.Modules.Add(new CreativeRepresentationModuleProducer(
new IInjectableModule[] { builder.GetModule<JsonSerializationToolkit>()! },
typeof(RepresentationModule)));
builder.Build();
@@ -41,3 +45,5 @@ TransmissionConfig.OwnershipRepository = new MultiClientOwnershipRepository();
var gateway = builder.GetModule<IGatewayModule>();
gateway.Run();
}
}
Example.Frontend/ClientBasedPrinter.cs
+8 -4
View File
@@ -1,8 +1,11 @@
using Example.Shared;
using System;
using System.Threading;
using System.Threading.Tasks;
using Example.Shared;
using mROA.Implementation;
namespace Example.Frontend;
namespace Example.Frontend
{
public class ClientBasedPrinter : IPrinter
{
public string GetName()
@@ -23,6 +26,7 @@ public class ClientBasedPage : IPage
{
public byte[] GetData()
{
return [1, 2, 3];
return new byte[] { 1, 2, 3 };
}
}
}
Example.Frontend/Example.Frontend.csproj
+4 -2
View File
@@ -2,9 +2,11 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<TargetFramework>netstandard2.1</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>9</LangVersion>
</PropertyGroup>
<ItemGroup>
Example.Frontend/Program.cs
+9 -1
View File
@@ -1,6 +1,8 @@
using System.Diagnostics;
using System;
using System.Diagnostics;
using System.Net;
using System.Text;
using System.Threading;
using Example.Frontend;
using Example.Shared;
using mROA.Codegen;
@@ -9,6 +11,10 @@ using mROA.Implementation.Backend;
using mROA.Implementation.Bootstrap;
using mROA.Implementation.Frontend;
class Program
{
public static void Main(string[] args)
{
var builder = new FullMixBuilder();
new RemoteTypeBinder();
builder.Modules.Add(new JsonSerializationToolkit());
@@ -77,3 +83,5 @@ timer.Stop();
Console.WriteLine("X is {0}", x);
Console.WriteLine("Time : {0}", timer.Elapsed.TotalMilliseconds);
Console.WriteLine($"Time per call: {timer.Elapsed.TotalMilliseconds / iterations} ms");
}
}
Example.Shared/Example.Shared.csproj
+4 -2
View File
@@ -1,9 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<TargetFramework>netstandard2.1</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>9</LangVersion>
</PropertyGroup>
<ItemGroup>
Example.Shared/ILoadTest.cs
+3 -2
View File
@@ -1,7 +1,7 @@
using mROA.Implementation.Attributes;
namespace Example.Shared;
namespace Example.Shared
{
[SharedObjectInterface]
public interface ILoadTest
{
@@ -10,4 +10,5 @@ public interface ILoadTest
void C();
void A();
}
}
Example.Shared/IPage.cs
+3 -2
View File
@@ -1,9 +1,10 @@
using mROA.Implementation.Attributes;
namespace Example.Shared;
namespace Example.Shared
{
[SharedObjectInterface]
public interface IPage
{
byte[] GetData();
}
}
Example.Shared/IPrinter.cs
+5 -2
View File
@@ -1,8 +1,10 @@
using System.Threading;
using System.Threading.Tasks;
using mROA.Implementation;
using mROA.Implementation.Attributes;
namespace Example.Shared;
namespace Example.Shared
{
[SharedObjectInterface]
public interface IPrinter
{
@@ -10,3 +12,4 @@ public interface IPrinter
Task<SharedObject<IPage>> Print(string text, CancellationToken cancellationToken);
}
}
Example.Shared/IPrinterFactory.cs
+3 -2
View File
@@ -1,8 +1,8 @@
using mROA.Implementation;
using mROA.Implementation.Attributes;
namespace Example.Shared;
namespace Example.Shared
{
[SharedObjectInterface]
public interface IPrinterFactory
{
@@ -13,3 +13,4 @@ public interface IPrinterFactory
string[] CollectAllNames();
}
}
mROA.Benchmark/Program.cs
+7 -3
View File
@@ -1,8 +1,11 @@
using BenchmarkDotNet.Attributes;
using System;
using System.Collections.Generic;
using System.Linq;
using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Running;
namespace mROA.Benchmark;
namespace mROA.Benchmark
{
class Program
{
static void Main(string[] args)
@@ -48,3 +51,4 @@ public class CollectionsSpeed
return sum;
}
}
}
mROA.Benchmark/mROA.Benchmark.csproj
+2 -2
View File
@@ -2,8 +2,8 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<TargetFramework>netstandard2.1</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>
mROA.Codegen/mROA.Codegen.csproj
+1 -2
View File
@@ -25,8 +25,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" />
</ItemGroup>
<ItemGroup>
mROA.Codegen/mROASourceGenerator.cs
+115 -53
View File
@@ -7,14 +7,14 @@ using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Text;
namespace mROA.Codegen;
namespace mROA.Codegen
{
/// <summary>
/// A sample source generator that creates a custom report based on class properties. The target class should be annotated with the 'Generators.ReportAttribute' attribute.
/// When using the source code as a baseline, an incremental source generator is preferable because it reduces the performance overhead.
/// </summary>
[Generator]
public class mROASourceGenerator : IIncrementalGenerator
public class mROASourceGenerator : ISourceGenerator
{
private const string Namespace = "mROA.Implementation";
private const string AttributeName = "SharedObjectInterafceAttribute";
@@ -29,47 +29,47 @@ namespace {Namespace}
}}
}}";
public void Initialize(IncrementalGeneratorInitializationContext context)
{
// Filter classes annotated with the [Report] attribute. Only filtered Syntax Nodes can trigger code generation.
var provider = context.SyntaxProvider
.CreateSyntaxProvider(
(s, _) => s is InterfaceDeclarationSyntax,
(ctx, _) => GetClassDeclarationForSourceGen(ctx))
.Where(t => t.reportAttributeFound)
.Select((t, _) => t.Item1);
// Generate the source code.
context.RegisterSourceOutput(context.CompilationProvider.Combine(provider.Collect()),
((ctx, t) => GenerateCode(ctx, t.Left, t.Right)));
}
// public void Initialize(IncrementalGeneratorInitializationContext context)
// {
// // Filter classes annotated with the [Report] attribute. Only filtered Syntax Nodes can trigger code generation.
// var provider = context.SyntaxProvider
// .CreateSyntaxProvider(
// (s, _) => s is InterfaceDeclarationSyntax,
// (ctx, _) => GetClassDeclarationForSourceGen(ctx))
// .Where(t => t.reportAttributeFound)
// .Select((t, _) => t.Item1);
//
// // Generate the source code.
// context.RegisterSourceOutput(context.CompilationProvider.Combine(provider.Collect()),
// ((ctx, t) => GenerateCode(ctx, t.Left, t.Right)));
// }
/// <summary>
/// Checks whether the Node is annotated with the [Report] attribute and maps syntax context to the specific node type (ClassDeclarationSyntax).
/// </summary>
/// <param name="context">Syntax context, based on CreateSyntaxProvider predicate</param>
/// <returns>The specific cast and whether the attribute was found.</returns>
private static (InterfaceDeclarationSyntax, bool reportAttributeFound) GetClassDeclarationForSourceGen(
GeneratorSyntaxContext context)
{
var classDeclarationSyntax = (InterfaceDeclarationSyntax)context.Node;
// Go through all attributes of the class.
foreach (AttributeListSyntax attributeListSyntax in classDeclarationSyntax.AttributeLists)
foreach (AttributeSyntax attributeSyntax in attributeListSyntax.Attributes)
{
if (context.SemanticModel.GetSymbolInfo(attributeSyntax).Symbol is not IMethodSymbol attributeSymbol)
continue; // if we can't get the symbol, ignore it
string attributeName = attributeSymbol.ContainingType.ToDisplayString();
// Check the full name of the [Report] attribute.
if (attributeName == "mROA.Implementation.Attributes.SharedObjectInterfaceAttribute")
return (classDeclarationSyntax, true);
}
return (classDeclarationSyntax, false);
}
// private static (InterfaceDeclarationSyntax, bool reportAttributeFound) GetClassDeclarationForSourceGen(
// GeneratorSyntaxContext context)
// {
// var classDeclarationSyntax = (InterfaceDeclarationSyntax)context.Node;
//
// // Go through all attributes of the class.
// foreach (AttributeListSyntax attributeListSyntax in classDeclarationSyntax.AttributeLists)
// foreach (AttributeSyntax attributeSyntax in attributeListSyntax.Attributes)
// {
// if (context.SemanticModel.GetSymbolInfo(attributeSyntax).Symbol is not IMethodSymbol attributeSymbol)
// continue; // if we can't get the symbol, ignore it
//
// string attributeName = attributeSymbol.ContainingType.ToDisplayString();
//
// // Check the full name of the [Report] attribute.
// if (attributeName == "mROA.Implementation.Attributes.SharedObjectInterfaceAttribute")
// return (classDeclarationSyntax, true);
// }
//
// return (classDeclarationSyntax, false);
// }
/// <summary>
/// Generate code action.
@@ -78,7 +78,7 @@ namespace {Namespace}
/// <param name="context">Source generation context used to add source files.</param>
/// <param name="compilation">Compilation used to provide access to the Semantic Model.</param>
/// <param name="classes">Nodes annotated with the [Report] attribute that trigger the generate action.</param>
private void GenerateCode(SourceProductionContext context, Compilation compilation,
private void GenerateCode(GeneratorExecutionContext context, Compilation compilation,
ImmutableArray<InterfaceDeclarationSyntax> classes)
{
var methods = new List<(string, IMethodSymbol)>();
@@ -166,9 +166,9 @@ namespace {Namespace}
//
// sb.AppendLine("\t}");
sb.AppendLine("\t\t" + prefix + caller + postfix+ ";");
sb.AppendLine("\t\t\t" + prefix + caller + postfix + ";");
sb.AppendLine("\t}");
sb.AppendLine("\t\t}");
methodsText.Add(sb.ToString());
}
@@ -181,8 +181,8 @@ using mROA.Implementation;
using System.Collections.Generic;
using mROA.Abstract;
namespace {namespaceName};
namespace {namespaceName}
{{
partial class {className} : RemoteObjectBase, {originalName}
{{
public {className}(int id, IRepresentationModule representationModule) : base(id, representationModule)
@@ -191,9 +191,11 @@ partial class {className} : RemoteObjectBase, {originalName}
{string.Join("\r\n\t", methodsText)}
}}
}}
";
// Add the source code to the compilation.
context.AddSource($"{className}.g.cs", SourceText.From(code, Encoding.UTF8));
@@ -204,21 +206,23 @@ partial class {className} : RemoteObjectBase, {originalName}
if (methods.Count != 0)
{
var methodsStringed = methods.Select(i =>
$"typeof({i.Item1}).GetMethod(\"{i.Item2.Name}\", [{string.Join(", ", i.Item2.Parameters.Select(p => $"typeof({p.Type.ToDisplayString()})"))}])")
$"typeof({i.Item1}).GetMethod(\"{i.Item2.Name}\", new Type[] {{{string.Join(", ", i.Item2.Parameters.Select(p => $"typeof({p.Type.ToDisplayString()})"))}}})")
.ToList();
var coCodegenRepoCode = @$"// <auto-generated/>
using System.Collections.Generic;
using System.Reflection;
using mROA.Abstract;
using System;
namespace mROA.Codegen;
namespace mROA.Codegen
{{
public class CoCodegenMethodRepository : IMethodRepository
{{
private readonly List<MethodInfo> _methods = [
{string.Join(", // test comment\r\n\t\t", methodsStringed)}
];
private readonly List<MethodInfo> _methods = new () {{
{string.Join(",\r\n\t\t\t", methodsStringed)}
}};
public MethodInfo GetMethod(int id)
{{
if (_methods.Count <= id)
@@ -242,6 +246,7 @@ public class CoCodegenMethodRepository : IMethodRepository
{{
}}
}}
}}
";
context.AddSource($"CoCodegenMethodRepository.g.cs", SourceText.From(coCodegenRepoCode, Encoding.UTF8));
}
@@ -249,17 +254,20 @@ public class CoCodegenMethodRepository : IMethodRepository
if (frontendContextRepo.Count != 0)
{
var fronendRepoCode = @$"// <auto-generated/>
using System.Collections.Frozen;
using mROA.Implementation;
using mROA.Abstract;
using System.Collections.Generic;
using System;
using System.Reflection;
namespace mROA.Codegen;
namespace mROA.Codegen
{{
public sealed class RemoteTypeBinder
{{
static RemoteTypeBinder(){{
RemoteContextRepository.RemoteTypes = new Dictionary<Type, Type> {{
{string.Join(", \r\n\t\t", frontendContextRepo)}}}.ToFrozenDictionary();
{string.Join(", \r\n\t\t\t", frontendContextRepo)}}};
}}
}}
}}
";
@@ -283,4 +291,58 @@ public sealed class RemoteTypeBinder
type = type.Substring(type.IndexOf('<') + 1);
return type.Substring(0, type.Length - 1);
}
public void Initialize(GeneratorInitializationContext context)
{
}
public void Execute(GeneratorExecutionContext context)
{
var trees = context.Compilation.SyntaxTrees;
var interfaces = new List<InterfaceDeclarationSyntax>();
foreach (var tree in trees)
{
var node = tree.GetRoot() as CompilationUnitSyntax;
foreach (var member in node.Members)
{
if (member is InterfaceDeclarationSyntax ids)
{
interfaces.Add(ids);
}
else if (member is NamespaceDeclarationSyntax nds)
{
foreach (var inside in nds.Members)
if (inside is InterfaceDeclarationSyntax ids2)
if (ContainsSOIAttribute(ids2.AttributeLists, context, ids2))
interfaces.Add(ids2);
}
}
}
GenerateCode(context, context.Compilation, interfaces.ToImmutableArray());
}
private bool ContainsSOIAttribute(SyntaxList<AttributeListSyntax> attributes, GeneratorExecutionContext context,
InterfaceDeclarationSyntax interfaceDeclarationSyntax)
{
foreach (AttributeListSyntax attributeListSyntax in attributes)
foreach (AttributeSyntax attributeSyntax in attributeListSyntax.Attributes)
{
if (context.Compilation.GetSemanticModel(interfaceDeclarationSyntax.SyntaxTree)
.GetSymbolInfo(attributeSyntax).Symbol is not IMethodSymbol attributeSymbol)
continue; // if we can't get the symbol, ignore it
string attributeName = attributeSymbol.ContainingType.ToDisplayString();
// Check the full name of the [Report] attribute.
if (attributeName == "mROA.Implementation.Attributes.SharedObjectInterfaceAttribute")
return true;
}
return false;
}
}
}
mROA.Test/NextGenTest.cs
+8 -4
View File
@@ -1,16 +1,19 @@
using System.Net;
using System;
using System.Linq;
using System.Net;
using System.Net.Sockets;
using System.Text;
using System.Threading.Tasks;
using mROA.Implementation;
namespace mROA.Test;
namespace mROA.Test
{
public class NextGenTest
{
private TcpListener _listener;
private NextGenerationInteractionModule _interactionModuleA;
private NextGenerationInteractionModule _interactionModuleB;
private Guid[] guids = [Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid()];
private Guid[] guids = new[] { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() };
[SetUp]
public void Setup()
@@ -70,3 +73,4 @@ public class NextGenTest
_listener.Dispose();
}
}
}
mROA.Test/mROA.Test.csproj
+2 -2
View File
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
</PropertyGroup>
mROA/Abstract/ICommandExecution.cs
+5 -2
View File
@@ -1,8 +1,11 @@
namespace mROA.Abstract;
using System;
namespace mROA.Abstract
{
public interface ICommandExecution
{
Guid Id { get; init; }
Guid Id { get; set; }
int ClientId { get; set; }
int CommandId { get; }
}
}
mROA/Abstract/IConnectionHub.cs
+3 -2
View File
@@ -1,5 +1,5 @@
namespace mROA.Abstract;
namespace mROA.Abstract
{
public delegate void ConnectionHandler(IRepresentationModule representationModule);
public delegate void DisconnectionHandler(IRepresentationModule representationModule);
@@ -10,3 +10,4 @@ public interface IConnectionHub : IInjectableModule
event ConnectionHandler? OnConnected;
event DisconnectionHandler? OnDisconnected;
}
}
mROA/Abstract/IContextRepository.cs
+4 -1
View File
@@ -1,5 +1,7 @@
namespace mROA.Abstract;
using System;
namespace mROA.Abstract
{
public interface IContextRepository : IInjectableModule
{
int ResisterObject(object o);
@@ -9,3 +11,4 @@ public interface IContextRepository : IInjectableModule
object GetSingleObject(Type type);
int GetObjectIndex(object o);
}
}
mROA/Abstract/IContextRepositoryHub.cs
+3 -2
View File
@@ -1,6 +1,7 @@
namespace mROA.Abstract;
namespace mROA.Abstract
{
public interface IContextRepositoryHub
{
IContextRepository GetRepository(int clientId);
}
}
mROA/Abstract/IExecuteModule.cs
+3 -2
View File
@@ -1,8 +1,9 @@
using mROA.Implementation;
namespace mROA.Abstract;
namespace mROA.Abstract
{
public interface IExecuteModule : IInjectableModule
{
ICommandExecution Execute(ICallRequest command, IContextRepository contextRepository);
}
}
mROA/Abstract/IFrontendBridge.cs
+6 -2
View File
@@ -1,3 +1,7 @@
namespace mROA.Abstract;
namespace mROA.Abstract
{
public interface IFrontendBridge : IInjectableModule
{
public interface IFrontendBridge : IInjectableModule;
}
}
mROA/Abstract/IGatewayModule.cs
+4 -1
View File
@@ -1,6 +1,9 @@
namespace mROA.Abstract;
using System;
namespace mROA.Abstract
{
public interface IGatewayModule : IDisposable, IInjectableModule
{
void Run();
}
}
mROA/Abstract/IIdentityGenerator.cs
+3 -2
View File
@@ -1,6 +1,7 @@
namespace mROA.Abstract;
namespace mROA.Abstract
{
public interface IIdentityGenerator : IInjectableModule
{
int GetNextIdentity();
}
}
mROA/Abstract/IInjectableModule.cs
+3 -2
View File
@@ -1,6 +1,7 @@
namespace mROA.Abstract;
namespace mROA.Abstract
{
public interface IInjectableModule
{
void Inject<T>(T dependency);
}
}
mROA/Abstract/IInteractionModule.cs
+6 -2
View File
@@ -1,7 +1,10 @@
using System;
using System.IO;
using System.Threading.Tasks;
using mROA.Implementation;
namespace mROA.Abstract;
namespace mROA.Abstract
{
public interface INextGenerationInteractionModule : IInjectableModule
{
int ConnectionId { get; }
@@ -12,3 +15,4 @@ public interface INextGenerationInteractionModule : IInjectableModule
NetworkMessage[] UnhandledMessages { get; }
NetworkMessage? FirstByFilter(Predicate<NetworkMessage> predicate);
}
}
mROA/Abstract/IMethodRepository.cs
+5 -3
View File
@@ -1,7 +1,8 @@
using System.Reflection;
namespace mROA.Abstract;
using System.Collections.Generic;
using System.Reflection;
namespace mROA.Abstract
{
public interface IMethodRepository : IInjectableModule
{
MethodInfo GetMethod(int id);
@@ -9,3 +10,4 @@ public interface IMethodRepository : IInjectableModule
IEnumerable<MethodInfo> GetMethods();
}
}
mROA/Abstract/IOwnershipRepository.cs
+3 -2
View File
@@ -1,7 +1,8 @@
namespace mROA.Abstract;
namespace mROA.Abstract
{
public interface IOwnershipRepository
{
int GetOwnershipId();
int GetHostOwnershipId();
}
}
mROA/Abstract/IRepresentationModuleProducer.cs
+3 -2
View File
@@ -1,6 +1,7 @@
namespace mROA.Abstract;
namespace mROA.Abstract
{
public interface IRepresentationModuleProducer : IInjectableModule
{
IRepresentationModule Produce(int id);
}
}
mROA/Abstract/IRequestExtractor.cs
+4 -1
View File
@@ -1,6 +1,9 @@
namespace mROA.Abstract;
using System.Threading.Tasks;
namespace mROA.Abstract
{
public interface IRequestExtractor : IInjectableModule
{
Task StartExtraction();
}
}
mROA/Abstract/ISerialisationModule.cs
+5 -2
View File
@@ -1,8 +1,10 @@
using System;
using System.Threading.Tasks;
using mROA.Implementation;
using mROA.Implementation.CommandExecution;
namespace mROA.Abstract;
namespace mROA.Abstract
{
public interface ISerialisationModule : IInjectableModule
{
void HandleIncomingRequest(int clientId, byte[] message);
@@ -29,3 +31,4 @@ public interface IRepresentationModule : IInjectableModule
void PostCallMessage<T>(Guid id, MessageType messageType, T payload) where T : notnull;
void PostCallMessage(Guid id, MessageType messageType, object payload, Type payloadType);
}
}
mROA/Abstract/ISerializationToolkit.cs
+4 -1
View File
@@ -1,5 +1,7 @@
namespace mROA.Abstract;
using System;
namespace mROA.Abstract
{
public interface ISerializationToolkit : IInjectableModule
{
byte[] Serialize<T>(T objectToSerialize);
@@ -12,3 +14,4 @@ public interface ISerializationToolkit : IInjectableModule
object Cast(object nonCasted, Type type);
}
}
mROA/Implementation/Attributes/SharedObjectInterfaceAttribute.cs
+5 -2
View File
@@ -1,3 +1,6 @@
namespace mROA.Implementation.Attributes;
using System;
public class SharedObjectInterfaceAttribute : Attribute;
namespace mROA.Implementation.Attributes
{
public class SharedObjectInterfaceAttribute : Attribute { }
}
mROA/Implementation/Attributes/SharedObjectSingletonAttribute.cs
+5 -2
View File
@@ -1,3 +1,6 @@
namespace mROA.Implementation.Attributes;
using System;
public class SharedObjectSingletonAttribute : Attribute;
namespace mROA.Implementation.Attributes
{
public class SharedObjectSingletonAttribute : Attribute { }
}
mROA/Implementation/Backend/BackendIdentityGenerator.cs
+3 -2
View File
@@ -1,7 +1,7 @@
using mROA.Abstract;
namespace mROA.Implementation.Backend;
namespace mROA.Implementation.Backend
{
public class BackendIdentityGenerator : IIdentityGenerator
{
private int _currentId;
@@ -15,3 +15,4 @@ public class BackendIdentityGenerator : IIdentityGenerator
{
}
}
}
mROA/Implementation/Backend/BasicConfigurationExtensions.cs
+4 -2
View File
@@ -1,10 +1,11 @@
using System;
using System.Net;
using System.Reflection;
using mROA.Abstract;
using mROA.Implementation.Bootstrap;
namespace mROA.Implementation.Backend;
namespace mROA.Implementation.Backend
{
public static class BasicConfigurationExtensions
{
public static void UseJsonSerialisation(this FullMixBuilder builder)
@@ -35,3 +36,4 @@ public static class BasicConfigurationExtensions
builder.Modules.Add(methodRepository);
}
}
}
mROA/Implementation/Backend/BasicExecutionModule.cs
+13 -6
View File
@@ -1,9 +1,12 @@
using System.Reflection;
using System;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using mROA.Abstract;
using mROA.Implementation.CommandExecution;
namespace mROA.Implementation.Backend;
namespace mROA.Implementation.Backend
{
public class BasicExecutionModule : IExecuteModule
{
private IMethodRepository? _methodRepo;
@@ -45,7 +48,8 @@ public class BasicExecutionModule : IExecuteModule
{
try
{
var finalResult = currentCommand.Invoke(context, parameter is null ? [] : [parameter]);
var finalResult = currentCommand.Invoke(context, parameter is null ? new object[0] : new[]
{ parameter });
return new TypedFinalCommandExecution
{
CommandId = command.CommandId, Result = finalResult,
@@ -70,7 +74,8 @@ public class BasicExecutionModule : IExecuteModule
var token = tokenSource.Token;
try
{
var result = (Task)currentCommand.Invoke(context, parameter is null ? [token] : [parameter, token])!;
var result = (Task)currentCommand.Invoke(context, parameter is null ? new object[] { token } : new[]
{ parameter, token })!;
result.Wait(token);
@@ -96,7 +101,8 @@ public class BasicExecutionModule : IExecuteModule
try
{
var result =
(Task)currentCommand.Invoke(context, parameter is null ? [token] : [parameter, token])!;
(Task)currentCommand.Invoke(context, parameter is null ? new object[] { token } : new[]
{ parameter, token })!;
result.Wait(token);
@@ -119,3 +125,4 @@ public class BasicExecutionModule : IExecuteModule
}
}
}
}
mROA/Implementation/Backend/ConnectionHub.cs
+6 -3
View File
@@ -1,7 +1,9 @@
using mROA.Abstract;
namespace mROA.Implementation.Backend;
using System;
using System.Collections.Generic;
using mROA.Abstract;
namespace mROA.Implementation.Backend
{
public class ConnectionHub : IConnectionHub
{
private readonly Dictionary<int, INextGenerationInteractionModule> _connections = new();
@@ -33,3 +35,4 @@ public class ConnectionHub : IConnectionHub
}
}
}
mROA/Implementation/Backend/ContextRepository.cs
+9 -5
View File
@@ -1,13 +1,16 @@
using System.Collections.Frozen;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using mROA.Abstract;
using mROA.Implementation.Attributes;
namespace mROA.Implementation.Backend;
namespace mROA.Implementation.Backend
{
public class ContextRepository : IContextRepository
{
private FrozenDictionary<int, object?>? _singletons;
private Dictionary<int, object?>? _singletons;
private object?[] _storage = new object[StartupSize];
private Task<int> _lastIndexFinder = Task.FromResult(0);
@@ -22,7 +25,7 @@ public class ContextRepository : IContextRepository
type is { IsClass: true, IsAbstract: false, IsGenericType: false } &&
type.GetCustomAttributes(typeof(SharedObjectSingletonAttribute), true).Length > 0);
_singletons =
types.ToFrozenDictionary(
types.ToDictionary(
t => t.GetInterfaces().FirstOrDefault(i =>
i.GetCustomAttributes(typeof(SharedObjectInterfaceAttribute), true).Length > 0)!.GetHashCode(),
Activator.CreateInstance);
@@ -86,3 +89,4 @@ public class ContextRepository : IContextRepository
}
}
}
mROA/Implementation/Backend/HubRequestExtractor.cs
+12 -4
View File
@@ -1,8 +1,9 @@
using System;
using mROA.Abstract;
namespace mROA.Implementation.Backend;
public class HubRequestExtractor(Type extractoType) : IInjectableModule
namespace mROA.Implementation.Backend
{
public class HubRequestExtractor : IInjectableModule
{
private IConnectionHub? _hub;
@@ -10,6 +11,12 @@ public class HubRequestExtractor(Type extractoType) : IInjectableModule
private IMethodRepository? _methodRepository;
private ISerializationToolkit? _serializationToolkit;
private IExecuteModule? _executeModule;
private readonly Type _extractorType;
public HubRequestExtractor(Type extractorType)
{
_extractorType = extractorType;
}
public void Inject<T>(T dependency)
{
@@ -36,7 +43,7 @@ public class HubRequestExtractor(Type extractoType) : IInjectableModule
private void HubOnOnConnected(IRepresentationModule interaction)
{
var extractor = (IRequestExtractor)Activator.CreateInstance(extractoType)!;
var extractor = (IRequestExtractor)Activator.CreateInstance(_extractorType)!;
extractor.Inject(interaction);
if (_contextRepository is IContextRepositoryHub contextHub)
extractor.Inject(contextHub.GetRepository(interaction.Id));
@@ -48,3 +55,4 @@ public class HubRequestExtractor(Type extractoType) : IInjectableModule
_ = extractor.StartExtraction();
}
}
}
mROA/Implementation/Backend/MultiClientContextRepository.cs
+13 -4
View File
@@ -1,17 +1,25 @@
using System;
using System.Collections.Generic;
using mROA.Abstract;
namespace mROA.Implementation.Backend;
public class MultiClientContextRepository(Func<int, IContextRepository> produceRepository) : IContextRepository, IContextRepositoryHub
namespace mROA.Implementation.Backend
{
public class MultiClientContextRepository : IContextRepository, IContextRepositoryHub
{
private Dictionary<int, IContextRepository> _repositories = new();
private readonly Func<int, IContextRepository> _produceRepository;
public MultiClientContextRepository(Func<int, IContextRepository> produceRepository)
{
_produceRepository = produceRepository;
}
private IContextRepository GetRepositoryByClientId(int clientId)
{
if (_repositories.TryGetValue(clientId, out var repository))
return repository;
var created = produceRepository(clientId);
var created = _produceRepository(clientId);
_repositories.Add(clientId, created);
return created;
}
@@ -54,3 +62,4 @@ public class MultiClientContextRepository(Func<int, IContextRepository> produceR
return GetRepositoryByClientId(clientId);
}
}
}
mROA/Implementation/Backend/MultiClientOwnershipRepository.cs
+6 -3
View File
@@ -1,7 +1,9 @@
using mROA.Abstract;
namespace mROA.Implementation.Backend;
using System;
using System.Collections.Generic;
using mROA.Abstract;
namespace mROA.Implementation.Backend
{
public class MultiClientOwnershipRepository : IOwnershipRepository
{
private Dictionary<int, int> _ownerships = new();
@@ -26,3 +28,4 @@ public class MultiClientOwnershipRepository : IOwnershipRepository
_ownerships.Remove(Environment.CurrentManagedThreadId);
}
}
}
mROA/Implementation/Backend/NetworkGatewayModule.cs
+6 -4
View File
@@ -1,9 +1,11 @@
using System.Net;
using System;
using System.Net;
using System.Net.Sockets;
using System.Threading.Tasks;
using mROA.Abstract;
namespace mROA.Implementation.Backend;
namespace mROA.Implementation.Backend
{
public class NetworkGatewayModule : IGatewayModule
{
private readonly Type? _interactionModuleType;
@@ -40,7 +42,6 @@ public class NetworkGatewayModule : IGatewayModule
public void Dispose()
{
_tcpListener.Stop();
_tcpListener.Dispose();
}
private void HandleIncomingConnections()
@@ -87,3 +88,4 @@ public class NetworkGatewayModule : IGatewayModule
_serialization = serializationToolkit;
}
}
}
mROA/Implementation/Bootstrap/FullMixBuilder.cs
+6 -3
View File
@@ -1,10 +1,12 @@
using System.Collections.Generic;
using System.Linq;
using mROA.Abstract;
namespace mROA.Implementation.Bootstrap;
namespace mROA.Implementation.Bootstrap
{
public class FullMixBuilder
{
public List<IInjectableModule> Modules { get; } = [];
public List<IInjectableModule> Modules { get; } = new() { };
public void Build()
{
@@ -18,3 +20,4 @@ public class FullMixBuilder
return Modules.OfType<T>().FirstOrDefault();
}
}
}
mROA/Implementation/CallRequest.cs
+8 -6
View File
@@ -1,9 +1,10 @@
using System.Text.Json.Serialization;
using System;
using System.Text.Json.Serialization;
// ReSharper disable UnusedAutoPropertyAccessor.Global
// ReSharper disable AutoPropertyCanBeMadeGetOnly.Global
namespace mROA.Implementation;
namespace mROA.Implementation
{
public interface ICallRequest
{
Guid Id { get; }
@@ -15,10 +16,11 @@ public interface ICallRequest
public class DefaultCallRequest : ICallRequest
{
public Guid Id { get; set; } = Guid.NewGuid();
public int CommandId { get; init; }
public int ObjectId { get; init; } = -1;
public int CommandId { get; set; }
public int ObjectId { get; set; } = -1;
[JsonIgnore]
public Type? ParameterType { get; init; }
public Type? ParameterType { get; set; }
public object? Parameter { get; set; }
}
}
mROA/Implementation/CommandExecution/ExceptionCommandExecution.cs
+8 -6
View File
@@ -1,17 +1,19 @@
using mROA.Abstract;
using System;
using mROA.Abstract;
using mROA.Implementation.Frontend;
namespace mROA.Implementation.CommandExecution;
namespace mROA.Implementation.CommandExecution
{
public class ExceptionCommandExecution : ICommandExecution
{
public Guid Id { get; init; }
public Guid Id { get; set; }
public int ClientId { get; set; }
public int CommandId { get; init; }
public required string Exception { get; set; }
public int CommandId { get; set; }
public string Exception { get; set; }
public RemoteException GetException()
{
return new RemoteException(Exception) { CallRequestId = Id };
}
}
}
mROA/Implementation/CommandExecution/FinalCommandExecution.cs
+8 -6
View File
@@ -1,20 +1,22 @@
using System.Text.Json.Serialization;
using System;
using System.Text.Json.Serialization;
using mROA.Abstract;
// ReSharper disable UnusedAutoPropertyAccessor.Global
namespace mROA.Implementation.CommandExecution;
namespace mROA.Implementation.CommandExecution
{
public class FinalCommandExecution : ICommandExecution
{
public Guid Id { get; init; }
public Guid Id { get; set; }
[JsonIgnore]
public int ClientId { get; set; }
[JsonIgnore]
public int CommandId { get; init; }
public int CommandId { get; set; }
}
public class FinalCommandExecution<T> : FinalCommandExecution
{
public T? Result { get; init; }
public T? Result { get; set; }
}
}
mROA/Implementation/CommandExecution/TypedFinalCommandExecution.cs
+5 -3
View File
@@ -1,10 +1,12 @@
using System.Text.Json.Serialization;
namespace mROA.Implementation.CommandExecution;
using System;
using System.Text.Json.Serialization;
namespace mROA.Implementation.CommandExecution
{
public class TypedFinalCommandExecution : FinalCommandExecution<object>
{
[JsonIgnore]
// ReSharper disable once UnusedAutoPropertyAccessor.Global
public Type? Type { get; set; }
}
}
mROA/Implementation/CreativeRepresentationModuleProducer.cs
+5 -3
View File
@@ -1,7 +1,8 @@
using mROA.Abstract;
namespace mROA.Implementation;
using System;
using mROA.Abstract;
namespace mROA.Implementation
{
public class CreativeRepresentationModuleProducer : IRepresentationModuleProducer
{
private Type _reprModuleType;
@@ -38,3 +39,4 @@ public class CreativeRepresentationModuleProducer : IRepresentationModuleProduce
return produced;
}
}
}
mROA/Implementation/Frontend/JsonFrontendSerialisationModule.cs
+13 -3
View File
@@ -1,5 +1,7 @@
namespace mROA.Implementation.Frontend;
using System;
namespace mROA.Implementation.Frontend
{
// public class JsonFrontendSerialisationModule
// : ISerialisationModule.IFrontendSerialisationModule
// {
@@ -77,8 +79,16 @@ namespace mROA.Implementation.Frontend;
// }
// }
public class RemoteException(string error) : Exception
public class RemoteException : Exception
{
public Guid CallRequestId;
public override string Message => $"Error in request {CallRequestId} : {error}";
private readonly string _error;
public RemoteException(string error)
{
_error = error;
}
public override string Message => $"Error in request {CallRequestId} : {_error}";
}
}
mROA/Implementation/Frontend/NetworkFrontendBridge.cs
+12 -4
View File
@@ -1,14 +1,21 @@
using System;
using System.Net;
using System.Net.Sockets;
using mROA.Abstract;
namespace mROA.Implementation.Frontend;
public class NetworkFrontendBridge(IPEndPoint ipEndPoint) : IFrontendBridge
namespace mROA.Implementation.Frontend
{
public class NetworkFrontendBridge : IFrontendBridge
{
private readonly TcpClient _tcpClient = new();
private NextGenerationInteractionModule? _interactionModule;
private ISerializationToolkit? _serialization;
private readonly IPEndPoint _ipEndPoint;
public NetworkFrontendBridge(IPEndPoint ipEndPoint)
{
_ipEndPoint = ipEndPoint;
}
public void Inject<T>(T dependency)
{
@@ -30,7 +37,7 @@ public class NetworkFrontendBridge(IPEndPoint ipEndPoint) : IFrontendBridge
if (_serialization == null)
throw new NullReferenceException("Serialization toolkit is not initialized");
_tcpClient.Connect(ipEndPoint);
_tcpClient.Connect(_ipEndPoint);
_interactionModule.BaseStream = _tcpClient.GetStream();
var welcomeMessage = _interactionModule.GetNextMessageReceiving().GetAwaiter().GetResult();
if (welcomeMessage.SchemaId != MessageType.IdAssigning)
@@ -41,3 +48,4 @@ public class NetworkFrontendBridge(IPEndPoint ipEndPoint) : IFrontendBridge
TransmissionConfig.OwnershipRepository = new StaticOwnershipRepository(_serialization.Deserialize<IdAssingnment>(welcomeMessage.Data)!.Id);
}
}
}
mROA/Implementation/Frontend/RequestExtractor.cs
+6 -2
View File
@@ -1,11 +1,14 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using mROA.Abstract;
using mROA.Implementation.Backend;
using mROA.Implementation.CommandExecution;
// ReSharper disable MethodHasAsyncOverload
namespace mROA.Implementation.Frontend;
namespace mROA.Implementation.Frontend
{
public class RequestExtractor : IRequestExtractor
{
private IRepresentationModule? _representationModule;
@@ -86,3 +89,4 @@ public class RequestExtractor : IRequestExtractor
}
}
}
}
mROA/Implementation/Frontend/StaticOwnershipRepository.cs
+13 -5
View File
@@ -1,16 +1,24 @@
using mROA.Abstract;
namespace mROA.Implementation.Frontend;
public class StaticOwnershipRepository(int id) : IOwnershipRepository
namespace mROA.Implementation.Frontend
{
public class StaticOwnershipRepository : IOwnershipRepository
{
private readonly int _id;
public StaticOwnershipRepository(int id)
{
_id = id;
}
public int GetOwnershipId()
{
return id;
return _id;
}
public int GetHostOwnershipId()
{
return id;
return _id;
}
}
}
mROA/Implementation/IdAssingnment.cs
+3 -2
View File
@@ -1,6 +1,7 @@
namespace mROA.Implementation;
namespace mROA.Implementation
{
public class IdAssingnment
{
public int Id { get; set; }
}
}
mROA/Implementation/JsonSerializationToolkit.cs
+5 -3
View File
@@ -1,8 +1,9 @@
using System.Text.Json;
using System;
using System.Text.Json;
using mROA.Abstract;
namespace mROA.Implementation;
namespace mROA.Implementation
{
public class JsonSerializationToolkit : ISerializationToolkit
{
public byte[] Serialize<T>(T objectToSerialize)
@@ -57,3 +58,4 @@ public class JsonSerializationToolkit : ISerializationToolkit
{
}
}
}
mROA/Implementation/MethodRepository.cs
+8 -4
View File
@@ -1,12 +1,15 @@
using System.Reflection;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using mROA.Abstract;
using mROA.Implementation.Attributes;
namespace mROA.Implementation;
namespace mROA.Implementation
{
public class MethodRepository : IMethodRepository
{
private readonly List<MethodInfo> _methods = [];
private readonly List<MethodInfo> _methods = new() { };
public MethodInfo GetMethod(int id)
{
@@ -41,3 +44,4 @@ public class MethodRepository : IMethodRepository
}
}
}
mROA/Implementation/NetworkMessage.cs
+8 -6
View File
@@ -1,18 +1,20 @@
using System.Text.Json.Serialization;
using System;
using System.Text.Json.Serialization;
// ReSharper disable UnusedMember.Global
namespace mROA.Implementation;
namespace mROA.Implementation
{
public class NetworkMessage
{
public Guid Id { get; init; }
public Guid Id { get; set; }
[JsonConverter(typeof(JsonStringEnumConverter))]
public MessageType SchemaId { get; init; }
public MessageType SchemaId { get; set; }
public required byte[] Data { get; init; }
public byte[] Data { get; set; }
}
public enum MessageType
{
Unknown, FinishedCommandExecution, ExceptionCommandExecution, AsyncCancelCommandExecution, CallRequest, IdAssigning
}
}
mROA/Implementation/NextGenerationInteractionModule.cs
+18 -10
View File
@@ -1,7 +1,12 @@
using mROA.Abstract;
namespace mROA.Implementation;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using mROA.Abstract;
namespace mROA.Implementation
{
public class NextGenerationInteractionModule : INextGenerationInteractionModule
{
private ISerializationToolkit? _serialization;
@@ -26,7 +31,6 @@ public class NextGenerationInteractionModule : INextGenerationInteractionModule
}
}
public Task<NetworkMessage> GetNextMessageReceiving()
{
if (_currentReceiving != null) return _currentReceiving;
@@ -62,7 +66,7 @@ public class NextGenerationInteractionModule : INextGenerationInteractionModule
return _messageBuffer.FirstOrDefault(m => predicate(m));
}
private NetworkMessage GetNextMessage()
private async Task<NetworkMessage> GetNextMessage()
{
if (BaseStream == null)
throw new NullReferenceException("BaseStream is null");
@@ -72,16 +76,20 @@ public class NextGenerationInteractionModule : INextGenerationInteractionModule
// Console.WriteLine("Receiving message");
var len = BitConverter.ToUInt16([(byte)BaseStream.ReadByte(), (byte)BaseStream.ReadByte()]);
var localSpan = _buffer.Span.Slice(0, len);
BaseStream.ReadExactly(localSpan);
var firstBit = (byte)BaseStream.ReadByte();
var secondBit = (byte)BaseStream.ReadByte();
var len = BitConverter.ToUInt16(new[] { firstBit, secondBit});
var localSpan = _buffer.Slice(0, len);
await BaseStream.ReadExactlyAsync(localSpan);
// Console.WriteLine("Receiving {0}", Encoding.Default.GetString(_buffer[..len]));
var message = _serialization.Deserialize<NetworkMessage>(localSpan);
var message = _serialization.Deserialize<NetworkMessage>(localSpan.Span);
_messageBuffer.Add(message!);
_currentReceiving = Task.Run(GetNextMessage);
_currentReceiving = GetNextMessage();
return message!;
}
}
}
mROA/Implementation/RemoteContextRepository.cs
+6 -4
View File
@@ -1,12 +1,13 @@
using System.Collections.Frozen;
using System;
using System.Collections.Generic;
using mROA.Abstract;
namespace mROA.Implementation;
namespace mROA.Implementation
{
public class RemoteContextRepository : IContextRepository
{
private IRepresentationModuleProducer? _representationProducer;
public static FrozenDictionary<Type, Type> RemoteTypes = FrozenDictionary<Type, Type>.Empty;
public static Dictionary<Type, Type> RemoteTypes = new();
public int ResisterObject(object o)
{
throw new NotSupportedException();
@@ -55,3 +56,4 @@ public class RemoteContextRepository : IContextRepository
_representationProducer = serialisationModule;
}
}
}
mROA/Implementation/RemoteObjectBase.cs
+25 -14
View File
@@ -1,26 +1,36 @@
using mROA.Abstract;
using System.Threading.Tasks;
using mROA.Abstract;
using mROA.Implementation.CommandExecution;
// ReSharper disable UnusedMember.Global
namespace mROA.Implementation;
public abstract class RemoteObjectBase(int id, IRepresentationModule representationModule)
namespace mROA.Implementation
{
public int Id => id;
public int OwnerId => representationModule.Id;
public abstract class RemoteObjectBase
{
private readonly int _id;
private readonly IRepresentationModule _representationModule;
protected RemoteObjectBase(int id, IRepresentationModule representationModule)
{
_id = id;
_representationModule = representationModule;
}
public int Id => _id;
public int OwnerId => _representationModule.Id;
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);
@@ -33,14 +43,14 @@ public abstract class RemoteObjectBase(int id, IRepresentationModule representat
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);
@@ -51,3 +61,4 @@ public abstract class RemoteObjectBase(int id, IRepresentationModule representat
throw errorResponse.Result.GetException();
}
}
}
mROA/Implementation/RepresentationModule.cs
+6 -3
View File
@@ -1,7 +1,9 @@
using mROA.Abstract;
namespace mROA.Implementation;
using System;
using System.Threading.Tasks;
using mROA.Abstract;
namespace mROA.Implementation
{
public class RepresentationModule : IRepresentationModule
{
private ISerializationToolkit? _serialization;
@@ -91,3 +93,4 @@ public class RepresentationModule : IRepresentationModule
PostCallMessageAsync(id, messageType, payload, payloadType).GetAwaiter().GetResult();
}
}
}
mROA/Implementation/SharedObject.cs
+8 -6
View File
@@ -1,10 +1,11 @@
using System.Text.Json.Serialization;
using System;
using System.Text.Json.Serialization;
using mROA.Abstract;
// ReSharper disable UnusedMember.Global
#pragma warning disable CS8618, CS9264
namespace mROA.Implementation;
namespace mROA.Implementation
{
public static class TransmissionConfig
{
private static IContextRepository? _realContextRepository;
@@ -50,7 +51,7 @@ public class SharedObject<T> where T : notnull
_ownerId = _ownerId == -1 ? TransmissionConfig.OwnershipRepository.GetOwnershipId() : _ownerId;
return _ownerId;
}
init => _ownerId = value;
set => _ownerId = value;
}
// ReSharper disable once MemberCanBePrivate.Global
@@ -65,14 +66,14 @@ public class SharedObject<T> where T : notnull
_contextId = TransmissionConfig.RealContextRepository.GetObjectIndex(Value);
return _contextId;
}
init
set
{
_contextId = value;
Value = GetDefaultContextRepository().GetObject<T>(_contextId)!;
}
}
[JsonIgnore] public T Value { get; private init; }
[JsonIgnore] public T Value { get; private set; }
// ReSharper disable once MemberCanBePrivate.Global
// ReSharper disable once UnusedMember.Global
@@ -99,3 +100,4 @@ public class SharedObject<T> where T : notnull
public static implicit operator SharedObject<T>(T value) =>
new(value);
}
}
mROA/Implementation/StaticRepresentationModuleProducer.cs
+5 -3
View File
@@ -1,7 +1,8 @@
using mROA.Abstract;
namespace mROA.Implementation;
using System;
using mROA.Abstract;
namespace mROA.Implementation
{
public class StaticRepresentationModuleProducer : IRepresentationModuleProducer
{
private IRepresentationModule? _representationModule;
@@ -19,3 +20,4 @@ public class StaticRepresentationModuleProducer : IRepresentationModuleProducer
_representationModule = serialisationModule;
}
}
}
mROA/LegacyExtentions.cs
+43
View File
@@ -0,0 +1,43 @@
using System.Collections.Generic;
using global::System;
using global::System.IO;
using global::System.Threading;
using global::System.Threading.Tasks;
namespace mROA
{
public static class LegacyExtentions
{
public static async ValueTask<int> ReadExactlyAsync(this Stream stream, byte[] buffer, int offset, int count)
{
return await stream.ReadAtLeastAsyncCore(buffer.AsMemory(offset, count), count, true, default);
}
public static ValueTask<int> ReadExactlyAsync(this Stream stream, Memory<byte> buffer,
CancellationToken cancellationToken = default(CancellationToken))
{
return stream.ReadAtLeastAsyncCore(buffer, buffer.Length, true, cancellationToken);
}
private static async ValueTask<int> ReadAtLeastAsyncCore(this Stream stream,
Memory<byte> buffer,
int minimumBytes,
bool throwOnEndOfStream,
CancellationToken cancellationToken)
{
int totalRead;
int num;
for (totalRead = 0; totalRead < minimumBytes; totalRead += num)
{
num = await stream.ReadAsync(buffer.Slice(totalRead), cancellationToken).ConfigureAwait(false);
if (num == 0)
{
if (throwOnEndOfStream)
throw new EndOfStreamException();
return totalRead;
}
}
return totalRead;
}
}
}
mROA/mROA.csproj
+6 -2
View File
@@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<TargetFramework>netstandard2.1</TargetFramework>
<Nullable>enable</Nullable>
<Title>mROA</Title>
<Version>2.0.0</Version>
@@ -12,6 +11,11 @@
<PackageProjectUrl>https://github.com/YaslePoy/mROA</PackageProjectUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>RPC</PackageTags>
<LangVersion>9</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Text.Json" Version="9.0.2" />
</ItemGroup>
</Project>