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-03-08 19:46:59 +03:00
parent 6aa11ba7c0
commit 4863010b47
9 changed files with 264 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mROA/Implementation/Backend/BasicExecutionModule.cs
+67 -33
View File
@@ -58,7 +58,7 @@ namespace mROA.Implementation.Backend
throw new NullReferenceException("Can't find cancellation for this request");
cts.Cancel();
_cancellationRepo.FreeCancelation(command.Id);
return new FinalCommandExecution
{
Id = command.Id
@@ -75,7 +75,7 @@ namespace mROA.Implementation.Backend
if (context == null)
throw new NullReferenceException("Instance can't be null");
object?[]? castedParams = null;
@@ -87,18 +87,19 @@ namespace mROA.Implementation.Backend
castedParams[i] = _serialization.Cast(command.Parameters![i], invoker.ParameterTypes[i]);
}
}
var execContext = new RequestContext(command.Id, representationModule.Id);
if (invoker is { IsAsync: true, IsVoid: false })
return TypedExecuteAsync(invoker, context, castedParams, command, _cancellationRepo,
if (invoker is AsyncMethodInvoker { IsVoid: false } asyncNonVoidMethodInvoker)
return TypedExecuteAsync(asyncNonVoidMethodInvoker, context, castedParams, command,
_cancellationRepo,
representationModule, execContext);
if (invoker.IsAsync)
return ExecuteAsync(invoker, context, castedParams, command, _cancellationRepo,
if (invoker is AsyncMethodInvoker asyncMethodInvoker)
return ExecuteAsync(asyncMethodInvoker, context, castedParams, command, _cancellationRepo,
representationModule, execContext);
var result = Execute(invoker, context, castedParams, command, execContext);
var result = Execute((invoker as MethodInvoker)!, context, castedParams!, command, execContext);
if (command.CommandId == -1)
{
#if TRACE
@@ -119,7 +120,7 @@ namespace mROA.Implementation.Backend
}
}
private static ICommandExecution Execute(IMethodInvoker invoker, object instance, object?[] parameter,
private static ICommandExecution Execute(MethodInvoker invoker, object instance, object?[] parameter,
ICallRequest command, RequestContext executionContext)
{
try
@@ -150,7 +151,7 @@ namespace mROA.Implementation.Backend
}
}
private ICommandExecution ExecuteAsync(IMethodInvoker invoker, object instance, object?[]? parameters,
private ICommandExecution ExecuteAsync(AsyncMethodInvoker invoker, object instance, object?[]? parameters,
ICallRequest command, ICancellationRepository cancellationRepository,
IRepresentationModule representationModule, RequestContext executionContext)
{
@@ -162,10 +163,7 @@ namespace mROA.Implementation.Backend
#endif
try
{
var result = (Task)invoker.Invoke(instance, parameters, new object[] { executionContext, token })!;
result.ContinueWith(_ =>
invoker.Invoke(instance, parameters, new object[] { executionContext, token }, _ =>
{
if (token.IsCancellationRequested)
return;
@@ -182,7 +180,26 @@ namespace mROA.Implementation.Backend
multiClientOwnershipRepository?.RegisterOwnership(representationModule.Id);
representationModule.PostCallMessage(command.Id, MessageType.FinishedCommandExecution, payload);
multiClientOwnershipRepository?.FreeOwnership();
}, token);
});
// result.ContinueWith(_ =>
// {
// if (token.IsCancellationRequested)
// return;
//
// var payload = new FinalCommandExecution
// {
// Id = command.Id
// };
// _cancellationRepo?.FreeCancelation(command.Id);
//
// var multiClientOwnershipRepository =
// TransmissionConfig.OwnershipRepository as MultiClientOwnershipRepository;
//
// multiClientOwnershipRepository?.RegisterOwnership(representationModule.Id);
// representationModule.PostCallMessage(command.Id, MessageType.FinishedCommandExecution, payload);
// multiClientOwnershipRepository?.FreeOwnership();
// }, token);
return new AsyncCommandExecution
{
@@ -199,7 +216,7 @@ namespace mROA.Implementation.Backend
}
}
private ICommandExecution TypedExecuteAsync(IMethodInvoker invoker, object instance, object?[]? parameters,
private ICommandExecution TypedExecuteAsync(AsyncMethodInvoker invoker, object instance, object?[]? parameters,
ICallRequest command, ICancellationRepository cancellationRepository,
IRepresentationModule representationModule, RequestContext executionContext)
{
@@ -209,25 +226,42 @@ namespace mROA.Implementation.Backend
var token = tokenSource.Token;
try
{
var result =
(Task)invoker.Invoke(instance, parameters, new object[] { executionContext, token })!;
result.ContinueWith(t =>
{
var finalResult = t.GetType().GetProperty("Result")?.GetValue(t);
var payload = new FinalCommandExecution<object>
invoker.Invoke(instance, parameters, new object[] { executionContext, token },
finalResult =>
{
Id = command.Id,
Result = finalResult
};
_cancellationRepo!.FreeCancelation(command.Id);
var payload = new FinalCommandExecution<object>
{
Id = command.Id,
Result = finalResult
};
_cancellationRepo!.FreeCancelation(command.Id);
var multiClientOwnershipRepository =
TransmissionConfig.OwnershipRepository as MultiClientOwnershipRepository;
multiClientOwnershipRepository?.RegisterOwnership(representationModule.Id);
representationModule.PostCallMessage(command.Id, MessageType.FinishedCommandExecution, payload);
multiClientOwnershipRepository?.FreeOwnership();
}, token);
var multiClientOwnershipRepository =
TransmissionConfig.OwnershipRepository as MultiClientOwnershipRepository;
multiClientOwnershipRepository?.RegisterOwnership(representationModule.Id);
representationModule.PostCallMessage(command.Id, MessageType.FinishedCommandExecution,
payload);
multiClientOwnershipRepository?.FreeOwnership();
});
// result.ContinueWith(t =>
// {
// var finalResult = t.GetType().GetProperty("Result")?.GetValue(t);
// var payload = new FinalCommandExecution<object>
// {
// Id = command.Id,
// Result = finalResult
// };
// _cancellationRepo!.FreeCancelation(command.Id);
//
// var multiClientOwnershipRepository =
// TransmissionConfig.OwnershipRepository as MultiClientOwnershipRepository;
// multiClientOwnershipRepository?.RegisterOwnership(representationModule.Id);
// representationModule.PostCallMessage(command.Id, MessageType.FinishedCommandExecution, payload);
// multiClientOwnershipRepository?.FreeOwnership();
// }, token);
return new AsyncCommandExecution
{
mROA/Implementation/MethodInvoker.cs
+18 -4
View File
@@ -5,11 +5,10 @@ namespace mROA.Implementation
{
public class MethodInvoker : IMethodInvoker
{
public bool IsAsync { get; set; }
public bool IsVoid { get; set; }
public Type[] ParameterTypes { get; set; } = Type.EmptyTypes;
public Type? ReturnType { get; set; }
public Func<object, object?[]?, object[], object?> Invoking { get; set; } = (_, _, _) => null;
public Func<object, object?[]?, object[], object?> Invoking { get; set; } = (_, _, _) => null;
public object? Invoke(object instance, object?[]? parameters, object[] special)
{
@@ -17,10 +16,9 @@ namespace mROA.Implementation
}
public Type SuitableType { get; set; } = null!;
public static readonly IMethodInvoker Dispose = new MethodInvoker
{
IsAsync = false,
IsVoid = true,
ReturnType = null,
Invoking = (instance, _, _) =>
@@ -31,4 +29,20 @@ namespace mROA.Implementation
SuitableType = typeof(IDisposable)
};
}
public class AsyncMethodInvoker : IMethodInvoker
{
public bool IsVoid { get; set; }
public Type[] ParameterTypes { get; set; } = Type.EmptyTypes;
public Type? ReturnType { get; set; }
public Type SuitableType { get; set; }
public Action<object, object?[]?, object[], Action<object?>> Invoking { get; set; } =
(_, _, _, post) => { post.Invoke(null); };
public void Invoke(object instance, object?[]? parameters, object[] special, Action<object?> postInvokeAction)
{
Invoking(instance, parameters, special, postInvokeAction);
}
}
}
mROA/Implementation/NetworkMessage.cs
+1 -1
View File
@@ -15,6 +15,6 @@ namespace mROA.Implementation
public enum MessageType
{
Unknown, FinishedCommandExecution, ExceptionCommandExecution, AsyncCommandExecution, CallRequest, IdAssigning, CancelRequest
Unknown, FinishedCommandExecution, ExceptionCommandExecution, AsyncCommandExecution, CallRequest, IdAssigning, CancelRequest, EventRequest
}
}
mROA/Implementation/UniversalObjectIdentifier.cs
+8
View File
@@ -1,10 +1,18 @@
using System;
using mROA.Abstract;
namespace mROA.Implementation
{
#pragma warning disable CS8618, CS9264
public struct UniversalObjectIdentifier : IEquatable<UniversalObjectIdentifier>
{
private static IMethodInvoker x = new MethodInvoker
{
IsVoid = false,
ReturnType = typeof(void),
ParameterTypes = Type.EmptyTypes
};
public int ContextId;
public int OwnerId;