Change nuget to package reference for WireMock.Net.Console.Net472.Cla…

examples/WireMock.Net.Console.Net452.Classic/MainApp.cs

@@ -6,6 +6,7 @@
 using Newtonsoft.Json;
 using WireMock.Logging;
 using WireMock.Matchers;
+using WireMock.Models;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
@@ -576,6 +577,38 @@ public static void Run()
                     };
                 }));
 
+            server.Given(Request.Create().WithPath(new WildcardMatcher("/multi-webhook", true)).UsingPost())
+                .WithWebhook(new Webhook
+                {
+                    Request = new WebhookRequest
+                    {
+                        Url = "https://any:12345/foo1",
+                        Method = "post",
+                        BodyData = new BodyData
+                        {
+                            BodyAsString = "OK 1!", DetectedBodyType = BodyType.String
+                        },
+                        Delay = 1000
+                    }
+                })
+                .WithWebhook(new Webhook
+                {
+                    Request = new WebhookRequest
+                    {
+                        Url = "https://localhost:12345/foo2",
+                        Method = "post",
+                        BodyData = new BodyData
+                        {
+                            BodyAsString = "OK 2!",
+                            DetectedBodyType = BodyType.String
+                        },
+                        MinimumRandomDelay = 3000,
+                        MaximumRandomDelay = 7000
+                    }
+                })
+                .WithWebhookFireAndForget(true)
+                .RespondWith(Response.Create().WithBody("a-response"));
+
             System.Console.WriteLine(JsonConvert.SerializeObject(server.MappingModels, Formatting.Indented));
 
             System.Console.WriteLine("Press any key to stop the server");

examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj

@@ -342,15 +342,6 @@
     <Reference Include="TinyMapper, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\TinyMapper.3.0.3\lib\net40\TinyMapper.dll</HintPath>
     </Reference>
-    <Reference Include="WireMock.Net, Version=1.5.3.0, Culture=neutral, PublicKeyToken=c8d65537854e1f03, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\WireMock.Net.1.5.3\lib\net461\WireMock.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="WireMock.Net.Abstractions, Version=1.5.3.0, Culture=neutral, PublicKeyToken=c8d65537854e1f03, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\WireMock.Net.Abstractions.1.5.3\lib\net451\WireMock.Net.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="WireMock.Org.Abstractions, Version=1.5.3.0, Culture=neutral, PublicKeyToken=c8d65537854e1f03, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\WireMock.Org.Abstractions.1.5.3\lib\net45\WireMock.Org.Abstractions.dll</HintPath>
-    </Reference>
     <Reference Include="XPath2, Version=1.1.3.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
       <HintPath>..\..\packages\XPath2.1.1.3\lib\net452\XPath2.dll</HintPath>
     </Reference>
@@ -388,6 +379,16 @@
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
+      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
+      <Name>WireMock.Net.Abstractions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
+      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
+      <Name>WireMock.Net</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

examples/WireMock.Net.Console.Net472.Classic/packages.config

@@ -147,9 +147,6 @@
   <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
   <package id="TinyMapper" version="3.0.3" targetFramework="net472" />
-  <package id="WireMock.Net" version="1.5.3" targetFramework="net472" />
-  <package id="WireMock.Net.Abstractions" version="1.5.3" targetFramework="net472" />
-  <package id="WireMock.Org.Abstractions" version="1.5.3" targetFramework="net472" />
   <package id="XPath2" version="1.1.3" targetFramework="net472" />
   <package id="XPath2.Extensions" version="1.1.3" targetFramework="net472" />
 </packages>

src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs

@@ -74,4 +74,9 @@ public class MappingModel
     /// The Webhooks.
     /// </summary>
     public WebhookModel[]? Webhooks { get; set; }
+
+    /// <summary>
+    /// Fire and forget for webhooks.
+    /// </summary>
+    public bool? UseWebhooksFireAndForget { get; set; }
 }

src/WireMock.Net.Abstractions/Admin/Mappings/WebhookRequestModel.cs

@@ -48,11 +48,6 @@ public class WebhookRequestModel
     /// </summary>
     public string? TransformerReplaceNodeOptions { get; set; }
 
-    /// <summary>
-    /// Use Fire and Forget (do not wait on result). Default value is false.
-    /// </summary>
-    public bool? UseFireAndForget { get; set; }
-
     /// <summary>
     /// Gets or sets the delay in milliseconds.
     /// </summary>

src/WireMock.Net.Abstractions/Models/IWebhookRequest.cs

@@ -44,11 +44,6 @@ public interface IWebhookRequest
     /// </summary>
     ReplaceNodeOptions TransformerReplaceNodeOptions { get; set; }
 
-    /// <summary>
-    /// Use Fire and Forget (do not wait on result). Default value is false.
-    /// </summary>
-    bool? UseFireAndForget { get; set; }
-
     /// <summary>
     /// Gets or sets the delay in milliseconds.
     /// </summary>

src/WireMock.Net/Http/WebhookSender.cs

@@ -102,34 +102,9 @@ IResponseMessage originalResponseMessage
         // Call the URL
         var sendTask = client.SendAsync(httpRequestMessage);
 
-        if (webhookRequest.UseFireAndForget == true)
-        {
-            try
-            {
-                FireAndForget(sendTask);
-            }
-            catch
-            {
-                // Ignore
-            }
-            return HttpResponseMessageOk;
-        }
-
         return await SendAsync(sendTask);
     }
 
-    private static async void FireAndForget(Task sendTask)
-    {
-        try
-        {
-            await sendTask;
-        }
-        catch
-        {
-            // Ignore
-        }
-    }
-
     private static async Task<HttpResponseMessage> SendAsync(Task<HttpResponseMessage> sendTask)
     {
         return await sendTask;

src/WireMock.Net/IMapping.cs

@@ -112,6 +112,11 @@ public interface IMapping
     /// </summary>
     IWebhook[]? Webhooks { get; }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool? UseWebhooksFireAndForget { get; set; }
+
     /// <summary>
     /// ProvideResponseAsync
     /// </summary>

src/WireMock.Net/Mapping.cs

@@ -63,6 +63,9 @@ public class Mapping : IMapping
     /// <inheritdoc />
     public IWebhook[]? Webhooks { get; }
 
+    /// <inheritdoc />
+    public bool? UseWebhooksFireAndForget { get; set; }
+
     /// <inheritdoc />
     public ITimeSettings? TimeSettings { get; }
 
@@ -82,6 +85,7 @@ public class Mapping : IMapping
     /// <param name="nextState">The next state which will occur after the current mapping execution. [Optional]</param>
     /// <param name="stateTimes">Only when the current state is executed this number, the next state which will occur. [Optional]</param>
     /// <param name="webhooks">The Webhooks. [Optional]</param>
+    /// <param name="useWebhooksFireAndForget">Use Fire and Forget for any defined webhooks</param>
     /// <param name="timeSettings">The TimeSettings. [Optional]</param>
     public Mapping(
         Guid guid,
@@ -97,6 +101,7 @@ public Mapping(
         string? nextState,
         int? stateTimes,
         IWebhook[]? webhooks,
+        bool? useWebhooksFireAndForget,
         ITimeSettings? timeSettings)
     {
         Guid = guid;
@@ -112,6 +117,7 @@ public Mapping(
         NextState = nextState;
         StateTimes = stateTimes;
         Webhooks = webhooks;
+        UseWebhooksFireAndForget = useWebhooksFireAndForget;
         TimeSettings = timeSettings;
     }
 

src/WireMock.Net/Models/WebhookRequest.cs

@@ -30,9 +30,6 @@ public class WebhookRequest : IWebhookRequest
     /// <inheritdoc />
     public ReplaceNodeOptions TransformerReplaceNodeOptions { get; set; }
 
-    /// <inheritdoc />
-    public bool? UseFireAndForget { get; set; }
-
     /// <inheritdoc />
     public int? Delay { get; set; }
 

src/WireMock.Net/Owin/WireMockMiddleware.cs

@@ -12,6 +12,9 @@
 using WireMock.ResponseBuilders;
 using WireMock.Settings;
 using System.Collections.Generic;
+using System.Net.Http;
+using WireMock.Models;
+using WireMock.Org.Abstractions;
 #if !USE_ASPNETCORE
 using IContext = Microsoft.Owin.IOwinContext;
 using OwinMiddleware = Microsoft.Owin.OwinMiddleware;
@@ -223,7 +226,27 @@ private async Task SendToWebhooksAsync(IMapping mapping, IRequestMessage request
                 });
             }
 
-            await Task.WhenAll(tasks.Select(async task => await task.Invoke()));
+            await FireWebhooks(tasks, mapping.UseWebhooksFireAndForget ?? false);
+        }
+
+        private async Task FireWebhooks(List<Func<Task>> sendTasks, bool fireAndForget = false)
+        {
+            if (fireAndForget == true)
+            {
+                try
+                {
+                    // Do not await
+                    await Task.WhenAll(sendTasks.Select(async task => task.Invoke()));
+                }
+                catch
+                {
+                    // Ignore
+                }
+            }
+            else
+            {
+                await Task.WhenAll(sendTasks.Select(async task => await task.Invoke()));
+            }
         }
 
         private void UpdateScenarioState(IMapping mapping)

src/WireMock.Net/Proxy/ProxyHelper.cs

@@ -119,6 +119,7 @@ private IMapping ToMapping(ProxyAndRecordSettings proxyAndRecordSettings, IReque
             nextState: null,
             stateTimes: null,
             webhooks: null,
+            useWebhooksFireAndForget: null,
             timeSettings: null
         );
     }

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -43,6 +43,7 @@ public MappingModel ToMappingModel(IMapping mapping)
             TimeSettings = TimeSettingsMapper.Map(mapping.TimeSettings),
             Title = mapping.Title,
             Description = mapping.Description,
+            UseWebhooksFireAndForget = mapping.UseWebhooksFireAndForget,
             Priority = mapping.Priority != 0 ? mapping.Priority : null,
             Scenario = mapping.Scenario,
             WhenStateIs = mapping.ExecutionConditionState,

src/WireMock.Net/Serialization/WebhookMapper.cs

@@ -20,7 +20,6 @@ public static IWebhook Map(WebhookModel model)
             {
                 Url = model.Request.Url,
                 Method = model.Request.Method,
-                UseFireAndForget = model.Request.UseFireAndForget,
                 Delay = model.Request.Delay,
                 MinimumRandomDelay = model.Request.MinimumRandomDelay,
                 MaximumRandomDelay = model.Request.MaximumRandomDelay,
@@ -87,7 +86,6 @@ public static WebhookModel Map(IWebhook webhook)
                 UseTransformer = webhook.Request.UseTransformer,
                 TransformerType = webhook.Request.UseTransformer == true ? webhook.Request.TransformerType.ToString() : null,
                 TransformerReplaceNodeOptions = webhook.Request.TransformerReplaceNodeOptions.ToString(),
-                UseFireAndForget = webhook.Request.UseFireAndForget,
                 Delay = webhook.Request.Delay,
                 MinimumRandomDelay = webhook.Request.MinimumRandomDelay,
                 MaximumRandomDelay = webhook.Request.MaximumRandomDelay,

src/WireMock.Net/Server/IRespondWithAProvider.cs

@@ -123,6 +123,13 @@ public interface IRespondWithAProvider
         /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
         IRespondWithAProvider WithWebhook(params IWebhook[] webhooks);
 
+        /// <summary>
+        /// Support FireAndForget for any configured Webhooks
+        /// </summary>
+        /// <param name="UseWebhooksFireAndForget"></param>
+        /// <returns></returns>
+        IRespondWithAProvider WithWebhookFireAndForget(bool UseWebhooksFireAndForget);
+
         /// <summary>
         /// Add a Webhook to call after the response has been generated.
         /// </summary>

src/WireMock.Net/Server/RespondWithAProvider.cs

@@ -30,6 +30,8 @@ internal class RespondWithAProvider : IRespondWithAProvider
     private readonly WireMockServerSettings _settings;
     private readonly bool _saveToFile;
 
+    private bool _useWebhookFireAndForget = false;
+
     public Guid Guid { get; private set; } = Guid.NewGuid();
 
     public IWebhook[]? Webhooks { get; private set; }
@@ -57,7 +59,7 @@ public RespondWithAProvider(RegistrationCallback registrationCallback, IRequestM
     /// <param name="provider">The provider.</param>
     public void RespondWith(IResponseProvider provider)
     {
-        _registrationCallback(new Mapping(Guid, _title, _description, _path, _settings, _requestMatcher, provider, _priority, _scenario, _executionConditionState, _nextState, _timesInSameState, Webhooks, TimeSettings), _saveToFile);
+        _registrationCallback(new Mapping(Guid, _title, _description, _path, _settings, _requestMatcher, provider, _priority, _scenario, _executionConditionState, _nextState, _timesInSameState, Webhooks, _useWebhookFireAndForget, TimeSettings), _saveToFile);
     }
 
     /// <inheritdoc />
@@ -233,6 +235,13 @@ public IRespondWithAProvider WithWebhook(
         return this;
     }
 
+    public IRespondWithAProvider WithWebhookFireAndForget(bool useWebhooksFireAndForget)
+    {
+        _useWebhookFireAndForget = useWebhooksFireAndForget;
+
+        return this;
+    }
+
     private static IWebhook InitWebhook(
         string url,
         string method,

test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs

@@ -176,7 +176,7 @@ public async Task WireMockMiddleware_Invoke_Mapping_Has_ProxyAndRecordSettings_A
             _mappingMock.SetupGet(m => m.Provider).Returns(responseBuilder);
             _mappingMock.SetupGet(m => m.Settings).Returns(settings);
 
-            var newMappingFromProxy = new Mapping(Guid.NewGuid(), string.Empty, string.Empty, null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null, null);
+            var newMappingFromProxy = new Mapping(Guid.NewGuid(), string.Empty, string.Empty, null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null, false, null);
             _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy));
 
             var requestBuilder = Request.Create().UsingAnyMethod();
@@ -230,7 +230,7 @@ public async Task WireMockMiddleware_Invoke_Mapping_Has_ProxyAndRecordSettings_A
             _mappingMock.SetupGet(m => m.Provider).Returns(responseBuilder);
             _mappingMock.SetupGet(m => m.Settings).Returns(settings);
 
-            var newMappingFromProxy = new Mapping(Guid.NewGuid(), "my-title", "my-description", null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null, null);
+            var newMappingFromProxy = new Mapping(Guid.NewGuid(), "my-title", "my-description", null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null, false, null);
             _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy));
 
             var requestBuilder = Request.Create().UsingAnyMethod();