@blaasvaer/frmwrk 0.1.15 → 0.1.18

package/.vscode/settings.json

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

package/handle-request.js

@@ -5,6 +5,8 @@ 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',
@@ -63,8 +65,19 @@ async function handleRequest( req, res ) {
 		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 ) {
 					/**
 					 * If the route has no parameters, then just run the route method and serve whatever it may …
@@ -97,6 +110,10 @@ async function handleRequest( req, res ) {
 		
 				res.statusCode = status_code;
 				res.setHeader( 'Content-Type', content_types[content_type] );
+				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'; font-src 'self'; img-src 'self'; script-src 'self'; style-src 'self'; frame-src 'self'");
+				// res.setHeader( 'Content-Security-Policy', "default-src 'self'; img-src 'self';");
 		
 				// Cookies
 				res.setHeader('Set-Cookie','uuid=1234-1324-1234-1234-1234; Max-Age=3000; SameSite=lax; Secure');
@@ -109,6 +126,8 @@ async function handleRequest( req, res ) {
 				break;
 			case 'POST':
 			case 'PUT':
+			case 'PATCH':
+			case 'UPDATE':
 				let data = '';
 				req.on('data', chunk => {
 				  data += chunk;
@@ -118,7 +137,13 @@ 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' );
+
+					// 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/package.json

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

package/router.js

@@ -66,10 +66,12 @@ function findRoute ( url ) {
 	let route = global.routes.find( ( obj ) => obj.route === FW.utils.removeTrailingSlashes( pathname ) );
 
 	if ( route ) {
-// console.log("Route defined", url);
+		// 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

package/package 2.json

@@ -1,30 +0,0 @@
-{
-  "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"
-  }
-}