@poppinss/multiparty 1.0.1 → 2.0.1

package/HISTORY.md

@@ -1,3 +1,15 @@
+unreleased
+==========
+
+  * Fix form parsing when no `part` event listener added
+
+4.2.3 / 2022-01-20
+==================
+
+  * Fix handling of unquoted values in `Content-Disposition`
+  * deps: http-errors@~1.8.1
+    - deps: toidentifier@1.0.1
+
 4.2.2 / 2020-07-27
 ==================
 

package/README.md

@@ -3,9 +3,7 @@
 
 [![NPM Version][npm-version-image]][npm-url]
 [![NPM Downloads][npm-downloads-image]][npm-url]
-[![Node.js Version][node-version-image]][node-version-url]
-[![Build Status][travis-image]][travis-url]
-[![Test Coverage][coveralls-image]][coveralls-url]
+[![Build Status][gh-workflow-image]][gh-workflow-url]
 
 Parses http requests with content-type `multipart/form-data`, also known as file uploads.
 
@@ -115,14 +113,14 @@ form.on('part', function(part) {
   // You *must* act on the part by reading it
   // NOTE: if you want to ignore it, just call "part.resume()"
 
-  if (!part.filename) {
+  if (part.filename === undefined) {
     // filename is not defined when this is a field and not a file
     console.log('got field named ' + part.name);
     // ignore field's content
     part.resume();
   }
 
-  if (part.filename) {
+  if (part.filename !== undefined) {
     // filename is defined when this is a file
     count++;
     console.log('got file named ' + part.name);
@@ -268,12 +266,10 @@ stream uploads to disk for you.
 
 [MIT](LICENSE)
 
-[coveralls-image]: https://badgen.net/coveralls/c/github/pillarjs/multiparty/master
-[coveralls-url]: https://coveralls.io/r/pillarjs/multiparty?branch=master
-[node-version-image]: https://badgen.net/npm/node/multiparty
-[node-version-url]: https://nodejs.org/en/download
-[npm-downloads-image]: https://badgen.net/npm/dm/multiparty
-[npm-url]: https://npmjs.org/package/multiparty
-[npm-version-image]: https://badgen.net/npm/v/multiparty
-[travis-image]: https://badgen.net/travis/pillarjs/multiparty/master
-[travis-url]: https://travis-ci.org/pillarjs/multiparty
+[npm-downloads-image]: https://img.shields.io/npm/dm/@poppinss/multiparty?style=for-the-badge
+[npm-url]: https://npmjs.org/package/@poppinss/multiparty
+
+[npm-version-image]: https://img.shields.io/npm/v/@poppinss/multiparty?style=for-the-badge
+
+[gh-workflow-image]: https://img.shields.io/github/workflow/status/poppinss/multiparty/test?style=for-the-badge
+[gh-workflow-url]: https://github.com/poppinss/multiparty/actions/workflows/test.yml "Github action"

package/index.js

@@ -42,7 +42,9 @@ var Z = 122;
 var CONTENT_TYPE_RE = /^multipart\/(?:form-data|related)(?:;|$)/i;
 var CONTENT_TYPE_PARAM_RE = /;\s*([^=]+)=(?:"([^"]+)"|([^;]+))/gi;
 var FILE_EXT_RE = /(\.[_\-a-zA-Z0-9]{0,16})[\S\s]*/;
+var FILENAME_PARAM_RE = /\bfilename=(?:"(.*?)"|([!#$%&'*+.0-9A-Z^_`a-z|~-]+))($|; )/i
 var LAST_BOUNDARY_SUFFIX_LEN = 4; // --\r\n
+var NAME_PARAM_RE = /\bname=(?:"([^"]+)"|([!#$%&'*+.0-9A-Z^_`a-z|~-]+))/i
 
 exports.Form = Form;
 
@@ -458,8 +460,8 @@ Form.prototype.onParseHeaderEnd = function() {
 
   var m;
   if (this.headerField === 'content-disposition') {
-    if (m = this.headerValue.match(/\bname="([^"]+)"/i)) {
-      this.partName = m[1];
+    if (m = NAME_PARAM_RE.exec(this.headerValue)) {
+      this.partName = m[1] || m[2] || ''
     }
     this.partFilename = parseFilename(this.headerValue);
   } else if (this.headerField === 'content-transfer-encoding') {
@@ -670,7 +672,14 @@ function handlePart(self, partStream) {
     endFlush(self);
   });
   emitAndReleaseHold(function() {
-    self.emit('part', partStream);
+    if (hasListeners(self, 'part')) {
+      self.emit('part', partStream)
+    } else {
+      partStream.on('error', function (err) {
+        self.handleError(err)
+      })
+      partStream.resume()
+    }
   });
 }
 
@@ -752,6 +761,26 @@ function handleField(self, fieldStream) {
   });
 }
 
+/**
+ * Determine if emitter has listeners of a given type.
+ *
+ * The way to do this check is done three different ways in Node.js >= 0.10
+ * so this consolidates them into a minimal set using instance methods.
+ *
+ * @param {EventEmitter} emitter
+ * @param {string} type
+ * @returns {boolean}
+ * @private
+ */
+
+function hasListeners (emitter, type) {
+  var count = typeof emitter.listenerCount !== 'function'
+    ? emitter.listeners(type).length
+    : emitter.listenerCount(type)
+
+  return count > 0
+}
+
 function clearPartVars(self) {
   self.partHeaders = {};
   self.partName = null;
@@ -795,7 +824,7 @@ function uploadPath(baseDir, filename) {
 }
 
 function parseFilename(headerValue) {
-  var m = headerValue.match(/\bfilename="(.*?)"($|; )/i);
+  var m = FILENAME_PARAM_RE.exec(headerValue)
   if (!m) {
     m = headerValue.match(/\bfilename\*=utf-8''(.*?)($|; )/i)
     if (m) {
@@ -805,7 +834,7 @@ function parseFilename(headerValue) {
     }
   }
 
-  var filename = m[1];
+  var filename = m[1] || m[2] || '';
   filename = filename.replace(/%22|\\"/g, '"');
   filename = filename.replace(/&#([\d]{4});/g, function(m, code) {
     return String.fromCharCode(code);

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@poppinss/multiparty",
-  "version": "1.0.1",
+  "version": "2.0.1",
   "description": "multipart/form-data parser which supports streaming",
   "main": "index.js",
+  "contributors": [
+    "Douglas Christopher Wilson <doug@somethingdoug.com>",
+    "Felix Geisendörfer <felix@debuggable.com>"
+  ],
   "license": "MIT",
   "keywords": [
     "file",
@@ -12,20 +16,20 @@
     "s3"
   ],
   "dependencies": {
-    "http-errors": "~1.8.0",
+    "http-errors": "^2.0.0",
     "safe-buffer": "5.2.1",
     "uid-safe": "2.1.5"
   },
   "devDependencies": {
-    "eslint": "^7.22.0",
-    "eslint-plugin-markdown": "^2.0.0",
+    "eslint": "^8.9.0",
+    "eslint-plugin-markdown": "2.2.1",
     "mkdirp": "^1.0.4",
-    "mocha": "^8.3.2",
+    "mocha": "^9.2.1",
     "nyc": "15.1.0",
     "pend": "1.2.0",
     "require-all": "3.0.0",
     "rimraf": "^3.0.2",
-    "superagent": "^6.1.0"
+    "superagent": "^7.1.1"
   },
   "files": [
     "HISTORY.md",
@@ -34,9 +38,9 @@
     "index.js"
   ],
   "scripts": {
-    "lint": "eslint --plugin markdown --ext js,md .",
+    "lint": "eslint .",
     "test": "mocha --reporter spec --bail --check-leaks test/",
-    "test-ci": "nyc --reporter=text npm test",
+    "test-ci": "nyc --reporter=lcov --reporter=text npm test",
     "test-cov": "nyc --reporter=html --reporter=text npm test"
   },
   "directories": {