@blaasvaer/frmwrk 0.1.14 → 0.1.15

package/handle-request.js

@@ -3,8 +3,7 @@
 const fs = require('fs');
 const path = require('path');
 const statics = require('serve-handler');
-const Url = require('url');
-const { findRoute, Router } = require('./router');
+const { findRoute } = require('./router');
 
 const content_types = {
 	"text" : 'text/plain; charset=utf-8',
@@ -19,23 +18,25 @@ const content_types = {
  * @return {Object}     Return the response
  */
 async function handleRequest( req, res ) {
-	// console.log("Cookies",req.headers);
-	const request_url = new URL( req.url, `http://${req.headers.host}`);
+	let method = req.method;
 
+	// console.log("handleRequest, req", req );
+	const request_url = new URL( req.url, `http://${req.headers.host}`);
+	// console.log("handleRequest, request_url", request_url);
 	/**
 	 * Set default status and header
 	 * @type {Number}
 	 */
 	let status_code = 200;
 	let content_type = 'html';
-
+	
 	// Prevent errors from missing favicon
 	if (request_url.pathname === '/favicon.ico') {
 		// TODO: Set theme dynamically
-		var favicon = path.join('themes/default', 'favicon.ico');
+		var favicon = path.join('assets/favicon', 'favicon.ico');
 		res.statusCode = 200;
 		res.setHeader('Content-Type', 'image/x-icon');
-
+		
 		if ( fs.existsSync( favicon ) ) {
 			fs.createReadStream( favicon ).pipe( res );
 			return;
@@ -43,13 +44,11 @@ async function handleRequest( req, res ) {
 			return;
 		}		
 	}
-
+	
 	/**
 	 * Find route in Router based on url
 	 */
-	//  const route = global.routes.find( ( obj ) => obj.route === FW.utils.removeTrailingSlashes( request_url.pathname ) );
-	const route = findRoute( request_url.pathname );
-// console.log("route", route);
+	const route = findRoute( request_url );
 	/**
 	 * Check for complete route
 	 * @param  {[type]} route [description]
@@ -62,48 +61,71 @@ async function handleRequest( req, res ) {
 		const controller = new Controller( route, req, res );
 
 		let response_output = 'Nothing here …';
-
-		if ( ! controller.route.params ) {
-			/**
-			 * If the route has no parameters, then just run the route method and serve whatever it may …
-			 */
-			response_output = await controller.route.action( route );
-		} else {
-			/**
-			 * Authorization
-			 */
-			if ( Authorize( controller.route ) ) {
-				response_output = await controller.route.action( route );
-			} else {
-				/**
-				 * Redirect the user to login if auth fails
-				 */
-				if ( controller.route.params.access.redirect ) {
-					status_code = 302;
-					res.setHeader( 'Location', controller.route.params.access.redirect );
+		
+		switch ( method ) {
+			case 'GET':
+		
+				if ( ! controller.route.params ) {
+					/**
+					 * If the route has no parameters, then just run the route method and serve whatever it may …
+					 */
+					response_output = await controller.view();
+				} else {
+					/**
+					 * Authorization
+					 */
+					if ( Authorize( controller.route ) ) {
+						response_output = await controller.view();
+					} else {
+						/**
+						 * Redirect the user to login if auth fails
+						 */
+						if ( controller.route.params.access.redirect ) {
+							status_code = 302;
+							res.setHeader( 'Location', controller.route.params.access.redirect );
+						}
+						// console.log("NO USER", controller.route.params.redirect);
+						// response_output = redirect.action.call();
+						// route.params.redirect.call();
+						// response_output = 'Access denied';
+					}
+					
+					if ( controller.route.params.type ) {
+						content_type = controller.route.params.type;
+					}
 				}
-				// console.log("NO USER", controller.route.params.redirect);
-				// response_output = redirect.action.call();
-				// route.params.redirect.call();
-				// response_output = 'Access denied';
-			}
+		
+				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 );
+				break;
+			case 'POST':
+			case 'PUT':
+				let data = '';
+				req.on('data', chunk => {
+				  data += chunk;
+				})
+				req.on('end', async () => {
+					res.statusCode = status_code;
+					res.setHeader( 'Content-Type', content_types[content_type] );
 			
-			if ( controller.route.params.type ) {
-				content_type = controller.route.params.type;
-			}
-		}
+					// Cookies
+					res.setHeader('Set-Cookie','uuid=1234-1324-1234-1234-1234; Max-Age=3000; SameSite=lax; Secure');
 
-		res.statusCode = status_code;
-		res.setHeader( 'Content-Type', content_types[content_type] );
+					response_output = await controller.view( data );
 
-		// 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 );
+					res.end( response_output );
+				})
+				break;
+			}
 	} else if ( request_url.pathname.split('/')[1] == 'assets' ) {
 		/**
 		 * Serve static files from public directory

package/index.js

@@ -61,15 +61,30 @@ FW = function ( config ) {
 	 * @param {object} res  The response object
 	 */
 	Controller = function Controller ( route, req, res ) {
-// console.log("Controller in index:\n", _this);
+// console.log("Controller in index (req.method):\n", req.method);
+// console.log("Controller in index (req):\n", req);
 		this.route = route;
 		this.req = req;
 		this.res = res;
+		this.route.method = req.method;
+
+		/**
+		 * Return view
+		 */
+		this.view = async function ( data = null ) {
+			route.data = data;
+			route.req = this.req;
+			route.res = this.res;
+			let output = await route.action( route );
+
+			return output;
+		}
 
 		/**
 		 * Check for authorization parameters.
 		 */
 		if ( route.params !== null ) {
+// console.log("Params not null", route.params);
 			if ( route.params.access !== undefined ) {
 console.log("This route should be authorized!");
 			}

package/models.js

@@ -4,7 +4,6 @@ const utils = require('./utils');
  * Install Models
  */
 function installModels ( config ) {
-// console.log("Installing models …", config);
 	let models_dir = config.root + '/models/';
 
 	return utils.readdirAsync( models_dir )

package/package 2.json

@@ -0,0 +1,30 @@
+{
+  "name": "@blaasvaer/frmwrk",
+  "version": "0.1.14",
+  "description": "My personal Node framework",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "patch": "npm version patch --force && npm publish",
+    "major": "npm version major --force && npm publish",
+    "minor": "npm version minor --force && npm publish"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@bitbucket.org/blaasvaer/frmwrk.git"
+  },
+  "keywords": [
+    "Node",
+    "Framework",
+    "Homebrew"
+  ],
+  "author": "Sam Blåsvær",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://bitbucket.org/blaasvaer/frmwrk/issues"
+  },
+  "homepage": "https://bitbucket.org/blaasvaer/frmwrk#readme",
+  "dependencies": {
+    "serve-handler": "^6.1.3"
+  }
+}

package/package.json

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

package/router.js

@@ -1,3 +1,5 @@
+const url = require('url');
+
 /**
  * This is the router for the fw framework.
  * 
@@ -30,7 +32,7 @@ global.ROUTE = function ( route, action, params = null ) {
 
 function Router ( req, url ) {
 	const method = req.method;
-	console.log("Router url:", url);
+	// console.log("Router url:", url);
 	// Split url into array
 	let url_array = url.pathname.split('/');
 
@@ -56,18 +58,22 @@ function Router ( req, url ) {
 };
 
 function findRoute ( url ) {
+	let pathname = url.pathname;
+	// console.log( "ROUTE, url", url );
+
+	// console.log("THIS", this);
 	// Check if route exist
-	let route = global.routes.find( ( obj ) => obj.route === FW.utils.removeTrailingSlashes( url ) );
+	let route = global.routes.find( ( obj ) => obj.route === FW.utils.removeTrailingSlashes( pathname ) );
 
 	if ( route ) {
 // console.log("Route defined", url);
 		// Execute action for route
 		return route;
 	} else {
-		const url_array = url.split('/').filter( e => e );
+		const url_array = pathname.split('/').filter( e => e );
 		
 		// Check if route is an API call
-		let isAPICall = url.split('/')[1] === 'api' ? true : false;
+		let isAPICall = pathname.split('/')[1] === 'api' ? true : false;
 		
 		if ( isAPICall ) {
 // console.log("Route NOT defined (API)", url, url.split('/')[1]);
@@ -98,15 +104,17 @@ function findRoute ( url ) {
 				break;
 			}
 
-			let regex_result = url.match(regex);
-			let regex_groups = regex_result.groups;
+			let regex_result = pathname.match(regex);
 
-			route.resource = regex_groups.resource;
-			route.resource_id = regex_groups.id;
+			if ( regex_result ) {
+				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 ) );
+			return global.routes.find( ( obj ) => obj.route === FW.utils.removeTrailingSlashes( pathname ) );
 		}
 	}
 }