stream: use readableObjectMode public api for js stream

PR-URL: #27655 Refs: #445 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Yongsheng Zhang <[email protected]>
nodejs · May 20, 2019 · 32fd0ac · 32fd0ac
1 parent 4a9af17
commit 32fd0ac
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 1 deletion.
diff --git a/doc/api/stream.md b/doc/api/stream.md
@@ -502,6 +502,13 @@ This property contains the number of bytes (or objects) in the queue
 ready to be written. The value provides introspection data regarding
 the status of the `highWaterMark`.
 
+##### writable.writableObjectMode
+<!-- YAML
+added: REPLACEME
+-->
+
+Getter for the property `objectMode` of a given `Writable` stream.
+
 ##### writable.write(chunk[, encoding][, callback])
 <!-- YAML
 added: v0.9.4
@@ -1089,6 +1096,13 @@ This property contains the number of bytes (or objects) in the queue
 ready to be read. The value provides introspection data regarding
 the status of the `highWaterMark`.
 
+##### readable.readableObjectMode
+<!-- YAML
+added: REPLACEME
+-->
+
+Getter for the property `objectMode` of a given `Readable` stream.
+
 ##### readable.resume()
 <!-- YAML
 added: v0.9.4

diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
@@ -1081,6 +1081,13 @@ Object.defineProperty(Readable.prototype, 'readableLength', {
   }
 });
 
+Object.defineProperty(Readable.prototype, 'readableObjectMode', {
+  enumerable: false,
+  get() {
+    return this._readableState ? this._readableState.objectMode : false;
+  }
+});
+
 // Pluck off n bytes from an array of buffers.
 // Length is the combined lengths of all the buffers in the list.
 // This function is designed to be inlinable, so please take care when making

diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js
@@ -707,6 +707,13 @@ Object.defineProperty(Writable.prototype, 'destroyed', {
   }
 });
 
+Object.defineProperty(Writable.prototype, 'writableObjectMode', {
+  enumerable: false,
+  get() {
+    return this._writableState ? this._writableState.objectMode : false;
+  }
+});
+
 Writable.prototype.destroy = destroyImpl.destroy;
 Writable.prototype._undestroy = destroyImpl.undestroy;
 Writable.prototype._destroy = function(err, cb) {

diff --git a/lib/internal/js_stream_socket.js b/lib/internal/js_stream_socket.js
@@ -50,7 +50,7 @@ class JSStreamSocket extends Socket {
     stream.on('error', (err) => this.emit('error', err));
     const ondata = (chunk) => {
       if (typeof chunk === 'string' ||
-          stream._readableState.objectMode === true) {
+          stream.readableObjectMode === true) {
         // Make sure that no further `data` events will happen.
         stream.pause();
         stream.removeListener('data', ondata);

diff --git a/test/parallel/test-stream2-basic.js b/test/parallel/test-stream2-basic.js
@@ -23,6 +23,7 @@
 
 const common = require('../common');
 const R = require('_stream_readable');
+const W = require('_stream_writable');
 const assert = require('assert');
 
 const EE = require('events').EventEmitter;
@@ -420,3 +421,15 @@ class TestWriter extends EE {
   const r2 = r.setEncoding('utf8').pause().resume().pause();
   assert.strictEqual(r, r2);
 }
+
+{
+  // Verify readableObjectMode property
+  const r = new R({ objectMode: true });
+  assert.strictEqual(r.readableObjectMode, true);
+}
+
+{
+  // Verify writableObjectMode property
+  const w = new W({ objectMode: true });
+  assert.strictEqual(w.writableObjectMode, true);
+}