Introduced Subscribe Resolver for IAsyncEnumerable<T> (#1262)

ChilliCream · Dec 9, 2019 · c5d4900 · c5d4900
1 parent 293058b
commit c5d4900
Show file tree

Hide file tree

Showing 55 changed files with 1,573 additions and 675 deletions.
diff --git a/src/Core/Abstractions/Abstractions.csproj b/src/Core/Abstractions/Abstractions.csproj
@@ -25,6 +25,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Core/Abstractions/EventMessageAttribute.cs b/src/Core/Abstractions/EventMessageAttribute.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace HotChocolate
+{
+    [AttributeUsage(AttributeTargets.Parameter)]
+    public sealed class EventMessageAttribute
+        : Attribute
+    {
+    }
+}
diff --git a/src/Core/Abstractions/Execution/IResponseStream.cs b/src/Core/Abstractions/Execution/IResponseStream.cs
@@ -1,27 +1,8 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace HotChocolate.Execution
 {
-    public interface IResponseStream
-        : IDisposable
+    public interface IResponseStream : IAsyncEnumerable<IReadOnlyQueryResult>
     {
-        /// <summary>
-        /// Defines if this stream is completed.
-        /// A completed response stream does not yield any new results.
-        /// </summary>
-        bool IsCompleted { get; }
-
-        /// <summary>
-        /// Reads the next result from the current response stream.
-        /// </summary>
-        Task<IReadOnlyQueryResult> ReadAsync();
-
-        /// <summary>
-        /// Reads the next result from the current response stream.
-        /// </summary>
-        Task<IReadOnlyQueryResult> ReadAsync(
-            CancellationToken cancellationToken);
     }
 }
diff --git a/src/Core/Abstractions/Execution/WellKnownContextData.cs b/src/Core/Abstractions/Execution/WellKnownContextData.cs
@@ -0,0 +1,8 @@
+namespace HotChocolate.Execution
+{
+    public static class WellKnownContextData
+    {
+        public const string Principal = "HotChocolate.Execution.Principal";
+        public const string EventMessage = "HotChocolate.Execution.EventMessage";
+    }
+}
diff --git a/src/Core/Core.Tests/Execution/Batching/BatchQueryExecutorTests.cs b/src/Core/Core.Tests/Execution/Batching/BatchQueryExecutorTests.cs
@@ -65,9 +65,8 @@ query getHuman {
                 await executor.ExecuteAsync(batch, CancellationToken.None);
 
             var results = new List<IReadOnlyQueryResult>();
-            while (!stream.IsCompleted)
+            await foreach (IReadOnlyQueryResult result in stream)
             {
-                IReadOnlyQueryResult result = await stream.ReadAsync();
                 if (result != null)
                 {
                     results.Add(result);
@@ -138,9 +137,8 @@ mutation secondReview {
                 await executor.ExecuteAsync(batch, CancellationToken.None);
 
             var results = new List<IReadOnlyQueryResult>();
-            while (!stream.IsCompleted)
+            await foreach (IReadOnlyQueryResult result in stream)
             {
-                IReadOnlyQueryResult result = await stream.ReadAsync();
                 if (result != null)
                 {
                     results.Add(result);
@@ -214,9 +212,8 @@ foo @export(as: ""b"")
                 await executor.ExecuteAsync(batch, CancellationToken.None);
 
             var results = new List<IReadOnlyQueryResult>();
-            while (!stream.IsCompleted)
+            await foreach (IReadOnlyQueryResult result in stream)
             {
-                IReadOnlyQueryResult result = await stream.ReadAsync();
                 if (result != null)
                 {
                     results.Add(result);
@@ -324,9 +321,8 @@ foo @export(as: ""b"")
                 await executor.ExecuteAsync(batch, CancellationToken.None);
 
             var results = new List<IReadOnlyQueryResult>();
-            while (!stream.IsCompleted)
+            await foreach (IReadOnlyQueryResult result in stream)
             {
-                IReadOnlyQueryResult result = await stream.ReadAsync();
                 if (result != null)
                 {
                     results.Add(result);
@@ -390,9 +386,8 @@ public async Task Add_Value_To_Variable_List()
                 await executor.ExecuteAsync(batch, CancellationToken.None);
 
             var results = new List<IReadOnlyQueryResult>();
-            while (!stream.IsCompleted)
+            await foreach (IReadOnlyQueryResult result in stream)
             {
-                IReadOnlyQueryResult result = await stream.ReadAsync();
                 if (result != null)
                 {
                     results.Add(result);
@@ -464,9 +459,8 @@ public async Task Convert_List_To_Single_Value_With_Converters()
                 await executor.ExecuteAsync(batch, CancellationToken.None);
 
             var results = new List<IReadOnlyQueryResult>();
-            while (!stream.IsCompleted)
+            await foreach (IReadOnlyQueryResult result in stream)
             {
-                IReadOnlyQueryResult result = await stream.ReadAsync();
                 if (result != null)
                 {
                     results.Add(result);

diff --git a/src/Core/Core.Tests/Integration/StarWarsCodeFirst/StarWarsCodeFirstTests.cs b/src/Core/Core.Tests/Integration/StarWarsCodeFirst/StarWarsCodeFirstTests.cs
@@ -694,10 +694,15 @@ public async Task SubscribeToReview()
                     }
                 }");
 
-            IReadOnlyQueryResult eventResult;
+            IReadOnlyQueryResult eventResult = null;
             using (var cts = new CancellationTokenSource(2000))
             {
-                eventResult = await responseStream.ReadAsync();
+                await foreach (IReadOnlyQueryResult item in
+                    responseStream.WithCancellation(cts.Token))
+                {
+                    eventResult = item;
+                    break;
+                }
             }
 
             eventResult.MatchSnapshot();

diff --git a/src/Core/Core/Core.csproj b/src/Core/Core/Core.csproj
@@ -18,13 +18,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.1" />
-    <PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
+    <ProjectReference Include="..\Types\Types.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Types\Types.csproj" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.1" />
+    <PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup>