Buffer all upload streams as Akamai requires a Content-Length header in

uploads, and some streams (e.g. multipart) don't provide one

Author: matAtWork

lib/akamai.js

@@ -129,7 +129,7 @@ akamai.setLogger = function(l) {
  * @param {Function} cb
  * @returns {request}
  */
-akamai.getRequestObject = function (path, params, cb) {
+akamai.getRequestObject = function (path, params, cb, httpHeaders) {
 	var self = this,
 	callback = function () {},
 	options = _.merge(
@@ -141,6 +141,9 @@ akamai.getRequestObject = function (path, params, cb) {
 	if (reqOptions) {
 		_.assign(options,reqOptions) ;
 	}
+	if (httpHeaders) {
+		_.assign(options.headers,httpHeaders) ;
+	}
 
 	if (typeof(cb) === 'function') {
 		callback = function (err, resp, body) {
@@ -191,12 +194,15 @@ akamai.fileExists = function (path, cb) {
 
 /** Api functions **/
 
-akamai.upload = function (stream, path, cb) {
+akamai.upload = function (stream, path, cb, contentLength) {
 	var options = {
 			request: {method: 'put'},
 			headers: {action: 'upload', 'upload-type': 'binary'}
 	};
-	stream.pipe(this.getRequestObject(path, options, cb));
+	var httpHeaders = {} ;
+	if (contentLength) 
+		httpHeaders["Content-Length"] = contentLength ;
+	stream.pipe(this.getRequestObject(path, options, cb, httpHeaders));
 	return this;
 };
 
@@ -276,57 +282,73 @@ akamai.mtime = function (path, date, cb) {
 
 /* Added by MattW for MOL */
 /* Like upload, but creates the path beforehand */
-akamai.create = function(source /*stream*/, cpcode, target, callback) {
+akamai.create = function(stream, cpcode, target, callback) {
 	var self = this ;
 
 	try {
-		if (!source)
+		if (!stream)
 			return callback && callback(new Error("akamai.create: source is not a stream")) ;
-		if (!("pipe" in source)) { 
+		if (!("pipe" in stream)) { 
 			// Probabaly not a stream
-			var original = source ;
-			source = new Stream();
+			var source = new Stream();
 			source.pipe = function(dest) {
-				dest.write(original);
+				dest.write(stream);
 				return dest;
-			};        
+			};
+			doUpload(source,stream.length) ;
+		} else {
+			// Akamai requires uploads must have a Content-Length, so we'll have to buffer
+			var buffers = [] ;
+			stream.on('data',function(b){ buffers.push(b) }) ;
+			stream.on('end',function(){ 
+				var source = new Stream() ;
+				var all = Buffer.concat(buffers) ;
+				source.pipe = function(dest) {
+					dest.write(all);
+					return dest;
+				};
+				doUpload(source,all.length) ;
+			}) ;
 		}
+		return ;
 	} catch(ex) {
 		return callback && callback(ex) ;
 	}
 
-	function mkdir(path,idx,done) {
-		if (idx>path.length)
-			return done(null) ;
-		idx += 1 ;
-		var l = path.slice(0,idx).join("/") ;
-		self.mkdir(l,function(err){
-			if (err && err.status!=409 && err.status!=403) {
-				err.message = "mkdir("+l+") "+err.message ;
-				return done(err) ;
-			}
-			mkdir(path,idx,done) ;
-		});
-	}
-
-	// Create path
-	target = path.join("/", "" + cpcode, "/", target) ;
-	var dirPath = target.split("/") ;
-	dirPath = dirPath.slice(0,dirPath.length-1).join("/") ;
-
-	mkdir(dirPath.split("/"),2,function(err){
-		if (err) {
-			err.message = err.message+"\n"+JSON.stringify(self.getConfig()) ;
-			return callback && callback(err);
+	function doUpload(source,contentLength) {
+		function mkdir(path,idx,done) {
+			if (idx>path.length)
+				return done(null) ;
+			idx += 1 ;
+			var l = path.slice(0,idx).join("/") ;
+			self.mkdir(l,function(err){
+				if (err && err.status!=409 && err.status!=403) {
+					err.message = "mkdir("+l+") "+err.message ;
+					return done(err) ;
+				}
+				mkdir(path,idx,done) ;
+			});
 		}
-		self.upload(source, target, function(err){
+	
+		// Create path
+		target = path.join("/", "" + cpcode, "/", target) ;
+		var dirPath = target.split("/") ;
+		dirPath = dirPath.slice(0,dirPath.length-1).join("/") ;
+	
+		mkdir(dirPath.split("/"),2,function(err){
 			if (err) {
-				err.message = err.message+"\t"+JSON.stringify(self.getConfig()) ;
+				err.message = err.message+"\n"+JSON.stringify(self.getConfig()) ;
 				return callback && callback(err);
 			}
-			callback && callback();
+			self.upload(source, target, function(err){
+				if (err) {
+					err.message = err.message+"\t"+JSON.stringify(self.getConfig()) ;
+					return callback && callback(err);
+				}
+				callback && callback();
+			},contentLength) ;
 		}) ;
-	}) ;
+	}
 }
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "akamai-http-api",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "main": "./lib/akamai.js",
   "author": "Kanstantsin Kamkou <kkamkou@gmail.com>",
   "description": "Akamai NetStorage HTTP API for the Node.js",