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

Autodetect ProtoBuf.js version in grpc.loadObject

This commit is contained in:
murgatroid99 2017-03-17 13:45:15 -07:00
parent 4a9346e332
commit 81b0110116
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
index.js
View File

@ -58,12 +58,17 @@ var protobuf_js_6_common = require('./src/protobuf_js_6_common');
grpc.setDefaultRootsPem(fs.readFileSync(SSL_ROOTS_PATH, 'ascii')); grpc.setDefaultRootsPem(fs.readFileSync(SSL_ROOTS_PATH, 'ascii'));
exports.loadObject = function loadObject(value, options) { exports.loadObject = function loadObject(value, options) {
options = _.defaults(options, {'protobufjs_version': 5}); options = _.defaults(options, common.defaultGrpcOptions);
switch (options.protobufjs_version) { if (value instanceof ProtoBuf.ReflectionObject) {
case 5: return protobuf_js_5_common.loadObject(value, options); return protobuf_js_6_common.loadObject(value, options);
case 6: return protobuf_js_6_common.loadObject(value, options); } else {
default: throw new Error('Unrecognized protobufjs_version:', /* If value is not a ProtoBuf.js 6 reflection object, we assume that it is
options.protobufjs_version); a ProtoBuf.js 5 reflection object, for backwards compatibility */
var deprecation_message = 'Calling grpc.loadObject with an object ' +
'generated by ProtoBuf.js 5 is deprecated. Please upgrade to ' +
'ProtoBuf.js 6.';
common.log(grpc.logVerbosity.INFO, deprecation_message);
return protobuf_js_5_common.loadObject(value, options);
} }
}; };
@ -108,7 +113,6 @@ exports.load = function load(filename, format, options) {
still the possibility of adding other formats that would be loaded still the possibility of adding other formats that would be loaded
differently */ differently */
options = _.defaults(options, common.defaultGrpcOptions); options = _.defaults(options, common.defaultGrpcOptions);
options.protobufjs_version = 6;
var root = new ProtoBuf.Root(); var root = new ProtoBuf.Root();
var parse_options = {keepCase: !options.convertFieldsToCamelCase}; var parse_options = {keepCase: !options.convertFieldsToCamelCase};
return loadObject(root.loadSync(applyProtoRoot(filename, root), return loadObject(root.loadSync(applyProtoRoot(filename, root),

19
test/surface_test.js
View File

@ -49,8 +49,7 @@ math_proto = math_proto.loadSync(__dirname +
var mathService = math_proto.lookup('math.Math'); var mathService = math_proto.lookup('math.Math');
var mathServiceAttrs = grpc.loadObject( var mathServiceAttrs = grpc.loadObject(
mathService, mathService, common.defaultGrpcOptions).service;
_.defaults({protobufjs_version: 6}, common.defaultGrpcOptions)).service;
/** /**
* This is used for testing functions with multiple asynchronous calls that * This is used for testing functions with multiple asynchronous calls that
@ -178,7 +177,7 @@ describe('Server.prototype.addService', function() {
beforeEach(function() { beforeEach(function() {
server.addService(mathServiceAttrs, {}); server.addService(mathServiceAttrs, {});
var port = server.bind('localhost:0', server_insecure_creds); var port = server.bind('localhost:0', server_insecure_creds);
var Client = grpc.loadObject(mathService, {protobufjs_version: 6}); var Client = grpc.loadObject(mathService);
client = new Client('localhost:' + port, client = new Client('localhost:' + port,
grpc.credentials.createInsecure()); grpc.credentials.createInsecure());
server.start(); server.start();
@ -250,7 +249,7 @@ describe('waitForClientReady', function() {
server = new grpc.Server(); server = new grpc.Server();
port = server.bind('localhost:0', grpc.ServerCredentials.createInsecure()); port = server.bind('localhost:0', grpc.ServerCredentials.createInsecure());
server.start(); server.start();
Client = grpc.loadObject(mathService, {protobufjs_version: 6}); Client = grpc.loadObject(mathService);
}); });
beforeEach(function() { beforeEach(function() {
client = new Client('localhost:' + port, grpc.credentials.createInsecure()); client = new Client('localhost:' + port, grpc.credentials.createInsecure());
@ -311,7 +310,7 @@ describe('Echo service', function() {
test_proto = test_proto.loadSync(__dirname + '/echo_service.proto', test_proto = test_proto.loadSync(__dirname + '/echo_service.proto',
{keepCase: true}); {keepCase: true});
var echo_service = test_proto.lookup('EchoService'); var echo_service = test_proto.lookup('EchoService');
var Client = grpc.loadObject(echo_service, {protobufjs_version: 6}); var Client = grpc.loadObject(echo_service);
server = new grpc.Server(); server = new grpc.Server();
server.addService(Client.service, { server.addService(Client.service, {
echo: function(call, callback) { echo: function(call, callback) {
@ -436,7 +435,7 @@ describe('Echo metadata', function() {
test_proto = test_proto.loadSync(__dirname + '/test_service.proto', test_proto = test_proto.loadSync(__dirname + '/test_service.proto',
{keepCase: true}); {keepCase: true});
var test_service = test_proto.lookup('TestService'); var test_service = test_proto.lookup('TestService');
var Client = grpc.loadObject(test_service, {protobufjs_version: 6}); var Client = grpc.loadObject(test_service);
server = new grpc.Server(); server = new grpc.Server();
server.addService(Client.service, { server.addService(Client.service, {
unary: function(call, cb) { unary: function(call, cb) {
@ -595,7 +594,7 @@ describe('Client malformed response handling', function() {
} }
}); });
var port = server.bind('localhost:0', server_insecure_creds); var port = server.bind('localhost:0', server_insecure_creds);
var Client = grpc.loadObject(test_service, {protobufjs_version: 6}); var Client = grpc.loadObject(test_service);
client = new Client('localhost:' + port, grpc.credentials.createInsecure()); client = new Client('localhost:' + port, grpc.credentials.createInsecure());
server.start(); server.start();
}); });
@ -704,7 +703,7 @@ describe('Server serialization failure handling', function() {
} }
}); });
var port = server.bind('localhost:0', server_insecure_creds); var port = server.bind('localhost:0', server_insecure_creds);
var Client = grpc.loadObject(test_service, {protobufjs_version: 6}); var Client = grpc.loadObject(test_service);
client = new Client('localhost:' + port, grpc.credentials.createInsecure()); client = new Client('localhost:' + port, grpc.credentials.createInsecure());
server.start(); server.start();
}); });
@ -757,7 +756,7 @@ describe('Other conditions', function() {
test_proto = test_proto.loadSync(__dirname + '/test_service.proto', test_proto = test_proto.loadSync(__dirname + '/test_service.proto',
{keepCase: true}); {keepCase: true});
test_service = test_proto.lookup('TestService'); test_service = test_proto.lookup('TestService');
Client = grpc.loadObject(test_service, {protobufjs_version: 6}); Client = grpc.loadObject(test_service);
server = new grpc.Server(); server = new grpc.Server();
var trailer_metadata = new grpc.Metadata(); var trailer_metadata = new grpc.Metadata();
trailer_metadata.add('trailer-present', 'yes'); trailer_metadata.add('trailer-present', 'yes');
@ -1106,7 +1105,7 @@ describe('Call propagation', function() {
{keepCase: true}); {keepCase: true});
test_service = test_proto.lookup('TestService'); test_service = test_proto.lookup('TestService');
server = new grpc.Server(); server = new grpc.Server();
Client = grpc.loadObject(test_service, {protobufjs_version: 6}); Client = grpc.loadObject(test_service);
server.addService(Client.service, { server.addService(Client.service, {
unary: function(call) {}, unary: function(call) {},
clientStream: function(stream) {}, clientStream: function(stream) {},