From 0a8a720c84f5da4c7300fe60cf8b4877fab881b7 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Tue, 27 Nov 2018 13:51:16 -0800 Subject: [PATCH 1/9] Native: update to 1.17.0-pre1 --- packages/grpc-native-core/binding.gyp | 9 ++++----- packages/grpc-native-core/build.yaml | 1 + packages/grpc-native-core/deps/grpc | 2 +- packages/grpc-native-core/package.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index 1556881c..9b4c0e8e 100644 --- a/packages/grpc-native-core/binding.gyp +++ b/packages/grpc-native-core/binding.gyp @@ -91,7 +91,7 @@ 'GPR_BACKWARDS_COMPATIBILITY_MODE', 'GRPC_ARES=0', 'GRPC_UV', - 'GRPC_NODE_VERSION="1.17.0-dev"' + 'GRPC_NODE_VERSION="1.17.0-pre1"' ], 'conditions': [ ['grpc_gcov=="true"', { @@ -772,6 +772,7 @@ 'deps/grpc/src/core/lib/transport/timeout_encoding.cc', 'deps/grpc/src/core/lib/transport/transport.cc', 'deps/grpc/src/core/lib/transport/transport_op_string.cc', + 'deps/grpc/src/core/lib/uri/uri_parser.cc', 'deps/grpc/src/core/lib/debug/trace.cc', 'deps/grpc/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc', 'deps/grpc/src/core/ext/transport/chttp2/transport/bin_decoder.cc', @@ -844,7 +845,7 @@ 'deps/grpc/src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc', 'deps/grpc/src/core/tsi/alts/frame_protector/frame_handler.cc', 'deps/grpc/src/core/tsi/alts/handshaker/alts_handshaker_client.cc', - 'deps/grpc/src/core/tsi/alts/handshaker/alts_tsi_event.cc', + 'deps/grpc/src/core/tsi/alts/handshaker/alts_shared_resource.cc', 'deps/grpc/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc', 'deps/grpc/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc', 'deps/grpc/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc', @@ -886,19 +887,17 @@ 'deps/grpc/src/core/ext/filters/client_channel/lb_policy.cc', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy_factory.cc', 'deps/grpc/src/core/ext/filters/client_channel/lb_policy_registry.cc', - 'deps/grpc/src/core/ext/filters/client_channel/method_params.cc', 'deps/grpc/src/core/ext/filters/client_channel/parse_address.cc', 'deps/grpc/src/core/ext/filters/client_channel/proxy_mapper.cc', 'deps/grpc/src/core/ext/filters/client_channel/proxy_mapper_registry.cc', 'deps/grpc/src/core/ext/filters/client_channel/resolver.cc', 'deps/grpc/src/core/ext/filters/client_channel/resolver_registry.cc', + 'deps/grpc/src/core/ext/filters/client_channel/resolver_result_parsing.cc', 'deps/grpc/src/core/ext/filters/client_channel/retry_throttle.cc', 'deps/grpc/src/core/ext/filters/client_channel/subchannel.cc', 'deps/grpc/src/core/ext/filters/client_channel/subchannel_index.cc', - 'deps/grpc/src/core/ext/filters/client_channel/uri_parser.cc', 'deps/grpc/src/core/ext/filters/deadline/deadline_filter.cc', 'deps/grpc/src/core/ext/filters/client_channel/health/health.pb.c', - 'deps/grpc/src/core/tsi/alts_transport_security.cc', 'deps/grpc/src/core/tsi/fake_transport_security.cc', 'deps/grpc/src/core/tsi/local_transport_security.cc', 'deps/grpc/src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc', diff --git a/packages/grpc-native-core/build.yaml b/packages/grpc-native-core/build.yaml index 49e36fdf..34149f49 100644 --- a/packages/grpc-native-core/build.yaml +++ b/packages/grpc-native-core/build.yaml @@ -1,2 +1,3 @@ settings: '#': It's possible to have node_version here as a key to override the core's version. + node_version: 1.17.0-pre1 diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index 4139ff89..802d89fa 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit 4139ff895fd413c730c4383d24d13a17bbeaea90 +Subproject commit 802d89fa59f77db60ab9e27d0145f986e62dbcf7 diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index 8caf09db..6c0dd8d2 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.17.0-dev", + "version": "1.17.0-pre1", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/", From bbd5bd8f7ce059c59bc2d32cc35ca17271528370 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Thu, 6 Dec 2018 17:22:14 -0800 Subject: [PATCH 2/9] Native: Protobuf.js 6 loadObject: switch to mappable methodsArray --- packages/grpc-native-core/src/protobuf_js_6_common.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/grpc-native-core/src/protobuf_js_6_common.js b/packages/grpc-native-core/src/protobuf_js_6_common.js index af3d4c04..a08b988e 100644 --- a/packages/grpc-native-core/src/protobuf_js_6_common.js +++ b/packages/grpc-native-core/src/protobuf_js_6_common.js @@ -104,9 +104,9 @@ exports.getProtobufServiceAttrs = function getProtobufServiceAttrs(service, options) { var prefix = '/' + fullyQualifiedName(service) + '/'; service.resolveAll(); - return common.zipObject(service.methods.map(function(method) { + return common.zipObject(service.methodsArray.map(function(method) { return camelCase(method.name); - }), service.methods.map(function(method) { + }), service.methodsArray.map(function(method) { return { originalName: method.name, path: prefix + method.name, From f45dda46afad06afa308ba4ff5d914d2cdedb2de Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Fri, 7 Dec 2018 10:16:16 -0800 Subject: [PATCH 3/9] Native: Protobuf.js 6 loadObject: switch to nestedArray --- packages/grpc-native-core/src/protobuf_js_6_common.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/grpc-native-core/src/protobuf_js_6_common.js b/packages/grpc-native-core/src/protobuf_js_6_common.js index a08b988e..bbc392ad 100644 --- a/packages/grpc-native-core/src/protobuf_js_6_common.js +++ b/packages/grpc-native-core/src/protobuf_js_6_common.js @@ -135,11 +135,10 @@ exports.loadObject = function loadObject(value, options) { return client.makeClientConstructor(service_attrs); } - if (value.hasOwnProperty('nested')) { + if (value.hasOwnProperty('nestedArray')) { // It's a namespace or root object - Object.keys(value.nested).forEach(name => { - const nested = value.nested[name]; - result[name] = loadObject(nested, options); + value.nestedArray.forEach(nested => { + result[nested.name] = loadObject(nested, options); }); return result; } From da052f467de9ec022caa21e60c7bfaea35469919 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Fri, 7 Dec 2018 10:57:21 -0800 Subject: [PATCH 4/9] Bump version to 1.17.0-pre2 and bump submodule --- packages/grpc-native-core/binding.gyp | 2 +- packages/grpc-native-core/build.yaml | 2 +- packages/grpc-native-core/deps/grpc | 2 +- packages/grpc-native-core/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index 9b4c0e8e..a14a5f9c 100644 --- a/packages/grpc-native-core/binding.gyp +++ b/packages/grpc-native-core/binding.gyp @@ -91,7 +91,7 @@ 'GPR_BACKWARDS_COMPATIBILITY_MODE', 'GRPC_ARES=0', 'GRPC_UV', - 'GRPC_NODE_VERSION="1.17.0-pre1"' + 'GRPC_NODE_VERSION="1.17.0-pre2"' ], 'conditions': [ ['grpc_gcov=="true"', { diff --git a/packages/grpc-native-core/build.yaml b/packages/grpc-native-core/build.yaml index 34149f49..adf1bb76 100644 --- a/packages/grpc-native-core/build.yaml +++ b/packages/grpc-native-core/build.yaml @@ -1,3 +1,3 @@ settings: '#': It's possible to have node_version here as a key to override the core's version. - node_version: 1.17.0-pre1 + node_version: 1.17.0-pre2 diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index 802d89fa..8d4f9c46 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit 802d89fa59f77db60ab9e27d0145f986e62dbcf7 +Subproject commit 8d4f9c4654ab4b0c670527599871530e2258e76d diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index 6c0dd8d2..19262126 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.17.0-pre1", + "version": "1.17.0-pre2", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/", From effeba7e78d73032ca35597a084d6ad3db170b1a Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Tue, 11 Dec 2018 10:53:47 -0800 Subject: [PATCH 5/9] Native: Protobuf.js 6: use nested again --- packages/grpc-native-core/src/protobuf_js_6_common.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/grpc-native-core/src/protobuf_js_6_common.js b/packages/grpc-native-core/src/protobuf_js_6_common.js index bbc392ad..6fbeeeff 100644 --- a/packages/grpc-native-core/src/protobuf_js_6_common.js +++ b/packages/grpc-native-core/src/protobuf_js_6_common.js @@ -135,11 +135,13 @@ exports.loadObject = function loadObject(value, options) { return client.makeClientConstructor(service_attrs); } - if (value.hasOwnProperty('nestedArray')) { + if (value.hasOwnProperty('nested')) { // It's a namespace or root object - value.nestedArray.forEach(nested => { - result[nested.name] = loadObject(nested, options); - }); + if (value.nested !== null && value.nested !== undefined) { + Object.values(value.nested).forEach(nested => { + result[nested.name] = loadObject(nested, options); + }); + } return result; } From b60928ee4ea8acd8d14c82f88b863bda88bff1f5 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Tue, 11 Dec 2018 23:37:22 +0100 Subject: [PATCH 6/9] Bumping to pre3... --- packages/grpc-native-core/binding.gyp | 2 +- packages/grpc-native-core/build.yaml | 2 +- packages/grpc-native-core/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index a14a5f9c..ea4436a5 100644 --- a/packages/grpc-native-core/binding.gyp +++ b/packages/grpc-native-core/binding.gyp @@ -91,7 +91,7 @@ 'GPR_BACKWARDS_COMPATIBILITY_MODE', 'GRPC_ARES=0', 'GRPC_UV', - 'GRPC_NODE_VERSION="1.17.0-pre2"' + 'GRPC_NODE_VERSION="1.17.0-pre3"' ], 'conditions': [ ['grpc_gcov=="true"', { diff --git a/packages/grpc-native-core/build.yaml b/packages/grpc-native-core/build.yaml index adf1bb76..c87865a3 100644 --- a/packages/grpc-native-core/build.yaml +++ b/packages/grpc-native-core/build.yaml @@ -1,3 +1,3 @@ settings: '#': It's possible to have node_version here as a key to override the core's version. - node_version: 1.17.0-pre2 + node_version: 1.17.0-pre3 diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index 19262126..19f043a8 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.17.0-pre2", + "version": "1.17.0-pre3", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/", From f3b22bcbc0a3aa348ed4ff85aefaecb5cbe19f04 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Wed, 12 Dec 2018 22:45:52 +0100 Subject: [PATCH 7/9] Fix for node 6. --- packages/grpc-native-core/src/protobuf_js_6_common.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/grpc-native-core/src/protobuf_js_6_common.js b/packages/grpc-native-core/src/protobuf_js_6_common.js index 6fbeeeff..66cebd61 100644 --- a/packages/grpc-native-core/src/protobuf_js_6_common.js +++ b/packages/grpc-native-core/src/protobuf_js_6_common.js @@ -138,8 +138,9 @@ exports.loadObject = function loadObject(value, options) { if (value.hasOwnProperty('nested')) { // It's a namespace or root object if (value.nested !== null && value.nested !== undefined) { - Object.values(value.nested).forEach(nested => { - result[nested.name] = loadObject(nested, options); + var values = Object.keys(value.nested).map(key => value.nested[key]); + values.forEach(nested => { + result[nested.name] = loadObject(nested, options); }); } return result; From 03a79e5e7e60ecfd13dfb4cda506e0848e45f99c Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Wed, 12 Dec 2018 22:56:42 +0100 Subject: [PATCH 8/9] Bumping to pre4. --- packages/grpc-native-core/binding.gyp | 2 +- packages/grpc-native-core/build.yaml | 2 +- packages/grpc-native-core/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index ea4436a5..34a49d38 100644 --- a/packages/grpc-native-core/binding.gyp +++ b/packages/grpc-native-core/binding.gyp @@ -91,7 +91,7 @@ 'GPR_BACKWARDS_COMPATIBILITY_MODE', 'GRPC_ARES=0', 'GRPC_UV', - 'GRPC_NODE_VERSION="1.17.0-pre3"' + 'GRPC_NODE_VERSION="1.17.0-pre4"' ], 'conditions': [ ['grpc_gcov=="true"', { diff --git a/packages/grpc-native-core/build.yaml b/packages/grpc-native-core/build.yaml index c87865a3..30fd25f4 100644 --- a/packages/grpc-native-core/build.yaml +++ b/packages/grpc-native-core/build.yaml @@ -1,3 +1,3 @@ settings: '#': It's possible to have node_version here as a key to override the core's version. - node_version: 1.17.0-pre3 + node_version: 1.17.0-pre4 diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index 19f043a8..e6939432 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.17.0-pre3", + "version": "1.17.0-pre4", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/", From d9eee9bdd038ed88a8d1279cd7cd5080ac177ae8 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Thu, 13 Dec 2018 20:38:21 +0100 Subject: [PATCH 9/9] Bumping to 1.17.0 --- packages/grpc-native-core/binding.gyp | 2 +- packages/grpc-native-core/build.yaml | 2 +- packages/grpc-native-core/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index 34a49d38..dc96bbaf 100644 --- a/packages/grpc-native-core/binding.gyp +++ b/packages/grpc-native-core/binding.gyp @@ -91,7 +91,7 @@ 'GPR_BACKWARDS_COMPATIBILITY_MODE', 'GRPC_ARES=0', 'GRPC_UV', - 'GRPC_NODE_VERSION="1.17.0-pre4"' + 'GRPC_NODE_VERSION="1.17.0"' ], 'conditions': [ ['grpc_gcov=="true"', { diff --git a/packages/grpc-native-core/build.yaml b/packages/grpc-native-core/build.yaml index 30fd25f4..45d905d3 100644 --- a/packages/grpc-native-core/build.yaml +++ b/packages/grpc-native-core/build.yaml @@ -1,3 +1,3 @@ settings: '#': It's possible to have node_version here as a key to override the core's version. - node_version: 1.17.0-pre4 + node_version: 1.17.0 diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index e6939432..994359ec 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.17.0-pre4", + "version": "1.17.0", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/",