Merge pull request #2683 from murgatroid99/grpc-js_server_event_order

grpc-js: Rearrange some function calls to revert event order changes
grpc · Mar 7, 2024 · 55b9852 · 55b9852
2 parents cb966df + 07ee52a
commit 55b9852
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/grpc-js/src/server-call.ts b/packages/grpc-js/src/server-call.ts
@@ -200,11 +200,11 @@ export class ServerWritableStreamImpl<RequestType, ResponseType>
   }
 
   _final(callback: Function): void {
+    callback(null);
     this.call.sendStatus({
       ...this.pendingStatus,
       metadata: this.pendingStatus.metadata ?? this.trailingMetadata,
     });
-    callback(null);
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -273,11 +273,11 @@ export class ServerDuplexStreamImpl<RequestType, ResponseType>
   }
 
   _final(callback: Function): void {
+    callback(null);
     this.call.sendStatus({
       ...this.pendingStatus,
       metadata: this.pendingStatus.metadata ?? this.trailingMetadata,
     });
-    callback(null);
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

diff --git a/packages/grpc-js/src/server-interceptors.ts b/packages/grpc-js/src/server-interceptors.ts
@@ -842,7 +842,6 @@ export class BaseServerInterceptingCall
     if (this.checkCancelled()) {
       return;
     }
-    this.notifyOnCancel();
 
     trace(
       'Request to method ' +
@@ -869,8 +868,11 @@ export class BaseServerInterceptingCall
           };
 
           this.stream.sendTrailers(trailersToSend);
+          this.notifyOnCancel();
         });
         this.stream.end();
+      } else {
+        this.notifyOnCancel();
       }
     } else {
       if (this.callEventTracker && !this.streamEnded) {
@@ -886,6 +888,7 @@ export class BaseServerInterceptingCall
         ...status.metadata?.toHttp2Headers(),
       };
       this.stream.respond(trailersToSend, { endStream: true });
+      this.notifyOnCancel();
     }
   }
   startRead(): void {