Merge pull request #1939 from grpc/@grpc/[email protected]

Upmerge a few recent changes from 1.4

Author: murgatroid99

packages/grpc-js-xds/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js-xds",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "Plugin for @grpc/grpc-js. Adds the xds:// URL scheme and associated features.",
   "main": "build/src/index.js",
   "scripts": {
@@ -47,7 +47,7 @@
     "re2-wasm": "^1.0.1"
   },
   "peerDependencies": {
-    "@grpc/grpc-js": "~1.3.0"
+    "@grpc/grpc-js": "~1.4.0"
   },
   "engines": {
     "node": ">=10.10.0"

packages/grpc-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "1.3.7",
+  "version": "1.4.1",
   "description": "gRPC Library for Node - pure JS implementation",
   "homepage": "https://grpc.io/",
   "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",
@@ -48,11 +48,11 @@
     "compile": "tsc -p .",
     "format": "clang-format -i -style=\"{Language: JavaScript, BasedOnStyle: Google, ColumnLimit: 80}\" src/*.ts test/*.ts",
     "lint": "npm run check",
-    "prepare": "npm run compile",
+    "prepare": "npm run generate-types && npm run compile",
     "test": "gulp test",
     "check": "gts check src/**/*.ts",
     "fix": "gts fix src/*.ts",
-    "pretest": "npm run compile",
+    "pretest": "npm run generate-types && npm run compile",
     "posttest": "npm run check && madge -c ./build/src",
     "generate-types": "proto-loader-gen-types --keepCase --longs String --enums String --defaults --oneofs --includeComments --includeDirs proto/ -O src/generated/ --grpcLib ../index channelz.proto"
   },
@@ -62,7 +62,8 @@
   },
   "files": [
     "src/**/*.ts",
-    "build/src/*.{js,d.ts,js.map}",
+    "build/src/**/*.{js,d.ts,js.map}",
+    "proto/*.proto",
     "LICENSE",
     "deps/envoy-api/envoy/api/v2/**/*.proto",
     "deps/envoy-api/envoy/config/**/*.proto",

packages/grpc-js/src/channel.ts

@@ -311,7 +311,7 @@ export class ChannelImplementation implements Channel {
       new MaxMessageSizeFilterFactory(this.options),
       new CompressionFilterFactory(this),
     ]);
-    this.trace('Constructed channel');
+    this.trace('Channel constructed with options ' + JSON.stringify(options, undefined, 2));
   }
 
   private getChannelzInfo(): ChannelInfo {

packages/grpc-js/src/subchannel.ts

@@ -229,7 +229,7 @@ export class Subchannel {
     this.channelzRef = registerChannelzSubchannel(this.subchannelAddressString, () => this.getChannelzInfo());
     this.channelzTrace = new ChannelzTrace();
     this.channelzTrace.addTrace('CT_INFO', 'Subchannel created');
-    this.trace('Subchannel constructed');
+    this.trace('Subchannel constructed with options ' + JSON.stringify(options, undefined, 2));
   }
 
   private getChannelzInfo(): SubchannelInfo {

run-tests.sh

@@ -28,7 +28,7 @@ cd $ROOT
 git submodule update --init --recursive
 
 if [ ! -n "$node_versions" ] ; then
-  node_versions="8 10 12"
+  node_versions="10 12 14 16"
 fi
 
 set +ex