Merge pull request #2232 from murgatroid99/grpc-js_optional_caller_stack

grpc-js: Defer evaluating caller stack until an error

Author: murgatroid99

packages/grpc-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "gRPC Library for Node - pure JS implementation",
   "homepage": "https://grpc.io/",
   "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",

packages/grpc-js/src/client.ts

@@ -108,6 +108,10 @@ export type ClientOptions = Partial<ChannelOptions> & {
   callInvocationTransformer?: CallInvocationTransformer;
 };
 
+function getErrorStackString(error: Error): string {
+  return error.stack!.split('\n').slice(1).join('\n');
+}
+
 /**
  * A generic gRPC client. Primarily useful as a base class for all generated
  * clients.
@@ -321,7 +325,7 @@ export class Client {
     }
     let responseMessage: ResponseType | null = null;
     let receivedStatus = false;
-    const callerStack = (new Error().stack!).split('\n').slice(1).join('\n');
+    const callerStackError = new Error();
     call.start(callProperties.metadata, {
       onReceiveMetadata: (metadata) => {
         emitter.emit('metadata', metadata);
@@ -340,6 +344,7 @@ export class Client {
         receivedStatus = true;
         if (status.code === Status.OK) {
           if (responseMessage === null) {
+            const callerStack = getErrorStackString(callerStackError);
             callProperties.callback!(callErrorFromStatus({
               code: Status.INTERNAL,
               details: 'No message received',
@@ -349,6 +354,7 @@ export class Client {
             callProperties.callback!(null, responseMessage);
           }
         } else {
+          const callerStack = getErrorStackString(callerStackError);
           callProperties.callback!(callErrorFromStatus(status, callerStack));
         }
         emitter.emit('status', status);
@@ -447,7 +453,7 @@ export class Client {
     }
     let responseMessage: ResponseType | null = null;
     let receivedStatus = false;
-    const callerStack = (new Error().stack!).split('\n').slice(1).join('\n');
+    const callerStackError = new Error();
     call.start(callProperties.metadata, {
       onReceiveMetadata: (metadata) => {
         emitter.emit('metadata', metadata);
@@ -466,6 +472,7 @@ export class Client {
         receivedStatus = true;
         if (status.code === Status.OK) {
           if (responseMessage === null) {
+            const callerStack = getErrorStackString(callerStackError);
             callProperties.callback!(callErrorFromStatus({
               code: Status.INTERNAL,
               details: 'No message received',
@@ -475,6 +482,7 @@ export class Client {
             callProperties.callback!(null, responseMessage);
           }
         } else {
+          const callerStack = getErrorStackString(callerStackError);
           callProperties.callback!(callErrorFromStatus(status, callerStack));
         }
         emitter.emit('status', status);
@@ -577,7 +585,7 @@ export class Client {
       call.setCredentials(callProperties.callOptions.credentials);
     }
     let receivedStatus = false;
-    const callerStack = (new Error().stack!).split('\n').slice(1).join('\n');
+    const callerStackError = new Error();
     call.start(callProperties.metadata, {
       onReceiveMetadata(metadata: Metadata) {
         stream.emit('metadata', metadata);
@@ -593,6 +601,7 @@ export class Client {
         receivedStatus = true;
         stream.push(null);
         if (status.code !== Status.OK) {
+          const callerStack = getErrorStackString(callerStackError);
           stream.emit('error', callErrorFromStatus(status, callerStack));
         }
         stream.emit('status', status);
@@ -675,7 +684,7 @@ export class Client {
       call.setCredentials(callProperties.callOptions.credentials);
     }
     let receivedStatus = false;
-    const callerStack = (new Error().stack!).split('\n').slice(1).join('\n');
+    const callerStackError = new Error();
     call.start(callProperties.metadata, {
       onReceiveMetadata(metadata: Metadata) {
         stream.emit('metadata', metadata);
@@ -690,6 +699,7 @@ export class Client {
         receivedStatus = true;
         stream.push(null);
         if (status.code !== Status.OK) {
+          const callerStack = getErrorStackString(callerStackError);
           stream.emit('error', callErrorFromStatus(status, callerStack));
         }
         stream.emit('status', status);