wapplr 1.0.49 → 1.0.53

package/dist/client/createClient.js

@@ -78,9 +78,7 @@ function createClient() {
           search: window.location.search,
           hash: window.location.hash
         },
-        state: {
-          key: 0
-        }
+        state: window.history.state
       }
     }, {}, function out() {
       var globals = wapp.globals;

package/dist/client/history.js

@@ -71,9 +71,7 @@ function createHistoryManager() {
     state.key = state.key || createKey();
     history.runListeners({
       action: "POP",
-      location: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newLocation), {}, {
-        key: state.key
-      }),
+      location: (0, _objectSpread2["default"])({}, newLocation),
       state: state
     });
   }
@@ -139,9 +137,7 @@ function createHistoryManager() {
     globalHistory.pushState(state, "", url);
     history.runListeners({
       action: "PUSH",
-      location: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newLocation), {}, {
-        key: state.key
-      }),
+      location: (0, _objectSpread2["default"])({}, newLocation),
       state: state
     });
   }
@@ -171,9 +167,6 @@ function createHistoryManager() {
       enumerable: false,
       value: defaultGetState
     }),
-    key: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: "initial"
-    }),
     listeners: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       enumerable: false,
       value: {}

package/dist/server/createServer.js

@@ -13,6 +13,8 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
+
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -165,6 +167,32 @@ function createServer() {
       httpServer.listen(port, function () {
         console.log("The server is running at http://localhost:".concat(port, "/"));
       });
+      httpServer.__sockets = new Set();
+      httpServer.on("connection", function (socket) {
+        httpServer.__sockets.add(socket);
+
+        socket.on("close", function () {
+          httpServer.__sockets["delete"](socket);
+        });
+      });
+
+      httpServer.__destroySockets = function () {
+        var sockets = httpServer.__sockets;
+
+        var _iterator = (0, _createForOfIteratorHelper2["default"])(sockets.values()),
+            _step;
+
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var socket = _step.value;
+            socket.destroy();
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+      };
     }
 
     if (key && cert && portSSL) {
@@ -180,6 +208,32 @@ function createServer() {
       httpsServer.listen(portSSL, function () {
         console.log("The server is running at https://localhost:".concat(portSSL, "/ with HTTP2 protocol"));
       });
+      httpsServer.__sockets = new Set();
+      httpsServer.on("connection", function (socket) {
+        httpsServer.__sockets.add(socket);
+
+        socket.on("close", function () {
+          httpsServer.__sockets["delete"](socket);
+        });
+      });
+
+      httpsServer.__destroySockets = function () {
+        var sockets = httpsServer.__sockets;
+
+        var _iterator2 = (0, _createForOfIteratorHelper2["default"])(sockets.values()),
+            _step2;
+
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var socket = _step2.value;
+            socket.destroy();
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      };
     }
   }
 
@@ -196,6 +250,8 @@ function createServer() {
     });
     var closed = 0;
     shouldClose.forEach(function (httpServer) {
+      httpServer.__destroySockets();
+
       httpServer.close(function () {
         closed = closed + 1;
         servers[port] = null;

package/dist/server/static.js

@@ -3,12 +3,104 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.endStream = endStream;
+exports.addCloseEventsForReadableStream = addCloseEventsForReadableStream;
 exports["default"] = serveStatic;
 
 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 onFinished(req, res, callback) {
+  function isFinishedResponse() {
+    var socket = res.socket;
+
+    if (typeof res.finished === "boolean") {
+      return Boolean(res.finished || res.writableEnded || 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) {
+      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 endStream(req, res, stream) {
+  if (req.__onFinishedRemoveListener) {
+    req.__onFinishedRemoveListener();
+
+    req.__onFinishedRemoveListener = null;
+  }
+
+  if (res.__onFinishedRemoveListener) {
+    res.__onFinishedRemoveListener();
+
+    res.__onFinishedRemoveListener = null;
+  }
+
+  destroy(stream);
+}
+
+function addCloseEventsForReadableStream(req, res, stream) {
+  req.on("close", function () {
+    endStream(req, res, stream);
+  });
+  req.connection.on("close", function () {
+    endStream(req, res, stream);
+  });
+  onFinished(req, res, function () {
+    endStream(req, res, stream);
+  });
+  stream.on("close", function onclose() {
+    endStream(req, res, stream);
+  });
+}
+
 function serveStatic(publicPath) {
   return function staticMiddleware(req, res, next) {
     var parsedUrl = {
@@ -21,13 +113,15 @@ function serveStatic(publicPath) {
 
     var sanitizePath = path.normalize(parsedUrl.pathname).replace(/^(\.\.[\/\\])+/, "");
     var pathname = path.join(publicPath, sanitizePath);
-    var paredSanitizePath = path.parse(pathname);
-    var ext = paredSanitizePath.ext;
+    var parsedSanitizePath = path.parse(pathname);
+    var ext = parsedSanitizePath.ext;
 
     if (!fs.existsSync(pathname) || !ext) {
       return next();
     }
 
+    var stream;
+
     try {
       var data = fs.readFileSync(pathname);
       var stats = fs.statSync(pathname);
@@ -35,10 +129,12 @@ function serveStatic(publicPath) {
       res.wappResponse.sendData = {
         data: data,
         stats: stats,
-        parsedPath: paredSanitizePath
+        parsedPath: parsedSanitizePath
       };
-      var stream = fs.createReadStream(pathname);
+      stream = fs.createReadStream(pathname);
+      addCloseEventsForReadableStream(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 +146,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.49",
+    "version": "1.0.53",
     "main": "dist/server",
     "browser": "dist/client",
     "repository": {