Skip to content

Fix Twilio IncomingMessage timeouts #338

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
ucswift merged 1 commit into from
Apr 21, 2026
Merged

Fix Twilio IncomingMessage timeouts #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 22 additions & 14 deletions Core/Resgrid.Services/SubscriptionsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,26 +56,34 @@ public SubscriptionsService(IPlansRepository plansRepository, IPaymentRepository

if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))
{
var options = new RestClientOptions(Config.SystemBehaviorConfig.BillingApiBaseUrl)
try
{
MaxTimeout = 200000 // ms
};
var options = new RestClientOptions(Config.SystemBehaviorConfig.BillingApiBaseUrl)
{
MaxTimeout = 5000 // ms — fail fast so callers (e.g. Twilio webhooks) don't exceed their own timeouts
};

var client = new RestClient(options, configureSerialization: s => s.UseNewtonsoftJson());
var request = new RestRequest($"/api/Billing/GetCurrentPlanForDepartment", Method.Get);
request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);
request.AddHeader("Content-Type", "application/json");
request.AddParameter("departmentId", departmentId, ParameterType.QueryString);
var client = new RestClient(options, configureSerialization: s => s.UseNewtonsoftJson());
var request = new RestRequest($"/api/Billing/GetCurrentPlanForDepartment", Method.Get);
request.AddHeader("X-API-Key", Config.ApiConfig.BackendInternalApikey);
request.AddHeader("Content-Type", "application/json");
request.AddParameter("departmentId", departmentId, ParameterType.QueryString);

var response = await client.ExecuteAsync<GetCurrentPlanForDepartmentResult>(request);
var response = await client.ExecuteAsync<GetCurrentPlanForDepartmentResult>(request);

if (response.StatusCode == HttpStatusCode.NotFound)
return freePlan;
if (response.StatusCode == HttpStatusCode.NotFound)
return freePlan;

if (response.Data == null)
return freePlan;
if (response.Data == null)
return freePlan;

return response.Data.Data;
return response.Data.Data;
}
catch (Exception ex)
{
Framework.Logging.LogException(ex);
return freePlan;
}
}

return freePlan;
Expand Down
22 changes: 15 additions & 7 deletions Web/Resgrid.Web.Services/Controllers/TwilioController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,18 @@ public async Task<ActionResult> IncomingMessage([FromQuery] TwilioMessage reques

if (departmentId.HasValue)
{
var department = await _departmentsService.GetDepartmentByIdAsync(departmentId.Value);
//var textToCallEnabled = await _departmentSettingsService.GetDepartmentIsTextCallImportEnabledAsync(departmentId.Value);
//var textCommandEnabled = await _departmentSettingsService.GetDepartmentIsTextCommandEnabledAsync(departmentId.Value);
var dispatchNumbers = await _departmentSettingsService.GetTextToCallSourceNumbersForDepartmentAsync(departmentId.Value);
var authroized = await _limitsService.CanDepartmentProvisionNumberAsync(departmentId.Value);
var customStates = await _customStateService.GetAllActiveCustomStatesForDepartmentAsync(departmentId.Value);
// Run all department-level lookups in parallel — they are independent of each other.
var departmentTask = _departmentsService.GetDepartmentByIdAsync(departmentId.Value);
var dispatchNumbersTask = _departmentSettingsService.GetTextToCallSourceNumbersForDepartmentAsync(departmentId.Value);
var authorizedTask = _limitsService.CanDepartmentProvisionNumberAsync(departmentId.Value);
var customStatesTask = _customStateService.GetAllActiveCustomStatesForDepartmentAsync(departmentId.Value);

await System.Threading.Tasks.Task.WhenAll(departmentTask, dispatchNumbersTask, authorizedTask, customStatesTask);

var department = departmentTask.Result;
var dispatchNumbers = dispatchNumbersTask.Result;
var authroized = authorizedTask.Result;
var customStates = customStatesTask.Result;

messageEvent.CustomerId = departmentId.Value.ToString();

Expand Down Expand Up @@ -196,7 +202,9 @@ public async Task<ActionResult> IncomingMessage([FromQuery] TwilioMessage reques

if (!isDispatchSource)
{
var profile = await _userProfileService.GetProfileByMobileNumberAsync(textMessage.Msisdn);
// Reuse the profile fetched above when the department was resolved via mobile number;
// only hit the DB again if the department came from the phone-number lookup path.
var profile = userProfile ?? await _userProfileService.GetProfileByMobileNumberAsync(textMessage.Msisdn);

if (profile != null)
{
Expand Down
Loading