slower 1.1.21 → 1.1.23

package/lib/router.js

@@ -1,7 +1,7 @@
 const http = require('http');
 const https = require('https');
 const fs = require('fs');
-const { clone, noop, slugify, isSparseEqual, last, renderDynamicHTML, setSocketLocals, setSocketSecurityHeaders, setResponseAssessors } = require('./utils');
+const { clone, noop, slugify, isSparseEqual, last, renderDynamicHTML, setSocketLocals, setSocketSecurityHeaders, setResponseAssessors, isPromise } = require('./utils');
 const mimetable = require('./mimetable.json');
 
 class Route {
@@ -26,15 +26,6 @@ class SlowerRouter {
     ];
 
     static mime_table = mimetable; 
-    // {
-    //     'txt' : ['text/plain', 'utf-8'],
-    //     'html': ['text/html', 'utf-8'],
-    //     'js'  : ['text/javascript', 'utf-8'],
-    //     'css' : ['text/css', 'utf-8'],
-    //     'ico' : ['image/png'],
-    //     'json': ['application/json'],
-    //     'default': ['application/octet-stream']
-    // }
 
     constructor () {
         this.strictHeaders = false;
@@ -44,6 +35,7 @@ class SlowerRouter {
         this.allowedMethods = clone(SlowerRouter.http_methods);
         this.blockedMethodCallback = noop;
         this.tls = { use: false, key: null, cert: null };
+        this.server = null;
     }
 
     enableStrictHeaders () {
@@ -372,17 +364,15 @@ class SlowerRouter {
         let fallback = this.fallback;
         let allowedMethods = this.allowedMethods;
         let blockedMethodCallback = this.blockedMethodCallback;
-
-        let server;
         
         if (this.tls.use && this.tls.cert && this.tls.key) {
-            server = https.createServer({ key:this.tls.key, cert: this.tls.cert }, mainServerHandler);
+            this.server = https.createServer({ key:this.tls.key, cert: this.tls.cert }, mainServerHandler);
 
         } else {
-            server = http.createServer({}, mainServerHandler);
+            this.server = http.createServer({}, mainServerHandler);
         }
 
-        function mainServerHandler (req, res) {
+        async function mainServerHandler (req, res) {
             try {
                 // Sets local req.session object
                 setSocketLocals(req);
@@ -393,7 +383,8 @@ class SlowerRouter {
                 if (!!this.strictHeaders) setSocketSecurityHeaders(req); 
                 // Runs all middlewares
                 for (let i = 0; i < middle.length; i++) { 
-                    middle[i](req, res); 
+                    const rr = middle[i](req, res); 
+                    if (isPromise(rr)) await rr;
                     if (res.writableEnded) return; // if res.end() is caller early in a middleware
                 }
                 // Only respond to allowed methods with callbacks, else, use the default empty response.
@@ -408,13 +399,15 @@ class SlowerRouter {
                             )
                         ) {
                             i = routes.length;
-                            route.callback(req, res);
+                            const rr = route.callback(req, res);
+                            if (isPromise(rr)) await rr;
                             // if (res.writableEnded) return; // if res.end() was called
                             // else res.end(); // if res.end() was not called
                             return;
                         }
                     }
-                    fallback(req,res);
+                    const rr = fallback(req,res);
+                    if (isPromise(rr)) await rr;
                     if (!res.writableEnded) res.end(); 
                 } else {
                     blockedMethodCallback(req, res);
@@ -425,11 +418,16 @@ class SlowerRouter {
             }
         }
 
-        callback(server);
+        this.port = port;
+        this.host = host;
         if (!host) host = undefined; // Turn falsy values into undefined, for default behaviour
-        server.listen(port, host);
+        this.server.listen(port, host, callback);
         return this;
     }
+
+    close = function (callback) {
+        this.server.close(callback);
+    }
 }
 
 const Slower = function () { return new SlowerRouter(); }

package/lib/utils.js

@@ -161,4 +161,10 @@ const toBool = [() => true, () => false];
 
 const clone = (object) => JSON.parse(JSON.stringify(object));
 
-module.exports = { clone, noop, slugify, isSparseEqual, toBool, last, renderDynamicHTML, setSocketLocals, setSocketSecurityHeaders, setResponseAssessors };
+const isPromise = obj => {
+    return obj !== null &&
+    (typeof obj === 'object' || typeof obj === 'function') &&
+    typeof obj.then === 'function';
+}
+
+module.exports = { clone, noop, slugify, isSparseEqual, toBool, last, renderDynamicHTML, setSocketLocals, setSocketSecurityHeaders, setResponseAssessors, isPromise };

package/package.json

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