DaJet 3.13.6

Прерывание цикла CONSUME для баз данных

Author: zhichkin

src/dajet-http-server/dajet-http-server.csproj

@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>DaJet.Http.Server</RootNamespace>
     <AssemblyName>DaJet.Http.Server</AssemblyName>
-    <Version>3.13.5</Version>
+    <Version>3.13.6</Version>
     <Authors>Zhichkin</Authors>
     <Copyright>Zhichkin © 2022</Copyright>
     <Description>DaJet HTTP server for 1C:Enterprise 8 databases</Description>

src/dajet-runtime/adapters/rabbitmq/Producer.cs

@@ -1,5 +1,6 @@
 using DaJet.Data;
 using DaJet.Scripting.Model;
+using Npgsql.Replication;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 using System.Buffers;
@@ -61,6 +62,66 @@ public Producer(in ScriptScope scope)
         private string VirtualHost { get; set; } = "/";
         private string UserName { get; set; } = "guest";
         private string Password { get; set; } = "guest";
+        private TimeSpan GetRequestedHeartbeat()
+        {
+            if (StreamFactory.TryGetOption(in _scope, "RequestedHeartbeat", out object value))
+            {
+                if (value is int seconds)
+                {
+                    return TimeSpan.FromSeconds(seconds);
+                }
+            }
+
+            return TimeSpan.FromSeconds(60);
+        }
+        private bool GetAutomaticRecoveryEnabled()
+        {
+            if (StreamFactory.TryGetOption(in _scope, "AutomaticRecoveryEnabled", out object value))
+            {
+                if (value is bool boolean)
+                {
+                    return boolean;
+                }
+            }
+
+            return true;
+        }
+        private TimeSpan GetNetworkRecoveryInterval()
+        {
+            if (StreamFactory.TryGetOption(in _scope, "NetworkRecoveryInterval", out object value))
+            {
+                if (value is int seconds)
+                {
+                    return TimeSpan.FromSeconds(seconds);
+                }
+            }
+
+            return TimeSpan.FromSeconds(5);
+        }
+        private TimeSpan GetContinuationTimeout()
+        {
+            if (StreamFactory.TryGetOption(in _scope, "ContinuationTimeout", out object value))
+            {
+                if (value is int seconds)
+                {
+                    return TimeSpan.FromSeconds(seconds);
+                }
+            }
+
+            return TimeSpan.FromSeconds(30);
+        }
+        private TimeSpan GetRequestedConnectionTimeout()
+        {
+            if (StreamFactory.TryGetOption(in _scope, "RequestedConnectionTimeout", out object value))
+            {
+                if (value is int seconds)
+                {
+                    return TimeSpan.FromSeconds(seconds);
+                }
+            }
+
+            return TimeSpan.FromSeconds(30);
+        }
         #endregion
 
         #region "MESSAGE OPTIONS AND VALUES"
@@ -291,7 +352,12 @@ private void InitializeConnection()
                 Port = HostPort,
                 VirtualHost = VirtualHost,
                 UserName = UserName,
-                Password = Password
+                Password = Password,
+                RequestedHeartbeat = GetRequestedHeartbeat(),
+                ContinuationTimeout = GetContinuationTimeout(),
+                RequestedConnectionTimeout = GetRequestedConnectionTimeout(),
+                AutomaticRecoveryEnabled = GetAutomaticRecoveryEnabled(),
+                NetworkRecoveryInterval = GetNetworkRecoveryInterval()
             };
 
             _connection = factory.CreateConnection();

src/dajet-runtime/dajet-runtime.csproj

@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <AssemblyName>DaJet.Runtime</AssemblyName>
-    <Version>3.13.5</Version>
+    <Version>3.13.6</Version>
     <Authors>Zhichkin</Authors>
     <Copyright>Zhichkin © 2024</Copyright>
     <PackageProjectUrl>https://zhichkin.github.io/</PackageProjectUrl>

src/dajet-runtime/database/ConsumeProcessor.cs

@@ -46,6 +46,10 @@ private void WhileActiveDoWork()
                         FileLogger.Default.Write($"Processed {processed} messages");
                     }
                 }
+                catch (BreakException)
+                {
+                    Dispose(); // STATE_ACTIVE -> STATE_DISPOSING -> STATE_IDLE
+                }
                 catch (Exception error)
                 {
                     delay = 60;

src/dajet-studio/Index.razor

@@ -1,3 +1,3 @@
 @page "/"
 
-<h6>DaJet Studio © 3.13.5</h6>
+<h6>DaJet Studio © 3.13.6</h6>

src/dajet-studio/dajet-studio.csproj

@@ -8,7 +8,7 @@
     <RootNamespace>DaJet.Studio</RootNamespace>
     <PackageId>$(AssemblyName)</PackageId>
     <AssemblyName>DaJet.Studio</AssemblyName>
-    <Version>3.13.5</Version>
+    <Version>3.13.6</Version>
     <Authors>Zhichkin</Authors>
     <Copyright>Zhichkin © 2022</Copyright>
     <Description>DaJet HTTP server Blazor UI</Description>

src/dajet-studio/wwwroot/index.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>DaJet Studio © 3.13.5</title>
+    <title>DaJet Studio © 3.13.6</title>
     <link rel="icon" href="/img/vuk.png" type="image/png">
     <base href="/" />
     <link href="css/app.css" rel="stylesheet" />

src/dajet/dajet.csproj

@@ -8,7 +8,7 @@
     <RootNamespace>DaJet</RootNamespace>
     <Authors>Zhichkin</Authors>
     <Copyright>Zhichkin © 2024</Copyright>
-    <Version>3.13.5</Version>
+    <Version>3.13.6</Version>
     <Title>DaJet Script Utility</Title>
     <PackageId>DaJet.Script.Utility</PackageId>
     <Product>DaJet Script Utility</Product>