@poppinss/multiparty 2.0.0 → 3.0.0

package/HISTORY.md

@@ -1,6 +1,11 @@
 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

package/README.md

@@ -271,5 +271,5 @@ stream uploads to disk for you.
 
 [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-image]: https://img.shields.io/github/actions/workflow/status/poppinss/multiparty/test.yml?style=for-the-badge
 [gh-workflow-url]: https://github.com/poppinss/multiparty/actions/workflows/test.yml "Github action"

package/index.js

@@ -9,13 +9,12 @@
 'use strict'
 
 var createError = require('http-errors')
-var uid = require('uid-safe')
 var stream = require('stream');
 var util = require('util');
 var fs = require('fs');
 var path = require('path');
 var os = require('os');
-var Buffer = require('safe-buffer').Buffer
+var crypto = require('crypto');
 var StringDecoder = require('string_decoder').StringDecoder;
 
 var START = 0;
@@ -48,6 +47,20 @@ var NAME_PARAM_RE = /\bname=(?:"([^"]+)"|([!#$%&'*+.0-9A-Z^_`a-z|~-]+))/i
 
 exports.Form = Form;
 
+/**
+ * Generates a URL safe random string of a given size
+ */
+function randomUid(size) {
+  var bits = (size + 1) * 6
+  var buffer = crypto.randomBytes(Math.ceil(bits / 8))
+  return Buffer.from(buffer)
+    .toString('base64')
+    .replace(/\+/g, '-')
+    .replace(/\//g, '_')
+    .replace(/=/g, '')
+    .slice(0, size)
+}
+
 util.inherits(Form, stream.Writable);
 function Form(options) {
   var opts = options || {}
@@ -672,7 +685,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()
+    }
   });
 }
 
@@ -754,6 +774,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;
@@ -792,7 +832,7 @@ function setUpParser(self, boundary) {
 
 function uploadPath(baseDir, filename) {
   var ext = path.extname(filename).replace(FILE_EXT_RE, '$1');
-  var name = uid.sync(18) + ext
+  var name = randomUid(18) + ext
   return path.join(baseDir, name);
 }
 
@@ -809,7 +849,7 @@ function parseFilename(headerValue) {
 
   var filename = m[1] || m[2] || '';
   filename = filename.replace(/%22|\\"/g, '"');
-  filename = filename.replace(/&#([\d]{4});/g, function(m, code) {
+  filename = filename.replace(/&#([0-9]{1,5});/g, function(m, code) {
     return String.fromCharCode(code);
   });
   return filename.substr(filename.lastIndexOf('\\') + 1);

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@poppinss/multiparty",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "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,18 @@
     "s3"
   ],
   "dependencies": {
-    "http-errors": "^2.0.0",
-    "safe-buffer": "5.2.1",
-    "uid-safe": "2.1.5"
+    "http-errors": "^2.0.0"
   },
   "devDependencies": {
-    "eslint": "^8.5.0",
+    "eslint": "^8.9.0",
     "eslint-plugin-markdown": "2.2.1",
     "mkdirp": "^1.0.4",
-    "mocha": "^9.1.3",
+    "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",