total5 0.0.1-9 → 0.0.2

package/utils.js

@@ -41,7 +41,7 @@ const REG_TAGS = /<\/?[^>]+(>|$)/g;
 const REG_UA = /[a-z]+/gi;
 const REG_XML = /\w+=".*?"/g;
 const REG_DECODE = /&#?[a-z0-9]+;/g;
-const REG_ARGS = /\{{1,2}[a-z0-9_.-\s]+\}{1,2}/gi;
+const REG_ARGS = /\{{1,2}[a-z0-9_$.-\s]+\}{1,2}/gi;
 const REG_INTEGER = /(^-|\s-)?[0-9]+/g;
 const REG_FLOAT = /(^-|\s-)?[0-9.,]+/g;
 const REG_TERMINAL = /[\w\S]+/g;
@@ -51,6 +51,8 @@ const REG_KEYWORD2 = /\n/g;
 const REG_KEYWORD3 = /\W|_/g;
 const REG_BASE = /^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$/;
 const REG_BASE2 = /^|,([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$/;
+const REG_NUMBER = /^[0-9,.]$/;
+const REG_WIN = /\\/g;
 
 const NEWLINE = '\r\n';
 const DIACRITICSMAP = {};
@@ -71,6 +73,7 @@ const REG_TIME = /am|pm/i;
 const REG_XMLKEY = /\[|\]|:|\.|_/g;
 const REG_HEADERPARSER = /(name|filename)=".*?"|content-type:\s[a-z0-9-./+]+/ig;
 const HEADEREND = Buffer.from('\r\n\r\n', 'ascii');
+const JSCHEMAS_NULLABLE = { json: 1, base64: 1, guid: 1, datauri: 1, uid: 1, string2: 1 };
 
 exports.MONTHS = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
 exports.DAYS = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
@@ -85,6 +88,26 @@ const REG_UTF8 = /[\u3400-\u9FBF]/;
 
 exports.success = { success: true };
 exports.noop = function() {};
+exports.toError = function(err) {
+
+	if (err instanceof Error)
+		return err;
+
+	if (err instanceof F.TBuilders.ErrorBuilder)
+		return new Error(err.toString());
+
+	switch (typeof(err)) {
+		case 'string':
+		case 'number':
+			return new Error(err + '');
+		default:
+			if (err instanceof Array)
+				err = err[0];
+			break;
+	}
+
+	return new Error((err ? (err.error || err.err || err.name) : '') || 'Unknown error');
+};
 
 exports.parseConfig = function(value) {
 
@@ -194,6 +217,12 @@ exports.parseConfig = function(value) {
 				generated.push(key);
 				break;
 			default:
+
+				if (val === 'true' || val === 'false')
+					val = val === 'true';
+				else if (REG_NUMBER.test(val))
+					val = val.parseFloat();
+
 				cfg[key] = val;
 				break;
 		}
@@ -287,9 +316,10 @@ var CONTENTTYPES = {
 	ico: 'image/x-icon',
 	ics: 'text/calendar',
 	ifb: 'text/calendar',
-	jpe: 'image/jpeg',
-	jpeg: 'image/jpeg',
+	ipynb: 'application/x-ipynb+json',
+	ijsnb: 'application/x-ijsnb+json',
 	jpg: 'image/jpeg',
+	jpeg: 'image/jpeg',
 	js: 'text/javascript',
 	json: 'application/json',
 	ui: 'application/json', // UI builder
@@ -685,8 +715,8 @@ function _request(opt, callback) {
 	if (options.resolve && (opt.unixsocket || (uri.hostname === 'localhost' || uri.hostname.charCodeAt(0) < 64)))
 		options.resolve = false;
 
-	if (!opt.unixsocket && CONF.default_proxy && !proxy && !PROXYBLACKLIST[uri.hostname])
-		proxy = parseProxy(CONF.default_proxy);
+	if (!opt.unixsocket && F.config.$proxyrequest && !proxy && !PROXYBLACKLIST[uri.hostname])
+		proxy = parseProxy(F.config.$proxyrequest);
 
 	if (!opt.unixsocket && proxy && (uri.hostname === 'localhost' || uri.hostname === '127.0.0.1'))
 		proxy = null;
@@ -1739,42 +1769,40 @@ exports.distance = function(lat1, lon1, lat2, lon2) {
 	return (R * c).floor(3);
 };
 
-function ls(path, callback, advanced, filter) {
+function ls(path, callback, advanced, filter, unified) {
+
 	var filelist = new FileList();
 	var tmp;
 
+	filelist.unified = unified == true;
 	filelist.advanced = advanced;
 	filelist.onComplete = callback;
 
 	if (typeof(filter) === 'string') {
 		tmp = filter.toLowerCase();
-		filelist.onFilter = function(filename, is) {
-			return is ? true : filename.toLowerCase().indexOf(tmp) !== -1;
-		};
+		filelist.onFilter = (filename, is) => is ? true : filename.toLowerCase().indexOf(tmp) !== -1;
 	} else if (filter && filter.test) {
 		// regexp
 		tmp = filter;
-		filelist.onFilter = function(filename, is) {
-			return is ? true : tmp.test(filename);
-		};
+		filelist.onFilter = (filename, is) => is ? true : tmp.test(filename);
 	} else
 		filelist.onFilter = filter || null;
 
 	filelist.walk(path);
 }
 
-exports.ls = function(path, callback, filter) {
+exports.ls = function(path, callback, filter, unified) {
 	if (callback)
-		ls(path, callback, false, filter);
+		ls(path, callback, false, filter, unified);
 	else
-		return new Promise(resolve => ls(path, (files, dirs) => resolve({ directories: dirs, files: files }), false, filter));
+		return new Promise(resolve => ls(path, (files, dirs) => resolve({ directories: dirs, files: files }), false, filter, unified));
 };
 
-exports.ls2 = function(path, callback, filter) {
+exports.ls2 = function(path, callback, filter, unified) {
 	if (callback)
-		ls(path, callback, true, filter);
+		ls(path, callback, true, filter, unified);
 	else
-		return new Promise(resolve => ls(path, (files, dirs) => resolve({ directories: dirs, files: files }), true, filter));
+		return new Promise(resolve => ls(path, (files, dirs) => resolve({ directories: dirs, files: files }), true, filter, unified));
 };
 
 DP.setTimeZone = function(timezone) {
@@ -2200,7 +2228,16 @@ SP.hash = function(type, salt) {
 	}
 };
 
-SP.sign = function(key) {
+SP.sign = function(key, check) {
+
+	if (check) {
+		let index = this.lastIndexOf('-');
+		if (index === -1)
+			return null;
+		var id = this.substring(0, index);
+		return id.sign(key) === this ? id : null;
+	}
+
 	return this + '-' + (string_hash(this + (key || '')) >>> 0).toString(36);
 };
 
@@ -2378,6 +2415,10 @@ SP.streamer = function(beg, end, callback, skip) {
 
 };
 
+SP.parseXML2 = function() {
+	return require('./htmlparser').parseHTML(this, false, null, true);
+};
+
 SP.parseXML = function(replace) {
 
 	var xml = this;
@@ -2542,13 +2583,13 @@ SP.parseEncoded = function() {
 			decodek = false;
 			decodev = false;
 
-			if ((count++) >= CONF.default_request_maxkeys)
+			if ((count++) >= F.config.$httpmaxkeys)
 				break;
 
 		} else {
 
 			if (n === 61) {
-				if ((i - pos) > CONF.default_request_maxkey)
+				if ((i - pos) > F.config.$httpmaxkey)
 					key = '';
 				else {
 					if (pos < i)
@@ -3118,7 +3159,7 @@ SP.parseDateExpiration = function() {
 };
 
 var configurereplace = function(text) {
-	var val = CONF[text.substring(1, text.length - 1)];
+	var val = F.config[text.substring(1, text.length - 1)];
 	return val == null ? '' : val;
 };
 
@@ -3184,7 +3225,7 @@ SP.parseConfig = function(def, onerr) {
 				obj[name] = (/true|on|1|enabled/i).test(value);
 				break;
 			case 'config':
-				obj[name] = CONF[value];
+				obj[name] = F.config[value];
 				break;
 			case 'eval':
 			case 'object':
@@ -3238,7 +3279,7 @@ SP.decrypt_uid = function(key) {
 	return exports.decrypt_uid(this, key);
 };
 
-SP.safehtml = function() {
+SP.encode = SP.safehtml = function() {
 	var output = '';
 	for (var i = 0, length = this.length; i < length; i++) {
 		var c = this[i];
@@ -3280,6 +3321,7 @@ SP.arg = SP.args = function(obj, encode, def) {
 		def = encode;
 	var isfn = typeof(encode) === 'function';
 	return this.replace(REG_ARGS, function(text) {
+
 		// Is double bracket?
 		var l = text[1] === '{' ? 2 : 1;
 		var key = text.substring(l, text.length - l).trim();
@@ -3425,6 +3467,18 @@ SP.isUID = function() {
 	return false;
 };
 
+// Remove the trailing slash
+SP.tslash = function() {
+	var t = this;
+
+	for (var i = t.length - 1; i > 0; i--) {
+		if (t[i] !== '/' || i === 1)
+			return t.substring(0, i + 1);
+	}
+
+	return t;
+};
+
 SP.parseUID = function() {
 	var self = this;
 	var obj = {};
@@ -3518,7 +3572,7 @@ SP.parseUID = function() {
 	return obj;
 };
 
-String.prototype.parseEnv = function() {
+SP.parseEnv = function() {
 
 	var arr = this.split(REG_ENVLINES);
 	var obj = {};
@@ -3760,7 +3814,7 @@ SP.encrypt = function(key, isUnique, secret) {
 	for (var i = 0; i < str.length; i++)
 		sum += str.charCodeAt(i);
 
-	return (sum + checksum((secret || CONF.secret) + key)) + '-' + str;
+	return (sum + checksum((secret || F.config.secret) + key)) + '-' + str;
 };
 
 SP.decrypt = function(key, secret) {
@@ -3774,7 +3828,7 @@ SP.decrypt = function(key, secret) {
 		return null;
 
 	var hash = this.substring(index + 1);
-	var sum = checksum((secret || CONF.secret) + key);
+	var sum = checksum((secret || F.config.secret) + key);
 	for (var i = 0; i < hash.length; i++)
 		sum += hash.charCodeAt(i);
 
@@ -3892,7 +3946,7 @@ exports.encrypt_uid = function(val, key) {
 	var sum = 0;
 
 	if (!key)
-		key = CONF.secret;
+		key = F.config.secret;
 
 	val = val + '';
 
@@ -3918,7 +3972,7 @@ exports.decrypt_uid = function(val, key) {
 exports.encrypt_crypto = function(type, key, value) {
 	if (!F.temporary.keys[key])
 		F.temporary.keys[key] = Buffer.from(key);
-	var cipher = F.Crypto.createCipheriv(type, F.temporary.keys[key], CONF.default_crypto_iv);
+	var cipher = F.Crypto.createCipheriv(type, F.temporary.keys[key], F.config.$cryptoiv);
 	CONCAT[0] = cipher.update(value);
 	CONCAT[1] = cipher.final();
 	return Buffer.concat(CONCAT);
@@ -3927,7 +3981,7 @@ exports.encrypt_crypto = function(type, key, value) {
 exports.decrypt_crypto = function(type, key, value) {
 	if (!F.temporary.keys[key])
 		F.temporary.keys[key] = Buffer.from(key);
-	var decipher = F.Crypto.createDecipheriv(type, F.temporary.keys[key], CONF.default_crypto_iv);
+	var decipher = F.Crypto.createDecipheriv(type, F.temporary.keys[key], F.config.$cryptoiv);
 	try {
 		CONCAT[0] = decipher.update(value);
 		CONCAT[1] = decipher.final();
@@ -4514,7 +4568,7 @@ AP.findAll = function(cb, value) {
 };
 
 AP.findValue = function(cb, value, path, def) {
-	var index = this.findIndex(cb, value);
+	var index = this.TfindIndex(cb, value);
 	if (index !== -1) {
 		var item = this[index][path];
 		return item == null ? def : item;
@@ -4524,13 +4578,14 @@ AP.findValue = function(cb, value, path, def) {
 
 AP.findItem = function(cb, value) {
 	var self = this;
-	var index = self.findIndex(cb, value);
+	var index = self.TfindIndex(cb, value);
 	if (index === -1)
 		return null;
 	return self[index];
 };
 
-AP.findIndex = function(cb, value) {
+// TfindIndex due to other NPM dependencies
+AP.TfindIndex = AP.findIndex = function(cb, value) {
 
 	var self = this;
 	var isFN = typeof(cb) === 'function';
@@ -4647,6 +4702,8 @@ AP.async = function(thread, callback, tmp) {
 		thread = 1;
 	} else if (thread === undefined)
 		thread = 1;
+	else if (thread > self.length)
+		thread = self.length;
 
 	if (!tmp) {
 		tmp = {};
@@ -4754,6 +4811,7 @@ function FileList() {
 	this.onComplete = null;
 	this.onFilter = null;
 	this.advanced = false;
+	this.unified = false;
 }
 
 const FLP = FileList.prototype;
@@ -4795,19 +4853,23 @@ FLP.stat = function(path) {
 		if (err)
 			return self.next();
 
+		var cleaned = self.unified && F.isWindows ? path.replace(REG_WIN, '/') : path;
+		var path2 = path;
+
 		if (stats.isDirectory()) {
 			path = self.clean(path);
-			if (!self.onFilter || self.onFilter(path, true)) {
-				self.directory.push(path);
-				self.pendingDirectory.push(path);
+			cleaned = self.unified && F.isWindows ? path.replace(REG_WIN, '/') : path;
+
+			if (!self.onFilter || self.onFilter(cleaned, true)) {
+				self.directory.push(cleaned);
+				self.pendingDirectory.push(path2);
 			}
-		} else if (!self.onFilter || self.onFilter(path, false))
-			self.file.push(self.advanced ? { filename: path, stats: stats } : path);
+		} else if (!self.onFilter || self.onFilter(cleaned, false))
+			self.file.push(self.advanced ? { filename: cleaned, stats: stats } : cleaned);
 
 		self.next();
 	});
 };
-
 FLP.clean = function(path) {
 	return path[path.length - 1] === F.Path.sep ? path : path + F.Path.sep;
 };
@@ -5870,10 +5932,10 @@ exports.connect = function(opt, callback) {
 	meta.socket1.on('clientError', error);
 };
 
-String.prototype.toJSONSchema = String.prototype.parseSchema = function(name, url) {
+SP.toJSONSchema = SP.parseSchema = function(name, url) {
 
 	var obj = {};
-	var p = (url || CONF.url || 'https://schemas.totaljs.com/');
+	var p = (url || F.config.url || 'https://schemas.totaljs.com');
 
 	if (p[p.length - 1] !== '/')
 		p += '/';
@@ -5971,7 +6033,10 @@ String.prototype.toJSONSchema = String.prototype.parseSchema = function(name, ur
 			type = 'object';
 		}
 
-		switch (type.toLowerCase()) {
+		var ltype = type.toLowerCase();
+
+		switch (ltype) {
+			case 'string2':
 			case 'string':
 			case 'uid':
 			case 'guid':
@@ -5989,19 +6054,21 @@ String.prototype.toJSONSchema = String.prototype.parseSchema = function(name, ur
 			case 'color':
 			case 'icon':
 			case 'base64':
+			case 'datauri':
 			case 'safestring':
 			case 'search':
 			case 'text':
 				tmp = {};
 				if (isarr) {
 					tmp.type = 'array';
-					tmp.items = { type: 'string', subtype: type === 'text' ? undefined : type };
+					tmp.items = { type: 'string', subtype: ltype === 'text' ? undefined : ltype, nullable: JSCHEMAS_NULLABLE[ltype] };
 					if (size)
 						tmp.items.maxLength = size;
 				} else {
 					tmp.type = 'string';
-					if (type !== tmp.type)
-						tmp.subtype = type;
+					tmp.nullable = JSCHEMAS_NULLABLE[ltype];
+					if (ltype !== tmp.type)
+						tmp.subtype = ltype;
 					if (size)
 						tmp.maxLength = size;
 				}
@@ -6021,11 +6088,11 @@ String.prototype.toJSONSchema = String.prototype.parseSchema = function(name, ur
 				tmp = {};
 				if (isarr) {
 					tmp.type = 'array';
-					tmp.items = { type: 'number', subtype: type === 'number' ? undefined : type };
+					tmp.items = { type: 'number', subtype: type === 'number' ? undefined : ltype };
 				} else {
 					tmp.type = 'number';
-					if (type !== 'number')
-						tmp.subtype = type;
+					if (ltype !== 'number')
+						tmp.subtype = ltype;
 				}
 
 				break;
@@ -6250,7 +6317,8 @@ exports.parseURI2 = function(url) {
 	if (index != -1)
 		url = url.replace(REG_TRAVELSE, '');
 
-	return { key: url.toLowerCase(), pathname: url, search: search, file: index != -1, ext: index == -1 ? '' : url.substring(index + 1), split: split };
+	let key = url.toLowerCase();
+	return { key: key, cache: key, pathname: url, search: search, file: index != -1, ext: index == -1 ? '' : url.substring(index + 1), split: split };
 };
 
 function destroyStreamopen() {
@@ -6265,9 +6333,10 @@ exports.destroystream = function(stream) {
 
 	if (stream instanceof F.Fs.ReadStream) {
 		stream.destroy();
-		typeof(stream.close) === 'function' && stream.on('open', destroyStreamopen);
-	} else if (stream instanceof F.Stream)
-		typeof(stream.destroy) === 'function' && stream.destroy();
+		if (typeof(stream.close) === 'function')
+			stream.on('open', destroyStreamopen);
+	} else if (stream instanceof F.Stream && typeof(stream.destroy) === 'function')
+		stream.destroy();
 
 	if (stream.$totalfd) {
 		F.Fs.close(stream.$totalfd, NOOP);
@@ -6298,7 +6367,8 @@ exports.onfinished = function(stream, fn) {
 		stream.$onFinishedQueue = fn;
 
 	var callback = function() {
-		!stream.$onFinished && (stream.$onFinished = true);
+		if (!stream.$onFinished)
+			stream.$onFinished = true;
 		if (stream.$onFinishedQueue instanceof Array) {
 			while (stream.$onFinishedQueue.length)
 				stream.$onFinishedQueue.shift()();
@@ -6309,36 +6379,31 @@ exports.onfinished = function(stream, fn) {
 		}
 	};
 
-	if (isFinished(stream)) {
-		setImmediate(callback);
-	} else {
-
-		if (stream.socket) {
-			if (!stream.socket.$totalstream) {
-				stream.socket.$totalstream = stream;
-				if (stream.socket.prependListener) {
-					stream.socket.prependListener('error', callback);
-					stream.socket.prependListener('close', callback);
-				} else {
-					stream.socket.on('error', callback);
-					stream.socket.on('close', callback);
-				}
+	if (stream.socket) {
+		if (!stream.socket.$totalstream) {
+			stream.socket.$totalstream = stream;
+			if (stream.socket.prependListener) {
+				stream.socket.prependListener('error', callback);
+				stream.socket.prependListener('close', callback);
+			} else {
+				stream.socket.on('error', callback);
+				stream.socket.on('close', callback);
 			}
 		}
+	}
 
-		if (stream.prependListener) {
-			stream.prependListener('error', callback);
-			stream.prependListener('end', callback);
-			stream.prependListener('close', callback);
-			stream.prependListener('aborted', callback);
-			stream.prependListener('finish', callback);
-		} else {
-			stream.on('error', callback);
-			stream.on('end', callback);
-			stream.on('close', callback);
-			stream.on('aborted', callback);
-			stream.on('finish', callback);
-		}
+	if (stream.prependListener) {
+		stream.prependListener('error', callback);
+		stream.prependListener('end', callback);
+		stream.prependListener('close', callback);
+		stream.prependListener('aborted', callback);
+		stream.prependListener('finish', callback);
+	} else {
+		stream.on('error', callback);
+		stream.on('end', callback);
+		stream.on('close', callback);
+		stream.on('aborted', callback);
+		stream.on('finish', callback);
 	}
 };
 
@@ -6351,7 +6416,7 @@ exports.uidr = function() {
 		var c;
 
 		if (i === 9) {
-			c = F.uidc;
+			c = F.internal.uidc;
 		} else {
 			let index = Math.floor(Math.random() * RANDOM_TEXT.length);
 			c = RANDOM_TEXT[index];
@@ -6364,24 +6429,4 @@ exports.uidr = function() {
 	}
 
 	return builder + RANDOM_STRING[sum] + 'r'; // "r" version
-};
-
-function isFinished(stream) {
-
-	// Response & Request
-	if (stream.socket) {
-		if (stream.writable && (!stream.socket._writableState || stream.socket._writableState.finished || stream.socket._writableState.destroyed))
-			return true;
-		if (stream.readable && (!stream.socket._readableState|| stream.socket._writableState.ended || stream.socket._readableState.destroyed))
-			return true;
-		return false;
-	}
-
-	if (stream._readableState && (stream._readableState.ended || stream._readableState.destroyed))
-		return true;
-
-	if (stream._writableState && (stream._writableState.finished || stream._writableState.destroyed))
-		return true;
-
-	return false;
-}
+};

package/viewengine.js

@@ -277,7 +277,7 @@ function parseplus(builder) {
 	return c !== '!' && c !== '?' && c !== '+' && c !== '.' && c !== ':';
 }
 
-function prepare(command, dynamicCommand, functions) {
+function prepare(command, dcommand, functions) {
 
 	var a = command.indexOf('.');
 	var b = command.indexOf('(');
@@ -301,10 +301,10 @@ function prepare(command, dynamicCommand, functions) {
 		index = command.length;
 
 	var name = command.substring(0, index);
-	if (name === dynamicCommand)
+	if (name === dcommand)
 		return 'self.safehtml(' + command + ', 1)';
 
-	if (name[0] === '!' && name.substring(1) === dynamicCommand)
+	if (name[0] === '!' && name.substring(1) === dcommand)
 		return 'self.safehtml(' + command.substring(1) + ')';
 
 	switch (name) {
@@ -328,7 +328,7 @@ function prepare(command, dynamicCommand, functions) {
 			return 'self.csrf()';
 
 		case 'root':
-			var r = CONF.$root;
+			var r = F.config.$root;
 			return '\'' + (r ? r.substring(0, r.length - 1) : r) + '\'';
 
 		case 'CONF':
@@ -391,13 +391,13 @@ function prepare(command, dynamicCommand, functions) {
 			return command.indexOf('(') === -1 ? '((repository[\'' + command + '\'] || \'\') + \'\').safehtml()' : 'self.' + command;
 
 		case 'title2':
-			return 'self.$' + command;
+			return 'self.' + command;
 
 		case '!title':
 		case '!description':
 		case '!keywords':
 		case '!author':
-			return '(repository[\'$' + command.substring(1) + '\'] || \'\')';
+			return '(repository[\'' + command.substring(1) + '\'] || \'\')';
 
 		case 'place':
 			return command.indexOf('(') === -1 ? '(repository[\'' + command + '\'] || \'\')' : 'self.' + command;
@@ -638,6 +638,13 @@ View.prototype.title = function(value) {
 	return '';
 };
 
+View.prototype.title2 = function(value) {
+	var current = this.repository.title;
+	if (value)
+		this.repository.title = (current || '') + value.safehtml();
+	return '';
+};
+
 View.prototype.description = function(value) {
 	this.repository.description = value;
 	return '';
@@ -676,7 +683,7 @@ View.prototype.href = function(key, value) {
 
 	if (type === 'string') {
 
-		var cachekey = '$href' + key;
+		var cachekey = 'href_' + key;
 		var str = self.repository[cachekey] || '';
 
 		if (!str) {
@@ -824,7 +831,7 @@ View.prototype.import = function() {
 
 View.prototype.section = function(name, value, replace) {
 
-	var key = '$section_' + name;
+	var key = 'section_' + name;
 	var self = this;
 
 	if (value == null)
@@ -848,6 +855,10 @@ View.prototype.url = function(hostname = false) {
 	return hostname ? (self.controller ? self.controller.hostname(self.controller.url) : '') : (self.controller ? self.controller.url : '');
 };
 
+View.prototype.set = function() {
+	return '';
+};
+
 View.prototype.render = function(name, model, ispartial = false) {
 
 	var self = this;

package/websocket.js

@@ -33,6 +33,7 @@ function Controller(req, socket, head) {
 	var ctrl = this;
 
 	ctrl.req = req;
+	ctrl.method = 'SOCKET';
 	ctrl.res = ctrl.socket = socket;
 	ctrl.route = null;
 	ctrl.head = head;
@@ -864,10 +865,14 @@ function authorize(ctrl) {
 
 function middleware(ctrl) {
 	var run = function(index) {
-		var fn = ctrl.route.middleware[index];
-		if (fn)
-			fn(ctrl, () => run(index + 1));
-		else
+		let key = ctrl.route.middleware[index];
+		if (key) {
+			let fn = F.routes.middleware[key];
+			if (fn)
+				fn(ctrl, () => run(index + 1));
+			else
+				prepare(ctrl);
+		} else
 			prepare(ctrl);
 	};
 	run(0);
@@ -875,7 +880,7 @@ function middleware(ctrl) {
 
 function prepare(ctrl) {
 
-	ctrl.ondata2 = () => websocket.ondata();
+	ctrl.ondata2 = () => ctrl.ondata();
 
 	var compress = (F.config.$wscompress && ctrl.headers['sec-websocket-extensions'] || '').indexOf('permessage-deflate') !== -1;
 	var header = ctrl.route.protocols && ctrl.route.protocols.length ? (compress ? SOCKET_RESPONSE_PROTOCOL_COMPRESS : SOCKET_RESPONSE_PROTOCOL).format(ctrl.sign(ctrl), ctrl.route.protocols.join(', ')) : (compress ? SOCKET_RESPONSE_COMPRESS : SOCKET_RESPONSE).format(ctrl.sign(ctrl));
@@ -1255,7 +1260,6 @@ WebSocketClient.prototype.connectforce = function(self, url, protocol, origin) {
 
 	self.req.on('response', function(res) {
 
-		print(res.statusCode);
 		self.$events.error && self.emit('error', new Error('Unexpected server response (' + res.statusCode + ')'));
 
 		if (self.options.reconnectserver) {