Issue/231: Updating NodeJS sample to make it work properly.

flowjs · Jul 23, 2017 · 346e264 · 346e264
1 parent 172e3d1
commit 346e264
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/samples/Node.js/app.js b/samples/Node.js/app.js
@@ -4,6 +4,7 @@ var express = require('express');
 var multipart = require('connect-multiparty');
 var multipartMiddleware = multipart();
 var flow = require('./flow-node.js')('tmp');
+var fs = require('fs');
 var app = express();
 
 // Configure access control allow origin header stuff
@@ -20,7 +21,22 @@ app.post('/upload', multipartMiddleware, function(req, res) {
     if (ACCESS_CONTROLL_ALLOW_ORIGIN) {
       res.header("Access-Control-Allow-Origin", "*");
     }
-    res.status(status).send();
+
+    if(status==='done'){
+
+            var s = fs.createWriteStream('./uploads/' + filename);
+            s.on('finish', function() {
+
+                res.status(200).send();
+
+            });
+
+            flow.write(identifier, s, {end: true});
+    } else {
+    	res.status(/^(partly_done|done)$/.test(status) ? 200 : 500).send();
+    }
+
+
   });
 });
 
@@ -55,4 +71,6 @@ app.get('/download/:identifier', function(req, res) {
   flow.write(req.params.identifier, res);
 });
 
-app.listen(3000);
+app.listen(3000, function(){
+	console.log('Server Started...');
+});
diff --git a/samples/Node.js/flow-node.js b/samples/Node.js/flow-node.js
@@ -1,6 +1,7 @@
 var fs = require('fs'),
     path = require('path'),
     util = require('util'),
+    mv = require('mv'),
     Stream = require('stream').Stream;
 
 module.exports = flow = function(temporaryFolder) {
@@ -107,9 +108,8 @@ module.exports = flow = function(temporaryFolder) {
         var validation = validateRequest(chunkNumber, chunkSize, totalSize, identifier, filename, files[$.fileParameterName].size);
         if (validation == 'valid') {
             var chunkFilename = getChunkFilename(chunkNumber, identifier);
-
             // Save the chunk (TODO: OVERWRITE)
-            fs.rename(files[$.fileParameterName].path, chunkFilename, function() {
+            mv(files[$.fileParameterName].path, chunkFilename, function() {
 
                 // Do we have all the chunks?
                 var currentTestChunk = 1;

diff --git a/samples/Node.js/package.json b/samples/Node.js/package.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
+    "connect-multiparty": "^1.0.4",
     "express": "^4.3.1",
-    "connect-multiparty": "^1.0.4"
+    "mv": "^2.1.1"
   }
 }