ultimate-express 1.3.1 → 1.3.2

package/README.md

@@ -302,6 +302,7 @@ Almost all middlewares that are compatible with Express are compatible with µEx
 - ✅ [express-rate-limit](https://npmjs.com/package/express-rate-limit)
 - ✅ [express-subdomain](https://npmjs.com/package/express-subdomain)
 - ✅ [vhost](https://npmjs.com/package/vhost)
+- ✅ [tsoa](https://github.com/lukeautry/tsoa)
 
 Middlewares and modules that are confirmed to not work:
 

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "ultimate-express",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "The Ultimate Express. Fastest http server with full Express compatibility, based on uWebSockets.",
   "main": "src/index.js",
   "scripts": {
-    "test": "node tests/index.js"
+    "test": "node tests/index.js",
+    "dev": "node --inspect=9229 demo/index.js"
   },
   "engines": {
     "node": ">=16"

package/src/request.js

@@ -351,53 +351,54 @@ module.exports = class Request extends Readable {
         if(this.#cachedHeaders) {
             return this.#cachedHeaders;
         }
-        let headers = new NullObject();
-        this.#rawHeadersEntries.forEach((val) => {
-            const key = val[0].toLowerCase();
-            const value = val[1];
-            if(headers[key]) {
+        this.#cachedHeaders = new NullObject();
+        for (let index = 0, len = this.#rawHeadersEntries.length; index < len; index++) {
+            let [key, value] = this.#rawHeadersEntries[index];   
+            key = key.toLowerCase();
+            if(this.#cachedHeaders[key]) {
                 if(discardedDuplicates.includes(key)) {
-                    return;
+                    continue;
                 }
                 if(key === 'cookie') {
-                    headers[key] += '; ' + value;
+                    this.#cachedHeaders[key] += '; ' + value;
                 } else if(key === 'set-cookie') {
-                    headers[key].push(value);
+                    this.#cachedHeaders[key].push(value);
                 } else {
-                    headers[key] += ', ' + value;
+                    this.#cachedHeaders[key] += ', ' + value;
                 }
-                return;
+                continue;
             }
             if(key === 'set-cookie') {
-                headers[key] = [value];
+                this.#cachedHeaders[key] = [value];
             } else {
-                headers[key] = value;
+                this.#cachedHeaders[key] = value;
             }
-        });
-        this.#cachedHeaders = headers;
-        return headers;
+        }
+        return this.#cachedHeaders;
     }
 
     get headersDistinct() {
         if(this.#cachedDistinctHeaders) {
             return this.#cachedDistinctHeaders;
         }
-        let headers = new NullObject();
+        this.#cachedDistinctHeaders = new NullObject();
         this.#rawHeadersEntries.forEach((val) => {
-            if(!headers[val[0]]) {
-                headers[val[0]] = [];
+            const [key, value] = val;
+            if(!this.#cachedDistinctHeaders[key]) {
+                this.#cachedDistinctHeaders[key] = [value];
+                return;
             }
-            headers[val[0]].push(val[1]);
+            this.#cachedDistinctHeaders[key].push(value);
         });
-        this.#cachedDistinctHeaders = headers;
-        return headers;
+        return this.#cachedDistinctHeaders;
     }
 
     get rawHeaders() {
         const res = [];
-        this.#rawHeadersEntries.forEach((val) => {
+        for (let index = 0, len = this.#rawHeadersEntries.length; index < len; index++) {
+            const val = this.#rawHeadersEntries[index];
             res.push(val[0], val[1]);
-        });
+        }
         return res;
     }
 }

package/src/response.js

@@ -225,7 +225,7 @@ module.exports = class Response extends Writable {
         this._res.cork(() => {
             if(!this.headersSent) {
                 const etagFn = this.app.get('etag fn');
-                if(data && !this.headers['etag'] && etagFn && !this.req.noEtag) {
+                if(etagFn && data && !this.headers['etag'] && !this.req.noEtag) {
                     this.headers['etag'] = etagFn(data);
                 }
                 const fresh = this.req.fresh;
@@ -238,8 +238,9 @@ module.exports = class Response extends Writable {
                     return;
                 }
             }
-            if(!data && this.headers['content-length']) {
-                this._res.endWithoutBody(this.headers['content-length'].toString());
+            const contentLength = this.headers['content-length'];
+            if(!data && contentLength) {
+                this._res.endWithoutBody(contentLength.toString());
             } else {
                 if(data instanceof Buffer) {
                     data = data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength);
@@ -279,8 +280,8 @@ module.exports = class Response extends Writable {
         }
         if(typeof body === 'string') {
             const contentType = this.headers['content-type'];
-            if(!contentType){
-                this.type('html'); // string defaulting to html
+            if(!contentType) {
+                this.headers['content-type'] = 'text/html; charset=utf-8';
             } else if(!contentType.includes(';')) {
                 this.headers['content-type'] += '; charset=utf-8';
             }
@@ -361,7 +362,8 @@ module.exports = class Response extends Writable {
                     this.status(403);
                     return done(new Error('Forbidden'));
                 case 'ignore_files':
-                    if(parts.length > 1 && parts[parts.length - 1].startsWith('.')) {
+                    const len = parts.length;
+                    if(len > 1 && parts[len - 1].startsWith('.')) {
                         this.status(404);
                         return done(new Error('Not found'));
                     }
@@ -408,7 +410,7 @@ module.exports = class Response extends Writable {
         }
 
         // etag
-        if(options.etag && !this.headers['etag'] && etagFn) {
+        if(options.etag && etagFn && !this.headers['etag']) {
             this.headers['etag'] = etagFn(stat);
         }
         if(!options.etag) {
@@ -442,9 +444,10 @@ module.exports = class Response extends Writable {
                 }
                 if(ranges !== -2 && ranges.length === 1) {
                     this.status(206);
-                    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;
+                    const range = ranges[0];
+                    this.headers['content-range'] = `bytes ${range.start}-${range.end}/${stat.size}`;
+                    offset = range.start;
+                    len = range.end - range.start + 1;
                     ranged = true;
                 }
             }
@@ -536,18 +539,12 @@ module.exports = class Response extends Writable {
         }
         return this;
     }
-    header(field, value) {
-        return this.set(field, value);
-    }
-    setHeader(field, value) {
-        return this.set(field, value);
-    }
+    header = this.set;
+    setHeader = this.set;
     get(field) {
         return this.headers[field.toLowerCase()];
     }
-    getHeader(field) {
-        return this.get(field);
-    }
+    getHeader = this.get;
     removeHeader(field) {
         delete this.headers[field.toLowerCase()];
         return this;
@@ -709,9 +706,7 @@ module.exports = class Response extends Writable {
 
         return this.set('content-type', ct);
     }
-    contentType(type) {
-        return this.type(type);
-    }
+    contentType = this.type;
 
     vary(field) {
         vary(this, field);

package/src/router.js

@@ -31,6 +31,8 @@ const methods = [
 ];
 const supportedUwsMethods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD', 'CONNECT', 'TRACE'];
 
+const regExParam = /:(\w+)/g;
+
 module.exports = class Router extends EventEmitter {
     constructor(settings = {}) {
         super();
@@ -264,7 +266,7 @@ module.exports = class Router extends EventEmitter {
             method = 'del';
         }
         if(!route.optimizedRouter && route.path.includes(":")) {
-            route.optimizedParams = route.path.match(/:(\w+)/g).map(p => p.slice(1));
+            route.optimizedParams = route.path.match(regExParam).map(p => p.slice(1));
         }
         const fn = async (res, req) => {
             const { request, response } = this.handleRequest(res, req);
@@ -282,7 +284,7 @@ module.exports = class Router extends EventEmitter {
             }
         };
         route.optimizedPath = optimizedPath;
-        let replacedPath = route.path.replace(/:(\w+)/g, ':x');
+        let replacedPath = route.path.replace(regExParam, ':x');
         this.uwsApp[method](replacedPath, fn);
         if(!this.get('strict routing') && route.path[route.path.length - 1] !== '/') {
             this.uwsApp[method](replacedPath + '/', fn);
@@ -407,33 +409,33 @@ module.exports = class Router extends EventEmitter {
     }
 
     async _routeRequest(req, res, startIndex = 0, routes = this._routes, skipCheck = false, skipUntil) {
-        return new Promise(async (resolve) => {
-            let routeIndex = skipCheck ? startIndex : findIndexStartingFrom(routes, r => (r.all || r.method === req.method || (r.gettable && req.method === 'HEAD')) && this._pathMatches(r, req), startIndex);
-            const route = routes[routeIndex];
-            if(!route) {
-                if(!skipCheck) {
-                    // on normal unoptimized routes, if theres no match then there is no route
-                    return resolve(false);
-                }
-                // on optimized routes, there can be more routes, so we have to use unoptimized routing and skip until we find route we stopped at
-                return resolve(this._routeRequest(req, res, 0, this._routes, false, skipUntil));
+        let routeIndex = skipCheck ? startIndex : findIndexStartingFrom(routes, r => (r.all || r.method === req.method || (r.gettable && req.method === 'HEAD')) && this._pathMatches(r, req), startIndex);
+        const route = routes[routeIndex];
+        if(!route) {
+            if(!skipCheck) {
+                // on normal unoptimized routes, if theres no match then there is no route
+                return false;
             }
-            let callbackindex = 0;
-            const continueRoute = await this._preprocessRequest(req, res, route);
-            if(route.use) {
-                const strictRouting = this.get('strict routing');
-                req._stack.push(route.path);
-                req._opPath = req.path.replace(this.getFullMountpath(req), '');
-                if(strictRouting) {
-                    if(req.endsWithSlash && req.path !== '/') {
-                        req._opPath += '/';
-                    }
-                } else if(req.endsWithSlash && req.path !== '/') {
-                    req._opPath = req._opPath.slice(0, -1);
+            // on optimized routes, there can be more routes, so we have to use unoptimized routing and skip until we find route we stopped at
+            return this._routeRequest(req, res, 0, this._routes, false, skipUntil);
+        }
+        let callbackindex = 0;
+        const continueRoute = await this._preprocessRequest(req, res, route);
+        if(route.use) {
+            const strictRouting = this.get('strict routing');
+            req._stack.push(route.path);
+            req._opPath = req.path.replace(this.getFullMountpath(req), '');
+            if(strictRouting) {
+                if(req.endsWithSlash && req.path !== '/') {
+                     req._opPath += '/';
                 }
-                req.url = req._opPath + req.urlQuery;
-                if(req.url === '') req.url = '/';
+            } else if(req.endsWithSlash && req.path !== '/') {
+                req._opPath = req._opPath.slice(0, -1);
             }
+            req.url = req._opPath + req.urlQuery;
+            if(req.url === '') req.url = '/';
+        }
+        return new Promise((resolve) => {
             const next = async (thingamabob) => {
                 if(thingamabob) {
                     if(thingamabob === 'route' || thingamabob === 'skipPop') {
@@ -565,4 +567,4 @@ module.exports = class Router extends EventEmitter {
             `</body>\n` +
             `</html>\n`);
     }
-}
+}

package/src/utils.js

@@ -23,7 +23,11 @@ const etag = require("etag");
 const { Stats } = require("fs");
 
 function fastQueryParse(query, options) {
-    if(query.length <= 128) {
+    const len = query.length;
+    if(len === 0){
+        return new NullObject();
+    }
+    if(len <= 128) {
         if(!query.includes('[') && !query.includes('%5B') && !query.includes('.') && !query.includes('%2E')) {
             return querystring.parse(query);
         }
@@ -44,9 +48,9 @@ function patternToRegex(pattern, isPrefix = false) {
     }
 
     let regexPattern = pattern
-        .replace(/\./g, '\\.')
-        .replace(/\-/g, '\\-')
-        .replace(/\*/g, '(.*)') // Convert * to .*
+        .replaceAll('.', '\\.')
+        .replaceAll('-', '\\-')
+        .replaceAll('*', '(.*)') // Convert * to .*
         .replace(/:(\w+)(\(.+?\))?/g, (match, param, regex) => {
             return `(?<${param}>${regex ? regex + '($|\\/)' : '[^/]+'})`;
         }); // Convert :param to capture group
@@ -101,12 +105,13 @@ function acceptParams(str) {
     const parts = str.split(/ *; */);
     const ret = { value: parts[0], quality: 1, params: {} }
   
-    for (let i = 1; i < parts.length; ++i) {
+    for (let i = 1, len = parts.length; i < len; ++i) {
       const pms = parts[i].split(/ *= */);
-      if ('q' === pms[0]) {
-        ret.quality = parseFloat(pms[1]);
+      const [pms_0, pms_1] = pms;
+      if ('q' === pms_0) {
+        ret.quality = parseFloat(pms_1);
       } else {
-        ret.params[pms[0]] = pms[1];
+        ret.params[pms_0] = pms_1;
       }
     }
   
@@ -218,7 +223,7 @@ function decode (path) {
 const UP_PATH_REGEXP = /(?:^|[\\/])\.\.(?:[\\/]|$)/;
 
 function containsDotFile(parts) {
-    for(let i = 0; i < parts.length; i++) {
+    for(let i = 0, len = parts.length; i < len; i++) {
         const part = parts[i];
         if(part.length > 1 && part[0] === '.') {
             return true;
@@ -341,4 +346,4 @@ module.exports = {
     findIndexStartingFrom,
     fastQueryParse,
     canBeOptimized
-};
+};