Swapped in multi-threaded reliable messaging library.

NTDLS · NTDLS · commit 4aaf8a8b1480 · 2025-05-19T16:19:36.000-04:00
diff --git a/CatMQ.Service/CatMQ.Service.csproj b/CatMQ.Service/CatMQ.Service.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <version>2.3.6</version>
+    <version>2.4.0</version>
     <ApplicationIcon>Logo.ico</ApplicationIcon>
   </PropertyGroup>
 
@@ -17,7 +17,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NTDLS.ReliableMessaging" Version="2.1.6" />
     <PackageReference Include="RocksDB" Version="9.10.0.55496" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
diff --git a/CatMQ.Service/Pages/Configuration.cshtml b/CatMQ.Service/Pages/Configuration.cshtml
@@ -65,15 +65,6 @@
                 </div>
                 <div class="card-body">
 
-                    <div class="mb-3">
-                        <label for="AsynchronousAcknowledgment" class="form-label fw-bold">Asynchronous Ack</label>
-                        <span asp-validation-for="ServerConfig.AsynchronousAcknowledgment" class="text-danger"></span>
-                        <select id="AsynchronousAcknowledgment" asp-for="ServerConfig.AsynchronousAcknowledgment" class="form-select">
-                            <option value="true">True</option>
-                            <option value="false">False</option>
-                        </select>
-                    </div>
-
                     <div class="mb-3">
                         <label for="acknowledgmentTimeoutSeconds" class="form-label fw-bold">Query Timeout (s)</label>
                         <span asp-validation-for="ServerConfig.AcknowledgmentTimeoutSeconds" class="text-danger"></span>
diff --git a/CatMQ.Service/Pages/Index.cshtml b/CatMQ.Service/Pages/Index.cshtml
@@ -18,7 +18,6 @@
             <thead class="table-light">
                 <tr>
                     <th>Listen Port</th>
-                    <th>Async. Ack.</th>
                     <th>Ack. Timeout</th>
                     <th>Initial Buffer</th>
                     <th>Max. Buffer</th>
@@ -28,7 +27,6 @@
             <tbody>
                 <tr>
                     <td>@Model.ServerConfig.ListenPort</td>
-                    <td>@Model.ServerConfig.AsynchronousAcknowledgment</td>
                     <td>@Model.ServerConfig.AcknowledgmentTimeoutSeconds.ToString("n0")</td>
                     <td>@Formatters.FileSize(Model.ServerConfig.InitialReceiveBufferSize, 2)</td>
                     <td>@Formatters.FileSize(Model.ServerConfig.MaxReceiveBufferSize, 1)</td>
diff --git a/CatMQ.Service/QueuingService.cs b/CatMQ.Service/QueuingService.cs
@@ -16,7 +16,6 @@ public void Start()
             _mqServer = new CMqServer(new CMqServerConfiguration
             {
                 PersistencePath = serviceConfiguration.DataPath,
-                AsynchronousAcknowledgment = serviceConfiguration.AsynchronousAcknowledgment,
                 InitialReceiveBufferSize = serviceConfiguration.InitialReceiveBufferSize,
                 MaxReceiveBufferSize = serviceConfiguration.MaxReceiveBufferSize,
                 AcknowledgmentTimeoutSeconds = serviceConfiguration.AcknowledgmentTimeoutSeconds,
diff --git a/CatMQ.Service/ServiceConfiguration.cs b/CatMQ.Service/ServiceConfiguration.cs
@@ -55,12 +55,6 @@ public string DataPath
         [Required(ErrorMessage = "Web UI URL is required.")]
         public string? WebListenURL { get; set; } = "http://*:45783";
 
-        /// <summary>
-        /// When true, query replies are queued in a thread pool. Otherwise, queries block other activities.
-        /// </summary>
-        [Required(ErrorMessage = "Asynchronous Query Waiting is required.")]
-        public bool AsynchronousAcknowledgment { get; set; } = true;
-
         /// <summary>
         /// The default amount of time to wait for a query to reply before throwing a timeout exception.
         /// </summary>
diff --git a/Installers/Windows.Installer.iss b/Installers/Windows.Installer.iss
@@ -1,4 +1,4 @@
-#define AppVersion "2.3.6"
+#define AppVersion "2.4.0"
 
 [Setup]
 ;-- Main Setup Information
diff --git a/NTDLS.CatMQ.Client/CMqClient.cs b/NTDLS.CatMQ.Client/CMqClient.cs
@@ -73,7 +73,6 @@ public CMqClient(CMqClientConfiguration configuration)
 
             var rmConfiguration = new RmConfiguration()
             {
-                AsynchronousQueryWaiting = configuration.AsynchronousAcknowledgment,
                 InitialReceiveBufferSize = configuration.InitialReceiveBufferSize,
                 MaxReceiveBufferSize = configuration.MaxReceiveBufferSize,
                 QueryTimeout = configuration.QueryTimeout,
diff --git a/NTDLS.CatMQ.Client/CMqClientConfiguration.cs b/NTDLS.CatMQ.Client/CMqClientConfiguration.cs
@@ -12,11 +12,6 @@ public class CMqClientConfiguration
         /// </summary>
         public bool AutoReconnect { get; set; } = true;
 
-        /// <summary>
-        /// When true, query replies are queued in a thread pool. Otherwise, queries block other activities.
-        /// </summary>
-        public bool AsynchronousAcknowledgment { get; set; } = true;
-
         /// <summary>
         /// The default amount of time to wait for a query to reply before throwing a timeout exception.
         /// </summary>
diff --git a/NTDLS.CatMQ.Client/NTDLS.CatMQ.Client.csproj b/NTDLS.CatMQ.Client/NTDLS.CatMQ.Client.csproj
@@ -21,7 +21,7 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Authors>NetworkDLS</Authors>
     <Company>NetworkDLS</Company>
-    <version>2.3.6</version>
+    <version>2.4.0</version>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageIcon>Logo.png</PackageIcon>
     <ApplicationIcon>Logo.ico</ApplicationIcon>
@@ -47,8 +47,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NTDLS.CatMQ.Shared" Version="2.3.6" />
-    <PackageReference Include="NTDLS.ReliableMessaging" Version="2.1.6" />
+    <ProjectReference Include="..\NTDLS.CatMQ.Shared\NTDLS.CatMQ.Shared.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/NTDLS.CatMQ.Server/CMqServer.cs b/NTDLS.CatMQ.Server/CMqServer.cs
@@ -44,7 +44,6 @@ public CMqServer(CMqServerConfiguration configuration)
 
             var rmConfiguration = new RmConfiguration()
             {
-                AsynchronousQueryWaiting = configuration.AsynchronousAcknowledgment,
                 InitialReceiveBufferSize = configuration.InitialReceiveBufferSize,
                 MaxReceiveBufferSize = configuration.MaxReceiveBufferSize,
                 QueryTimeout = TimeSpan.FromSeconds(configuration.AcknowledgmentTimeoutSeconds),
@@ -160,7 +159,6 @@ public CMqServerDescriptor GetConfiguration()
         {
             return new CMqServerDescriptor
             {
-                AsynchronousAcknowledgment = _configuration.AsynchronousAcknowledgment,
                 AcknowledgmentTimeoutSeconds = _configuration.AcknowledgmentTimeoutSeconds,
                 InitialReceiveBufferSize = _configuration.InitialReceiveBufferSize,
                 MaxReceiveBufferSize = _configuration.MaxReceiveBufferSize,
diff --git a/NTDLS.CatMQ.Server/CMqServerConfiguration.cs b/NTDLS.CatMQ.Server/CMqServerConfiguration.cs
@@ -7,11 +7,6 @@ namespace NTDLS.CatMQ.Server
     /// </summary>
     public class CMqServerConfiguration
     {
-        /// <summary>
-        /// When true, query replies are queued in a thread pool. Otherwise, queries block other activities.
-        /// </summary>
-        public bool AsynchronousAcknowledgment { get; set; } = true;
-
         /// <summary>
         /// The default amount of time to wait for a query to reply before throwing a timeout exception.
         /// </summary>
diff --git a/NTDLS.CatMQ.Server/Management/CMqServerDescriptor.cs b/NTDLS.CatMQ.Server/Management/CMqServerDescriptor.cs
@@ -5,15 +5,11 @@
     /// </summary>
     public class CMqServerDescriptor
     {
-        /// <summary>
-        /// When true, query replies are queued in a thread pool. Otherwise, queries block other activities.
-        /// </summary>
-        public bool AsynchronousAcknowledgment { get; internal set; } = true;
-
         /// <summary>
         /// The default amount of time to wait for a query to reply before throwing a timeout exception.
         /// </summary>
         public int AcknowledgmentTimeoutSeconds { get; internal set; }
+
         /// <summary>
         /// The initial size in bytes of the receive buffer.
         /// If the buffer ever gets full while receiving data it will be automatically resized up to MaxReceiveBufferSize.
diff --git a/NTDLS.CatMQ.Server/NTDLS.CatMQ.Server.csproj b/NTDLS.CatMQ.Server/NTDLS.CatMQ.Server.csproj
@@ -21,7 +21,7 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Authors>NetworkDLS</Authors>
     <Company>NetworkDLS</Company>
-    <version>2.3.6</version>
+    <version>2.4.0</version>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageIcon>Logo.png</PackageIcon>
     <ApplicationIcon>Logo.ico</ApplicationIcon>
@@ -47,9 +47,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NTDLS.CatMQ.Shared" Version="2.3.6" />
-    <PackageReference Include="NTDLS.ReliableMessaging" Version="2.1.6" />
     <PackageReference Include="RocksDB" Version="9.10.0.55496" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\NTDLS.CatMQ.Shared\NTDLS.CatMQ.Shared.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/NTDLS.CatMQ.Shared/NTDLS.CatMQ.Shared.csproj b/NTDLS.CatMQ.Shared/NTDLS.CatMQ.Shared.csproj
@@ -21,7 +21,7 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Authors>NetworkDLS</Authors>
     <Company>NetworkDLS</Company>
-    <version>2.3.6</version> <!-- NTDLS.CatMQ.Shared is versioned seperately from NTDLS.CatMQ.Client and NTDLS.CatMQ.Server -->
+    <version>2.4.0</version> <!-- NTDLS.CatMQ.Shared is versioned seperately from NTDLS.CatMQ.Client and NTDLS.CatMQ.Server -->
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageIcon>Logo.png</PackageIcon>
     <ApplicationIcon>Logo.ico</ApplicationIcon>
@@ -47,7 +47,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NTDLS.ReliableMessaging" Version="2.1.6" />
+    <PackageReference Include="NTDLS.ReliableMessaging" Version="3.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/Test.QueueClient/Test.QueueClient.csproj b/Test.QueueClient/Test.QueueClient.csproj
@@ -12,10 +12,6 @@
     <Content Include="Logo.ico" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="NTDLS.ReliableMessaging" Version="2.1.6" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\NTDLS.CatMQ.Client\NTDLS.CatMQ.Client.csproj" />
   </ItemGroup>
diff --git a/Test.QueueServer/Test.QueueServer.csproj b/Test.QueueServer/Test.QueueServer.csproj
@@ -13,7 +13,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NTDLS.ReliableMessaging" Version="2.1.6" />
     <PackageReference Include="RocksDB" Version="9.10.0.55496" />
   </ItemGroup>
 
diff --git a/Test.Stress/Test.Stress.csproj b/Test.Stress/Test.Stress.csproj
@@ -12,10 +12,6 @@
     <Content Include="Logo.ico" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="NTDLS.ReliableMessaging" Version="2.1.6" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\NTDLS.CatMQ.Client\NTDLS.CatMQ.Client.csproj" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ public void Start()`
`16`	`16`	`_mqServer = new CMqServer(new CMqServerConfiguration`
`17`	`17`	`{`
`18`	`18`	`PersistencePath = serviceConfiguration.DataPath,`
`19`		`- AsynchronousAcknowledgment = serviceConfiguration.AsynchronousAcknowledgment,`
`20`	`19`	`InitialReceiveBufferSize = serviceConfiguration.InitialReceiveBufferSize,`
`21`	`20`	`MaxReceiveBufferSize = serviceConfiguration.MaxReceiveBufferSize,`
`22`	`21`	`AcknowledgmentTimeoutSeconds = serviceConfiguration.AcknowledgmentTimeoutSeconds,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#define AppVersion "2.3.6"`
	`1`	`+#define AppVersion "2.4.0"`
`2`	`2`
`3`	`3`	`[Setup]`
`4`	`4`	`;-- Main Setup Information`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,6 @@ public CMqClient(CMqClientConfiguration configuration)`
`73`	`73`
`74`	`74`	`var rmConfiguration = new RmConfiguration()`
`75`	`75`	`{`
`76`		`- AsynchronousQueryWaiting = configuration.AsynchronousAcknowledgment,`
`77`	`76`	`InitialReceiveBufferSize = configuration.InitialReceiveBufferSize,`
`78`	`77`	`MaxReceiveBufferSize = configuration.MaxReceiveBufferSize,`
`79`	`78`	`QueryTimeout = configuration.QueryTimeout,`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ public CMqServer(CMqServerConfiguration configuration)`
`44`	`44`
`45`	`45`	`var rmConfiguration = new RmConfiguration()`
`46`	`46`	`{`
`47`		`- AsynchronousQueryWaiting = configuration.AsynchronousAcknowledgment,`
`48`	`47`	`InitialReceiveBufferSize = configuration.InitialReceiveBufferSize,`
`49`	`48`	`MaxReceiveBufferSize = configuration.MaxReceiveBufferSize,`
`50`	`49`	`QueryTimeout = TimeSpan.FromSeconds(configuration.AcknowledgmentTimeoutSeconds),`
`@@ -160,7 +159,6 @@ public CMqServerDescriptor GetConfiguration()`
`160`	`159`	`{`
`161`	`160`	`return new CMqServerDescriptor`
`162`	`161`	`{`
`163`		`- AsynchronousAcknowledgment = _configuration.AsynchronousAcknowledgment,`
`164`	`162`	`AcknowledgmentTimeoutSeconds = _configuration.AcknowledgmentTimeoutSeconds,`
`165`	`163`	`InitialReceiveBufferSize = _configuration.InitialReceiveBufferSize,`
`166`	`164`	`MaxReceiveBufferSize = _configuration.MaxReceiveBufferSize,`