From 01823377be02b78869c92d8c147944a1b789139b Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Thu, 28 Apr 2022 10:34:30 -0700
Subject: [PATCH] grpc-js: Add calling context to call errors

---
 packages/grpc-js/src/call.ts   |  6 ++++--
 packages/grpc-js/src/client.ts | 16 ++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/grpc-js/src/call.ts b/packages/grpc-js/src/call.ts
index fcc3159d..10b606a4 100644
--- a/packages/grpc-js/src/call.ts
+++ b/packages/grpc-js/src/call.ts
@@ -76,9 +76,11 @@ export type ClientDuplexStream<
  * error is not necessarily a problem in gRPC itself.
  * @param status
  */
-export function callErrorFromStatus(status: StatusObject): ServiceError {
+export function callErrorFromStatus(status: StatusObject, callerStack: string): ServiceError {
   const message = `${status.code} ${Status[status.code]}: ${status.details}`;
-  return Object.assign(new Error(message), status);
+  const error = new Error(message);
+  const stack = `${error.stack}\nfor call at\n${callerStack}`;
+  return Object.assign(new Error(message), status, {stack});
 }
 
 export class ClientUnaryCallImpl
diff --git a/packages/grpc-js/src/client.ts b/packages/grpc-js/src/client.ts
index 20f56bcb..747c5c87 100644
--- a/packages/grpc-js/src/client.ts
+++ b/packages/grpc-js/src/client.ts
@@ -321,6 +321,7 @@ export class Client {
     }
     let responseMessage: ResponseType | null = null;
     let receivedStatus = false;
+    const callerStack = (new Error().stack!).split('\n').slice(1).join('\n');
     call.start(callProperties.metadata, {
       onReceiveMetadata: (metadata) => {
         emitter.emit('metadata', metadata);
@@ -343,12 +344,12 @@ export class Client {
               code: Status.INTERNAL,
               details: 'No message received',
               metadata: status.metadata
-            }));
+            }, callerStack));
           } else {
             callProperties.callback!(null, responseMessage);
           }
         } else {
-          callProperties.callback!(callErrorFromStatus(status));
+          callProperties.callback!(callErrorFromStatus(status, callerStack));
         }
         emitter.emit('status', status);
       },
@@ -446,6 +447,7 @@ export class Client {
     }
     let responseMessage: ResponseType | null = null;
     let receivedStatus = false;
+    const callerStack = (new Error().stack!).split('\n').slice(1).join('\n');
     call.start(callProperties.metadata, {
       onReceiveMetadata: (metadata) => {
         emitter.emit('metadata', metadata);
@@ -468,12 +470,12 @@ export class Client {
               code: Status.INTERNAL,
               details: 'No message received',
               metadata: status.metadata
-            }));
+            }, callerStack));
           } else {
             callProperties.callback!(null, responseMessage);
           }
         } else {
-          callProperties.callback!(callErrorFromStatus(status));
+          callProperties.callback!(callErrorFromStatus(status, callerStack));
         }
         emitter.emit('status', status);
       },
@@ -575,6 +577,7 @@ export class Client {
       call.setCredentials(callProperties.callOptions.credentials);
     }
     let receivedStatus = false;
+    const callerStack = (new Error().stack!).split('\n').slice(1).join('\n');
     call.start(callProperties.metadata, {
       onReceiveMetadata(metadata: Metadata) {
         stream.emit('metadata', metadata);
@@ -590,7 +593,7 @@ export class Client {
         receivedStatus = true;
         stream.push(null);
         if (status.code !== Status.OK) {
-          stream.emit('error', callErrorFromStatus(status));
+          stream.emit('error', callErrorFromStatus(status, callerStack));
         }
         stream.emit('status', status);
       },
@@ -672,6 +675,7 @@ export class Client {
       call.setCredentials(callProperties.callOptions.credentials);
     }
     let receivedStatus = false;
+    const callerStack = (new Error().stack!).split('\n').slice(1).join('\n');
     call.start(callProperties.metadata, {
       onReceiveMetadata(metadata: Metadata) {
         stream.emit('metadata', metadata);
@@ -686,7 +690,7 @@ export class Client {
         receivedStatus = true;
         stream.push(null);
         if (status.code !== Status.OK) {
-          stream.emit('error', callErrorFromStatus(status));
+          stream.emit('error', callErrorFromStatus(status, callerStack));
         }
         stream.emit('status', status);
       },