telos-server 1.0.13 → 1.0.14

package/package.json

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

package/serverUtils.js

@@ -1,5 +1,5 @@
-var fs = require("fs");
 var path = require("path");
+var virtualSystem = require("virtual-system");
 
 var extensionTypes = {
 	'txt': 'text/plain',
@@ -43,16 +43,23 @@ function getAllFiles(directory) {
 		return items;
 	}
 
-	fs.readdirSync(directory).forEach(value => {
-		
-		value = directory + path.sep + value;
+	directory = directory.split(":\\").join("://").split("\\").join("/");
 
-		if(fs.statSync(value).isFile())
-			items[value] = getFileData(value);
+	let contents = virtualSystem.getResource(directory);
 
-		else
-			Object.assign(items, getAllFiles(value));
-	})
+	if(!Array.isArray(contents))
+		return;
+
+	contents[0].forEach(item => {
+		Object.assign(items, getAllFiles(directory + path.sep + item));
+	});
+
+	contents[1].forEach(item => {
+
+		item = directory + path.sep + item;
+
+		items[item] = getFileData(item);
+	});
 
 	return items;
 }
@@ -92,7 +99,7 @@ function getFileData(file) {
 
 	return {
 		file: file,
-		folder: fs.lstatSync(file).isDirectory(),
+		folder: Array.isArray(virtualSystem.getResource(file)),
 		meta: file.split(/[\/\\]/).map(item =>
 			item.split(".").slice(1).reduce(
 				(value, item) => {
@@ -127,7 +134,16 @@ function getFiles(items, paths) {
 
 			try {
 
-				fs.readdirSync(file).forEach(item => {
+				file = file.split(":\\").join("://").split("\\").join("/");
+
+				let contents = virtualSystem.getResource(file);
+
+				if(!Array.isArray(contents))
+					return;
+
+				contents = contents[0].concat(contents[1]);
+
+				contents.forEach(item => {
 
 					if(item.toLowerCase().startsWith(alias.toLowerCase()))
 						files.push(file + path.sep + item);
@@ -145,8 +161,17 @@ function getFiles(items, paths) {
 		paths.forEach(file => {
 
 			try {
-		
-				fs.readdirSync(file).forEach(item => {
+
+				file = file.split(":\\").join("://").split("\\").join("/");
+
+				let contents = virtualSystem.getResource(file);
+
+				if(!Array.isArray(contents))
+					return;
+
+				contents = contents[0].concat(contents[1]);
+
+				contents.forEach(item => {
 		
 					if(item.toLowerCase().startsWith("index"))
 						files.push(file + path.sep + item);

package/telosMiddleware.js

@@ -1,6 +1,5 @@
-var fs = use("fs");
-var path = use("path");
 var pup = require("universal-preprocessor");
+var virtualSystem = require("virtual-system");
 
 let extensionTypes = {
 	'txt': 'text/plain',
@@ -49,23 +48,14 @@ function middlewareFolder(packet, file) {
 	
 	if(file.type != "folder")
 		return;
-	
-	let result = [[], []];
-
-	fs.readdirSync(file.file).forEach(item => {
-
-		result[
-			fs.lstatSync(
-				file.file + path.sep + item
-			).isDirectory() ? 0 : 1
-		].push(item);
-	})
 
 	return {
 		headers: {
 			"Content-Type": "text/json"
 		},
-		body: JSON.stringify(result, null, "\t")
+		body: JSON.stringify(
+			virtualSystem.getResource(file.file), null, "\t"
+		)
 	}
 }
 
@@ -109,7 +99,10 @@ function middlewareJS(packet, file) {
 				<script>
 
 					${preprocess(
-						fs.readFileSync(file.file, "utf-8")
+						virtualSystem.getResource(
+							file.file.
+								split(":\\").join("://").split("\\").join("/")
+						)
 					)}
 
 				</script>
@@ -129,11 +122,10 @@ function middlewareJS(packet, file) {
 					var vision = use("kaeon-united")("vision");
 
 					vision.extend(JSON.parse("${
-						JSON.stringify(
-							preprocess(
-								fs.readFileSync(file.file, "utf-8")
-							)
-						)
+						JSON.stringify(preprocess(virtualSystem.getResource(
+							file.file.
+								split(":\\").join("://").split("\\").join("/")
+						)))
 					}");
 
 				</script>
@@ -152,7 +144,9 @@ function middlewareText(packet, file) {
 			"Content-Type": extensionTypes[file.type]
 		},
 		body: preprocess(
-			fs.readFileSync(file.file, "utf-8")
+			virtualSystem.getResource(
+				file.file.split(":\\").join("://").split("\\").join("/")
+			)
 		)
 	}
 }

package/telosRouter.js

@@ -1,6 +1,7 @@
 var apint = require("apint");
 var path = require("path");
 var serverUtils = require("./serverUtils.js");
+var virtualSystem = require("virtual-system");
 
 var telosRouter = {
 	config: {
@@ -19,9 +20,13 @@ var telosRouter = {
 				if(packet.tags != null) {
 
 					if(packet.tags.length == 1 &&
-						packet.tags[0] == "telos-engine") {
+						(packet.tags[0] == "telos-engine" ||
+							packet.tags[0] == "telos-engine-refresh")) {
 					
-						telosRouter.tasks = telosRouter.tasks != null ?
+						telosRouter.tasks = (
+							telosRouter.tasks != null &&
+							packet.tags[0] == "telos-engine"
+						) ?
 							telosRouter.tasks :
 							Object.values(
 								serverUtils.getAllFiles(
@@ -37,10 +42,17 @@ var telosRouter = {
 								item => item.file
 							);
 
+						if(packet.tags[0] == "telos-engine-refresh")
+							return;
+
 						telosRouter.tasks.forEach(item => {
 
 							try {
-								use(item)();
+								
+								use(
+									virtualSystem.getResource(item),
+									{ dynamic: true }
+								)();
 							}
 
 							catch(error) {
@@ -94,7 +106,7 @@ var telosRouter = {
 			}
 
 			catch(error) {
-
+				console.log(error);
 			}
 		}
 

package/telosServer.js

@@ -3,6 +3,7 @@ var fs = require("fs");
 var http = require("http");
 var https = require("https");
 var busNet = use("bus-net");
+var virtualSystem = require("virtual-system");
 
 var telosServer = {
 	process: ((request, response) => {
@@ -149,6 +150,8 @@ var telosServer = {
 			return;
 		}
 
+		virtualSystem.initiateVirtualSystemDefault();
+
 		let options = packet.content.options.options;
 		
 		if(options.port != false) {