From 6ca23d7846cb47e84fd344543e394e50938540be Mon Sep 17 00:00:00 2001
From: Robert Nagy <ronagy@icloud.com>
Date: Fri, 30 Jul 2021 14:18:38 +0200
Subject: [PATCH] Revert "stream: add readableDidRead"

This reverts commit 83060510015c2ad05b156af54938d05e9b2df5ae.

PR-URL: https://github.com/nodejs/node/pull/39589
Refs: https://github.com/nodejs/undici/pull/907
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
---
 doc/api/stream.md                             | 11 +++
 lib/_http_incoming.js                         |  1 -
 lib/_http_server.js                           |  2 +-
 lib/internal/streams/readable.js              | 19 ++--
 test/parallel/test-stream-readable-didRead.js | 98 +++++++++++++++++--
 5 files changed, 112 insertions(+), 19 deletions(-)

diff --git a/doc/api/stream.md b/doc/api/stream.md
index fc66885ebc9203..312f200e61c4d5 100644
--- a/doc/api/stream.md
+++ b/doc/api/stream.md
@@ -1261,6 +1261,17 @@ added: v11.4.0
 Is `true` if it is safe to call [`readable.read()`][stream-read], which means
 the stream has not been destroyed or emitted `'error'` or `'end'`.
 
+##### `readable.readableDidRead`
+<!-- YAML
+added: REPLACEME
+-->
+
+* {boolean}
+
+Allows determining if the stream has been or is about to be read.
+Returns true if `'data'`, `'end'`, `'error'` or `'close'` has been
+emitted.
+
 ##### `readable.readableEncoding`
 <!-- YAML
 added: v12.7.0
diff --git a/lib/_http_incoming.js b/lib/_http_incoming.js
index bb76d6eaefc34d..31b7db6f6c7c99 100644
--- a/lib/_http_incoming.js
+++ b/lib/_http_incoming.js
@@ -87,7 +87,6 @@ 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
index 8d9321d28b9919..64cd44c066cf8a 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -802,7 +802,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.readableDidRead)
+  if (!req._consuming && !req._readableState.resumeScheduled)
     req._dump();
 
   // Make sure the requestTimeout is cleared before finishing.
diff --git a/lib/internal/streams/readable.js b/lib/internal/streams/readable.js
index e7dd60a6d78c13..a6a1913961bb41 100644
--- a/lib/internal/streams/readable.js
+++ b/lib/internal/streams/readable.js
@@ -171,7 +171,7 @@ function ReadableState(options, stream, isDuplex) {
   // If true, a maybeReadMore has been scheduled.
   this.readingMore = false;
 
-  this.didRead = false;
+  this.dataEmitted = false;
 
   this.decoder = null;
   this.encoding = null;
@@ -316,6 +316,7 @@ function addChunk(stream, state, chunk, addToFront) {
     } else {
       state.awaitDrainWriters = null;
     }
+    state.dataEmitted = true;
     stream.emit('data', chunk);
   } else {
     // Update the buffer info.
@@ -541,10 +542,10 @@ Readable.prototype.read = function(n) {
       endReadable(this);
   }
 
-  if (ret !== null)
+  if (ret !== null) {
+    state.dataEmitted = true;
     this.emit('data', ret);
-
-  state.didRead = true;
+  }
 
   return ret;
 };
@@ -849,9 +850,7 @@ 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);
     }
   };
@@ -999,7 +998,6 @@ Readable.prototype.resume = function() {
 function resume(stream, state) {
   if (!state.resumeScheduled) {
     state.resumeScheduled = true;
-    state.didRead = true;
     process.nextTick(resume_, stream, state);
   }
 }
@@ -1187,7 +1185,12 @@ ObjectDefineProperties(Readable.prototype, {
   readableDidRead: {
     enumerable: false,
     get: function() {
-      return this._readableState.didRead;
+      return (
+        this._readableState.dataEmitted ||
+        this._readableState.endEmitted ||
+        this._readableState.errorEmitted ||
+        this._readableState.closeEmitted
+      );
     }
   },
 
diff --git a/test/parallel/test-stream-readable-didRead.js b/test/parallel/test-stream-readable-didRead.js
index 18e2da97e88e94..7508dd76899013 100644
--- a/test/parallel/test-stream-readable-didRead.js
+++ b/test/parallel/test-stream-readable-didRead.js
@@ -1,24 +1,104 @@
 'use strict';
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 const Readable = require('stream').Readable;
 
+function noop() {}
+
+function check(readable, data, fn) {
+  assert.strictEqual(readable.readableDidRead, false);
+  if (data === -1) {
+    readable.on('error', common.mustCall());
+    readable.on('data', common.mustNotCall());
+    readable.on('end', common.mustNotCall());
+  } else {
+    readable.on('error', common.mustNotCall());
+    if (data === -2) {
+      readable.on('end', common.mustNotCall());
+    } else {
+      readable.on('end', common.mustCall());
+    }
+    if (data > 0) {
+      readable.on('data', common.mustCallAtLeast(data));
+    } else {
+      readable.on('data', common.mustNotCall());
+    }
+  }
+  readable.on('close', common.mustCall());
+  fn();
+  setImmediate(() => {
+    assert.strictEqual(readable.readableDidRead, true);
+  });
+}
+
 {
   const readable = new Readable({
-    read: () => {}
+    read() {
+      this.push(null);
+    }
   });
+  check(readable, 0, () => {
+    readable.read();
+  });
+}
 
-  assert.strictEqual(readable.readableDidRead, false);
-  readable.read();
-  assert.strictEqual(readable.readableDidRead, true);
+{
+  const readable = new Readable({
+    read() {
+      this.push(null);
+    }
+  });
+  check(readable, 0, () => {
+    readable.resume();
+  });
 }
 
 {
   const readable = new Readable({
-    read: () => {}
+    read() {
+      this.push(null);
+    }
+  });
+  check(readable, -2, () => {
+    readable.destroy();
   });
+}
 
-  assert.strictEqual(readable.readableDidRead, false);
-  readable.resume();
-  assert.strictEqual(readable.readableDidRead, true);
+{
+  const readable = new Readable({
+    read() {
+      this.push(null);
+    }
+  });
+
+  check(readable, -1, () => {
+    readable.destroy(new Error());
+  });
+}
+
+{
+  const readable = new Readable({
+    read() {
+      this.push('data');
+      this.push(null);
+    }
+  });
+
+  check(readable, 1, () => {
+    readable.on('data', noop);
+  });
+}
+
+{
+  const readable = new Readable({
+    read() {
+      this.push('data');
+      this.push(null);
+    }
+  });
+
+  check(readable, 1, () => {
+    readable.on('data', noop);
+    readable.off('data', noop);
+  });
 }