next

Author: arusakov

examples/webcam.html

@@ -116,6 +116,11 @@ <h3>Server</h3>
 FileAPI.upload({
  url: '/upload'
 , files: { shot: file }
+, data: {
+x: 1,
+arr: [1, {y: 1}],
+y: "xxxxxx"
+}
 , complete: function (err, xhr){
 var res = JSON.parse(xhr.responseText);
 var img = new Image;

node/file-api.js

@@ -1,43 +1,44 @@
 
 function convertToBase64(buffer, mimetype) {
- return 'data:' + mimetype + ';base64,' + buffer.toString('base64');
+return 'data:' + mimetype + ';base64,' + buffer.toString('base64');
 }
 
 function fileApi() {
- return function (req, res, next) {
- req.body = {};
- req.files = {};
- req.images = {};
-
- req.busboy.on('file', function (fieldname, file, filename, encoding, mimetype) {
- var buffersArray = [];
-
- file.on('data', function (data) {
- buffersArray.push(data);
- });
-
- file.on('end', function () {
- var bufferResult = Buffer.concat(buffersArray);
- var fileObj = {
- dataURL: convertToBase64(bufferResult, mimetype),
- mime: mimetype,
- size: bufferResult.length
- };
- req.files[fieldname] = fileObj;
- if (mimetype.indexOf('image/') === 0) {
- req.images[fieldname] = fileObj;
- }
- });
- });
-
- req.busboy.on('field', function (key, value, keyTruncated, valueTruncated) {
- req.body[key] = value;
- });
-
- req.busboy.on('finish', function () {
- next();
- });
- };
+return function (req, res, next) {
+req.body = {};
+req.files = {};
+req.images = {};
+
+req.busboy.on('file', function (fieldname, file, filename, encoding, mimetype) {
+var buffersArray = [];
+
+file.on('data', function (data) {
+buffersArray.push(data);
+});
+
+file.on('end', function () {
+var bufferResult = Buffer.concat(buffersArray);
+var fileObj = {
+dataURL: convertToBase64(bufferResult, mimetype),
+mime: mimetype,
+size: bufferResult.length
+};
+req.files[fieldname] = fileObj;
+if (mimetype.indexOf('image/') === 0) {
+req.images[fieldname] = fileObj;
+}
+});
+});
+
+req.busboy.on('field', function (key, value, keyTruncated, valueTruncated) {
+req.body[key] = value;
+console.log(arguments);
+});
+
+req.busboy.on('finish', function () {
+next();
+});
+};
 }
 
 module.exports = fileApi;

node/server.js

@@ -6,45 +6,50 @@ var app = express();
 app.use(express.static('.', {index: 'index.html'}));
 
 app.use(function (req, res, next) {
- // Enable CORS for non static files
- var origin = req.get('Origin');
-
- if (origin) {
- res.set({
- 'Access-Control-Allow-Origin':  origin,
- 'Access-Control-Allow-Methods':  'POST, GET, OPTIONS',
- 'Access-Control-Allow-Headers':  'Origin, X-Requested-With, Content-Range, Content-Disposition, Content-Type, X-Foo, X-Rnd',
- 'Access-Control-Allow-Credentials': 'true'
- });
- }
- next();
+// Enable CORS for non static files
+var origin = req.get('Origin');
+
+if (origin) {
+res.set({
+'Access-Control-Allow-Origin': origin,
+'Access-Control-Allow-Methods': 'POST, GET, OPTIONS',
+'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Range, Content-Disposition, Content-Type, X-Foo, X-Rnd',
+'Access-Control-Allow-Credentials': 'true'
+});
+}
+next();
 });
 
 var uploadPath = '/upload';
 
 app.options(uploadPath, function (req, res) {
- res.end();
+res.end();
 });
 
-app.post(uploadPath, busboy({immediate: true}), fileApi(), function (req, res) {
- var jsonp = req.query.callback || null;
-
- res[jsonp ? 'jsonp' : 'json']({
- status: 200,
- statusText: 'OK',
- images: req.images,
- data: {
-HEADERS: req.headers,
-_REQUEST: req.body,
-_FILES: req.files
+app.post(
+uploadPath,
+busboy({immediate: true}), // parse post data
+fileApi(),// prepare req.body, req.files and req.images
+function (req, res) {
+var jsonp = req.query.callback || null;
+
+res[jsonp ? 'jsonp' : 'json']({
+status: 200,
+statusText: 'OK',
+images: req.images,
+data: {
+HEADERS: req.headers,
+_REQUEST: req.body,
+_FILES: req.files
+}
+});
 }
- });
-});
+);
 
 var server = app.listen(8000, function () {
 
- var host = server.address().address;
- var port = server.address().port;
+var host = server.address().address;
+var port = server.address().port;
 
- console.log('Test server listening at http://%s:%s', host, port)
+console.log('Test server listening at http://%s:%s', host, port)
 });