Merge pull request #35 from fiskaltrust/user/tsc/journalfix

Don't return \0 in last journal chunk
fiskaltrust · Nov 26, 2020 · f00141e · f00141e
2 parents 9a90eb8 + 9c19a4c
commit f00141e
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 36 deletions.
diff --git a/src/fiskaltrust.Middleware.Interface.Client.Common/Extensions/StreamExtension.cs b/src/fiskaltrust.Middleware.Interface.Client.Common/Extensions/StreamExtension.cs
@@ -7,15 +7,15 @@ namespace fiskaltrust.Middleware.Interface.Client.Extensions
 {
     public static class StreamExtensions
     {
-        public static async IAsyncEnumerable<JournalResponse> ToAsyncEnumerable(this Stream stream)
+        public static async IAsyncEnumerable<JournalResponse> ToAsyncEnumerable(this Stream stream, int chunkSize)
         {
-            var chunkSize = 4096;
             var buffer = new byte[chunkSize];
-            while ((_ = await stream.ReadAsync(buffer, 0, buffer.Length)) > 0)
+            int readAmount;
+            while ((readAmount = await stream.ReadAsync(buffer, 0, buffer.Length)) > 0)
             {
                 yield return new JournalResponse
                 {
-                    Chunk = buffer.ToList()
+                    Chunk = buffer.Take(readAmount).ToList()
                 };
                 buffer = new byte[chunkSize];
             }

diff --git a/src/fiskaltrust.Middleware.Interface.Client.Http.StrongName/version.json b/src/fiskaltrust.Middleware.Interface.Client.Http.StrongName/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.4",
+  "version": "1.3.11",
   "releaseBranches": [
     "^refs/heads/master$",
     "^refs/tags/v\\d+(?:\\.\\d+)*(?:-.*)?$"

diff --git a/src/fiskaltrust.Middleware.Interface.Client.Http/Helpers/AsyncJournalPOSHelper.cs b/src/fiskaltrust.Middleware.Interface.Client.Http/Helpers/AsyncJournalPOSHelper.cs
@@ -39,7 +39,7 @@ public AsyncJournalPOSHelper(IPOS innerPOS)
         public IAsyncEnumerable<JournalResponse> JournalAsync(JournalRequest request)
         {
             var stream = _innerPOS.Journal(request.ftJournalType, request.From, request.To);
-            return stream.ToAsyncEnumerable();
+            return stream.ToAsyncEnumerable(request.MaxChunkSize);
         }
 
         public Task<EchoResponse> EchoAsync(EchoRequest message) => _innerPOS.EchoAsync(message);

diff --git a/src/fiskaltrust.Middleware.Interface.Client.Http/POS/HttpPosClientOptions.cs b/src/fiskaltrust.Middleware.Interface.Client.Http/POS/HttpPosClientOptions.cs
@@ -1,19 +1,18 @@
-using System;
-
-namespace fiskaltrust.Middleware.Interface.Client.Http
-{
-    public class HttpPosClientOptions : ClientOptions
-    {
-        public HttpCommunicationType CommunicationType { get; set; }
+using System;
+
+namespace fiskaltrust.Middleware.Interface.Client.Http
+{
+    public class HttpPosClientOptions : ClientOptions
+    {
+        public HttpCommunicationType CommunicationType { get; set; }
         public bool UseUnversionedLegacyUrls { get; set; } = false;
-        public Guid? CashboxId { get; set; }
-        public string AccessToken { get; set; }
-    }
-
-    public enum HttpCommunicationType
-    {
-        Json,
-        Xml
-    }
-
+        public Guid? CashboxId { get; set; }
+        public string AccessToken { get; set; }
+    }
+
+    public enum HttpCommunicationType
+    {
+        Json,
+        Xml
+    }
 }
diff --git a/src/fiskaltrust.Middleware.Interface.Client.Http/version.json b/src/fiskaltrust.Middleware.Interface.Client.Http/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.4",
+  "version": "1.3.11",
   "releaseBranches": [
     "^refs/heads/master$",
     "^refs/tags/v\\d+(?:\\.\\d+)*(?:-.*)?$"

diff --git a/src/fiskaltrust.Middleware.Interface.Client.Soap/Helpers/AsyncPOSHelper.cs b/src/fiskaltrust.Middleware.Interface.Client.Soap/Helpers/AsyncPOSHelper.cs
@@ -41,7 +41,7 @@ public AsyncPOSHelper(ifPOS.v1.IPOS innerPOS)
         public IAsyncEnumerable<ifPOS.v1.JournalResponse> JournalAsync(ifPOS.v1.JournalRequest request)
         {
             var stream = _innerPOS.Journal(request.ftJournalType, request.From, request.To);
-            return stream.ToAsyncEnumerable();
+            return stream.ToAsyncEnumerable(request.MaxChunkSize);
         }
 
         public Task<ifPOS.v1.EchoResponse> EchoAsync(ifPOS.v1.EchoRequest message) => Task.Run(() => _innerPOS.EchoAsync(message));

diff --git a/src/fiskaltrust.Middleware.Interface.Client.Soap/SoapClientOptions.cs b/src/fiskaltrust.Middleware.Interface.Client.Soap/SoapClientOptions.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace fiskaltrust.Middleware.Interface.Client.Soap
+{
+    public class SoapClientOptions : ClientOptions
+    {
+        public long MaxReceivedMessageSize { get; set; } = 16 * 1024 * 1024;
+        public TimeSpan ReceiveTimeout { get; set; } = TimeSpan.FromDays(14);
+    }
+}
diff --git a/src/fiskaltrust.Middleware.Interface.Client.Soap/SoapDESSCDFactory.cs b/src/fiskaltrust.Middleware.Interface.Client.Soap/SoapDESSCDFactory.cs
@@ -7,6 +7,16 @@ namespace fiskaltrust.Middleware.Interface.Client.Soap
     public static class SoapDESSCDFactory
     {
         public static async Task<IDESSCD> CreateSSCDAsync(ClientOptions options)
+        {
+            var soapClientOptions = new SoapClientOptions
+            {
+                RetryPolicyOptions = options.RetryPolicyOptions,
+                Url = options.Url
+            };
+            return await CreateSSCDAsync(soapClientOptions);
+        }
+
+        public static async Task<IDESSCD> CreateSSCDAsync(SoapClientOptions options)
         {
             var connectionhandler = new SoapProxyConnectionHandler<IDESSCD>(options);
 

diff --git a/src/fiskaltrust.Middleware.Interface.Client.Soap/SoapPosFactory.cs b/src/fiskaltrust.Middleware.Interface.Client.Soap/SoapPosFactory.cs
@@ -8,6 +8,16 @@ namespace fiskaltrust.Middleware.Interface.Client.Soap
     public static class SoapPosFactory
     {
         public static async Task<IPOS> CreatePosAsync(ClientOptions options)
+        {
+            var soapClientOptions = new SoapClientOptions
+            {
+                RetryPolicyOptions = options.RetryPolicyOptions,
+                Url = options.Url
+            };
+            return await CreatePosAsync(soapClientOptions);
+        }
+
+        public static async Task<IPOS> CreatePosAsync(SoapClientOptions options)
         {
             var connectionhandler = new SoapProxyConnectionHandler<IPOS>(options);
 

diff --git a/src/fiskaltrust.Middleware.Interface.Client.Soap/SoapProxyConnectionHandler.cs b/src/fiskaltrust.Middleware.Interface.Client.Soap/SoapProxyConnectionHandler.cs
@@ -9,13 +9,10 @@ namespace fiskaltrust.Middleware.Interface.Client.Soap
 {
     internal class SoapProxyConnectionHandler<T> : IProxyConnectionHandler<T> where T : class
     {
-        private const long MAX_RECEIVED_MESSAGE_SIZE = 16 * 1024 * 1024;
-        private const int RECEIVE_TIMEOUT_DAYS = 14;
-
         private T _proxy;
-        private readonly ClientOptions _options;
+        private readonly SoapClientOptions _options;
 
-        public SoapProxyConnectionHandler(ClientOptions options)
+        public SoapProxyConnectionHandler(SoapClientOptions options)
         {
             _options = options;
         }
@@ -77,14 +74,13 @@ private Binding ConfigureBinding()
         {
             // Use timeout * 2 to make sure the call doesn't end before the outer timeout
             var sendTimeout = _options.RetryPolicyOptions?.ClientTimeout.Double() ?? RetryPolicyOptions.Default.ClientTimeout.Double();
-            var receiveTimeout = TimeSpan.FromDays(RECEIVE_TIMEOUT_DAYS);
 
             return _options.Url.Scheme switch
             {
-                "http" => new BasicHttpBinding(BasicHttpSecurityMode.None) { MaxReceivedMessageSize = MAX_RECEIVED_MESSAGE_SIZE, SendTimeout = sendTimeout, ReceiveTimeout = receiveTimeout },
-                "https" => new BasicHttpBinding(BasicHttpSecurityMode.Transport) { MaxReceivedMessageSize = MAX_RECEIVED_MESSAGE_SIZE, SendTimeout = sendTimeout, ReceiveTimeout = receiveTimeout },
-                "net.pipe" => new NetNamedPipeBinding(NetNamedPipeSecurityMode.None) { MaxReceivedMessageSize = MAX_RECEIVED_MESSAGE_SIZE, SendTimeout = sendTimeout, ReceiveTimeout = receiveTimeout },
-                "net.tcp" => new NetTcpBinding(SecurityMode.None) { MaxReceivedMessageSize = MAX_RECEIVED_MESSAGE_SIZE, SendTimeout = sendTimeout, ReceiveTimeout = receiveTimeout },
+                "http" => new BasicHttpBinding(BasicHttpSecurityMode.None) { MaxReceivedMessageSize = _options.MaxReceivedMessageSize, SendTimeout = sendTimeout, ReceiveTimeout = _options.ReceiveTimeout },
+                "https" => new BasicHttpBinding(BasicHttpSecurityMode.Transport) { MaxReceivedMessageSize = _options.MaxReceivedMessageSize, SendTimeout = sendTimeout, ReceiveTimeout = _options.ReceiveTimeout },
+                "net.pipe" => new NetNamedPipeBinding(NetNamedPipeSecurityMode.None) { MaxReceivedMessageSize = _options.MaxReceivedMessageSize, SendTimeout = sendTimeout, ReceiveTimeout = _options.ReceiveTimeout },
+                "net.tcp" => new NetTcpBinding(SecurityMode.None) { MaxReceivedMessageSize = _options.MaxReceivedMessageSize, SendTimeout = sendTimeout, ReceiveTimeout = _options.ReceiveTimeout },
                 _ => throw new ArgumentException($"The url {_options.Url} is not supported.", nameof(_options.Url))
             };
         }

diff --git a/src/fiskaltrust.Middleware.Interface.Client.Soap/version.json b/src/fiskaltrust.Middleware.Interface.Client.Soap/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.4",
+  "version": "1.3.11",
   "releaseBranches": [
     "^refs/heads/master$",
     "^refs/tags/v\\d+(?:\\.\\d+)*(?:-.*)?$"