Merge pull request #5 from firstandthird/feature/update

Feature/update

Author: dawnerd

README.md

@@ -1,3 +1,13 @@
 # hapi-upload-s3
 
 A hapi plugin to upload files and images to S3. See example for usage.
+
+### Installation
+
+`npm install hapi-upload-s3`
+
+Install graphicsmagick
+
+Brew (osx): `brew install graphicsmagick`
+Apt: `apt-get install graphicsmagick`
+Windows: [Installation instructions](http://www.graphicsmagick.org/INSTALL-windows.html)

example/server.js

@@ -1,16 +1,20 @@
 var Hapi = require('hapi');
 var port = process.env.PORT || 8080;
-var server = new Hapi.Server(port, '0.0.0.0');
+var server = new Hapi.Server();
 var fs = require('fs');
 
-server.pack.register([
+server.connection({ port: port });
+
+server.register([
  {
- plugin: require('../'),
+ register: require('../'),
  options: {
  s3AccessKey: '',
  s3SecretAccessKey: '',
  s3Region: 'us-east-1',
- s3Bucket: ''
+ s3Bucket: '',
+ contentTypes: ['image/jpeg'],
+ maxBytes: 30000
  }
  }
 ], function(err) {

lib/handler.js

@@ -1,6 +1,7 @@
-var Uploader = require('s3-upload-stream').Uploader;
+var s3Stream = require('s3-upload-stream');
 var Joi = require('joi');
 var gm = require('gm');
+var Boom = require('boom');
 
 exports.upload = {
  payload: {
@@ -14,29 +15,32 @@ exports.upload = {
  handler: function(request, reply) {
  var self = this;
  var file = request.payload.file;
+ 
  if (!file.hapi.filename) {
- return reply(this.Hapi.error.badRequest('must be a file'));
+ return reply(Boom.badData('must be a file'));
  }
+
+ if (this.options.contentTypes.length && this.options.contentTypes.indexOf(file.hapi.headers['content-type']) === -1) {
+ return reply(Boom.unsupportedMediaType('content-type not allowed'));
+ }
+
  var fileKey = this.getFileKey(file.hapi.filename);
 
- new Uploader({
- s3Client: this.s3
- }, {
- 'Bucket': self.bucketName,
- 'Key': fileKey,
- 'ContentType': file.hapi.headers['content-type']
- }, function (err, uploadStream) {
- if(err) {
- return reply(err);
- }
- uploadStream.on('uploaded', function (data) {
- return reply(self.getS3Url(fileKey));
- });
+ var upload = s3Stream(this.s3).upload({
+ 'Bucket': self.bucketName,
+ 'Key': fileKey,
+ 'ContentType': file.hapi.headers['content-type']
+ });
 
-  file.pipe(uploadStream);
- }
- );
+ upload.on('error', function(err) {
+ reply(Boom.wrap(err, 500, 'put'));
+ });
 
+ upload.on('uploaded', function(data) {
+ reply(self.getS3Url(fileKey));
+ });
+
+ file.pipe(upload);
  }
 };
 
@@ -54,9 +58,15 @@ exports.image = {
  handler: function(request, reply) {
  var self = this;
  var file = request.payload.file;
+ 
  if (!file.hapi.filename) {
- return reply(this.Hapi.error.badRequest('must be a file'));
+ return reply(Boom.badData('must be a file'));
+ }
+
+ if (this.options.contentTypes.length && this.options.contentTypes.indexOf(file.hapi.headers['content-type']) === -1) {
+ return reply(Boom.unsupportedMediaType('content-type not allowed'));
  }
+
  var fileKey = this.getFileKey(file.hapi.filename);
 
  var w = request.params.width;
@@ -70,7 +80,7 @@ exports.image = {
  .quality(80)
  .stream(function(err, stdout, stderr) {
  if (err) {
- return reply(self.Hapi.error.internal('gm', err));
+ return reply(Boom.wrap(err, 500, 'gm'));
  }
 
  var buf = new Buffer(0);
@@ -85,7 +95,7 @@ exports.image = {
  };
  self.s3.putObject(data, function(err, resp) {
  if (err) {
- return reply(self.Hapi.error.internal('put', err));
+ return reply(Boom.wrap(err, 500, 'put'));
  }
  return reply(self.getS3Url(fileKey));
  });

lib/index.js

@@ -1,24 +1,24 @@
 var handler = require('./handler');
 var AWS = require('aws-sdk');
-var path = require('path');
-var uuid = require('uuid');
 var datefmt = require('datefmt');
+var Hoek = require('hoek');
 
 module.exports = function(plugin, options, next) {
 
  options = options || {};
 
  var endpoint = options.endpoint || '/upload';
 
+ options.contentTypes = options.contentTypes || [];
+
  var s3 = new AWS.S3({
  accessKeyId: options.s3AccessKey,
  secretAccessKey: options.s3SecretAccessKey,
  region: options.s3Region
  });
 
  var getFileKey = function(filename) {
- var fileExtension = path.extname(filename);
- var fileKey = datefmt('%Y-%m-%d', new Date()) + '/' + uuid.v4() + fileExtension;
+ var fileKey = datefmt('%Y-%m-%d', new Date()) + '/' + (+new Date) + '/' + filename;
  return fileKey;
  };
 
@@ -36,9 +36,15 @@ module.exports = function(plugin, options, next) {
  getS3Url: options.getS3Url || getS3Url
  });
 
+ var maxBytes = {
+ payload: {
+ maxBytes: options.maxBytes || 1048576 // Hapi default (1MB)
+ }
+ };
+
  plugin.route([
- { path: endpoint, method: 'POST', config: handler.upload },
- { path: endpoint + '/image/{type}/{width}/{height}', method: 'POST', config: handler.image }
+ { path: endpoint, method: 'POST', config: Hoek.applyToDefaults(handler.upload, maxBytes) },
+ { path: endpoint + '/image/{type}/{width}/{height}', method: 'POST', config: Hoek.applyToDefaults(handler.image, maxBytes) }
  ]);
  next();
 };

package.json

@@ -9,14 +9,15 @@
  "url": "https://github.com/firstandthird/hapi-upload-s3.git"
  },
  "devDependencies": {
- "hapi": "^6.2.2"
+ "hapi": "^8.1.0"
  },
  "dependencies": {
+ "aws-sdk": "^2.1.6",
+ "boom": "^2.6.1",
  "datefmt": "^0.4.0",
- "uuid": "^1.4.1",
- "s3-upload-stream": "^0.4.0",
- "joi": "^4.6.2",
- "gm": "^1.16.0",
- "aws-sdk": "^2.0.11"
+ "gm": "^1.17.0",
+ "hoek": "^2.11.0",
+ "joi": "^5.1.0",
+ "s3-upload-stream": "^1.0.7"
  }
 }