ultimate-express 1.4.0 → 1.4.2

package/README.md

@@ -232,7 +232,7 @@ In general, basically all features and options are supported. Use [Express 4.x d
 - ✅ req.subdomains
 - ✅ req.xhr
 - 🚧 req.route (route implementation is different from Express)
-- 🚧 req.connection, req.socket (only `end()`, `encrypted`, `remoteAddress`, `localPort` and `remotePort` are supported)
+- 🚧 req.connection, req.socket (only `end()`, `encrypted`, `remoteAddress` and `localPort` are supported)
 - ✅ req.accepts()
 - ✅ req.acceptsCharsets()
 - ✅ req.acceptsEncodings()

package/package.json

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

package/src/application.js

@@ -55,7 +55,9 @@ class Application extends Router {
         if(typeof settings.threads !== 'number') {
             settings.threads = cpuCount > 1 ? 1 : 0;
         }
-        if(settings.http3) {
+        if(settings.uwsApp) {
+            this.uwsApp = settings.uwsApp;
+        } else if(settings.http3) {
             if(!settings.uwsOptions.key_file_name || !settings.uwsOptions.cert_file_name) {
                 throw new Error('uwsOptions.key_file_name and uwsOptions.cert_file_name are required for HTTP/3');
             }

package/src/request.js

@@ -233,7 +233,7 @@ module.exports = class Request extends Readable {
     }
 
     get parsedIp() {
-        if(this.#cachedParsedIp) {
+        if(this.#cachedParsedIp !== null) {
             return this.#cachedParsedIp;
         }
         const finished = !this.res.socket.writable;
@@ -252,7 +252,7 @@ module.exports = class Request extends Readable {
         if(this.rawIp.byteLength === 4) {
             // ipv4
             ip = this.rawIp.join('.');
-        } else {
+        } else if(this.rawIp.byteLength === 16) {
             // ipv6
             const dv = new DataView(this.rawIp);
             for(let i = 0; i < 8; i++) {
@@ -261,6 +261,8 @@ module.exports = class Request extends Readable {
                     ip += ':';
                 }
             }
+        } else {
+            this.#cachedParsedIp = undefined; // unix sockets dont have ip
         }
         this.#cachedParsedIp = ip;
         return ip;
@@ -270,7 +272,6 @@ module.exports = class Request extends Readable {
         return {
             remoteAddress: this.parsedIp,
             localPort: this.app.port,
-            remotePort: this.app.port,
             encrypted: this.app.ssl,
             end: (body) => this.res.end(body)
         };

package/src/types.d.ts

@@ -5,6 +5,8 @@ declare module "ultimate-express" {
   type Settings = {
     uwsOptions?: AppOptions;
     threads?: number;
+    http3?: boolean;
+    uwsApp?: any;
   };
 
   namespace express {