Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: grpc/grpc-node
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: @grpc/grpc-js@1.9.12
Choose a base ref
...
head repository: grpc/grpc-node
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: @grpc/grpc-js@1.9.13
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 1, 2023

  1. grpc-js: Fix call ref timer handling

    @murgatroid99
    murgatroid99 committed Dec 1, 2023
    Copy the full SHA
    4dfd8c4 View commit details

Commits on Dec 12, 2023

  1. Merge pull request #2626 from murgatroid99/grpc-js_call_timer_ref_fix 

    grpc-js: Fix call ref timer handling
    @murgatroid99
    murgatroid99 authored Dec 12, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9890d59 View commit details
Showing with 10 additions and 5 deletions.
  1. +1 −1 packages/grpc-js/package.json
  2. +9 −4 packages/grpc-js/src/internal-channel.ts
2 changes: 1 addition & 1 deletion packages/grpc-js/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@grpc/grpc-js",
"version": "1.9.12",
"version": "1.9.13",
"description": "gRPC Library for Node - pure JS implementation",
"homepage": "https://grpc.io/",
"repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",
13 changes: 9 additions & 4 deletions packages/grpc-js/src/internal-channel.ts
View file
Original file line number Diff line number Diff line change
@@ -296,7 +296,9 @@ export class InternalChannel {
this.currentPicker = picker;
const queueCopy = this.pickQueue.slice();
this.pickQueue = [];
this.callRefTimerUnref();
if (queueCopy.length > 0) {
this.callRefTimerUnref();
}
for (const call of queueCopy) {
call.doPick();
}
@@ -349,11 +351,12 @@ export class InternalChannel {
process.nextTick(() => {
const localQueue = this.configSelectionQueue;
this.configSelectionQueue = [];
this.callRefTimerUnref();
if (localQueue.length > 0) {
this.callRefTimerUnref();
}
for (const call of localQueue) {
call.getConfig();
}
this.configSelectionQueue = [];
});
},
status => {
@@ -380,7 +383,9 @@ export class InternalChannel {
}
const localQueue = this.configSelectionQueue;
this.configSelectionQueue = [];
this.callRefTimerUnref();
if (localQueue.length > 0) {
this.callRefTimerUnref();
}
for (const call of localQueue) {
call.reportResolverError(status);
}