total5 0.0.9-3 → 0.0.9-5

package/changelog.txt

@@ -11,6 +11,12 @@
 - replaced `$.hostname` property with a method in the Schema/Auth Options
 - __critital__ fixed cloning buffers in the `FlowStream`
 - improved user-agent parser
+- added `FILESTORAGE().clone(id, newid, [callback])` method
+- fixed `FILESTORAGE().copy(id, newid, [callback])` method
+- extended `PROXY(endpoint, stream_function(ctrl))` by adding support for a custom handler
+- extended `REQUEST()` by adding `opt.writer {function(res)}` option
+- added missing `TotalAPI()` method
+- fixed `CONF.totalapi` key when initializing the framework
 
 ========================
 0.0.8

package/filestorage.js

@@ -373,6 +373,106 @@ FP._read = function(id, callback, nostream) {
 	return self;
 };
 
+FP.clone = function(id, newid, callback) {
+	var self = this;
+
+	if (typeof(newid) === 'function') {
+		callback = newid;
+		newid = UID();
+	}
+
+	if (callback)
+		return self._clone(id, newid, callback);
+	else
+		return new Promise((resolve, reject) => self._clone(id, newid, (err, res) => err ? reject(err) : resolve(res)));
+};
+
+FP._clone = function(id, newid, callback) {
+
+	var self = this;
+
+	if (self.pause) {
+		setTimeout(self._clone, 500, id, newid, callback);
+		return self;
+	}
+
+	var filename = F.Path.join(self.makedirectory(id), id + '.file');
+
+	F.stats.performance.open++;
+	F.Fs.open(filename, 'r', function(err, fd) {
+
+		if (err) {
+			callback(err);
+			return;
+		}
+
+		var buffer = Buffer.alloc(HEADERSIZE);
+		F.Fs.read(fd, buffer, 0, HEADERSIZE, 0, function(err) {
+
+			if (err) {
+				F.Fs.close(fd, NOOP);
+				callback(err);
+				return;
+			}
+
+			F.stats.performance.open++;
+
+			var str = buffer.toString('utf8').replace(REG_CLEAN, '');
+			if (!str) {
+				// Invalid file
+				F.Fs.close(fd, function() {
+					if (buffer.length === HEADERSIZE)
+						F.Fs.unlink(filename, NOOP);
+				});
+				callback('File not found');
+				return;
+			}
+
+			var meta = str.parseJSON(true);
+			if (!meta) {
+				F.Fs.close(fd, NOOP);
+				callback('Invalid file');
+				return;
+			}
+
+			F.Fs.close(fd, NOOP);
+			meta.id = newid;
+
+			if (meta.expire && meta.expire < NOW) {
+				callback('File is expired');
+				return;
+			}
+
+			var directory = self.makedirectory(newid);
+			var filenamenew = F.Path.join(directory, newid + '.file');
+
+			if (self.cache[directory]) {
+				F.Fs.copyFile(filename, filenamenew, function(err) {
+					if (!err)
+						F.Fs.appendFile(self.logger, JSON.stringify(meta) + '\n', NOOP);
+					callback && callback(err, meta);
+				});
+			} else {
+				F.Fs.mkdir(directory, MKDIR, function(err) {
+
+					if (err) {
+						callback(err);
+						return;
+					}
+
+					self.cache[directory] = 1;
+					F.Fs.copyFile(filename, filenamenew, function(err) {
+						if (!err)
+							F.Fs.appendFile(self.logger, JSON.stringify(meta) + '\n', NOOP);
+						callback && callback(err, meta);
+					});
+				});
+			}
+
+		});
+	});
+};
+
 FP.copy = function(id, path, callback) {
 	var self = this;
 	if (callback)
@@ -390,10 +490,10 @@ FP._copy = function(id, path, callback) {
 		return self;
 	}
 
-	var filename = Path.join(self.makedirectory(id), id + '.file');
+	var filename = F.Path.join(self.makedirectory(id), id + '.file');
 
 	F.stats.performance.open++;
-	Fs.open(filename, 'r', function(err, fd) {
+	F.Fs.open(filename, 'r', function(err, fd) {
 
 		if (err) {
 			callback(err);
@@ -401,20 +501,20 @@ FP._copy = function(id, path, callback) {
 		}
 
 		var buffer = Buffer.alloc(HEADERSIZE);
-		Fs.read(fd, buffer, 0, HEADERSIZE, 0, function(err) {
+		F.Fs.read(fd, buffer, 0, HEADERSIZE, 0, function(err) {
 
 			if (err) {
-				Fs.close(fd, NOOP);
+				F.Fs.close(fd, NOOP);
 				callback(err);
 				return;
 			}
 
-			var str = buffer.toString('utf8').replace(REGCLEAN, '');
+			var str = buffer.toString('utf8').replace(REG_CLEAN, '');
 			if (!str) {
 				// Invalid file
-				Fs.close(fd, function() {
+				F.Fs.close(fd, function() {
 					if (buffer.length === HEADERSIZE)
-						Fs.unlink(filename, NOOP);
+						F.Fs.unlink(filename, NOOP);
 				});
 				callback('File not found');
 				return;
@@ -422,7 +522,7 @@ FP._copy = function(id, path, callback) {
 
 			var meta = str.parseJSON(true);
 			if (!meta) {
-				Fs.close(fd, NOOP);
+				F.Fs.close(fd, NOOP);
 				callback('Invalid file');
 				return;
 			}
@@ -430,21 +530,21 @@ FP._copy = function(id, path, callback) {
 			meta.id = id;
 
 			if (meta.expire && meta.expire < NOW) {
-				Fs.close(fd, NOOP);
+				F.Fs.close(fd, NOOP);
 				callback('File is expired');
 				return;
 			}
 
 			F.stats.performance.open++;
 
-			var reader = Fs.createReadStream(filename, { fd: fd, start: HEADERSIZE });
-			var writer = Fs.createWriteStream(path.includes('.') ? path : Path.join(path, meta.name));
+			var reader = F.Fs.createReadStream(filename, { fd: fd, start: HEADERSIZE });
+			var writer = F.Fs.createWriteStream(path.includes('.') ? path : F.Path.join(path, meta.name));
 
 			reader.pipe(writer);
 
 			CLEANUP(reader, function() {
 				callback(err, meta);
-				Fs.close(fd, NOOP);
+				F.Fs.close(fd, NOOP);
 			});
 
 		});

package/global.js

@@ -299,3 +299,9 @@ global.clearTimeout2 = function(id) {
 
 	return !!tmp;
 };
+
+global.TotalAPI = function(name, model, callback) {
+	let obj = API('TAPI', name, model);
+	callback && obj.callback(callback);
+	return obj;
+};

package/index.js

@@ -545,7 +545,10 @@ F.loadconfig = function(value) {
 
 		switch (key) {
 			case 'totalapi':
-				key = '$tapi';
+				if (typeof(val) === 'string' && val.length > 5)
+					key = 'secret_totalapi';
+				else
+					key = '$tapi';
 				break;
 			case '$tms':
 				break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "total5",
-  "version": "0.0.9-3",
+  "version": "0.0.9-5",
   "description": "Total.js framework v5",
   "main": "index.js",
   "directories": {

package/routing.js

@@ -761,19 +761,23 @@ function Proxy(url, target) {
 	t.url = url.toLowerCase();
 	t.copypath = 'none'; // replace|extend|none
 
-	if ((/^(https|http):\/\//).test(target))
+	if (typeof(target) === 'function')
+		t.stream = target;
+	else if ((/^(https|http):\/\//).test(target))
 		t.target = F.Url.parse(target);
 	else
 		t.target = { socketPath: target };
 
-	if (t.target.href) {
-		let index = t.target.href.indexOf('?');
-		if (index !== -1)
-			t.query = t.target.href.substring(index + 1);
-		t.path = t.target.pathname[t.target.pathname.length - 1] === '/' ? t.target.pathname.substring(0, t.target.pathname.length - 1) : t.target.pathname;
-	}
+	if (t.target) {
+		if (t.target.href) {
+			let index = t.target.href.indexOf('?');
+			if (index !== -1)
+				t.query = t.target.href.substring(index + 1);
+			t.path = t.target.pathname[t.target.pathname.length - 1] === '/' ? t.target.pathname.substring(0, t.target.pathname.length - 1) : t.target.pathname;
+		}
 
-	t.uri = t.target;
+		t.uri = t.target;
+	}
 }
 
 Proxy.prototype.copy = function(type) {
@@ -883,6 +887,13 @@ function proxyheadersws(header, headers) {
 
 function proxycreate(proxy, ctrl) {
 
+	if (proxy.stream) {
+		F.stats.performance.external++;
+		F.stats.request.external++;
+		proxy.stream(ctrl);
+		return;
+	}
+
 	var secured = proxy.uri.protocol === 'https:';
 	var uri = {};
 

package/utils.js

@@ -893,7 +893,9 @@ function request_call(uri, options) {
 
 	req.on('response', request_assign_res);
 
-	if (options.upload) {
+	if (options.writer) {
+		options.writer(req);
+	} else if (options.upload) {
 		options.first = true;
 		options.files.wait(function(file, next) {
 			request_writefile(req, options, file, next);
@@ -921,9 +923,9 @@ function request_call(uri, options) {
 			req.end(NEWLINE + '--' + options.boundary + '--');
 		});
 	} else {
-		if (options.opt.compress) {
+		if (options.opt.compress)
 			F.Zlib[options.opt.compress](options.body, (err, buffer) => req.end(buffer));
-		} else
+		else
 			req.end(options.body);
 	}
 }