1 files changed, 12 insertions, 35 deletions

diff --git a/src/SMAPI/Framework/Reflection/InterfaceProxyFactory.cs b/src/SMAPI/Framework/Reflection/InterfaceProxyFactory.cs
index 5acba569..694c563d 100644
--- a/src/SMAPI/Framework/Reflection/InterfaceProxyFactory.cs
+++ b/src/SMAPI/Framework/Reflection/InterfaceProxyFactory.cs
@@ -1,21 +1,17 @@
-using System;
-using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
+using Nanoray.Pintail;
 
 namespace StardewModdingAPI.Framework.Reflection
 {
-    /// <summary>Generates proxy classes to access mod APIs through an arbitrary interface.</summary>
-    internal class InterfaceProxyFactory
+    /// <inheritdoc />
+    internal class InterfaceProxyFactory : IInterfaceProxyFactory
     {
         /*********
         ** Fields
         *********/
-        /// <summary>The CLR module in which to create proxy classes.</summary>
-        private readonly ModuleBuilder ModuleBuilder;
-
-        /// <summary>The generated proxy types.</summary>
-        private readonly IDictionary<string, InterfaceProxyBuilder> Builders = new Dictionary<string, InterfaceProxyBuilder>();
+        /// <summary>The underlying proxy type builder.</summary>
+        private readonly IProxyManager<string> ProxyManager;
 
 
         /*********
@@ -25,37 +21,18 @@ namespace StardewModdingAPI.Framework.Reflection
         public InterfaceProxyFactory()
         {
             AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName($"StardewModdingAPI.Proxies, Version={this.GetType().Assembly.GetName().Version}, Culture=neutral"), AssemblyBuilderAccess.Run);
-            this.ModuleBuilder = assemblyBuilder.DefineDynamicModule("StardewModdingAPI.Proxies");
+            ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule("StardewModdingAPI.Proxies");
+            this.ProxyManager = new ProxyManager<string>(moduleBuilder, new ProxyManagerConfiguration<string>(
+                proxyPrepareBehavior: ProxyManagerProxyPrepareBehavior.Eager,
+                proxyObjectInterfaceMarking: ProxyObjectInterfaceMarking.Disabled
+            ));
         }
 
-        /// <summary>Create an API proxy.</summary>
-        /// <typeparam name="TInterface">The interface through which to access the API.</typeparam>
-        /// <param name="instance">The API instance to access.</param>
-        /// <param name="sourceModID">The unique ID of the mod consuming the API.</param>
-        /// <param name="targetModID">The unique ID of the mod providing the API.</param>
+        /// <inheritdoc />
         public TInterface CreateProxy<TInterface>(object instance, string sourceModID, string targetModID)
             where TInterface : class
         {
-            lock (this.Builders)
-            {
-                // validate
-                if (instance == null)
-                    throw new InvalidOperationException("Can't proxy access to a null API.");
-                if (!typeof(TInterface).IsInterface)
-                    throw new InvalidOperationException("The proxy type must be an interface, not a class.");
-
-                // get proxy type
-                Type targetType = instance.GetType();
-                string proxyTypeName = $"StardewModdingAPI.Proxies.From<{sourceModID}_{typeof(TInterface).FullName}>_To<{targetModID}_{targetType.FullName}>";
-                if (!this.Builders.TryGetValue(proxyTypeName, out InterfaceProxyBuilder builder))
-                {
-                    builder = new InterfaceProxyBuilder(proxyTypeName, this.ModuleBuilder, typeof(TInterface), targetType);
-                    this.Builders[proxyTypeName] = builder;
-                }
-
-                // create instance
-                return (TInterface)builder.CreateInstance(instance);
-            }
+            return this.ProxyManager.ObtainProxy<string, TInterface>(instance, targetContext: targetModID, proxyContext: sourceModID);
         }
     }
 }