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 #204 from arcana261/master 

stronger checking for functions in client.js
This commit is contained in:
Michael Lumish 2018-03-06 14:26:37 -08:00 committed by GitHub
parent ed2a048161 232ff022ab
commit 227c095c66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/grpc-native-core/src/client.js
View File

@ -429,7 +429,7 @@ exports.Client = Client;
Client.prototype.makeUnaryRequest = function(path, serialize, deserialize,
argument, metadata, options,
callback) {
if (options instanceof Function) {
if (_.isFunction(options)) {
callback = options;
if (metadata instanceof Metadata) {
options = {};
@ -437,7 +437,7 @@ Client.prototype.makeUnaryRequest = function(path, serialize, deserialize,
options = metadata;
metadata = new Metadata();
}
} else if (metadata instanceof Function) {
} else if (_.isFunction(metadata)) {
callback = metadata;
metadata = new Metadata();
options = {};
@ -450,7 +450,7 @@ Client.prototype.makeUnaryRequest = function(path, serialize, deserialize,
}
if (!((metadata instanceof Metadata) &&
(options instanceof Object) &&
(callback instanceof Function))) {
(_.isFunction(callback)))) {
throw new Error('Argument mismatch in makeUnaryRequest');
}
@ -508,7 +508,7 @@ Client.prototype.makeUnaryRequest = function(path, serialize, deserialize,
Client.prototype.makeClientStreamRequest = function(path, serialize,
deserialize, metadata,
options, callback) {
if (options instanceof Function) {
if (_.isFunction(options)) {
callback = options;
if (metadata instanceof Metadata) {
options = {};
@ -516,7 +516,7 @@ Client.prototype.makeClientStreamRequest = function(path, serialize,
options = metadata;
metadata = new Metadata();
}
} else if (metadata instanceof Function) {
} else if (_.isFunction(metadata)) {
callback = metadata;
metadata = new Metadata();
options = {};
@ -529,7 +529,7 @@ Client.prototype.makeClientStreamRequest = function(path, serialize,
}
if (!((metadata instanceof Metadata) &&
(options instanceof Object) &&
(callback instanceof Function))) {
(_.isFunction(callback)))) {
throw new Error('Argument mismatch in makeClientStreamRequest');
}