multer-orm 2.0.1 → 2.0.2

package/lib/make-middleware.js

@@ -1,194 +1,194 @@
-var is = require('type-is')
-var Busboy = require('busboy')
-var extend = require('xtend')
-var appendField = require('append-field')
-
-var Counter = require('./counter')
-var MulterError = require('./multer-error')
-var FileAppender = require('./file-appender')
-var removeUploadedFiles = require('./remove-uploaded-files')
-
-function drainStream (stream) {
-  stream.on('readable', () => {
-    while (stream.read() !== null) {}
-  })
-}
-
-function makeMiddleware (setup) {
-  return function multerMiddleware (req, res, next) {
-    if (!is(req, ['multipart'])) return next()
-
-    var options = setup()
-
-    var limits = options.limits
-    var storage = options.storage
-    var fileFilter = options.fileFilter
-    var fileStrategy = options.fileStrategy
-    var preservePath = options.preservePath
-
-    req.body = Object.create(null)
-
-    req.on('error', function (err) {
-      abortWithError(err)
-    })
-
-    var busboy
-
-    try {
-      busboy = Busboy({ headers: req.headers, limits: limits, preservePath: preservePath })
-    } catch (err) {
-      return next(err)
-    }
-
-    var appender = new FileAppender(fileStrategy, req)
-    var isDone = false
-    var readFinished = false
-    var errorOccured = false
-    var pendingWrites = new Counter()
-    var uploadedFiles = []
-
-    function done (err) {
-      if (isDone) return
-      isDone = true
-      req.unpipe(busboy)
-      drainStream(req)
-      req.resume()
-      setImmediate(() => {
-        busboy.removeAllListeners()
-      })
-      next(err)
-    }
-
-    function indicateDone () {
-      if (readFinished && pendingWrites.isZero() && !errorOccured) done()
-    }
-
-    function abortWithError (uploadError) {
-      if (errorOccured) return
-      errorOccured = true
-
-      pendingWrites.onceZero(function () {
-        function remove (file, cb) {
-          storage._removeFile(req, file, cb)
-        }
-
-        removeUploadedFiles(uploadedFiles, remove, function (err, storageErrors) {
-          if (err) return done(err)
-
-          uploadError.storageErrors = storageErrors
-          done(uploadError)
-        })
-      })
-    }
-
-    function abortWithCode (code, optionalField) {
-      abortWithError(new MulterError(code, optionalField))
-    }
-
-    // handle text field data
-    busboy.on('field', function (fieldname, value, { nameTruncated, valueTruncated }) {
-      if (fieldname == null) return abortWithCode('MISSING_FIELD_NAME')
-      if (nameTruncated) return abortWithCode('LIMIT_FIELD_KEY')
-      if (valueTruncated) return abortWithCode('LIMIT_FIELD_VALUE', fieldname)
-
-      // Work around bug in Busboy (https://github.com/mscdex/busboy/issues/6)
-      if (limits && Object.prototype.hasOwnProperty.call(limits, 'fieldNameSize')) {
-        if (fieldname.length > limits.fieldNameSize) return abortWithCode('LIMIT_FIELD_KEY')
-      }
-
-      appendField(req.body, fieldname, value)
-    })
-
-    // handle files
-    busboy.on('file', function (fieldname, fileStream, { filename, encoding, mimeType }) {
-      var pendingWritesIncremented = false
-
-      fileStream.on('error', function (err) {
-        if (pendingWritesIncremented) {
-          pendingWrites.decrement()
-        }
-        abortWithError(err)
-      })
-
-      if (fieldname == null) return abortWithCode('MISSING_FIELD_NAME')
-
-      // don't attach to the files object, if there is no file
-      if (!filename) return fileStream.resume()
-
-      // Work around bug in Busboy (https://github.com/mscdex/busboy/issues/6)
-      if (limits && Object.prototype.hasOwnProperty.call(limits, 'fieldNameSize')) {
-        if (fieldname.length > limits.fieldNameSize) return abortWithCode('LIMIT_FIELD_KEY')
-      }
-
-      var file = {
-        fieldname: fieldname,
-        originalname: filename,
-        encoding: encoding,
-        mimetype: mimeType
-      }
-
-      var placeholder = appender.insertPlaceholder(file)
-
-      fileFilter(req, file, function (err, includeFile) {
-        if (err) {
-          appender.removePlaceholder(placeholder)
-          return abortWithError(err)
-        }
-
-        if (!includeFile) {
-          appender.removePlaceholder(placeholder)
-          return fileStream.resume()
-        }
-
-        var aborting = false
-        pendingWritesIncremented = true
-        pendingWrites.increment()
-
-        Object.defineProperty(file, 'stream', {
-          configurable: true,
-          enumerable: false,
-          value: fileStream
-        })
-
-        fileStream.on('limit', function () {
-          aborting = true
-          abortWithCode('LIMIT_FILE_SIZE', fieldname)
-        })
-
-        storage._handleFile(req, file, function (err, info) {
-          if (aborting) {
-            appender.removePlaceholder(placeholder)
-            uploadedFiles.push(extend(file, info))
-            return pendingWrites.decrement()
-          }
-
-          if (err) {
-            appender.removePlaceholder(placeholder)
-            pendingWrites.decrement()
-            return abortWithError(err)
-          }
-
-          var fileInfo = extend(file, info)
-
-          appender.replacePlaceholder(placeholder, fileInfo)
-          uploadedFiles.push(fileInfo)
-          pendingWrites.decrement()
-          indicateDone()
-        })
-      })
-    })
-
-    busboy.on('error', function (err) { abortWithError(err) })
-    busboy.on('partsLimit', function () { abortWithCode('LIMIT_PART_COUNT') })
-    busboy.on('filesLimit', function () { abortWithCode('LIMIT_FILE_COUNT') })
-    busboy.on('fieldsLimit', function () { abortWithCode('LIMIT_FIELD_COUNT') })
-    busboy.on('close', function () {
-      readFinished = true
-      indicateDone()
-    })
-
-    req.pipe(busboy)
-  }
-}
-
-module.exports = makeMiddleware
+var is = require('type-is')
+var Busboy = require('busboy')
+var extend = require('xtend')
+var appendField = require('append-field')
+
+var Counter = require('./counter')
+var MulterError = require('./multer-error')
+var FileAppender = require('./file-appender')
+var removeUploadedFiles = require('./remove-uploaded-files')
+
+function drainStream (stream) {
+  stream.on('readable', () => {
+    while (stream.read() !== null) {}
+  })
+}
+
+function makeMiddleware (setup) {
+  return function multerMiddleware (req, res, next) {
+    if (!is(req, ['multipart'])) return next()
+
+    var options = setup()
+
+    var limits = options.limits
+    var storage = options.storage
+    var fileFilter = options.fileFilter
+    var fileStrategy = options.fileStrategy
+    var preservePath = options.preservePath
+
+    req.body = Object.create(null)
+
+    req.on('error', function (err) {
+      abortWithError(err)
+    })
+
+    var busboy
+
+    try {
+      busboy = Busboy({ headers: req.headers, limits: limits, preservePath: preservePath })
+    } catch (err) {
+      return next(err)
+    }
+
+    var appender = new FileAppender(fileStrategy, req)
+    var isDone = false
+    var readFinished = false
+    var errorOccured = false
+    var pendingWrites = new Counter()
+    var uploadedFiles = []
+
+    function done (err) {
+      if (isDone) return
+      isDone = true
+      req.unpipe(busboy)
+      drainStream(req)
+      req.resume()
+      setImmediate(() => {
+        busboy.removeAllListeners()
+      })
+      next(err)
+    }
+
+    function indicateDone () {
+      if (readFinished && pendingWrites.isZero() && !errorOccured) done()
+    }
+
+    function abortWithError (uploadError) {
+      if (errorOccured) return
+      errorOccured = true
+
+      pendingWrites.onceZero(function () {
+        function remove (file, cb) {
+          storage._removeFile(req, file, cb)
+        }
+
+        removeUploadedFiles(uploadedFiles, remove, function (err, storageErrors) {
+          if (err) return done(err)
+
+          uploadError.storageErrors = storageErrors
+          done(uploadError)
+        })
+      })
+    }
+
+    function abortWithCode (code, optionalField) {
+      abortWithError(new MulterError(code, optionalField))
+    }
+
+    // handle text field data
+    busboy.on('field', function (fieldname, value, { nameTruncated, valueTruncated }) {
+      if (fieldname == null) return abortWithCode('MISSING_FIELD_NAME')
+      if (nameTruncated) return abortWithCode('LIMIT_FIELD_KEY')
+      if (valueTruncated) return abortWithCode('LIMIT_FIELD_VALUE', fieldname)
+
+      // Work around bug in Busboy (https://github.com/mscdex/busboy/issues/6)
+      if (limits && Object.prototype.hasOwnProperty.call(limits, 'fieldNameSize')) {
+        if (fieldname.length > limits.fieldNameSize) return abortWithCode('LIMIT_FIELD_KEY')
+      }
+
+      appendField(req.body, fieldname, value)
+    })
+
+    // handle files
+    busboy.on('file', function (fieldname, fileStream, { filename, encoding, mimeType }) {
+      var pendingWritesIncremented = false
+
+      fileStream.on('error', function (err) {
+        if (pendingWritesIncremented) {
+          pendingWrites.decrement()
+        }
+        abortWithError(err)
+      })
+
+      if (fieldname == null) return abortWithCode('MISSING_FIELD_NAME')
+
+      // don't attach to the files object, if there is no file
+      if (!filename) return fileStream.resume()
+
+      // Work around bug in Busboy (https://github.com/mscdex/busboy/issues/6)
+      if (limits && Object.prototype.hasOwnProperty.call(limits, 'fieldNameSize')) {
+        if (fieldname.length > limits.fieldNameSize) return abortWithCode('LIMIT_FIELD_KEY')
+      }
+
+      var file = {
+        fieldname: fieldname,
+        originalname: filename,
+        encoding: encoding,
+        mimetype: mimeType
+      }
+
+      var placeholder = appender.insertPlaceholder(file)
+
+      fileFilter(req, file, function (err, includeFile) {
+        if (err) {
+          appender.removePlaceholder(placeholder)
+          return abortWithError(err)
+        }
+
+        if (!includeFile) {
+          appender.removePlaceholder(placeholder)
+          return fileStream.resume()
+        }
+
+        var aborting = false
+        pendingWritesIncremented = true
+        pendingWrites.increment()
+
+        Object.defineProperty(file, 'stream', {
+          configurable: true,
+          enumerable: false,
+          value: fileStream
+        })
+
+        fileStream.on('limit', function () {
+          aborting = true
+          abortWithCode('LIMIT_FILE_SIZE', fieldname)
+        })
+
+        storage._handleFile(req, file, function (err, info) {
+          if (aborting) {
+            appender.removePlaceholder(placeholder)
+            uploadedFiles.push(extend(file, info))
+            return pendingWrites.decrement()
+          }
+
+          if (err) {
+            appender.removePlaceholder(placeholder)
+            pendingWrites.decrement()
+            return abortWithError(err)
+          }
+
+          var fileInfo = extend(file, info)
+
+          appender.replacePlaceholder(placeholder, fileInfo)
+          uploadedFiles.push(fileInfo)
+          pendingWrites.decrement()
+          indicateDone()
+        })
+      })
+    })
+
+    busboy.on('error', function (err) { abortWithError(err) })
+    busboy.on('partsLimit', function () { abortWithCode('LIMIT_PART_COUNT') })
+    busboy.on('filesLimit', function () { abortWithCode('LIMIT_FILE_COUNT') })
+    busboy.on('fieldsLimit', function () { abortWithCode('LIMIT_FIELD_COUNT') })
+    busboy.on('close', function () {
+      readFinished = true
+      indicateDone()
+    })
+
+    req.pipe(busboy)
+  }
+}
+
+module.exports = makeMiddleware

package/lib/multer-error.js

@@ -1,24 +1,24 @@
-var util = require('util')
-
-var errorMessages = {
-  LIMIT_PART_COUNT: 'Too many parts',
-  LIMIT_FILE_SIZE: 'File too large',
-  LIMIT_FILE_COUNT: 'Too many files',
-  LIMIT_FIELD_KEY: 'Field name too long',
-  LIMIT_FIELD_VALUE: 'Field value too long',
-  LIMIT_FIELD_COUNT: 'Too many fields',
-  LIMIT_UNEXPECTED_FILE: 'Unexpected field',
-  MISSING_FIELD_NAME: 'Field name missing'
-}
-
-function MulterError (code, field) {
-  Error.captureStackTrace(this, this.constructor)
-  this.name = this.constructor.name
-  this.message = errorMessages[code]
-  this.code = code
-  if (field) this.field = field
-}
-
-util.inherits(MulterError, Error)
-
-module.exports = MulterError
+var util = require('util')
+
+var errorMessages = {
+  LIMIT_PART_COUNT: 'Too many parts',
+  LIMIT_FILE_SIZE: 'File too large',
+  LIMIT_FILE_COUNT: 'Too many files',
+  LIMIT_FIELD_KEY: 'Field name too long',
+  LIMIT_FIELD_VALUE: 'Field value too long',
+  LIMIT_FIELD_COUNT: 'Too many fields',
+  LIMIT_UNEXPECTED_FILE: 'Unexpected field',
+  MISSING_FIELD_NAME: 'Field name missing'
+}
+
+function MulterError (code, field) {
+  Error.captureStackTrace(this, this.constructor)
+  this.name = this.constructor.name
+  this.message = errorMessages[code]
+  this.code = code
+  if (field) this.field = field
+}
+
+util.inherits(MulterError, Error)
+
+module.exports = MulterError

package/lib/remove-uploaded-files.js

@@ -1,28 +1,28 @@
-function removeUploadedFiles (uploadedFiles, remove, cb) {
-  var length = uploadedFiles.length
-  var errors = []
-
-  if (length === 0) return cb(null, errors)
-
-  function handleFile (idx) {
-    var file = uploadedFiles[idx]
-
-    remove(file, function (err) {
-      if (err) {
-        err.file = file
-        err.field = file.fieldname
-        errors.push(err)
-      }
-
-      if (idx < length - 1) {
-        handleFile(idx + 1)
-      } else {
-        cb(null, errors)
-      }
-    })
-  }
-
-  handleFile(0)
-}
-
-module.exports = removeUploadedFiles
+function removeUploadedFiles (uploadedFiles, remove, cb) {
+  var length = uploadedFiles.length
+  var errors = []
+
+  if (length === 0) return cb(null, errors)
+
+  function handleFile (idx) {
+    var file = uploadedFiles[idx]
+
+    remove(file, function (err) {
+      if (err) {
+        err.file = file
+        err.field = file.fieldname
+        errors.push(err)
+      }
+
+      if (idx < length - 1) {
+        handleFile(idx + 1)
+      } else {
+        cb(null, errors)
+      }
+    })
+  }
+
+  handleFile(0)
+}
+
+module.exports = removeUploadedFiles

package/package.json

@@ -1,52 +1,57 @@
-{
-  "name": "multer-orm",
-  "description": "Multer ORM for handling `multipart/form-data`.",
-  "version": "2.0.1",
-  "license": "MIT",
-  "repository": "expressjs/multer",
-  "keywords": [
-    "form",
-    "post",
-    "multipart",
-    "form-data",
-    "formdata",
-    "express",
-    "middleware"
-  ],
-  "dependencies": {
-    "append-field": "^1.0.0",
-    "busboy": "^1.6.0",
-    "concat-stream": "^2.0.0",
-    "mkdirp": "^0.5.6",
-    "object-assign": "^4.1.1",
-    "type-is": "^1.6.18",
-    "xtend": "^4.0.2"
-  },
-  "devDependencies": {
-    "deep-equal": "^2.0.3",
-    "express": "^4.21.2",
-    "form-data": "^4.0.2",
-    "fs-temp": "^1.2.1",
-    "mocha": "^11.5.0",
-    "nyc": "^15.1.0",
-    "rimraf": "^2.4.1",
-    "standard": "^14.3.3",
-    "testdata-w3c-json-form": "^1.0.0"
-  },
-  "engines": {
-    "node": ">= 10.16.0"
-  },
-  "files": [
-    "LICENSE",
-    "index.js",
-    "storage/",
-    "lib/"
-  ],
-  "scripts": {
-    "lint": "standard",
-    "lint:fix": "standard --fix",
-    "test": "mocha --reporter spec --exit --check-leaks test/",
-    "test-ci": "nyc --reporter=lcov --reporter=text npm test",
-    "test-cov": "nyc --reporter=html --reporter=text npm test"
-  }
-}
+{
+  "name": "multer-orm",
+  "description": "Middleware for handling `multipart/form-data`.",
+  "version": "2.0.2",
+  "contributors": [
+    "Hage Yaapa <captain@hacksparrow.com> (http://www.hacksparrow.com)",
+    "Jaret Pfluger <https://github.com/jpfluger>",
+    "Linus Unnebäck <linus@folkdatorn.se>"
+  ],
+  "license": "MIT",
+  "repository": "expressjs/multer",
+  "keywords": [
+    "form",
+    "post",
+    "multipart",
+    "form-data",
+    "formdata",
+    "express",
+    "middleware"
+  ],
+  "dependencies": {
+    "append-field": "^1.0.0",
+    "busboy": "^1.6.0",
+    "concat-stream": "^2.0.0",
+    "mkdirp": "^0.5.6",
+    "object-assign": "^4.1.1",
+    "type-is": "^1.6.18",
+    "xtend": "^4.0.2"
+  },
+  "devDependencies": {
+    "deep-equal": "^2.0.3",
+    "express": "^4.21.2",
+    "form-data": "^4.0.2",
+    "fs-temp": "^1.2.1",
+    "mocha": "^11.5.0",
+    "nyc": "^15.1.0",
+    "rimraf": "^2.4.1",
+    "standard": "^14.3.3",
+    "testdata-w3c-json-form": "^1.0.0"
+  },
+  "engines": {
+    "node": ">= 10.16.0"
+  },
+  "files": [
+    "LICENSE",
+    "index.js",
+    "storage/",
+    "lib/"
+  ],
+  "scripts": {
+    "lint": "standard",
+    "lint:fix": "standard --fix",
+    "test": "mocha --reporter spec --exit --check-leaks test/",
+    "test-ci": "nyc --reporter=lcov --reporter=text npm test",
+    "test-cov": "nyc --reporter=html --reporter=text npm test"
+  }
+}