ultimate-express 1.0.7 → 1.0.9

package/README.md

@@ -93,7 +93,7 @@ Optimized routes can be up to 10 times faster than normal routes, as they're usi
 
 3. Do not set `body methods` to read body of requests with GET method or other methods that don't need a body. Reading body makes server about 10k req/sec slower.
 
-4. By default, µExpress creates 1 worker thread for reading files (or 0 if your CPU has only 1 core). You can change this number by setting `fsThreads` to a different number in `express()`, or set to 0 to disable thread pool for file reading (`express({ fsThreads: 0 })`). Threads are shared between all express() instances, with largest fsThreads number being used. Using more threads will not necessarily improve performance. Sometimes not using threads at all is faster, please [test](https://github.com/wg/wrk/) both options.
+4. By default, µExpress creates 1 (or 0 if your CPU has only 1 core) child thread to improve performance of reading files and computing hashes for etag. You can change this number by setting `threads` to a different number in `express()`, or set to 0 to disable thread pool (`express({ threads: 0 })`). Threads are shared between all express() instances, with largest `threads` number being used. Using more threads will not necessarily improve performance. Sometimes not using threads at all is faster, please [test](https://github.com/wg/wrk/) both options.
 
 ## Compatibility
 
@@ -110,6 +110,7 @@ In general, basically all features and options are supported. Use [Express 4.x d
 - ✅ express.json()
 - ✅ express.urlencoded()
 - ✅ express.static()
+- - Additionally you can pass `options.ifModifiedSince` to support If-Modified-Since header (this header is not supported in normal Express, but is supported in µExpress)
 - ✅ express.text()
 - ✅ express.raw()
 - 🚧 express.request (this is not a constructor but a prototype for replacing methods)
@@ -229,7 +230,7 @@ In general, basically all features and options are supported. Use [Express 4.x d
 - - ✅ Range header
 - - ✅ Setting ETag header
 - - ✅ If-Match header
-- - ✅ If-Modified-Since header
+- - ✅ If-Modified-Since header (with `options.ifModifiedSince` option)
 - - ✅ If-Unmodified-Since header
 - - ✅ If-Range header
 - ✅ res.sendStatus()

package/package.json

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

package/src/application.js

@@ -10,25 +10,25 @@ const { Worker } = require("worker_threads");
 
 const cpuCount = os.cpus().length;
 
-let fsWorkers = [];
-let fsKey = 0;
-const fsCache = {};
+let workers = [];
+let taskKey = 0;
+const workerTasks = {};
 
-function createFsWorker() {
-    const fsWorker = new Worker(path.join(__dirname, 'workers/fs.js'));
-    fsWorkers.push(fsWorker);
+function createWorker() {
+    const worker = new Worker(path.join(__dirname, 'worker.js'));
+    workers.push(worker);
 
-    fsWorker.on('message', (message) => {
+    worker.on('message', (message) => {
         if(message.err) {
-            fsCache[message.key].reject(new Error(message.err));
+            workerTasks[message.key].reject(new Error(message.err));
         } else {
-            fsCache[message.key].resolve(message.data);
+            workerTasks[message.key].resolve(message.data);
         }
-        delete fsCache[message.key];
+        delete workerTasks[message.key];
     });
-    fsWorker.unref();
+    worker.unref();
 
-    return fsWorker;
+    return worker;
 }
 
 class Application extends Router {
@@ -37,8 +37,8 @@ class Application extends Router {
         if(!settings?.uwsOptions) {
             settings.uwsOptions = {};
         }
-        if(typeof settings.fsThreads !== 'number') {
-            settings.fsThreads = cpuCount > 1 ? 1 : 0;
+        if(typeof settings.threads !== 'number') {
+            settings.threads = cpuCount > 1 ? 1 : 0;
         }
         if(settings.uwsOptions.key_file_name && settings.uwsOptions.cert_file_name) {
             this.uwsApp = uWS.SSLApp(settings.uwsOptions);
@@ -53,12 +53,12 @@ class Application extends Router {
             settings: this.settings
         };
         this.listenCalled = false;
-        this.fsWorkers = [];
-        for(let i = 0; i < settings.fsThreads; i++) {
-            if(fsWorkers[i]) {
-                this.fsWorkers[i] = fsWorkers[i];
+        this.workers = [];
+        for(let i = 0; i < settings.threads; i++) {
+            if(workers[i]) {
+                this.workers[i] = workers[i];
             } else {
-                this.fsWorkers[i] = createFsWorker();
+                this.workers[i] = createWorker();
             }
         }
         this.port = undefined;
@@ -77,12 +77,12 @@ class Application extends Router {
 
     readFileWithWorker(path) {
         return new Promise((resolve, reject) => {
-            const fsWorker = this.fsWorkers[Math.floor(Math.random() * this.fsWorkers.length)];
-            const key = fsKey++;
-            fsWorker.postMessage({ key, type: 'readFile', path });
-            fsCache[key] = { resolve, reject };
+            const worker = this.workers[Math.floor(Math.random() * this.workers.length)];
+            const key = taskKey++;
+            worker.postMessage({ key, type: 'readFile', path });
+            workerTasks[key] = { resolve, reject };
             if(key > 1000000) {
-                fsKey = 0;
+                taskKey = 0;
             }
         });
     }

package/src/middlewares.js

@@ -20,7 +20,7 @@ function static(root, options) {
 
     return (req, res, next) => {
         const iq = req.url.indexOf('?');
-        let url = iq !== -1 ? req.url.substring(0, iq) : req.url;
+        let url = decodeURIComponent(iq !== -1 ? req.url.substring(0, iq) : req.url);
         let _path = url;
         let fullpath = path.resolve(path.join(options.root, url));
         if(options.root && !fullpath.startsWith(path.resolve(options.root))) {

package/src/response.js

@@ -333,16 +333,18 @@ module.exports = class Response extends Writable {
         }
 
         // if-modified-since
-        let modifiedSince = this.req.headers['if-modified-since'];
-        let lastModified = this.headers['last-modified'];
-        if(options.lastModified && lastModified && modifiedSince) {
-            modifiedSince = parseHttpDate(modifiedSince);
-            lastModified = parseHttpDate(lastModified);
-
-            if(!isNaN(lastModified) && !isNaN(modifiedSince) && lastModified <= modifiedSince) {
-                this.status(304);
-                return this.end();
-            };
+        if(options.ifModifiedSince) {
+            let modifiedSince = this.req.headers['if-modified-since'];
+            let lastModified = this.headers['last-modified'];
+            if(options.lastModified && lastModified && modifiedSince) {
+                modifiedSince = parseHttpDate(modifiedSince);
+                lastModified = parseHttpDate(lastModified);
+
+                if(!isNaN(lastModified) && !isNaN(modifiedSince) && lastModified <= modifiedSince) {
+                    this.status(304);
+                    return this.end();
+                };
+            }
         }
 
         // range requests
@@ -377,7 +379,7 @@ module.exports = class Response extends Writable {
         }
 
         // serve smaller files using workers
-        if(this.app.fsWorkers.length && stat.size < 1024 * 1024 && !ranged) {
+        if(this.app.workers.length && stat.size < 1024 * 1024 && !ranged) {
             this.app.readFileWithWorker(fullpath).then((data) => {
                 if(this._res.aborted) {
                     return;