ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-23 08:17:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Load services asynchronously whenever possible (#893)

Browse source
This commit is contained in:
kizer 2022-06-25 05:12:51 +09:00 • committed by GitHub
parent fba8c7163c
commit 8e7f370ddd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
66 changed files with 959 additions and 899 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Dalamud/IoC/Internal/ObjectInstance.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Reflection;
using System.Threading.Tasks;
namespace Dalamud.IoC.Internal
{
@ -11,11 +12,12 @@ namespace Dalamud.IoC.Internal
/// <summary>
/// Initializes a new instance of the <see cref="ObjectInstance"/> class.
/// </summary>
/// <param name="instance">The underlying instance.</param>
public ObjectInstance(object instance)
/// <param name="instanceTask">Weak reference to the underlying instance.</param>
/// <param name="type">Type of the underlying instance.</param>
public ObjectInstance(Task<WeakReference> instanceTask, Type type)
{
this.Instance = new WeakReference(instance);
this.Version = instance.GetType().GetCustomAttribute<InterfaceVersionAttribute>();
this.InstanceTask = instanceTask;
this.Version = type.GetCustomAttribute<InterfaceVersionAttribute>();
}
/// <summary>
@ -26,6 +28,7 @@ namespace Dalamud.IoC.Internal
/// <summary>
/// Gets a reference to the underlying instance.
/// </summary>
public WeakReference Instance { get; }
/// <returns>The underlying instance.</returns>
public Task<WeakReference> InstanceTask { get; }
}
}

76
Dalamud/IoC/Internal/ServiceContainer.cs
View file

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Runtime.Serialization;
using System.Threading.Tasks;
using Dalamud.Logging.Internal;
namespace Dalamud.IoC.Internal
@ -17,19 +17,26 @@ namespace Dalamud.IoC.Internal
private readonly Dictionary<Type, ObjectInstance> instances = new();
/// <summary>
/// Initializes a new instance of the <see cref="ServiceContainer"/> class.
/// </summary>
public ServiceContainer()
{
}
/// <summary>
/// Register a singleton object of any type into the current IOC container.
/// </summary>
/// <param name="instance">The existing instance to register in the container.</param>
/// <typeparam name="T">The interface to register.</typeparam>
public void RegisterSingleton<T>(T instance)
public void RegisterSingleton<T>(Task<T> instance)
{
if (instance == null)
{
throw new ArgumentNullException(nameof(instance));
}
this.instances[typeof(T)] = new(instance);
this.instances[typeof(T)] = new(instance.ContinueWith(x => new WeakReference(x.Result)), typeof(T));
}
/// <summary>
@ -38,12 +45,12 @@ namespace Dalamud.IoC.Internal
/// <param name="objectType">The type of object to create.</param>
/// <param name="scopedObjects">Scoped objects to be included in the constructor.</param>
/// <returns>The created object.</returns>
public object? Create(Type objectType, params object[] scopedObjects)
public async Task<object?> Create(Type objectType, params object[] scopedObjects)
{
var ctor = this.FindApplicableCtor(objectType, scopedObjects);
if (ctor == null)
{
Log.Error("Failed to create {TypeName}, an eligible ctor with satisfiable services could not be found", objectType.FullName);
Log.Error("Failed to create {TypeName}, an eligible ctor with satisfiable services could not be found", objectType.FullName!);
return null;
}
@ -59,36 +66,37 @@ namespace Dalamud.IoC.Internal
if (!versionCheck)
{
Log.Error("Failed to create {TypeName}, a RequestedVersion could not be satisfied", objectType.FullName);
Log.Error("Failed to create {TypeName}, a RequestedVersion could not be satisfied", objectType.FullName!);
return null;
}
var resolvedParams = parameters
.Select(p =>
{
var service = this.GetService(p.parameterType, scopedObjects);
var resolvedParams =
await Task.WhenAll(
parameters
.Select(async p =>
{
var service = await this.GetService(p.parameterType, scopedObjects);
if (service == null)
{
Log.Error("Requested service type {TypeName} was not available (null)", p.parameterType.FullName);
}
if (service == null)
{
Log.Error("Requested service type {TypeName} was not available (null)", p.parameterType.FullName!);
}
return service;
})
.ToArray();
return service;
}));
var hasNull = resolvedParams.Any(p => p == null);
if (hasNull)
{
Log.Error("Failed to create {TypeName}, a requested service type could not be satisfied", objectType.FullName);
Log.Error("Failed to create {TypeName}, a requested service type could not be satisfied", objectType.FullName!);
return null;
}
var instance = FormatterServices.GetUninitializedObject(objectType);
if (!this.InjectProperties(instance, scopedObjects))
if (!await this.InjectProperties(instance, scopedObjects))
{
Log.Error("Failed to create {TypeName}, a requested property service type could not be satisfied", objectType.FullName);
Log.Error("Failed to create {TypeName}, a requested property service type could not be satisfied", objectType.FullName!);
return null;
}
@ -105,7 +113,7 @@ namespace Dalamud.IoC.Internal
/// <param name="instance">The object instance.</param>
/// <param name="scopedObjects">Scoped objects.</param>
/// <returns>Whether or not the injection was successful.</returns>
public bool InjectProperties(object instance, params object[] scopedObjects)
public async Task<bool> InjectProperties(object instance, params object[] scopedObjects)
{
var objectType = instance.GetType();
@ -121,17 +129,17 @@ namespace Dalamud.IoC.Internal
if (!versionCheck)
{
Log.Error("Failed to create {TypeName}, a RequestedVersion could not be satisfied", objectType.FullName);
Log.Error("Failed to create {TypeName}, a RequestedVersion could not be satisfied", objectType.FullName!);
return false;
}
foreach (var prop in props)
{
var service = this.GetService(prop.propertyInfo.PropertyType, scopedObjects);
var service = await this.GetService(prop.propertyInfo.PropertyType, scopedObjects);
if (service == null)
{
Log.Error("Requested service type {TypeName} was not available (null)", prop.propertyInfo.PropertyType.FullName);
Log.Error("Requested service type {TypeName} was not available (null)", prop.propertyInfo.PropertyType.FullName!);
return false;
}
@ -162,14 +170,14 @@ namespace Dalamud.IoC.Internal
"Requested version {ReqVersion} does not match the implemented version {ImplVersion} for param type {ParamType}",
requiredVersion.Version,
declVersion.Version,
parameterType.FullName);
parameterType.FullName!);
return false;
}
private object? GetService(Type serviceType, object[] scopedObjects)
private async Task<object?> GetService(Type serviceType, object[] scopedObjects)
{
var singletonService = this.GetService(serviceType);
var singletonService = await this.GetService(serviceType);
if (singletonService != null)
{
return singletonService;
@ -185,15 +193,13 @@ namespace Dalamud.IoC.Internal
return scoped;
}
private object? GetService(Type serviceType)
private async Task<object?> GetService(Type serviceType)
{
var hasInstance = this.instances.TryGetValue(serviceType, out var service);
if (hasInstance && service.Instance.IsAlive)
{
return service.Instance.Target;
}
if (!this.instances.TryGetValue(serviceType, out var service))
return null;
return null;
var instance = await service.InstanceTask;
return instance.Target;
}
private ConstructorInfo? FindApplicableCtor(Type type, object[] scopedObjects)
@ -224,7 +230,7 @@ namespace Dalamud.IoC.Internal
var contains = types.Contains(parameter.ParameterType);
if (!contains)
{
Log.Error("Failed to validate {TypeName}, unable to find any services that satisfy the type", parameter.ParameterType.FullName);
Log.Error("Failed to validate {TypeName}, unable to find any services that satisfy the type", parameter.ParameterType.FullName!);
return false;
}
}