wapplr 1.0.50 → 1.0.52

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,6 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.endStream = endStream;
+exports.addCloseEventsForReadableStream = addCloseEventsForReadableStream;
 exports["default"] = serveStatic;
 
 var fs = require("fs");
@@ -26,28 +28,12 @@ function destroy(stream) {
   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);
+      return Boolean(res.finished || res.writableEnded || socket && !socket.writable);
     }
   }
 
@@ -61,7 +47,6 @@ function onFinished(req, res, callback) {
 
   function removeListener() {
     if (req.__onFinishedInterval) {
-      console.log("remove listener", req.path);
       clearInterval(req.__onFinishedInterval);
       req.__onFinishedInterval = 0;
     }
@@ -85,6 +70,37 @@ function onFinished(req, res, callback) {
   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 = {
@@ -97,8 +113,8 @@ 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();
@@ -113,15 +129,10 @@ function serveStatic(publicPath) {
       res.wappResponse.sendData = {
         data: data,
         stats: stats,
-        parsedPath: paredSanitizePath
+        parsedPath: parsedSanitizePath
       };
       stream = fs.createReadStream(pathname);
-      onFinished(req, res, function () {
-        endStream(req, res, stream);
-      });
-      stream.on("close", function onopen() {
-        endStream(req, res, stream);
-      });
+      addCloseEventsForReadableStream(req, res, stream);
       stream.on("error", function onerror(err) {
         endStream(req, res, stream);
         res.wappResponse.status(err.statusCode || 500, err);

package/package.json

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