Added first version support for uploading to s3

Author: drginm

examples/app.js

@@ -8,7 +8,8 @@
 * */
 var express = require('express'),
     http = require('http'),
-    upload = require('../');
+    upload = require('../'),
+    AWS = require('aws-sdk');
 
 var swig = require('swig');
 
@@ -29,22 +30,47 @@ swig.setDefaults({
     cache: false   // default 'memory'
 });
 
+var varS3Region = 'THE REGION FROM AMAZON',
+    s3Bucket = 'YOUR BUCKET NAME';
+AWS.config.update({
+    "accessKeyId"    : "YOUR ACCESS KEY ID",
+    "secretAccessKey": "YOUR SECRET ACCESS KEY",
+    "region"         : varS3Region
+});
 
 // jquery-file-upload helper
 app.use('/upload/default', function (req, res, next) {
     upload.fileHandler({
         tmpDir: dirs.temp,
         uploadDir: __dirname + dirs.default,
         uploadUrl: dirs.default_url,
-        imageVersions: resizeConf.default
+        imageVersions: resizeConf.default,
+        s3Bucket: function () {
+            return s3Bucket;
+        },
+        s3Region: function () {
+            return varS3Region;
+        },
+        s3Url: function () {
+            return dirs.default_s3_url;
+        }
     })(req, res, next);
 });
 
 app.use('/upload/location', upload.fileHandler({
     tmpDir: dirs.temp,
     uploadDir: __dirname + dirs.location,
     uploadUrl: dirs.location_url,
-    imageVersions: resizeConf.location
+    imageVersions: resizeConf.location,
+    s3Bucket: function () {
+        return s3Bucket;
+    },
+    s3Region: function () {
+        return varS3Region;
+    },
+    s3Url: function () {
+        return dirs.default_s3_url;
+    }
 }));
 
 app.use('/upload/location/list', function (req, res, next) {

examples/config.js

@@ -50,6 +50,7 @@ exports.directors = {
 
     default: '/public/uploads/default',
     default_url: '/uploads/default',
+    default_s3_url: '/uploads',
 
     location: '/public/uploads/location',
     location_url: '/uploads/location'

examples/public/uploads/location/28071_10151274648580240_1606415380_n.jpg

@@ -5,10 +5,13 @@ var EventEmitter = require('events').EventEmitter,
     imageMagick = require('imagemagick'),
     mkdirp = require('mkdirp'),
     _ = require('lodash'),
-    async = require('async');
+    async = require('async'),
+    AWS = require('aws-sdk');
 
 module.exports = function (options) {
 
+    var s3 = new AWS.S3();
+
     var FileInfo = require('./fileinfo')(
         _.extend({
             baseDir: options.uploadDir
@@ -74,6 +77,7 @@ module.exports = function (options) {
             finish = _.bind(function () {
                 if (!--counter) {
                     async.each(files, _.bind(function(fileInfo, cb) {
+                        this.moveToS3(fileInfo);
                         this.initUrls(fileInfo, _.bind(function(err) {
                             this.emit('end', fileInfo);
                             cb(err);
@@ -197,18 +201,58 @@ module.exports = function (options) {
     };
 
     UploadHandler.prototype.initUrls = function (fileInfo, cb) {
-        var baseUrl = (options.ssl ? 'https:' : 'http:') + '//' + (options.hostname || this.req.get('Host'));
-        fileInfo.setUrl(null, baseUrl + options.uploadUrl());
-        fileInfo.setUrl('delete', baseUrl + this.req.originalUrl);
+        //http://<<bucket>>.s3-<<region>>.amazonaws.com
+        var baseUrl = (options.ssl ? 'https:' : 'http:') + '//' + options.s3Bucket() + '.s3-' + options.s3Region() + '.amazonaws.com';
+        fileInfo.setUrl(null, baseUrl + options.s3Url());
+        fileInfo.setUrl('delete', baseUrl + this.req.s3Url);
         async.each(Object.keys(options.imageVersions), function(version, cb) {
             fs.exists(options.uploadDir() + '/' + version + '/' + fileInfo.name, function(exists) {
-                if (exists) fileInfo.setUrl(version, baseUrl + options.uploadUrl() + '/' + version);
+                if (exists) fileInfo.setUrl(version, baseUrl + options.s3Url() + '/' + version);
                 cb(null);
             })
         },
         cb);
     };
 
+    UploadHandler.prototype.moveToS3 = function(fileInfo) {
+        var fileName = options.uploadDir() + '/' + fileInfo.name;
+        fs.readFile(fileName, _.bind(function(err, data) {
+            if(!err) {
+                this.uploadToS3(options.s3Url() + '/' + fileInfo.name, data);
+
+                async.each(Object.keys(options.imageVersions), _.bind(function(version) {
+                    fileName = options.uploadDir() + '/' + version + '/' + fileInfo.name;
+                    fs.readFile(fileName, _.bind(function(err, data) {
+                        if(!err) {
+                            this.uploadToS3(options.s3Url() + '/' + version + '/' + fileInfo.name, data);
+                        }
+                    }, this));
+                }, this));
+            }
+        }, this));
+    };
+    
+    UploadHandler.prototype.uploadToS3 = function(fileName, data) {
+        fs.unlink(fileName, _.bind(function(err){
+            this.emit('error', err);
+        }, this));
+
+        var bucket = options.s3Bucket();
+        s3.createBucket({Bucket: bucket}, _.bind(function() {
+            var params = {
+                Bucket: bucket,
+                Key: fileName,
+                Body: data,ACL:'public-read'
+            };
+            s3.putObject(params, _.bind(function(err, data) {
+                console.log(err);
+                if (err) {
+                    this.emit('error', err);
+                }
+            }, this));
+        }, this));
+    };
+
     return UploadHandler;
 }
 

examples/public/uploads/location/large/28071_10151274648580240_1606415380_n.jpg

@@ -10,11 +10,12 @@
   ],
   "version": "0.1.7",
   "dependencies": {
+    "async": "*",
+    "aws-sdk": "^2.0.17",
     "formidable": ">=1.0.11",
     "imagemagick": ">=0.1.2",
     "lodash": ">= 0.9.2",
-    "mkdirp": ">= 0.3.4",
-    "async": "*"
+    "mkdirp": ">= 0.3.4"
   },
   "engines": {
     "node": ">= 0.8.8"