ultimate-express 1.3.8 → 1.3.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-express",
-  "version": "1.3.8",
+  "version": "1.3.10",
   "description": "The Ultimate Express. Fastest http server with full Express compatibility, based on uWebSockets.",
   "main": "src/index.js",
   "scripts": {
@@ -63,6 +63,7 @@
     "vary": "^1.1.2"
   },
   "devDependencies": {
+    "@codechecks/client": "^0.1.12",
     "body-parser": "^1.20.3",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",

package/src/application.js

@@ -63,7 +63,7 @@ class Application extends Router {
             this.ssl = false;
         }
         this.cache = new NullObject();
-        this.engines = new NullObject();
+        this.engines = {};
         this.locals = {
             settings: this.settings
         };
@@ -292,7 +292,7 @@ class Application extends Router {
             view = new View(name, {
                 defaultEngine: this.get('view engine'),
                 root: this.get('views'),
-                engines: this.engines
+                engines: {...this.engines}
             });
             if(!view.path) {
                 const dirs = Array.isArray(view.root) && view.root.length > 1

package/src/declarative.js

@@ -6,6 +6,11 @@ const parser = acorn.Parser;
 
 const allowedResMethods = ['set', 'header', 'setHeader', 'status', 'send', 'end', 'append'];
 const allowedIdentifiers = ['query', 'params', ...allowedResMethods];
+const objKeyRegex = /[\s{\n]([A-Za-z-0-9_]+)(\s|\n)*?:/g;
+
+function replaceSingleCharacter(str, index, char) {
+    return str.slice(0, index) + char + str.slice(index + 1);
+}
 
 // generates a declarative response from a callback
 // uWS allows creating such responses and they are extremely fast
@@ -274,11 +279,19 @@ module.exports = function compileDeclarative(cb, app) {
                         }
                         body.push(...stuff.reverse());
                     } else if(arg.type === 'ObjectExpression') {
+                        if(call.obj.propertyName === 'end') {
+                            return false;
+                        }
                         // only simple objects can be optimized
+                        let objCode = code;
                         for(let property of arg.properties) {
                             if(property.key.type !== 'Identifier' && property.key.type !== 'Literal') {
                                 return false;
                             }
+                            if(property.value.raw.startsWith("'") && property.value.raw.endsWith("'") && !property.value.value.includes("'")) {
+                                objCode = replaceSingleCharacter(objCode, property.value.start, '"');
+                                objCode = replaceSingleCharacter(objCode, property.value.end - 1, '"');
+                            }
                             if(property.value.type !== 'Literal') {
                                 return false;
                             }
@@ -286,7 +299,18 @@ module.exports = function compileDeclarative(cb, app) {
                         if(typeof app.get('json replacer') !== 'undefined' && typeof app.get('json replacer') !== 'string') {
                             return false;
                         }
-                        body.push({type: 'text', value: stringify(JSON.parse(code.slice(arg.start, arg.end)), app.get('json replacer'), app.get('json spaces'), app.get('json escape'))});
+
+                        headers.push(['content-type', 'application/json; charset=utf-8']);
+                        body.push({
+                            type: 'text',
+                            value: 
+                            stringify(
+                                JSON.parse(objCode.slice(arg.start, arg.end).replace(objKeyRegex, '"$1":')), 
+                                app.get('json replacer'), 
+                                app.get('json spaces'), 
+                                app.get('json escape')
+                            )
+                        });
                     } else {
                         return false;
                     }

package/src/request.js

@@ -45,6 +45,7 @@ module.exports = class Request extends Readable {
         this._req.forEach((key, value) => {
             this.#rawHeadersEntries.push([key, value]);
         });
+        this.routeCount = 0;
         this.key = key++;
         if(key > 100000) {
             key = 0;
@@ -65,7 +66,7 @@ module.exports = class Request extends Readable {
             this._opPath = this._opPath.slice(0, -1);
         }
         this.method = req.getCaseSensitiveMethod().toUpperCase();
-        this.params = new NullObject();
+        this.params = {};
 
         this._gotParams = new Set();
         this._stack = [];
@@ -209,7 +210,7 @@ module.exports = class Request extends Readable {
         } else {
             this.#cachedQuery = new NullObject();
         }
-        return this.#cachedQuery;
+        return {...this.#cachedQuery};
     }
 
     get secure() {
@@ -307,23 +308,19 @@ module.exports = class Request extends Readable {
     }
 
     accepts(...types) {
-        const accept = accepts({ headers: this.headers });
-        return accept.types(...types);
+        return accepts(this).types(...types);
     }
 
     acceptsCharsets(...charsets) {
-        const accept = accepts({ headers: this.headers });
-        return accept.charsets(...charsets);
+        return accepts(this).charsets(...charsets);
     }
 
     acceptsEncodings(...encodings) {
-        const accept = accepts({ headers: this.headers });
-        return accept.encodings(...encodings);
+        return accepts(this).encodings(...encodings);
     }
     
     acceptsLanguages(...languages) {
-        const accept = accepts({ headers: this.headers });
-        return accept.languages(...languages);
+        return accepts(this).languages(...languages);
     }
 
     is(type) {
@@ -350,7 +347,7 @@ module.exports = class Request extends Readable {
     get headers() {
         // https://nodejs.org/api/http.html#messageheaders
         if(this.#cachedHeaders) {
-            return this.#cachedHeaders;
+            return {...this.#cachedHeaders};
         }
         this.#cachedHeaders = new NullObject();
         for (let index = 0, len = this.#rawHeadersEntries.length; index < len; index++) {
@@ -375,7 +372,7 @@ module.exports = class Request extends Readable {
                 this.#cachedHeaders[key] = value;
             }
         }
-        return this.#cachedHeaders;
+        return {...this.#cachedHeaders};
     }
 
     get headersDistinct() {
@@ -391,7 +388,7 @@ module.exports = class Request extends Readable {
             }
             this.#cachedDistinctHeaders[key].push(value);
         });
-        return this.#cachedDistinctHeaders;
+        return {...this.#cachedDistinctHeaders};
     }
 
     get rawHeaders() {
@@ -402,4 +399,4 @@ module.exports = class Request extends Readable {
         }
         return res;
     }
-}
+}

package/src/response.js

@@ -83,6 +83,7 @@ module.exports = class Response extends Writable {
         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) => {
@@ -256,8 +257,10 @@ module.exports = class Response extends Writable {
             if(this.socketExists) this.socket.emit('close');
         });
 
+        this.emit('finish')
         return this;
     }
+
     send(body) {
         if(this.headersSent) {
             throw new Error('Can\'t write body: Response was already sent');
@@ -288,6 +291,7 @@ module.exports = class Response extends Writable {
         }
         return this.end(body);
     }
+
     sendFile(path, options = new NullObject(), callback) {
         if(typeof path !== 'string') {
             throw new TypeError('path argument is required to res.sendFile');
@@ -496,10 +500,10 @@ module.exports = class Response extends Writable {
         if (typeof filename === 'function') {
             done = filename;
             name = null;
-            opts = new NullObject();
+            opts = {};
         } else if (typeof options === 'function') {
             done = options;
-            opts = new NullObject();
+            opts = {};
         }
 
         // support optional filename, where options may be in it's place
@@ -577,10 +581,10 @@ module.exports = class Response extends Writable {
     render(view, options, callback) {
         if(typeof options === 'function') {
             callback = options;
-            options = new NullObject();
+            options = {};
         }
         if(!options) {
-            options = new NullObject();
+            options = {};
         } else {
             options = Object.assign({}, options);
         }
@@ -594,7 +598,7 @@ module.exports = class Response extends Writable {
     }
     cookie(name, value, options) {
         if(!options) {
-            options = new NullObject();
+            options = {};
         }
         let val = typeof value === 'object' ? "j:"+JSON.stringify(value) : String(value);
         if(options.maxAge != null) {

package/src/router.js

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const { patternToRegex, needsConversionToRegex, deprecated, findIndexStartingFrom, canBeOptimized, NullObject } = require("./utils.js");
+const { patternToRegex, needsConversionToRegex, deprecated, findIndexStartingFrom, canBeOptimized, NullObject, EMPTY_REGEX } = require("./utils.js");
 const Response = require("./response.js");
 const Request = require("./request.js");
 const { EventEmitter } = require("tseep");
@@ -93,6 +93,9 @@ module.exports = class Router extends EventEmitter {
 
     getFullMountpath(req) {
         let fullStack = req._stack.join("");
+        if(!fullStack){
+            return EMPTY_REGEX;
+        }
         let fullMountpath = this._mountpathCache.get(fullStack);
         if(!fullMountpath) {
             fullMountpath = patternToRegex(fullStack, true);
@@ -118,7 +121,9 @@ module.exports = class Router extends EventEmitter {
             }
             return pattern === path;
         }
-        
+        if (pattern === EMPTY_REGEX){
+            return true;
+        }
         return pattern.test(path);
     }
 
@@ -355,60 +360,60 @@ module.exports = class Router extends EventEmitter {
     }
 
     _preprocessRequest(req, res, route) {
-            req.route = route;
-            if(route.optimizedParams) {
-                req.params = req.optimizedParams;
-            } else if(typeof route.path === 'string' && (route.path.includes(':') || route.path.includes('*')) && route.pattern instanceof RegExp) {
-                let path = req._originalPath;
-                if(req._stack.length > 0) {
-                    path = path.replace(this.getFullMountpath(req), '');
-                }
-                req.params = this._extractParams(route.pattern, path);
-                if(req._paramStack.length > 0) {
-                    for(let params of req._paramStack) {
-                        req.params = {...params, ...req.params};
-                    }
+        req.route = route;
+        if(route.optimizedParams) {
+            req.params = {...req.optimizedParams};
+        } else if(typeof route.path === 'string' && (route.path.includes(':') || route.path.includes('*')) && route.pattern instanceof RegExp) {
+            let path = req._originalPath;
+            if(req._stack.length > 0) {
+                path = path.replace(this.getFullMountpath(req), '');
+            }
+            req.params = {...this._extractParams(route.pattern, path)};
+            if(req._paramStack.length > 0) {
+                for(let params of req._paramStack) {
+                    req.params = {...params, ...req.params};
                 }
-            } else {
-                req.params = new NullObject();
-                if(req._paramStack.length > 0) {
-                    for(let params of req._paramStack) {
-                        req.params = {...params, ...req.params};
-                    }
+            }
+        } else {
+            req.params = {};
+            if(req._paramStack.length > 0) {
+                for(let params of req._paramStack) {
+                    req.params = {...params, ...req.params};
                 }
             }
+        }
 
-            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);
-                                            }
+        if(this._paramCallbacks.size > 0) {
+            return new Promise(async resolve => {
+                for(let param in req.params) {
+                    const pcs = this._paramCallbacks.get(param);
+                    if(pcs && !req._gotParams.has(param)) {
+                        req._gotParams.add(param);
+                        for(let i = 0, len = pcs.length; i < len; 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);
-                                });
-                            }
+                                    }
+                                    return resolveRoute();
+                                };
+                                req.next = next;
+                                fn(req, res, next, req.params[param], param);
+                            });
                         }
                     }
+                }
 
-                    resolve(true)
-                });
-            }
-            return true;
+                resolve(true)
+            });
+        }
+        return true;
     }
 
     param(name, fn) {
@@ -445,11 +450,18 @@ module.exports = class Router extends EventEmitter {
             return this._routeRequest(req, res, 0, this._routes, false, skipUntil);
         }
         let callbackindex = 0;
-        const continueRoute = await this._preprocessRequest(req, res, route);
+
+        // avoid calling _preprocessRequest as async function as its slower
+        // but it seems like calling it as async has unintended consequence of resetting max call stack size
+        // so call it as async when the request has been through every 300 routes to reset it
+        const continueRoute = this._paramCallbacks.size === 0 && req.routeCount % 300 !== 0 ? 
+            this._preprocessRequest(req, res, route) : await this._preprocessRequest(req, res, route);
+        
+        const strictRouting = this.get('strict routing');
         if(route.use) {
-            const strictRouting = this.get('strict routing');
             req._stack.push(route.path);
-            req._opPath = req._originalPath.replace(this.getFullMountpath(req), '');
+            const fullMountpath = this.getFullMountpath(req);
+            req._opPath = fullMountpath !== EMPTY_REGEX ? req._originalPath.replace(fullMountpath, '') : req._originalPath;
             if(req.endsWithSlash && req._opPath[req._opPath.length - 1] !== '/') {
                 if(strictRouting) {
                     req._opPath += '/';
@@ -470,7 +482,7 @@ module.exports = class Router extends EventEmitter {
                     if(thingamabob === 'route' || thingamabob === 'skipPop') {
                         if(route.use && thingamabob !== 'skipPop') {
                             req._stack.pop();
-                            const strictRouting = this.get('strict routing');
+                            
                             req._opPath = req._stack.length > 0 ? req._originalPath.replace(this.getFullMountpath(req), '') : req._originalPath;
                             if(strictRouting) {
                                 if(req.endsWithSlash && req._opPath[req._opPath.length - 1] !== '/') {
@@ -490,6 +502,7 @@ module.exports = class Router extends EventEmitter {
                                 req.app = req.app.parent;
                             }
                         }
+                        req.routeCount++;
                         return resolve(this._routeRequest(req, res, routeIndex + 1, routes, skipCheck, skipUntil));
                     } else {
                         this._handleError(thingamabob, req, res);

package/src/utils.js

@@ -22,6 +22,8 @@ const querystring = require("fast-querystring");
 const etag = require("etag");
 const { Stats } = require("fs");
 
+const EMPTY_REGEX = new RegExp(``);
+
 function fastQueryParse(query, options) {
     const len = query.length;
     if(len === 0){
@@ -29,10 +31,12 @@ function fastQueryParse(query, options) {
     }
     if(len <= 128) {
         if(!query.includes('[') && !query.includes('%5B') && !query.includes('.') && !query.includes('%2E')) {
-            return querystring.parse(query);
+            // [Object: null prototype] issue
+            return {...querystring.parse(query)};
         }
     }
-    return qs.parse(query, options);
+    // [Object: null prototype] issue
+    return {...qs.parse(query, options)};
 }
 
 function removeDuplicateSlashes(path) {
@@ -44,7 +48,7 @@ function patternToRegex(pattern, isPrefix = false) {
         return pattern;
     }
     if(isPrefix && pattern === '') {
-        return new RegExp(``);
+        return EMPTY_REGEX;
     }
 
     let regexPattern = pattern
@@ -102,17 +106,33 @@ function canBeOptimized(pattern) {
 }
 
 function acceptParams(str) {
-    const parts = str.split(/ *; */);
-    const ret = { value: parts[0], quality: 1, params: {} }
-  
-    for (let i = 1, len = parts.length; i < len; ++i) {
-      const pms = parts[i].split(/ *= */);
-      const [pms_0, pms_1] = pms;
-      if ('q' === pms_0) {
-        ret.quality = parseFloat(pms_1);
-      } else {
-        ret.params[pms_0] = pms_1;
-      }
+    const length = str.length;
+    const colonIndex = str.indexOf(';');
+    const index = colonIndex === -1 ? length : colonIndex;
+    const ret = { value: str.slice(0, index).trim(), quality: 1, params: {} };
+
+    while (index < length) {
+        const splitIndex = str.indexOf('=', index);
+        if (splitIndex === -1) break;
+
+        const colonIndex = str.indexOf(';', index);
+        const endIndex = colonIndex === -1 ? length : colonIndex;
+
+        if (splitIndex > endIndex) {
+            index = str.lastIndexOf(';', splitIndex - 1) + 1;
+            continue;
+        }
+
+        const key = str.slice(index, splitIndex).trim();
+        const value = str.slice(splitIndex + 1, endIndex).trim();
+
+        if (key === 'q') {
+            ret.quality = parseFloat(value);
+        } else {
+            ret.params[key] = value;
+        }
+
+        index = endIndex + 1;
     }
   
     return ret;
@@ -205,7 +225,7 @@ function deprecated(oldMethod, newMethod, full = false) {
 }
 
 function findIndexStartingFrom(arr, fn, index = 0) {
-    for(let i = index; i < arr.length; i++) {
+    for(let i = index, end = arr.length; i < end; i++) {
         if(fn(arr[i], i, arr)) {
             return i;
         }
@@ -346,5 +366,6 @@ module.exports = {
     isRangeFresh,
     findIndexStartingFrom,
     fastQueryParse,
-    canBeOptimized
+    canBeOptimized,
+    EMPTY_REGEX
 };