ultimate-express 1.2.10 → 1.2.12

package/package.json

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

package/src/request.js

@@ -34,6 +34,7 @@ module.exports = class Request extends Readable {
     #cachedHeaders = null;
     #cachedDistinctHeaders = null;
     #rawHeadersEntries = [];
+    #cachedParsedIp = null;
     constructor(req, res, app) {
         super();
         this._res = res;
@@ -58,13 +59,13 @@ module.exports = class Request extends Readable {
         }
         this.method = req.getMethod().toUpperCase();
         this.params = {};
-        this.rawIp = Buffer.from(this._res.getRemoteAddressAsText()).toString();
 
         this._gotParams = new Set();
         this._stack = [];
         this._paramStack = [];
         this.bufferedData = Buffer.allocUnsafe(0);
         this.receivedData = false;
+        this.rawIp = this._res.getRemoteAddress();
 
         const additionalMethods = this.app.get('body methods');
         // skip reading body for non-POST requests
@@ -156,7 +157,7 @@ module.exports = class Request extends Readable {
     get ip() {
         const trust = this.app.get('trust proxy fn');
         if(!trust) {
-            return this.rawIp;
+            return this.parsedIp;
         }
         return proxyaddr(this, trust);
     }
@@ -217,9 +218,31 @@ module.exports = class Request extends Readable {
         return this.headers['x-requested-with'] === 'XMLHttpRequest';
     }
 
+    get parsedIp() {
+        if(this.#cachedParsedIp) {
+            return this.#cachedParsedIp;
+        }
+        let ip = '';
+        if(this.rawIp.byteLength === 4) {
+            // ipv4
+            ip = this.rawIp.join('.');
+        } else {
+            // ipv6
+            const dv = new DataView(this.rawIp);
+            for(let i = 0; i < 8; i++) {
+                ip += dv.getUint16(i * 2).toString(16).padStart(4, '0');
+                if(i < 7) {
+                    ip += ':';
+                }
+            }
+        }
+        this.#cachedParsedIp = ip;
+        return ip;
+    }
+
     get connection() {
         return {
-            remoteAddress: this.rawIp,
+            remoteAddress: this.parsedIp,
             localPort: this.app.port,
             remotePort: this.app.port,
             encrypted: this.app.ssl,

package/src/response.js

@@ -28,7 +28,9 @@ const fs = require("fs");
 const Path = require("path");
 const statuses = require("statuses");
 const { sign } = require("cookie-signature");
-const { EventEmitter } = require("tseep");
+// events is faster at init, tseep is faster at sending events
+// since we create a ton of objects and dont send a ton of events, its better to use events here
+const { EventEmitter } = require("events");
 const http = require("http");
 const ms = require('ms');   
 const etag = require("etag");
@@ -67,8 +69,12 @@ module.exports = class Response extends Writable {
         this.chunkedTransfer = true;
         this.totalSize = 0;
         this.headers = {
+            'connection': 'keep-alive',
             'keep-alive': 'timeout=10'
         };
+        if(this.app.get('x-powered-by')) {
+            this.headers['x-powered-by'] = 'UltimateExpress';
+        }
         // support for node internal
         this[kOutHeaders] = new Proxy(this.headers, {
             set: (obj, prop, value) => {
@@ -80,9 +86,6 @@ module.exports = class Response extends Writable {
             }
         });
         this.body = undefined;
-        if(this.app.get('x-powered-by')) {
-            this.set('x-powered-by', 'uExpress');
-        }
         this.on('error', (err) => {
             if(this.aborted) {
                 return;
@@ -194,7 +197,7 @@ module.exports = class Response extends Writable {
             if(!this.headersSent) {
                 const etagFn = this.app.get('etag fn');
                 if(data && !this.headers['etag'] && etagFn && !this.req.noEtag) {
-                    this.set('etag', etagFn(data));
+                    this.headers['etag'] = etagFn(data);
                 }
                 const fresh = this.req.fresh;
                 this._res.writeStatus(fresh ? '304' : this.statusCode.toString());
@@ -361,15 +364,15 @@ module.exports = class Response extends Writable {
         }
 
         // headers
-        if(!this.get('Content-Type')) {
+        if(!this.headers['content-type']) {
             const m = mime.lookup(fullpath);
             if(m) this.type(m);
         }
         if(options.cacheControl) {
-            this.set('Cache-Control', `public, max-age=${options.maxAge / 1000}` + (options.immutable ? ', immutable' : ''));
+            this.headers['cache-control'] = `public, max-age=${options.maxAge / 1000}` + (options.immutable ? ', immutable' : '');
         }
         if(options.lastModified) {
-            this.set('Last-Modified', stat.mtime.toUTCString());
+            this.headers['last-modified'] = stat.mtime.toUTCString();
         }
         if(options.headers) {
             for(const header in options.headers) {
@@ -382,7 +385,7 @@ module.exports = class Response extends Writable {
 
         // etag
         if(options.etag && !this.headers['etag'] && etagFn) {
-            this.set('etag', etagFn(stat));
+            this.headers['etag'] = etagFn(stat);
         }
         if(!options.etag) {
             this.req.noEtag = true;
@@ -397,7 +400,7 @@ module.exports = class Response extends Writable {
         // range requests
         let offset = 0, len = stat.size, ranged = false;
         if(options.acceptRanges) {
-            this.set('accept-ranges', 'bytes');
+            this.headers['accept-ranges'] = 'bytes';
             if(this.req.headers.range) {
                 let ranges = this.req.range(stat.size, {
                     combine: true
@@ -410,12 +413,12 @@ module.exports = class Response extends Writable {
     
                 if(ranges === -1) {
                     this.status(416);
-                    this.set('Content-Range', `bytes */${stat.size}`);
+                    this.headers['content-range'] = `bytes */${stat.size}`;
                     return done(new Error('Range Not Satisfiable'));
                 }
                 if(ranges !== -2 && ranges.length === 1) {
                     this.status(206);
-                    this.set('Content-Range', `bytes ${ranges[0].start}-${ranges[0].end}/${stat.size}`);
+                    this.headers['content-range'] = `bytes ${ranges[0].start}-${ranges[0].end}/${stat.size}`;
                     offset = ranges[0].start;
                     len = ranges[0].end - ranges[0].start + 1;
                     ranged = true;
@@ -501,7 +504,7 @@ module.exports = class Response extends Writable {
             if(field === 'set-cookie' && Array.isArray(value)) {
                 value = value.join('; ');
             } else if(field === 'content-type') {
-                if(value.startsWith('text/') || value === 'application/json' || value === 'application/javascript') {
+                if(!value.includes('charset=') && (value.startsWith('text/') || value === 'application/json' || value === 'application/javascript')) {
                     value += '; charset=utf-8';
                 }
             }
@@ -589,7 +592,7 @@ module.exports = class Response extends Writable {
         return this.cookie(name, '', opts);
     }
     attachment(filename) {
-        this.set('Content-Disposition', `attachment; filename="${filename}"`);
+        this.headers['Content-Disposition'] = `attachment; filename="${filename}"`;
         this.type(filename.split('.').pop());
         return this;
     }
@@ -611,8 +614,8 @@ module.exports = class Response extends Writable {
         return this;
     }
     json(body) {
-        if(!this.get('Content-Type')) {
-            this.set('Content-Type', 'application/json; charset=utf-8');
+        if(!this.headers['content-type']) {
+            this.headers['content-type'] = 'application/json; charset=utf-8';
         }
         const escape = this.app.get('json escape');
         const replacer = this.app.get('json replacer');
@@ -623,9 +626,9 @@ module.exports = class Response extends Writable {
         let callback = this.req.query[this.app.get('jsonp callback name')];
         let body = stringify(object, this.app.get('json replacer'), this.app.get('json spaces'), this.app.get('json escape'));
 
-        if(!this.get('Content-Type')) {
-            this.set('Content-Type', 'application/javascript; charset=utf-8');
-            this.set('X-Content-Type-Options', 'nosniff');
+        if(!this.headers['content-type']) {
+            this.headers['content-type'] = 'application/javascript; charset=utf-8';
+            this.headers['X-Content-Type-Options'] = 'nosniff';
         }
 
         if(Array.isArray(callback)) {
@@ -633,8 +636,6 @@ module.exports = class Response extends Writable {
         }
 
         if(typeof callback === 'string' && callback.length !== 0) {
-            this.set('Content-Type', 'application/javascript; charset=utf-8');
-            this.set('X-Content-Type-Options', 'nosniff');
             callback = callback.replace(/[^\[\]\w$.]/g, '');
 
             if(body === undefined) {
@@ -651,7 +652,7 @@ module.exports = class Response extends Writable {
         return this.send(body);
     }
     links(links) {
-        this.set('Link', Object.entries(links).map(([rel, url]) => `<${url}>; rel="${rel}"`).join(', '));
+        this.headers['link'] = Object.entries(links).map(([rel, url]) => `<${url}>; rel="${rel}"`).join(', ');
         return this;
     }
     location(path) {
@@ -660,7 +661,7 @@ module.exports = class Response extends Writable {
             if(!path) path = this.req.get('Referer');
             if(!path) path = '/';
         }
-        return this.set('Location', encodeUrl(path));
+        return this.headers['location'] = encodeUrl(path);
     }
     redirect(status, url) {
         if(typeof status !== 'number' && !url) {
@@ -669,7 +670,7 @@ module.exports = class Response extends Writable {
         }
         this.location(url);
         this.status(status);
-        this.set('Content-Type', 'text/plain; charset=utf-8');
+        this.headers['content-type'] = 'text/plain; charset=utf-8';
         return this.send(`${statuses.message[status] ?? status}. Redirecting to ${url}`);
     }
 
@@ -680,7 +681,7 @@ module.exports = class Response extends Writable {
         if(ct.startsWith('text/') || ct === 'application/json' || ct === 'application/javascript') {
             ct += '; charset=UTF-8';
         }
-        return this.set('Content-Type', ct);
+        return this.set('content-type', ct);
     }
     contentType(type) {
         return this.type(type);

package/src/router.js

@@ -326,7 +326,6 @@ module.exports = class Router extends EventEmitter {
     }
 
     #preprocessRequest(req, res, route) {
-        return new Promise(async resolve => {
             req.route = route;
             if(route.optimizedParams) {
                 req.params = req.optimizedParams;
@@ -350,34 +349,37 @@ module.exports = class Router extends EventEmitter {
                 }
             }
 
-            for(let param in req.params) {
-                if(this.#paramCallbacks.has(param) && !req._gotParams.has(param)) {
-                    req._gotParams.add(param);
-                    const pcs = this.#paramCallbacks.get(param);
-                    for(let i = 0; i < pcs.length; i++) {
-                        const fn = pcs[i];
-                        await new Promise(resolveRoute => {
-                            const next = (thingamabob) => {
-                                if(thingamabob) {
-                                    if(thingamabob === 'route') {
-                                        return resolve('route');
-                                    } else {
-                                        this.#handleError(thingamabob, req, res);
-                                        return resolve(false);
-                                    }
-                                }
-                                return resolveRoute();
-                            };
-                            req.next = next;
-                            fn(req, res, next, req.params[param], param);
-                        });
+            if(this.#paramCallbacks.size > 0) {
+                return new Promise(async resolve => {
+                    for(let param in req.params) {
+                        if(this.#paramCallbacks.has(param) && !req._gotParams.has(param)) {
+                            req._gotParams.add(param);
+                            const pcs = this.#paramCallbacks.get(param);
+                            for(let i = 0; i < pcs.length; i++) {
+                                const fn = pcs[i];
+                                await new Promise(resolveRoute => {
+                                    const next = (thingamabob) => {
+                                        if(thingamabob) {
+                                            if(thingamabob === 'route') {
+                                                return resolve('route');
+                                            } else {
+                                                this.#handleError(thingamabob, req, res);
+                                                return resolve(false);
+                                            }
+                                        }
+                                        return resolveRoute();
+                                    };
+                                    req.next = next;
+                                    fn(req, res, next, req.params[param], param);
+                                });
+                            }
+                        }
                     }
-                }
+                });
             }
-
-            resolve(true);
-        });
+            return true;
     }
+
     param(name, fn) {
         if(typeof name === 'function') {
             deprecated('app.param(callback)', 'app.param(name, callback)', true);
@@ -413,7 +415,7 @@ module.exports = class Router extends EventEmitter {
                 return resolve(this._routeRequest(req, res, 0, this._routes, false, skipUntil));
             }
             let callbackindex = 0;
-            const continueRoute = await this.#preprocessRequest(req, res, route);
+            let continueRoute = await this.#preprocessRequest(req, res, route);
             if(route.use) {
                 req._stack.push(route.path);
                 req._opPath =