total5 0.0.1-2 → 0.0.1-21

package/index.js

@@ -1,4 +1,4 @@
-// Total.js core
+// Total.js framework
 // The MIT License
 // Copyright 2012-2023 (c) Peter Širka <petersirka@gmail.com>
 
@@ -8,7 +8,7 @@ const NODE_MODULES = { buffer: 1, child_process: 1, process: 1, fs: 1, events: 1
 const EMPTYOBJECT = {};
 const EMPTYARRAY = [];
 
-const REG_SKIPERRORS = /epipe|invalid\sdistance/i;
+const REG_SKIPERRORS = /epipe|invalid\sdistance|err_ipc_channel_closed/i;
 const REG_HTTPHTTPS = /^(http|https):\/\//i;
 const SOCKETWINDOWS = '\\\\?\\pipe';
 const CLUSTER_STATS = { TYPE: 'stats' };
@@ -37,6 +37,7 @@ global.DEF = {};
 	F.id = '';
 	F.clusterid = '';
 	F.is5 = F.version = 5000;
+	F.isBundle = false;
 	F.version_header = '5';
 	F.version_node = process.version + '';
 	F.EMPTYOBJECT = EMPTYOBJECT;
@@ -214,14 +215,17 @@ global.DEF = {};
 	};
 
 	F.path = {};
-
 	F.path.root = path => path ? F.path.$join(F.directory, path) : F.directory;
 	F.path.logs = path => path ? F.path.$join(F.temporary.directories.logs, path) : F.temporary.directories.logs;
 	F.path.public = path => path ? F.path.$join(F.temporary.directories.public, path) : F.temporary.directories.public;
 	F.path.private = path => path ? F.path.$join(F.temporary.directories.private, path) : F.temporary.directories.private;
 	F.path.databases = path => path ? F.path.$join(F.temporary.directories.databases, path) : F.temporary.directories.databases;
+	F.path.plugins = path => path ? F.path.$join(F.temporary.directories.plugins, path) : F.temporary.directories.plugins;
+	F.path.templates = path => path ? F.path.$join(F.temporary.directories.templates, path) : F.temporary.directories.templates;
+	F.path.flowstreams = path => path ? F.path.$join(F.temporary.directories.flowstreams, path) : F.temporary.directories.flowstreams;
 	F.path.directory = (type, path) => path ? F.path.$join(F.temporary.directories[type], path) : F.temporary.directories[type];
 	F.path.tmp = F.path.temp = path => path ? F.path.$join(F.temporary.directories.tmp, path) : F.temporary.directories.tmp;
+	F.path.exists = (path, callback) => callback ? (F.Fs.lstat(path, (err, stats) => callback(err ? false : true, stats ? stats.size : 0, stats ? stats.isFile() : false))) : new Promise(resolve => F.path.exists(path, resolve));
 
 	F.path.$join = function(directory, path) {
 		var key = '$' + directory;
@@ -340,11 +344,12 @@ function unlink(arr, callback) {
 	CONF.$httpreqlimit = 0; // request limit per ip
 	CONF.$httpcompress = true;
 	CONF.$httpetag = '';
-	CONF.$httpmaxsize = 256; // 256 kB
+	CONF.$httpmaxsize = 256; // kB
 	CONF.$httprangebuffer = 5120; // 5 MB
 	CONF.$httptimeout = 5; // 5 seconds
-	CONF.$httpfiles = { flac: true, jpg: true, jpeg: true, png: true, gif: true, ico: true, wasm: true, js: true, mjs: true, css: true, txt: true, xml: true, woff: true, woff2: true, otf: true, ttf: true, eot: true, svg: true, zip: true, rar: true, pdf: true, docx: true, xlsx: true, doc: true, xls: true, html: true, htm: true, appcache: true, manifest: true, map: true, ogv: true, ogg: true, mp4: true, mp3: true, webp: true, webm: true, swf: true, package: true, json: true, ui: true, md: true, m4v: true, jsx: true, heif: true, heic: true, ics: true, ts: true, m3u8: true, wav: true };
+	CONF.$httpfiles = { flac: true, jpg: true, jpeg: true, png: true, gif: true, ico: true, wasm: true, js: true, mjs: true, css: true, txt: true, xml: true, woff: true, woff2: true, otf: true, ttf: true, eot: true, svg: true, zip: true, rar: true, pdf: true, docx: true, xlsx: true, doc: true, xls: true, html: true, htm: true, appcache: true, manifest: true, map: true, ogv: true, ogg: true, mp4: true, mp3: true, webp: true, webm: true, swf: true, package: true, json: true, ui: true, md: true, m4v: true, jsx: true, heif: true, heic: true, ics: true, ts: true, m3u8: true, wav: true, xsd: true, xsl: true, xslt: true };
 	CONF.$httpchecktypes = true; // for multipart data only
+	CONF.$httpmaxage = 60; // in seconds
 	CONF.$blacklist = '';
 	CONF.$xpoweredby = 'Total.js';
 	CONF.$maxopenfiles = 100;
@@ -352,7 +357,7 @@ function unlink(arr, callback) {
 	CONF.$minifycss = true;
 	CONF.$minifyhtml = true;
 	CONF.$localize = true;
-	CONF.$port = 8000;
+	CONF.$port = 'auto';
 	CONF.$ip = '0.0.0.0';
 	CONF.$unixsocket = '';
 	CONF.$timezone = 'utc';
@@ -367,11 +372,9 @@ function unlink(arr, callback) {
 	CONF.$imagememory = 0; // disabled because e.g. GM v1.3.32 throws some error about the memory
 	CONF.$stats = true;
 
-	CONF.$nodemodules = require.resolve('./index');
-	CONF.$nodemodules = CONF.$nodemodules.substring(0, CONF.$nodemodules.length - (8 + 7));
 	CONF.$npmcache = '/var/www/.npm';
 	CONF.$python = 'python3';
-	CONF.$wsmaxsize = 256; // 256 kB
+	CONF.$wsmaxsize = 256; // kB
 	CONF.$wscompress = true;
 	CONF.$wsencodedecode = false;
 	CONF.$wsmaxlatency = 2000;
@@ -386,7 +389,7 @@ function unlink(arr, callback) {
 	CONF.$tapilogger = false;
 
 	CONF.$tms = false;
-	CONF.$tmsmaxsize = 256;
+	CONF.$tmsmaxsize = 256; // kB
 	CONF.$tmsurl = '/$tms/';
 	CONF.$tmsclearblocked = 60; // in minutes
 
@@ -478,7 +481,10 @@ function unlink(arr, callback) {
 
 		NOW = new Date();
 
-		if (!name && err.name)
+		if (err instanceof F.TBuilders.ErrorBuilder) {
+			if (!name)
+				name = err[0].name;
+		} else if (!name && err.name)
 			name = err.name;
 
 		err = err.toString();
@@ -489,7 +495,7 @@ function unlink(arr, callback) {
 		if (F.errors.push(obj) > 10)
 			F.errors.shift();
 
-		EMIT('error', obj);
+		F.$events.error && F.emit('error', obj);
 		F.stats.error++;
 	};
 
@@ -591,9 +597,13 @@ F.loadconfig = function(value) {
 	if (smtp)
 		F.config.smtp = smtp;
 
+	if (!F.config.$nodemodules)
+		F.config.$nodemodules = PATH.root('node_modules');
+
 	process.env.NODE_TLS_REJECT_UNAUTHORIZED = F.config.$insecure ? '0' : '1';
 	F.logger(F.config.$logger == true);
 	F.dir();
+	F.emit('$cors');
 	F.emit('$tms');
 	F.emit('$reconfigure');
 };
@@ -610,10 +620,10 @@ F.loadresource = function(name, value) {
 			if (response && (response instanceof Array || typeof(response) === 'object')) {
 				if (response instanceof Array) {
 					for (let item of response)
-						LOADRESOURCE(item.id || item.key || item.code || item.language, item.value || item.name || item.text || item.body);
+						F.loadresource(item.id || item.key || item.code || item.language, item.value || item.name || item.text || item.body);
 				} else {
 					for (let key in response)
-						LOADRESOURCE(key, response[key]);
+						F.loadresource(key, response[key]);
 				}
 			}
 
@@ -695,8 +705,15 @@ F.resource = function(language, key) {
 	return language === 'default' ? '' : F.resource('default', key);
 };
 
+F.localize = function(fn) {
+	F.def.onLocalize = fn;
+};
+
 F.auth = function(fn) {
-	F.def.onAuthorize = fn;
+	if (typeof(fn) === 'object')
+		F.TBuilders.builtinauth(fn);
+	else
+		F.def.onAuthorize = fn;
 };
 
 F.load = async function(types, callback) {
@@ -708,6 +725,8 @@ F.load = async function(types, callback) {
 	await F.TBundles.extract();
 	await F.clear(true);
 
+	process.send && process.send('total:ready');
+
 	if (typeof(types) === 'string')
 		types = types.split(',').trim();
 
@@ -730,21 +749,35 @@ F.load = async function(types, callback) {
 	}
 
 	if (!types.length || types.includes('env')) {
-		var env = await read(F.path.root('.env'));
+		let env = await read(F.path.root('.env'));
 		env && F.loadenv(env);
 	}
 
 	if (!types.length || types.includes('config')) {
-		var config = await read(F.path.root('config'));
+		let config = await read(F.path.root('config'));
 		config && F.loadconfig(config);
 	}
 
 	if (!types.length || types.includes('resources')) {
-		var resources = await list(F.path.root('resources'), 'resource');
+		let resources = await list(F.path.root('resources'), 'resource');
 		for (let resource of resources)
 			F.loadresource(F.TUtils.getName(resource).replace(/\.resource$/i, ''), await read(resource));
 	}
 
+	if (!types.length || types.includes('jsonschemas')) {
+		let jsonschemas = await list(F.path.root('jsonschemas'), 'json');
+		for (let jsonschema of jsonschemas) {
+			let json = await read(jsonschema);
+			json = json.parseJSON();
+			json && F.newjsonschema(F.TUtils.getName(jsonschema).replace(/\.json$/i, ''), json);
+		}
+		jsonschemas = await list(F.path.root('jsonschemas'), 'txt');
+		for (let jsonschema of jsonschemas) {
+			let txt = await read(jsonschema);
+			txt && F.newjsonschema(F.TUtils.getName(jsonschema).replace(/\.txt$/i, ''), txt);
+		}
+	}
+
 	let loader = ['modules', 'controllers', 'actions', 'schemas', 'models', 'definitions', 'sources', 'middleware'];
 	var files = [];
 	var tmp;
@@ -836,7 +869,6 @@ F.load = async function(types, callback) {
 	F.stats.compiled = files.length;
 	F.isloaded = true;
 	DEBUG && F.TSourceMap.refresh();
-	process.send && process.send('total:ready');
 	callback && callback();
 
 	F.emit('ready');
@@ -846,7 +878,7 @@ F.load = async function(types, callback) {
 F.require = function(name) {
 	if (name.startsWith('node:'))
 		return require(name);
-	return NODE_MODULES[name] ? require('node:' + name) : require(F.Path.join(F.directory, name));
+	return NODE_MODULES[name] ? require('node:' + name) : require(name); // TODO: check functionality without absolute path: require(F.Path.join(F.config.$nodemodules, name))
 };
 
 F.import = function(url, callback) {
@@ -953,7 +985,7 @@ F.npminstall = function(name, callback) {
 	if (!callback)
 		return new Promise((resolve, reject) => F.npminstall(name, err => err ? reject(err) : resolve()));
 
-	var path = F.config.$node_modules;
+	var path = F.config.$nodemodules;
 	F.path.mkdir(path, true);
 
 	var index = name.lastIndexOf('@');
@@ -1010,6 +1042,9 @@ F.shell = function(cmd, callback, cwd) {
 F.console = function() {
 
 	var memory = process.memoryUsage();
+	var nodemodules = require.resolve('./index');
+
+	nodemodules = nodemodules.substring(0, CONF.$nodemodules.length - (8 + 7));
 
 	print('====================================================');
 	print('PID           : ' + process.pid);
@@ -1030,10 +1065,10 @@ F.console = function() {
 	print('====================================================');
 	F.config.$root && print('Root          : ' + F.config.$root);
 	print('Directory     : ' + process.cwd());
-	print('node_modules  : ' + F.config.$nodemodules);
+	print('node_modules  : ' + nodemodules);
 	print('====================================================\n');
 
-	if (!F.isWorker) {
+	if (!F.isWorker && F.server) {
 
 		var hostname = F.unixsocket ? ('Socket: ' + F.unixsocket) : '{2}://{0}:{1}/'.format(F.config.$ip, F.config.$port, F.isHTTPS ? 'https' : 'http');
 
@@ -1147,6 +1182,10 @@ F.http = function(opt) {
 
 		if (unixsocket) {
 
+			try {
+				F.Fs.unlinkSync(unixsocket);
+			} catch (e) {}
+
 			if (F.isWindows && unixsocket.indexOf(SOCKETWINDOWS) === -1)
 				unixsocket = F.Path.join(SOCKETWINDOWS, unixsocket);
 
@@ -1180,6 +1219,23 @@ F.http = function(opt) {
 			if (opt.port)
 				F.config.$port = opt.port;
 
+			if (F.config.$port === 'auto') {
+				let port = process.env.PORT;
+				if (!port) {
+					for (let arg of process.argv) {
+						if ((/^\d{3,5}$/).test(arg)) {
+							port = arg;
+							break;
+						}
+					}
+				}
+				if (port)
+					port = +port;
+				if (isNaN(port))
+					port = 8000;
+				F.config.$port = port;
+			}
+
 			if (opt.ip)
 				F.config.$ip = opt.ip;
 
@@ -1294,18 +1350,18 @@ F.componentator = function(name, components, removeprev = true) {
 
 	F.Fs.lstat(filename, function(err) {
 		if (err)
-			F.download(url, filename, F.error('COMPONENTATOR'));
+			F.download(url, filename, err => err ? F.error(err, 'COMPONENTATOR') : null);
 	});
 
 };
 
-F.error = function(err, name, uri) {
+F.error = function(err, name, url) {
 
 	if (!arguments.length)
 		return F.errorcallback;
 
 	if (err)
-		F.def.onError(err, name, uri);
+		F.def.onError(err, name, url);
 };
 
 F.errorcallback = function(err) {
@@ -1475,8 +1531,12 @@ F.middleware = function(name, fn, assign) {
 					}
 				}
 			} else {
+
 				if (a === 'websocket' || a === 'file' || a === 'route')
 					a += 's';
+				else if (a === 'dynamic')
+					a = 'routes';
+
 				let routes = F.routes[a];
 				if (routes) {
 					for (let route of routes) {
@@ -1586,10 +1646,8 @@ F.service = function(count) {
 	}
 
 	// Update expires date
-	if (count % 60 === 0) {
+	if (count % 60 === 0)
 		F.config.$httpexpire = NOW.add('y', 1).toUTCString();
-		F.TImages.clear();
-	}
 
 	if (count % F.config.$tmsclearblocked === 0)
 		F.temporary.tmsblocked = {};
@@ -1796,7 +1854,7 @@ F.newjsonschema = function(name, obj) {
 F.newtransform = function(name, action, id) {
 	if (action == null) {
 		let items = F.transformations[name];
-		let index = items.findIndex('id', id);
+		let index = items.TfindIndex('id', id);
 		if (index !== -1) {
 			items.splice(index, 1);
 			if (!items.length)
@@ -2160,7 +2218,7 @@ F.backup = function(filename, files, callback, filter) {
 			F.Fs.stat(file, function(err, stats) {
 
 				if (err) {
-					F.error(err, 'BACKUP()', filename);
+					F.error(err, 'F.backup()', filename);
 					next();
 					return;
 				}
@@ -2246,7 +2304,7 @@ F.backup = function(filename, files, callback, filter) {
 					counter++;
 					setImmediate(next);
 				}).on('error', function(err) {
-					F.error(err, 'F.backup', file);
+					F.error(err, 'F.backup()', file);
 					setImmediate(next);
 				});
 
@@ -2255,16 +2313,17 @@ F.backup = function(filename, files, callback, filter) {
 	});
 };
 
-F.exit = function(signal) {
+F.restart = function() {
+	process.send && process.send('total:restart');
+};
+
+F.exit = function(signal = 15) {
 
 	if (F.isexited)
 		return;
 
 	F.isexited = true;
 
-	if (!signal)
-		signal = 'SIGTERM';
-
 	for (let m in F.workers) {
 		let worker = F.workers[m];
 		try {
@@ -2272,7 +2331,7 @@ F.exit = function(signal) {
 		} catch (e) {}
 	}
 
-	let key = '$exit';
+	let key = 'exit';
 
 	F.$events[key] && F.emit(key, signal);
 
@@ -2366,7 +2425,7 @@ F.dir = function(val) {
 	if (val)
 		F.directory = val;
 
-	var dirs = ['public', 'tmp', 'logs', 'databases', 'controllers', 'resources', 'plugins', 'views', 'definitions', 'schemas', 'models', 'flowstreams', 'bundles', 'actions', 'extensions', 'source', 'services', 'updates', 'templates'];
+	var dirs = ['public', 'tmp', 'logs', 'databases', 'controllers', 'resources', 'plugins', 'views', 'definitions', 'schemas', 'models', 'flowstreams', 'bundles', 'actions', 'extensions', 'source', 'services', 'updates', 'templates', 'private'];
 
 	for (let dir of dirs) {
 		var cfg = F.config['$dir' + dir];
@@ -2406,6 +2465,12 @@ F.mail = function(email, subject, name, model, language, callback) {
 		callback = tmp;
 	}
 
+	// Localization
+	if (typeof(language) === 'string') {
+		if (subject.includes('@('))
+			subject = TRANSLATE(language, subject);
+	}
+
 	let body = F.view(name, model, view => view.language = language || '');
 	return F.def.onMail(email, subject, body, callback);
 };
@@ -2418,17 +2483,22 @@ F.htmlmail = function(email, subject, body, language, callback) {
 		callback = tmp;
 	}
 
-	// Translation
+	// Localization
 	if (typeof(language) === 'string') {
-		subject = subject.indexOf('@(') === -1 ? TRANSLATE(language, subject) : TRANSLATOR(language, subject);
-		if (body.indexOf('@(') !== -1)
-			body = TRANSLATOR(language, body);
+		if (subject.includes('@('))
+			subject = TRANSLATE(language, subject);
+		if (body.includes('@('))
+			body = TRANSLATE(language, body);
 	}
 
-	var body = body.indexOf('<body>') === -1 ? ('<!DOCTYPE html><html><head><title>' + subject + '</title><meta charset="utf-8" /></head><body style="padding:0;margin:0;font-family:Arial;font-size:14px;font-weight:normal">' + body + '</body></html>') : body;
+	body = body.indexOf('<body>') === -1 ? ('<!DOCTYPE html><html><head><title>' + subject + '</title><meta charset="utf-8" /></head><body style="padding:0;margin:0;font-family:Arial;font-size:14px;font-weight:normal">' + body + '</body></html>') : body;
 	return F.def.onMail(email, subject, body, callback);
 };
 
+F.readfile = function(path, type = null) {
+	return new Promise(resolve => F.Fs.readFile(path, type, (err, response) => err ? resolve(null) : resolve(response)));
+};
+
 F.loadstats = function() {
 
 	var main = {};
@@ -2526,13 +2596,11 @@ process.on('unhandledRejection', function(e) {
 	F.error(e.stack, '');
 });
 
-// process.on('uncaughtException', function(e) {
 process.on('uncaughtException', function(e) {
-
 	var err = e + '';
 	if (err.indexOf('listen EADDRINUSE') !== -1) {
-		process.send && process.send('total:eaddrinuse');
 		console.log('\nThe IP address and the PORT is already in use.\nYou must change the PORT\'s number or IP address.\n');
+		process.send && process.send('total:eaddrinuse');
 		process.exit(1);
 		return;
 	} else if (F.config.$filtererrors && REG_SKIPERRORS.test(err))
@@ -2548,9 +2616,9 @@ process.on('message', function(msg, h) {
 
 	let key;
 
-	if (msg === 'total:debug')
+	if (msg === 'total:debug') {
 		F.TUtils.wait(() => F.isloaded, F.console, 10000, 500);
-	else if (msg === 'total:ping')
+	} else if (msg === 'total:ping')
 		setImmediate(ping);
 	else if (msg === 'total:update') {
 		key = '$update';
@@ -2608,6 +2676,8 @@ process.on('message', function(msg, h) {
 	F.syshash = (__dirname + '-' + F.Os.hostname() + '-' + F.Os.platform() + '-' + F.Os.arch() + '-' + F.Os.release() + '-' + F.Os.tmpdir() + JSON.stringify(process.versions)).md5();
 	F.isLE = F.Os.endianness ? F.Os.endianness() === 'LE' : true;
 
+	CONF.$total5 = F.Path.dirname(require.resolve('./index'));
+
 	F.cache = require('./cache');
 	F.TImages = require('./images');
 	F.path.fs = F.Fs;
@@ -2658,5 +2728,29 @@ process.connected && setTimeout(() => process.send('total:init'), 100);
 
 require('./global');
 require('./tangular');
+require('./markdown');
+
+// Init directories
+F.dir();
+
+// Init CORS
+F.on('$cors', function() {
+
+	var arr = (F.config.$cors || '').toLowerCase().split(',').trim();
+	var wildcard = [];
+	var strict = [];
+
+	for (let i = 0; i < arr.length; i++) {
+		let val = arr[i];
+		if (val !== '*') {
+			if (val[0] === '*' && val.length > 1)
+				wildcard.push(val.substring(1));
+			else
+				strict.push(val);
+		}
+	}
+
+	F.temporary.cors = F.config.$cors === '*' ? null : { wildcard: wildcard, strict: strict };
+});
 
 module.exports = F;

package/jsonschema.js

@@ -18,7 +18,7 @@ function check_string(meta, error, value, errplus, path) {
 	var type = typeof(value);
 
 	if (type !== 'string')
-		value = value ? (value + '') : null;
+		value = value ? (value + '') : meta.nullable ? null : '';
 
 	if (errplus == null)
 		errplus = '';
@@ -37,7 +37,7 @@ function check_string(meta, error, value, errplus, path) {
 	}
 
 	if (value == null)
-		return;
+		return null;
 
 	var len = value.length;
 
@@ -133,6 +133,14 @@ function check_string(meta, error, value, errplus, path) {
 					return;
 				}
 				break;
+			case 'datauri':
+				value = value.trim();
+				if (value && !value.isBase64(true)) {
+					error.push2(errplus + meta.$$ID, path);
+					return;
+				}
+				value = value ? value.parseDataURI() : null;
+				break;
 			case 'color':
 				value = value.trim();
 				if (value && !REG_COLOR.test(value)) {
@@ -299,7 +307,8 @@ function check_date(meta, error, value, errplus, path) {
 	return value;
 }
 
-function read_def(ref, definitions) {
+function readdef(ref, definitions) {
+
 	if (ref[0] === '#') {
 		var tmp = ref.substring(2).split('/');
 		var def = definitions[tmp[0]];
@@ -312,7 +321,8 @@ function read_def(ref, definitions) {
 				return obj;
 			}
 		}
-	}
+	} else
+		return F.jsonschemas[ref];
 }
 
 function check_array(meta, error, value, stop, definitions, path) {
@@ -420,13 +430,14 @@ function check_array(meta, error, value, stop, definitions, path) {
 			var val = value[i];
 
 			if (meta.items.$ref) {
-				var ref = read_def(meta.items.$ref, definitions);
+				var ref = typeof(meta.items.$ref) === 'object' ? meta.items.$ref :readdef(meta.items.$ref, definitions);
 				if (ref) {
-					var newerror = [];
-					tmp = transform(ref, newerror, val);
-					if (newerror.length) {
-						for (var err of newerror)
-							error.push2(ref.$$ID + '.' + err, path, i);
+					var newerror = new F.ErrorBuilder();
+					tmp = transform(ref, newerror, val, false, currentpath + '[' + i + ']');
+					if (newerror.items.length) {
+						for (var err of newerror.items) {
+							error.push2(err.name, err.path, i);
+						}
 					} else if (tmp != null && (!meta.uniqueItems || response.indexOf(tmp) === -1))
 						response.push(tmp);
 					continue;
@@ -552,10 +563,8 @@ function check_object(meta, error, value, response, stop, definitions, path) {
 			case 'boolean':
 			case 'bool':
 				tmp = check_boolean(prop, error, val, null, currentpath);
-				if (tmp != null) {
-					response[key] = tmp;
-					count++;
-				}
+				response[key] = tmp == true;
+				count++;
 				break;
 			case 'date':
 				tmp = check_date(prop, error, val, null, currentpath);
@@ -564,16 +573,14 @@ function check_object(meta, error, value, response, stop, definitions, path) {
 				break;
 			case 'string':
 				tmp = check_string(prop, error, val, null, currentpath);
-				if (tmp != null) {
-
-					if (!tmp && prop.subtype === 'uid')
-						tmp = null;
-
-					response[key] = tmp;
-					count++;
-				}
+				if (tmp == '' && prop.nullable)
+					tmp = null;
+				response[key] = tmp;
+				count++;
 				break;
+
 			case 'object':
+
 				if (prop.properties) {
 					tmp = check_object(prop, error, val, null, null, definitions, currentpath);
 					if (tmp != null) {
@@ -584,13 +591,14 @@ function check_object(meta, error, value, response, stop, definitions, path) {
 
 					// check ref
 					if (prop.$ref) {
-						var ref = read_def(prop.$ref, definitions);
+						var ref = typeof(prop.$ref) === 'object' ? prop.$ref : readdef(prop.$ref, definitions);
 						if (ref) {
-							var newerror = new ErrorBuilder();
-							tmp = transform(ref, newerror, val);
+							var newerror = new F.ErrorBuilder();
+							tmp = transform(ref, newerror, val, false, currentpath);
 							if (newerror.items.length) {
-								for (var err of newerror.items)
-									error.push(ref.$$ID + '.' + err, '@');
+								for (var err of newerror.items) {
+									error.push2(err.name, err.path);
+								}
 							} else
 								response[key] = tmp;
 							continue;

package/mail.js

@@ -225,10 +225,12 @@ Message.prototype.send2 = function(callback) {
 	Mailer.send(F.config.smtp, self, callback);
 };
 
-Message.prototype.send = function(smtp, options, callback) {
-	this.$callback2 = callback;
-	Mailer.send(smtp, options, this);
-	return this;
+Message.prototype.send = function(smtp, options, callback, cache) {
+	var self = this;
+	self.$callback2 = callback;
+	options.server = smtp;
+	Mailer.send(options, self, callback, cache);
+	return self;
 };
 
 Mailer.tls = function(obj, opt) {
@@ -396,12 +398,12 @@ function writeattachmentbytes(chunk) {
 	}
 }
 
-Mailer.try = function(smtp, options, callback) {
+Mailer.try = function(options, callback) {
 	var self = this;
 	if (callback)
-		return self.send(smtp, options, undefined, callback);
+		self.send(options, undefined, callback);
 	else
-		return new Promise((resolve, reject) => self.send(smtp, options, undefined, err => err ? reject(err) : resolve()));
+		return new Promise((resolve, reject) => self.send(options, undefined, err => err ? reject(err) : resolve()));
 };
 
 Mailer.send2 = function(messages, callback) {