total5 0.0.1-9 → 0.0.2

package/debug.js

@@ -43,6 +43,13 @@ module.exports.watcher = function(callback) {
 	runwatching();
 };
 
+function killapp(pid) {
+	try {
+		process.kill(pid, 'SIGINT');
+	} catch (e) {
+	}
+}
+
 function runapp() {
 	!options && (options = {});
 	if (options.servicemode) {
@@ -250,12 +257,12 @@ function runwatching() {
 			var index = fn.indexOf('/', 1);
 			var dir = fn.substring(0, index + 1);
 
-			if (dir === CONF.directory_themes) {
+			if (dir === F.config.directory_themes) {
 				index = fn.indexOf('/', index + 1);
 				dir = fn.substring(index, fn.indexOf('/', index + 1) + 1);
 			}
 
-			return CONF.directory_views === dir || CONF.directory_public === dir ? fn : '';
+			return dir === '/views/' || dir === '/public/' ? fn : '';
 		}
 
 		function makestamp() {
@@ -388,7 +395,7 @@ function runwatching() {
 				try
 				{
 					skiprestart = true;
-					process.kill(app.pid);
+					killapp(app.pid);
 					if (options.inspector) {
 						setTimeout(restart, 1000);
 						return;
@@ -471,7 +478,7 @@ function runwatching() {
 			}
 
 			skiprestart = true;
-			process.kill(app.pid);
+			killapp(app.pid);
 			app = null;
 			process.exit(0);
 		}
@@ -491,7 +498,7 @@ function runwatching() {
 						F.Fs.unlink(pid, noop);
 						if (app !== null) {
 							skiprestart = true;
-							process.kill(app.pid);
+							killapp(app.pid);
 						}
 						process.exit(0);
 					}

package/edit.js

@@ -1,6 +1,6 @@
 // Total.js Edit
 // The MIT License
-// Copyright 2020-2023 (c) Peter Širka <petersirka@gmail.com>
+// Copyright 2020-2024 (c) Peter Širka <petersirka@gmail.com>
 
 'use strict';
 
@@ -26,8 +26,6 @@ exports.init = function(url) {
 			return;
 		}
 
-		console.log(msg);
-
 		F.action('editor', msg).callback(function(err, response) {
 
 			if (err) {
@@ -165,17 +163,7 @@ F.newaction('editor', {
 });
 
 function mkdir(path, callback) {
-	var a = '/';
-	path = path.split('/').trim();
-	path.wait(function(p, next) {
-		a = a + p + '/';
-		F.Fs.lstat(a, function(err) {
-			if (err)
-				F.Fs.mkdir(a, next);
-			else
-				next();
-		});
-	}, callback);
+	F.Fs.mkdir(path, { recursive: true }, callback);
 }
 
 function browse($, model) {
@@ -204,11 +192,11 @@ function browse($, model) {
 
 		$.callback({ files: files, directories: directories });
 
-	}, validator);
+	}, validator, true);
 }
 
 function log($, model) {
-	var filename = F.path.root(model.path);
+	var filename = F.Path.normalize(F.path.root(model.path));
 	F.Fs.stat(filename, function(err, stats) {
 		if (stats) {
 			var start = stats.size - (1024 * 4); // Max. 4 kB
@@ -231,7 +219,7 @@ function clearlog($, model) {
 }
 
 function load($, model) {
-	var filename = F.path.root(model.path);
+	var filename = F.Path.normalize(F.path.root(model.path));
 	F.Fs.readFile(filename, function(err, data) {
 
 		if (err) {
@@ -264,20 +252,20 @@ function save($, model) {
 	// Tries to create a folder
 	var filename = F.path.root(model.path);
 	var name = F.TUtils.getName(model.path);
-	var directory = filename.substring(0, filename.length - name.length);
+	var directory = F.Path.normalize(filename.substring(0, filename.length - name.length));
 
-	F.Fs.mkdir(directory, { recursive: true }, function() {
+	mkdir(directory, function() {
 		decodedata(model, function(err, buffer) {
 			if (err)
 				$.invalid(err);
 			else
-				F.Fs.writeFile(filename, buffer, $.done());
+				F.Fs.writeFile(F.Path.normalize(filename), buffer, $.done());
 		});
 	});
 }
 
 function remove($, model) {
-	var filename = F.path.root(model.path);
+	var filename = F.Path.normalize(F.path.root(model.path));
 	try {
 		var stats = F.Fs.lstatSync(filename);
 		if (stats.isFile()) {
@@ -294,12 +282,12 @@ function remove($, model) {
 }
 
 function info($, model) {
-	var filename = F.path.root(model.path);
+	var filename = F.Path.normalize(F.path.root(model.path));
 	F.Fs.lstat(filename, $.callback);
 }
 
 function download($, model) {
-	var filename = F.path.root(model.path);
+	var filename = F.Path.normalize(F.path.root(model.path));
 	var ext = F.TUtils.getExtension(model.path);
 	F.Fs.lstat(filename, function(err, stats) {
 		if (err || stats.isDirectory() || stats.isSocket()) {
@@ -328,7 +316,7 @@ function download($, model) {
 }
 
 function send($, model) {
-	var filename = F.path.root(model.path);
+	var filename = F.Path.normalize(F.path.root(model.path));
 	F.Fs.fstat(filename, function() {
 		var opt = {};
 		opt.method = 'GET';
@@ -340,7 +328,7 @@ function send($, model) {
 }
 
 function customimport($, model) {
-	var filename = F.path.root(model.path);
+	var filename = F.Path.normalize(F.path.root(model.path));
 	DOWNLOAD(model.data, filename, $.done());
 }
 
@@ -356,8 +344,8 @@ function rename($, model) {
 
 	data = data.response;
 
-	data.newpath = F.path.root(data.newpath);
-	data.oldpath = F.path.root(data.oldpath);
+	data.newpath = F.Path.normalize(F.path.root(data.newpath));
+	data.oldpath = F.Path.normalize(F.path.root(data.oldpath));
 
 	mkdir(F.Path.dirname(data.newpath), function() {
 		F.Fs.rename(data.oldpath, data.newpath, $.done());
@@ -366,7 +354,12 @@ function rename($, model) {
 
 function create($, model) {
 
-	var filename = F.path.root(model.path);
+	// model.path {String}
+	// model.data {Object}
+	// model.data.clone {String}
+	// model.data.folder {Boolean}
+
+	var filename = F.Path.normalize(F.path.root(model.path));
 	var data = (model.data || '{}').parseJSON();
 
 	F.Fs.lstat(filename, function(err) {
@@ -376,14 +369,14 @@ function create($, model) {
 			// we can continue
 			if (data.folder) {
 				if (model.clone)
-					F.Fs.cp(F.path.root(data.clone), filename, { recursive: true, force: true }, $.done());
+					F.Fs.cp(F.Path.normalize(F.path.root(data.clone)), filename, { recursive: true, force: true }, $.done());
 				else
 					mkdir(filename, $.done());
 			} else {
 				var name = F.TUtils.getName(filename);
 				mkdir(filename.substring(0, filename.length - name.length), function() {
 					if (data.clone)
-						F.Fs.copyFile(F.path.root(data.clone), filename, $.done());
+						F.Fs.copyFile(F.Path.normalize(F.path.root(data.clone)), filename, $.done());
 					else
 						F.Fs.writeFile(filename, '', $.done());
 				});
@@ -395,8 +388,8 @@ function create($, model) {
 
 function upload($, model) {
 	var name = F.TUtils.getName(model.path);
-	var filename = F.path.root(model.path);
-	var directory = F.path.root(model.path.substring(0, model.length - name.length));
+	var filename = F.Path.normalize(F.path.root(model.path));
+	var directory = F.Path.normalize(F.path.root(model.path.substring(0, model.length - name.length)));
 	mkdir(directory, function() {
 		decodedata(model, function(err, buffer) {
 			if (err)
@@ -416,7 +409,7 @@ function modify($, model) {
 
 function wiki($) {
 
-	var path = F.path.root();
+	var path = F.Path.normalize(PATH.root());
 
 	F.TUtils.ls(path, function(files) {
 

package/filestorage.js

@@ -7,6 +7,7 @@
 const IMAGES = { jpg: 1, png: 1, gif: 1, svg: 1, jpeg: 1, heic: 1, heif: 1, webp: 1, tiff: 1, bmp: 1 };
 const HEADERSIZE = 2000;
 const MKDIR = { recursive: true };
+const READDIR = { withFileTypes: true };
 const GZIP_FILE = { memLevel: 9 };
 
 const REG_RANGE = /bytes=/;
@@ -435,7 +436,7 @@ FP._readbuffer = function(id, callback) {
 FP.browse = function(callback) {
 	var db = NOSQL(this.logger).find();
 	if (callback)
-		db.$callback = callback;
+		db.main.callback = callback;
 	return db;
 };
 
@@ -743,11 +744,11 @@ FP._clear = function(callback) {
 	return self;
 };
 
-FP.stream = function(onfile, callback, workers) {
+FP.stream = function(onfile, callback, workers = 2) {
 
 	var self = this;
 
-	F.Fs.readdir(self.directory, function(err, response) {
+	F.Fs.readdir(self.directory, READDIR, function(err, response) {
 
 		if (err) {
 			callback();
@@ -758,15 +759,33 @@ FP.stream = function(onfile, callback, workers) {
 
 		response.wait(function(item, next) {
 
-			if (item.length !== 4) {
+			if (!item.isDirectory()) {
+				next();
+				return;
+			}
+
+			if (item.name.length !== 4) {
 				next();
 				return;
 			}
 
-			F.Fs.readdir(F.Path.join(self.directory, item), function(err, files) {
+			F.Fs.readdir(F.Path.join(self.directory, item.name), READDIR, function(err, files) {
 				if (files instanceof Array) {
 					files.wait(function(item, next) {
-						var id = item.substring(0, item.lastIndexOf('.'));
+
+						if (!item.isFile()) {
+							next();
+							return;
+						}
+
+						let index = item.name.lastIndexOf('.');
+
+						if (item.name.substring(index) !== '.file') {
+							next();
+							return;
+						}
+
+						let id = item.name.substring(0, index);
 						self.read(id, function(err, meta) {
 							if (meta) {
 								meta.id = id;
@@ -954,7 +973,7 @@ FP.http = function(ctrl, opt) {
 
 	var self = this;
 
-	if (F.temporary.notfound[ctrl.uri.key]) {
+	if (F.temporary.notfound[ctrl.uri.cache]) {
 		ctrl.fallback(404);
 		return;
 	}
@@ -966,7 +985,7 @@ FP.http = function(ctrl, opt) {
 		fd && F.Fs.close(fd, NOOP);
 
 		if (err || (obj.expire && obj.expire < NOW) || (opt.check && opt.check(obj) == false)) {
-			F.temporary.notfound[ctrl.uri.key] = true;
+			F.temporary.notfound[ctrl.uri.cache] = true;
 			ctrl.fallback(404);
 			return;
 		}
@@ -976,17 +995,11 @@ FP.http = function(ctrl, opt) {
 		var date = obj.date ? obj.date.toUTCString() : '';
 		var response = ctrl.response;
 
-		if (!opt.download && ctrl.headers['if-modified-since'] === date) {
-			response.status = 304;
-			response.headers['cache-control'] = 'public, max-age=11111111';
-			response.headers['last-modified'] = date;
-			ctrl.flush();
-			F.stats.response.notmodified++;
+		if (!opt.download && date && ctrl.notmodified(date))
 			return;
-		}
 
 		// Resized image?
-		if (!DEBUG && F.temporary.path[ctrl.uri.key]) {
+		if (!DEBUG && F.temporary.path[ctrl.uri.cache]) {
 			ctrl.resume();
 			return;
 		}
@@ -1047,7 +1060,10 @@ FP.http = function(ctrl, opt) {
 
 				response.status = 206;
 				response.headers['accept-ranges'] = 'bytes';
-				response.headers['cache-control'] = DEBUG ? 'private, no-cache, no-store, max-age=0' : 'public, max-age=11111111';
+
+				if (!opt.download && !DEBUG && date)
+					ctrl.httpcache(date);
+
 				response.headers['content-length'] = length;
 				response.headers['content-range'] = 'bytes ' + beg + '-' + end + '/' + obj.size;
 				response.headers['content-type'] = obj.type;
@@ -1057,9 +1073,14 @@ FP.http = function(ctrl, opt) {
 
 				ctrl.res.writeHead(response.status, response.headers);
 				F.Fs.createReadStream(filename, { flags: 'r', mode: '0666', autoClose: true, start: HEADERSIZE + beg, end: end + HEADERSIZE }).pipe(ctrl.res);
+				ctrl.free();
 
 			} else {
 				var stream = F.Fs.createReadStream(filename, { start: HEADERSIZE });
+
+				if (!opt.download && !DEBUG && date)
+					ctrl.httpcache(date);
+
 				ctrl.stream(obj.type, stream);
 			}
 		}