Skip to content

Commit e765257

Browse files
addaleaxtrivikr
authored andcommitted
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]>
1 parent ff7c2cc commit e765257

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

lib/stream.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,15 @@ Stream.Stream = Stream;
3838

3939
// Internal utilities
4040
try {
41-
Stream._isUint8Array = require('internal/util/types').isUint8Array;
42-
} catch (e) {
43-
// Throws for code outside of Node.js core.
44-
45-
try {
46-
Stream._isUint8Array = process.binding('util').isUint8Array;
47-
} catch (e) {
41+
const types = require('util').types;
42+
if (types && typeof types.isUint8Array === 'function') {
43+
Stream._isUint8Array = types.isUint8Array;
44+
} else {
4845
// This throws for Node < 4.2.0 because there's no util binding and
4946
// returns undefined for Node < 7.4.0.
47+
Stream._isUint8Array = process.binding('util').isUint8Array;
5048
}
49+
} catch (e) {
5150
}
5251

5352
if (!Stream._isUint8Array) {

lib/zlib.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,13 @@ const {
2828
ERR_ZLIB_INITIALIZATION_FAILED
2929
} = require('internal/errors').codes;
3030
const Transform = require('_stream_transform');
31-
const { _extend } = require('util');
32-
const { isAnyArrayBuffer } = process.binding('util');
33-
const { isArrayBufferView } = require('internal/util/types');
31+
const {
32+
_extend,
33+
types: {
34+
isAnyArrayBuffer,
35+
isArrayBufferView
36+
}
37+
} = require('util');
3438
const binding = process.binding('zlib');
3539
const assert = require('assert').ok;
3640
const {

0 commit comments

Comments
 (0)