Merge pull request #71 from kbarbounakis/finalize-request-after-format

finalize context before format response

modules/@themost/express/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@themost/express",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "description": "MOST Data ORM Express Middleware",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

modules/@themost/express/src/app.js

@@ -251,8 +251,8 @@ class ExpressDataApplication extends IApplication {
               return context;
             }
           });
-          req.on('end', () => {
-            //on end
+          res.on('close', () => {
+            //on clse
             if (req.context) {
               //finalize data context
               return req.context.finalize( () => {

modules/@themost/express/src/middleware.js

@@ -105,6 +105,13 @@ const DefaultTopOption = 25;
  * @returns string
  */
 
+function finalizeContext(req, next) {
+    if (req && req.context && typeof req.context.finalize === 'function') {
+        return req.context.finalize(next);
+    }
+    return next();
+}
+
 /**
  * Gets or sets the name of the route parameter that holds the name of an entity function
  * @property
@@ -118,20 +125,22 @@ const DefaultTopOption = 25;
  * @param {*} res
  */
 function tryFormat(data, req, res) {
-    // get response formatter
-    const responseFormatter = req.context.getApplication().getStrategy(ResponseFormatter);
-    //if service exists
-    if (responseFormatter) {
-        // call Response.format with formatter
-        return res.format(responseFormatter.format(data).for(req, res));
-    }
-    // fallback to json
-    if (data == null) {
-        // send no content if data is empty
-        return res.status(204).type('application/json').send();
-    }
-    // otherwise send json data
-    return res.json(data);
+    // finalize context
+    return finalizeContext(req, () => {
+        // get response formatter
+        const responseFormatter = req.context.getApplication().getStrategy(ResponseFormatter);
+        //if service exists
+        if (responseFormatter) {
+            // call Response.format with formatter
+            return res.format(responseFormatter.format(data).for(req, res));
+        }
+        if (data == null) {
+            // send no content if data is empty
+            return res.status(204).type('application/json').send();
+        }
+        // otherwise send json data
+        return res.json(data);
+    });
  }
 
 /**
@@ -141,7 +150,9 @@ function tryFormat(data, req, res) {
  * @param {NextFunction} next
  */
 function tryFormatStream(data, req, res, next) {
-    return new StreamFormatter(data).execute(req, res, next);
+    return finalizeContext(req, () => {
+        return new StreamFormatter(data).execute(req, res, next);
+    });
 }
 
 /**