1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stream: do not use crypto.DEFAULT_ENCODING in lazy_transform.js

Browse Source 
The default encoding can be retrieved via
`require('internal/crypto/util').getDefaultEncoding` instead of
the deprecated crypto.DEFAULT_ENCODING which triggers a warning.

Background:

The require chain goes like this:

```
internal/streams/lazy_transform.js
  -> crypto.js
  -> internal/crypto/cipher.js (uses LazyTransform in the global scope)
  -> internal/streams/lazy_transform.js
```

So when `internal/streams/lazy_transform.js` is required before
`lib/crypto.js`, we have a circular dependency and since
`internal/crypto/cipher.js` uses destructuring to use LazyTransform
we will get an error. And it can also trigger a warning if
lazy_transform.js is the first file that touches
crypto.DEFAULT_ENCODING.

PR-URL: https://github.com/nodejs/node/pull/24396
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
Joyee Cheung 2018-11-17 00:18:55 +08:00 committed by Rich Trott
parent ea655191d3
commit 413fcada8f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/internal/streams/lazy_transform.js
View File

@ -5,7 +5,10 @@
const stream = require('stream'); const stream = require('stream');
const util = require('util'); const util = require('util');
const crypto = require('crypto');
const {
getDefaultEncoding
} = require('internal/crypto/util');
module.exports = LazyTransform; module.exports = LazyTransform;
@ -22,7 +25,7 @@ function makeGetter(name) {
this._writableState.decodeStrings = false; this._writableState.decodeStrings = false;
if (!this._options || !this._options.defaultEncoding) { if (!this._options || !this._options.defaultEncoding) {
this._writableState.defaultEncoding = crypto.DEFAULT_ENCODING; this._writableState.defaultEncoding = getDefaultEncoding();
} }
return this[name]; return this[name];