@blaasvaer/frmwrk 0.2.4 → 0.2.6

package/connections.js

@@ -14,12 +14,12 @@ function installconnections ( config ) {
 		const connection_files = [];
 
 		files.forEach( file => {
-			let connection_name = file.split('.')[0];
-
 			// Skip file if name start with an underscore
-			if ( file.charAt(0) === '_' )
+			if ( file.charAt(0) === '_' || file === '.DS_Store' )
 				return;
 
+			let connection_name = file.split('.')[0];
+
 			let promise = new Promise( function ( resolve, reject ) {
 
 				let connection = require( connections_dir + file );

package/controllers.js

@@ -13,7 +13,7 @@ function installControllers ( config ) {
 
 		files.forEach( file => {
 			// Skip file if name start with an underscore
-			if ( file.charAt(0) === '_' )
+			if ( file.charAt(0) === '_' || file === '.DS_Store' )
 				return;
 
 				let promise = new Promise( function( resolve, reject ) {

package/handle-request.js

@@ -51,12 +51,12 @@ async function handleRequest( req, res ) {
 	 */
 	if (request_url.pathname === '/service-worker.js') {
 		// TODO: Set theme dynamically
-		var favicon = path.join('', 'service-worker.js');
+		var worker = path.join('', 'service-worker.js');
 		res.statusCode = 200;
 		res.setHeader('Content-Type', 'text/javascript');
 		
-		if ( fs.existsSync( favicon ) ) {
-			fs.createReadStream( favicon ).pipe( res );
+		if ( fs.existsSync( worker ) ) {
+			fs.createReadStream( worker ).pipe( res );
 			return;
 		} else {
 			return;
@@ -81,6 +81,13 @@ async function handleRequest( req, res ) {
 
 		let response_output = 'Nothing here …';
 
+		/**
+		 * Set Content Type
+		 */
+		if ( controller?.route?.params?.type ) {
+			content_type = controller?.route?.params?.type;
+		}
+
 		switch ( method ) {
 			case 'GET':
 				if ( ! controller.route.params?.authorize ) {
@@ -110,10 +117,6 @@ async function handleRequest( req, res ) {
 						// route.params.redirect.call();
 						// response_output = 'Access denied';
 					}
-					
-					if ( controller.route.params.type ) {
-						content_type = controller.route.params.type;
-					}
 				}
 		
 				res.statusCode = status_code;
@@ -145,7 +148,7 @@ async function handleRequest( req, res ) {
 					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' );
+					// res.setHeader( 'Set-Cookie','uuid=1234-1324-1234-1234-1234; Max-Age=3000; SameSite=lax; Secure' );
 					res.setHeader( 'Access-Control-Allow-Methods', 'GET, POST, PATCH, PUT, DELETE, OPTIONS' );
 					// res.setHeader( 'Content-Security-Policy', "default-src 'self'; img-src 'self';");
 

package/models.js

@@ -13,7 +13,7 @@ function installModels ( config ) {
 
 		files.forEach( file => {
 			// Skip file if name start with an underscore
-			if ( file.charAt(0) === '_' )
+			if ( file.charAt(0) === '_' || file === '.DS_Store' )
 				return;
 
 				let promise = new Promise( function ( resolve, reject ) {

package/package.json

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

package/views.js

@@ -36,6 +36,12 @@ function Views ( config ) {
 	.isFile()
 	? readFile( path )
 	.then(function ( template ) {
+		// Prevent .DS_Store files from breaking templates
+		let ds_store_file_path = path.split('/');
+
+		if ( ds_store_file_path[ ds_store_file_path.length - 1 ] === '.DS_Store' )
+			return;
+
 		let tpl = 'Handlebars.template(' + Handlebars.precompile(  template.toString() ) + ')';
 
 		if ( config.compress_html ) {