@blaasvaer/frmwrk 0.1.18 → 0.1.19

package/handle-request.js

@@ -5,8 +5,6 @@ const path = require('path');
 const statics = require('serve-handler');
 const { findRoute } = require('./router');
 
-let headers = {};
-
 const content_types = {
 	"text" : 'text/plain; charset=utf-8',
 	"html" : 'text/html; charset=utf-8',
@@ -51,6 +49,7 @@ async function handleRequest( req, res ) {
 	 * Find route in Router based on url
 	 */
 	const route = findRoute( request_url );
+
 	/**
 	 * Check for complete route
 	 * @param  {[type]} route [description]
@@ -60,23 +59,11 @@ async function handleRequest( req, res ) {
 		/**
 		 * Create new controller from route
 		 */
-		const controller = new Controller( route, req, res );
+		const controller = new Controller( route, req, res, request_url );
 
 		let response_output = 'Nothing here …';
-		
+
 		switch ( method ) {
-			case 'OPTIONS': // CORS request
-				headers = {
-					"Access-Control-Allow-Origin": "http://localhost",
-					"Access-Control-Allow-Methods": "OPTIONS, POST, GET, PUT, DELETE",
-					"Access-Control-Max-Age": 2592000, // 30 days // 86400, // 24 hours
-					"Access-Control-Allow-Credentials": false,
-					"Access-Control-Allow-Headers": "X-Requested-With, X-HTTP-Method-Override, Content-Type, Accept"
-					/** add other headers as per requirement */
-				};
-				res.writeHead(204, headers);
-				res.end();
-				return;
 			case 'GET':
 				if ( ! controller.route.params ) {
 					/**
@@ -138,11 +125,7 @@ async function handleRequest( req, res ) {
 			
 					// Cookies
 					res.setHeader( 'Set-Cookie','uuid=1234-1324-1234-1234-1234; Max-Age=3000; SameSite=lax; Secure' );
-
-					// CORS
 					res.setHeader( 'Access-Control-Allow-Methods', 'GET, POST, PATCH, PUT, DELETE, OPTIONS' );
-					res.setHeader( 'Access-Control-Allow-Origin', 'http://localhost');
-					res.setHeader( 'Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept');
 					// res.setHeader( 'Content-Security-Policy', "default-src 'self'; img-src 'self';");
 
 					response_output = await controller.view( data );

package/index.js

@@ -60,12 +60,11 @@ FW = function ( config ) {
 	 * @param {object} req  The incomming request object
 	 * @param {object} res  The response object
 	 */
-	Controller = function Controller ( route, req, res ) {
-// console.log("Controller in index (req.method):\n", req.method);
-// console.log("Controller in index (req):\n", req);
+	Controller = function Controller ( route, req, res, url ) {
 		this.route = route;
 		this.req = req;
 		this.res = res;
+		this.url = url;
 		this.route.method = req.method;
 
 		/**
@@ -75,6 +74,19 @@ FW = function ( config ) {
 			route.data = data;
 			route.req = this.req;
 			route.res = this.res;
+			route.url = this.url;
+
+			/**
+			 * Add search params to route
+			 */
+			let params = {};
+
+			for ( let pair of url.searchParams) {
+				params[pair[0]] = pair[1];
+			}
+
+			route.searchParams = params;
+
 			let output = await route.action( route );
 
 			return output;

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.18",
+  "version": "0.1.19",
   "description": "My personal Node framework",
   "main": "index.js",
   "scripts": {

package/router.js

@@ -30,55 +30,47 @@ global.ROUTE = function ( route, action, params = null ) {
 	global.routes.push( r );
 };
 
-function Router ( req, url ) {
-	const method = req.method;
-	// console.log("Router url:", url);
-	// Split url into array
-	let url_array = url.pathname.split('/');
+// 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();
+// 	// 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];
+// 	// 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);
+// 	// 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;
-};
+// 	return this;
+// };
 
 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( pathname ) );
 
 	if ( route ) {
-		// console.log("Route defined url:", url);
-		// console.log("Route defined route:", route);
-		// Execute action for route
 		return route;
 	} else {
-// console.log("Route NOT defined", url);
 		const url_array = pathname.split('/').filter( e => e );
 		
 		// Check if route is an API call
 		let isAPICall = pathname.split('/')[1] === 'api' ? true : false;
 		
 		if ( isAPICall ) {
-// console.log("Route NOT defined (API)", url, url.split('/')[1]);
 			/**
 			 * If checking for UUID use:
 			 * UUID v1:
@@ -122,6 +114,6 @@ function findRoute ( url ) {
 }
 
 module.exports = {
-	Router,
+	// Router,
 	findRoute
 }