slower 1.1.13 → 1.1.16

package/lib/router.js

@@ -29,6 +29,7 @@ class SlowerRouter {
         'js'  : ['text/javascript', 'utf-8'],
         'css' : ['text/css', 'utf-8'],
         'ico' : ['image/png'],
+        'json': ['application/json'],
         'default': ['application/octet-stream']
     }
 
@@ -113,7 +114,8 @@ class SlowerRouter {
         * }));
     */
     setDynamic = function (path, file = '', mime = '', replacementData = null) {
-        let encoding = (mime === SlowerRouter.mime_table['default'] ? undefined : 'utf-8')
+        let encoding = (mime === SlowerRouter.mime_table['default'] ? undefined : 'utf-8');
+        if (file.includes('{%}')) { file = file.replace(/\{\%\}/gim, path.replace(/\//gim,'')); }
         let stat = new Route(path, 'GET', (req, res) => {
             let data, targetFile, extension, targetMime, targetEncoding;
             if (fs.existsSync(file) && fs.lstatSync(file).isDirectory()) {
@@ -153,10 +155,11 @@ class SlowerRouter {
      * @param {String} mime The file's mime type
      * @returns {Object} An Route object already configured
      * @example <caption> Defining a simple GET route:</caption>
-     * setStatic('/login', __dirname+'/public/static/views/login.html', 'text/html');
+     * setStatic('/login', __dirname+'/public/static/views/{%}.html', 'text/html');
     */
     setStatic = function (path, file = '', mime = '') {
-        let encoding = (mime === SlowerRouter.mime_table['default'] ? undefined : 'utf-8')
+        let encoding = (mime === SlowerRouter.mime_table['default'] ? undefined : 'utf-8');
+        if (file.includes('{%}')) { file = file.replace(/\{\%\}/gim, path.replace(/\//gim,'')); }
         let stat = new Route(path, 'GET', (req, res) => { 
             let data, targetFile, extension, targetMime, targetEncoding;
             if (fs.existsSync(file) && fs.lstatSync(file).isDirectory()) {
@@ -223,7 +226,7 @@ class SlowerRouter {
     */
     setFallbackFile = function (file = '', mime = '', replacementData = null) {
         this.fallback = function fb (req,res) {
-            let encoding = (mime === SlowerRouter.mime_table['default'] ? undefined : 'utf-8')
+            let encoding = (mime === SlowerRouter.mime_table['default'] ? undefined : 'utf-8');
             let data, targetFile, extension, targetMime, targetEncoding;
             if (fs.existsSync(file) && fs.lstatSync(file).isDirectory()) {
                 targetFile = file.replace(/\//gim, '\\');
@@ -330,7 +333,7 @@ class SlowerRouter {
         });
         callback(server);
         if (!host) host = undefined; // Turn falsy values into undefined, for default behaviour
-        // return server.listen(port, host);
+        server.listen(port, host);
         return this;
     }
 }

package/lib/utils.js

@@ -44,7 +44,7 @@ const isSparseEqual = (str1 = '', str2 = '') => {
 
 /**
  * It's a template engine, to render HTML containing template spaces.
- * The charset for replacement is <{content}>
+ * The charset for replacement is {{content}}
  * @since 1.2.5
  * 
  * @param  {String} html The HTML code
@@ -52,7 +52,7 @@ const isSparseEqual = (str1 = '', str2 = '') => {
  * @return {String} The HTML with the templates replaces
  * 
  * @example <caption> Rendering: </caption>
- * var template = 'Hello, my name is <{name}>. I\\'m <{age}> years old.';
+ * var template = 'Hello, my name is {{name}}. I\\'m {{age}} years old.';
  * console.log(TemplateEngine(template, {
  *   name: "Krasimir",
  *   age: 29
@@ -62,7 +62,7 @@ const renderDynamicHTML = (html, patterns) => {
     let template = html;
     for (let item in patterns) {
         template = html.replace(
-            new RegExp('<{'+item+'}>', 'gim'), 
+            new RegExp('{{'+item+'}}', 'gim'), 
             patterns[item]
         );
     }
@@ -76,7 +76,7 @@ const setSocketLocals = (socket) => {
     socket.session.host = (
         socket.socket.localAddress.startsWith('::') ? 
         socket.socket.localAddress.substring(
-            socket.socketlocalAddress.indexOf(':',2)+1
+            socket.socket.localAddress.indexOf(':',2)+1
         ) : socket.socket.localAddress);
         socket.session.rhost = (
         socket.socket.remoteAddress.startsWith('::') ? 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slower",
-  "version": "1.1.13",
+  "version": "1.1.16",
   "description": "A package for simple HTTP server routing.",
   "main": "index.js",
   "directories": {

package/readme.md

@@ -53,6 +53,11 @@ app.setDynamic(string: path, string: file = '', string: mime = '', object: repla
 > This is a custom file-response route, configured for template rendering just before response.
 > Providing an object as 'replacementData' in this format { valueToBeReplaced: valueToReplace },
   allows for template rendering. The value to replace in the file, uses this notation: '<{content}>'.
+> URL reference in filename:
+    > For direct references, it is possible to use the token '{%}' to replace the filename for the URL.
+    > Ex:
+        app.setStatic('/login', './templates/{%}.html', 'text/html');
+        This will access the 'login.html' file when the route '/login' is accessed.
 > Example:
   Responding a route for '/custom' with file 'custom.html':
     app.setDynamic('/custom', './templates/custom.html', 'text/html', { smile: ':)' })
@@ -66,6 +71,11 @@ app.setDynamic(string: path, string: file = '', string: mime = '', object: repla
 app.setStatic(string: path, string: file = '', string: mime = ''): this
 
 > Creates a new GET route for path defined in 'path', responding with the specified file and MIME type.
+> URL reference in filename:
+    > For direct references, it is possible to use the token '{%}' to replace the filename for the URL.
+    > Ex:
+        app.setStatic('/login', './templates/{%}.html', 'text/html');
+        This will access the 'login.html' file when the route '/login' is accessed.
 > Example: A route for '/login' page, responding with 'login.html' file
     setStatic('/login', __dirname+'/public/static/views/login.html', 'text/html');
 > Returns the own object instance, so that methods can be chained.
@@ -116,7 +126,7 @@ app.setMiddleware((req, res) => {
     console.log(`${req.time} - ${req.method} : ${req.url}`);
 });
 
-app.setStatic('/favicon.ico', __dirname+'/public/favicon.ico');
+app.setStatic('/favicon.ico', __dirname+'/public/{%}');
 
 app.setRoute('/', 'GET', (req, res) => {
     res.writeHead(200, { 'Content-Type': 'text/html' });