expediate 0.0.3 → 1.0.1

package/.gitignore

@@ -1,14 +0,0 @@
-# Git ignore
-# ------------------------
-*
-!*/
-# ------------------------
-
-node_modules/
-!*.js
-!*.html
-!package.json
-!.git*
-!.npm*
-!dist/**/*
-

package/index.js

@@ -1,305 +0,0 @@
-/* Copyright 2021 Fabien Bavent
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-'use strict';
-
-const http = require('http'),
-  https = require('https'),
-  serv = require('./static.js');
-
-/**
- * Prepare an layer object to define a new route
- *
- * @param {String} method
- * @param {String} [path]
- * @param {Listener} listener
- * @return {Layer}
- */
-function buildRouteLayer(method, path, listener) {
-  if (method)
-    method = method.toUpperCase();
-  if (typeof path !== 'string' && !(path instanceof RegExp)) {
-    listener = path;
-    path = '/';
-  }
-  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 };
-};
-
-/**
- * Check if a request match the current route(layer)
- *
- * In case the request match the route, we update the request
- * path field and the queries.route map depending on route parameters
- *
- * @param {Layer} layer
- * @param {http.ClientRequest} req
- * @param {String[]} parts
- * @return {Bool}
- */
-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;
-    else if (layer.parts[i][0] == ':')
-      params[layer.parts[i].substring(1)] = parts[i];
-    else if (layer.parts[i] != parts[i])
-      return false;
-  }
-};
-
-/**
- * Extends the request and response object of a http request
- * with parameters and helper.
- *
- * @param {http.ClientRequest} req
- * @param {http.ServerResponse} res
- */
-function updateHttpObject(req, res) {
-  if (req.queries)
-    return
-  req.queries = {};
-
-  let qry = new URL(`http://${req.headers.host}${req.url}`)
-  req.originalUrl = req.url;
-  req.path = qry.pathname
-
-  // Parse URL-encoded data
-  let params = {};
-  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 = {};
-    if (req.headers.cookie) {
-      const dico = req.headers.cookie.split(';')
-        .map(x => x.replace(/^\s+|\s+$/g, '').split('='));
-      for (var k in dico) {
-        let key = dico[k][0]
-        let val = dico[k][1]
-        req.cookies[key] = val;
-        // TODO s: Cookie is signed, j: Cookie is a JSON
-      }
-    }
-  }
-
-
-  res.setHeader('X-Powered-By', 'Expediate');
-
-  res.send = (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])
-    return res;
-  };
-
-  res.redirect = (url) => {
-    let status = 302;
-    res.setHeader('location', url);
-    res.writeHead(status)
-    res.write(`Found. Redirecting to ${url}`);
-    res.end();
-  };
-
-  res.cookie = function (name, value, options) {
-    var opts = options || {};
-
-    if (opts.signed && !res.req.secret)
-      throw new Error('cookieParser("secret") required for signed cookies');
-
-    var val = typeof value === 'object'
-      ? 'j:' + JSON.stringify(value)
-      : String(value);
-
-    if (opts.signed)
-      val = 's:' + sign(val, res.req.secret);
-
-    let txt = `${name}=${String(val)}`
-
-    if ('maxAge' in opts) {
-      opts.expires = new Date(Date.now() + opts.maxAge);
-      opts.maxAge /= 1000;
-    }
-
-    if (opts.path == null)
-      opts.path = '/';
-    txt += `; Path=${opts.path}`
-
-    res.setHeader('Set-Cookie', txt);
-    return res;
-  };
-
-};
-
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-module.exports = Router;
-
-/**
- * This function create a new router function as a web listener.
- */
-function Router() {
-
-  const routes = [];
-
-  const listener = function(req, res, done) {
-    const method = req.method;
-    const url = req.url;
-    let idx = 0;
-    updateHttpObject(req, res);
-    const parts = req.path.split('/').filter(x => x.length > 0);
-
-    const next = () => {
-      while (idx < routes.length) {
-        let layer = routes[idx++];
-        if (matchRouteLayer(layer, req, parts, req.path))
-          return layer.listener(req, res, next);
-      }
-
-      if (done)
-        return done();
-      return res.status(404).end(`Cannot ${method} ${url}`);
-    }
-
-    try {
-      next();
-    } catch (e) {
-      console.warn(e)
-      res.status(500).end(`Error ${method} ${url}`)
-    }
-  };
-
-  listener.use = (p, l) => routes.push(buildRouteLayer(null, p, l));
-  listener.all = (p, l) => routes.push(buildRouteLayer(null, p, l));
-  listener.get = (p, l) => routes.push(buildRouteLayer('GET', p, l));
-  listener.put = (p, l) => routes.push(buildRouteLayer('PUT', p, l));
-  listener.post = (p, l) => routes.push(buildRouteLayer('POST', p, l));
-  listener.delete = (p, l) => routes.push(buildRouteLayer('DELETE', p, l));
-  listener.patch = (p, l) => routes.push(buildRouteLayer('PATCH', p, l));
-
-  listener.listen = (port, opts, cb) => {
-    if (typeof opts === 'function') {
-      cb = opts;
-      opts = null;
-    }
-    if (opts && opts.key && opts.cert)
-      https.createServer(opts, listener).listen(port, cb);
-    else
-      http.createServer(listener).listen(port, cb);
-  };
-
-  return listener;
-};
-
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-Router.logger = () => {
-  return (req, res, next) => {
-    const nclr = '\x1b[0m';
-    const colors = [
-      '\x1b[31m', '\x1b[33m', '\x1b[32m', '\x1b[33m', '\x1b[31m', '\x1b[91m'];
-    const rec = new Intl.DateTimeFormat('en-GB', {
-      month: 'short',
-      day:'2-digit',
-      hour:'2-digit',
-      minute:'2-digit'}).format();
-    const path = req.path;
-    req.received = new Date().getTime();
-    res.on('finish', ev => {
-      req.elapsed = new Date().getTime() - req.received;
-      const clr = colors[parseInt(res.statusCode / 100)];
-      const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
-      const user = req.session ? `${req.session.username}/${req.session.ssid}` : '-'
-      const status = `${clr}${res.statusCode}${nclr}`
-      const elp = `${req.elapsed} ms`
-      const len = res.getHeader('content-length') ? res.getHeader('content-length') : '-';
-      console.log(`${rec} ${status} ${req.method} ${path} ${ip} <${user}> ${elp} (${len})`);
-    })
-    next();
-  };
-};
-
-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) => {
-    let ssid = req.cookies.ssid;
-    req.session = opts.openSession(ssid);
-    if (ssid != req.session.ssid)
-      res.cookie('ssid', req.session.ssid);
-    next();
-  };
-};

package/sample.js

@@ -1,9 +0,0 @@
-
-const expediate = require('./index.js')
-    app = expediate();
-
-
-app.use('/', expediate.logger())
-app.use('/', expediate.static('.'))
-app.listen(80)
-