formstream 0.0.7 → 1.1.1

package/History.md

@@ -1,4 +1,32 @@
 
+1.1.1 / 2021-04-28
+==================
+
+**fixes**
+  * [[`c96ba5b`](http://github.com/node-modules/formstream/commit/c96ba5bace0e96bf39770769e43d9de4271971d8)] - fix: upgrade mime to fix wrong mime type (#19) (shaozj <<shaozj@users.noreply.github.com>>)
+
+**others**
+  * [[`21918e5`](http://github.com/node-modules/formstream/commit/21918e5fc37a4cea5aae82659d39587f099e805b)] - chore: upgrade devDeps express to latest version (#15) (fengmk2 <<fengmk2@gmail.com>>)
+
+1.1.0 / 2016-12-19
+==================
+
+  * deps: upgrade mime to latest version (#9)
+
+1.0.0 / 2014-11-04
+==================
+
+ * fix(field): support stream.field(String, Number)
+ * chore: fix links
+ * chore: use npm scripts instead of Makefile
+ * fix test case on node@0.8
+
+0.0.8 / 2014-01-17 
+==================
+
+  * destroy source stream when formstream destroy()
+  * add more test cases
+
 0.0.7 / 2013-07-25 
 ==================
 

package/README.md

@@ -1,7 +1,21 @@
-formstream [![Build Status](https://secure.travis-ci.org/fengmk2/formstream.png)](http://travis-ci.org/fengmk2/formstream) [![Coverage Status](https://coveralls.io/repos/fengmk2/formstream/badge.png)](https://coveralls.io/r/fengmk2/formstream)
-==========
-
-![logo](https://raw.github.com/fengmk2/formstream/master/logo.png)
+# formstream
+
+[![NPM version][npm-image]][npm-url]
+[![build status][travis-image]][travis-url]
+[![Test coverage][coveralls-image]][coveralls-url]
+[![David deps][david-image]][david-url]
+[![npm download][download-image]][download-url]
+
+[npm-image]: https://img.shields.io/npm/v/formstream.svg?style=flat-square
+[npm-url]: https://npmjs.org/package/formstream
+[travis-image]: https://img.shields.io/travis/node-modules/formstream.svg?style=flat-square
+[travis-url]: https://travis-ci.org/node-modules/formstream
+[coveralls-image]: https://img.shields.io/coveralls/node-modules/formstream.svg?style=flat-square
+[coveralls-url]: https://coveralls.io/r/node-modules/formstream?branch=master
+[david-image]: https://img.shields.io/david/node-modules/formstream.svg?style=flat-square
+[david-url]: https://david-dm.org/node-modules/formstream
+[download-image]: https://img.shields.io/npm/dm/formstream.svg?style=flat-square
+[download-url]: https://npmjs.org/package/formstream
 
 A [multipart/form-data](http://tools.ietf.org/html/rfc2388) encoded stream, helper for file upload.
 
@@ -166,26 +180,12 @@ Emitted when the stream has received no more 'data' events will happen.
 
 See [Node.js Documentation](http://nodejs.org/api/stream.html#stream_event_end) for more.
 
-## Authors
-
-```bash
-$ git summary 
-
- project  : formstream
- repo age : 10 months
- active   : 15 days
- commits  : 28
- files    : 14
- authors  : 
-    21  fengmk2                 75.0%
-     7  XiNGRZ                  25.0%
-```
-
 ## License
 
 (The MIT License)
 
-Copyright (c) 2012 - 2013 fengmk2 <fengmk2@gmail.com>
+Copyright (c) 2012 - 2014 fengmk2 <fengmk2@gmail.com>
+Copyright(c) node-modules and other contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/lib/formstream.js

@@ -1,8 +1,4 @@
-/*!
- * formstream - lib/formstream.js
- * Copyright(c) 2012 - 2013 fengmk2 <fengmk2@gmail.com>
- * MIT Licensed
- *
+/**
  * Data format:
  *
 
@@ -25,18 +21,15 @@ Content-Type: image/png\r\n
  *
  */
 
-"use strict";
+'use strict';
 
-/**
- * Module dependencies.
- */
-require('buffer-concat');
 var Stream = require('stream');
 var parseStream = require('pause-stream');
 var util = require('util');
 var mime = require('mime');
 var path = require('path');
 var fs = require('fs');
+var destroy = require('destroy');
 
 var PADDING = '--';
 var NEW_LINE = '\r\n';
@@ -117,7 +110,7 @@ FormStream.prototype.headers = function (options) {
 };
 
 FormStream.prototype.file = function (name, filepath, filename, filesize) {
-  var mimeType = mime.lookup(filepath);
+  var mimeType = mime.getType(filepath);
 
   if (typeof filename === 'number' && !filesize) {
     filesize = filename;
@@ -131,20 +124,37 @@ FormStream.prototype.file = function (name, filepath, filename, filesize) {
   return this.stream(name, stream, filename, mimeType, filesize);
 };
 
+/**
+ * Add a form field
+ * @param  {String} name field name
+ * @param  {String|Buffer} value field value
+ * @return {this}
+ */
 FormStream.prototype.field = function (name, value) {
-  var buffer = new Buffer(value);
-  return this.buffer(name, buffer);
+  if (!Buffer.isBuffer(value)) {
+    // field(String, Number)
+    // https://github.com/qiniu/nodejs-sdk/issues/123
+    if (typeof value === 'number') {
+      value = String(value);
+    }
+    value = new Buffer(value);
+  }
+  return this.buffer(name, value);
 };
 
 FormStream.prototype.stream = function (name, stream, filename, mimeType, size) {
   if (typeof mimeType === 'number' && !size) {
     size = mimeType;
-    mimeType = mime.lookup(filename);
+    mimeType = mime.getType(filename);
   } else if (!mimeType) {
-    mimeType = mime.lookup(filename);
+    mimeType = mime.getType(filename);
   }
 
-  stream.on('error', this.emit.bind(this, 'error'));
+  stream.once('error', this.emit.bind(this, 'error'));
+  // if form stream destroy, also destroy the source stream
+  this.once('destroy', function () {
+    destroy(stream);
+  });
 
   var leading = this._leading({ name: name, filename: filename }, mimeType);
 
@@ -170,12 +180,12 @@ FormStream.prototype.stream = function (name, stream, filename, mimeType, size)
 
 FormStream.prototype.buffer = function (name, buffer, filename, mimeType) {
   if (filename && !mimeType) {
-    mimeType = mime.lookup(filename);
+    mimeType = mime.getType(filename);
   }
 
-  var disposition = { name: name }
+  var disposition = { name: name };
   if (filename) {
-    disposition.filename = filename
+    disposition.filename = filename;
   }
 
   var leading = this._leading(disposition, mimeType);
@@ -277,3 +287,7 @@ FormStream.prototype.resume = function () {
 
   return this;
 };
+
+FormStream.prototype.close = FormStream.prototype.destroy = function () {
+  this.emit('destroy');
+};

package/package.json

@@ -1,16 +1,21 @@
 {
   "name": "formstream",
-  "version": "0.0.7",
+  "version": "1.1.1",
   "description": "A multipart/form-data encoded stream, helper for file upload.",
-  "main": "index.js",
+  "main": "lib/formstream.js",
+  "files": [
+    "lib"
+  ],
   "scripts": {
-    "test": "make test-all",
-    "blanket": { "pattern": "formstream/lib" },
-    "travis-cov": { "threshold": 100 }
+    "test": "mocha -R spec -t 5000 -r should test/*.test.js",
+    "test-cov": "istanbul cover node_modules/.bin/_mocha -- -t 5000 -r should test/*.test.js",
+    "test-travis": "istanbul cover node_modules/.bin/_mocha --report lcovonly -- -t 5000 -r should test/*.test.js",
+    "jshint": "jshint .",
+    "autod": "autod -w --prefix '^'"
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/fengmk2/formstream.git"
+    "url": "git://github.com/node-modules/formstream.git"
   },
   "keywords": [
     "form",
@@ -22,20 +27,20 @@
     "request"
   ],
   "dependencies": {
-    "mime": "1.2.9",
-    "buffer-concat": "0.0.1",
-    "pause-stream": ">=0.0.10"
+    "destroy": "^1.0.4",
+    "mime": "^2.5.2",
+    "pause-stream": "~0.0.11"
   },
   "devDependencies": {
-    "connect": "*",
-    "should": "*",
-    "pedding": "*",
-    "blanket": "*",
-    "travis-cov": "*",
-    "coveralls": "*",
-    "mocha-lcov-reporter": "*",
-    "mocha": "*"
+    "autod": "*",
+    "connect-multiparty": "1",
+    "express": "^4.16.4",
+    "istanbul": "*",
+    "mocha": "3",
+    "pedding": "1",
+    "should": "4",
+    "urllib": "2"
   },
-  "author": "fengmk2 <fengmk2@gmail.com> (http://fengmk2.github.com)",
+  "author": "fengmk2 <fengmk2@gmail.com> (https://fengmk2.com)",
   "license": "MIT"
 }

package/.npmignore

@@ -1,7 +0,0 @@
-test/
-example/
-coverage.html
-lib-cov/
-Makefile
-.travis.yml
-logo.png

package/LICENSE.txt

@@ -1,21 +0,0 @@
-This software is licensed under the MIT License.
-
-Copyright (C) 2012 - 2013 by fengmk2 <fengmk2@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

package/index.js

@@ -1 +0,0 @@
-module.exports = require('./lib/formstream');