expediate 0.0.2 → 0.0.3

package/README.md

@@ -6,10 +6,11 @@ however it doesn't intent to provide all the features.
 
   [![NPM Version][npm-image]][npm-url]
   [![NPM Downloads][downloads-image]][downloads-url]
+<!--
   [![Linux Build][travis-image]][travis-url]
   [![Windows Build][appveyor-image]][appveyor-url]
   [![Test Coverage][coveralls-image]][coveralls-url]
-
+ -->
 ```js
 const expediate = require('expediate')
 const app = expediate()

package/index.js

@@ -22,7 +22,7 @@
 
 const http = require('http'),
   https = require('https'),
-  serveStatic = require('./static.js');
+  serv = require('./static.js');
 
 /**
  * Prepare an layer object to define a new route
@@ -35,11 +35,15 @@ const http = require('http'),
 function buildRouteLayer(method, path, listener) {
   if (method)
     method = method.toUpperCase();
-  if (typeof path === 'function') {
+  if (typeof path !== 'string' && !(path instanceof RegExp)) {
     listener = path;
     path = '/';
   }
-  let parts = path.split('/').filter(x => x.length > 0);
+  let parts = path instanceof RegExp ? null : path.split('/').filter(x => x.length > 0);
+  if (listener && typeof listener !== 'function')
+    listener = listener.listener // Route object
+  if (typeof listener !== 'function')
+    throw new TypeError('Incorrect listener type');
   return { method, path, parts, listener };
 };
 
@@ -54,14 +58,28 @@ function buildRouteLayer(method, path, listener) {
  * @param {String[]} parts
  * @return {Bool}
  */
-function matchRouteLayer(layer, req, parts) {
+function matchRouteLayer(layer, req, parts, path) {
   if (layer.method && layer.method != req.method)
     return false;
   let params = {}
   for (let i = 0; ; ++i) {
+    if (layer.parts == null) {
+      var m = layer.path.exec(path);
+      if (m == null)
+        return false;
+      for (let i = 1; i < m.length; ++i)
+        params[i] = m[i];
+      req.path = m.index == 0 ? path.replace(m[0], '') : path;
+      req.queries.route = params;
+      for (var k in params)
+        req.params[k] = params[k];
+      return true;
+    }
     if (layer.parts.length <= i) {
       req.path = '/' + parts.slice(i).join('/');
       req.queries.route = params;
+      for (var k in params)
+        req.params[k] = params[k];
       return true;
     } else if (parts.length <= i)
       return false;
@@ -93,21 +111,19 @@ function updateHttpObject(req, res) {
   for(var pair of qry.searchParams.entries())
     params[pair[0]] = pair[1];
   req.queries.url = params;
+  req.params = params;
 
   // Parse cookies
   if (req.cookies == null) {
     req.cookies = {};
-    var cookies = req.headers.cookie;
-    if (cookies) {
-      cookies = cookies.split(';')
+    if (req.headers.cookie) {
+      const dico = req.headers.cookie.split(';')
         .map(x => x.replace(/^\s+|\s+$/g, '').split('='));
-      for (var k in cookies) {
-        let key = cookies[k][0]
-        let val = cookies[k][1]
+      for (var k in dico) {
+        let key = dico[k][0]
+        let val = dico[k][1]
         req.cookies[key] = val;
-        if (typeof val == 'string') {
-          // TODO s: Cookie is signed, j: Cookie is a JSON
-        }
+        // TODO s: Cookie is signed, j: Cookie is a JSON
       }
     }
   }
@@ -116,15 +132,16 @@ function updateHttpObject(req, res) {
   res.setHeader('X-Powered-By', 'Expediate');
 
   res.send = (data) => {
-    res.write(data);
+    if (data)
+      res.write(data);
     res.end();
   }
 
   res.status = (code, headers) => {
+    res.statusCode = code;
     if (headers)
       for (var k in headers)
         res.setHeader(k, headers[k])
-    res.writeHead(code)
     return res;
   };
 
@@ -187,7 +204,7 @@ function Router() {
     const next = () => {
       while (idx < routes.length) {
         let layer = routes[idx++];
-        if (matchRouteLayer(layer, req, parts))
+        if (matchRouteLayer(layer, req, parts, req.path))
           return layer.listener(req, res, next);
       }
 
@@ -247,13 +264,35 @@ Router.logger = () => {
       const user = req.session ? `${req.session.username}/${req.session.ssid}` : '-'
       const status = `${clr}${res.statusCode}${nclr}`
       const elp = `${req.elapsed} ms`
-      console.log(`${rec} ${status} ${req.method} ${path} ${ip} <${user}> ${elp}`);
+      const len = res.getHeader('content-length') ? res.getHeader('content-length') : '-';
+      console.log(`${rec} ${status} ${req.method} ${path} ${ip} <${user}> ${elp} (${len})`);
     })
     next();
   };
 };
 
-Router.static = serveStatic;
+Router.parseBody = () => {
+  return (req, res, next) => {
+    let data = '';
+    req.on('data', chunk => {
+        data += chunk;
+    });
+    req.on('end', () => {
+        try {
+            req.body = JSON.parse(data);
+        } catch {
+            req.body = data;
+        }
+        next();
+    });
+  }
+}
+
+Router.static = serv.serveStatic;
+Router.file = serv.serveFile;
+Router.sendFile = serv.sendFile;
+Router.sendIndex = serv.sendIndex;
+
 
 Router.session = (opts) => {
   return (req, res, next) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expediate",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Fast and simple, minimalist web framework",
   "main": "index.js",
   "scripts": {

package/static.js

@@ -253,14 +253,14 @@ function sendFile(req, res, pathname, stat, opts) {
 
   // Conditionnal GET
   if (hasCondition(req.headers)) {
-    if (!conditionMatch(req.headers, res.getHeaders())) {
-      return HTTP.PRECONDITION_FAILS(res)
-    }
+    if (conditionMatch(req.headers, res.getHeaders())) {
 
-    if (isCacheFresh(req.headers, res.getHeaders())) {
-      removeContentHeaders(res);
-      return HTTP.NOT_MODIFIED(res);
+      if (isCacheFresh(req.headers, res.getHeaders())) {
+        removeContentHeaders(res);
+        return HTTP.NOT_MODIFIED(res);
+      }
     }
+    // return HTTP.PRECONDITION_FAILS(res)
   }
 
 
@@ -277,7 +277,7 @@ function sendFile(req, res, pathname, stat, opts) {
   });
   stream.on('error', err => {
     if (finished) return;
-    console.log('ERROR', pathname, err)
+    console.warn('static error', pathname, err)
     HTTP.INTERNAL_ERROR(res, err.code);
     finished = true;
     destroyReadStream(stream);
@@ -310,7 +310,7 @@ function sendIndex(req, res, pathname, stat, opts) {
   })
 }
 
-function serveStatic (root, options) {
+function serveOptions(root, options) {
 
   if (!root)
     throw new TypeError('root path required')
@@ -319,7 +319,7 @@ function serveStatic (root, options) {
 
   // copy options
   var opts = options || {
-    fallthrough: false,
+    fallthrough: true,
     redirect: false,
   };
   opts.fallthrough = opts.fallthrough !== false
@@ -329,8 +329,13 @@ function serveStatic (root, options) {
   if (opts.setHeaders && typeof opts.setHeaders !== 'function')
     throw new TypeError('option setHeaders must be function')
 
+  return opts;
+}
+
+function serveStatic (root, options) {
 
-  return function serveStatic (req, res, next) {
+  var opts = serveOptions(root, options);
+  return function (req, res, next) {
 
     if (req.method !== 'GET' && req.method !== 'HEAD') {
       if (opts.fallthrough)
@@ -338,7 +343,7 @@ function serveStatic (root, options) {
       return HTTP.NOT_ALLOWED(res);
     }
 
-    var originalUrl = decodeURIComponent(req.originalUrl || req.path || req.url)
+    var originalUrl = decodeURIComponent(/*req.originalUrl || */req.path || req.url)
     var pathname = originalUrl
 
     // make sure redirect occurs at mount
@@ -365,6 +370,7 @@ function serveStatic (root, options) {
         if (err.code == 'ENOENT' || err.code == 'ENAMETOOLONG' || err.code == 'ENOTDIR') {
           if (opts.fallthrough)
             return next();
+          console.warn('static error:', err)
           return HTTP.NOT_FOUND(res)
         }
         return HTTP.INTERNAL_ERROR(res, err.code);
@@ -383,6 +389,28 @@ function serveStatic (root, options) {
   }
 }
 
+function serveFile (root, options) {
+
+  var opts = serveOptions(root, options);
+  return function (req, res, next) {
+
+    if (req.method !== 'GET' && req.method !== 'HEAD') {
+      if (opts.fallthrough)
+        return next()
+      return HTTP.NOT_ALLOWED(res);
+    }
+
+    const pathname = opts.root;
+    fs.stat(pathname, function onstat (err, stat) {
+      if (err)
+        return HTTP.INTERNAL_ERROR(res, err.code);
+      if (stat.isDirectory())
+        return HTTP.INTERNAL_ERROR(res, err.code);
+
+      sendFile(req, res, pathname, stat, opts)
+    });
+  }
+}
 
 
-module.exports = serveStatic;
+module.exports = { serveStatic, serveFile, sendFile, sendIndex };