grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1648 from murgatroid99/grpc-js_deadline_filter_fast_cancel 

grpc-js: End calls faster if the deadline has already passed
This commit is contained in:
Michael Lumish 2021-01-07 12:55:49 -08:00 committed by GitHub
parent fe4bd2641a 21da990cb0
commit 0b026be131
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grpc-js/package.json
View File

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

12
packages/grpc-js/src/deadline-filter.ts
View File

@ -56,10 +56,14 @@ export class DeadlineFilter extends BaseFilter implements Filter {
} }
const now: number = new Date().getTime(); const now: number = new Date().getTime();
let timeout = this.deadline - now; let timeout = this.deadline - now;
if (timeout < 0) { if (timeout <= 0) {
timeout = 0; process.nextTick(() => {
} callStream.cancelWithStatus(
if (this.deadline !== Infinity) { Status.DEADLINE_EXCEEDED,
'Deadline exceeded'
);
});
} else if (this.deadline !== Infinity) {
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
callStream.cancelWithStatus( callStream.cancelWithStatus(
Status.DEADLINE_EXCEEDED, Status.DEADLINE_EXCEEDED,