feat(server): don't await handleCall

edvardchen · Aug 9, 2019 · cf850cf · cf850cf
1 parent a6300ea
commit cf850cf
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 9 deletions.
diff --git a/__tests__/server.test.ts b/__tests__/server.test.ts
@@ -1,17 +1,57 @@
 import { Interceptor } from '../src/server';
 
-import { handleUnaryCall, ServiceError, status } from 'grpc';
-import { Point, Feature } from './fixtures/static_codegen/route_guide_pb';
+import {
+  ServerUnaryCall,
+  sendUnaryData,
+  handleUnaryCall,
+  ServerWriteableStream,
+  ServiceError,
+  status,
+} from 'grpc';
+import {
+  Point,
+  Feature,
+  Rectangle,
+} from './fixtures/static_codegen/route_guide_pb';
 
 import runTest from './helpers/runTest';
 
 describe('server', () => {
   describe('pass through', () => {
-    const getFeature: handleUnaryCall<Point, Feature> = (call, callback) => {
-      callback(null, new Feature());
-    };
     runTest({
-      implementations: { getFeature },
+      implementations: {
+        getFeature(
+          call: ServerUnaryCall<Point>,
+          callback: sendUnaryData<Feature>
+        ) {
+          callback(null, new Feature());
+          return new Promise(resolve => setTimeout(resolve, 30000));
+        },
+        listFeatures(call: ServerWriteableStream<Feature>) {
+          call.end();
+          return new Promise(resolve => setTimeout(resolve, 30000));
+        },
+      },
+      testcase(server, client) {
+        describe('should not timeout', () => {
+          it('getFeature', done => {
+            // @ts-ignore
+            client().getFeature(new Point(), done);
+          });
+
+          it('listFeatures', done => {
+            server().use(async (ctx, next) => {
+              await next();
+              done();
+            });
+            // @ts-ignore
+            client().listFeatures(new Rectangle());
+          });
+        });
+      },
+    });
+
+    runTest({
       testcase(getServer, getClient) {
         it('getFeature', done => {
           const server = getServer();

diff --git a/src/server/index.ts b/src/server/index.ts
@@ -66,10 +66,11 @@ export default class ExperimentalServer extends Server {
       if (!first) {
         // no interceptors
         // @ts-ignore
-        return original(call, grpcCallback);
+        original(call, grpcCallback);
+        return;
       }
 
-      first(ctx, async function next() {
+      first(ctx, function next() {
         const { done, value } = interceptors.next();
         if (done) {
           // unary call
@@ -92,7 +93,8 @@ export default class ExperimentalServer extends Server {
           }
 
           // @ts-ignore
-          return original(call);
+          original(call);
+          return;
         }
         // run another interceptor
         return value(ctx, next);