Merge pull request #1037 from yileicn/master

optimize HooKEmitter

Author: Oceania2018

src/Infrastructure/BotSharp.Abstraction/Infrastructures/HookEmitOption.cs

@@ -1,6 +1,11 @@
 namespace BotSharp.Abstraction.Infrastructures;
 
-public class HookEmitOption
+public class HookEmitOption<T>
 {
     public bool OnlyOnce { get; set; }
+
+    /// <summary>
+    /// Optional predicate to determine if the hook action should be executed for a specific hook instance.
+    /// </summary>
+    public Func<T, bool>? ShouldExecute { get; set; }
 }

src/Infrastructure/BotSharp.Core/Infrastructures/HookEmitter.cs

@@ -4,7 +4,7 @@ namespace BotSharp.Core.Infrastructures;
 
 public static class HookEmitter
 {
-    public static HookEmittedResult Emit<T>(IServiceProvider services, Action<T> action, HookEmitOption? option = null)
+    public static HookEmittedResult Emit<T>(IServiceProvider services, Action<T> action, HookEmitOption<T>? option = null)
     {
         var logger = services.GetRequiredService<ILogger<T>>();
         var result = new HookEmittedResult();
@@ -15,12 +15,15 @@ public static HookEmittedResult Emit<T>(IServiceProvider services, Action<T> act
         {
             try
             {
-                logger.LogDebug($"Emit hook action on {action.Method.Name}({hook.GetType().Name})");
-                action(hook);
-
-                if (option.OnlyOnce)
+                if (option.ShouldExecute == null || option.ShouldExecute(hook))
                 {
-                    break;
+                    logger.LogDebug($"Emit hook action on {action.Method.Name}({hook.GetType().Name})");
+                    action(hook);
+
+                    if (option.OnlyOnce)
+                    {
+                        break;
+                    }
                 }
             }
             catch (Exception ex)
@@ -32,7 +35,7 @@ public static HookEmittedResult Emit<T>(IServiceProvider services, Action<T> act
         return result;
     }
 
-    public static async Task<HookEmittedResult> Emit<T>(IServiceProvider services, Func<T, Task> action, HookEmitOption? option = null)
+    public static async Task<HookEmittedResult> Emit<T>(IServiceProvider services, Func<T, Task> action, HookEmitOption<T>? option = null)
     {
         var logger = services.GetRequiredService<ILogger<T>>();
         var result = new HookEmittedResult();
@@ -43,12 +46,15 @@ public static async Task<HookEmittedResult> Emit<T>(IServiceProvider services, F
         {
             try
             {
-                logger.LogDebug($"Emit hook action on {action.Method.Name}({hook.GetType().Name})");
-                await action(hook);
-
-                if (option.OnlyOnce)
+                if (option.ShouldExecute == null || option.ShouldExecute(hook))
                 {
-                    break;
+                    logger.LogDebug($"Emit hook action on {action.Method.Name}({hook.GetType().Name})");
+                    await action(hook);
+
+                    if (option.OnlyOnce)
+                    {
+                        break;
+                    }
                 }
             }
             catch (Exception ex)

src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioVoiceController.cs

@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Twilio.Http;
 using Task = System.Threading.Tasks.Task;
+using BotSharp.Abstraction.Infrastructures;
 
 namespace BotSharp.Plugin.Twilio.Controllers;
 
@@ -341,62 +342,46 @@ public async Task<TwiMLResult> TransferCall(ConversationalVoiceRequest request)
     public async Task<ActionResult> PhoneCallStatus(ConversationalVoiceRequest request)
     {
         var twilio = _services.GetRequiredService<TwilioService>();
-        if (request.CallStatus == "completed")
-        {
-            if (twilio.MachineDetected(request))
-            {
-                // voicemail
-                await HookEmitter.Emit<ITwilioCallStatusHook>(_services,
-                    async hook =>
-                    {
-                        if (hook.IsMatch(request)) await hook.OnVoicemailLeft(request);
-                    });
-            }
-            else
-            {
-                // phone call completed
-                await HookEmitter.Emit<ITwilioCallStatusHook>(_services,
-                    async hook =>
-                    {
-                        if (hook.IsMatch(request)) await hook.OnUserDisconnected(request);
-                    });
-            }
-        }
-        else if (request.CallStatus == "busy")
-        {
-            await HookEmitter.Emit<ITwilioCallStatusHook>(_services,
-                async hook =>
-                {
-                    if (hook.IsMatch(request)) await hook.OnCallBusyStatus(request);
-                });
-        }
-        else if (request.CallStatus == "no-answer")
+
+        // Define the options with the predicate
+        var emitOptions = new HookEmitOption<ITwilioCallStatusHook>
         {
-            await HookEmitter.Emit<ITwilioCallStatusHook>(_services,
-                async hook =>
-                {
-                    if (hook.IsMatch(request)) await hook.OnCallNoAnswerStatus(request);
-                });
-        }
-        else if (request.CallStatus == "canceled")
+            ShouldExecute = hook => hook.IsMatch(request)
+        };
+
+        switch (request.CallStatus)
         {
-            await HookEmitter.Emit<ITwilioCallStatusHook>(_services,
-                async hook =>
+            case "completed":
+                if (twilio.MachineDetected(request))
                 {
-                    if (hook.IsMatch(request)) await hook.OnCallCanceledStatus(request);
-                });
-        }
-        else if (request.CallStatus == "failed")
-        {
-            await HookEmitter.Emit<ITwilioCallStatusHook>(_services,
-                async hook =>
+                    // voicemail
+                    await HookEmitter.Emit<ITwilioCallStatusHook>(_services, hook => hook.OnVoicemailLeft(request), emitOptions);
+                }
+                else
                 {
-                    if (hook.IsMatch(request)) await hook.OnCallFailedStatus(request);
-                });
-        }
-        else
-        {
-            _logger.LogError($"Unknown call status: {request.CallStatus}, {request.CallSid}");
+                    // phone call completed
+                    await HookEmitter.Emit<ITwilioCallStatusHook>(_services, hook => hook.OnUserDisconnected(request), emitOptions);
+                }
+                break;
+
+            case "busy":
+                await HookEmitter.Emit<ITwilioCallStatusHook>(_services, hook => hook.OnCallBusyStatus(request), emitOptions);
+                break;
+
+            case "no-answer":
+                await HookEmitter.Emit<ITwilioCallStatusHook>(_services, hook => hook.OnCallNoAnswerStatus(request), emitOptions);
+                break;
+
+            case "canceled":
+                await HookEmitter.Emit<ITwilioCallStatusHook>(_services, hook => hook.OnCallCanceledStatus(request), emitOptions);
+                break;
+
+            case "failed":
+                await HookEmitter.Emit<ITwilioCallStatusHook>(_services, hook => hook.OnCallFailedStatus(request), emitOptions);
+                break;
+            default:
+                _logger.LogError($"Unknown call status: {request.CallStatus}, {request.CallSid}");
+                break;
         }
 
         return Ok();