@nodefony/http-bundle - npm Package Compare versions

Comparing version 4.3.3 to 5.0.0

package.json

 {
   "name": "@nodefony/http-bundle",
-  "version": "4.3.3",
+  "version": "5.0.0",
   "description": "Nodefony Framework Bundle HTTP ",
@@ -15,13 +15,13 @@ "contributors": [],
   "dependencies": {
-    "cookie": "^0.3.1",
+    "cookie": "^0.4.0",
     "formidable": "^1.2.1",
     "memcached": "^2.2.2",
-    "mime": "^2.4.2",
+    "mime": "^2.4.4",
     "mkdirp": "^0.5.1",
-    "ms": "^2.1.1",
+    "ms": "^2.1.2",
     "qs": "^6.7.0",
     "request": "^2.88.0",
-    "serve-static": "^1.13.2",
+    "serve-static": "^1.14.1",
     "sockjs": "^0.3.19",
-    "websocket": "^1.0.28"
+    "websocket": "^1.0.29"
   },
@@ -28,0 +28,0 @@ "repository": {

services/kernel/httpKernelService.js

@@ -378,5 +378,8 @@ /*
       return this.serverStatic.handle(request, response)
-        .then(() => {
-          this.fire("onServerRequest", request, response, type);
-          return this.handle(request, response, type);
+        .then((res) => {
+          if ( res ){
+            this.fire("onServerRequest", request, response, type);
+            return this.handle(request, response, type);
+          }
+          throw new Error("Bad request");
         })
@@ -736,2 +739,2 @@ .catch(e => {
   }
-};
+};

services/requestClient/requestClientService.js

@@ -48,3 +48,3 @@ const request = require("request");
 
-  http(uri, options, container) {
+  async http(uri, options, container) {
     let req = null;
@@ -51,0 +51,0 @@ return new Promise((resolve, reject) => {

services/servers/staticsService.js

@@ -15,3 +15,2 @@ const serveStatic = require('serve-static');
     }
-
     this.environment = this.kernel.environment;
@@ -40,2 +39,19 @@ this.once("onBoot", () => {
       Path = this.kernel.checkPath(Path);
+      let setHeaders = null;
+      if (!this.settings[staticRoot].options) {
+        this.settings[staticRoot].options = {};
+      }
+      if (this.settings[staticRoot].options.setHeaders) {
+        if (typeof this.settings[staticRoot].options.setHeaders === "function") {
+          setHeaders = this.settings[staticRoot].options.setHeaders;
+          delete this.settings[staticRoot].options.setHeaders;
+        }
+      }
+      this.settings[staticRoot].options.setHeaders = (res, path) => {
+        this.logger(`Serve Static ${path}`, "DEBUG");
+        this.fire("onServeStatic", res, path, staticRoot, this);
+      };
+      if (setHeaders) {
+        this.on("onServeStatic", setHeaders);
+      }
       this.addDirectory(Path, this.settings[staticRoot].options);
@@ -58,30 +74,27 @@ }
 
-  handle(request, response, next) {
+  getStatic(server, request, response) {
+    return new Promise((resolve, reject) => {
+      server(request, response, (err) => {
+        if (err) {
+          return reject(err);
+        }
+        return resolve(response);
+      });
+    });
+  }
+
+  async handle(request, response) {
     let pathname = url.parse(request.url).pathname;
     let type = this.mime.lookup(pathname);
     response.setHeader("Content-Type", type);
-    let tab = [];
+    let res = null;
     for (let server in this.servers) {
-      let myPromise = new Promise((resolve, reject) => {
-        this.servers[server](request, response, (err) => {
-          if (err) {
-            return reject(err);
-          }
-          return resolve();
-        });
-      });
-      tab.push(myPromise);
+      try {
+        res = await this.getStatic(this.servers[server], request, response);
+      } catch (e) {
+        return Promise.reject(e);
+      }
     }
-    return Promise.all(tab).then((ele) => {
-      if (next) {
-        return next(ele);
-      }
-      return ele;
-    }).catch((err) => {
-      if (next) {
-        return next(err);
-      }
-      throw err;
-    });
+    return Promise.resolve(res);
   }
-};
+};

src/context/context.js

@@ -38,2 +38,3 @@ nodefony.register("Context", () => {
       this.isControlledAccess = false;
+      this.contentLength = false ;
     }
@@ -293,2 +294,2 @@
   return Context;
-});
+});

src/context/http/response.js

@@ -187,3 +187,3 @@ const http = require("http");
         try {
-          if (this.context.method === "HEAD") {
+          if (this.context.method === "HEAD" || this.context.contentLength) {
             this.setHeader('Content-Length', this.getLength());
@@ -292,2 +292,2 @@ }
   return Response;
-});
+});

src/context/http2/response.js

@@ -44,3 +44,3 @@ //const http = require("http");
           try {
-            if (this.context.method === "HEAD") {
+            if (this.context.method === "HEAD" || this.context.contentLength) {
               this.setHeader('Content-Length', this.getLength());
@@ -188,2 +188,2 @@ }
   return Response2;
-});
+});

src/context/subRequest.js

@@ -74,3 +74,7 @@ module.exports = nodefony.register("subRequest", () => {
       }
+    }
 
+    setCsrfToken(name, options) {
+      this.csrf = this.csrfService.createCsrfToken(name, options, this);
+      return this.csrf;
     }
@@ -118,2 +122,2 @@
   return subRequest;
-});
+});

No alert changes

Improved metrics

Lines of code

5095

increased by0.53%

Worsened metrics

Total package byte prevSize

173508

decreased by-11.5%

Number of package files

42

decreased by-2.33%

Dependency changes

• + Addedcookie@0.4.2(transitive)

• - Removedcookie@0.3.1(transitive)

• Updatedcookie@^0.4.0

• Updatedmime@^2.4.4

• Updatedms@^2.1.2

• Updatedserve-static@^1.14.1

• Updatedwebsocket@^1.0.29