zlib,stream: use “official” util.types typechecks

The old variants have been deprecated since b20af80. Refs: #18415 PR-URL: #19602 Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: Weijia Wang <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Mar 28, 2018 · e765257 · e765257
1 parent ff7c2cc
commit e765257
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/lib/stream.js b/lib/stream.js
@@ -38,16 +38,15 @@ Stream.Stream = Stream;
 
 // Internal utilities
 try {
-  Stream._isUint8Array = require('internal/util/types').isUint8Array;
-} catch (e) {
-  // Throws for code outside of Node.js core.
-
-  try {
-    Stream._isUint8Array = process.binding('util').isUint8Array;
-  } catch (e) {
+  const types = require('util').types;
+  if (types && typeof types.isUint8Array === 'function') {
+    Stream._isUint8Array = types.isUint8Array;
+  } else {
     // This throws for Node < 4.2.0 because there's no util binding and
     // returns undefined for Node < 7.4.0.
+    Stream._isUint8Array = process.binding('util').isUint8Array;
   }
+} catch (e) {
 }
 
 if (!Stream._isUint8Array) {

diff --git a/lib/zlib.js b/lib/zlib.js
@@ -28,9 +28,13 @@ const {
   ERR_ZLIB_INITIALIZATION_FAILED
 } = require('internal/errors').codes;
 const Transform = require('_stream_transform');
-const { _extend } = require('util');
-const { isAnyArrayBuffer } = process.binding('util');
-const { isArrayBufferView } = require('internal/util/types');
+const {
+  _extend,
+  types: {
+    isAnyArrayBuffer,
+    isArrayBufferView
+  }
+} = require('util');
 const binding = process.binding('zlib');
 const assert = require('assert').ok;
 const {