diff --git a/lib/tar/file_stream.js b/lib/tar/file_stream.js index 8f45a05..e08fbe8 100644 --- a/lib/tar/file_stream.js +++ b/lib/tar/file_stream.js @@ -21,7 +21,7 @@ class TarFileStream extends stream.Transform { // stat file to get file size fs.stat(opts.source, (err, stat) => { if (err) return this.emit('error', err); - this.entry = pack.entry({ name: opts.relativePath || path.basename(opts.source), size: stat.size, mode: stat.mode & 0o777 }, err => { + this.entry = pack.entry({ name: opts.relativePath || path.basename(opts.source), size: stat.size, mode: stat.mode & 0o777, mtime: stat.mtime }, err => { if (err) return this.emit('error', err); pack.finalize(); }); diff --git a/lib/tar/stream.js b/lib/tar/stream.js index 6e64625..c76f177 100644 --- a/lib/tar/stream.js +++ b/lib/tar/stream.js @@ -60,7 +60,7 @@ class TarStream extends BaseStream { // stat file to get file size fs.stat(entry, (err, stat) => { if (err) return this.emit('error', err); - const entryStream = this._pack.entry({ name: opts.relativePath || path.basename(entry), size: stat.size, mode: stat.mode & 0o777 }, this._onEntryFinish.bind(this)); + const entryStream = this._pack.entry({ name: opts.relativePath || path.basename(entry), size: stat.size, mode: stat.mode & 0o777, mtime: stat.mtime }, this._onEntryFinish.bind(this)); const stream = fs.createReadStream(entry, opts.fs); stream.on('error', err => this.emit('error', err)); stream.pipe(entryStream); diff --git a/test/tar/index.test.js b/test/tar/index.test.js index 519a09f..696eda3 100644 --- a/test/tar/index.test.js +++ b/test/tar/index.test.js @@ -143,6 +143,53 @@ describe('test/tar/index.test.js', () => { assert(fs.existsSync(destFile)); }); + it('tar.compressFile(file, destFile) keeps the modification time', async () => { + const sourceFile = path.join(os.tmpdir(), randomUUID() + '.txt'); + const mtime = new Date('2020-01-02T03:04:05Z'); + fs.writeFileSync(sourceFile, 'hi'); + fs.utimesSync(sourceFile, mtime, mtime); + const destFile = path.join(os.tmpdir(), randomUUID() + '.tar'); + await compressing.tar.compressFile(sourceFile, destFile); + + const extract = require('tar-stream').extract(); + let entryMtime; + extract.on('entry', (header, stream, next) => { + entryMtime = header.mtime; + stream.resume(); + stream.on('end', next); + }); + await new Promise((resolve, reject) => { + extract.on('finish', resolve); + extract.on('error', reject); + fs.createReadStream(destFile).pipe(extract); + }); + assert.deepStrictEqual(entryMtime, mtime); + }); + + it('tar.compressDir(dir, destFile) keeps file modification times', async () => { + const sourceDir = path.join(os.tmpdir(), randomUUID()); + fs.mkdirSync(sourceDir); + const mtime = new Date('2020-01-02T03:04:05Z'); + fs.writeFileSync(path.join(sourceDir, 'a.txt'), 'hi'); + fs.utimesSync(path.join(sourceDir, 'a.txt'), mtime, mtime); + const destFile = path.join(os.tmpdir(), randomUUID() + '.tar'); + await compressing.tar.compressDir(sourceDir, destFile); + + const mtimes = {}; + const extract = require('tar-stream').extract(); + extract.on('entry', (header, stream, next) => { + mtimes[header.name] = header.mtime; + stream.resume(); + stream.on('end', next); + }); + await new Promise((resolve, reject) => { + extract.on('finish', resolve); + extract.on('error', reject); + fs.createReadStream(destFile).pipe(extract); + }); + assert.deepStrictEqual(mtimes[path.basename(sourceDir) + '/a.txt'], mtime); + }); + it('tar.compressDir(dir, destStream) should return promise', async () => { const sourceDir = path.join(__dirname, '..', 'fixtures'); const destFile = path.join(os.tmpdir(), randomUUID() + '.tar');