wapplr 1.0.46 → 1.0.50

package/dist/common/contents.js

@@ -44,22 +44,35 @@ function createDefaultContentManager() {
               contents = contentManager.contents;
               content = contentName && contents[contentName] ? (0, _objectSpread2["default"])({}, contents[contentName]) : null;
 
-              if (!(content && content.request)) {
+              if (!contentManager.firstRequest) {
                 _context.next = 8;
                 break;
               }
 
               _context.next = 8;
-              return content.request({
+              return contentManager.firstRequest({
                 wapp: wapp,
                 req: req,
                 res: res
               });
 
             case 8:
+              if (!(content && content.request)) {
+                _context.next = 11;
+                break;
+              }
+
+              _context.next = 11;
+              return content.request({
+                wapp: wapp,
+                req: req,
+                res: res
+              });
+
+            case 11:
               return _context.abrupt("return", content);
 
-            case 9:
+            case 12:
             case "end":
               return _context.stop();
           }
@@ -211,6 +224,9 @@ function createDefaultContentManager() {
     }),
     getComponent: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       value: defaultGetComponent
+    }),
+    firstRequest: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
+      value: null
     })
   });
   return contentManager;

package/dist/server/html.js

@@ -30,7 +30,7 @@ function html(_ref) {
       _config$appStyle = config.appStyle,
       appStyle = _config$appStyle === void 0 ? style : _config$appStyle;
   var _res$wappResponse = res.wappResponse,
-      state = _res$wappResponse.state,
+      store = _res$wappResponse.store,
       _res$wappResponse$con = _res$wappResponse.content,
       content = _res$wappResponse$con === void 0 ? {} : _res$wappResponse$con,
       _res$wappResponse$sta = _res$wappResponse.statusCode,
@@ -39,6 +39,7 @@ function html(_ref) {
       containerElementId = _res$wappResponse$con2 === void 0 ? "app" : _res$wappResponse$con2,
       _res$wappResponse$app = _res$wappResponse.appStateName,
       appStateName = _res$wappResponse$app === void 0 ? "APP_STATE" : _res$wappResponse$app;
+  var state = store ? store.getState() : {};
   var _content$render = content.render,
       render = _content$render === void 0 ? "" : _content$render,
       _content$title = content.title,

package/dist/server/static.js

@@ -9,6 +9,82 @@ var fs = require("fs");
 
 var path = require("path");
 
+function destroy(stream) {
+  if (!(stream !== null && stream !== void 0 && stream.__destroyed)) {
+    stream.destroy();
+    stream.__destroyed = true;
+
+    if (typeof stream.close === "function") {
+      stream.on("open", function onOpenClose() {
+        if (typeof this.fd === "number") {
+          this.close();
+        }
+      });
+    }
+  }
+
+  return stream;
+}
+
+function endStream(req, res, stream) {
+  if (req.__onFinishedRemoveListener) {
+    req.__onFinishedRemoveListener();
+
+    req.__onFinishedRemoveListener = null;
+  }
+
+  if (res.__onFinishedRemoveListener) {
+    res.__onFinishedRemoveListener();
+
+    res.__onFinishedRemoveListener = null;
+  }
+
+  destroy(stream);
+}
+
+function onFinished(req, res, callback) {
+  function isFinishedResponse() {
+    var socket = res.socket;
+
+    if (typeof res.finished === "boolean") {
+      return Boolean(res.finished || socket && !socket.writable);
+    }
+  }
+
+  function isFinishedRequest() {
+    var socket = req.socket;
+
+    if (typeof req.complete === "boolean") {
+      return Boolean(req.upgrade || !socket || !socket.readable || req.complete && !req.readable);
+    }
+  }
+
+  function removeListener() {
+    if (req.__onFinishedInterval) {
+      console.log("remove listener", req.path);
+      clearInterval(req.__onFinishedInterval);
+      req.__onFinishedInterval = 0;
+    }
+
+    if (res.__onFinishedInterval) {
+      clearInterval(res.__onFinishedInterval);
+      res.__onFinishedInterval = 0;
+    }
+  }
+
+  function listener() {
+    var result = isFinishedRequest() || isFinishedResponse();
+
+    if (result) {
+      removeListener();
+      callback();
+    }
+  }
+
+  req.__onFinishedInterval = res.__onFinishedInterval = setInterval(listener, 100);
+  req.__onFinishedRemoveListener = res.__onFinishedRemoveListener = removeListener;
+}
+
 function serveStatic(publicPath) {
   return function staticMiddleware(req, res, next) {
     var parsedUrl = {
@@ -28,6 +104,8 @@ function serveStatic(publicPath) {
       return next();
     }
 
+    var stream;
+
     try {
       var data = fs.readFileSync(pathname);
       var stats = fs.statSync(pathname);
@@ -37,8 +115,15 @@ function serveStatic(publicPath) {
         stats: stats,
         parsedPath: paredSanitizePath
       };
-      var stream = fs.createReadStream(pathname);
+      stream = fs.createReadStream(pathname);
+      onFinished(req, res, function () {
+        endStream(req, res, stream);
+      });
+      stream.on("close", function onopen() {
+        endStream(req, res, stream);
+      });
       stream.on("error", function onerror(err) {
+        endStream(req, res, stream);
         res.wappResponse.status(err.statusCode || 500, err);
         res.wapp.log(err, req, res);
         next(err);
@@ -50,6 +135,7 @@ function serveStatic(publicPath) {
         });
       });
     } catch (err) {
+      endStream(req, res, stream);
       res.wappResponse.status(err.statusCode || 500, err);
       res.wapp.log(err, req, res);
       next(err);

package/package.json

@@ -22,7 +22,7 @@
     "files": [
         "dist/*"
     ],
-    "version": "1.0.46",
+    "version": "1.0.50",
     "main": "dist/server",
     "browser": "dist/client",
     "repository": {