WIP

s2quake · Sep 19, 2024 · 2857014 · 2857014
1 parent 143d68c
commit 2857014
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/src/client/LibplanetConsole.Clients/ApplicationBase.cs b/src/client/LibplanetConsole.Clients/ApplicationBase.cs
@@ -34,6 +34,7 @@ protected ApplicationBase(ApplicationOptions options)
         _container.ComposeExportedValue(_client);
         _container.ComposeExportedValue<IClient>(_client);
         _container.ComposeExportedValue<IBlockChain>(_client);
+        _container.ComposeExportedValues(options.Components);
         _clientServiceContext = _container.GetValue<ClientServiceContext>();
         _clientServiceContext.EndPoint = options.EndPoint;
         _container.GetValue<IApplicationConfigurations>();

diff --git a/src/common/LibplanetConsole.Frameworks/Extensions/CompositionContainerExtensions.cs b/src/common/LibplanetConsole.Frameworks/Extensions/CompositionContainerExtensions.cs
@@ -1,4 +1,6 @@
+using System.ComponentModel.Composition;
 using System.ComponentModel.Composition.Hosting;
+using System.ComponentModel.Composition.Primitives;
 
 namespace LibplanetConsole.Frameworks.Extensions;
 
@@ -7,4 +9,22 @@ public static class CompositionContainerExtensions
     public static T GetValue<T>(this CompositionContainer @this)
         => @this.GetExportedValue<T>() ??
             throw new InvalidOperationException($"'{typeof(T)}' is not found.");
+
+    public static void ComposeExportedValues(this CompositionContainer @this, object[] components)
+    {
+        var batch = new CompositionBatch();
+        foreach (var item in components)
+        {
+            var contractName = AttributedModelServices.GetContractName(item.GetType());
+            var typeIdentity = AttributedModelServices.GetTypeIdentity(item.GetType());
+            var metadata = new Dictionary<string, object?>
+            {
+                { "ExportTypeIdentity", typeIdentity },
+            };
+            var export = new Export(contractName, metadata, () => item);
+            batch.AddExport(export);
+        }
+
+        @this.Compose(batch);
+    }
 }
diff --git a/src/console/LibplanetConsole.Consoles/ApplicationBase.cs b/src/console/LibplanetConsole.Consoles/ApplicationBase.cs
@@ -38,6 +38,7 @@ protected ApplicationBase(ApplicationOptions options)
         _container.ComposeExportedValue(_clients);
         _container.ComposeExportedValue<IClientCollection>(_clients);
         _container.ComposeExportedValue<IApplicationService>(_clients);
+        _container.ComposeExportedValues(options.Components);
         _consoleContext = _container.GetValue<ConsoleServiceContext>();
         _consoleContext.EndPoint = options.EndPoint;
         _container.GetValue<IApplicationConfigurations>();

diff --git a/src/node/LibplanetConsole.Nodes/ApplicationBase.cs b/src/node/LibplanetConsole.Nodes/ApplicationBase.cs
@@ -1,5 +1,8 @@
 using System.Collections;
+using System.ComponentModel;
 using System.ComponentModel.Composition;
+using System.ComponentModel.Composition.Hosting;
+using System.ComponentModel.Composition.Primitives;
 using System.Diagnostics;
 using LibplanetConsole.Common;
 using LibplanetConsole.Frameworks;
@@ -34,7 +37,8 @@ protected ApplicationBase(ApplicationOptions options)
         _container.ComposeExportedValue(_node);
         _container.ComposeExportedValue<INode>(_node);
         _container.ComposeExportedValue<IBlockChain>(_node);
-        Array.ForEach(options.Components, _container.ComposeExportedValue);
+        _container.ComposeExportedValues(options.Components);
+        _container.ComposeParts(options.Components);
         _nodeContext = _container.GetValue<NodeContext>();
         _nodeContext.EndPoint = options.EndPoint;
         _logger.Debug(options.EndPoint.ToString());