diff options
Diffstat (limited to 'node_modules/fs-minipass/index.js')
| -rw-r--r-- | node_modules/fs-minipass/index.js | 103 |
1 files changed, 34 insertions, 69 deletions
diff --git a/node_modules/fs-minipass/index.js b/node_modules/fs-minipass/index.js index 9b0779c80..cd585a83c 100644 --- a/node_modules/fs-minipass/index.js +++ b/node_modules/fs-minipass/index.js @@ -3,21 +3,11 @@ const MiniPass = require('minipass') const EE = require('events').EventEmitter const fs = require('fs') -let writev = fs.writev +// for writev +const binding = process.binding('fs') +const writeBuffers = binding.writeBuffers /* istanbul ignore next */ -if (!writev) { - // This entire block can be removed if support for earlier than Node.js - // 12.9.0 is not needed. - const binding = process.binding('fs') - const FSReqWrap = binding.FSReqWrap || binding.FSReqCallback - - writev = (fd, iovec, pos, cb) => { - const done = (er, bw) => cb(er, bw, iovec) - const req = new FSReqWrap() - req.oncomplete = done - binding.writeBuffers(fd, iovec, pos, req) - } -} +const FSReqWrap = binding.FSReqWrap || binding.FSReqCallback const _autoClose = Symbol('_autoClose') const _close = Symbol('_close') @@ -46,20 +36,17 @@ const _size = Symbol('_size') const _write = Symbol('_write') const _writing = Symbol('_writing') const _defaultFlag = Symbol('_defaultFlag') -const _errored = Symbol('_errored') class ReadStream extends MiniPass { constructor (path, opt) { opt = opt || {} super(opt) - this.readable = true this.writable = false if (typeof path !== 'string') throw new TypeError('path must be a string') - this[_errored] = false this[_fd] = typeof opt.fd === 'number' ? opt.fd : null this[_path] = path this[_readSize] = opt.readSize || 16*1024*1024 @@ -109,8 +96,7 @@ class ReadStream extends MiniPass { this[_reading] = true const buf = this[_makeBuf]() /* istanbul ignore if */ - if (buf.length === 0) - return process.nextTick(() => this[_onread](null, 0, buf)) + if (buf.length === 0) return process.nextTick(() => this[_onread](null, 0, buf)) fs.read(this[_fd], buf, 0, buf.length, null, (er, br, buf) => this[_onread](er, br, buf)) } @@ -126,9 +112,8 @@ class ReadStream extends MiniPass { [_close] () { if (this[_autoClose] && typeof this[_fd] === 'number') { - const fd = this[_fd] + fs.close(this[_fd], _ => this.emit('close')) this[_fd] = null - fs.close(fd, er => er ? this.emit('error', er) : this.emit('close')) } } @@ -165,12 +150,6 @@ class ReadStream extends MiniPass { this[_read]() break - case 'error': - if (this[_errored]) - return - this[_errored] = true - return super.emit(ev, data) - default: return super.emit(ev, data) } @@ -197,8 +176,7 @@ class ReadStreamSync extends ReadStream { do { const buf = this[_makeBuf]() /* istanbul ignore next */ - const br = buf.length === 0 ? 0 - : fs.readSync(this[_fd], buf, 0, buf.length, null) + const br = buf.length === 0 ? 0 : fs.readSync(this[_fd], buf, 0, buf.length, null) if (!this[_handleChunk](br, buf)) break } while (true) @@ -213,9 +191,10 @@ class ReadStreamSync extends ReadStream { [_close] () { if (this[_autoClose] && typeof this[_fd] === 'number') { - const fd = this[_fd] + try { + fs.closeSync(this[_fd]) + } catch (er) {} this[_fd] = null - fs.closeSync(fd) this.emit('close') } } @@ -226,8 +205,6 @@ class WriteStream extends EE { opt = opt || {} super(opt) this.readable = false - this.writable = true - this[_errored] = false this[_writing] = false this[_ended] = false this[_needDrain] = false @@ -248,16 +225,6 @@ class WriteStream extends EE { this[_open]() } - emit (ev, data) { - if (ev === 'error') { - if (this[_errored]) - return - this[_errored] = true - } - return super.emit(ev, data) - } - - get fd () { return this[_fd] } get path () { return this[_path] } @@ -297,12 +264,11 @@ class WriteStream extends EE { if (!this[_writing] && !this[_queue].length && typeof this[_fd] === 'number') this[_onwrite](null, 0) - return this } write (buf, enc) { if (typeof buf === 'string') - buf = Buffer.from(buf, enc) + buf = new Buffer(buf, enc) if (this[_ended]) { this.emit('error', new Error('write() after end()')) @@ -364,9 +330,8 @@ class WriteStream extends EE { [_close] () { if (this[_autoClose] && typeof this[_fd] === 'number') { - const fd = this[_fd] + fs.close(this[_fd], _ => this.emit('close')) this[_fd] = null - fs.close(fd, er => er ? this.emit('error', er) : this.emit('close')) } } } @@ -374,47 +339,47 @@ class WriteStream extends EE { class WriteStreamSync extends WriteStream { [_open] () { let fd - // only wrap in a try{} block if we know we'll retry, to avoid - // the rethrow obscuring the error's source frame in most cases. - if (this[_defaultFlag] && this[_flags] === 'r+') { - try { - fd = fs.openSync(this[_path], this[_flags], this[_mode]) - } catch (er) { - if (er.code === 'ENOENT') { - this[_flags] = 'w' - return this[_open]() - } else - throw er - } - } else + try { fd = fs.openSync(this[_path], this[_flags], this[_mode]) - + } catch (er) { + if (this[_defaultFlag] && + this[_flags] === 'r+' && + er && er.code === 'ENOENT') { + this[_flags] = 'w' + return this[_open]() + } else + throw er + } this[_onopen](null, fd) } [_close] () { if (this[_autoClose] && typeof this[_fd] === 'number') { - const fd = this[_fd] + try { + fs.closeSync(this[_fd]) + } catch (er) {} this[_fd] = null - fs.closeSync(fd) this.emit('close') } } [_write] (buf) { - // throw the original, but try to close if it fails - let threw = true try { this[_onwrite](null, fs.writeSync(this[_fd], buf, 0, buf.length, this[_pos])) - threw = false - } finally { - if (threw) - try { this[_close]() } catch (_) {} + } catch (er) { + this[_onwrite](er, 0) } } } +const writev = (fd, iovec, pos, cb) => { + const done = (er, bw) => cb(er, bw, iovec) + const req = new FSReqWrap() + req.oncomplete = done + binding.writeBuffers(fd, iovec, pos, req) +} + exports.ReadStream = ReadStream exports.ReadStreamSync = ReadStreamSync |