style: add prettier, lint-staged, husky and eslint rules

.gitignore

@@ -9,3 +9,5 @@ node_modules
 
 /dist/
 yarn.lock
+.yarn/
+.yarnrc.yml

examples/compose-object-test-example.js

@@ -20,7 +20,7 @@ const os = require('os')
 const splitFile = require('split-file')
 const fs = require('fs')
 
-var Minio = require('minio')
+var Minio = require('../dist/main/minio')
 var Helpers = require('../dist/main/helpers')
 
 var s3Client = new Minio.Client({

examples/compose-object.js

@@ -17,7 +17,7 @@
 // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-bucketname and my-objectname
 // are dummy values, please replace them with original values.
 
-var Minio = require('minio')
+var Minio = require('../dist/main/minio')
 var Helpers = require('../dist/main/helpers')
 
 var s3Client = new Minio.Client({

examples/select-object-content.js

@@ -17,7 +17,7 @@
 // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-bucketname
 // and my-objectname are dummy values, please replace them with original values.
 
-var Minio = require('minio')
+var Minio = require('../dist/main/minio')
 
 var s3Client = new Minio.Client({
   endPoint: 's3.amazonaws.com',

package.json

@@ -72,9 +72,6 @@
   "devDependencies": {
     "@babel/core": "^7.12.10",
     "@babel/preset-env": "^7.12.10",
-    "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-replace": "^5.0.2",
-    "@rollup/plugin-typescript": "^11.1.0",
     "@types/lodash": "^4.14.192",
     "@types/node": "^18.15.11",
     "@typescript-eslint/eslint-plugin": "^5.57.1",

src/main/AssumeRoleProvider.js

@@ -22,6 +22,7 @@ class AssumeRoleProvider extends CredentialProvider {
     token,
     webIdentityToken,
     action = 'AssumeRole',
+    transportAgent = undefined,
   }) {
     super({})
 
@@ -112,6 +113,7 @@ class AssumeRoleProvider extends CredentialProvider {
         'x-amz-date': makeDateLong(date),
         'x-amz-content-sha256': contentSha256,
       },
+      agent: this.transportAgent,
     }
 
     const authorization = signV4ByServiceName(requestOptions, this.accessKey, this.secretKey, this.region, date, 'sts')

src/main/minio.js

@@ -150,7 +150,9 @@ export class Client {
     // if custom transport agent is set, use it.
     if (params.transportAgent) {
       if (!isObject(params.transportAgent)) {
-        throw new errors.InvalidArgumentError(`Invalid transportAgent type: ${params.transportAgent}, expected to be type "object"`)
+        throw new errors.InvalidArgumentError(
+          `Invalid transportAgent type: ${params.transportAgent}, expected to be type "object"`,
+        )
       }
 
       transportAgent = params.transportAgent
@@ -1157,13 +1159,17 @@ export class Client {
         (cb) => fs.stat(filePath, cb),
         (stats, cb) => {
           size = stats.size
+          var stream
           var cbTriggered = false
           var origCb = cb
           cb = function () {
             if (cbTriggered) {
               return
             }
             cbTriggered = true
+            if (stream) {
+              stream.destroy()
+            }
             return origCb.apply(this, arguments)
           }
           if (size > this.maxObjectSize) {
@@ -1185,7 +1191,7 @@ export class Client {
               .on('data', (data) => {
                 var md5sum = data.md5sum
                 var sha256sum = data.sha256sum
-                var stream = fs.createReadStream(filePath, options)
+                stream = fs.createReadStream(filePath, options)
                 uploader(stream, size, sha256sum, md5sum, (err, objInfo) => {
                   callback(err, objInfo)
                   cb(true)
@@ -1224,13 +1230,17 @@ export class Client {
               cb(null, uploadedSize < size)
             },
             (cb) => {
+              var stream
               var cbTriggered = false
               var origCb = cb
               cb = function () {
                 if (cbTriggered) {
                   return
                 }
                 cbTriggered = true
+                if (stream) {
+                  stream.destroy()
+                }
                 return origCb.apply(this, arguments)
               }
               var part = parts[partNumber]
@@ -1255,7 +1265,7 @@ export class Client {
                     return cb()
                   }
                   // part is not uploaded yet, or md5 mismatch
-                  var stream = fs.createReadStream(filePath, options)
+                  stream = fs.createReadStream(filePath, options)
                   uploader(uploadId, partNumber, stream, length, data.sha256sum, data.md5sum, (e, objInfo) => {
                     if (e) {
                       return cb(e)
@@ -1930,7 +1940,7 @@ export class Client {
 
     async.eachSeries(
       result.listOfList,
-      (list) => {
+      (list, batchCb) => {
         var objects = []
         list.forEach(function (value) {
           if (isObject(value)) {
@@ -1947,22 +1957,27 @@ export class Client {
 
         headers['Content-MD5'] = toMd5(payload)
 
+        let removeObjectsResult
         this.makeRequest({ method, bucketName, query, headers }, payload, [200], '', true, (e, response) => {
           if (e) {
-            return cb(e)
+            return batchCb(e)
           }
-          let removeObjectsResult
           pipesetup(response, transformers.removeObjectsTransformer())
             .on('data', (data) => {
               removeObjectsResult = data
             })
-            .on('error', cb)
+            .on('error', (e) => {
+              return batchCb(e, null)
+            })
             .on('end', () => {
-              cb(null, removeObjectsResult)
+              batchResults.push(removeObjectsResult)
+              return batchCb(null, removeObjectsResult)
             })
         })
       },
-      cb,
+      () => {
+        cb(null, _.flatten(batchResults))
+      },
     )
   }
 

src/main/s3-endpoints.js

@@ -33,6 +33,7 @@ let awsS3Endpoint = {
   'ap-northeast-1': 's3-ap-northeast-1.amazonaws.com',
   'cn-north-1': 's3.cn-north-1.amazonaws.com.cn',
   'ap-east-1': 's3.ap-east-1.amazonaws.com',
+  'eu-north-1': 's3.eu-north-1.amazonaws.com',
   // Add new endpoints here.
 }