From 2d37686a1a0e0f028acb455a630fa65e122db7ad Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Mon, 9 Jan 2023 10:18:43 -0800
Subject: [PATCH] grpc-js: Ensure ordering between status and final message

---
 packages/grpc-js/package.json           | 2 +-
 packages/grpc-js/src/subchannel-call.ts | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json
index 06707c2c..c11b4dc4 100644
--- a/packages/grpc-js/package.json
+++ b/packages/grpc-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "gRPC Library for Node - pure JS implementation",
   "homepage": "https://grpc.io/",
   "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",
diff --git a/packages/grpc-js/src/subchannel-call.ts b/packages/grpc-js/src/subchannel-call.ts
index 6556bc46..a560ed4d 100644
--- a/packages/grpc-js/src/subchannel-call.ts
+++ b/packages/grpc-js/src/subchannel-call.ts
@@ -87,6 +87,7 @@ export class Http2SubchannelCall implements SubchannelCall {
   private decoder = new StreamDecoder();
 
   private isReadFilterPending = false;
+  private isPushPending = false;
   private canPush = false;
   /**
    * Indicates that an 'end' event has come from the http2 stream, so there
@@ -360,7 +361,8 @@ export class Http2SubchannelCall implements SubchannelCall {
         this.finalStatus.code !== Status.OK ||
         (this.readsClosed &&
           this.unpushedReadMessages.length === 0 &&
-          !this.isReadFilterPending)
+          !this.isReadFilterPending &&
+          !this.isPushPending)
       ) {
         this.outputStatus();
       }
@@ -373,7 +375,9 @@ export class Http2SubchannelCall implements SubchannelCall {
         (message instanceof Buffer ? message.length : null)
     );
     this.canPush = false;
+    this.isPushPending = true;
     process.nextTick(() => {
+      this.isPushPending = false;
       /* If we have already output the status any later messages should be
        * ignored, and can cause out-of-order operation errors higher up in the
        * stack. Checking as late as possible here to avoid any race conditions.