Merge pull request #2102 from murgatroid99/grpc-js_no_unary_response

grpc-js: Report error when no message received for unary response
grpc · Apr 20, 2022 · 028047f · 028047f
2 parents fa92727 + 5311c03
commit 028047f
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/packages/grpc-js/src/client.ts b/packages/grpc-js/src/client.ts
@@ -338,7 +338,15 @@ export class Client {
         }
         receivedStatus = true;
         if (status.code === Status.OK) {
-          callProperties.callback!(null, responseMessage!);
+          if (responseMessage === null) {
+            callProperties.callback!(callErrorFromStatus({
+              code: Status.INTERNAL,
+              details: 'No message received',
+              metadata: status.metadata
+            }));
+          } else {
+            callProperties.callback!(null, responseMessage);
+          }
         } else {
           callProperties.callback!(callErrorFromStatus(status));
         }
@@ -455,7 +463,15 @@ export class Client {
         }
         receivedStatus = true;
         if (status.code === Status.OK) {
-          callProperties.callback!(null, responseMessage!);
+          if (responseMessage === null) {
+            callProperties.callback!(callErrorFromStatus({
+              code: Status.INTERNAL,
+              details: 'No message received',
+              metadata: status.metadata
+            }));
+          } else {
+            callProperties.callback!(null, responseMessage);
+          }
         } else {
           callProperties.callback!(callErrorFromStatus(status));
         }