telos-server 1.0.17 → 1.0.19

package/package.json

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

package/serverUtils.js

@@ -1,3 +1,4 @@
+var net = require('net');
 var path = require("path");
 var virtualSystem = require("virtual-system");
 
@@ -275,6 +276,30 @@ function isHTTPJSON(json) {
 	return true;
 }
 
+function isPortFree(port) {
+
+	return new Promise((resolve, reject) => {
+
+		let server = net.createServer();
+
+		server.once('error', (err) => {
+
+			server.close();
+
+			resolve(false);
+		});
+
+		server.once('listening', () => {
+
+			server.close();
+
+			resolve(true);
+		});
+
+		server.listen(port);
+	});
+}
+
 function processRequest(request, protocol, callback) {
 
 	let text = null;
@@ -304,5 +329,6 @@ module.exports = {
 	getFileData,
 	getFiles,
 	isHTTPJSON,
+	isPortFree,
 	processRequest
 };

package/telosMiddleware.js

@@ -30,6 +30,8 @@ let fileTypes = [
 	'mp4'
 ];
 
+let apiCache = { };
+
 function middlewareFile(packet, file) {
 					
 	if(!fileTypes.includes(file.type) || file.type == "folder")
@@ -65,7 +67,14 @@ function middlewareJS(packet, file) {
 
 		try {
 
-			let response = use(file.file)(packet);
+			apiCache[file.file] =
+				apiCache[file.file] != null ?
+					apiCache[file.file] :
+					use(
+						virtualSystem.getResource(file.file), { dynamic: true }
+					);
+
+			let response = apiCache[file.file](packet);
 
 			return response != null ? response : { };
 		}

package/telosServer.js

@@ -155,14 +155,20 @@ var telosServer = {
 		let options = packet.content.options.options;
 		
 		if(options.port != false) {
+			
+			let port =
+				process.env.PORT || (options.port != null ? options.port : 80);
 
-			telosServer.server = http.createServer(telosServer.process);
+			serverUtils.isPortFree(port).then((free) => {
 
-			telosServer.server.listen(
-				process.env.PORT || (options.port != null ? options.port : 80)
-			);
+				if(!free)
+					return;
 
-			console.log("TELOS SERVER ON!");
+				telosServer.server = http.createServer(telosServer.process);
+				telosServer.server.listen(port);
+
+				console.log("TELOS SERVER ON!");
+			});
 		}
 	},
 	server: null,