s3-zip 3.2.1 → 3.3.1-a0

package/.github/workflows/npm-publish.yml

@@ -0,0 +1,29 @@
+name: Publish to NPM
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version to publish (leave empty to use package.json version)'
+        required: false
+        type: string
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      # Setup .npmrc file to publish to npm
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          registry-url: 'https://registry.npmjs.org'
+      - run: npm i
+      - run: npm publish --provenance --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/.github/workflows/test.yml

@@ -0,0 +1,29 @@
+name: Test
+
+on:
+  pull_request:
+    branches: [master]
+    types: [opened, synchronize, reopened]
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [16, 18, 20]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install dependencies
+        run: npm i
+
+      - name: Run tests
+        run: npm test

package/.travis.yml

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

package/README.md

@@ -51,12 +51,12 @@ s3Zip
 You can also pass a custom S3 client. For example if you want to zip files from a S3 compatible storage:
 
 ```javascript
-const aws = require('aws-sdk')
+const { S3Client } = require('@aws-sdk/client-s3')
 
-const s3Client = new aws.S3({
-  signatureVersion: 'v4',
-  s3ForcePathStyle: 'true',
+const s3Client = new S3Client({
+  region: 'us-east-1',
   endpoint: 'http://localhost:9000',
+  forcePathStyle: true
 })
 
 s3Zip
@@ -64,6 +64,8 @@ s3Zip
   .pipe(output)
 ```
 
+**Note:** When passing a custom S3 client, it must be an AWS SDK v3 client (from `@aws-sdk/client-s3`). AWS SDK v2 clients are not supported and will result in an error.
+
 ### Zip files with AWS Lambda
 
 Example of s3-zip in combination with [AWS Lambda](aws_lambda.md).
@@ -74,14 +76,16 @@ Example of s3-zip in combination with [AWS Lambda](aws_lambda.md).
 ```javascript
 const fs = require('fs')
 const join = require('path').join
-const AWS = require('aws-sdk')
+const {
+  S3Client
+} = require("@aws-sdk/client-s3")
 const s3Zip = require('s3-zip')
 const XmlStream = require('xml-stream')
 
 const region = 'bucket-region'
 const bucket = 'name-of-s3-bucket'
 const folder = 'name-of-bucket-folder/'
-const s3 = new AWS.S3({ region: region })
+const s3 = new S3Client({ region: region })
 const params = {
   Bucket: bucket,
   Prefix: folder
@@ -192,10 +196,27 @@ If you would like a more fancy coverage report:
 npm run coverage
 ```
 
+## Publishing
+
+This package is automatically published to NPM when a new release is created on GitHub. The publishing workflow:
+
+1. Triggers on GitHub releases
+2. Runs tests to ensure quality
+3. Publishes to NPM using the `NPM_TOKEN` secret
+
+### Setup for Maintainers
+
+To enable automatic publishing, the repository requires an `NPM_TOKEN` secret to be configured in GitHub:
+
+1. Generate an NPM access token with publish permissions
+2. Add it as a repository secret named `NPM_TOKEN` in GitHub Settings > Secrets and variables > Actions
+
+The workflow can also be triggered manually from the Actions tab for testing purposes.
+
 
 
 
-[aws-sdk-url]: http://docs.aws.amazon.com/AWSJavaScriptSDK/guide/node-configuring.html
+[aws-sdk-url]: https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/configuring-the-jssdk.html
 [npm-badge]: https://badge.fury.io/js/s3-zip.svg
 [npm-url]: https://badge.fury.io/js/s3-zip
 [travis-badge]: https://travis-ci.org/orangewise/s3-zip.svg?branch=master

package/aws_lambda.md

@@ -4,8 +4,10 @@
 
 
 ```javascript
-const AWS = require('aws-sdk')
+const { Upload } = require("@aws-sdk/lib-storage");
+const { S3 } = require("@aws-sdk/client-s3");
 const s3Zip = require('s3-zip')
+const {Readable} = require('stream')
 
 exports.handler = function (event, context) {
   console.log('event', event)
@@ -20,27 +22,31 @@ exports.handler = function (event, context) {
   // Create body stream
   try {
 
-    const body = s3Zip.archive({ region: region, bucket: bucket}, folder, files)
+    const writable = s3Zip.archive({ region: region, bucket: bucket}, folder, files)
+    const body = Readable.from(writable)
     const zipParams = { params: { Bucket: bucket, Key: folder + zipFileName } }
-    const zipFile = new AWS.S3(zipParams)
-    zipFile.upload({ Body: body })
+    const zipFile = new S3(zipParams)
+    new Upload({
+      client: zipFile,
+      params: { Body: body }
+    })
       .on('httpUploadProgress', function (evt) { console.log(evt) })
-      .send(function (e, r) { 
-        if (e) {
-          const err = 'zipFile.upload error ' + e
-          console.log(err)         
+      .done().then(
+        (r) => {
+          console.log(r)
+          context.succeed(r)
+        },
+        (e) => {
+          console.log('zipFile.upload error', e)
           context.fail(err)
-        } 
-        console.log(r) 
-        context.succeed(r)
-      })
+        }
+      )
 
   } catch (e) {
     const err = 'catched error: ' + e
     console.log(err)    
     context.fail(err)
   }
-
 }
 
 ```
@@ -48,7 +54,7 @@ exports.handler = function (event, context) {
 ## Invoke the function
 
 ```javascript
-const AWS = require('aws-sdk')
+const { LambdaClient } = require("@aws-sdk/client-lambda");
 
 const region = 'bucket-region'
 const bucket = 'name-of-s3-bucket'
@@ -59,12 +65,10 @@ const file3 = 'Image C.png'
 const file4 = 'Image D.png'
 
 
-AWS.config.update({
-  region: region
+const lambda = new LambdaClient({
+  region
 })
 
-const lambda = new AWS.Lambda()
-
 const files = [file1, file2, file3, file4]
 const payload = JSON.stringify({ 
   'region'     : region,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s3-zip",
-  "version": "3.2.1",
+  "version": "3.3.1-a0",
   "description": "Download selected files from an Amazon S3 bucket as a zip file.",
   "main": "s3-zip.js",
   "scripts": {
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/orangewise/s3-zip.git"
+    "url": "git+https://github.com/orangewise/s3-zip.git"
   },
   "keywords": [
     "amazon",
@@ -25,19 +25,20 @@
   },
   "homepage": "https://github.com/orangewise/s3-zip#readme",
   "dependencies": {
-    "archiver": "^5.2.0",
-    "s3-files": "^2.0.3"
+    "archiver": "^6.0.1",
+    "normalize-path": "^3.0.0",
+    "s3-files": "^3.0.0"
   },
   "devDependencies": {
     "archiver-zip-encryptable": "^1.0.5",
     "child_process": "^1.0.2",
     "concat-stream": "^2.0.0",
     "proxyquire": "^2.1.3",
-    "sinon": "^7.4.1",
-    "standard": "^14.0.2",
+    "sinon": "^16.0.0",
+    "standard": "^17.1.0",
     "stream-array": "^1.1.2",
-    "tap": "^14.6.1",
-    "tar": "^4.4.10",
-    "yauzl": "^2.9.1"
+    "tap": "^16.3.8",
+    "tar": "^6.2.0",
+    "yauzl": "^2.10.0"
   }
 }

package/s3-zip.js

@@ -13,6 +13,11 @@ s3Zip.archive = function (opts, folder, filesS3, filesZip) {
   self.debug = opts.debug || false
 
   if ('s3' in opts) {
+    // Validate that the provided S3 client is compatible with AWS SDK v3
+    if (!opts.s3 || typeof opts.s3.send !== 'function') {
+      throw new Error('The provided S3 client must be an AWS SDK v3 client with a .send() method. ' +
+        'Please use @aws-sdk/client-s3 (v3) instead of aws-sdk (v2).')
+    }
     connectionConfig = {
       s3: opts.s3
     }
@@ -39,7 +44,10 @@ s3Zip.archiveStream = function (stream, filesS3, filesZip) {
   const self = this
   const folder = this.folder || ''
   if (this.registerFormat) {
-    archiver.registerFormat(this.registerFormat, this.formatModule)
+    // Only register the format if it hasn't been registered before
+    if (!archiver.isRegisteredFormat(this.registerFormat)) {
+      archiver.registerFormat(this.registerFormat, this.formatModule)
+    }
   }
   const archive = archiver(this.format || 'zip', this.archiverOpts || {})
   archive.on('error', function (err) {

package/test/test-coverage-missing-lines.js

@@ -0,0 +1,97 @@
+// Test to cover missing lines for full coverage
+
+const t = require('tap')
+const Stream = require('stream')
+const sinon = require('sinon')
+const proxyquire = require('proxyquire')
+
+// Mock s3Files to avoid real S3 calls
+const mockS3Files = {
+  connect: sinon.stub().returns({
+    createKeyStream: sinon.stub().returns(new Stream())
+  }),
+  createFileStream: sinon.stub().returns(new Stream())
+}
+
+const s3Zip = proxyquire('../s3-zip.js', {
+  's3-files': mockS3Files
+})
+
+t.test('test archive with valid AWS SDK v3 client', function (child) {
+  // Mock valid AWS SDK v3 client (has .send method)
+  const awsV3Client = {
+    send: function (command) {
+      return Promise.resolve({ Body: Buffer.from('test data') })
+    }
+  }
+
+  try {
+    // This should work and cover line 21: connectionConfig = { s3: opts.s3 }
+    const archive = s3Zip.archive(
+      { s3: awsV3Client, bucket: 'test-bucket' },
+      'folder/',
+      ['test-file.txt']
+    )
+
+    child.type(archive, 'object', 'Should return archive object')
+    child.end()
+  } catch (error) {
+    child.fail(`Should not throw error with valid SDK v3 client: ${error.message}`)
+    child.end()
+  }
+})
+
+t.test('test archiveStream with debug mode and directory paths', function (child) {
+  const rs = new Stream()
+  rs.readable = true
+
+  // Enable debug mode to cover lines 59-60
+  s3Zip.debug = true
+
+  const archive = s3Zip.archiveStream(rs, [])
+
+  // Emit a directory path to trigger the debug log
+  rs.emit('data', { data: Buffer.alloc(0), path: 'test-folder/' })
+  rs.emit('end')
+
+  child.type(archive, 'object', 'Should return archive object')
+  child.end()
+})
+
+t.test('test archiveStream with file not in filesS3 array', function (child) {
+  const rs = new Stream()
+  rs.readable = true
+
+  // Test the ternary on line 66 - when file is not found in filesS3 array
+  const archive = s3Zip.archiveStream(rs, ['different-file.txt'], ['renamed.txt'])
+
+  // Emit a file that's not in the filesS3 array
+  rs.emit('data', {
+    data: Buffer.from('test content'),
+    path: 'not-in-list.txt'
+  })
+  rs.emit('end')
+
+  child.type(archive, 'object', 'Should return archive object')
+  child.end()
+})
+
+t.test('test archiveStream with debug and archive error', function (child) {
+  const rs = new Stream()
+  rs.readable = true
+
+  // Enable debug mode to cover line 54
+  s3Zip.debug = true
+
+  const archive = s3Zip.archiveStream(rs, [])
+
+  // Force an archive error to trigger the debug log on line 54
+  setImmediate(() => {
+    archive.emit('error', new Error('test error'))
+  })
+
+  rs.emit('end')
+
+  child.type(archive, 'object', 'Should return archive object')
+  child.end()
+})

package/test/test-password-protected-duplicate.js

@@ -0,0 +1,37 @@
+const s3Zip = require('../s3-zip.js')
+const t = require('tap')
+const archiverZipEncryptable = require('archiver-zip-encryptable')
+
+t.test('test duplicate format registration does not error', function (child) {
+  // First registration should work
+  s3Zip.setRegisterFormatOptions('zip-encryptable', archiverZipEncryptable)
+
+  // Try to register the format via archiveStream simulation
+  const mockStream = {
+    on: function (event, callback) {
+      if (event === 'end') {
+        setTimeout(callback, 10) // Simulate async behavior
+      } else if (event === 'data') {
+        // Don't emit any data
+      } else if (event === 'error') {
+        // Don't emit any errors
+      }
+      return this
+    }
+  }
+
+  try {
+    // First call to archiveStream (should register format)
+    const archive1 = s3Zip.archiveStream(mockStream, [], [])
+    child.ok(archive1, 'First archiveStream call succeeded')
+
+    // Second call to archiveStream (should NOT fail due to duplicate registration)
+    const archive2 = s3Zip.archiveStream(mockStream, [], [])
+    child.ok(archive2, 'Second archiveStream call succeeded')
+
+    child.end()
+  } catch (err) {
+    child.fail(`archiveStream calls failed: ${err.message}`)
+    child.end()
+  }
+})

package/test/test-s3-error-on-stream.js

@@ -1,16 +1,16 @@
-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 proxyquire = require('proxyquire')
-var sinon = require('sinon')
+let s3Zip = require('../s3-zip.js')
+const t = require('tap')
+const fs = require('fs')
+const Stream = require('stream')
+const concat = require('concat-stream')
+const join = require('path').join
+const proxyquire = require('proxyquire')
+const sinon = require('sinon')
 
-var fileStream = function (file) {
-  var rs = new Stream()
+const fileStream = function (file) {
+  const rs = new Stream()
   rs.readable = true
-  var fileStream = fs.createReadStream(join(__dirname, file))
+  const fileStream = fs.createReadStream(join(__dirname, file))
   fileStream
     .pipe(concat(
       function buffersEmit (buffer) {
@@ -26,18 +26,18 @@ var fileStream = function (file) {
 }
 
 t.test('test if error on filestream with archiveStream', function (child) {
-  var stream = fileStream('./fixtures/file.txt')
-  var files = ['foo.png']
+  const stream = fileStream('./fixtures/file.txt')
+  const files = ['foo.png']
   s3Zip.archiveStream(stream, files)
   child.end()
 })
 
 t.test('test if error on filestream with archive', function (child) {
-  var stream = fileStream('./fixtures/file.txt')
+  const stream = fileStream('./fixtures/file.txt')
   s3Zip = proxyquire('../s3-zip.js', {
     's3-files': { createFileStream: sinon.stub().returns(stream) }
   })
-  var files = ['foo.png']
+  const files = ['foo.png']
   s3Zip.archive({ region: 'region', bucket: 'bucket' }, 'folder', files)
   child.end()
 })

package/test/test-s3-password-protected.js

@@ -1,27 +1,27 @@
-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 archiverZipEncryptable = require('archiver-zip-encryptable')
-var { exec } = require('child_process')
+let s3Zip = require('../s3-zip.js')
+const t = require('tap')
+const fs = require('fs')
+const Stream = require('stream')
+const concat = require('concat-stream')
+const join = require('path').join
+const streamify = require('stream-array')
+const archiverZipEncryptable = require('archiver-zip-encryptable')
+const { exec } = require('child_process')
 
-var fileStreamForFiles = function (files, preserveFolderPath) {
-  var rs = new Stream()
+const fileStreamForFiles = function (files, preserveFolderPath) {
+  const rs = new Stream()
   rs.readable = true
 
-  var fileCounter = 0
+  let fileCounter = 0
   streamify(files).on('data', function (file) {
     fileCounter += 1
 
-    var fileStream = fs.createReadStream(join(__dirname, file))
+    const 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 })
+        const path = preserveFolderPath ? file : file.replace(/^.*[\\/]/, '')
+        rs.emit('data', { data: buffer, path })
       })
     )
     fileStream.on('end', function () {
@@ -35,11 +35,11 @@ var fileStreamForFiles = function (files, preserveFolderPath) {
   return rs
 }
 
-var file1 = 'a/file.txt'
-var file2 = 'b/file.txt'
-var sinon = require('sinon')
-var proxyquire = require('proxyquire')
-var s3Stub = fileStreamForFiles(
+const file1 = 'a/file.txt'
+const file2 = 'b/file.txt'
+const sinon = require('sinon')
+const proxyquire = require('proxyquire')
+const s3Stub = fileStreamForFiles(
   ['/fixtures/folder/a/file.txt', '/fixtures/folder/b/file.txt'],
   true
 )
@@ -48,8 +48,8 @@ s3Zip = proxyquire('../s3-zip.js', {
 })
 
 t.test('test archive password protected', async child => {
-  var outputPath = join(__dirname, '/test-password-protected.zip')
-  var output = fs.createWriteStream(outputPath)
+  const outputPath = join(__dirname, '/test-password-protected.zip')
+  const output = fs.createWriteStream(outputPath)
 
   await s3Zip
     .setRegisterFormatOptions('zip-encryptable', archiverZipEncryptable)

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

@@ -1,28 +1,30 @@
 // 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')
+const s3Zip = require('../s3-zip.js')
+const t = require('tap')
+const fs = require('fs')
+const Stream = require('stream')
+const concat = require('concat-stream')
+const join = require('path').join
+const streamify = require('stream-array')
+const tar = require('tar')
+const sinon = require('sinon')
+const proxyquire = require('proxyquire')
 
-var fileStreamForFiles = function (files, preserveFolderPath) {
-  var rs = new Stream()
+const fileStreamForFiles = function (files, preserveFolderPath) {
+  const rs = new Stream()
   rs.readable = true
 
-  var fileCounter = 0
+  let fileCounter = 0
   streamify(files).on('data', function (file) {
     fileCounter += 1
 
-    var fileStream = fs.createReadStream(join(__dirname, file))
+    const 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 })
+        const path = preserveFolderPath ? file : file.replace(/^.*[\\/]/, '')
+        rs.emit('data', { data: buffer, path })
       })
     )
     fileStream.on('end', function () {
@@ -36,20 +38,20 @@ var fileStreamForFiles = function (files, preserveFolderPath) {
   return rs
 }
 
-var inputFiles = [
-  '/fixtures/folder/a/file.txt',
-  '/fixtures/folder/a/file.txt'
-]
-var outputFiles = [
+const outputFiles = [
   'FILE_1_ALT_1.TXT',
   'FILE_1_ALT_2.TXT'
 ]
-var filesRead = []
+const 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
+  const inputFiles = [
+    '/fixtures/folder/a/file.txt',
+    '/fixtures/folder/a/file.txt'
+  ]
+  const outputPath = join(__dirname, '/test-same_file_alt_name.tar')
+  const output = fs.createWriteStream(outputPath)
+  const archive = s3Zip
     .setFormat('tar')
     .archiveStream(fileStreamForFiles(inputFiles, true), inputFiles, outputFiles)
     .pipe(output)
@@ -68,7 +70,14 @@ t.test('test a tar archive with alternate names for one file listed many times',
 })
 
 t.test('test archive with alternate names for one file listed many times', function (child) {
-  var archive = s3Zip
+  const inputFiles = [
+    '/fixtures/folder/a/file.txt',
+    '/fixtures/folder/a/file.txt'
+  ]
+  const s3Zip = proxyquire('../s3-zip.js', {
+    's3-files': { createFileStream: sinon.stub().returns(fileStreamForFiles(inputFiles, true)) }
+  })
+  const archive = s3Zip
     .archive({ region: 'region', bucket: 'bucket' },
       '',
       inputFiles,

package/test/test-s3-v2-client-error.js

@@ -0,0 +1,55 @@
+// Test s3-zip with AWS SDK v2 client which should produce clear error
+
+const s3Zip = require('../s3-zip.js')
+const t = require('tap')
+
+t.test('test s3-zip with AWS SDK v2 client should fail with clear error', function (child) {
+  // Mock AWS SDK v2 client (no .send method)
+  const awsV2Client = {
+    getObject: function (params) {
+      return {
+        promise: function () {
+          return Promise.resolve({ Body: Buffer.from('test data') })
+        }
+      }
+    }
+  }
+
+  try {
+    // This should fail with a clear error message about AWS SDK compatibility
+    s3Zip.archive(
+      { s3: awsV2Client, bucket: 'test-bucket' },
+      'folder/',
+      ['test-file.txt']
+    )
+
+    // If we get here without an error, the test failed
+    child.fail('Expected an error about AWS SDK compatibility but none was thrown')
+    child.end()
+  } catch (error) {
+    // We should get a clear error about AWS SDK version compatibility
+    child.ok(error.message.includes('AWS SDK v3'), 'Should get clear error about AWS SDK v3 requirement')
+    child.ok(error.message.includes('@aws-sdk/client-s3'), 'Should mention the correct package')
+    child.end()
+  }
+})
+
+t.test('test s3-zip with null s3 client should fail with clear error', function (child) {
+  try {
+    // This should fail with a clear error message about AWS SDK compatibility
+    s3Zip.archive(
+      { s3: null, bucket: 'test-bucket' },
+      'folder/',
+      ['test-file.txt']
+    )
+
+    // If we get here without an error, the test failed
+    child.fail('Expected an error about AWS SDK compatibility but none was thrown')
+    child.end()
+  } catch (error) {
+    // We should get a clear error about AWS SDK version compatibility
+    child.ok(error.message.includes('AWS SDK v3'), 'Should get clear error about AWS SDK v3 requirement')
+    child.ok(error.message.includes('.send() method'), 'Should mention the .send() method requirement')
+    child.end()
+  }
+})

package/test/test-s3-zip-alt-names.js

@@ -1,18 +1,18 @@
 // Test s3-zip BUT using alternate file names in the resulting zip archive
 
-var s3Zip = require('../s3-zip.js')
-var t = require('tap')
-var fs = require('fs')
-var Stream = require('stream')
-var concat = require('concat-stream')
-var yauzl = require('yauzl')
-var join = require('path').join
-var tar = require('tar')
+let s3Zip = require('../s3-zip.js')
+const t = require('tap')
+const fs = require('fs')
+const Stream = require('stream')
+const concat = require('concat-stream')
+const yauzl = require('yauzl')
+const join = require('path').join
+const tar = require('tar')
 
-var fileStream = function (file, forceError) {
-  var rs = new Stream()
+const fileStream = function (file, forceError) {
+  const rs = new Stream()
   rs.readable = true
-  var fileStream = fs.createReadStream(join(__dirname, file))
+  const fileStream = fs.createReadStream(join(__dirname, file))
   fileStream
     .pipe(concat(
       function buffersEmit (buffer) {
@@ -32,21 +32,21 @@ var fileStream = function (file, forceError) {
   return rs
 }
 
-var file1 = '/fixtures/file.txt'
-var file1Alt = 'FILE_ALT.TXT'
-var file1DataEntry = { name: file1Alt, mode: parseInt('0600', 8) }
+const file1 = '/fixtures/file.txt'
+const file1Alt = 'FILE_ALT.TXT'
+const file1DataEntry = { name: file1Alt, mode: parseInt('0600', 8) }
 // Stub: var fileStream = s3Files.createFileStream(keyStream);
-var sinon = require('sinon')
-var proxyquire = require('proxyquire')
-var s3Stub = fileStream(file1)
+const sinon = require('sinon')
+const proxyquire = require('proxyquire')
+const s3Stub = fileStream(file1)
 s3Zip = proxyquire('../s3-zip.js', {
   's3-files': { createFileStream: sinon.stub().returns(s3Stub) }
 })
 
 t.test('test archiveStream and zip file with alternate file name in zip archive', function (child) {
-  var output = fs.createWriteStream(join(__dirname, '/test-alt.zip'))
-  var s = fileStream(file1)
-  var archive = s3Zip
+  const output = fs.createWriteStream(join(__dirname, '/test-alt.zip'))
+  const s = fileStream(file1)
+  const archive = s3Zip
     .archiveStream(s, [file1], [file1Alt])
     .pipe(output)
   archive.on('close', function () {
@@ -69,7 +69,7 @@ t.test('test archiveStream and zip file with alternate file name in zip archive'
 })
 
 t.test('test archive with alternate zip archive names', function (child) {
-  var archive = s3Zip
+  const archive = s3Zip
     .archive({ region: 'region', bucket: 'bucket' },
       'folder',
       [file1],
@@ -80,9 +80,9 @@ t.test('test archive with alternate zip archive names', function (child) {
 })
 
 t.test('test a tar archive with EntryData object', function (child) {
-  var outputPath = join(__dirname, '/test-entrydata.tar')
-  var output = fs.createWriteStream(outputPath)
-  var archive = s3Zip
+  const outputPath = join(__dirname, '/test-entrydata.tar')
+  const output = fs.createWriteStream(outputPath)
+  const archive = s3Zip
     .setFormat('tar')
     .archiveStream(fileStream(file1), [file1], [file1DataEntry])
     .pipe(output)

package/test/test-s3-zip-unique-prefix.js

@@ -1,26 +1,26 @@
-var s3Zip = require('../s3-zip.js')
-var t = require('tap')
-var fs = require('fs')
-var Stream = require('stream')
-var concat = require('concat-stream')
-var yauzl = require('yauzl')
-var join = require('path').join
-var streamify = require('stream-array')
+let s3Zip = require('../s3-zip.js')
+const t = require('tap')
+const fs = require('fs')
+const Stream = require('stream')
+const concat = require('concat-stream')
+const yauzl = require('yauzl')
+const join = require('path').join
+const streamify = require('stream-array')
 
-var fileStreamForFiles = function (files, preserveFolderPath) {
-  var rs = new Stream()
+const fileStreamForFiles = function (files, preserveFolderPath) {
+  const rs = new Stream()
   rs.readable = true
 
-  var fileCounter = 0
+  let fileCounter = 0
   streamify(files).on('data', function (file) {
     fileCounter += 1
 
-    var fileStream = fs.createReadStream(join(__dirname, file))
+    const 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 })
+        const path = preserveFolderPath ? file : file.replace(/^.*[\\/]/, '')
+        rs.emit('data', { data: buffer, path })
       })
     )
     fileStream.on('end', function () {
@@ -34,13 +34,13 @@ var fileStreamForFiles = function (files, preserveFolderPath) {
   return rs
 }
 
-var file1 = 'a/file.txt'
-var file1Alt = 'file.txt'
-var file2 = 'b/file.txt'
-var file2Alt = 'file-1.txt'
-var sinon = require('sinon')
-var proxyquire = require('proxyquire')
-var s3Stub = fileStreamForFiles(
+const file1 = 'a/file.txt'
+const file1Alt = 'file.txt'
+const file2 = 'b/file.txt'
+const file2Alt = 'file-1.txt'
+const sinon = require('sinon')
+const proxyquire = require('proxyquire')
+const s3Stub = fileStreamForFiles(
   ['/fixtures/folder/a/file.txt', '/fixtures/folder/b/file.txt'],
   true
 )
@@ -51,10 +51,10 @@ s3Zip = proxyquire('../s3-zip.js', {
 t.test(
   'test archive with matching alternate zip archive names but unique keys',
   function (child) {
-    var outputPath = join(__dirname, '/test-unique.zip')
-    var output = fs.createWriteStream(outputPath)
+    const outputPath = join(__dirname, '/test-unique.zip')
+    const output = fs.createWriteStream(outputPath)
 
-    var archive = s3Zip
+    const archive = s3Zip
       .archive(
         { region: 'region', bucket: 'bucket' },
         '/fixtures/folder/',
@@ -63,13 +63,13 @@ t.test(
       )
       .pipe(output)
 
-    var altFiles = [file1Alt, file2Alt]
+    const altFiles = [file1Alt, file2Alt]
 
     archive.on('close', function () {
       yauzl.open(outputPath, function (err, zip) {
         if (err) console.log('err', err)
         zip.on('entry', function (entry) {
-          var i = altFiles.indexOf(entry.fileName)
+          const i = altFiles.indexOf(entry.fileName)
           if (i > -1) {
             child.same(entry.fileName, altFiles[i])
             altFiles.splice(i, 1)

package/test/test-s3-zip.js

@@ -1,15 +1,15 @@
-var s3Zip = require('../s3-zip.js')
-var t = require('tap')
-var fs = require('fs')
-var Stream = require('stream')
-var concat = require('concat-stream')
-var yauzl = require('yauzl')
-var join = require('path').join
+let s3Zip = require('../s3-zip.js')
+const t = require('tap')
+const fs = require('fs')
+const Stream = require('stream')
+const concat = require('concat-stream')
+const yauzl = require('yauzl')
+const { join } = require('path')
 
-var fileStream = function (file, forceError) {
-  var rs = new Stream()
+const fileStream = function (file, forceError) {
+  const rs = new Stream()
   rs.readable = true
-  var fileStream = fs.createReadStream(join(__dirname, file))
+  const fileStream = fs.createReadStream(join(__dirname, file))
   fileStream.pipe(
     concat(function buffersEmit (buffer) {
       if (forceError) {
@@ -27,20 +27,20 @@ var fileStream = function (file, forceError) {
   return rs
 }
 
-var file1 = '/fixtures/file.txt'
-var emptyFile = '/fixtures/empty.txt'
+const file1 = '/fixtures/file.txt'
+const emptyFile = '/fixtures/empty.txt'
 // Stub: var fileStream = s3Files.createFileStream(keyStream);
-var sinon = require('sinon')
-var proxyquire = require('proxyquire')
-var s3Stub = fileStream(file1)
+const sinon = require('sinon')
+const proxyquire = require('proxyquire')
+const s3Stub = fileStream(file1)
 s3Zip = proxyquire('../s3-zip.js', {
   's3-files': { createFileStream: sinon.stub().returns(s3Stub) }
 })
 
 t.test('test archiveStream and zip file', function (child) {
-  var output = fs.createWriteStream(join(__dirname, '/test.zip'))
-  var s = fileStream(file1)
-  var archive = s3Zip.archiveStream(s).pipe(output)
+  const output = fs.createWriteStream(join(__dirname, '/test.zip'))
+  const s = fileStream(file1)
+  const archive = s3Zip.archiveStream(s).pipe(output)
   archive.on('close', function () {
     console.log('+++++++++++')
     yauzl.open(join(__dirname, '/test.zip'), function (err, zip) {
@@ -61,7 +61,7 @@ t.test('test archiveStream and zip file', function (child) {
 })
 
 t.test('test archive', function (child) {
-  var archive = s3Zip.archive(
+  const archive = s3Zip.archive(
     { region: 'region', bucket: 'bucket' },
     'folder',
     [file1]
@@ -71,9 +71,9 @@ t.test('test archive', function (child) {
 })
 
 t.test('test archive on empty file', function (child) {
-  var output = fs.createWriteStream(join(__dirname, '/test.zip'))
-  var s = fileStream(emptyFile)
-  var archive = s3Zip.archiveStream(s).pipe(output)
+  const output = fs.createWriteStream(join(__dirname, '/test.zip'))
+  const s = fileStream(emptyFile)
+  const archive = s3Zip.archiveStream(s).pipe(output)
   archive.on('close', function () {
     console.log('+++++++++++')
     yauzl.open(join(__dirname, '/test.zip'), function (err, zip) {