Nulo/tar-stream
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move to streamx for streams, brittle for testing, and b4a for buffer operations (#143)

Browse source 
* Move to `streamx` for streams and `brittle` for testing

* More `b4a` and octal notation

* More `b4a`
This commit is contained in:
Kasper Isager Dalsgarð 2022-12-06 15:04:04 +00:00 committed by GitHub
parent e08fcd8457
commit 32353cc02c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 754 additions and 800 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
.github/workflows/test-node.yml vendored Normal file
View file

@ -0,0 +1,23 @@
name: Build Status
on:
push:
branches:
- master
pull_request:
branches:
- master
jobs:
build:
strategy:
matrix:
node-version: [lts/*]
os: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm test

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
node_modules node_modules
package-lock.json
sandbox.js sandbox.js

7
.travis.yml
View file

@ -1,7 +0,0 @@
language: node_js
node_js:
- '6'
- '8'
- '10'
- '12'
- '14'

6
README.md
View file

@ -1,6 +1,6 @@
# tar-stream # tar-stream
tar-stream is a streaming tar parser and generator and nothing else. It is streams2 and operates purely using streams which means you can easily extract/parse tarballs without ever hitting the file system. tar-stream is a streaming tar parser and generator and nothing else. It operates purely using streams which means you can easily extract/parse tarballs without ever hitting the file system.
Note that you still need to gunzip your data if you have a `.tar.gz`. We recommend using [gunzip-maybe](https://github.com/mafintosh/gunzip-maybe) in conjunction with this. Note that you still need to gunzip your data if you have a `.tar.gz`. We recommend using [gunzip-maybe](https://github.com/mafintosh/gunzip-maybe) in conjunction with this.
@ -28,7 +28,7 @@ To create a pack stream use `tar.pack()` and call `pack.entry(header, [callback]
``` js ``` js
var tar = require('tar-stream') var tar = require('tar-stream')
var pack = tar.pack() // pack is a streams2 stream var pack = tar.pack() // pack is a stream
// add a file called my-test.txt with the content "Hello World!" // add a file called my-test.txt with the content "Hello World!"
pack.entry({ name: 'my-test.txt' }, 'Hello World!') pack.entry({ name: 'my-test.txt' }, 'Hello World!')
@ -136,7 +136,7 @@ pack.pipe(newTarballStream)
var fs = require('fs') var fs = require('fs')
var tar = require('tar-stream') var tar = require('tar-stream')
var pack = tar.pack() // pack is a streams2 stream var pack = tar.pack() // pack is a stream
var path = 'YourTarBall.tar' var path = 'YourTarBall.tar'
var yourTarball = fs.createWriteStream(path) var yourTarball = fs.createWriteStream(path)

155
extract.js
View file

@ -1,24 +1,21 @@
var util = require('util') const bl = require('bl')
var bl = require('bl') const { Writable, PassThrough } = require('streamx')
var headers = require('./headers') const headers = require('./headers')
var Writable = require('readable-stream').Writable const noop = function () {}
var PassThrough = require('readable-stream').PassThrough
var noop = function () {} const overflow = function (size) {
var overflow = function (size) {
size &= 511 size &= 511
return size && 512 - size return size && 512 - size
} }
var emptyStream = function (self, offset) { const emptyStream = function (self, offset) {
var s = new Source(self, offset) const s = new Source(self, offset)
s.end() s.end()
return s return s
} }
var mixinPax = function (header, pax) { const mixinPax = function (header, pax) {
if (pax.path) header.name = pax.path if (pax.path) header.name = pax.path
if (pax.linkpath) header.linkname = pax.linkpath if (pax.linkpath) header.linkname = pax.linkpath
if (pax.size) header.size = parseInt(pax.size, 10) if (pax.size) header.size = parseInt(pax.size, 10)
@ -26,21 +23,21 @@ var mixinPax = function (header, pax) {
return header return header
} }
var Source = function (self, offset) { class Source extends PassThrough {
constructor (self, offset) {
super()
this._parent = self this._parent = self
this.offset = offset this.offset = offset
PassThrough.call(this, { autoDestroy: false }) }
_predestroy () {
this._parent.destroy()
}
} }
util.inherits(Source, PassThrough) class Extract extends Writable {
constructor (opts) {
Source.prototype.destroy = function (err) { super(opts)
this._parent.destroy(err)
}
var Extract = function (opts) {
if (!(this instanceof Extract)) return new Extract(opts)
Writable.call(this, opts)
opts = opts || {} opts = opts || {}
@ -54,75 +51,74 @@ var Extract = function (opts) {
this._overflow = null this._overflow = null
this._cb = null this._cb = null
this._locked = false this._locked = false
this._destroyed = false
this._pax = null this._pax = null
this._paxGlobal = null this._paxGlobal = null
this._gnuLongPath = null this._gnuLongPath = null
this._gnuLongLinkPath = null this._gnuLongLinkPath = null
var self = this const self = this
var b = self._buffer const b = self._buffer
var oncontinue = function () { const oncontinue = function () {
self._continue() self._continue()
} }
var onunlock = function (err) { const onunlock = function (err) {
self._locked = false self._locked = false
if (err) return self.destroy(err) if (err) return self.destroy(err)
if (!self._stream) oncontinue() if (!self._stream) oncontinue()
} }
var onstreamend = function () { const onstreamend = function () {
self._stream = null self._stream = null
var drain = overflow(self._header.size) const drain = overflow(self._header.size)
if (drain) self._parse(drain, ondrain) if (drain) self._parse(drain, ondrain)
else self._parse(512, onheader) else self._parse(512, onheader)
if (!self._locked) oncontinue() if (!self._locked) oncontinue()
} }
var ondrain = function () { const ondrain = function () {
self._buffer.consume(overflow(self._header.size)) self._buffer.consume(overflow(self._header.size))
self._parse(512, onheader) self._parse(512, onheader)
oncontinue() oncontinue()
} }
var onpaxglobalheader = function () { const onpaxglobalheader = function () {
var size = self._header.size const size = self._header.size
self._paxGlobal = headers.decodePax(b.slice(0, size)) self._paxGlobal = headers.decodePax(b.slice(0, size))
b.consume(size) b.consume(size)
onstreamend() onstreamend()
} }
var onpaxheader = function () { const onpaxheader = function () {
var size = self._header.size const size = self._header.size
self._pax = headers.decodePax(b.slice(0, size)) self._pax = headers.decodePax(b.slice(0, size))
if (self._paxGlobal) self._pax = Object.assign({}, self._paxGlobal, self._pax) if (self._paxGlobal) self._pax = Object.assign({}, self._paxGlobal, self._pax)
b.consume(size) b.consume(size)
onstreamend() onstreamend()
} }
var ongnulongpath = function () { const ongnulongpath = function () {
var size = self._header.size const size = self._header.size
this._gnuLongPath = headers.decodeLongPath(b.slice(0, size), opts.filenameEncoding) this._gnuLongPath = headers.decodeLongPath(b.slice(0, size), opts.filenameEncoding)
b.consume(size) b.consume(size)
onstreamend() onstreamend()
} }
var ongnulonglinkpath = function () { const ongnulonglinkpath = function () {
var size = self._header.size const size = self._header.size
this._gnuLongLinkPath = headers.decodeLongPath(b.slice(0, size), opts.filenameEncoding) this._gnuLongLinkPath = headers.decodeLongPath(b.slice(0, size), opts.filenameEncoding)
b.consume(size) b.consume(size)
onstreamend() onstreamend()
} }
var onheader = function () { const onheader = function () {
var offset = self._offset const offset = self._offset
var header let header
try { try {
header = self._header = headers.decode(b.slice(0, 512), opts.filenameEncoding, opts.allowUnknownFormat) header = self._header = headers.decode(b.slice(0, 512), opts.filenameEncoding, opts.allowUnknownFormat)
} catch (err) { } catch (err) {
self.emit('error', err) self.destroy(err)
} }
b.consume(512) b.consume(512)
@ -131,21 +127,25 @@ var Extract = function (opts) {
oncontinue() oncontinue()
return return
} }
if (header.type === 'gnu-long-path') { if (header.type === 'gnu-long-path') {
self._parse(header.size, ongnulongpath) self._parse(header.size, ongnulongpath)
oncontinue() oncontinue()
return return
} }
if (header.type === 'gnu-long-link-path') { if (header.type === 'gnu-long-link-path') {
self._parse(header.size, ongnulonglinkpath) self._parse(header.size, ongnulonglinkpath)
oncontinue() oncontinue()
return return
} }
if (header.type === 'pax-global-header') { if (header.type === 'pax-global-header') {
self._parse(header.size, onpaxglobalheader) self._parse(header.size, onpaxglobalheader)
oncontinue() oncontinue()
return return
} }
if (header.type === 'pax-header') { if (header.type === 'pax-header') {
self._parse(header.size, onpaxheader) self._parse(header.size, onpaxheader)
oncontinue() oncontinue()
@ -184,62 +184,49 @@ var Extract = function (opts) {
this._onheader = onheader this._onheader = onheader
this._parse(512, onheader) this._parse(512, onheader)
} }
util.inherits(Extract, Writable) _parse (size, onparse) {
Extract.prototype.destroy = function (err) {
if (this._destroyed) return
this._destroyed = true
if (err) this.emit('error', err)
this.emit('close')
if (this._stream) this._stream.emit('close')
}
Extract.prototype._parse = function (size, onparse) {
if (this._destroyed) return
this._offset += size this._offset += size
this._missing = size this._missing = size
if (onparse === this._onheader) this._partial = false if (onparse === this._onheader) this._partial = false
this._onparse = onparse this._onparse = onparse
} }
Extract.prototype._continue = function () { _continue () {
if (this._destroyed) return const cb = this._cb
var cb = this._cb
this._cb = noop this._cb = noop
if (this._overflow) this._write(this._overflow, undefined, cb) if (this._overflow) this._write(this._overflow, cb)
else cb() else cb()
} }
Extract.prototype._write = function (data, enc, cb) { _write (data, cb) {
if (this._destroyed) return const s = this._stream
const b = this._buffer
var s = this._stream const missing = this._missing
var b = this._buffer if (data.byteLength) this._partial = true
var missing = this._missing
if (data.length) this._partial = true
// we do not reach end-of-chunk now. just forward it // we do not reach end-of-chunk now. just forward it
if (data.byteLength < missing) {
if (data.length < missing) { this._missing -= data.byteLength
this._missing -= data.length
this._overflow = null this._overflow = null
if (s) return s.write(data, cb) if (s) {
if (s.write(data, cb)) cb()
else s.once('drain', cb)
return
}
b.append(data) b.append(data)
return cb() return cb()
} }
// end-of-chunk. the parser should call cb. // end-of-chunk. the parser should call cb.
this._cb = cb this._cb = cb
this._missing = 0 this._missing = 0
var overflow = null let overflow = null
if (data.length > missing) { if (data.byteLength > missing) {
overflow = data.slice(missing) overflow = data.subarray(missing)
data = data.slice(0, missing) data = data.subarray(0, missing)
} }
if (s) s.end(data) if (s) s.end(data)
@ -247,11 +234,13 @@ Extract.prototype._write = function (data, enc, cb) {
this._overflow = overflow this._overflow = overflow
this._onparse() this._onparse()
}
_final (cb) {
cb(this._partial ? new Error('Unexpected end of data') : null)
}
} }
Extract.prototype._final = function (cb) { module.exports = function extract (opts) {
if (this._partial) return this.destroy(new Error('Unexpected end of data')) return new Extract(opts)
cb()
} }
module.exports = Extract

157
headers.js
View file

@ -1,17 +1,17 @@
var alloc = Buffer.alloc const b4a = require('b4a')
var ZEROS = '0000000000000000000' const ZEROS = '0000000000000000000'
var SEVENS = '7777777777777777777' const SEVENS = '7777777777777777777'
var ZERO_OFFSET = '0'.charCodeAt(0) const ZERO_OFFSET = '0'.charCodeAt(0)
var USTAR_MAGIC = Buffer.from('ustar\x00', 'binary') const USTAR_MAGIC = b4a.from('ustar\x00', 'binary')
var USTAR_VER = Buffer.from('00', 'binary') const USTAR_VER = b4a.from('00', 'binary')
var GNU_MAGIC = Buffer.from('ustar\x20', 'binary') const GNU_MAGIC = b4a.from('ustar\x20', 'binary')
var GNU_VER = Buffer.from('\x20\x00', 'binary') const GNU_VER = b4a.from('\x20\x00', 'binary')
var MASK = parseInt('7777', 8) const MASK = 0o7777
var MAGIC_OFFSET = 257 const MAGIC_OFFSET = 257
var VERSION_OFFSET = 263 const VERSION_OFFSET = 263
var clamp = function (index, len, defaultValue) { const clamp = function (index, len, defaultValue) {
if (typeof index !== 'number') return defaultValue if (typeof index !== 'number') return defaultValue
index = ~~index // Coerce to integer. index = ~~index // Coerce to integer.
if (index >= len) return len if (index >= len) return len
@ -21,7 +21,7 @@ var clamp = function (index, len, defaultValue) {
return 0 return 0
} }
var toType = function (flag) { const toType = function (flag) {
switch (flag) { switch (flag) {
case 0: case 0:
return 'file' return 'file'
@ -53,7 +53,7 @@ var toType = function (flag) {
return null return null
} }
var toTypeflag = function (flag) { const toTypeflag = function (flag) {
switch (flag) { switch (flag) {
case 'file': case 'file':
return 0 return 0
@ -78,21 +78,21 @@ var toTypeflag = function (flag) {
return 0 return 0
} }
var indexOf = function (block, num, offset, end) { const indexOf = function (block, num, offset, end) {
for (; offset < end; offset++) { for (; offset < end; offset++) {
if (block[offset] === num) return offset if (block[offset] === num) return offset
} }
return end return end
} }
var cksum = function (block) { const cksum = function (block) {
var sum = 8 * 32 let sum = 8 * 32
for (var i = 0; i < 148; i++) sum += block[i] for (let i = 0; i < 148; i++) sum += block[i]
for (var j = 156; j < 512; j++) sum += block[j] for (let j = 156; j < 512; j++) sum += block[j]
return sum return sum
} }
var encodeOct = function (val, n) { const encodeOct = function (val, n) {
val = val.toString(8) val = val.toString(8)
if (val.length > n) return SEVENS.slice(0, n) + ' ' if (val.length > n) return SEVENS.slice(0, n) + ' '
else return ZEROS.slice(0, n - val.length) + val + ' ' else return ZEROS.slice(0, n - val.length) + val + ' '
@ -106,21 +106,22 @@ var encodeOct = function (val, n) {
function parse256 (buf) { function parse256 (buf) {
// first byte MUST be either 80 or FF // first byte MUST be either 80 or FF
// 80 for positive, FF for 2's comp // 80 for positive, FF for 2's comp
var positive let positive
if (buf[0] === 0x80) positive = true if (buf[0] === 0x80) positive = true
else if (buf[0] === 0xFF) positive = false else if (buf[0] === 0xFF) positive = false
else return null else return null
// build up a base-256 tuple from the least sig to the highest // build up a base-256 tuple from the least sig to the highest
var tuple = [] const tuple = []
for (var i = buf.length - 1; i > 0; i--) { let i
var byte = buf[i] for (i = buf.length - 1; i > 0; i--) {
const byte = buf[i]
if (positive) tuple.push(byte) if (positive) tuple.push(byte)
else tuple.push(0xFF - byte) else tuple.push(0xFF - byte)
} }
var sum = 0 let sum = 0
var l = tuple.length const l = tuple.length
for (i = 0; i < l; i++) { for (i = 0; i < l; i++) {
sum += tuple[i] * Math.pow(256, i) sum += tuple[i] * Math.pow(256, i)
} }
@ -128,7 +129,7 @@ function parse256 (buf) {
return positive ? sum : -1 * sum return positive ? sum : -1 * sum
} }
var decodeOct = function (val, offset, length) { const decodeOct = function (val, offset, length) {
val = val.slice(offset, offset + length) val = val.slice(offset, offset + length)
offset = 0 offset = 0
@ -138,20 +139,20 @@ var decodeOct = function (val, offset, length) {
} else { } else {
// Older versions of tar can prefix with spaces // Older versions of tar can prefix with spaces
while (offset < val.length && val[offset] === 32) offset++ while (offset < val.length && val[offset] === 32) offset++
var end = clamp(indexOf(val, 32, offset, val.length), val.length, val.length) const end = clamp(indexOf(val, 32, offset, val.length), val.length, val.length)
while (offset < end && val[offset] === 0) offset++ while (offset < end && val[offset] === 0) offset++
if (end === offset) return 0 if (end === offset) return 0
return parseInt(val.slice(offset, end).toString(), 8) return parseInt(val.slice(offset, end).toString(), 8)
} }
} }
var decodeStr = function (val, offset, length, encoding) { const decodeStr = function (val, offset, length, encoding) {
return val.slice(offset, indexOf(val, 0, offset, offset + length)).toString(encoding) return val.slice(offset, indexOf(val, 0, offset, offset + length)).toString(encoding)
} }
var addLength = function (str) { const addLength = function (str) {
var len = Buffer.byteLength(str) const len = b4a.byteLength(str)
var digits = Math.floor(Math.log(len) / Math.log(10)) + 1 let digits = Math.floor(Math.log(len) / Math.log(10)) + 1
if (len + digits >= Math.pow(10, digits)) digits++ if (len + digits >= Math.pow(10, digits)) digits++
return (len + digits) + str return (len + digits) + str
@ -162,29 +163,29 @@ exports.decodeLongPath = function (buf, encoding) {
} }
exports.encodePax = function (opts) { // TODO: encode more stuff in pax exports.encodePax = function (opts) { // TODO: encode more stuff in pax
var result = '' let result = ''
if (opts.name) result += addLength(' path=' + opts.name + '\n') if (opts.name) result += addLength(' path=' + opts.name + '\n')
if (opts.linkname) result += addLength(' linkpath=' + opts.linkname + '\n') if (opts.linkname) result += addLength(' linkpath=' + opts.linkname + '\n')
var pax = opts.pax const pax = opts.pax
if (pax) { if (pax) {
for (var key in pax) { for (const key in pax) {
result += addLength(' ' + key + '=' + pax[key] + '\n') result += addLength(' ' + key + '=' + pax[key] + '\n')
} }
} }
return Buffer.from(result) return b4a.from(result)
} }
exports.decodePax = function (buf) { exports.decodePax = function (buf) {
var result = {} const result = {}
while (buf.length) { while (buf.length) {
var i = 0 let i = 0
while (i < buf.length && buf[i] !== 32) i++ while (i < buf.length && buf[i] !== 32) i++
var len = parseInt(buf.slice(0, i).toString(), 10) const len = parseInt(buf.slice(0, i).toString(), 10)
if (!len) return result if (!len) return result
var b = buf.slice(i + 1, len - 1).toString() const b = buf.slice(i + 1, len - 1).toString()
var keyIndex = b.indexOf('=') const keyIndex = b.indexOf('=')
if (keyIndex === -1) return result if (keyIndex === -1) return result
result[b.slice(0, keyIndex)] = b.slice(keyIndex + 1) result[b.slice(0, keyIndex)] = b.slice(keyIndex + 1)
@ -195,65 +196,65 @@ exports.decodePax = function (buf) {
} }
exports.encode = function (opts) { exports.encode = function (opts) {
var buf = alloc(512) const buf = b4a.alloc(512)
var name = opts.name let name = opts.name
var prefix = '' let prefix = ''
if (opts.typeflag === 5 && name[name.length - 1] !== '/') name += '/' if (opts.typeflag === 5 && name[name.length - 1] !== '/') name += '/'
if (Buffer.byteLength(name) !== name.length) return null // utf-8 if (b4a.byteLength(name) !== name.length) return null // utf-8
while (Buffer.byteLength(name) > 100) { while (b4a.byteLength(name) > 100) {
var i = name.indexOf('/') const i = name.indexOf('/')
if (i === -1) return null if (i === -1) return null
prefix += prefix ? '/' + name.slice(0, i) : name.slice(0, i) prefix += prefix ? '/' + name.slice(0, i) : name.slice(0, i)
name = name.slice(i + 1) name = name.slice(i + 1)
} }
if (Buffer.byteLength(name) > 100 || Buffer.byteLength(prefix) > 155) return null if (b4a.byteLength(name) > 100 || b4a.byteLength(prefix) > 155) return null
if (opts.linkname && Buffer.byteLength(opts.linkname) > 100) return null if (opts.linkname && b4a.byteLength(opts.linkname) > 100) return null
buf.write(name) b4a.write(buf, name)
buf.write(encodeOct(opts.mode & MASK, 6), 100) b4a.write(buf, encodeOct(opts.mode & MASK, 6), 100)
buf.write(encodeOct(opts.uid, 6), 108) b4a.write(buf, encodeOct(opts.uid, 6), 108)
buf.write(encodeOct(opts.gid, 6), 116) b4a.write(buf, encodeOct(opts.gid, 6), 116)
buf.write(encodeOct(opts.size, 11), 124) b4a.write(buf, encodeOct(opts.size, 11), 124)
buf.write(encodeOct((opts.mtime.getTime() / 1000) | 0, 11), 136) b4a.write(buf, encodeOct((opts.mtime.getTime() / 1000) | 0, 11), 136)
buf[156] = ZERO_OFFSET + toTypeflag(opts.type) buf[156] = ZERO_OFFSET + toTypeflag(opts.type)
if (opts.linkname) buf.write(opts.linkname, 157) if (opts.linkname) b4a.write(buf, opts.linkname, 157)
USTAR_MAGIC.copy(buf, MAGIC_OFFSET) b4a.copy(USTAR_MAGIC, buf, MAGIC_OFFSET)
USTAR_VER.copy(buf, VERSION_OFFSET) b4a.copy(USTAR_VER, buf, VERSION_OFFSET)
if (opts.uname) buf.write(opts.uname, 265) if (opts.uname) b4a.write(buf, opts.uname, 265)
if (opts.gname) buf.write(opts.gname, 297) if (opts.gname) b4a.write(buf, opts.gname, 297)
buf.write(encodeOct(opts.devmajor || 0, 6), 329) b4a.write(buf, encodeOct(opts.devmajor || 0, 6), 329)
buf.write(encodeOct(opts.devminor || 0, 6), 337) b4a.write(buf, encodeOct(opts.devminor || 0, 6), 337)
if (prefix) buf.write(prefix, 345) if (prefix) b4a.write(buf, prefix, 345)
buf.write(encodeOct(cksum(buf), 6), 148) b4a.write(buf, encodeOct(cksum(buf), 6), 148)
return buf return buf
} }
exports.decode = function (buf, filenameEncoding, allowUnknownFormat) { exports.decode = function (buf, filenameEncoding, allowUnknownFormat) {
var typeflag = buf[156] === 0 ? 0 : buf[156] - ZERO_OFFSET let typeflag = buf[156] === 0 ? 0 : buf[156] - ZERO_OFFSET
var name = decodeStr(buf, 0, 100, filenameEncoding) let name = decodeStr(buf, 0, 100, filenameEncoding)
var mode = decodeOct(buf, 100, 8) const mode = decodeOct(buf, 100, 8)
var uid = decodeOct(buf, 108, 8) const uid = decodeOct(buf, 108, 8)
var gid = decodeOct(buf, 116, 8) const gid = decodeOct(buf, 116, 8)
var size = decodeOct(buf, 124, 12) const size = decodeOct(buf, 124, 12)
var mtime = decodeOct(buf, 136, 12) const mtime = decodeOct(buf, 136, 12)
var type = toType(typeflag) const type = toType(typeflag)
var linkname = buf[157] === 0 ? null : decodeStr(buf, 157, 100, filenameEncoding) const linkname = buf[157] === 0 ? null : decodeStr(buf, 157, 100, filenameEncoding)
var uname = decodeStr(buf, 265, 32) const uname = decodeStr(buf, 265, 32)
var gname = decodeStr(buf, 297, 32) const gname = decodeStr(buf, 297, 32)
var devmajor = decodeOct(buf, 329, 8) const devmajor = decodeOct(buf, 329, 8)
var devminor = decodeOct(buf, 337, 8) const devminor = decodeOct(buf, 337, 8)
var c = cksum(buf) const c = cksum(buf)
// checksum is still initial value if header was null. // checksum is still initial value if header was null.
if (c === 8 * 32) return null if (c === 8 * 32) return null

190
pack.js
View file

@ -1,24 +1,20 @@
var constants = require('fs-constants') const { constants } = require('fs')
var eos = require('end-of-stream') const { Readable, Writable } = require('streamx')
var inherits = require('inherits') const { StringDecoder } = require('string_decoder')
var alloc = Buffer.alloc const b4a = require('b4a')
var Readable = require('readable-stream').Readable const headers = require('./headers')
var Writable = require('readable-stream').Writable
var StringDecoder = require('string_decoder').StringDecoder
var headers = require('./headers') const DMODE = 0o755
const FMODE = 0o644
var DMODE = parseInt('755', 8) const END_OF_TAR = b4a.alloc(1024)
var FMODE = parseInt('644', 8)
var END_OF_TAR = alloc(1024) const noop = function () {}
var noop = function () {} const overflow = function (self, size) {
var overflow = function (self, size) {
size &= 511 size &= 511
if (size) self.push(END_OF_TAR.slice(0, 512 - size)) if (size) self.push(END_OF_TAR.subarray(0, 512 - size))
} }
function modeToType (mode) { function modeToType (mode) {
@ -33,80 +29,51 @@ function modeToType (mode) {
return 'file' return 'file'
} }
var Sink = function (to) { class Sink extends Writable {
Writable.call(this) constructor (to) {
super()
this.written = 0 this.written = 0
this._to = to this._to = to
this._destroyed = false }
}
inherits(Sink, Writable) _write (data, cb) {
this.written += data.byteLength
Sink.prototype._write = function (data, enc, cb) {
this.written += data.length
if (this._to.push(data)) return cb() if (this._to.push(data)) return cb()
this._to._drain = cb this._to._drain = cb
}
} }
Sink.prototype.destroy = function () { class LinkSink extends Writable {
if (this._destroyed) return constructor () {
this._destroyed = true super()
this.emit('close')
}
var LinkSink = function () {
Writable.call(this)
this.linkname = '' this.linkname = ''
this._decoder = new StringDecoder('utf-8') this._decoder = new StringDecoder('utf-8')
this._destroyed = false }
}
inherits(LinkSink, Writable) _write (data, cb) {
LinkSink.prototype._write = function (data, enc, cb) {
this.linkname += this._decoder.write(data) this.linkname += this._decoder.write(data)
cb() cb()
}
} }
LinkSink.prototype.destroy = function () { class Void extends Writable {
if (this._destroyed) return _write (data, cb) {
this._destroyed = true
this.emit('close')
}
var Void = function () {
Writable.call(this)
this._destroyed = false
}
inherits(Void, Writable)
Void.prototype._write = function (data, enc, cb) {
cb(new Error('No body allowed for this entry')) cb(new Error('No body allowed for this entry'))
}
} }
Void.prototype.destroy = function () { class Pack extends Readable {
if (this._destroyed) return constructor (opts) {
this._destroyed = true super(opts)
this.emit('close')
}
var Pack = function (opts) {
if (!(this instanceof Pack)) return new Pack(opts)
Readable.call(this, opts)
this._drain = noop this._drain = noop
this._finalized = false this._finalized = false
this._finalizing = false this._finalizing = false
this._destroyed = false
this._stream = null this._stream = null
} }
inherits(Pack, Readable) entry (header, buffer, callback) {
Pack.prototype.entry = function (header, buffer, callback) {
if (this._stream) throw new Error('already piping an entry') if (this._stream) throw new Error('already piping an entry')
if (this._finalized || this._destroyed) return if (this._finalized || this.destroyed) return
if (typeof buffer === 'function') { if (typeof buffer === 'function') {
callback = buffer callback = buffer
@ -115,7 +82,7 @@ Pack.prototype.entry = function (header, buffer, callback) {
if (!callback) callback = noop if (!callback) callback = noop
var self = this const self = this
if (!header.size || header.type === 'symlink') header.size = 0 if (!header.size || header.type === 'symlink') header.size = 0
if (!header.type) header.type = modeToType(header.mode) if (!header.type) header.type = modeToType(header.mode)
@ -124,11 +91,11 @@ Pack.prototype.entry = function (header, buffer, callback) {
if (!header.gid) header.gid = 0 if (!header.gid) header.gid = 0
if (!header.mtime) header.mtime = new Date() if (!header.mtime) header.mtime = new Date()
if (typeof buffer === 'string') buffer = Buffer.from(buffer) if (typeof buffer === 'string') buffer = b4a.from(buffer)
if (Buffer.isBuffer(buffer)) { if (b4a.isBuffer(buffer)) {
header.size = buffer.length header.size = buffer.byteLength
this._encode(header) this._encode(header)
var ok = this.push(buffer) const ok = this.push(buffer)
overflow(self, header.size) overflow(self, header.size)
if (ok) process.nextTick(callback) if (ok) process.nextTick(callback)
else this._drain = callback else this._drain = callback
@ -136,13 +103,13 @@ Pack.prototype.entry = function (header, buffer, callback) {
} }
if (header.type === 'symlink' && !header.linkname) { if (header.type === 'symlink' && !header.linkname) {
var linkSink = new LinkSink() const linkSink = new LinkSink()
eos(linkSink, function (err) { linkSink
if (err) { // stream was closed .on('error', function (err) {
self.destroy() self.destroy()
return callback(err) callback(err)
} })
.on('close', function () {
header.linkname = linkSink.linkname header.linkname = linkSink.linkname
self._encode(header) self._encode(header)
callback() callback()
@ -158,32 +125,30 @@ Pack.prototype.entry = function (header, buffer, callback) {
return new Void() return new Void()
} }
var sink = new Sink(this) const sink = new Sink(this)
sink
this._stream = sink .on('error', function (err) {
self._stream = null
eos(sink, function (err) { self.destroy()
callback(err)
})
.on('close', function () {
self._stream = null self._stream = null
if (err) { // stream was closed
self.destroy()
return callback(err)
}
if (sink.written !== header.size) { // corrupting tar if (sink.written !== header.size) { // corrupting tar
self.destroy()
return callback(new Error('size mismatch'))
} }
overflow(self, header.size) overflow(self, header.size)
if (self._finalizing) self.finalize() if (self._finalizing) { self.finalize() }
callback() callback()
}) })
return sink this._stream = sink
}
Pack.prototype.finalize = function () { return sink
}
finalize () {
if (this._stream) { if (this._stream) {
this._finalizing = true this._finalizing = true
return return
@ -193,41 +158,32 @@ Pack.prototype.finalize = function () {
this._finalized = true this._finalized = true
this.push(END_OF_TAR) this.push(END_OF_TAR)
this.push(null) this.push(null)
} }
Pack.prototype.destroy = function (err) { _encode (header) {
if (this._destroyed) return
this._destroyed = true
if (err) this.emit('error', err)
this.emit('close')
if (this._stream && this._stream.destroy) this._stream.destroy()
}
Pack.prototype._encode = function (header) {
if (!header.pax) { if (!header.pax) {
var buf = headers.encode(header) const buf = headers.encode(header)
if (buf) { if (buf) {
this.push(buf) this.push(buf)
return return
} }
} }
this._encodePax(header) this._encodePax(header)
} }
Pack.prototype._encodePax = function (header) { _encodePax (header) {
var paxHeader = headers.encodePax({ const paxHeader = headers.encodePax({
name: header.name, name: header.name,
linkname: header.linkname, linkname: header.linkname,
pax: header.pax pax: header.pax
}) })
var newHeader = { const newHeader = {
name: 'PaxHeader', name: 'PaxHeader',
mode: header.mode, mode: header.mode,
uid: header.uid, uid: header.uid,
gid: header.gid, gid: header.gid,
size: paxHeader.length, size: paxHeader.byteLength,
mtime: header.mtime, mtime: header.mtime,
type: 'pax-header', type: 'pax-header',
linkname: header.linkname && 'PaxHeader', linkname: header.linkname && 'PaxHeader',
@ -239,17 +195,21 @@ Pack.prototype._encodePax = function (header) {
this.push(headers.encode(newHeader)) this.push(headers.encode(newHeader))
this.push(paxHeader) this.push(paxHeader)
overflow(this, paxHeader.length) overflow(this, paxHeader.byteLength)
newHeader.size = header.size newHeader.size = header.size
newHeader.type = header.type newHeader.type = header.type
this.push(headers.encode(newHeader)) this.push(headers.encode(newHeader))
} }
Pack.prototype._read = function (n) { _read (cb) {
var drain = this._drain const drain = this._drain
this._drain = noop this._drain = noop
drain() drain()
cb()
}
} }
module.exports = Pack module.exports = function pack (opts) {
return new Pack(opts)
}

64
package.json
View file

@ -1,58 +1,32 @@
{ {
"name": "tar-stream", "name": "tar-stream",
"version": "2.2.0", "version": "2.2.0",
"description": "tar-stream is a streaming tar parser and generator and nothing else. It is streams2 and operates purely using streams which means you can easily extract/parse tarballs without ever hitting the file system.", "description": "tar-stream is a streaming tar parser and generator and nothing else. It operates purely using streams which means you can easily extract/parse tarballs without ever hitting the file system.",
"author": "Mathias Buus <mathiasbuus@gmail.com>",
"dependencies": {
"bl": "^4.0.3",
"end-of-stream": "^1.4.1",
"fs-constants": "^1.0.0",
"inherits": "^2.0.3",
"readable-stream": "^3.1.1"
},
"devDependencies": {
"concat-stream": "^2.0.0",
"standard": "^12.0.1",
"tape": "^4.9.2"
},
"scripts": {
"test": "standard && tape test/extract.js test/pack.js",
"test-all": "standard && tape test/*.js"
},
"keywords": [
"tar",
"tarball",
"parse",
"parser",
"generate",
"generator",
"stream",
"stream2",
"streams",
"streams2",
"streaming",
"pack",
"extract",
"modify"
],
"bugs": {
"url": "https://github.com/mafintosh/tar-stream/issues"
},
"homepage": "https://github.com/mafintosh/tar-stream",
"main": "index.js", "main": "index.js",
"files": [ "files": [
"*.js", "*.js"
"LICENSE"
], ],
"directories": { "scripts": {
"test": "test" "test": "standard && brittle test/*.js"
}, },
"license": "MIT",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/mafintosh/tar-stream.git" "url": "git+https://github.com/mafintosh/tar-stream.git"
}, },
"engines": { "author": "Mathias Buus <mathiasbuus@gmail.com>",
"node": ">=6" "license": "MIT",
"bugs": {
"url": "https://github.com/mafintosh/tar-stream/issues"
},
"homepage": "https://github.com/mafintosh/tar-stream",
"dependencies": {
"b4a": "^1.6.1",
"bl": "^6.0.0",
"streamx": "^2.12.5"
},
"devDependencies": {
"brittle": "^3.1.1",
"concat-stream": "^2.0.0",
"standard": "^17.0.0"
} }
} }

304
test/extract.js
View file

@ -1,10 +1,10 @@
var test = require('tape') const test = require('brittle')
var tar = require('../index') const concat = require('concat-stream')
var fixtures = require('./fixtures') const fs = require('fs')
var concat = require('concat-stream') const tar = require('..')
var fs = require('fs') const fixtures = require('./fixtures')
var clamp = function (index, len, defaultValue) { const clamp = function (index, len, defaultValue) {
if (typeof index !== 'number') return defaultValue if (typeof index !== 'number') return defaultValue
index = ~~index // Coerce to integer. index = ~~index // Coerce to integer.
if (index >= len) return len if (index >= len) return len
@ -17,13 +17,13 @@ var clamp = function (index, len, defaultValue) {
test('one-file', function (t) { test('one-file', function (t) {
t.plan(3) t.plan(3)
var extract = tar.extract() const extract = tar.extract()
var noEntries = false let noEntries = false
extract.on('entry', function (header, stream, callback) { extract.on('entry', function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'test.txt', name: 'test.txt',
mode: parseInt('644', 8), mode: 0o644,
uid: 501, uid: 501,
gid: 20, gid: 20,
size: 12, size: 12,
@ -38,8 +38,8 @@ test('one-file', function (t) {
stream.pipe(concat(function (data) { stream.pipe(concat(function (data) {
noEntries = true noEntries = true
t.same(data.toString(), 'hello world\n') t.is(data.toString(), 'hello world\n')
callback() cb()
})) }))
}) })
@ -53,13 +53,13 @@ test('one-file', function (t) {
test('chunked-one-file', function (t) { test('chunked-one-file', function (t) {
t.plan(3) t.plan(3)
var extract = tar.extract() const extract = tar.extract()
var noEntries = false let noEntries = false
extract.on('entry', function (header, stream, callback) { extract.on('entry', function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'test.txt', name: 'test.txt',
mode: parseInt('644', 8), mode: 0o644,
uid: 501, uid: 501,
gid: 20, gid: 20,
size: 12, size: 12,
@ -74,8 +74,8 @@ test('chunked-one-file', function (t) {
stream.pipe(concat(function (data) { stream.pipe(concat(function (data) {
noEntries = true noEntries = true
t.same(data.toString(), 'hello world\n') t.is(data.toString(), 'hello world\n')
callback() cb()
})) }))
}) })
@ -83,10 +83,10 @@ test('chunked-one-file', function (t) {
t.ok(noEntries) t.ok(noEntries)
}) })
var b = fs.readFileSync(fixtures.ONE_FILE_TAR) const b = fs.readFileSync(fixtures.ONE_FILE_TAR)
for (var i = 0; i < b.length; i += 321) { for (let i = 0; i < b.length; i += 321) {
extract.write(b.slice(i, clamp(i + 321, b.length, b.length))) extract.write(b.subarray(i, clamp(i + 321, b.length, b.length)))
} }
extract.end() extract.end()
}) })
@ -94,13 +94,13 @@ test('chunked-one-file', function (t) {
test('multi-file', function (t) { test('multi-file', function (t) {
t.plan(5) t.plan(5)
var extract = tar.extract() const extract = tar.extract()
var noEntries = false let noEntries = false
var onfile1 = function (header, stream, callback) { const onfile1 = function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'file-1.txt', name: 'file-1.txt',
mode: parseInt('644', 8), mode: 0o644,
uid: 501, uid: 501,
gid: 20, gid: 20,
size: 12, size: 12,
@ -115,15 +115,15 @@ test('multi-file', function (t) {
extract.on('entry', onfile2) extract.on('entry', onfile2)
stream.pipe(concat(function (data) { stream.pipe(concat(function (data) {
t.same(data.toString(), 'i am file-1\n') t.is(data.toString(), 'i am file-1\n')
callback() cb()
})) }))
} }
var onfile2 = function (header, stream, callback) { const onfile2 = function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'file-2.txt', name: 'file-2.txt',
mode: parseInt('644', 8), mode: 0o644,
uid: 501, uid: 501,
gid: 20, gid: 20,
size: 12, size: 12,
@ -138,8 +138,8 @@ test('multi-file', function (t) {
stream.pipe(concat(function (data) { stream.pipe(concat(function (data) {
noEntries = true noEntries = true
t.same(data.toString(), 'i am file-2\n') t.is(data.toString(), 'i am file-2\n')
callback() cb()
})) }))
} }
@ -155,13 +155,13 @@ test('multi-file', function (t) {
test('chunked-multi-file', function (t) { test('chunked-multi-file', function (t) {
t.plan(5) t.plan(5)
var extract = tar.extract() const extract = tar.extract()
var noEntries = false let noEntries = false
var onfile1 = function (header, stream, callback) { const onfile1 = function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'file-1.txt', name: 'file-1.txt',
mode: parseInt('644', 8), mode: 0o644,
uid: 501, uid: 501,
gid: 20, gid: 20,
size: 12, size: 12,
@ -176,15 +176,15 @@ test('chunked-multi-file', function (t) {
extract.on('entry', onfile2) extract.on('entry', onfile2)
stream.pipe(concat(function (data) { stream.pipe(concat(function (data) {
t.same(data.toString(), 'i am file-1\n') t.is(data.toString(), 'i am file-1\n')
callback() cb()
})) }))
} }
var onfile2 = function (header, stream, callback) { const onfile2 = function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'file-2.txt', name: 'file-2.txt',
mode: parseInt('644', 8), mode: 0o644,
uid: 501, uid: 501,
gid: 20, gid: 20,
size: 12, size: 12,
@ -199,8 +199,8 @@ test('chunked-multi-file', function (t) {
stream.pipe(concat(function (data) { stream.pipe(concat(function (data) {
noEntries = true noEntries = true
t.same(data.toString(), 'i am file-2\n') t.is(data.toString(), 'i am file-2\n')
callback() cb()
})) }))
} }
@ -210,9 +210,9 @@ test('chunked-multi-file', function (t) {
t.ok(noEntries) t.ok(noEntries)
}) })
var b = fs.readFileSync(fixtures.MULTI_FILE_TAR) const b = fs.readFileSync(fixtures.MULTI_FILE_TAR)
for (var i = 0; i < b.length; i += 321) { for (let i = 0; i < b.length; i += 321) {
extract.write(b.slice(i, clamp(i + 321, b.length, b.length))) extract.write(b.subarray(i, clamp(i + 321, b.length, b.length)))
} }
extract.end() extract.end()
}) })
@ -220,13 +220,13 @@ test('chunked-multi-file', function (t) {
test('pax', function (t) { test('pax', function (t) {
t.plan(3) t.plan(3)
var extract = tar.extract() const extract = tar.extract()
var noEntries = false let noEntries = false
extract.on('entry', function (header, stream, callback) { extract.on('entry', function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'pax.txt', name: 'pax.txt',
mode: parseInt('644', 8), mode: 0o644,
uid: 501, uid: 501,
gid: 20, gid: 20,
size: 12, size: 12,
@ -242,8 +242,8 @@ test('pax', function (t) {
stream.pipe(concat(function (data) { stream.pipe(concat(function (data) {
noEntries = true noEntries = true
t.same(data.toString(), 'hello world\n') t.is(data.toString(), 'hello world\n')
callback() cb()
})) }))
}) })
@ -257,13 +257,13 @@ test('pax', function (t) {
test('types', function (t) { test('types', function (t) {
t.plan(3) t.plan(3)
var extract = tar.extract() const extract = tar.extract()
var noEntries = false let noEntries = false
var ondir = function (header, stream, callback) { const ondir = function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'directory', name: 'directory',
mode: parseInt('755', 8), mode: 0o755,
uid: 501, uid: 501,
gid: 20, gid: 20,
size: 0, size: 0,
@ -279,13 +279,13 @@ test('types', function (t) {
t.ok(false) t.ok(false)
}) })
extract.once('entry', onlink) extract.once('entry', onlink)
callback() cb()
} }
var onlink = function (header, stream, callback) { const onlink = function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'directory-link', name: 'directory-link',
mode: parseInt('755', 8), mode: 0o755,
uid: 501, uid: 501,
gid: 20, gid: 20,
size: 0, size: 0,
@ -301,7 +301,7 @@ test('types', function (t) {
t.ok(false) t.ok(false)
}) })
noEntries = true noEntries = true
callback() cb()
} }
extract.once('entry', ondir) extract.once('entry', ondir)
@ -316,13 +316,13 @@ test('types', function (t) {
test('long-name', function (t) { test('long-name', function (t) {
t.plan(3) t.plan(3)
var extract = tar.extract() const extract = tar.extract()
var noEntries = false let noEntries = false
extract.on('entry', function (header, stream, callback) { extract.on('entry', function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'my/file/is/longer/than/100/characters/and/should/use/the/prefix/header/foobarbaz/foobarbaz/foobarbaz/foobarbaz/foobarbaz/foobarbaz/filename.txt', name: 'my/file/is/longer/than/100/characters/and/should/use/the/prefix/header/foobarbaz/foobarbaz/foobarbaz/foobarbaz/foobarbaz/foobarbaz/filename.txt',
mode: parseInt('644', 8), mode: 0o644,
uid: 501, uid: 501,
gid: 20, gid: 20,
size: 16, size: 16,
@ -337,8 +337,8 @@ test('long-name', function (t) {
stream.pipe(concat(function (data) { stream.pipe(concat(function (data) {
noEntries = true noEntries = true
t.same(data.toString(), 'hello long name\n') t.is(data.toString(), 'hello long name\n')
callback() cb()
})) }))
}) })
@ -352,13 +352,13 @@ test('long-name', function (t) {
test('unicode-bsd', function (t) { // can unpack a bsdtar unicoded tarball test('unicode-bsd', function (t) { // can unpack a bsdtar unicoded tarball
t.plan(3) t.plan(3)
var extract = tar.extract() const extract = tar.extract()
var noEntries = false let noEntries = false
extract.on('entry', function (header, stream, callback) { extract.on('entry', function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'høllø.txt', name: 'høllø.txt',
mode: parseInt('644', 8), mode: 0o644,
uid: 501, uid: 501,
gid: 20, gid: 20,
size: 4, size: 4,
@ -374,8 +374,8 @@ test('unicode-bsd', function (t) { // can unpack a bsdtar unicoded tarball
stream.pipe(concat(function (data) { stream.pipe(concat(function (data) {
noEntries = true noEntries = true
t.same(data.toString(), 'hej\n') t.is(data.toString(), 'hej\n')
callback() cb()
})) }))
}) })
@ -389,13 +389,13 @@ test('unicode-bsd', function (t) { // can unpack a bsdtar unicoded tarball
test('unicode', function (t) { // can unpack a bsdtar unicoded tarball test('unicode', function (t) { // can unpack a bsdtar unicoded tarball
t.plan(3) t.plan(3)
var extract = tar.extract() const extract = tar.extract()
var noEntries = false let noEntries = false
extract.on('entry', function (header, stream, callback) { extract.on('entry', function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'høstål.txt', name: 'høstål.txt',
mode: parseInt('644', 8), mode: 0o644,
uid: 501, uid: 501,
gid: 20, gid: 20,
size: 8, size: 8,
@ -411,8 +411,8 @@ test('unicode', function (t) { // can unpack a bsdtar unicoded tarball
stream.pipe(concat(function (data) { stream.pipe(concat(function (data) {
noEntries = true noEntries = true
t.same(data.toString(), 'høllø\n') t.is(data.toString(), 'høllø\n')
callback() cb()
})) }))
}) })
@ -426,19 +426,19 @@ test('unicode', function (t) { // can unpack a bsdtar unicoded tarball
test('name-is-100', function (t) { test('name-is-100', function (t) {
t.plan(3) t.plan(3)
var extract = tar.extract() const extract = tar.extract()
extract.on('entry', function (header, stream, callback) { extract.on('entry', function (header, stream, cb) {
t.same(header.name.length, 100) t.is(header.name.length, 100)
stream.pipe(concat(function (data) { stream.pipe(concat(function (data) {
t.same(data.toString(), 'hello\n') t.is(data.toString(), 'hello\n')
callback() cb()
})) }))
}) })
extract.on('finish', function () { extract.on('finish', function () {
t.ok(true) t.pass()
}) })
extract.end(fs.readFileSync(fixtures.NAME_IS_100_TAR)) extract.end(fs.readFileSync(fixtures.NAME_IS_100_TAR))
@ -447,7 +447,7 @@ test('name-is-100', function (t) {
test('invalid-file', function (t) { test('invalid-file', function (t) {
t.plan(1) t.plan(1)
var extract = tar.extract() const extract = tar.extract()
extract.on('error', function (err) { extract.on('error', function (err) {
t.ok(!!err) t.ok(!!err)
@ -460,15 +460,15 @@ test('invalid-file', function (t) {
test('space prefixed', function (t) { test('space prefixed', function (t) {
t.plan(5) t.plan(5)
var extract = tar.extract() const extract = tar.extract()
extract.on('entry', function (header, stream, callback) { extract.on('entry', function (header, stream, cb) {
t.ok(true) t.pass()
callback() cb()
}) })
extract.on('finish', function () { extract.on('finish', function () {
t.ok(true) t.pass()
}) })
extract.end(fs.readFileSync(fixtures.SPACE_TAR_GZ)) extract.end(fs.readFileSync(fixtures.SPACE_TAR_GZ))
@ -477,15 +477,15 @@ test('space prefixed', function (t) {
test('gnu long path', function (t) { test('gnu long path', function (t) {
t.plan(2) t.plan(2)
var extract = tar.extract() const extract = tar.extract()
extract.on('entry', function (header, stream, callback) { extract.on('entry', function (header, stream, cb) {
t.ok(header.name.length > 100) t.ok(header.name.length > 100)
callback() cb()
}) })
extract.on('finish', function () { extract.on('finish', function () {
t.ok(true) t.pass()
}) })
extract.end(fs.readFileSync(fixtures.GNU_LONG_PATH)) extract.end(fs.readFileSync(fixtures.GNU_LONG_PATH))
@ -493,12 +493,12 @@ test('gnu long path', function (t) {
test('base 256 uid and gid', function (t) { test('base 256 uid and gid', function (t) {
t.plan(2) t.plan(2)
var extract = tar.extract() const extract = tar.extract()
extract.on('entry', function (header, stream, callback) { extract.on('entry', function (header, stream, cb) {
t.ok(header.uid === 116435139) t.ok(header.uid === 116435139)
t.ok(header.gid === 1876110778) t.ok(header.gid === 1876110778)
callback() cb()
}) })
extract.end(fs.readFileSync(fixtures.BASE_256_UID_GID)) extract.end(fs.readFileSync(fixtures.BASE_256_UID_GID))
@ -507,12 +507,12 @@ test('base 256 uid and gid', function (t) {
test('base 256 size', function (t) { test('base 256 size', function (t) {
t.plan(2) t.plan(2)
var extract = tar.extract() const extract = tar.extract()
extract.on('entry', function (header, stream, callback) { extract.on('entry', function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'test.txt', name: 'test.txt',
mode: parseInt('644', 8), mode: 0o644,
uid: 501, uid: 501,
gid: 20, gid: 20,
size: 12, size: 12,
@ -524,11 +524,11 @@ test('base 256 size', function (t) {
devmajor: 0, devmajor: 0,
devminor: 0 devminor: 0
}) })
callback() cb()
}) })
extract.on('finish', function () { extract.on('finish', function () {
t.ok(true) t.pass()
}) })
extract.end(fs.readFileSync(fixtures.BASE_256_SIZE)) extract.end(fs.readFileSync(fixtures.BASE_256_SIZE))
@ -538,13 +538,13 @@ test('latin-1', function (t) { // can unpack filenames encoded in latin-1
t.plan(3) t.plan(3)
// This is the older name for the "latin1" encoding in Node // This is the older name for the "latin1" encoding in Node
var extract = tar.extract({ filenameEncoding: 'binary' }) const extract = tar.extract({ filenameEncoding: 'binary' })
var noEntries = false let noEntries = false
extract.on('entry', function (header, stream, callback) { extract.on('entry', function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'En français, s\'il vous plaît?.txt', name: 'En français, s\'il vous plaît?.txt',
mode: parseInt('644', 8), mode: 0o644,
uid: 0, uid: 0,
gid: 0, gid: 0,
size: 14, size: 14,
@ -559,8 +559,8 @@ test('latin-1', function (t) { // can unpack filenames encoded in latin-1
stream.pipe(concat(function (data) { stream.pipe(concat(function (data) {
noEntries = true noEntries = true
t.same(data.toString(), 'Hello, world!\n') t.is(data.toString(), 'Hello, world!\n')
callback() cb()
})) }))
}) })
@ -574,14 +574,14 @@ test('latin-1', function (t) { // can unpack filenames encoded in latin-1
test('incomplete', function (t) { test('incomplete', function (t) {
t.plan(1) t.plan(1)
var extract = tar.extract() const extract = tar.extract()
extract.on('entry', function (header, stream, callback) { extract.on('entry', function (header, stream, cb) {
callback() cb()
}) })
extract.on('error', function (err) { extract.on('error', function (err) {
t.same(err.message, 'Unexpected end of data') t.is(err.message, 'Unexpected end of data')
}) })
extract.on('finish', function () { extract.on('finish', function () {
@ -594,13 +594,13 @@ test('incomplete', function (t) {
test('gnu', function (t) { // can correctly unpack gnu-tar format test('gnu', function (t) { // can correctly unpack gnu-tar format
t.plan(3) t.plan(3)
var extract = tar.extract() const extract = tar.extract()
var noEntries = false let noEntries = false
extract.on('entry', function (header, stream, callback) { extract.on('entry', function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'test.txt', name: 'test.txt',
mode: parseInt('644', 8), mode: 0o644,
uid: 12345, uid: 12345,
gid: 67890, gid: 67890,
size: 14, size: 14,
@ -615,8 +615,8 @@ test('gnu', function (t) { // can correctly unpack gnu-tar format
stream.pipe(concat(function (data) { stream.pipe(concat(function (data) {
noEntries = true noEntries = true
t.same(data.toString(), 'Hello, world!\n') t.is(data.toString(), 'Hello, world!\n')
callback() cb()
})) }))
}) })
@ -634,13 +634,13 @@ test('gnu-incremental', function (t) {
// for a directory prefix (also offset 345). // for a directory prefix (also offset 345).
t.plan(3) t.plan(3)
var extract = tar.extract() const extract = tar.extract()
var noEntries = false let noEntries = false
extract.on('entry', function (header, stream, callback) { extract.on('entry', function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'test.txt', name: 'test.txt',
mode: parseInt('644', 8), mode: 0o644,
uid: 12345, uid: 12345,
gid: 67890, gid: 67890,
size: 14, size: 14,
@ -655,8 +655,8 @@ test('gnu-incremental', function (t) {
stream.pipe(concat(function (data) { stream.pipe(concat(function (data) {
noEntries = true noEntries = true
t.same(data.toString(), 'Hello, world!\n') t.is(data.toString(), 'Hello, world!\n')
callback() cb()
})) }))
}) })
@ -670,7 +670,7 @@ test('gnu-incremental', function (t) {
test('v7 unsupported', function (t) { // correctly fails to parse v7 tarballs test('v7 unsupported', function (t) { // correctly fails to parse v7 tarballs
t.plan(1) t.plan(1)
var extract = tar.extract() const extract = tar.extract()
extract.on('error', function (err) { extract.on('error', function (err) {
t.ok(!!err) t.ok(!!err)
@ -683,7 +683,7 @@ test('v7 unsupported', function (t) { // correctly fails to parse v7 tarballs
test('unknown format doesn\'t extract by default', function (t) { test('unknown format doesn\'t extract by default', function (t) {
t.plan(1) t.plan(1)
var extract = tar.extract() const extract = tar.extract()
extract.on('error', function (err) { extract.on('error', function (err) {
t.ok(!!err) t.ok(!!err)
@ -696,13 +696,13 @@ test('unknown format doesn\'t extract by default', function (t) {
test('unknown format attempts to extract if allowed', function (t) { test('unknown format attempts to extract if allowed', function (t) {
t.plan(5) t.plan(5)
var extract = tar.extract({ allowUnknownFormat: true }) const extract = tar.extract({ allowUnknownFormat: true })
var noEntries = false let noEntries = false
var onfile1 = function (header, stream, callback) { const onfile1 = function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'file-1.txt', name: 'file-1.txt',
mode: parseInt('644', 8), mode: 0o644,
uid: 501, uid: 501,
gid: 20, gid: 20,
size: 12, size: 12,
@ -717,15 +717,15 @@ test('unknown format attempts to extract if allowed', function (t) {
extract.on('entry', onfile2) extract.on('entry', onfile2)
stream.pipe(concat(function (data) { stream.pipe(concat(function (data) {
t.same(data.toString(), 'i am file-1\n') t.is(data.toString(), 'i am file-1\n')
callback() cb()
})) }))
} }
var onfile2 = function (header, stream, callback) { const onfile2 = function (header, stream, cb) {
t.deepEqual(header, { t.alike(header, {
name: 'file-2.txt', name: 'file-2.txt',
mode: parseInt('644', 8), mode: 0o644,
uid: 501, uid: 501,
gid: 20, gid: 20,
size: 12, size: 12,
@ -740,8 +740,8 @@ test('unknown format attempts to extract if allowed', function (t) {
stream.pipe(concat(function (data) { stream.pipe(concat(function (data) {
noEntries = true noEntries = true
t.same(data.toString(), 'i am file-2\n') t.is(data.toString(), 'i am file-2\n')
callback() cb()
})) }))
} }

2
test/fixtures/index.js vendored
View file

@ -1,4 +1,4 @@
var path = require('path') const path = require('path')
exports.ONE_FILE_TAR = path.join(__dirname, 'one-file.tar') exports.ONE_FILE_TAR = path.join(__dirname, 'one-file.tar')
exports.MULTI_FILE_TAR = path.join(__dirname, 'multi-file.tar') exports.MULTI_FILE_TAR = path.join(__dirname, 'multi-file.tar')

122
test/pack.js
View file

@ -1,19 +1,20 @@
var test = require('tape') const test = require('brittle')
var tar = require('../index') const concat = require('concat-stream')
var fixtures = require('./fixtures') const fs = require('fs')
var concat = require('concat-stream') const b4a = require('b4a')
var fs = require('fs') const { Writable } = require('streamx')
var Writable = require('readable-stream').Writable const tar = require('..')
const fixtures = require('./fixtures')
test('one-file', function (t) { test('one-file', function (t) {
t.plan(2) t.plan(2)
var pack = tar.pack() const pack = tar.pack()
pack.entry({ pack.entry({
name: 'test.txt', name: 'test.txt',
mtime: new Date(1387580181000), mtime: new Date(1387580181000),
mode: parseInt('644', 8), mode: 0o644,
uname: 'maf', uname: 'maf',
gname: 'staff', gname: 'staff',
uid: 501, uid: 501,
@ -23,20 +24,20 @@ test('one-file', function (t) {
pack.finalize() pack.finalize()
pack.pipe(concat(function (data) { pack.pipe(concat(function (data) {
t.same(data.length & 511, 0) t.is(data.length & 511, 0)
t.deepEqual(data, fs.readFileSync(fixtures.ONE_FILE_TAR)) t.alike(data, fs.readFileSync(fixtures.ONE_FILE_TAR))
})) }))
}) })
test('multi-file', function (t) { test('multi-file', function (t) {
t.plan(2) t.plan(2)
var pack = tar.pack() const pack = tar.pack()
pack.entry({ pack.entry({
name: 'file-1.txt', name: 'file-1.txt',
mtime: new Date(1387580181000), mtime: new Date(1387580181000),
mode: parseInt('644', 8), mode: 0o644,
uname: 'maf', uname: 'maf',
gname: 'staff', gname: 'staff',
uid: 501, uid: 501,
@ -46,7 +47,7 @@ test('multi-file', function (t) {
pack.entry({ pack.entry({
name: 'file-2.txt', name: 'file-2.txt',
mtime: new Date(1387580181000), mtime: new Date(1387580181000),
mode: parseInt('644', 8), mode: 0o644,
size: 12, size: 12,
uname: 'maf', uname: 'maf',
gname: 'staff', gname: 'staff',
@ -57,20 +58,20 @@ test('multi-file', function (t) {
pack.finalize() pack.finalize()
pack.pipe(concat(function (data) { pack.pipe(concat(function (data) {
t.same(data.length & 511, 0) t.is(data.length & 511, 0)
t.deepEqual(data, fs.readFileSync(fixtures.MULTI_FILE_TAR)) t.alike(data, fs.readFileSync(fixtures.MULTI_FILE_TAR))
})) }))
}) })
test('pax', function (t) { test('pax', function (t) {
t.plan(2) t.plan(2)
var pack = tar.pack() const pack = tar.pack()
pack.entry({ pack.entry({
name: 'pax.txt', name: 'pax.txt',
mtime: new Date(1387580181000), mtime: new Date(1387580181000),
mode: parseInt('644', 8), mode: 0o644,
uname: 'maf', uname: 'maf',
gname: 'staff', gname: 'staff',
uid: 501, uid: 501,
@ -81,21 +82,21 @@ test('pax', function (t) {
pack.finalize() pack.finalize()
pack.pipe(concat(function (data) { pack.pipe(concat(function (data) {
// fs.writeFileSync('tmp.tar', data) t.is(data.length & 511, 0)
t.same(data.length & 511, 0) t.alike(data, fs.readFileSync(fixtures.PAX_TAR))
t.deepEqual(data, fs.readFileSync(fixtures.PAX_TAR))
})) }))
}) })
test('types', function (t) { test('types', function (t) {
t.plan(2) t.plan(2)
var pack = tar.pack()
const pack = tar.pack()
pack.entry({ pack.entry({
name: 'directory', name: 'directory',
mtime: new Date(1387580181000), mtime: new Date(1387580181000),
type: 'directory', type: 'directory',
mode: parseInt('755', 8), mode: 0o755,
uname: 'maf', uname: 'maf',
gname: 'staff', gname: 'staff',
uid: 501, uid: 501,
@ -107,7 +108,7 @@ test('types', function (t) {
mtime: new Date(1387580181000), mtime: new Date(1387580181000),
type: 'symlink', type: 'symlink',
linkname: 'directory', linkname: 'directory',
mode: parseInt('755', 8), mode: 0o755,
uname: 'maf', uname: 'maf',
gname: 'staff', gname: 'staff',
uid: 501, uid: 501,
@ -118,20 +119,21 @@ test('types', function (t) {
pack.finalize() pack.finalize()
pack.pipe(concat(function (data) { pack.pipe(concat(function (data) {
t.equal(data.length & 511, 0) t.is(data.length & 511, 0)
t.deepEqual(data, fs.readFileSync(fixtures.TYPES_TAR)) t.alike(data, fs.readFileSync(fixtures.TYPES_TAR))
})) }))
}) })
test('long-name', function (t) { test('long-name', function (t) {
t.plan(2) t.plan(2)
var pack = tar.pack()
const pack = tar.pack()
pack.entry({ pack.entry({
name: 'my/file/is/longer/than/100/characters/and/should/use/the/prefix/header/foobarbaz/foobarbaz/foobarbaz/foobarbaz/foobarbaz/foobarbaz/filename.txt', name: 'my/file/is/longer/than/100/characters/and/should/use/the/prefix/header/foobarbaz/foobarbaz/foobarbaz/foobarbaz/foobarbaz/foobarbaz/filename.txt',
mtime: new Date(1387580181000), mtime: new Date(1387580181000),
type: 'file', type: 'file',
mode: parseInt('644', 8), mode: 0o644,
uname: 'maf', uname: 'maf',
gname: 'staff', gname: 'staff',
uid: 501, uid: 501,
@ -141,19 +143,20 @@ test('long-name', function (t) {
pack.finalize() pack.finalize()
pack.pipe(concat(function (data) { pack.pipe(concat(function (data) {
t.equal(data.length & 511, 0) t.is(data.length & 511, 0)
t.deepEqual(data, fs.readFileSync(fixtures.LONG_NAME_TAR)) t.alike(data, fs.readFileSync(fixtures.LONG_NAME_TAR))
})) }))
}) })
test('large-uid-gid', function (t) { test('large-uid-gid', function (t) {
t.plan(2) t.plan(2)
var pack = tar.pack()
const pack = tar.pack()
pack.entry({ pack.entry({
name: 'test.txt', name: 'test.txt',
mtime: new Date(1387580181000), mtime: new Date(1387580181000),
mode: parseInt('644', 8), mode: 0o644,
uname: 'maf', uname: 'maf',
gname: 'staff', gname: 'staff',
uid: 1000000001, uid: 1000000001,
@ -163,21 +166,22 @@ test('large-uid-gid', function (t) {
pack.finalize() pack.finalize()
pack.pipe(concat(function (data) { pack.pipe(concat(function (data) {
t.same(data.length & 511, 0) t.is(data.length & 511, 0)
t.deepEqual(data, fs.readFileSync(fixtures.LARGE_UID_GID)) t.alike(data, fs.readFileSync(fixtures.LARGE_UID_GID))
fs.writeFileSync('/tmp/foo', data) fs.writeFileSync('/tmp/foo', data)
})) }))
}) })
test('unicode', function (t) { test('unicode', function (t) {
t.plan(2) t.plan(2)
var pack = tar.pack()
const pack = tar.pack()
pack.entry({ pack.entry({
name: 'høstål.txt', name: 'høstål.txt',
mtime: new Date(1387580181000), mtime: new Date(1387580181000),
type: 'file', type: 'file',
mode: parseInt('644', 8), mode: 0o644,
uname: 'maf', uname: 'maf',
gname: 'staff', gname: 'staff',
uid: 501, uid: 501,
@ -187,43 +191,49 @@ test('unicode', function (t) {
pack.finalize() pack.finalize()
pack.pipe(concat(function (data) { pack.pipe(concat(function (data) {
t.equal(data.length & 511, 0) t.is(data.length & 511, 0)
t.deepEqual(data, fs.readFileSync(fixtures.UNICODE_TAR)) t.alike(data, fs.readFileSync(fixtures.UNICODE_TAR))
})) }))
}) })
test('backpressure', function (t) { test('backpressure', async function (t) {
var slowWritable = new Writable({ highWaterMark: 1 }) const end = t.test('end')
slowWritable._write = (chunk, enc, next) => { end.plan(1)
setImmediate(next)
const slowStream = new Writable({
highWaterMark: 1,
write (data, cb) {
setImmediate(cb)
} }
var pack = tar.pack()
var later = false
setImmediate(() => {
later = true
}) })
pack.pipe(slowWritable) slowStream.on('finish', () => end.pass())
slowWritable.on('finish', () => t.end()) const pack = tar.pack()
pack.on('end', () => t.ok(later))
var i = 0 let later = false
var next = () => {
setImmediate(() => { later = true })
pack
.on('end', () => t.ok(later))
.pipe(slowStream)
let i = 0
const next = () => {
if (++i < 25) { if (++i < 25) {
var header = { const header = {
name: `file${i}.txt`, name: `file${i}.txt`,
mtime: new Date(1387580181000), mtime: new Date(1387580181000),
mode: parseInt('644', 8), mode: 0o644,
uname: 'maf', uname: 'maf',
gname: 'staff', gname: 'staff',
uid: 501, uid: 501,
gid: 20 gid: 20
} }
var buffer = Buffer.alloc(1024) const buffer = b4a.alloc(1024)
pack.entry(header, buffer, next) pack.entry(header, buffer, next)
} else { } else {
@ -232,4 +242,6 @@ test('backpressure', function (t) {
} }
next() next()
await end
}) })

37
test/slow.js → test/slow/huge.js
View file

@ -1,27 +1,28 @@
var test = require('tape') const test = require('brittle')
var stream = require('readable-stream') const zlib = require('zlib')
var zlib = require('zlib') const fs = require('fs')
var fs = require('fs') const { Writable } = require('streamx')
var tar = require('../') const tar = require('../..')
var fixtures = require('./fixtures') const fixtures = require('../fixtures')
test('huge', function (t) { test('huge', function (t) {
t.plan(1) t.plan(1)
var extract = tar.extract() const extract = tar.extract()
var noEntries = false let noEntries = false
var hugeFileSize = 8804630528 // ~8.2GB const hugeFileSize = 8804630528 // ~8.2GB
var dataLength = 0 let dataLength = 0
var countStream = new stream.Writable() const countStream = new Writable({
countStream._write = function (chunk, encoding, done) { write (data, cb) {
dataLength += chunk.length dataLength += data.length
done() cb()
} }
})
// Make sure we read the correct pax size entry for a file larger than 8GB. // Make sure we read the correct pax size entry for a file larger than 8GB.
extract.on('entry', function (header, stream, callback) { extract.on('entry', function (header, stream, callback) {
t.deepEqual(header, { t.alike(header, {
devmajor: 0, devmajor: 0,
devminor: 0, devminor: 0,
gid: 20, gid: 20,
@ -51,10 +52,10 @@ test('huge', function (t) {
extract.on('finish', function () { extract.on('finish', function () {
t.ok(noEntries) t.ok(noEntries)
t.equal(dataLength, hugeFileSize) t.is(dataLength, hugeFileSize)
}) })
var gunzip = zlib.createGunzip() const gunzip = zlib.createGunzip()
var reader = fs.createReadStream(fixtures.HUGE) const reader = fs.createReadStream(fixtures.HUGE)
reader.pipe(gunzip).pipe(extract) reader.pipe(gunzip).pipe(extract)
}) })