fix: make pipelining limit work for h2

nodejs · Feb 28, 2024 · b17acad · b17acad
1 parent 861f782
commit b17acad
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/lib/dispatcher/client.js b/lib/dispatcher/client.js
@@ -66,6 +66,13 @@ const connectH2 = require('./client-h2.js')
 
 const kClosedResolve = Symbol('kClosedResolve')
 
+function getPipelining (client) {
+  return client[kPipelining] ??
+    (client[kHTTPContext]?.version === 'h2' ? Infinity : null) ??
+    (client[kHTTPContext]?.version === 'h1' ? 1 : null) ??
+    0
+}
+
 /**
  * @type {import('../../types/client.js').default}
  */
@@ -213,7 +220,7 @@ class Client extends DispatcherBase {
     this[kUrl] = util.parseOrigin(url)
     this[kConnector] = connect
     this[kSocket] = null
-    this[kPipelining] = pipelining != null ? pipelining : 1
+    this[kPipelining] = pipelining
     this[kMaxHeadersSize] = maxHeaderSize || http.maxHeaderSize
     this[kKeepAliveDefaultTimeout] = keepAliveTimeout == null ? 4e3 : keepAliveTimeout
     this[kKeepAliveMaxTimeout] = keepAliveMaxTimeout == null ? 600e3 : keepAliveMaxTimeout
@@ -280,7 +287,7 @@ class Client extends DispatcherBase {
     const socket = this[kSocket]
     return (
       (socket && (socket[kReset] || socket[kWriting] || socket[kBlocking])) ||
-      (this[kSize] >= (this[kPipelining] || 1)) ||
+      (this[kSize] >= getPipelining(this)) ||
       this[kPending] > 0
     )
   }
@@ -564,10 +571,8 @@ function _resume (client, sync) {
       return
     }
 
-    if (client[kHTTPContext]?.version === 'h1') {
-      if (client[kRunning] >= (client[kPipelining] || 1)) {
-        return
-      }
+    if (client[kRunning] >= getPipelining(client)) {
+      return
     }
 
     const request = client[kQueue][client[kPendingIdx]]