From 7a92e7cd1960b372b1e24b55035cfc68ad72c704 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 12 Nov 2018 22:16:15 -0800 Subject: [PATCH 1/2] refactor: drop usage of _.bind --- packages/grpc-native-core/src/server.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/grpc-native-core/src/server.js b/packages/grpc-native-core/src/server.js index 9f1715e0..ab3a95de 100644 --- a/packages/grpc-native-core/src/server.js +++ b/packages/grpc-native-core/src/server.js @@ -871,14 +871,15 @@ Server.prototype.addService = function(service, implementation) { if (!_.isObject(service) || !_.isObject(implementation)) { throw new Error('addService requires two objects as arguments'); } - if (_.keys(service).length === 0) { + if (Object.keys(service).length === 0) { throw new Error('Cannot add an empty service to a server'); } if (this.started) { throw new Error('Can\'t add a service to a started server.'); } var self = this; - _.forOwn(service, function(attrs, name) { + Object.keys(service).forEach(key => { + const attrs = service[key]; var method_type; if (attrs.requestStream) { if (attrs.responseStream) { @@ -903,10 +904,10 @@ Server.prototype.addService = function(service, implementation) { ' for ' + attrs.path + ' expected but not provided'); impl = defaultHandler[method_type]; } else { - impl = _.bind(implementation[attrs.originalName], implementation); + impl = implementation[attrs.originalName].bind(implementation); } } else { - impl = _.bind(implementation[name], implementation); + impl = implementation[name].bind(implementation); } var serialize = attrs.responseSerialize; var deserialize = attrs.requestDeserialize; From 69882cb5f690b319b7f06ccb1271e220aa00b2fb Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 13 Nov 2018 10:06:23 -0800 Subject: [PATCH 2/2] fixy --- packages/grpc-native-core/src/server.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/grpc-native-core/src/server.js b/packages/grpc-native-core/src/server.js index ab3a95de..5cd1b641 100644 --- a/packages/grpc-native-core/src/server.js +++ b/packages/grpc-native-core/src/server.js @@ -871,15 +871,14 @@ Server.prototype.addService = function(service, implementation) { if (!_.isObject(service) || !_.isObject(implementation)) { throw new Error('addService requires two objects as arguments'); } - if (Object.keys(service).length === 0) { + if (_.keys(service).length === 0) { throw new Error('Cannot add an empty service to a server'); } if (this.started) { throw new Error('Can\'t add a service to a started server.'); } var self = this; - Object.keys(service).forEach(key => { - const attrs = service[key]; + _.forOwn(service, function(attrs, name) { var method_type; if (attrs.requestStream) { if (attrs.responseStream) {