allows async interceptors (#120)

* allows async interceptors

* prevent chunks to come before starting streaming request

AUTHORS

@@ -5,3 +5,4 @@
 
 Google Inc.
 German Saprykin <saprykin.h@gmail.com>
+Alexandre Ardhuin <alexandre.ardhuin@gmail.com>

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.5
+
+* Interceptors are now async.
+
 ## 0.6.4
 
 * Update dependencies to be compatible with Dart 2.

lib/src/server/handler.dart

@@ -93,12 +93,14 @@ class ServerHandler extends ServiceCall {
 
   // -- Idle state, incoming data --
 
-  void _onDataIdle(GrpcMessage message) {
+  void _onDataIdle(GrpcMessage message) async {
     if (message is! GrpcMetadata) {
       _sendError(new GrpcError.unimplemented('Expected header frame'));
       _sinkIncoming();
       return;
     }
+    _incomingSubscription.pause();
+
     final headerMessage = message
         as GrpcMetadata; // TODO(jakobr): Cast should not be necessary here.
     _clientMetadata = headerMessage.metadata;
@@ -120,7 +122,7 @@ class ServerHandler extends ServiceCall {
       return;
     }
 
-    final error = _applyInterceptors();
+    final error = await _applyInterceptors();
     if (error != null) {
       _sendError(error);
       _sinkIncoming();
@@ -130,10 +132,10 @@ class ServerHandler extends ServiceCall {
     _startStreamingRequest();
   }
 
-  GrpcError _applyInterceptors() {
+  Future<GrpcError> _applyInterceptors() async {
     try {
       for (final interceptor in _interceptors) {
-        final error = interceptor(this, this._descriptor);
+        final error = await interceptor(this, this._descriptor);
         if (error != null) {
           return error;
         }
@@ -146,7 +148,6 @@ class ServerHandler extends ServiceCall {
   }
 
   void _startStreamingRequest() {
-    _incomingSubscription.pause();
     _requests = _descriptor.createRequestStream(_incomingSubscription);
     _incomingSubscription.onData(_onDataActive);
 
@@ -297,8 +298,8 @@ class ServerHandler extends ServiceCall {
     }
 
     final outgoingTrailers = <Header>[];
-    outgoingTrailersMap.forEach((key, value) =>
+    outgoingTrailersMap.forEach((key, value) => outgoingTrailers
-        outgoingTrailers.add(new Header(ascii.encode(key), utf8.encode(value))));
+        .add(new Header(ascii.encode(key), utf8.encode(value))));
     _stream.sendHeaders(outgoingTrailers, endStream: true);
     // We're done!
     _cancelResponseSubscription();

lib/src/server/interceptor.dart

@@ -1,5 +1,6 @@
-import '../shared/status.dart';
+import 'dart:async';
 
+import '../shared/status.dart';
 import 'call.dart';
 import 'service.dart';
 
@@ -9,5 +10,5 @@ import 'service.dart';
 /// If the interceptor returns a [GrpcError], the error will be returned as a response and [ServiceMethod] wouldn't be called.
 /// If the interceptor throws [Exception], [GrpcError.internal] with exception.toString() will be returned.
 /// If the interceptor returns null, the corresponding [ServiceMethod] of [Service] will be called.
-typedef Interceptor = GrpcError Function(
+typedef Interceptor = FutureOr<GrpcError> Function(
     ServiceCall call, ServiceMethod method);

pubspec.yaml

@@ -1,6 +1,6 @@
 name: grpc
 description: Dart implementation of gRPC.
-version: 0.6.4
+version: 0.6.5
 author: Dart Team <misc@dartlang.org>
 homepage: https://github.com/dart-lang/grpc-dart
 

test/server_test.dart

@@ -279,7 +279,7 @@ void main() {
   });
 
   group('Server with interceptor', () {
-    test('processes calls if interceptor allows request', () async {
+    group('processes calls if interceptor allows request', () {
       const expectedRequest = 5;
       const expectedResponse = 7;
       Future<int> methodHandler(ServiceCall call, Future<int> request) async {
@@ -287,48 +287,83 @@ void main() {
         return expectedResponse;
       }
 
-      GrpcError interceptorHandler(ServiceCall call, ServiceMethod method) {
+      final Interceptor interceptor = (call, method) {
         if (method.name == "Unary") {
           return null;
         }
         return new GrpcError.unauthenticated('Request is unauthenticated');
+      };
+
+      Future<void> doTest(Interceptor handler) async {
+        harness
+          ..interceptor.handler = handler
+          ..service.unaryHandler = methodHandler
+          ..runTest('/Test/Unary', [expectedRequest], [expectedResponse]);
+
+        await harness.fromServer.done;
       }
 
-      harness
+      test('with sync interceptor', () => doTest(interceptor));
-        ..interceptor.handler = interceptorHandler
+      test('with async interceptor',
-        ..service.unaryHandler = methodHandler
+          () => doTest((call, method) async => interceptor(call, method)));
-        ..runTest('/Test/Unary', [expectedRequest], [expectedResponse]);
-
-      await harness.fromServer.done;
     });
 
-    test('returns error if interceptor blocks request', () async {
+    group('returns error if interceptor blocks request', () {
-      GrpcError interceptorHandler(ServiceCall call, ServiceMethod method) {
+      final Interceptor interceptor = (call, method) {
         if (method.name == "Unary") {
           return new GrpcError.unauthenticated('Request is unauthenticated');
         }
         return null;
+      };
+
+      Future<void> doTest(Interceptor handler) async {
+        harness
+          ..interceptor.handler = handler
+          ..expectErrorResponse(
+              StatusCode.unauthenticated, 'Request is unauthenticated')
+          ..sendRequestHeader('/Test/Unary');
+
+        await harness.fromServer.done;
       }
 
-      harness
+      test('with sync interceptor', () => doTest(interceptor));
-        ..interceptor.handler = interceptorHandler
+      test('with async interceptor',
-        ..expectErrorResponse(
+          () => doTest((call, method) async => interceptor(call, method)));
-            StatusCode.unauthenticated, 'Request is unauthenticated')
-        ..sendRequestHeader('/Test/Unary');
-
-      await harness.fromServer.done;
     });
 
-    test('returns internal error if interceptor throws exception', () async {
+    group('returns internal error if interceptor throws exception', () {
-      GrpcError interceptorHandler(ServiceCall call, ServiceMethod method) {
+      final Interceptor interceptor = (call, method) {
         throw new Exception('Reason is unknown');
+      };
+
+      Future<void> doTest(Interceptor handler) async {
+        harness
+          ..interceptor.handler = handler
+          ..expectErrorResponse(
+              StatusCode.internal, 'Exception: Reason is unknown')
+          ..sendRequestHeader('/Test/Unary');
+
+        await harness.fromServer.done;
       }
 
+      test('with sync interceptor', () => doTest(interceptor));
+      test('with async interceptor',
+          () => doTest((call, method) async => interceptor(call, method)));
+    });
+
+    test("don't fail if interceptor await 2 times", () async {
+      final Interceptor interceptor = (call, method) async {
+        await Future.value();
+        await Future.value();
+        throw new Exception('Reason is unknown');
+      };
+
       harness
-        ..interceptor.handler = interceptorHandler
+        ..interceptor.handler = interceptor
         ..expectErrorResponse(
             StatusCode.internal, 'Exception: Reason is unknown')
-        ..sendRequestHeader('/Test/Unary');
+        ..sendRequestHeader('/Test/Unary')
+        ..sendData(1);
 
       await harness.fromServer.done;
     });

test/src/server_utils.dart

@@ -81,7 +81,7 @@ class TestService extends Service {
 class TestInterceptor {
   Interceptor handler;
 
-  GrpcError call(ServiceCall call, ServiceMethod method) {
+  FutureOr<GrpcError> call(ServiceCall call, ServiceMethod method) {
     if (handler == null) {
       return null;
     }