vanilla-jet 1.2.0 → 1.2.2

package/Gruntfile.js

@@ -176,7 +176,7 @@ module.exports = function(grunt) {
     grunt.option('force', true);
     grunt.task.run('clean:' + target);
   });
-  grunt.registerTask('default', ['buildLess', 'uglify', 'cleanForce:build', 'concat', 'cleanForce:minified', 'shell:compileTemplates', 'watch']);
-  grunt.registerTask('build', ['buildLess', 'uglify', 'cleanForce:build', 'concat', 'cleanForce:minified', 'shell:compileTemplates']);
+  grunt.registerTask('default', ['buildLess', 'uglify', 'cleanForce:build', 'concat', 'cleanForce:minified', 'shell:compileTemplates', 'compress', 'watch']);
+  grunt.registerTask('build', ['buildLess', 'uglify', 'cleanForce:build', 'concat', 'cleanForce:minified', 'shell:compileTemplates', 'compress']);
   grunt.registerTask('server', ['buildLess']);
 };

package/framework/dipper.js

@@ -9,12 +9,7 @@ function Dipper(options, shared) {
 	this.page_title = this.site_title;
 	this.description = shared.description;
 	this.fbAppId = shared.fbAppId;
-
-	this.site_url = ((this.options.site_url == 'localhost')  ? 
-		'http://localhost' : 
-		this.options.site_url) + ':' + this.options.port;
 	this.base_dir = path.join(process.cwd(), '/');
-	this.base_url = this.site_url + this.options.base_url;
 	
 	// Dirs
 	this.dirs = {
@@ -44,30 +39,22 @@ function Dipper(options, shared) {
 }
 
 Dipper.prototype.getPageTitle = function() {
-
-	var obj = this;
-	return obj.page_title;
+	return this.page_title;
 }
 
 Dipper.prototype.getSiteTitle = function() {
-
-	var obj = this;
-	return obj.site_title;
+	return this.site_title;
 }
 
 Dipper.prototype.getDescription = function() {
-
-	var obj = this;
-	return obj.description;
+	return this.description;
 }
 
 Dipper.prototype.getFbAppId = function() {
-
-	var obj = this;
-	return obj.fbAppId;
+	return this.fbAppId;
 }
 
-Dipper.prototype.addMeta = function(name, content, attribute) {
+Dipper.prototype.addMeta = function({name, content, attribute}) {
 
 	let obj = this;
 	attribute = attribute || 'name';
@@ -100,11 +87,8 @@ Dipper.prototype.metaTags = function() {
 }
 
 Dipper.prototype.img = function(filename) {
-
-	var obj = this,
-		dir = this.getDir('images', false);
-		ret = this.urlTo(dir + filename);
-	return ret;
+	let dir = this.getDir('images', false);
+	return this.urlTo(dir + filename);
 }
 
 Dipper.prototype.script = function(filename) {
@@ -119,17 +103,14 @@ Dipper.prototype.style = function(filename) {
 
 Dipper.prototype.pdf = function(filename) {
 
-	var obj = this,
-		dir = '/assets/pdf/'
-		ret = this.urlTo(dir + filename);
-		//console.log(ret);
-	return ret;
+	let dir = '/assets/pdf/';
+	return this.urlTo(dir + filename);
 }
 
 Dipper.prototype.getDir = function(dir, full) {
 	
-	var obj = this,
-		full = (full == undefined) ? true : full;
+	let obj = this;
+	full = (full == undefined) ? true : full;
 
 	if ( obj.dirs[dir] != undefined ) {
 		return (full == true ? obj.baseDir(obj.dirs[dir]) : obj.dirs[dir]);
@@ -138,32 +119,14 @@ Dipper.prototype.getDir = function(dir, full) {
 }
 
 Dipper.prototype.baseDir = function(path) {
-
-	var obj = this,
-		path = path || '',
-		ret = obj.base_dir + path;
-	return ret;
-}
-
-Dipper.prototype.isSecureRequest = function() {
-
-	var obj = this;
-	// Cheking for http or https
-	if (/^((http):\/\/)/.test(obj.options.site_url) || /^((localhost))/.test(obj.options.site_url)) {
-		return false;
-	} else if (/^((https):\/\/)/.test(obj.options.site_url)) {
-		return true;
-	}
+	path = path || '';
+	return this.base_dir + path;
 }
 
-Dipper.prototype.urlTo = function(route, protocol) {
-
-	var obj = this,
-		protocol = protocol || undefined,
-		url = obj.base_url + route;
-		//url = obj.baseUrl(route, protocol);
-	return url;
-}
+Dipper.prototype.urlTo = function (route) {
+  if (/^(?:[a-z][a-z0-9+.-]*:)?\/\//i.test(route)) return route;
+  return '/' + route.replace(/^\/+/, '');
+};
 
 Dipper.prototype.registerStyle = function(
 	name, url, requires,

package/framework/functions.js

@@ -90,7 +90,11 @@ class Functions {
       { name: 'theme-color', content: '#ffffff' }
     ];
     basicMeta.forEach(meta => {
-      dipper.addMeta(meta.name, meta.content);
+      dipper.addMeta({
+        name: meta.name,
+        content: meta.content || null,
+        attribute: meta.attribute || null
+      });
     });
 
     // Add Open Graph meta tags
@@ -104,7 +108,11 @@ class Functions {
       'og:locale': 'es_MX',
     };
     Object.entries(openGraphMeta).forEach(([key, value]) => {
-      dipper.addMeta(key, value, 'property');
+      dipper.addMeta({
+        name: key,
+        content: value,
+        attribute: 'property'
+      });
     });
   }
 }

package/framework/router.js

@@ -52,10 +52,13 @@ class Router {
 
 	addRoute(method, route, handler, insert) {
 
-		var obj = this, insert = insert || false, method = method.toLowerCase(), prev = (obj.server.options.base_url && obj.server.options.base_url != '' && obj.server.options.base_url != '/') ? obj.server.options.base_url : '', instance = {
-			regexp: obj.routeToRegExp(prev + route),
-			handler: handler
-		};
+		var obj = this, 
+      insert = insert || false, 
+      method = method.toLowerCase(), 
+      instance = {
+			  regexp: obj.routeToRegExp(route),
+			  handler: handler
+		  };
 		// Add the route, may be at the beginning or at the end
 		if (insert) { // Adding the route at the beginning of the route's array
 			obj.routes[method].unshift(instance);
@@ -71,9 +74,7 @@ class Router {
 		let response = new Response(res);
 		let request = new Request(req, {
 			onDataReceived: function () {
-				if (request.path == obj.server.options.base_url) {
-					request.path = obj.server.options.base_url + obj.defaultRoute;
-				}
+				if (request.path == '') { request.path = obj.defaultRoute; }
 				// -- Check GET or POST routes
 				_.each(obj.routes[request.type], function (route) {
 					if (request.path.match(route.regexp)) {
@@ -104,7 +105,7 @@ class Router {
 					if (extHandled) {
 
 						let rep = obj.cwd.replace('core/framework', ''), 
-							route = request.path.replace(obj.server.options.base_url, ''), 
+							route = request.path,
 							filename = path.join(rep, route), 
 							filePrivate = obj.isProtectedFile(route);
 
@@ -172,10 +173,7 @@ class Router {
 	}
 
 	getDefaultRoute() {
-
-		let obj = this, 
-      prev = (obj.server.options.base_url && obj.server.options.base_url != '' && obj.server.options.base_url != '/') ? obj.server.options.base_url : '';
-		return (prev + obj.defaultRoute);
+		return this.defaultRoute;
 	}
 
 	onNotFound(response) {

package/framework/server.js

@@ -7,7 +7,6 @@ const path = require('path');
 
 let Router = require('./router.js');
 let Dipper = require('./dipper.js');
-let Functions = require('./functions.js');
 
 class Server {
 
@@ -31,10 +30,8 @@ class Server {
 			security = settings['security'] || {};
 
 		_.defaults(opts, {
-			base_url: '',
-			site_url: '',
-			wsServer: false,
-			onNotFound: obj.onNotFound
+			https_server: false,
+			wsServer: false
 		});
 		obj.options = opts;
 
@@ -57,9 +54,6 @@ class Server {
     // -- Create the server
     obj.createServer();
 
-    // -- Not found callback
-		obj.onNotFound = opts.onNotFound;
-
 		// Initialize router
 		obj.router = new Router(obj);
 
@@ -69,56 +63,35 @@ class Server {
 			endpoints_built[endpoint.name] = new endpoint(obj.router);
 		}
     this.endpoints = endpoints_built;
-
-		// Setting endpoints
-		obj.functions = new Functions();
 	}
 
 	start() {
-
-		let obj = this;
-		let port = (obj.options.port && obj.options.port != '') ? obj.options.port : 8080;
-
-		// Listen on the specified port
-		obj.httpx.listen(port);
-
-		// Logging
-		obj.log('__________________  VanillaJet server started  ___________________');
-		obj.log(` >           Listening on ${obj.options.site_url}:${obj.options.port}${obj.options.base_url}         < `);
-		obj.log('-----------------------------------------------------------------');
+		this.log('__________________  VanillaJet Server started  ___________________');
+		this.log(` >           Running on 0.0.0.0:${this.options.port}/           < `);
+		this.log('------------------------------------------------------------------');
 	}
 
   createServer() {
 
     let obj = this;
-    // -- Http server
-    let isLocalhost = /^((http):\/\/)/.test(obj.options.site_url) || /^((localhost))/.test(obj.options.site_url);
-    if (isLocalhost) {
-      obj.httpx = http.createServer((req, res) => {
-        obj.router.onRequest.call(obj.router, req, res);
-      });
-      return;
-    }
 
     // -- Https server (self managed certs)
     if (obj.security.self_managed_certs) {
-      let certs = {
-        key: fs.readFileSync(obj.security.key, 'utf8'),
-        cert: fs.readFileSync(obj.security.cert, 'utf8'),
-        allowHTTP1: true
-      };
+      console.log('HTTPs server created - Self managed certs');
+      let certs = obj.getCertificates();
       obj.httpx = http2.createSecureServer(certs, (req, res) => {
         obj.router.onRequest.call(obj.router, req, res);
       });
-      return;
+    } else {
+      console.log('HTTP server created - Without self managed certs');
+      obj.httpx = http.createServer((req, res) => {
+        console.log('Request received: ', req.url);
+        obj.router.onRequest.call(obj.router, req, res);
+      });
     }
-    
-    // -- Certs managed by NGINX, Google Cloud Run, etc.
-    console.log('HTTP server created - Without self managed certs');
-    obj.httpx = http.createServer((req, res) => {
-      console.log('Request received: ', req.url);
-      obj.router.onRequest.call(obj.router, req, res);
-    });
+
+    // -- Set the port
+    obj.httpx.listen(obj.options.port || 8080);
   }
 
 	log(value) {
@@ -129,11 +102,15 @@ class Server {
 		}
 	}
 
-	onNotFound(request, response) {
-		
-		response.setStatus(404);
-		response.respond();
-	}
+  getCertificates() {
+
+    let obj = this;
+    return {
+      key: fs.readFileSync(obj.security.key, 'utf8'),
+      cert: fs.readFileSync(obj.security.cert, 'utf8'),
+      allowHTTP1: true
+    }
+  }
 }
 
 module.exports = Server;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vanilla-jet",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "VannilaJet framework",
   "main": "index.js",
   "bin": {