Proper fix, soft-detecting there is a custom inspect.

nodejs · Feb 9, 2018 · fc6db13 · fc6db13
1 parent 6ec7d8a
commit fc6db13
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/build/files.js b/build/files.js
@@ -319,9 +319,28 @@ module.exports['_stream_writable.js'] = [
   , useCorkedRequest
   , addConstructors
 ]
+
 module.exports['internal/streams/BufferList.js'] = [
-    safeBufferFix
+    [
+      /(?:var|const) (?:{ )Buffer(?: }) = require\('buffer'\)(?:\.Buffer)?;/,
+      `
+const Buffer = require('safe-buffer').Buffer
+const util = require('util')
+      `
+    ]
   , fixCopyBuffer
+  , [
+    /$/,
+    `
+
+if (util && util.inspect.custom) {
+  module.exports.prototype[util.inspect.custom] = function () {
+    const obj = util.inspect({ length: this.length });
+    return \`\${this.constructor.name} \${obj}\`;
+  }
+}
+`
+  ]
 
 ]
 module.exports['internal/streams/destroy.js'] = [

diff --git a/lib/internal/streams/BufferList.js b/lib/internal/streams/BufferList.js
@@ -1,11 +1,9 @@
 'use strict';
 
-/*<replacement>*/
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 var Buffer = require('safe-buffer').Buffer;
-/*</replacement>*/
+var util = require('util');
 
 function copyBuffer(src, target, offset) {
   src.copy(target, offset);
@@ -71,4 +69,11 @@ module.exports = function () {
   };
 
   return BufferList;
-}();
+}();
+
+if (util && util.inspect.custom) {
+  module.exports.prototype[util.inspect.custom] = function () {
+    var obj = util.inspect({ length: this.length });
+    return this.constructor.name + ' ' + obj;
+  };
+}