Merge pull request #200 from nefarius/nefarius/issue/198

Changes GetChangesAsync to indefinitely auto-recover until cancellation is signalled

Author: matteobortolazzo

CHANGELOG.md

@@ -1,3 +1,15 @@
+# 3.6.0 (2024-03-11)
+
+## Bugs
+
+* **Change feed**: Fixed automatic resume at last change in continuous feed ([#198](https://github.com/matteobortolazzo/couchdb-net/issues/198))
+
+# 3.5.0 (2024-02-03)
+
+## Features
+
+* **Find**: Added support for fetching attachments with entire content ([#194](https://github.com/matteobortolazzo/couchdb-net/issues/194))
+
 # 3.4.0 (2023-06-21)
 
 ## Features
@@ -16,7 +28,7 @@
 
 ## Bug Fixes
 
-* **Dependency Injection**: Fix dependency injection packages references ([#180](https://github.com/matteobortolazzo/couchdb-net/pull/180)) 
+* **Dependency Injection**: Fix dependency injection packages references ([#180](https://github.com/matteobortolazzo/couchdb-net/pull/180))
 
 # 3.3.0 (2022-10-20)
 

LATEST_CHANGE.md

@@ -1,13 +1,5 @@
-# 3.4.0 (2023-06-21)
-
-## Features
-
-* **Database split**: Configurable field for document discrimination ([#150](https://github.com/matteobortolazzo/couchdb-net/issues/150))
-* **Find**: Added all options and responses ([#182](https://github.com/matteobortolazzo/couchdb-net/issues/182))
-* **Change feed**: Adds support for database split ([#187](https://github.com/matteobortolazzo/couchdb-net/issues/187))
-* **Replicas**: Adds `CreateTarget` option ([#189](https://github.com/matteobortolazzo/couchdb-net/issues/189))
+# 3.6.0 (2024-03-11)
 
 ## Bugs
 
-* **Queries**: Fix when `In` is called inside `Any` ([#183](https://github.com/matteobortolazzo/couchdb-net/issues/183))
-* **Database split**: Fix `FirstOrDefault` without filter queries ([#185](https://github.com/matteobortolazzo/couchdb-net/issues/185))
+* **Change feed**: Fixed automatic resume at last change in continuous feed ([#198](https://github.com/matteobortolazzo/couchdb-net/issues/198))

src/CouchDB.Driver/CouchDatabase.cs

@@ -459,33 +459,45 @@ public async IAsyncEnumerable<ChangesFeedResponseResult<TSource>> GetContinuousC
                 request = request.ApplyQueryParametersOptions(options);
             }
 
-            await using Stream stream = filter == null
-                ? await request.GetStreamAsync(cancellationToken, HttpCompletionOption.ResponseHeadersRead)
-                    .ConfigureAwait(false)
-                : await request.QueryContinuousWithFilterAsync<TSource>(_queryProvider, filter, cancellationToken)
-                    .ConfigureAwait(false);
-
-            await foreach (var line in stream.ReadLinesAsync(cancellationToken))
+            do
             {
-                if (string.IsNullOrEmpty(line))
-                {
-                    continue;
-                }
-                
-                MatchCollection matches = _feedChangeLineStartPattern.Matches(line);
-                for (var i = 0; i < matches.Count; i++)
+                await using Stream stream = filter == null
+                    ? await request.GetStreamAsync(cancellationToken, HttpCompletionOption.ResponseHeadersRead)
+                        .ConfigureAwait(false)
+                    : await request.QueryContinuousWithFilterAsync<TSource>(_queryProvider, filter, cancellationToken)
+                        .ConfigureAwait(false);
+
+                var lastSequence = options?.Since ?? "0";
+
+                await foreach (var line in stream.ReadLinesAsync(cancellationToken))
                 {
-                    var startIndex = matches[i].Index;
-                    var endIndex = i < matches.Count - 1 ? matches[i + 1].Index : line.Length;
-                    var lineLength = endIndex - startIndex;
-                    var substring = line.Substring(startIndex, lineLength);
-                    ChangesFeedResponseResult<TSource>? result = JsonConvert.DeserializeObject<ChangesFeedResponseResult<TSource>>(substring);
-                    if (string.IsNullOrWhiteSpace(_discriminator) || result.Document.SplitDiscriminator == _discriminator)
+                    if (string.IsNullOrEmpty(line))
+                    {
+                        continue;
+                    }
+
+                    MatchCollection matches = _feedChangeLineStartPattern.Matches(line);
+                    for (var i = 0; i < matches.Count; i++)
                     {
-                        yield return result;
+                        var startIndex = matches[i].Index;
+                        var endIndex = i < matches.Count - 1 ? matches[i + 1].Index : line.Length;
+                        var lineLength = endIndex - startIndex;
+                        var substring = line.Substring(startIndex, lineLength);
+                        ChangesFeedResponseResult<TSource>? result =
+                            JsonConvert.DeserializeObject<ChangesFeedResponseResult<TSource>>(substring);
+                        if (string.IsNullOrWhiteSpace(_discriminator) ||
+                            result.Document.SplitDiscriminator == _discriminator)
+                        {
+                            lastSequence = result.Seq;
+                            yield return result;
+                        }
                     }
                 }
-            }
+
+                // stream broke, pick up listening after last successful processed sequence
+                request = request.SetQueryParam("since", lastSequence);
+
+            } while (!cancellationToken.IsCancellationRequested);
         }
 
         #endregion

src/azure-pipelines.yaml

@@ -1,6 +1,6 @@
 variables:
   BuildConfiguration: Release
-  PackageVersion: '3.5.0'
+  PackageVersion: '3.6.0'
 
 trigger:
   branches: