ultimate-express 1.2.17 → 1.2.20

package/README.md

@@ -79,7 +79,7 @@ https.createServer({
 
 You have to pass `uwsOptions` to the `express()` constructor:
 ```js
-const express = require("u-express");
+const express = require("ultimate-express");
 
 const app = express({
     uwsOptions: {
@@ -144,7 +144,8 @@ In general, basically all features and options are supported. Use [Express 4.x d
 
 ### Application
 
-- ✅ app.listen()
+- ✅ app.listen(port[, host][, callback])
+- ✅ app.listen(unix_socket[, callback])
 - ✅ app.METHOD() (app.get, app.post, etc.)
 - ✅ app.route()
 - ✅ app.all()
@@ -312,4 +313,4 @@ Any Express view engine should work. Here's list of engines we include in our te
 - ✅ [express-dot-engine](https://npmjs.com/package/express-dot-engine)
 - ✅ [express-art-template](https://npmjs.com/package/express-art-template)
 - ✅ [express-handlebars](https://npmjs.com/package/express-handlebars)
-- ✅ [swig](https://npmjs.com/package/swig)
+- ✅ [swig](https://npmjs.com/package/swig)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-express",
-  "version": "1.2.17",
+  "version": "1.2.20",
   "description": "The Ultimate Express. Fastest http server with full Express compatibility, based on uWebSockets.",
   "main": "src/index.js",
   "scripts": {

package/src/application.js

@@ -183,34 +183,52 @@ class Application extends Router {
             const matchedRoute = await this._routeRequest(request, response);
             if(!matchedRoute && !response.headersSent && !response.aborted) {
                 response.status(404);
-                response.send(this._generateErrorPage(`Cannot ${request.method} ${request.path}`, false));
+                this._sendErrorPage(request, response, `Cannot ${request.method} ${request.path}`, false);
             }
         });
     }
 
-    listen(port, callback) {
+    listen(port, host, callback) {
         this.#createRequestHandler();
+        // support listen(callback)
         if(!callback && typeof port === 'function') {
             callback = port;
             port = 0;
         }
+        // support listen(port, callback)
+        if(typeof host === 'function') {
+            callback = host;
+            host = undefined;
+        }
+        const onListen = socket => {
+            if(!socket) {
+                let err = new Error('Failed to listen on port ' + port + '. No permission or address already in use.');
+                throw err;
+            }
+            this.port = uWS.us_socket_local_port(socket);
+            callback(this.port);
+        };
         let fn = 'listen';
+        let args = [port];
         if(typeof port !== 'number') {
             if(!isNaN(Number(port))) {
                 port = Number(port);
+                args.push(onListen);
+                if(host) {
+                    args.unshift(host);
+                }
             } else {
                 fn = 'listen_unix';
+                args.unshift(onListen);
+                if(host) {
+                    args.unshift(host);
+                }
             }
+        } else {
+            args.push(onListen);
         }
         this.listenCalled = true;
-        this.uwsApp[fn](port, socket => {
-            if(!socket) {
-                let err = new Error('Failed to listen on port ' + port + '. No permission or address already in use.');
-                throw err;
-            }
-            this.port = uWS.us_socket_local_port(socket);
-            callback(this.port);
-        });
+        this.uwsApp[fn](...args);
     }
 
     address() {

package/src/response.js

@@ -116,19 +116,7 @@ module.exports = class Response extends Writable {
             if(!this.headersSent) {
                 this.writeHead(this.statusCode);
                 this._res.writeStatus(this.statusCode.toString());
-                for(const header in this.headers) {
-                    if(header === 'content-length') {
-                        // if content-length is set, disable chunked transfer encoding, since size is known
-                        this.chunkedTransfer = false;
-                        this.totalSize = parseInt(this.headers[header]);
-                        continue;
-                    }
-                    this._res.writeHeader(header, this.headers[header]);
-                }
-                if(!this.headers['content-type']) {
-                    this._res.writeHeader('content-type', 'text/html' + (typeof chunk === 'string' ? `; charset=utf-8` : ''));
-                }
-                this.headersSent = true;
+                this.writeHeaders(typeof chunk === 'string');
             }
             if(!Buffer.isBuffer(chunk) && !(chunk instanceof ArrayBuffer)) {
                 chunk = Buffer.from(chunk);
@@ -184,6 +172,27 @@ module.exports = class Response extends Writable {
             this.set(header, headers[header]);
         }
     }
+    writeHeaders(utf8) {
+        for(const header in this.headers) {
+            if(header === 'content-length') {
+                // if content-length is set, disable chunked transfer encoding, since size is known
+                this.chunkedTransfer = false;
+                this.totalSize = parseInt(this.headers[header]);
+                continue;
+            }
+            if(Array.isArray(this.headers[header])) {
+                for(let value of this.headers[header]) {
+                    this._res.writeHeader(header, value);
+                }
+            } else {
+                this._res.writeHeader(header, this.headers[header]);
+            }
+        }
+        if(!this.headers['content-type']) {
+            this._res.writeHeader('content-type', 'text/html' + (utf8 ? `; charset=utf-8` : ''));
+        }
+        this.headersSent = true;
+    }
     _implicitHeader() {
         // compatibility function
         // usually should send headers but this is useless for us
@@ -212,16 +221,7 @@ module.exports = class Response extends Writable {
                 }
                 const fresh = this.req.fresh;
                 this._res.writeStatus(fresh ? '304' : this.statusCode.toString());
-                for(const header in this.headers) {
-                    if(header === 'content-length') {
-                        continue;
-                    }
-                    this._res.writeHeader(header, this.headers[header]);
-                }
-                if(!this.headers['content-type']) {
-                    this._res.writeHeader('content-type', 'text/html' + (typeof data === 'string' ? `; charset=utf-8` : ''));
-                }
-                this.headersSent = true;
+                this.writeHeaders(true);
                 if(fresh) {
                     this._res.end();
                     this.finished = true;
@@ -543,18 +543,22 @@ module.exports = class Response extends Writable {
     }
     append(field, value) {
         field = field.toLowerCase();
-        if(this.headers[field]) {
-            if(typeof value === 'string' || typeof value === 'number') {
-                this.headers[field] += ', ' + value;
-            } else if(Array.isArray(value)) {
-                this.headers[field] += ', ' + value.join(', ');
+        const old = this.headers[field];
+        if(old) {
+            const newVal = [];
+            if(Array.isArray(old)) {
+                newVal.push(...old);
+            } else if(old) {
+                newVal.push(old);
             }
-        } else {
-            if(typeof value === 'string' || typeof value === 'number') {
-                this.headers[field] = value.toString();
-            } else if(Array.isArray(value)) {
-                this.headers[field] = value.join(', ');
+            if(Array.isArray(value)) {
+                newVal.push(...value);
+            } else {
+                newVal.push(value);
             }
+            this.headers[field] = newVal;
+        } else {
+            this.headers[field] = value;
         }
         return this;
     }
@@ -719,16 +723,7 @@ function pipeStreamOverResponse(res, readStream, totalSize, callback) {
             if(!res.headersSent) {
                 res.writeHead(res.statusCode);
                 res._res.writeStatus(res.statusCode.toString());
-                for(const header in res.headers) {
-                    if(header === 'content-length') {
-                        continue;
-                    }
-                    res._res.writeHeader(header, res.headers[header]);
-                }
-                if(!res.headers['content-type']) {
-                    res._res.writeHeader('content-type', 'text/html; charset=utf-8');
-                }
-                res.headersSent = true;
+                res.writeHeaders(true);
             }
             const ab = chunk.buffer.slice(chunk.byteOffset, chunk.byteOffset + chunk.byteLength);
         

package/src/router.js

@@ -276,7 +276,8 @@ module.exports = class Router extends EventEmitter {
             const matchedRoute = await this._routeRequest(request, response, 0, optimizedPath, true, route);
             if(!matchedRoute && !response.headersSent && !response.aborted) {
                 response.status(404);
-                response.send(this._generateErrorPage(`Cannot ${request.method} ${request.path}`, false));
+                request.noEtag = true;
+                this._sendErrorPage(request, response, `Cannot ${request.method} ${request.path}`, false);
             }
         };
         route.optimizedPath = optimizedPath;
@@ -305,7 +306,7 @@ module.exports = class Router extends EventEmitter {
                     if(response.statusCode === 200) {
                         response.statusCode = 500;
                     }
-                    response.send(this._generateErrorPage(err, true));
+                    this._sendErrorPage(request, response, err, true);
                 }
             });
         }
@@ -313,7 +314,7 @@ module.exports = class Router extends EventEmitter {
         if(response.statusCode === 200) {
             response.statusCode = 500;
         }
-        response.send(this._generateErrorPage(err, true));
+        this._sendErrorPage(request, response, err, true);
     }
 
     #extractParams(pattern, path) {
@@ -524,11 +525,15 @@ module.exports = class Router extends EventEmitter {
         return fns;
     }
 
-    _generateErrorPage(err, checkEnv = false) {
+    _sendErrorPage(request, response, err, checkEnv = false) {
         if(checkEnv && this.get('env') === 'production') {
             err = 'Internal Server Error';
         }
-        return `<!DOCTYPE html>\n` +
+        request.noEtag = true;
+        response.setHeader('Content-Type', 'text/html; charset=utf-8');
+        response.setHeader('X-Content-Type-Options', 'nosniff');
+        response.setHeader('Content-Security-Policy', "default-src 'none'");
+        response.send(`<!DOCTYPE html>\n` +
             `<html lang="en">\n` +
             `<head>\n` +
             `<meta charset="utf-8">\n` +
@@ -537,6 +542,6 @@ module.exports = class Router extends EventEmitter {
             `<body>\n` +
             `<pre>${err?.stack ?? err}</pre>\n` +
             `</body>\n` +
-            `</html>\n`;
+            `</html>\n`);
     }
 }