Merge remote-tracking branch 'upstream/grpc@1.19.x' into v1.19_upmerge

packages/grpc-js/package.json

@@ -20,8 +20,7 @@
     "@types/node": "^10.5.4",
     "clang-format": "^1.0.55",
     "gts": "^0.5.1",
-    "lodash": "^4.17.4",
-    "typescript": "~3.3.3333"
+    "lodash": "^4.17.4"
   },
   "contributors": [
     {

packages/grpc-native-core/binding.gyp

@@ -91,7 +91,7 @@
       'GPR_BACKWARDS_COMPATIBILITY_MODE',
       'GRPC_ARES=0',
       'GRPC_UV',
-      'GRPC_NODE_VERSION="1.19.0-pre1"'
+      'GRPC_NODE_VERSION="1.19.0"'
     ],
     'conditions': [
       ['grpc_gcov=="true"', {
@@ -963,7 +963,8 @@
       ],
       'cflags': [
         '-pthread',
-        '-Wno-error=deprecated-declarations'
+        '-Wno-error=deprecated-declarations',
+        '-Wno-cast-function-type'
       ],
       "conditions": [
         ['OS=="win" or runtime=="electron"', {

packages/grpc-native-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grpc",
-  "version": "1.19.0-pre1",
+  "version": "1.19.0",
   "author": "Google Inc.",
   "description": "gRPC Library for Node",
   "homepage": "https://grpc.io/",

packages/grpc-native-core/src/client.js

@@ -376,12 +376,14 @@ function Client(address, credentials, options) {
   }
   self.$interceptors = options.interceptors || [];
   self.$interceptor_providers = options.interceptor_providers || [];
-  Object.keys(self.$method_definitions).forEach(method_name => {
-    const method_definition = self.$method_definitions[method_name];
-    self[method_name].interceptors = client_interceptors
-      .resolveInterceptorProviders(self.$interceptor_providers, method_definition)
-      .concat(self.$interceptors);
-  });
+  if (self.$method_definitions) {
+    Object.keys(self.$method_definitions).forEach(method_name => {
+      const method_definition = self.$method_definitions[method_name];
+      self[method_name].interceptors = client_interceptors
+        .resolveInterceptorProviders(self.$interceptor_providers, method_definition)
+        .concat(self.$interceptors);
+    });
+  }
 
   this.$callInvocationTransformer = options.callInvocationTransformer;
 

packages/grpc-native-core/templates/binding.gyp.template

@@ -312,7 +312,8 @@
         ],
         'cflags': [
           '-pthread',
-          '-Wno-error=deprecated-declarations'
+          '-Wno-error=deprecated-declarations',
+          '-Wno-cast-function-type'
         ],
         "conditions": [
           ['OS=="win" or runtime=="electron"', {

packages/grpc-native-core/test/surface_test.js

@@ -220,6 +220,13 @@ describe('Client constructor building', function() {
     assert.strictEqual(Client.prototype.add, Client.prototype.Add);
   });
 });
+describe('Generic client', function() {
+  it('Should construct without error', function() {
+    assert.doesNotThrow(() => {
+      const client = new grpc.Client('localhost: 50051', grpc.credentials.createInsecure());
+    });
+  });
+});
 describe('waitForClientReady', function() {
   var server;
   var port;
@@ -314,7 +321,7 @@ describe('Echo service', function() {
     });
   });
 });
-describe('Generic client and server', function() {
+describe('Non-protobuf client and server', function() {
   function toString(val) {
     return val.toString();
   }

packages/proto-loader/package.json

@@ -46,8 +46,7 @@
     "@types/lodash.camelcase": "^4.3.4",
     "@types/node": "^10.12.5",
     "clang-format": "^1.2.2",
-    "gts": "^0.5.3",
-    "typescript": "~3.3.3333"
+    "gts": "^0.5.3"
   },
   "engines": {
     "node": ">=6"

tools/release/native/Dockerfile

@@ -1,6 +1,8 @@
 FROM debian:jessie
 
-RUN echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list
+RUN echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list
+RUN echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
 RUN apt-get update
 RUN apt-get -t jessie-backports install -y cmake
 RUN apt-get install -y curl build-essential python libc6-dev-i386 lib32stdc++-4.9-dev jq