neuecc · neuecc · commit 54770a507ef8 · 2020-01-09T16:30:32.000+09:00
logger and interceptor method names changed
diff --git a/ReadMe.md b/ReadMe.md
diff --git a/src/ConsoleAppFramework.WebHosting/ConsoleAppFrameworkHostingExtensions.cs b/src/ConsoleAppFramework.WebHosting/ConsoleAppFrameworkHostingExtensions.cs
@@ -79,7 +79,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime lifetime
                 {
                     try
                     {
-                        await interceptor.OnConsoleAppEngineBeginAsync(provider, logger);
+                        await interceptor.OnEngineBeginAsync(provider, logger);
                     }
                     catch { }
                 });
@@ -88,7 +88,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime lifetime
                 {
                     try
                     {
-                        await interceptor.OnConsoleAppEngineEndAsync();
+                        await interceptor.OnMethodEndAsync();
                     }
                     catch { }
                 });
diff --git a/src/ConsoleAppFramework.WebHosting/ConsoleAppFrameworkMiddleware.cs b/src/ConsoleAppFramework.WebHosting/ConsoleAppFrameworkMiddleware.cs
@@ -22,27 +22,27 @@ public WebHostingInterceptor(IConsoleAppInterceptor innerInterceptor)
             this.innerInterceptor = innerInterceptor;
         }
 
-        public ValueTask OnConsoleAppEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger)
+        public ValueTask OnEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger)
         {
-            return innerInterceptor.OnConsoleAppEngineBeginAsync(serviceProvider, logger);
+            return innerInterceptor.OnEngineBeginAsync(serviceProvider, logger);
         }
 
-        public ValueTask OnConsoleAppEngineEndAsync()
+        public ValueTask OnMethodEndAsync()
         {
-            return innerInterceptor.OnConsoleAppEngineEndAsync();
+            return innerInterceptor.OnMethodEndAsync();
         }
 
-        public ValueTask OnConsoleAppRunBeginAsync(ConsoleAppContext context)
+        public ValueTask OnMethodBeginAsync(ConsoleAppContext context)
         {
-            return innerInterceptor.OnConsoleAppRunBeginAsync(context);
+            return innerInterceptor.OnMethodBeginAsync(context);
         }
 
-        public ValueTask OnConsoleAppRunCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists)
+        public ValueTask OnEngineCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists)
         {
             this.CompleteSuccessfully = (errorMessageIfFailed == null && exceptionIfExists == null);
             this.ErrorMessage = errorMessageIfFailed;
             this.Exception = exceptionIfExists;
-            return innerInterceptor.OnConsoleAppRunCompleteAsync(context, errorMessageIfFailed, exceptionIfExists);
+            return innerInterceptor.OnEngineCompleteAsync(context, errorMessageIfFailed, exceptionIfExists);
         }
     }
 
diff --git a/src/ConsoleAppFramework/CompositeConsoleAppInterceptor.cs b/src/ConsoleAppFramework/CompositeConsoleAppInterceptor.cs
@@ -16,14 +16,14 @@ public CompositeConsoleAppInterceptor(params IConsoleAppInterceptor[] intercepto
             this.interceptors = interceptors;
         }
 
-        public async ValueTask OnConsoleAppEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger)
+        public async ValueTask OnEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger)
         {
             var exceptions = new AggregateExceptionHolder();
             foreach (var item in interceptors)
             {
                 try
                 {
-                    await item.OnConsoleAppEngineBeginAsync(serviceProvider, logger);
+                    await item.OnEngineBeginAsync(serviceProvider, logger);
                 }
                 catch (Exception e)
                 {
@@ -33,14 +33,14 @@ public async ValueTask OnConsoleAppEngineBeginAsync(IServiceProvider serviceProv
             exceptions.ThrowIfExists();
         }
 
-        public async ValueTask OnConsoleAppEngineEndAsync()
+        public async ValueTask OnMethodEndAsync()
         {
             var exceptions = new AggregateExceptionHolder();
             foreach (var item in interceptors)
             {
                 try
                 {
-                    await item.OnConsoleAppEngineEndAsync();
+                    await item.OnMethodEndAsync();
                 }
                 catch (Exception e)
                 {
@@ -50,14 +50,14 @@ public async ValueTask OnConsoleAppEngineEndAsync()
             exceptions.ThrowIfExists();
         }
 
-        public async ValueTask OnConsoleAppRunBeginAsync(ConsoleAppContext context)
+        public async ValueTask OnMethodBeginAsync(ConsoleAppContext context)
         {
             var exceptions = new AggregateExceptionHolder();
             foreach (var item in interceptors)
             {
                 try
                 {
-                    await item.OnConsoleAppRunBeginAsync(context);
+                    await item.OnMethodBeginAsync(context);
                 }
                 catch (Exception e)
                 {
@@ -67,14 +67,14 @@ public async ValueTask OnConsoleAppRunBeginAsync(ConsoleAppContext context)
             exceptions.ThrowIfExists();
         }
 
-        public async ValueTask OnConsoleAppRunCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists)
+        public async ValueTask OnEngineCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists)
         {
             var exceptions = new AggregateExceptionHolder();
             foreach (var item in interceptors)
             {
                 try
                 {
-                    await item.OnConsoleAppRunCompleteAsync(context, errorMessageIfFailed, exceptionIfExists);
+                    await item.OnEngineCompleteAsync(context, errorMessageIfFailed, exceptionIfExists);
                 }
                 catch (Exception e)
                 {
diff --git a/src/ConsoleAppFramework/ConsoleAppEngine.cs b/src/ConsoleAppFramework/ConsoleAppEngine.cs
@@ -42,7 +42,7 @@ public async Task RunAsync(Type type, string[] args)
             var ctx = new ConsoleAppContext(args, DateTime.UtcNow, cancellationToken, logger);
             try
             {
-                await interceptor.OnConsoleAppRunBeginAsync(ctx);
+                await interceptor.OnMethodBeginAsync(ctx);
 
                 if (type == typeof(void))
                 {
@@ -181,26 +181,28 @@ async Task RunCore(ConsoleAppContext ctx, Type type, MethodInfo methodInfo, stri
                 }
             }
 
-            await interceptor.OnConsoleAppRunCompleteAsync(ctx, null, null);
+            await interceptor.OnEngineCompleteAsync(ctx, null, null);
             logger.LogTrace("ConsoleAppEngine.Run Complete Successfully");
         }
 
         async ValueTask SetFailAsync(ConsoleAppContext context, string message)
         {
             Environment.ExitCode = 1;
             logger.LogError(message);
-            await interceptor.OnConsoleAppRunCompleteAsync(context, message, null);
+            await interceptor.OnEngineCompleteAsync(context, message, null);
         }
 
         async ValueTask SetFailAsync(ConsoleAppContext context, string message, Exception ex)
         {
             Environment.ExitCode = 1;
             logger.LogError(ex, message);
-            await interceptor.OnConsoleAppRunCompleteAsync(context, message, ex);
+            await interceptor.OnEngineCompleteAsync(context, message, ex);
         }
 
-        static bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, int argsOffset, out object[] invokeArgs, out string? errorMessage)
+        bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, int argsOffset, out object[] invokeArgs, out string? errorMessage)
         {
+            var jsonOption = (JsonSerializerOptions)provider.GetService(typeof(JsonSerializerOptions));
+
             var argumentDictionary = ParseArgument(args, argsOffset);
             invokeArgs = new object[parameters.Length];
 
@@ -268,7 +270,7 @@ static bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, in
                             }
                             try
                             {
-                                invokeArgs[i] = JsonSerializer.Deserialize(v, parameters[i].ParameterType);
+                                invokeArgs[i] = JsonSerializer.Deserialize(v, parameters[i].ParameterType, jsonOption);
                                 continue;
                             }
                             catch
@@ -281,7 +283,7 @@ static bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, in
                         {
                             try
                             {
-                                invokeArgs[i] = JsonSerializer.Deserialize(value.Value, parameters[i].ParameterType);
+                                invokeArgs[i] = JsonSerializer.Deserialize(value.Value, parameters[i].ParameterType, jsonOption);
                                 continue;
                             }
                             catch
diff --git a/src/ConsoleAppFramework/ConsoleAppEngineHostBuilderExtensions.cs b/src/ConsoleAppFramework/ConsoleAppEngineHostBuilderExtensions.cs
@@ -61,7 +61,7 @@ IHostBuilder ConfigureEmptyService()
 
                 if (methodIndex != -1)
                 {
-                    var (t, mi) = GetTypeFromAssemblies(args[1], null);
+                    var (t, mi) = GetTypeFromAssemblies(args[methodIndex], null);
                     if (mi != null)
                     {
                         Console.Write(new CommandHelpBuilder().BuildHelpMessage(mi, showCommandName: true));
diff --git a/src/ConsoleAppFramework/ConsoleAppEngineService.cs b/src/ConsoleAppFramework/ConsoleAppEngineService.cs
@@ -39,7 +39,7 @@ public ConsoleAppEngineService(IHostApplicationLifetime appLifetime, Type type,
 
         public async Task StartAsync(CancellationToken cancellationToken)
         {
-            await interceptor.OnConsoleAppEngineBeginAsync(scope.ServiceProvider, logger);
+            await interceptor.OnEngineBeginAsync(scope.ServiceProvider, logger);
 
             // raise after all event registered
             appLifetime.ApplicationStarted.Register(async state =>
@@ -84,7 +84,7 @@ public async Task StopAsync(CancellationToken cancellationToken)
             }
             finally
             {
-                await interceptor.OnConsoleAppEngineEndAsync();
+                await interceptor.OnMethodEndAsync();
                 scope.Dispose();
             }
         }
diff --git a/src/ConsoleAppFramework/IConsoleAppInterceptor.cs b/src/ConsoleAppFramework/IConsoleAppInterceptor.cs
@@ -7,47 +7,47 @@ namespace ConsoleAppFramework
     public interface IConsoleAppInterceptor
     {
         /// <summary>
-        /// Called once when ConsoleAppEngineService is stareted.
+        /// Called once when ConsoleAppFramework is stareted.
         /// </summary>
-        ValueTask OnConsoleAppEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger);
+        ValueTask OnEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger);
 
         /// <summary>
-        /// Called once when ConsoleAppEngineService is finished.
+        /// Called when ConsoleAppMethod is called.
         /// </summary>
-        ValueTask OnConsoleAppEngineEndAsync();
+        ValueTask OnMethodBeginAsync(ConsoleAppContext context);
 
         /// <summary>
-        /// Called when ConsoleAppMethod is called.
+        /// Called once when ConsoleAppMethod is finished.
         /// </summary>
-        ValueTask OnConsoleAppRunBeginAsync(ConsoleAppContext context);
+        ValueTask OnMethodEndAsync();
 
         /// <summary>
-        /// Called when ConsoleAppMethod is error or completed.
+        /// Called when ConsoleAppFramework is error or completed.
         /// </summary>
-        ValueTask OnConsoleAppRunCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists);
+        ValueTask OnEngineCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists);
     }
 
     public class NullConsoleAppInterceptor : IConsoleAppInterceptor
     {
         public static readonly IConsoleAppInterceptor Default = new NullConsoleAppInterceptor();
         readonly ValueTask Empty = default(ValueTask);
 
-        public ValueTask OnConsoleAppEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger)
+        public ValueTask OnEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger)
         {
             return Empty;
         }
 
-        public ValueTask OnConsoleAppEngineEndAsync()
+        public ValueTask OnMethodEndAsync()
         {
             return Empty;
         }
 
-        public ValueTask OnConsoleAppRunBeginAsync(ConsoleAppContext context)
+        public ValueTask OnMethodBeginAsync(ConsoleAppContext context)
         {
             return Empty;
         }
 
-        public ValueTask OnConsoleAppRunCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists)
+        public ValueTask OnEngineCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists)
         {
             return Empty;
         }

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime lifetime`
`79`	`79`	`{`
`80`	`80`	`try`
`81`	`81`	`{`
`82`		`- await interceptor.OnConsoleAppEngineBeginAsync(provider, logger);`
	`82`	`+ await interceptor.OnEngineBeginAsync(provider, logger);`
`83`	`83`	`}`
`84`	`84`	`catch { }`
`85`	`85`	`});`
`@@ -88,7 +88,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime lifetime`
`88`	`88`	`{`
`89`	`89`	`try`
`90`	`90`	`{`
`91`		`- await interceptor.OnConsoleAppEngineEndAsync();`
	`91`	`+ await interceptor.OnMethodEndAsync();`
`92`	`92`	`}`
`93`	`93`	`catch { }`
`94`	`94`	`});`
Original file line number	Diff line number	Diff line change
`@@ -22,27 +22,27 @@ public WebHostingInterceptor(IConsoleAppInterceptor innerInterceptor)`
`22`	`22`	`this.innerInterceptor = innerInterceptor;`
`23`	`23`	`}`
`24`	`24`
`25`		`- public ValueTask OnConsoleAppEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger)`
	`25`	`+ public ValueTask OnEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger)`
`26`	`26`	`{`
`27`		`- return innerInterceptor.OnConsoleAppEngineBeginAsync(serviceProvider, logger);`
	`27`	`+ return innerInterceptor.OnEngineBeginAsync(serviceProvider, logger);`
`28`	`28`	`}`
`29`	`29`
`30`		`- public ValueTask OnConsoleAppEngineEndAsync()`
	`30`	`+ public ValueTask OnMethodEndAsync()`
`31`	`31`	`{`
`32`		`- return innerInterceptor.OnConsoleAppEngineEndAsync();`
	`32`	`+ return innerInterceptor.OnMethodEndAsync();`
`33`	`33`	`}`
`34`	`34`
`35`		`- public ValueTask OnConsoleAppRunBeginAsync(ConsoleAppContext context)`
	`35`	`+ public ValueTask OnMethodBeginAsync(ConsoleAppContext context)`
`36`	`36`	`{`
`37`		`- return innerInterceptor.OnConsoleAppRunBeginAsync(context);`
	`37`	`+ return innerInterceptor.OnMethodBeginAsync(context);`
`38`	`38`	`}`
`39`	`39`
`40`		`- public ValueTask OnConsoleAppRunCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists)`
	`40`	`+ public ValueTask OnEngineCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists)`
`41`	`41`	`{`
`42`	`42`	`this.CompleteSuccessfully = (errorMessageIfFailed == null && exceptionIfExists == null);`
`43`	`43`	`this.ErrorMessage = errorMessageIfFailed;`
`44`	`44`	`this.Exception = exceptionIfExists;`
`45`		`- return innerInterceptor.OnConsoleAppRunCompleteAsync(context, errorMessageIfFailed, exceptionIfExists);`
	`45`	`+ return innerInterceptor.OnEngineCompleteAsync(context, errorMessageIfFailed, exceptionIfExists);`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,14 @@ public CompositeConsoleAppInterceptor(params IConsoleAppInterceptor[] intercepto`
`16`	`16`	`this.interceptors = interceptors;`
`17`	`17`	`}`
`18`	`18`
`19`		`- public async ValueTask OnConsoleAppEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger)`
	`19`	`+ public async ValueTask OnEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger)`
`20`	`20`	`{`
`21`	`21`	`var exceptions = new AggregateExceptionHolder();`
`22`	`22`	`foreach (var item in interceptors)`
`23`	`23`	`{`
`24`	`24`	`try`
`25`	`25`	`{`
`26`		`- await item.OnConsoleAppEngineBeginAsync(serviceProvider, logger);`
	`26`	`+ await item.OnEngineBeginAsync(serviceProvider, logger);`
`27`	`27`	`}`
`28`	`28`	`catch (Exception e)`
`29`	`29`	`{`
`@@ -33,14 +33,14 @@ public async ValueTask OnConsoleAppEngineBeginAsync(IServiceProvider serviceProv`
`33`	`33`	`exceptions.ThrowIfExists();`
`34`	`34`	`}`
`35`	`35`
`36`		`- public async ValueTask OnConsoleAppEngineEndAsync()`
	`36`	`+ public async ValueTask OnMethodEndAsync()`
`37`	`37`	`{`
`38`	`38`	`var exceptions = new AggregateExceptionHolder();`
`39`	`39`	`foreach (var item in interceptors)`
`40`	`40`	`{`
`41`	`41`	`try`
`42`	`42`	`{`
`43`		`- await item.OnConsoleAppEngineEndAsync();`
	`43`	`+ await item.OnMethodEndAsync();`
`44`	`44`	`}`
`45`	`45`	`catch (Exception e)`
`46`	`46`	`{`
`@@ -50,14 +50,14 @@ public async ValueTask OnConsoleAppEngineEndAsync()`
`50`	`50`	`exceptions.ThrowIfExists();`
`51`	`51`	`}`
`52`	`52`
`53`		`- public async ValueTask OnConsoleAppRunBeginAsync(ConsoleAppContext context)`
	`53`	`+ public async ValueTask OnMethodBeginAsync(ConsoleAppContext context)`
`54`	`54`	`{`
`55`	`55`	`var exceptions = new AggregateExceptionHolder();`
`56`	`56`	`foreach (var item in interceptors)`
`57`	`57`	`{`
`58`	`58`	`try`
`59`	`59`	`{`
`60`		`- await item.OnConsoleAppRunBeginAsync(context);`
	`60`	`+ await item.OnMethodBeginAsync(context);`
`61`	`61`	`}`
`62`	`62`	`catch (Exception e)`
`63`	`63`	`{`
`@@ -67,14 +67,14 @@ public async ValueTask OnConsoleAppRunBeginAsync(ConsoleAppContext context)`
`67`	`67`	`exceptions.ThrowIfExists();`
`68`	`68`	`}`
`69`	`69`
`70`		`- public async ValueTask OnConsoleAppRunCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists)`
	`70`	`+ public async ValueTask OnEngineCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists)`
`71`	`71`	`{`
`72`	`72`	`var exceptions = new AggregateExceptionHolder();`
`73`	`73`	`foreach (var item in interceptors)`
`74`	`74`	`{`
`75`	`75`	`try`
`76`	`76`	`{`
`77`		`- await item.OnConsoleAppRunCompleteAsync(context, errorMessageIfFailed, exceptionIfExists);`
	`77`	`+ await item.OnEngineCompleteAsync(context, errorMessageIfFailed, exceptionIfExists);`
`78`	`78`	`}`
`79`	`79`	`catch (Exception e)`
`80`	`80`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public async Task RunAsync(Type type, string[] args)`
`42`	`42`	`var ctx = new ConsoleAppContext(args, DateTime.UtcNow, cancellationToken, logger);`
`43`	`43`	`try`
`44`	`44`	`{`
`45`		`- await interceptor.OnConsoleAppRunBeginAsync(ctx);`
	`45`	`+ await interceptor.OnMethodBeginAsync(ctx);`
`46`	`46`
`47`	`47`	`if (type == typeof(void))`
`48`	`48`	`{`
`@@ -181,26 +181,28 @@ async Task RunCore(ConsoleAppContext ctx, Type type, MethodInfo methodInfo, stri`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`
`184`		`- await interceptor.OnConsoleAppRunCompleteAsync(ctx, null, null);`
	`184`	`+ await interceptor.OnEngineCompleteAsync(ctx, null, null);`
`185`	`185`	`logger.LogTrace("ConsoleAppEngine.Run Complete Successfully");`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`async ValueTask SetFailAsync(ConsoleAppContext context, string message)`
`189`	`189`	`{`
`190`	`190`	`Environment.ExitCode = 1;`
`191`	`191`	`logger.LogError(message);`
`192`		`- await interceptor.OnConsoleAppRunCompleteAsync(context, message, null);`
	`192`	`+ await interceptor.OnEngineCompleteAsync(context, message, null);`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`async ValueTask SetFailAsync(ConsoleAppContext context, string message, Exception ex)`
`196`	`196`	`{`
`197`	`197`	`Environment.ExitCode = 1;`
`198`	`198`	`logger.LogError(ex, message);`
`199`		`- await interceptor.OnConsoleAppRunCompleteAsync(context, message, ex);`
	`199`	`+ await interceptor.OnEngineCompleteAsync(context, message, ex);`
`200`	`200`	`}`
`201`	`201`
`202`		`- static bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, int argsOffset, out object[] invokeArgs, out string? errorMessage)`
	`202`	`+ bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, int argsOffset, out object[] invokeArgs, out string? errorMessage)`
`203`	`203`	`{`
	`204`	`+ var jsonOption = (JsonSerializerOptions)provider.GetService(typeof(JsonSerializerOptions));`
	`205`	`+`
`204`	`206`	`var argumentDictionary = ParseArgument(args, argsOffset);`
`205`	`207`	`invokeArgs = new object[parameters.Length];`
`206`	`208`
`@@ -268,7 +270,7 @@ static bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, in`
`268`	`270`	`}`
`269`	`271`	`try`
`270`	`272`	`{`
`271`		`- invokeArgs[i] = JsonSerializer.Deserialize(v, parameters[i].ParameterType);`
	`273`	`+ invokeArgs[i] = JsonSerializer.Deserialize(v, parameters[i].ParameterType, jsonOption);`
`272`	`274`	`continue;`
`273`	`275`	`}`
`274`	`276`	`catch`
`@@ -281,7 +283,7 @@ static bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, in`
`281`	`283`	`{`
`282`	`284`	`try`
`283`	`285`	`{`
`284`		`- invokeArgs[i] = JsonSerializer.Deserialize(value.Value, parameters[i].ParameterType);`
	`286`	`+ invokeArgs[i] = JsonSerializer.Deserialize(value.Value, parameters[i].ParameterType, jsonOption);`
`285`	`287`	`continue;`
`286`	`288`	`}`
`287`	`289`	`catch`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ IHostBuilder ConfigureEmptyService()`
`61`	`61`
`62`	`62`	`if (methodIndex != -1)`
`63`	`63`	`{`
`64`		`- var (t, mi) = GetTypeFromAssemblies(args[1], null);`
	`64`	`+ var (t, mi) = GetTypeFromAssemblies(args[methodIndex], null);`
`65`	`65`	`if (mi != null)`
`66`	`66`	`{`
`67`	`67`	`Console.Write(new CommandHelpBuilder().BuildHelpMessage(mi, showCommandName: true));`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public ConsoleAppEngineService(IHostApplicationLifetime appLifetime, Type type,`
`39`	`39`
`40`	`40`	`public async Task StartAsync(CancellationToken cancellationToken)`
`41`	`41`	`{`
`42`		`- await interceptor.OnConsoleAppEngineBeginAsync(scope.ServiceProvider, logger);`
	`42`	`+ await interceptor.OnEngineBeginAsync(scope.ServiceProvider, logger);`
`43`	`43`
`44`	`44`	`// raise after all event registered`
`45`	`45`	`appLifetime.ApplicationStarted.Register(async state =>`
`@@ -84,7 +84,7 @@ public async Task StopAsync(CancellationToken cancellationToken)`
`84`	`84`	`}`
`85`	`85`	`finally`
`86`	`86`	`{`
`87`		`- await interceptor.OnConsoleAppEngineEndAsync();`
	`87`	`+ await interceptor.OnMethodEndAsync();`
`88`	`88`	`scope.Dispose();`
`89`	`89`	`}`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,47 +7,47 @@ namespace ConsoleAppFramework`
`7`	`7`	`public interface IConsoleAppInterceptor`
`8`	`8`	`{`
`9`	`9`	`/// <summary>`
`10`		`- /// Called once when ConsoleAppEngineService is stareted.`
	`10`	`+ /// Called once when ConsoleAppFramework is stareted.`
`11`	`11`	`/// </summary>`
`12`		`- ValueTask OnConsoleAppEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger);`
	`12`	`+ ValueTask OnEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger);`
`13`	`13`
`14`	`14`	`/// <summary>`
`15`		`- /// Called once when ConsoleAppEngineService is finished.`
	`15`	`+ /// Called when ConsoleAppMethod is called.`
`16`	`16`	`/// </summary>`
`17`		`- ValueTask OnConsoleAppEngineEndAsync();`
	`17`	`+ ValueTask OnMethodBeginAsync(ConsoleAppContext context);`
`18`	`18`
`19`	`19`	`/// <summary>`
`20`		`- /// Called when ConsoleAppMethod is called.`
	`20`	`+ /// Called once when ConsoleAppMethod is finished.`
`21`	`21`	`/// </summary>`
`22`		`- ValueTask OnConsoleAppRunBeginAsync(ConsoleAppContext context);`
	`22`	`+ ValueTask OnMethodEndAsync();`
`23`	`23`
`24`	`24`	`/// <summary>`
`25`		`- /// Called when ConsoleAppMethod is error or completed.`
	`25`	`+ /// Called when ConsoleAppFramework is error or completed.`
`26`	`26`	`/// </summary>`
`27`		`- ValueTask OnConsoleAppRunCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists);`
	`27`	`+ ValueTask OnEngineCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public class NullConsoleAppInterceptor : IConsoleAppInterceptor`
`31`	`31`	`{`
`32`	`32`	`public static readonly IConsoleAppInterceptor Default = new NullConsoleAppInterceptor();`
`33`	`33`	`readonly ValueTask Empty = default(ValueTask);`
`34`	`34`
`35`		`- public ValueTask OnConsoleAppEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger)`
	`35`	`+ public ValueTask OnEngineBeginAsync(IServiceProvider serviceProvider, ILogger<ConsoleAppEngine> logger)`
`36`	`36`	`{`
`37`	`37`	`return Empty;`
`38`	`38`	`}`
`39`	`39`
`40`		`- public ValueTask OnConsoleAppEngineEndAsync()`
	`40`	`+ public ValueTask OnMethodEndAsync()`
`41`	`41`	`{`
`42`	`42`	`return Empty;`
`43`	`43`	`}`
`44`	`44`
`45`		`- public ValueTask OnConsoleAppRunBeginAsync(ConsoleAppContext context)`
	`45`	`+ public ValueTask OnMethodBeginAsync(ConsoleAppContext context)`
`46`	`46`	`{`
`47`	`47`	`return Empty;`
`48`	`48`	`}`
`49`	`49`
`50`		`- public ValueTask OnConsoleAppRunCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists)`
	`50`	`+ public ValueTask OnEngineCompleteAsync(ConsoleAppContext context, string? errorMessageIfFailed, Exception? exceptionIfExists)`
`51`	`51`	`{`
`52`	`52`	`return Empty;`
`53`	`53`	`}`