Throw on failed HTTP requests to WhatsApp

This makes it easier to detect issues and handle abnormal execution (i.e. including Polly).

Author: kzu

src/Tests/WhatsAppClientTests.cs

@@ -31,9 +31,7 @@ public async Task SendsMessageAsync()
     {
         var (configuration, client) = Initialize();
 
-        var result = await client.SendTextAync(configuration["SendFrom"]!, configuration["SendTo"]!, "Hi there!");
-
-        Assert.True(result);
+        await client.SendTextAync(configuration["SendFrom"]!, configuration["SendTo"]!, "Hi there!");
     }
 
     [SecretsFact("Meta:VerifyToken", "SendFrom", "SendTo")]
@@ -43,7 +41,7 @@ public async Task SendsButtonAsync()
 
         // Send an interactive message with three buttons showcasing the payload/value 
         // being different than the button text
-        var result = await client.SendAync(configuration["SendFrom"]!, new
+        await client.SendAync(configuration["SendFrom"]!, new
         {
             messaging_product = "whatsapp",
             recipient_type = "individual",
@@ -66,8 +64,6 @@ public async Task SendsButtonAsync()
                 }
             }
         });
-
-        Assert.True(result);
     }
 
     (IConfiguration configuration, WhatsAppClient client) Initialize()

src/WhatsApp/AzureFunctions.cs

@@ -71,7 +71,18 @@ public async Task<HttpResponseMessage> Message([HttpTrigger(AuthorizationLevel.A
             await queue.CreateIfNotExistsAsync();
             await queue.SendMessageAsync(json);
             if (message.Type == MessageType.Content)
-                await whatsapp.MarkReadAsync(message.To.Id, message.Id);
+            {
+                try
+                {
+                    // Best-effort to mark as read. This might be an old message callback, 
+                    // or the message might have been deleted.
+                    await whatsapp.MarkReadAsync(message.To.Id, message.Id);
+                }
+                catch (HttpRequestException e)
+                {
+                    logger.LogWarning("Failed to mark message as read: {Id}\r\n{Payload}", message.Id, e.Message);
+                }
+            }
         }
         else
         {

src/WhatsApp/AzureFunctionsExtensions.cs

@@ -6,7 +6,6 @@
 using Devlooped.WhatsApp;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Http.Resilience;
 
 namespace Microsoft.Azure.Functions.Worker.Builder;
 
@@ -15,19 +14,9 @@ namespace Microsoft.Azure.Functions.Worker.Builder;
 /// </summary>
 public static class AzureFunctionsExtensions
 {
-    /// <summary>
-    /// Configure the WhatsApp handler for Azure Functions.
-    /// </summary>
-    public static IFunctionsWorkerApplicationBuilder UseWhatsApp(this IFunctionsWorkerApplicationBuilder builder, Func<IServiceProvider, Message, Task> handler)
-    {
-        builder.Services.AddSingleton<IWhatsAppHandler>(services => new AnonymousWhatsAppHandler(services, handler));
-        ConfigureServices(builder.Services);
-        return builder;
-    }
-
     static void ConfigureServices(IServiceCollection services)
     {
-        services.AddHttpClient().ConfigureHttpClientDefaults(http => http.AddStandardResilienceHandler());
+        services.AddHttpClient("whatsapp").AddStandardResilienceHandler();
         services.AddSingleton<IWhatsAppClient, WhatsAppClient>();
 
         if (services.FirstOrDefault(x => x.ServiceType == typeof(QueueServiceClient)) == null)
@@ -79,6 +68,26 @@ public static IFunctionsWorkerApplicationBuilder UseWhatsApp<THandler>(this IFun
         return builder;
     }
 
+    /// <summary>
+    /// Configure the WhatsApp handler for Azure Functions.
+    /// </summary>
+    public static IFunctionsWorkerApplicationBuilder UseWhatsApp(this IFunctionsWorkerApplicationBuilder builder, Func<IServiceProvider, Message, Task> handler)
+    {
+        builder.Services.AddSingleton<IWhatsAppHandler>(services => new AnonymousWhatsAppHandler(services, handler));
+        ConfigureServices(builder.Services);
+        return builder;
+    }
+
+    /// <summary>
+    /// Configure the WhatsApp handler for Azure Functions.
+    /// </summary>
+    public static IFunctionsWorkerApplicationBuilder UseWhatsApp(this IFunctionsWorkerApplicationBuilder builder, Func<Message, Task> handler)
+    {
+        builder.Services.AddSingleton<IWhatsAppHandler>(services => new SimpleAnonymousWhatsAppHandler(handler));
+        ConfigureServices(builder.Services);
+        return builder;
+    }
+
     /// <summary>
     /// Configure the WhatsApp handler for Azure Functions.
     /// </summary>
@@ -160,6 +169,11 @@ public static IFunctionsWorkerApplicationBuilder UseWhatsApp<TService1, TService
         return builder;
     }
 
+    class SimpleAnonymousWhatsAppHandler(Func<Message, Task> handler) : IWhatsAppHandler
+    {
+        public Task HandleAsync(Message message) => handler(message);
+    }
+
     class AnonymousWhatsAppHandler(IServiceProvider services, Func<IServiceProvider, Message, Task> handler) : IWhatsAppHandler
     {
         public Task HandleAsync(Message message) => handler(services, message);

src/WhatsApp/IWhatsAppClient.cs

@@ -14,5 +14,7 @@ public interface IWhatsAppClient
     /// <param name="payload">The message payload.</param>
     /// <returns>Whether the message was successfully sent.</returns>
     /// <see cref="https://developers.facebook.com/docs/whatsapp/cloud-api/reference/messages"/>
-    Task<bool> SendAync(string from, object payload);
+    /// <exception cref="ArgumentException">The number <paramref name="from"/> is not registered in <see cref="MetaOptions"/>.</exception>
+    /// <exception cref="HttpRequestException">The HTTP request failed. Exception message contains the error response body from WhatsApp.</exception>
+    Task SendAync(string from, object payload);
 }

src/WhatsApp/WhatsAppClient.cs

@@ -30,8 +30,7 @@ public static IWhatsAppClient Create(IHttpClientFactory httpFactory, MetaOptions
         => new WhatsAppClient(httpFactory, Options.Create(options), logger);
 
     /// <inheritdoc />
-    /// <exception cref="ArgumentException"></exception>
-    public async Task<bool> SendAync(string from, object payload)
+    public async Task SendAync(string from, object payload)
     {
         if (!options.Numbers.TryGetValue(from, out var token))
             throw new ArgumentException($"The number '{from}' is not registered in the options.", nameof(from));
@@ -46,10 +45,8 @@ public async Task<bool> SendAync(string from, object payload)
         if (!result.IsSuccessStatusCode)
         {
             var error = JsonNode.Parse(await result.Content.ReadAsStringAsync())?.ToJsonString(new() { WriteIndented = true });
-            logger.LogError("Failed to send WhatsApp message: {error}", error);
-            return false;
+            logger.LogError("Failed to send WhatsApp message from {From}: {Error}", from, error);
+            throw new HttpRequestException(error, null, result.StatusCode);
         }
-
-        return true;
     }
 }

src/WhatsApp/WhatsAppClientExtensions.cs

@@ -14,7 +14,7 @@ public static Task MarkReadAsync(this IWhatsAppClient client, string from, strin
         });
 
 
-    public static Task<bool> ReactAsync(this IWhatsAppClient client, string from, string to, string messageId, string reaction)
+    public static Task ReactAsync(this IWhatsAppClient client, string from, string to, string messageId, string reaction)
         => client.SendAync(from, new
         {
             messaging_product = "whatsapp",
@@ -28,7 +28,7 @@ public static Task<bool> ReactAsync(this IWhatsAppClient client, string from, st
             }
         });
 
-    public static Task<bool> SendTextAync(this IWhatsAppClient client, string from, string to, string message)
+    public static Task SendTextAync(this IWhatsAppClient client, string from, string to, string message)
         => client.SendAync(from, new
         {
             messaging_product = "whatsapp",