ultimate-express 1.4.7 → 1.4.9

package/README.md

@@ -101,7 +101,7 @@ app.listen(3000, () => {
 ```
 
 - This also applies to non-SSL HTTP too. Do not create http server manually, use `app.listen()` instead.
-- NodeJS max header size is 16384 byte, uWebSockets 4096 byte, if you need long headers set the env variable `UWS_HTTP_MAX_HEADERS_SIZE`
+- Node.JS max header size is 16384 bytes, while uWebSockets by default is 4096 bytes, so if you need longer headers set the env variable `UWS_HTTP_MAX_HEADERS_SIZE` to max byte count you need.
 
 ## Performance tips
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-express",
-  "version": "1.4.7",
+  "version": "1.4.9",
   "description": "The Ultimate Express. Fastest http server with full Express compatibility, based on uWebSockets.",
   "main": "src/index.js",
   "scripts": {
@@ -67,6 +67,7 @@
   },
   "devDependencies": {
     "@codechecks/client": "^0.1.12",
+    "better-sse": "^0.14.1",
     "body-parser": "^1.20.3",
     "compression": "^1.8.0",
     "cookie-parser": "^1.4.6",
@@ -74,6 +75,7 @@
     "cors": "^2.8.5",
     "ejs": "^3.1.10",
     "errorhandler": "^1.5.1",
+    "eventsource": "^3.0.6",
     "exit-hook": "^2.2.1",
     "express": "latest-4",
     "express-art-template": "^1.0.1",
@@ -86,6 +88,7 @@
     "express-session": "^1.18.0",
     "express-subdomain": "^1.0.6",
     "formdata-node": "^6.0.3",
+    "graphql-http": "^1.22.4",
     "helmet": "^8.1.0",
     "method-override": "^3.0.0",
     "morgan": "^1.10.0",

package/src/declarative.js

@@ -201,8 +201,12 @@ module.exports = function compileDeclarative(cb, app) {
         }
 
         // get body
+        let sendUsed = false;
         for(let call of callExprs) {
             if(call.obj.propertyName === 'send' || call.obj.propertyName === 'end') {
+                if(sendUsed) {
+                    return false;
+                }
                 const arg = call.arguments[0];
                 if(arg) {
                     if(arg.type === 'Literal') {
@@ -315,6 +319,7 @@ module.exports = function compileDeclarative(cb, app) {
                         return false;
                     }
                 }
+                sendUsed = true;
             }
         }
 

package/src/response.js

@@ -71,6 +71,7 @@ module.exports = class Response extends Writable {
     #socket = null;
     #pendingChunks = [];
     #lastWriteChunkTime = 0;
+    #writeTimeout = null;
     constructor(res, req, app) {
         super();
         this._req = req;
@@ -153,13 +154,29 @@ module.exports = class Response extends Writable {
                 this.#pendingChunks.push(chunk);
                 const size = this.#pendingChunks.reduce((acc, chunk) => acc + chunk.byteLength, 0);
                 const now = Date.now();
-                // the first chunk is set immediately (!this.#lastWriteChunkTime)
+                // the first chunk is sent immediately (!this.#lastWriteChunkTime)
                 // the other chunks are sent when watermark is reached (size >= HIGH_WATERMARK) 
-                // or if elapsed 100ms of last send (now - this.#lastWriteChunkTime > 100)
-                if (!this.#lastWriteChunkTime || size >= HIGH_WATERMARK || now - this.#lastWriteChunkTime > 100) {
+                // or if elapsed 50ms of last send (now - this.#lastWriteChunkTime > 50)
+                if (!this.#lastWriteChunkTime || size >= HIGH_WATERMARK || now - this.#lastWriteChunkTime > 50) {
                     this._res.write(Buffer.concat(this.#pendingChunks, size));
                     this.#pendingChunks = [];
                     this.#lastWriteChunkTime = now;
+                    if(this.#writeTimeout) {
+                        clearTimeout(this.#writeTimeout);
+                        this.#writeTimeout = null;
+                    }
+                } else if(!this.#writeTimeout) {
+                    this.#writeTimeout = setTimeout(() => {
+                        this.#writeTimeout = null;
+                        if(!this.finished && !this.aborted) this._res.cork(() => {
+                            if(this.#pendingChunks.length) {
+                                const size = this.#pendingChunks.reduce((acc, chunk) => acc + chunk.byteLength, 0);
+                                this._res.write(Buffer.concat(this.#pendingChunks, size));
+                                this.#pendingChunks = [];
+                                this.#lastWriteChunkTime = now;
+                            }
+                        });
+                    }, 50);
                 }
                 this.writingChunk = false;
                 callback(null);
@@ -201,12 +218,13 @@ module.exports = class Response extends Writable {
             this.statusText = statusMessage;
         }
         if(!headers) {
-            if(!statusMessage) return;
+            if(!statusMessage) return this;
             headers = statusMessage;
         }
         for(let header in headers) {
             this.set(header, headers[header]);
         }
+        return this;
     }
     writeHeaders(utf8) {
         for(const header in this.headers) {
@@ -766,4 +784,4 @@ module.exports = class Response extends Writable {
     get writableFinished() {
         return this.finished;
     }
-}
+}

package/src/router.js

@@ -365,7 +365,7 @@ module.exports = class Router extends EventEmitter {
         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) {
+        } else if(typeof route.path === 'string' && (route.path.includes(':') || route.path.includes('*') || (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), '');
@@ -526,6 +526,9 @@ module.exports = class Router extends EventEmitter {
                         req._opPath += '/';
                     }
                     const routed = await callback._routeRequest(req, res, 0);
+                    if (req._error) {
+                        req._errorKey = route.routeKey;
+                    }
                     if(routed) return resolve(true);
                     next();
                 } else {

package/src/utils.js

@@ -57,7 +57,7 @@ function patternToRegex(pattern, isPrefix = false) {
         .replaceAll('*', '(.*)') // Convert * to .*
         .replace(/\/:(\w+)(\(.+?\))?\??/g, (match, param, regex) => {
             const optional = match.endsWith('?');
-            return `\\/${optional ? '?' : ''}?(?<${param}>${regex ? regex + '($|\\/)' : '[^/]+'})${optional ? '?' : ''}`;
+            return `\\/${optional ? '?' : ''}(?<${param}>${regex ? regex + '($|\\/)' : '[^/]+'})${optional ? '?' : ''}`;
         }); // Convert :param to capture group
 
     return new RegExp(`^${regexPattern}${isPrefix ? '(?=$|\/)' : '$'}`);

package/src/view.js

@@ -59,26 +59,25 @@ module.exports = class View {
                 this.path += this.ext;
             }
         } else {
-            this.path = path.join(this.root, fileName);
+            this.path = this.lookup(fileName);
         }
     }
 
     lookup(name) {
-        let path;
+        let _path;
         let roots = [].concat(this.root);
-        for (let i = 0; i < roots.length && !path; i++) {
+        for (let i = 0; i < roots.length && !_path; i++) {
             const root = roots[i];
         
             // resolve the path
             const loc = path.resolve(root, name);
             const dir = path.dirname(loc);
             const file = path.basename(loc);
-        
+            
             // resolve the file
-            path = this.resolve(dir, file);
+            _path = this.resolve(dir, file);
         }
-        
-        return path;
+        return _path;
     }
 
     // ill be real idk what exactly this does but express implements it this way
@@ -101,19 +100,19 @@ module.exports = class View {
         const ext = this.ext;
 
         // <path>.<ext>
-        let path = path.join(dir, file);
-        let stat = tryStat(path);
+        let _path = path.join(dir, file);
+        let stat = tryStat(_path);
 
         if(stat && stat.isFile()) {
-            return path;
+            return _path;
         }
 
         // <path>/index.<ext>
-        path = path.join(dir, path.basename(file, ext) + ext);
-        stat = tryStat(path);
+        _path = path.join(dir, path.basename(file, ext), 'index' + ext);
+        stat = tryStat(_path);
 
         if(stat && stat.isFile()) {
-            return path;
+            return _path;
         }
     }
 }