Merge pull request #1761 from zereraz/master

grpc-js: stricter function check than instanceof
grpc · Apr 27, 2021 · d82b1a3 · d82b1a3
2 parents d35fa3a + 923b44b
commit d82b1a3
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/packages/grpc-js/src/client.ts b/packages/grpc-js/src/client.ts
@@ -55,6 +55,10 @@ const INTERCEPTOR_SYMBOL = Symbol();
 const INTERCEPTOR_PROVIDER_SYMBOL = Symbol();
 const CALL_INVOCATION_TRANSFORMER_SYMBOL = Symbol();
 
+function isFunction<ResponseType>(arg: Metadata | CallOptions | UnaryCallback<ResponseType> | undefined): arg is UnaryCallback<ResponseType>{
+  return Object.prototype.toString.call(arg) === '[object Function]'
+}
+
 export interface UnaryCallback<ResponseType> {
   (err: ServiceError | null, value?: ResponseType): void;
 }
@@ -198,9 +202,9 @@ export class Client {
     options: CallOptions;
     callback: UnaryCallback<ResponseType>;
   } {
-    if (arg1 instanceof Function) {
+    if (isFunction(arg1)) {
       return { metadata: new Metadata(), options: {}, callback: arg1 };
-    } else if (arg2 instanceof Function) {
+    } else if (isFunction(arg2)) {
       if (arg1 instanceof Metadata) {
         return { metadata: arg1, options: {}, callback: arg2 };
       } else {
@@ -211,7 +215,7 @@ export class Client {
         !(
           arg1 instanceof Metadata &&
           arg2 instanceof Object &&
-          arg3 instanceof Function
+          isFunction(arg3)
         )
       ) {
         throw new Error('Incorrect arguments passed');
@@ -671,3 +675,4 @@ export class Client {
     return stream;
   }
 }
+