stream: add readableDidRead

ronag · ronag · commit f0201c1ec4ed · 2021-08-23T15:46:16.000+02:00
Adds readableDidRead to streams and applies usage to http, http2 and quic. PR-URL: nodejs#36820 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
diff --git a/lib/_http_incoming.js b/lib/_http_incoming.js
@@ -87,6 +87,7 @@ function IncomingMessage(socket) {
   this.statusMessage = null;
   this.client = socket;
 
+  // TODO: Deprecate and remove.
   this._consuming = false;
   // Flag for when we decide that this message cannot possibly be
   // read by the user, so there's no point continuing to handle it.
diff --git a/lib/_http_server.js b/lib/_http_server.js
@@ -804,7 +804,7 @@ function resOnFinish(req, res, socket, state, server) {
   // If the user never called req.read(), and didn't pipe() or
   // .resume() or .on('data'), then we call req._dump() so that the
   // bytes will be pulled off the wire.
-  if (!req._consuming && !req._readableState.resumeScheduled)
+  if (!req.readableDidRead)
     req._dump();
 
   // Make sure the requestTimeout is cleared before finishing.
diff --git a/lib/internal/streams/readable.js b/lib/internal/streams/readable.js
@@ -527,6 +527,8 @@ Readable.prototype.read = function(n) {
     this.emit('data', ret);
   }
 
+  state.didRead = true;
+
   return ret;
 };
 
@@ -830,7 +832,9 @@ function pipeOnDrain(src, dest) {
 
     if ((!state.awaitDrainWriters || state.awaitDrainWriters.size === 0) &&
       EE.listenerCount(src, 'data')) {
+      // TODO(ronag): Call resume() instead?
       state.flowing = true;
+      state.didRead = true;
       flow(src);
     }
   };
@@ -978,6 +982,7 @@ Readable.prototype.resume = function() {
 function resume(stream, state) {
   if (!state.resumeScheduled) {
     state.resumeScheduled = true;
+    state.didRead = true;
     process.nextTick(resume_, stream, state);
   }
 }
@@ -1191,12 +1196,16 @@ ObjectDefineProperties(Readable.prototype, {
   readableDidRead: {
     enumerable: false,
     get: function() {
+<<<<<<< HEAD
       return (
         this._readableState.dataEmitted ||
         this._readableState.endEmitted ||
         this._readableState.errorEmitted ||
         this._readableState.closeEmitted
       );
+=======
+      return this._readableState.didRead;
+>>>>>>> 8fe7d23c17... stream: add readableDidRead
     }
   },
 
