Pure JS: Fixed two bugs with goaway handling

packages/grpc-js/src/call-stream.ts

@@ -298,10 +298,10 @@ export class Http2CallStream extends Duplex implements Call {
       stream.on('end', () => {
         this.tryPush(null);
       });
-      stream.on('close', async errorCode => {
+      stream.on('close', async () => {
         let code: Status;
         let details = '';
-        switch (errorCode) {
+        switch (stream.rstCode) {
           case http2.constants.NGHTTP2_REFUSED_STREAM:
             code = Status.UNAVAILABLE;
             break;
@@ -329,11 +329,9 @@ export class Http2CallStream extends Duplex implements Call {
         this.endCall({ code, details, metadata: new Metadata() });
       });
       stream.on('error', (err: Error) => {
-        this.endCall({
-          code: Status.INTERNAL,
-          details: 'Internal HTTP2 error',
-          metadata: new Metadata(),
-        });
+        /* We need an error handler here to stop "Uncaught Error" exceptions
+         * from bubbling up. However, errors here should all correspond to
+         * "close" events, where we will handle the error more granularly */
       });
       if (!this.pendingRead) {
         stream.pause();

packages/grpc-js/src/subchannel.ts

@@ -78,6 +78,10 @@ export class Http2SubChannel extends EventEmitter implements SubChannel {
       this.stopKeepalivePings();
       this.emit('close');
     });
+    this.session.on('goaway', () => {
+      this.stopKeepalivePings();
+      this.emit('close');
+    });
     this.userAgent = userAgent;
 
     if (channelArgs['grpc.keepalive_time_ms']) {

test/api/connectivity_test.js

@@ -0,0 +1,99 @@
+/*
+ * Copyright 2019 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+const options = {
+  keepCase: true,
+  longs: String,
+  enums: String,
+  defaults: true,
+  oneofs: true
+};
+const path = require('path');
+const fs = require('fs');
+const assert = require('assert');
+const _ = require('lodash');
+const anyGrpc = require('../any_grpc');
+const clientGrpc = anyGrpc.client;
+const serverGrpc = anyGrpc.server;
+const protoLoader = require('../../packages/proto-loader', options);
+const testServiceDef = protoLoader.loadSync(__dirname + '/../proto/test_service.proto');
+const TestService = serverGrpc.loadPackageDefinition(testServiceDef).TestService.service;
+const TestServiceClient = clientGrpc.loadPackageDefinition(testServiceDef).TestService;
+
+const clientCreds = clientGrpc.credentials.createInsecure();
+const serverCreds = serverGrpc.ServerCredentials.createInsecure();
+
+const serviceImpl = {
+  unary: function(call, cb) {
+    cb(null, {});
+  },
+  clientStream: function(stream, cb){
+    stream.on('data', function(data) {});
+    stream.on('end', function() {
+      cb(null, {});
+    });
+  },
+  serverStream: function(stream) {
+    stream.end();
+  },
+  bidiStream: function(stream) {
+    stream.on('data', function(data) {});
+    stream.on('end', function() {
+      stream.end();
+    });
+  }
+};
+
+describe('Reconnection', function() {
+  let server1;
+  let server2;
+  let port;
+  before(function() {
+    server1 = new serverGrpc.Server();
+    server1.addService(TestService, serviceImpl);
+    server2 = new serverGrpc.Server();
+    server2.addService(TestService, serviceImpl);
+    port = server1.bind('localhost:0', serverCreds);
+    server1.start();
+    client = new TestServiceClient(`localhost:${port}`, clientCreds);
+  });
+  after(function() {
+    server1.forceShutdown();
+    server2.forceShutdown();
+  });
+  it('Should end with either OK or UNAVAILABLE when querying a server that is shutting down', function(done) {
+    client.unary({}, (err, data) => {
+      assert.ifError(err);
+      server1.tryShutdown(() => {
+        server2.bind(`localhost:${port}`, serverCreds);
+        server2.start();
+        client.unary({}, (err, data) => {
+          assert.ifError(err);
+          clearInterval(callInterval);
+          done();
+        });
+      });
+      let callInterval = setInterval(() => {
+        client.unary({}, (err, data) => {
+          if (err) {
+            assert.strictEqual(err.code, clientGrpc.status.UNAVAILABLE);
+          }
+        });
+      }, 0);
+    });
+  });
+});