s3-zip 3.1.2 → 3.2.1

package/.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
 node_js:
+  - 14
   - 12
   - 10
-  - 8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s3-zip",
-  "version": "3.1.2",
+  "version": "3.2.1",
   "description": "Download selected files from an Amazon S3 bucket as a zip file.",
   "main": "s3-zip.js",
   "scripts": {
@@ -25,8 +25,8 @@
   },
   "homepage": "https://github.com/orangewise/s3-zip#readme",
   "dependencies": {
-    "archiver": "^3.1.1",
-    "s3-files": "^2.0.0"
+    "archiver": "^5.2.0",
+    "s3-files": "^2.0.3"
   },
   "devDependencies": {
     "archiver-zip-encryptable": "^1.0.5",

package/s3-zip.js

@@ -56,6 +56,7 @@ s3Zip.archiveStream = function (stream, filesS3, filesZip) {
         // Place files_s3[i] into the archive as files_zip[i]
         const i = filesS3.indexOf(file.path.startsWith(folder) ? file.path.substr(folder.length) : file.path)
         fname = (i >= 0 && i < filesZip.length) ? filesZip[i] : file.path
+        filesS3[i] = ''
       } else {
         // Just use the S3 file name
         fname = file.path

package/test/test-s3-same-file-alt-names.js

@@ -0,0 +1,82 @@
+// Test s3-zip BUT using alternate file names for the same file which is listed multiple times
+
+var s3Zip = require('../s3-zip.js')
+var t = require('tap')
+var fs = require('fs')
+var Stream = require('stream')
+var concat = require('concat-stream')
+var join = require('path').join
+var streamify = require('stream-array')
+var tar = require('tar')
+
+var fileStreamForFiles = function (files, preserveFolderPath) {
+  var rs = new Stream()
+  rs.readable = true
+
+  var fileCounter = 0
+  streamify(files).on('data', function (file) {
+    fileCounter += 1
+
+    var fileStream = fs.createReadStream(join(__dirname, file))
+    fileStream.pipe(
+      concat(function buffersEmit (buffer) {
+        // console.log('buffers concatenated, emit data for ', file);
+        var path = preserveFolderPath ? file : file.replace(/^.*[\\/]/, '')
+        rs.emit('data', { data: buffer, path: path })
+      })
+    )
+    fileStream.on('end', function () {
+      fileCounter -= 1
+      if (fileCounter < 1) {
+        // console.log('all files processed, emit end');
+        rs.emit('end')
+      }
+    })
+  })
+  return rs
+}
+
+var inputFiles = [
+  '/fixtures/folder/a/file.txt',
+  '/fixtures/folder/a/file.txt'
+]
+var outputFiles = [
+  'FILE_1_ALT_1.TXT',
+  'FILE_1_ALT_2.TXT'
+]
+var filesRead = []
+
+t.test('test a tar archive with alternate names for one file listed many times', function (child) {
+  var outputPath = join(__dirname, '/test-same_file_alt_name.tar')
+  var output = fs.createWriteStream(outputPath)
+  var archive = s3Zip
+    .setFormat('tar')
+    .archiveStream(fileStreamForFiles(inputFiles, true), inputFiles, outputFiles)
+    .pipe(output)
+
+  archive.on('close', function () {
+    fs.createReadStream(outputPath)
+      .pipe(tar.list())
+      .on('entry', function (entry) {
+        filesRead.push(entry.path)
+      })
+      .on('end', function () {
+        child.same(filesRead, outputFiles)
+        child.end()
+      })
+  })
+})
+
+t.test('test archive with alternate names for one file listed many times', function (child) {
+  var archive = s3Zip
+    .archive({ region: 'region', bucket: 'bucket' },
+      '',
+      inputFiles,
+      outputFiles.map(file => {
+        return { name: file }
+      })
+    )
+
+  child.type(archive, 'object')
+  child.end()
+})