total5 0.0.2 → 0.0.3-1

package/changelog.txt

@@ -1,3 +1,13 @@
+========================
+0.0.3
+========================
+
+- extended icon validator by adding support for `tic` keyword
+- added new events `ON('request')`, `ON('controller')` and `ON('websocket')`
+- fixed applying the `$insecure` option in the FlowStream
+- fixed routing for unexpected content-type
+- added `controller.authorize([callback])` method
+
 ========================
 0.0.2
 ========================

package/controller.js

@@ -188,6 +188,10 @@ Controller.prototype.callback = function(err, value) {
 
 };
 
+Controller.prototype.cancel = function() {
+	this.iscanceled = true;
+};
+
 Controller.prototype.csrf = function() {
 	return F.def.onCSRFcreate(this);
 };
@@ -881,6 +885,7 @@ Controller.prototype.hostname = function(path) {
 Controller.prototype.$route = function() {
 
 	var ctrl = this;
+
 	if (ctrl.isfile) {
 
 		if (F.routes.files.length) {
@@ -943,7 +948,6 @@ Controller.prototype.$route = function() {
 
 				ctrl.payload = Buffer.concat(ctrl.payload);
 				F.stats.performance.download += ctrl.payload.length / 1024 / 1024;
-
 				switch (ctrl.datatype) {
 					case 'json':
 						ctrl.body = F.def.parsers.json(ctrl.payload.toString('utf8'));
@@ -987,6 +991,29 @@ function readfile(filename, callback) {
 	});
 }
 
+/*
+	@Path: Controller
+	@Method: instance.authorize([callback]); #callback {Function(err, session)} optional;
+	The method performs "manual" authorization. If the user is logged in, then `session {Object}` is not null, otherwise `null`. If you don't use the `callback` argument, then the method returns `Promise`.
+*/
+Controller.prototype.authorize = function(callback) {
+
+	var ctrl = this;
+
+	if (!callback)
+		return new Promise((resolve, reject) => ctrl.authorize((err, response) => resolve(response)));
+
+	if (F.def.onAuthorize) {
+		var opt = new F.TBuilders.Options(ctrl);
+		opt.TYPE = 'auth';
+		opt.query = ctrl.query;
+		opt.next = opt.callback;
+		opt.$callback = (err, response) => callback(null, response);
+		F.def.onAuthorize(opt);
+	} else
+		callback();
+}
+
 Controller.prototype.notmodified = function(date) {
 	var ctrl = this;
 	if (ctrl.headers['if-modified-since'] === date) {
@@ -1137,6 +1164,7 @@ function execute(ctrl, skipmiddleware) {
 
 				let schema = body.schema.split('/');
 				let endpoint = ctrl.route.api[schema[0]];
+
 				if (endpoint) {
 
 					if ((endpoint.auth === 1 && ctrl.user == null) || (endpoint.auth === 2 && ctrl.user)) {
@@ -1170,29 +1198,56 @@ function execute(ctrl, skipmiddleware) {
 
 						ctrl.params = params;
 						ctrl.query = query ? query.parseEncoded() : {};
+
+						if (body)
+							ctrl.body = body;
+
+						if (F.$events.controller) {
+							F.emit('controller', ctrl);
+							if (ctrl.iscanceled)
+								return;
+						}
+
 						let action = endpoint.action;
-						if (action) {
-							ctrl.body = body || {};
+						if (action)
 							action(ctrl);
-						} else
-							F.action(endpoint.actions, body || {}, ctrl).autorespond();
+						else
+							F.action(endpoint.actions, ctrl.body, ctrl).autorespond();
+
 						return;
 					}
 				}
 
-				ctrl.fallback(400, 'Invalid data');
 			}
+
+			ctrl.fallback(400, 'Invalid data');
+
 		} else {
+
+			if (F.$events.controller) {
+				/*
+					@Path: Framework
+					@Event: ON('controller', function(ctrl) { ... }); #ctrl {Controller};
+					The event captures all processed controllers on HTTP requests. The next processing can be canceled via the `ctrl.cancel()` method.
+				*/
+				F.emit('controller', ctrl);
+				if (ctrl.iscanceled)
+					return;
+			}
+
 			if (ctrl.route.actions) {
 				F.action(ctrl.route.actions, ctrl.body, ctrl).autorespond();
 			} else {
+
 				if (ctrl.route.view) {
 					ctrl.view(ctrl.route.view);
 					return;
 				}
+
 				let action = ctrl.route.action;
 				if (!action)
 					action = auto_view;
+
 				action(ctrl);
 			}
 		}

package/flow-flowstream.js

@@ -1467,6 +1467,9 @@ function init_worker(meta, type, callback) {
 
 	var forkargs = [F.directory, '--fork'];
 
+	if (F.config.$insecure)
+		forkargs.push('--insecure');
+
 	if (meta.memory)
 		forkargs.push('--max-old-space-size=' + meta.memory);
 
@@ -3323,7 +3326,12 @@ function makeunixsocket(id) {
 
 if (process.argv[1].endsWith('flow-flowstream.js')) {
 
-	isFLOWSTREAMWORKER = W.workerData || process.argv.indexOf('--fork') !== -1;
+	isFLOWSTREAMWORKER = W.workerData || process.argv.includes('--fork');
+
+	if (process.argv.includes('--insecure')) {
+		process.env.NODE_TLS_REJECT_UNAUTHORIZED = '1';
+		F.config.$insecure = true;
+	}
 
 	// Runs the worker
 	if (W.workerData) {

package/http.js

@@ -65,6 +65,19 @@ exports.listen = function(req, res) {
 	// Pending requests
 	F.temporary.pending.push(ctrl);
 
+	if (F.$events.request) {
+
+		/*
+			@Path: Framework
+			@Event: ON('request', function(ctrl) { ... }); #ctrl {Controller};
+			The event captures all incoming requests. The next processing can be canceled via the `ctrl.cancel()` method.
+		*/
+		F.emit('request', ctrl);
+
+		if (ctrl.iscanceled)
+			return;
+	}
+
 	if (ctrl.headers.origin && (F.def.onCORS || F.config.$cors)) {
 		if (F.TRouting.lookupcors(ctrl))
 			ctrl.$route();

package/index.js

@@ -36,7 +36,7 @@ global.DEF = {};
 
 	F.id = '';
 	F.clusterid = '';
-	F.is5 = F.version = 5000;
+	F.is5 = F.version = 5003;
 	F.isBundle = false;
 	F.isLoaded = false;
 	F.version_header = '5';

package/jsonschema.js

@@ -8,7 +8,7 @@ require('./index');
 
 const REG_NUMBER = /[\d,.]+/;
 const REG_COLOR = /^#([A-F0-9]{3}|[A-F0-9]{6}|[A-F0-9]{8})$/i;
-const REG_ICON = /^(ti|far|fab|fad|fal|fas|fa)?\s(fa|ti)-[a-z0-9-]+$/;
+const REG_ICON = /^(ti|tic|far|fab|fad|fal|fas|fa)?\s(fa|ti|tic)-[a-z0-9-]+$/;
 const REG_WSPACE = /\u00A0/g;
 
 function Value() {}

package/package.json

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

package/tms.js

@@ -101,7 +101,7 @@ function tmscontroller($) {
 				}
 			} else {
 				msg.error = true;
-				msg.data = new ErrorBuilder.push(404).output();
+				msg.data = new ErrorBuilder().push(404).output();
 				client.send(msg);
 			}
 		}
@@ -377,4 +377,4 @@ F.on('$tms', function() {
 		Cache.socket && Cache.socket.close(1000, 'Changed TMS secret');
 	}
 
-});
+});

package/websocket.js

@@ -110,7 +110,19 @@ Controller.prototype.upgrade = function(websocket) {
 	ctrl.socket.on('end', websocket_close);
 	ctrl.parent.add(ctrl);
 	websocket.online++;
-	F.$events.websocket_begin && F.emit('websocket_begin', ctrl.parent, ctrl);
+
+	// Deprecated:
+	// F.$events.websocket_begin && F.emit('websocket_begin', ctrl.parent, ctrl);
+
+	if (F.$events.websocket) {
+		/*
+			@Path: Framework
+			@Event: ON('websocket', function(ctrl) { ... }); #ctrl {Controller};
+			The event captures all incoming WebSocket connections. The next processing __can't be__ canceled via the `ctrl.cancel()` method.
+		*/
+		F.emit('websocket', ctrl);
+	}
+
 	ctrl.parent.$events.open && ctrl.parent.emit('open', ctrl);
 };