@blaasvaer/frmwrk 0.2.1 → 0.2.4

package/handle-request.js

@@ -23,6 +23,7 @@ async function handleRequest( req, res ) {
 	// console.log("handleRequest, req", req );
 	const request_url = new URL( req.url, `http://${req.headers.host}`);
 	// console.log("handleRequest, request_url", request_url);
+	// console.log("handleRequest, request_url.searchParams", request_url.searchParams);
 	/**
 	 * Set default status and header
 	 * @type {Number}
@@ -42,7 +43,24 @@ async function handleRequest( req, res ) {
 			return;
 		} else {
 			return;
-		}		
+		}
+	}
+	
+	/**
+	 * Service Worker from root
+	 */
+	if (request_url.pathname === '/service-worker.js') {
+		// TODO: Set theme dynamically
+		var favicon = path.join('', 'service-worker.js');
+		res.statusCode = 200;
+		res.setHeader('Content-Type', 'text/javascript');
+		
+		if ( fs.existsSync( favicon ) ) {
+			fs.createReadStream( favicon ).pipe( res );
+			return;
+		} else {
+			return;
+		}
 	}
 	
 	/**
@@ -65,7 +83,7 @@ async function handleRequest( req, res ) {
 
 		switch ( method ) {
 			case 'GET':
-				if ( ! controller.route.params ) {
+				if ( ! controller.route.params?.authorize ) {
 					/**
 					 * If the route has no parameters, then just run the route method and serve whatever it may …
 					 */
@@ -75,14 +93,17 @@ async function handleRequest( req, res ) {
 					 * Authorization
 					 */
 					if ( Authorize( controller.route ) ) {
+						// console.log(`We're authorized!`, controller.route.params);
 						response_output = await controller.view();
 					} else {
+						// console.log(`We're NOT authorized!`, controller.route.params);
 						/**
 						 * Redirect the user to login if auth fails
 						 */
-						if ( controller.route.params.access.redirect ) {
+						if ( controller.route.params.authorize.redirect ) {
+							// console.log('controller.route.params.redirect', controller.route.params.redirect);
 							status_code = 302;
-							res.setHeader( 'Location', controller.route.params.access.redirect );
+							res.setHeader( 'Location', controller.route.params.authorize.redirect );
 						}
 						// console.log("NO USER", controller.route.params.redirect);
 						// response_output = redirect.action.call();

package/index.js

@@ -46,14 +46,6 @@ FW = function ( config ) {
 	controllers = {};
 	models = {};
 
-	/**
-	 * Create and start the server
-	 * @return {function} Server instance
-	 */
-	 http.createServer( handleRequest ).listen(port, hostname, () => {
-		console.log(`Server running at http://${hostname}:${port}`);
-	});
-
 	/**
 	 * Set the Controller
 	 * @param {string} name The name of the controller
@@ -75,7 +67,7 @@ FW = function ( config ) {
 			route.req = this.req;
 			route.res = this.res;
 			route.url = this.url;
-
+			
 			/**
 			 * Add search params to route
 			 */
@@ -95,12 +87,13 @@ FW = function ( config ) {
 		/**
 		 * Check for authorization parameters.
 		 */
-		if ( route.params !== null ) {
+// 		if ( route.params !== null ) {
 // console.log("Params not null", route.params);
-			if ( route.params.access !== undefined ) {
-console.log("This route should be authorized!");
-			}
-		}
+// 			if ( route.params.authorize !== undefined ) {
+// console.log("This route should be authorized!");
+// 				Authorize( route.params );
+// 			}
+// 		}
 			
 		return this;
 	}
@@ -109,8 +102,9 @@ console.log("This route should be authorized!");
 	 * TODO: Authorize user
 	 */
 	Authorize = function Authorize ( credentials ) {
-// console.log("Authorize - check credentials:", credentials);
-		return true;
+console.log("Authorize - check credentials:", credentials);
+		return false;
+		// return true;
 	}
 
 	/**
@@ -119,10 +113,17 @@ console.log("This route should be authorized!");
 	Install( config )
 	.then(( result ) => {
 		/**
-		 * Run post install processes here …
+		 * Run optional post install processes here …
+		 */
+
+		/**
+		 * Create and start the server
+		 * @return {function} Server instance
 		 */
-// console.log("Install result:", routes);
-		})
+		http.createServer( handleRequest ).listen(port, hostname, () => {
+			console.log(`Server running at http://${hostname}:${port}`);
+		});
+	})
 	.catch(function( err ) {
 console.log("Install Error:", err);
 	});;

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

package/router.js

@@ -10,63 +10,37 @@ const url = require('url');
 global.routes = [];
 
 global.ROUTE = function ( route, action, params = null ) {
+	let _route = route.split('/');
+
 	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],
+		"controller": _route[1] == '' ? 'index' : _route[1],
+		"resource": _route[2] == '' ? '' : _route[2],
+		"resource_id": _route[3] == '' ? '' : _route[3],
 		"route": route,
 		"action": action,
 		"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 );
 };
 
-// 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;
-// };
-
+/**
+ * A route can be either static or dynamic.
+ * A static route is defined in the controllers and dynamic routes will be resolved automatically.
+ * In order to figure out if we have a static route, we check the pathname and match it against the global.routes object.
+ * If we do not find any match we asume the route is dynamic and therefore pass '/api/:resource' on.
+ * @param {string} url The url to find
+ * @returns object
+ */
 function findRoute ( url ) {
-	let pathname = url.pathname;
+	let pathname = url.pathname,
+		url_array = pathname.split('/').filter( e => e );
 
 	let route = global.routes.find( ( obj ) => obj.route === FW.utils.removeTrailingSlashes( pathname ) );
 
 	if ( route ) {
 		return route;
 	} else {
-		const url_array = pathname.split('/').filter( e => e );
-		
 		// Check if route is an API call
 		let isAPICall = pathname.split('/')[1] === 'api' ? true : false;
 		
@@ -93,8 +67,19 @@ function findRoute ( url ) {
 				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' );
+				// Check for static route with dynamic resource_id
+				let static_route_path = '/' + url_array[0] + '/' + url_array[1] + '/:id';
+				let static_route = global.routes.find( ( obj ) => obj.route === static_route_path );
+
+				// If we don't find a static route we pass on a dynamic
+				if ( ! static_route ) {
+					regex = /api\/(?<resource>[a-z_]+)\/(?<id>[0-9]+)/; // match /api/<resource>/<id>
+					route = global.routes.find( ( obj ) => obj.route === '/api/:resources/:id' );
+				} else {
+					let resource = url_array[1];
+					regex = new RegExp(`\/api\/${resource}\/(?<id>[0-9]+)`); // match /api/resource/<id>
+					route = global.routes.find( ( obj ) => obj.route === '/api/' + url_array[1] + '/:id' );
+				}
 				break;
 			}
 
@@ -114,6 +99,5 @@ function findRoute ( url ) {
 }
 
 module.exports = {
-	// Router,
 	findRoute
 }

package/utils.js

@@ -71,6 +71,15 @@ class Utils {
 	removeTrailingSlashes( url ) {
 		return url.replace(/\/+$/, '');
 	}
+
+	/**
+	 * Removes all starting and trailing slashes from URL
+	 * @param {string} url
+	 * @return {string}	Return the string without trailing slashes.
+	 */
+	removeStartingTrailingSlashes( url ) {
+		return url.replace(/^\/+|\/+$/g, '')
+	}
 }
 
 module.exports = new Utils();