Skip to content

optimize HooKEmitter #1037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2025
Merged

optimize HooKEmitter #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5148cb
optimize HooKEmitter
yileicn Apr 29, 2025
46ad042
fix conflict
yileicn May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Infrastructure/BotSharp.Abstraction/Infrastructures/HookEmitOption.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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; }
}
30 changes: 18 additions & 12 deletions src/Infrastructure/BotSharp.Core/Infrastructures/HookEmitter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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)
Expand All @@ -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();
Expand All @@ -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)
Expand Down
89 changes: 37 additions & 52 deletions src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioVoiceController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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();
Expand Down
Loading