summaryrefslogtreecommitdiff
path: root/server.js
diff options
context:
space:
mode:
Diffstat (limited to 'server.js')
-rw-r--r--server.js37
1 files changed, 19 insertions, 18 deletions
diff --git a/server.js b/server.js
index cbff284..a16ad84 100644
--- a/server.js
+++ b/server.js
@@ -9,7 +9,7 @@ var express = require('express'),
var s3 = knox.createClient({
key: process.env.ASDF_S3_KEY,
secret: process.env.ASDF_S3_SECRET,
- bucket: 'dump2'
+ bucket: 'cocoapaint'
});
app.configure(function(){
@@ -29,26 +29,27 @@ app.get('/latest', function(req, res){
});
app.post('/upload', function(req, res) {
- var user = req.body.socketid;
- var image = req.files.image;
- var filename = "/test/" + timestamp() + "-" + image.name
-
- var s3req = s3.putFile(image.path, filename, {
- 'Content-Length': image.size,
- 'Content-Type': image.type,
+
+ var nick = req.body.nick;
+ var image = new Buffer(req.body.image, 'base64');
+ var filename = "/test/" + nick + "-" + Date.now() + "-" + "test" + ".png";
+
+ var s3req = s3.putBuffer(image, filename, {
+ 'Content-Length': image.length,
+ 'Content-Type': 'image/png',
'x-amz-acl': 'public-read'
- }, function(err, s3res){
- if (200 == s3res.statusCode) {
- ImageURL = s3res.client._httpMessage.url; // janked
- Images.push( ImageURL );
+ }, function(err, s3res){
+
+ if (200 == s3res.statusCode) {
+ console.log('saved to %s', s3req.url);
- console.log('saved to %s', ImageURL);
+ io.sockets.emit( 'event-image', {
+ 'nick': nick,
+ 'url': s3req.url
+ });
+ }
+ });
- var data = { 'status': 'ok' };
- res.setHeader('Content-Type', 'application/json');
- res.send(JSON.stringify(data));
- }
- });
});
/******************************* WEBSOCKETS