@blaasvaer/frmwrk 0.1.7 → 0.1.8

package/.vscode/settings.json

@@ -13,7 +13,13 @@
 		"titleBar.activeBackground": "#215732",
 		"titleBar.activeForeground": "#e7e7e7",
 		"titleBar.inactiveBackground": "#21573299",
-		"titleBar.inactiveForeground": "#e7e7e799"
+		"titleBar.inactiveForeground": "#e7e7e799",
+		"editorGroup.border": "#2f7c47",
+		"panel.border": "#2f7c47",
+		"sash.hoverBorder": "#2f7c47",
+		"sideBar.border": "#2f7c47",
+		"statusBarItem.remoteBackground": "#215732",
+		"statusBarItem.remoteForeground": "#e7e7e7"
 	},
 	"peacock.color": "#215732"
 }

package/connections.js

@@ -1,4 +1,3 @@
-const path = require('path');
 const utils = require('./utils');
 
 /**
@@ -23,17 +22,23 @@ function installconnections ( config ) {
 
 				let connection = require( connections_dir + file );
 
-				FW.connections[ path.parse(file).name ] = connection;
-
-				// Check for config connection type
-				if ( config.connection && FW.connections[ config.connection ] ) {
-					FW.database = FW.connections[ config.connection ];
+				if ( connection ) {
+					// FW.connections[ path.parse(file).name ] = connection;
+					FW.connections[ file.split('.')[0] ] = connection;
+	
+					// Check for config connection type
+					if ( config.connection && FW.connections[ config.connection ] ) {
+						FW.database = FW.connections[ config.connection ];
+					}
+	
+					resolve( file );
+				} else {
+					reject( "Loading of connection: " + file + " failed!" );
 				}
 			});
 
 			connection_files.push( promise );
 		});
-// console.log("connection file require()", FW.connections);
 
 		return Promise.all( connection_files );
 	});

package/controllers.js

@@ -1,10 +1,9 @@
-const utils = require('./utils');
+const utils = require('@blaasvaer/frmwrk/utils');
 
 /**
  * Install Controllers
  */
 function installControllers ( config ) {
-// console.log("Installing controllers …", config);
 	let controllers_dir = config.root + '/controllers/';
 
 	return utils.readdirAsync( controllers_dir )
@@ -38,7 +37,7 @@ function installControllers ( config ) {
 
 			controller_files.push( promise );
 		});
-// console.log("This controllers: ", this.controllers);
+
 		return Promise.all( controller_files );
 	});
 }

package/handle-request.js

@@ -3,6 +3,8 @@
 const fs = require('fs');
 const path = require('path');
 const statics = require('serve-handler');
+const Url = require('url');
+const { findRoute, Router } = require('./router');
 
 const content_types = {
 	"text" : 'text/plain; charset=utf-8',
@@ -17,14 +19,8 @@ const content_types = {
  * @return {Object}     Return the response
  */
 async function handleRequest( req, res ) {
-	/**
-	 * TEMP
-	 * @type {[type]}
-	 */
-	const SOME_CONTROLLER_EXISTS = true;
-	const method = req.method;
-	const url = FW.utils.removeTrailingSlashes( req.url );
-	const query = url.split('/').splice(3); // Get url parts as parameters
+	// console.log("Cookies",req.headers);
+	const request_url = new URL( req.url, `http://${req.headers.host}`);
 
 	/**
 	 * Set default status and header
@@ -34,14 +30,11 @@ async function handleRequest( req, res ) {
 	let content_type = 'html';
 
 	// Prevent errors from missing favicon
-	if (url === '/favicon.ico') {
-		/**
-		 * TODO: Set theme dynamically
-		 */
+	if (request_url.pathname === '/favicon.ico') {
+		// TODO: Set theme dynamically
 		var favicon = path.join('themes/default', 'favicon.ico');
 		res.statusCode = 200;
 		res.setHeader('Content-Type', 'image/x-icon');
-		// const icon = fs.createReadStream( favicon );
 
 		if ( fs.existsSync( favicon ) ) {
 			fs.createReadStream( favicon ).pipe( res );
@@ -54,9 +47,9 @@ async function handleRequest( req, res ) {
 	/**
 	 * Find route in Router based on url
 	 */
-	const route = global.routes.find(( obj ) => obj.route === url);
-	const controller = url.split('/')[1];
-
+	//  const route = global.routes.find( ( obj ) => obj.route === FW.utils.removeTrailingSlashes( request_url.pathname ) );
+	const route = findRoute( request_url.pathname );
+// console.log("route", route);
 	/**
 	 * Check for complete route
 	 * @param  {[type]} route [description]
@@ -66,26 +59,7 @@ async function handleRequest( req, res ) {
 		/**
 		 * Create new controller from route
 		 */
-		const controller = new Controller( route, req, res, query );
-
-		/**
-		 * TODO
-		 * Figure out how to receive data and handle it properly (in a general and robust way) in routing
-		 */
-		
-		/**
-		 * Prepare body
-		 * @type {String}
-		 */
-		let body = '';
-
-		req.on('data', ( chunk ) => {
-			body += chunk;
-		});
-
-		req.on('end', () => {
-			controller.addBody( body );
-		})
+		const controller = new Controller( route, req, res );
 
 		let response_output = 'Nothing here …';
 
@@ -93,13 +67,13 @@ async function handleRequest( req, res ) {
 			/**
 			 * If the route has no parameters, then just run the route method and serve whatever it may …
 			 */
-			response_output = await controller.route.action();
+			response_output = await controller.route.action( route );
 		} else {
 			/**
 			 * Authorization
 			 */
 			if ( Authorize( controller.route ) ) {
-				response_output = await controller.route.action();
+				response_output = await controller.route.action( route );
 			} else {
 				/**
 				 * Redirect the user to login if auth fails
@@ -121,8 +95,16 @@ async function handleRequest( req, res ) {
 
 		res.statusCode = status_code;
 		res.setHeader( 'Content-Type', content_types[content_type] );
+
+		// Cookies
+		res.setHeader('Set-Cookie','uuid=1234-1324-1234-1234-1234; Max-Age=3000; SameSite=lax; Secure');
+		// Set a same-site cookie for first-party contexts
+		// res.cookie('cookie1', 'value1', { sameSite: 'lax' });
+		// Set a cross-site cookie for third-party contexts
+		// res.cookie('cookie2', 'value2', { sameSite: 'none', secure: true });
+
 		res.end( response_output );
-	} else if ( url.split('/')[1] == 'themes' ) {
+	} else if ( request_url.pathname.split('/')[1] == 'themes' ) {
 		/**
 		 * Serve static files from public directory
 		 */
@@ -136,7 +118,7 @@ async function handleRequest( req, res ) {
 	} else {
 		res.statusCode = 404;
 		res.setHeader('Content-Type', 'text/plain; charset=utf-8' );
-		res.end("404 – Page not found: " + url + ".\n\nDo you have a controller with an action for that route?");
+		res.end("404 – Page not found: " + request_url + ".\n\nDo you have a controller with an action for that route?");
 	}
 }
 

package/index.js

@@ -10,19 +10,17 @@
  * Native modules
  */
 const http = require('http');
-
 /**
  * Custom modules
  */
 const handleRequest = require('./handle-request');
-const router = require('./router');
 const Utils = require('./utils');
 
 /**
  * Define variables
  */
 let hostname,
-	server;
+server;
 
 /**
  * If port number is passed in as first (custom) parameter, set port
@@ -40,20 +38,21 @@ if ( process.env.NODE_ENV !== 'production') {
  * @param  {object} config The configuration object
  * @return {Node}        Node
  */
-	FW = function ( config ) {
+FW = function ( config ) {
+	let _this = this;
+
 	hostname = config.hostname ? config.hostname : '127.0.0.1';
 
-	this.controllers = [];
-	this.models = [];
+	controllers = {};
+	models = {};
 
 	/**
 	 * Create and start the server
 	 * @return {function} Server instance
 	 */
-	http.createServer( handleRequest ).listen(port, hostname, () => {
+	 http.createServer( handleRequest ).listen(port, hostname, () => {
 		console.log(`Server running at http://${hostname}:${port}`);
 	});
-// console.log("This.server:", this.server);
 
 	/**
 	 * Set the Controller
@@ -61,11 +60,11 @@ if ( process.env.NODE_ENV !== 'production') {
 	 * @param {object} req  The incomming request object
 	 * @param {object} res  The response object
 	 */
-	Controller = function Controller ( route, req, res, query ) {
+	Controller = function Controller ( route, req, res ) {
+// console.log("Controller in index:\n", _this);
 		this.route = route;
 		this.req = req;
 		this.res = res;
-		this.query = query;
 
 		/**
 		 * Check for authorization parameters.
@@ -75,32 +74,31 @@ if ( process.env.NODE_ENV !== 'production') {
 console.log("This route should be authorized!");
 			}
 		}
-		
+			
 		return this;
 	}
 
-	Controller.prototype.addBody = function addBody ( body ) {
-		this.body = body;
-console.log("Controller.addBody:", this.body);
-	}
-
 	/**
-	 * Authorize user
+	 * TODO: Authorize user
 	 */
 	Authorize = function Authorize ( credentials ) {
-// console.log("Authorize - credentials:", credentials, this);
+// console.log("Authorize - check credentials:", credentials);
 		return true;
 	}
 
 	/**
 	 * Install framework components and start the server
 	 */
-	Install( config ).then(() => {
+	Install( config )
+	.then(( result ) => {
 		/**
 		 * Run post install processes here …
 		 */
-	});
-// console.log("This:", this);
+// console.log("Install result:", routes);
+		})
+	.catch(function( err ) {
+console.log("Install Error:", err);
+	});;
 };
 
 /**
@@ -125,15 +123,7 @@ global.Install = function Install ( config ) {
 		// require('./users')( config )
 	];
 
-	return Promise.all( install_processes )
-	.then(function( result ) {
-console.log("Install result", result);
-// console.log("Routes", global.routes );
-// console.log("User:", global.users );
-	})
-	.catch(function( err ) {
-console.log("Install Error:", err);
-	});
+	return Promise.all( install_processes );
 }
 
 FW.utils = Utils;

package/models.js

@@ -43,7 +43,7 @@ function installModels ( config ) {
 
 			model_files.push( promise );
 		});
-// console.log("This models: ", this.models);
+
 		return Promise.all( model_files );
 	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@blaasvaer/frmwrk",
-	"version": "0.1.7",
+	"version": "0.1.8",
 	"description": "My personal Node framework",
 	"main": "index.js",
 	"scripts": {

package/router.js

@@ -1,5 +1,5 @@
 /**
- * This is the router for the F framework.
+ * This is the router for the fw framework.
  * 
  * @author Sam Blåsvær <sam@blaasvaer.dk>
  * Version 1.0.0
@@ -10,16 +10,108 @@ global.routes = [];
 global.ROUTE = function ( route, action, params = null ) {
 	let r = {
 		"controller": route.split('/')[1] == '' ? 'index' : route.split('/')[1],
+		"resource": route.split('/')[2] == '' ? 'index' : route.split('/')[2],
+		"resource_id": route.split('/')[3] == '' ? 'index' : route.split('/')[3],
 		"route": route,
 		"action": action,
 		"params": params,
 	}
-// console.log("Router params:", params);
+	// console.log("Router params:", params?.type);
+	// console.log("----------------------");
+	// console.log("Router route:", route);
+	// console.log("Router controller:", r.controller);
+	// console.log("Router resource:", r.resource);
+	// console.log("Router resource_id:", r.resource_id);
+	// console.log("Router route:", r.route);
+	// console.log("Router action:", r.action);
+	// console.log("Router params:", r.params);
 	global.routes.push( r );
 };
 
-let Router = function () {
-	// console.log("Router");
+function Router ( req, url ) {
+	const method = req.method;
+	console.log("Router url:", url);
+	// Split url into array
+	let url_array = url.pathname.split('/');
+
+	// Remove first empty element
+	url_array.shift();
+
+	// Set controller, resource, resource_id, search, searchParams
+	this.controller 	= url_array[0];
+	this.resource 		= url_array[1];
+	this.resource_id 	= url_array[2];
+	this.search 		= url_array[3];
+	this.searchParams 	= url_array[4];
+
+	// console.log("referer", referer);
+	// console.log("url", url);
+	// console.log("this.controller", this.controller);
+	// console.log("this.resource", this.resource);
+	// console.log("this.resource_id", this.resource_id);
+	// console.log("this.search", this.search);
+	// console.log("this.searchParams", this.searchParams);
+
+	return this;
 };
 
-module.exports = new Router();
+function findRoute ( url ) {
+	// Check if route exist
+	let route = global.routes.find( ( obj ) => obj.route === FW.utils.removeTrailingSlashes( url ) );
+
+	if ( route ) {
+// console.log("Route defined", url);
+		// Execute action for route
+		return route;
+	} else {
+		const url_array = url.split('/').filter( e => e );
+		
+		// Check if route is an API call
+		let isAPICall = url.split('/')[1] === 'api' ? true : false;
+		
+		if ( isAPICall ) {
+// console.log("Route NOT defined (API)", url, url.split('/')[1]);
+			/**
+			 * If checking for UUID use:
+			 * UUID v1:
+			 * /^[0-9A-F]{8}-[0-9A-F]{4}-[1][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
+			 * UUID v2:
+			 * /^[0-9A-F]{8}-[0-9A-F]{4}-[2][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
+			 * UUID v3:
+			 * /^[0-9A-F]{8}-[0-9A-F]{4}-[3][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
+			 * UUID v4:
+			 * /^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
+			 * UUID v5:
+			 * /^[0-9A-F]{8}-[0-9A-F]{4}-[5][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
+			 */
+			
+			let regex = /()/;
+			
+			switch ( url_array.length ) {
+			case 2:
+				regex = /api\/(?<resource>[a-z_]+)/; // match /api/<resource>
+				route = global.routes.find( ( obj ) => obj.route === '/api/:resources' );
+				break;
+			case 3:
+				regex = /api\/(?<resource>[a-z_]+)\/(?<id>[0-9]+)/; // match /api/<resource>/<id>
+				route = global.routes.find( ( obj ) => obj.route === '/api/:resources/:id' );
+				break;
+			}
+
+			let regex_result = url.match(regex);
+			let regex_groups = regex_result.groups;
+
+			route.resource = regex_groups.resource;
+			route.resource_id = regex_groups.id;
+
+			return route;
+		} else {
+			return global.routes.find( ( obj ) => obj.route === FW.utils.removeTrailingSlashes( url ) );
+		}
+	}
+}
+
+module.exports = {
+	Router,
+	findRoute
+}

package/views.js

@@ -13,6 +13,7 @@
  */
 const { readdir, readFile, stat } = require("fs").promises;
 const { basename, join } = require("path");
+
 /**
  * 3rd party modules
  */
@@ -22,7 +23,7 @@ const htmlclean = require('htmlclean');
 /**
  * Custom modules
  */
-const utils = require('./utils');
+const utils = require('@blaasvaer/frmwrk/utils');
 
 /**
  * Compile views on application initialization.
@@ -35,7 +36,12 @@ function Views ( config ) {
 	.isFile()
 	? readFile( path )
 	.then(function ( template ) {
-		let tpl = 'Handlebars.template(' + Handlebars.precompile( htmlclean( template.toString() ) ) + ')';
+		let tpl = 'Handlebars.template(' + Handlebars.precompile(  template.toString() ) + ')';
+
+		if ( config.compress_html ) {
+			tpl = 'Handlebars.template(' + Handlebars.precompile( htmlclean( template.toString() ) ) + ')';
+		}
+		
 		return eval( tpl );
 	})
 	.catch(function ( err ) {
@@ -56,7 +62,6 @@ function Views ( config ) {
 	dir2obj ( views_dir )
 	.then( function ( output ) {
 		global.views = output;
-// console.log('global.views:', global.views);
 	})
 }