wapplr 1.0.61 → 1.0.62

package/dist/client/app.js

@@ -270,11 +270,11 @@ function createApp() {
                 return res;
               };
 
-              res.send = res.send || function (html) {
-                res.end(html);
+              res.send = res.send || function (html, callback) {
+                res.end(html, callback);
               };
 
-              res.end = res.end || function (html) {
+              res.end = res.end || function (html, callback) {
                 if (!res.headersSent) {
                   Object.defineProperty(res, "headersSent", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
                     enumerable: false,
@@ -305,6 +305,10 @@ function createApp() {
                   }
                 } else {//throw Error
                 }
+
+                if (callback) {
+                  callback();
+                }
               }; // res.container (Html element) property are plus thing, usually there is not in the response
               // but is necessary for end render
 

package/dist/client/middlewares.js

@@ -70,39 +70,93 @@ function createRenderMiddleware() {
   }
 
   function _defaultHandle() {
-    _defaultHandle = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee2(req, res, out) {
-      var statesMiddlewares, index, next;
-      return (0, _regeneratorRuntime2["default"])().wrap(function _callee2$(_context2) {
+    _defaultHandle = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee4(req, res, out) {
+      var renderMiddlewares, index, next, _next;
+
+      return (0, _regeneratorRuntime2["default"])().wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
-              next = function _next(err) {
-                if (statesMiddlewares[index]) {
-                  var func = statesMiddlewares[index];
-                  index = index + 1;
-                  return func(req, res, err ? function () {
-                    next(err);
-                  } : next);
-                } else if (typeof out === "function") {
-                  index = 0;
-                  return out(err);
-                }
-
-                return null;
+              _next = function _next3() {
+                _next = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee3(err) {
+                  var func;
+                  return (0, _regeneratorRuntime2["default"])().wrap(function _callee3$(_context3) {
+                    while (1) {
+                      switch (_context3.prev = _context3.next) {
+                        case 0:
+                          if (!renderMiddlewares[index]) {
+                            _context3.next = 8;
+                            break;
+                          }
+
+                          func = renderMiddlewares[index];
+                          index = index + 1;
+                          _context3.next = 5;
+                          return func(req, res, err ? /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee2() {
+                            return (0, _regeneratorRuntime2["default"])().wrap(function _callee2$(_context2) {
+                              while (1) {
+                                switch (_context2.prev = _context2.next) {
+                                  case 0:
+                                    _context2.next = 2;
+                                    return next(err);
+
+                                  case 2:
+                                  case "end":
+                                    return _context2.stop();
+                                }
+                              }
+                            }, _callee2);
+                          })) : next);
+
+                        case 5:
+                          return _context3.abrupt("return", _context3.sent);
+
+                        case 8:
+                          if (!(typeof out === "function")) {
+                            _context3.next = 13;
+                            break;
+                          }
+
+                          index = 0;
+                          _context3.next = 12;
+                          return out(err);
+
+                        case 12:
+                          return _context3.abrupt("return", _context3.sent);
+
+                        case 13:
+                          return _context3.abrupt("return", null);
+
+                        case 14:
+                        case "end":
+                          return _context3.stop();
+                      }
+                    }
+                  }, _callee3);
+                }));
+                return _next.apply(this, arguments);
               };
 
-              statesMiddlewares = Object.keys(renderMiddleware.handles).map(function (key) {
+              next = function _next2(_x7) {
+                return _next.apply(this, arguments);
+              };
+
+              renderMiddlewares = Object.keys(renderMiddleware.handles).map(function (key) {
                 return renderMiddleware.handles[key];
               });
               index = 0;
-              return _context2.abrupt("return", next());
+              _context4.next = 6;
+              return next();
+
+            case 6:
+              return _context4.abrupt("return", _context4.sent);
 
-            case 4:
+            case 7:
             case "end":
-              return _context2.stop();
+              return _context4.stop();
           }
         }
-      }, _callee2);
+      }, _callee4);
     }));
     return _defaultHandle.apply(this, arguments);
   }

package/dist/common/middlewares.js

@@ -215,8 +215,16 @@ function createWappMiddleware() {
           var _wappResponse$sendDat;
 
           var endHtml = ((_wappResponse$sendDat = wappResponse.sendData) === null || _wappResponse$sendDat === void 0 ? void 0 : _wappResponse$sendDat.data) || "";
-          res.send.apply(res, [endHtml].concat((0, _toConsumableArray2["default"])(restAttr)));
-          wappResponse.sended = true;
+          var callback = restAttr[0];
+
+          if (typeof callback === 'function') {
+            res.send.apply(res, [endHtml, function () {
+              callback();
+              wappResponse.sended = true;
+            }].concat((0, _toConsumableArray2["default"])(restAttr.slice(1))));
+          } else {
+            res.send.apply(res, [endHtml].concat((0, _toConsumableArray2["default"])(restAttr)));
+          }
         });
       }
     };

package/package.json

@@ -22,11 +22,11 @@
     "files": [
         "dist/*"
     ],
-    "version": "1.0.61",
+    "version": "1.0.62",
     "main": "dist/server",
     "browser": "dist/client",
     "repository": {
         "type": "git",
         "url": "https://github.com/wapplr/wapplr.git"
     }
-}
+}