slower 1.1.20 → 1.1.22

package/LICENSE

@@ -0,0 +1,22 @@
+
+MIT License
+
+Copyright (c) 2024 Tomás Luchesi
+
+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.

package/lib/router.js

@@ -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,14 +364,12 @@ 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) {
@@ -409,27 +399,31 @@ class SlowerRouter {
                         ) {
                             i = routes.length;
                             route.callback(req, res);
-                            if (res.writableEnded) return; // if res.end() was called
-                            else res.end(); // if res.end() was not called
+                            // if (res.writableEnded) return; // if res.end() was called
+                            // else res.end(); // if res.end() was not called
                             return;
                         }
                     }
                     fallback(req,res);
-                    if (!res.writableEnded) res.end(); // No need to call res.end() on handlers anymore
+                    if (!res.writableEnded) res.end(); 
                 } else {
                     blockedMethodCallback(req, res);
-                    if (!res.writableEnded) res.end(); // No need to call res.end() on handlers anymore
+                    if (!res.writableEnded) res.end();
                 }
             } catch(err) {
                 console.log(err);
             }
         }
 
-        callback(server);
+        callback(this.server);
         if (!host) host = undefined; // Turn falsy values into undefined, for default behaviour
-        server.listen(port, host);
+        this.server.listen(port, host);
         return this;
     }
+
+    close = function () {
+        this.server.close();
+    }
 }
 
 const Slower = function () { return new SlowerRouter(); }

package/lib/utils.js

@@ -90,10 +90,17 @@ const setResponseAssessors = (resSocket) => {
     resSocket.sendText = (data, code = 200) => {
         resSocket.writeHead(code, { 'Content-Type': 'text/plain' }); 
         resSocket.write(data);
+        resSocket.end();
     };
     resSocket.sendJSON = (data, code = 200) => {
         resSocket.writeHead(code, { 'Content-Type': 'application/json' }); 
+        resSocket.write(typeof data === 'string' ? data : JSON.stringify(data));
+        resSocket.end();
+    };
+    resSocket.sendHTML = (data, code = 200) => {
+        resSocket.writeHead(code, { 'Content-Type': 'text/html' }); 
         resSocket.write(data);
+        resSocket.end();
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "slower",
-	"version": "1.1.20",
+	"version": "1.1.22",
 	"description": "A package for simple HTTP server routing.",
 	"main": "index.js",
 	"directories": {
@@ -10,6 +10,6 @@
 		"test": "echo \"Error: no test specified\" && exit 1"
 	},
 	"keywords": [],
-	"author": "no.mad.devtech@gmail.com",
-	"license": "ISC"
+	"author": "Tomás Luchesi <no.mad.devtech@gmail.com>",
+	"license": "MIT"
 }

package/readme.md

@@ -146,8 +146,7 @@ app.setDynamic('/download/{?}/', './main-download.txt', { DowloadName: generateD
 // Responds to download routes such as '/download/2/'
 
 app.setFallback((req, res) => {
-    res.writeHead(200, { 'Content-Type': 'text/html' }); 
-    res.write('<html><body><p>This is the fallback page.</p></body></html>');
+    res.sendHTML('<html><body><p>This is the fallback page.</p></body></html>', 404);
     res.end();
 });