fs: stop lazy loading stream constructors

Fixes: #21489
PR-URL: #21776
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

Author: targos

lib/fs.js

@@ -52,6 +52,7 @@ const {
 }=errors.codes;
 
 const{ FSReqWrap, statValues }=binding;
+const{ ReadStream, WriteStream }=require('internal/fs/streams');
 constinternalFS=require('internal/fs/utils');
 const{ getPathFromURL }=require('internal/url');
 constinternalUtil=require('internal/util');
@@ -91,13 +92,6 @@ let fs;
 letpromises;
 letwatchers;
 letReadFileContext;
-letReadStream;
-letWriteStream;
-
-// These have to be separate because of how graceful-fs happens to do it's
-// monkeypatching.
-letFileReadStream;
-letFileWriteStream;
 
 constisWindows=process.platform==='win32';
 
@@ -1697,20 +1691,11 @@ function copyFileSync(src, dest, flags) {
 handleErrorFromBinding(ctx);
 }
 
-functionlazyLoadStreams(){
-if(!ReadStream){
-({ ReadStream, WriteStream }=require('internal/fs/streams'));
-[FileReadStream,FileWriteStream]=[ReadStream,WriteStream];
-}
-}
-
 functioncreateReadStream(path,options){
-lazyLoadStreams();
 returnnewReadStream(path,options);
 }
 
 functioncreateWriteStream(path,options){
-lazyLoadStreams();
 returnnewWriteStream(path,options);
 }
 
@@ -1793,43 +1778,12 @@ module.exports = fs = {
  writeSync,
  Stats,
 
-getReadStream(){
-lazyLoadStreams();
-returnReadStream;
-},
-
-setReadStream(val){
-ReadStream=val;
-},
-
-getWriteStream(){
-lazyLoadStreams();
-returnWriteStream;
-},
-
-setWriteStream(val){
-WriteStream=val;
-},
-
-// Legacy names... these have to be separate because of how graceful-fs
-// (and possibly other) modules monkey patch the values.
-getFileReadStream(){
-lazyLoadStreams();
-returnFileReadStream;
-},
-
-setFileReadStream(val){
-FileReadStream=val;
-},
-
-getFileWriteStream(){
-lazyLoadStreams();
-returnFileWriteStream;
-},
-
-setFileWriteStream(val){
-FileWriteStream=val;
-},
+// Stream constructors
+ ReadStream,
+ WriteStream,
+// Legacy names...
+FileReadStream: ReadStream,
+FileWriteStream: WriteStream,
 
 // For tests
 _toUnixTimestamp: toUnixTimestamp

lib/internal/fs/streams.js

@@ -8,7 +8,6 @@ const {
 ERR_INVALID_ARG_TYPE,
 ERR_OUT_OF_RANGE
 }=require('internal/errors').codes;
-constfs=require('fs');
 const{ Buffer }=require('buffer');
 const{
  copyObject,
@@ -18,6 +17,13 @@ const { Readable, Writable } = require('stream');
 const{ getPathFromURL }=require('internal/url');
 constutil=require('util');
 
+letfs;
+functionlazyFs(){
+if(fs===undefined)
+fs=require('fs');
+returnfs;
+}
+
 constkMinPoolSpace=128;
 
 letpool;
@@ -92,7 +98,7 @@ function ReadStream(path, options) {
 util.inherits(ReadStream,Readable);
 
 ReadStream.prototype.open=function(){
-fs.open(this.path,this.flags,this.mode,(er,fd)=>{
+lazyFs().open(this.path,this.flags,this.mode,(er,fd)=>{
 if(er){
 if(this.autoClose){
 this.destroy();
@@ -142,7 +148,7 @@ ReadStream.prototype._read = function(n) {
 returnthis.push(null);
 
 // the actual read.
-fs.read(this.fd,pool,pool.used,toRead,this.pos,(er,bytesRead)=>{
+lazyFs().read(this.fd,pool,pool.used,toRead,this.pos,(er,bytesRead)=>{
 if(er){
 if(this.autoClose){
 this.destroy();
@@ -177,7 +183,7 @@ ReadStream.prototype._destroy = function(err, cb) {
 };
 
 functioncloseFsStream(stream,cb,err){
-fs.close(stream.fd,(er)=>{
+lazyFs().close(stream.fd,(er)=>{
 er=er||err;
 cb(er);
 stream.closed=true;
@@ -242,7 +248,7 @@ WriteStream.prototype._final = function(callback) {
 };
 
 WriteStream.prototype.open=function(){
-fs.open(this.path,this.flags,this.mode,(er,fd)=>{
+lazyFs().open(this.path,this.flags,this.mode,(er,fd)=>{
 if(er){
 if(this.autoClose){
 this.destroy();
@@ -270,7 +276,7 @@ WriteStream.prototype._write = function(data, encoding, cb) {
 });
 }
 
-fs.write(this.fd,data,0,data.length,this.pos,(er,bytes)=>{
+lazyFs().write(this.fd,data,0,data.length,this.pos,(er,bytes)=>{
 if(er){
 if(this.autoClose){
 this.destroy();