telos-server 1.0.10 → 1.0.12

package/README.md

@@ -9,10 +9,11 @@ which operates on a declarative file system based CMS.
 
 ## 2 - Contents
 
-### 2.1 - Content
+### 2.1 - Telos Folder
 
-Telos Server shall source its content and endpoints from a folder on disk, which by default shall
-be called "telos", and shall be stored in the same directory the server process runs from.
+Telos Server shall source its content and endpoints from a Telos folder, stored on disk, which by
+default shall be called "telos", and shall be stored in the same directory the server process runs
+from.
 
 File names in the telos folder shall have their names segmented into chunks by periods, with the
 first chunk specifying the name of the file, the last chunk specifying the extension, and each
@@ -57,15 +58,41 @@ blank response.
 
 If a file has the property "private", it shall be inaccessible from the client.
 
-##### 2.1.2.3 - Universal Preprocessor
+##### 2.1.2.3 - Task
+
+If a JS file has the property "task", it shall serve as a script in a persistent background
+process. It shall use Common JS to assign as the module exports a single function which, at regular
+intervals, shall be invoked by an event handler responsive to the Telos engine.
+
+##### 2.1.2.4 - Universal Preprocessor
 
 If a file has the property "pup", it will be processed by the
 [Universal Preprocessor](https://github.com/Telos-Project/Universal-Preprocessor) before being
 fetched.
 
-### 2.2 - Usage
+### 2.2 - Telos Engine
+
+The Telos engine is a background process embedded in an associated bus module, which is integrated
+into, but may be used independently of, Telos Server.
+
+The Telos engine, at regular intervals, calls the bus net of Telos Origin with the following
+object:
+
+    { tags: ["telos-engine"] }
+
+The Telos engine also stores a reference to the initialization call object of Telos Origin, which
+shall be returned from the Telos engine bus module query function if the following object is passed
+to it:
+
+    { tags: ["telos-configuration"] }
+
+The default interval for the Telos engine is 60 times per second. This may be altered using a
+number assigned to the content.options.options.engineInterval field in the initialization call
+object of Telos Origin specifying how long in seconds to wait between each interval.
+
+### 2.3 - Usage
 
-#### 2.2.1 - Setup
+#### 2.3.1 - Setup
 
 First, create a folder for your project. Within this folder, create your "telos" folder, and
 populate it with the content you intend to serve.
@@ -83,12 +110,12 @@ the following command before uploading your project:
 
     npx telos-origin -m wrap
 
-#### 2.2.2 - Configuration
+#### 2.3.2 - Configuration
 
 The default port can be reconfigured with a Telos Config utility with the desired port specified as
 a numerical field in the properties with the alias "port".
 
-#### 2.2.3 - Middleware
+#### 2.3.3 - Middleware
 
 Telos Server may be extended through middleware referenced in the Telos Origin APInt.
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "telos-server",
-	"version": "1.0.10",
+	"version": "1.0.12",
 	"description": "An Extensible CMS Server for Telos Origin.",
 	"main": "telosServer.json",
 	"dependencies": {

package/telosMiddleware.js

@@ -1,7 +1,6 @@
 var fs = use("fs");
 var path = use("path");
 var pup = require("universal-preprocessor");
-var pupLangs = require("universal-preprocessor/pupLangs");
 
 let extensionTypes = {
 	'txt': 'text/plain',
@@ -161,7 +160,7 @@ function middlewareText(packet, file) {
 function preprocess(string, file) {
 
 	return (file != null ? file.meta.pup != null : true) ?
-		pup.preprocess(pupLangs, string) : string;
+		pup.preprocess(string) : string;
 }
 
 module.exports = {

package/telosServer.js

@@ -9,102 +9,127 @@ var telosServer = {
 
 		serverUtils.processRequest(request, "http", (data) => {
 
-			let responses = busNet.call(data);
+			(new Promise((resolve, reject) => {
 
-			let status = 200;
+				let results = busNet.call(data);
+				let responses = [];
 
-			let headers = {
-				'Content-Type': 'text/plain',
-				'Access-Control-Allow-Origin': '*',
-				'Access-Control-Allow-Methods': 'GET,PUT,POST,DELETE'
-			};
+				results.forEach(item => {
 
-			let body = [];
-			let file = false;
+					if(item instanceof Promise) {
 
-			let max = -Infinity;
+						item.then((result => {
 
-			responses.filter(item => item != null).forEach(item => {
+							responses.push(result);
 
-				item.priority = item.priority != null ? item.priority : 0;
+							if(responses.length == results.length)
+								resolve(responses);
+						}));
+					}
+					
+					else
+						responses.push(item);
 
-				if(item.priority > max)
-					max = item.priority;
-			});
+					if(responses.length == results.length)
+						resolve(responses);
+				});
+			})).then((responses) => {
 
-			responses.filter(
-				item => {
+				let status = 200;
 
-					if(item == null)
-						return
+				let headers = {
+					'Content-Type': 'text/plain',
+					'Access-Control-Allow-Origin': '*',
+					'Access-Control-Allow-Methods': 'GET,PUT,POST,DELETE'
+				};
 
-					if(item.priority != max)
-						return false;
+				let body = [];
+				let file = false;
 
-					delete item.priority;
+				let max = -Infinity;
 
-					if(typeof item == "object") {
+				responses.filter(item => item != null).forEach(item => {
 
-						if(item.file != null) {
-							
-							if(item.file)
-								file = true;
+					item.priority = item.priority != null ? item.priority : 0;
+
+					if(item.priority > max)
+						max = item.priority;
+				});
+
+				responses.filter(
+					item => {
+
+						if(item == null)
+							return
 
-							delete item.file;
+						if(item.priority != max)
+							return false;
+
+						delete item.priority;
+
+						if(typeof item == "object") {
+
+							if(item.file != null) {
+								
+								if(item.file)
+									file = true;
+
+								delete item.file;
+							}
 						}
+						
+						return serverUtils.isHTTPJSON(item);
 					}
-					
-					return serverUtils.isHTTPJSON(item);
-				}
-			).filter(
-				item => item.request == null
-			).forEach(item => {
+				).filter(
+					item => item.request == null
+				).forEach(item => {
 
-				if(item.response != null) {
+					if(item.response != null) {
 
-					if(item.response.status != null) {
+						if(item.response.status != null) {
 
-						if(item.response.status > status)
-							status = item.response.status;
+							if(item.response.status > status)
+								status = item.response.status;
+						}
 					}
-				}
 
-				if(item.headers != null)
-					Object.assign(headers, item.headers);
+					if(item.headers != null)
+						Object.assign(headers, item.headers);
 
-				if(item.body != null)
-					body.push("" + item.body);
-			});
+					if(item.body != null)
+						body.push("" + item.body);
+				});
 
-			response.writeHead(status, headers);
+				response.writeHead(status, headers);
 
-			if(file) {
+				if(file) {
 
-				if(body.length > 0) {
+					if(body.length > 0) {
 
-					fs.readFile(body[0], function(error, data) {
+						fs.readFile(body[0], function(error, data) {
 
-						if(error) {
-							response.statusCode = 500;
-							response.end(`ERROR: ${error}.`);
-						}
-						
-						else
-							response.end(data);
-					});
+							if(error) {
+								response.statusCode = 500;
+								response.end(`ERROR: ${error}.`);
+							}
+							
+							else
+								response.end(data);
+						});
+					}
 				}
-			}
 
-			else {
+				else {
 
-				if(body.length == 1)
-					response.write(body[0]);
-	
-				else if(body.length > 1)
-					response.write(JSON.stringify(body));
-	
-				response.end();
-			}
+					if(body.length == 1)
+						response.write(body[0]);
+		
+					else if(body.length > 1)
+						response.write(JSON.stringify(body));
+		
+					response.end();
+				}
+			});
 		});
 	}),
 	query: (packet) => {