grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #696 from grpc/grpc@1.17.x 

1.17.x upmerge to master
This commit is contained in:
Nicolas Noble 2019-01-07 23:07:44 -08:00 committed by GitHub
parent 22a04a4bf1 e029551c31
commit 7cc5286e60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/grpc-native-core/binding.gyp
View File

@ -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"'
],
'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',

1
packages/grpc-native-core/build.yaml
View File

@ -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

2
packages/grpc-native-core/deps/grpc

@ -1 +1 @@
Subproject commit 4139ff895fd413c730c4383d24d13a17bbeaea90
Subproject commit 8d4f9c4654ab4b0c670527599871530e2258e76d

2
packages/grpc-native-core/package.json
View File

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

14
packages/grpc-native-core/src/protobuf_js_6_common.js
View File

@ -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,
@ -137,10 +137,12 @@ exports.loadObject = function loadObject(value, options) {
if (value.hasOwnProperty('nested')) {
// It's a namespace or root object
Object.keys(value.nested).forEach(name => {
const nested = value.nested[name];
result[name] = loadObject(nested, options);
});
if (value.nested !== null && value.nested !== undefined) {
var values = Object.keys(value.nested).map(key => value.nested[key]);
values.forEach(nested => {
result[nested.name] = loadObject(nested, options);
});
}
return result;
}