wapplr 1.0.77 → 1.0.79

package/dist/server/createServer.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = createServer;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _regenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -369,71 +369,64 @@ function createServer() {
       "static": app["static"](wapplrServer.config.publicPath)
     }, _rest);
   }
-  app.use( /*#__PURE__*/function () {
-    var _defaultMiddlewaresWrapper = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee3(req, res, out) {
-      var next, middlewares, index;
-      return (0, _regeneratorRuntime2["default"])().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+  app.use(/*#__PURE__*/function () {
+    var _defaultMiddlewaresWrapper = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee3(req, res, out) {
+      var _next, middlewares, index;
+      return (0, _regenerator2["default"])().w(function (_context3) {
+        while (1) switch (_context3.n) {
           case 0:
             if (wapplrServer.config.disableUseDefaultMiddlewares) {
-              _context3.next = 7;
+              _context3.n = 2;
               break;
             }
-            next = /*#__PURE__*/function () {
-              var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee2(err) {
-                var func, defaultArgs, args;
-                return (0, _regeneratorRuntime2["default"])().wrap(function _callee2$(_context2) {
-                  while (1) switch (_context2.prev = _context2.next) {
+            _next = /*#__PURE__*/function () {
+              var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee2(err) {
+                var func, defaultArgs, args, _t;
+                return (0, _regenerator2["default"])().w(function (_context2) {
+                  while (1) switch (_context2.p = _context2.n) {
                     case 0:
                       if (!middlewares[index]) {
-                        _context2.next = 19;
+                        _context2.n = 5;
                         break;
                       }
                       func = middlewares[index];
                       index = index + 1;
-                      defaultArgs = [req, res, err ? /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee() {
-                        return (0, _regeneratorRuntime2["default"])().wrap(function _callee$(_context) {
-                          while (1) switch (_context.prev = _context.next) {
+                      defaultArgs = [req, res, err ? /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee() {
+                        return (0, _regenerator2["default"])().w(function (_context) {
+                          while (1) switch (_context.n) {
                             case 0:
-                              _context.next = 2;
-                              return next(err);
-                            case 2:
-                            case "end":
-                              return _context.stop();
+                              _context.n = 1;
+                              return _next(err);
+                            case 1:
+                              return _context.a(2);
                           }
                         }, _callee);
-                      })) : next];
+                      })) : _next];
                       args = func.length === 4 && err ? [err].concat(defaultArgs) : defaultArgs;
-                      _context2.prev = 5;
-                      _context2.next = 8;
+                      _context2.p = 1;
+                      _context2.n = 2;
                       return func.apply(void 0, (0, _toConsumableArray2["default"])(args));
-                    case 8:
-                      return _context2.abrupt("return", _context2.sent);
-                    case 11:
-                      _context2.prev = 11;
-                      _context2.t0 = _context2["catch"](5);
-                      res.wappResponse.status(500, _context2.t0);
-                      _context2.next = 16;
-                      return next(_context2.t0);
-                    case 16:
-                      return _context2.abrupt("return", _context2.sent);
-                    case 17:
-                      _context2.next = 22;
-                      break;
-                    case 19:
+                    case 2:
+                      return _context2.a(2, _context2.v);
+                    case 3:
+                      _context2.p = 3;
+                      _t = _context2.v;
+                      res.wappResponse.status(500, _t);
+                      _context2.n = 4;
+                      return _next(_t);
+                    case 4:
+                      return _context2.a(2, _context2.v);
+                    case 5:
                       if (!(typeof out === "function")) {
-                        _context2.next = 22;
+                        _context2.n = 6;
                         break;
                       }
                       index = 0;
-                      return _context2.abrupt("return", out(err));
-                    case 22:
-                      return _context2.abrupt("return", null);
-                    case 23:
-                    case "end":
-                      return _context2.stop();
+                      return _context2.a(2, out(err));
+                    case 6:
+                      return _context2.a(2, null);
                   }
-                }, _callee2, null, [[5, 11]]);
+                }, _callee2, null, [[1, 3]]);
               }));
               return function next(_x4) {
                 return _ref2.apply(this, arguments);
@@ -443,18 +436,15 @@ function createServer() {
               return wapplrServer.middlewares[key];
             });
             index = 0;
-            _context3.next = 6;
-            return next();
-          case 6:
-            return _context3.abrupt("return", _context3.sent);
-          case 7:
-            _context3.next = 9;
+            _context3.n = 1;
+            return _next();
+          case 1:
+            return _context3.a(2, _context3.v);
+          case 2:
+            _context3.n = 3;
             return out();
-          case 9:
-            return _context3.abrupt("return", _context3.sent);
-          case 10:
-          case "end":
-            return _context3.stop();
+          case 3:
+            return _context3.a(2, _context3.v);
         }
       }, _callee3);
     }));

package/dist/server/middlewares.js

@@ -275,8 +275,8 @@ function createMiddlewares(p) {
         var mtime = stats.mtime,
           size = stats.size;
         if (!res.getHeader("ETag") && mtime && size) {
-          var etag = "W/\"".concat(size.toString(16), "-").concat(mtime.getTime().toString(16), "\"");
-          res.setHeader("ETag", etag);
+          var _etag = "W/\"".concat(size.toString(16), "-").concat(mtime.getTime().toString(16), "\"");
+          res.setHeader("ETag", _etag);
         }
       }
       return next();

package/dist/server/static.js

@@ -1,12 +1,16 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.addCloseEventsForReadableStream = addCloseEventsForReadableStream;
 exports["default"] = serveStatic;
 exports.endStream = endStream;
-var fs = require("fs");
+var _regenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var fs = require("node:fs/promises");
+var fsSync = require("node:fs");
 var path = require("path");
 function destroy(stream) {
   if (!(stream !== null && stream !== void 0 && stream.__destroyed)) {
@@ -81,49 +85,91 @@ function addCloseEventsForReadableStream(req, res, stream) {
   });
 }
 function serveStatic(publicPath) {
-  return function staticMiddleware(req, res, next) {
-    var parsedUrl = {
-      pathname: req.wappRequest.path
-    };
-    try {
-      parsedUrl = new URL(req.wappRequest.url);
-    } catch (e) {}
-    var sanitizePath = path.normalize(parsedUrl.pathname).replace(/^(\.\.[\/\\])+/, "");
-    var pathname = path.join(publicPath, sanitizePath);
-    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);
-      res.wappResponse.status(200);
-      res.wappResponse.sendData = {
-        data: data,
-        stats: stats,
-        parsedPath: parsedSanitizePath
-      };
-      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);
-      });
-      stream.on("open", function onopen() {
-        res.wapp.middleware.runSendMiddlewares(req, res, function next() {
-          res.wapp.log(req, res);
-          stream.pipe(res);
-        });
-      });
-    } catch (err) {
-      endStream(req, res, stream);
-      res.wappResponse.status(err.statusCode || 500, err);
-      res.wapp.log(err, req, res);
-      next(err);
+  return /*#__PURE__*/function () {
+    var _staticMiddleware = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee(req, res, next) {
+      var parsedUrl, sanitizePath, pathname, parsedSanitizePath, ext, stream, data, stats, _t, _t2;
+      return (0, _regenerator2["default"])().w(function (_context) {
+        while (1) switch (_context.p = _context.n) {
+          case 0:
+            parsedUrl = {
+              pathname: req.wappRequest.path
+            };
+            try {
+              parsedUrl = new URL(req.wappRequest.url);
+            } catch (e) {}
+            sanitizePath = path.normalize(parsedUrl.pathname).replace(/^(\.\.[\/\\])+/, "");
+            pathname = path.join(publicPath, sanitizePath);
+            parsedSanitizePath = path.parse(pathname);
+            ext = parsedSanitizePath.ext;
+            if (ext) {
+              _context.n = 2;
+              break;
+            }
+            _context.n = 1;
+            return next();
+          case 1:
+            return _context.a(2, _context.v);
+          case 2:
+            _context.p = 2;
+            _context.n = 3;
+            return fs.access(pathname);
+          case 3:
+            _context.n = 6;
+            break;
+          case 4:
+            _context.p = 4;
+            _t = _context.v;
+            _context.n = 5;
+            return next();
+          case 5:
+            return _context.a(2, _context.v);
+          case 6:
+            _context.p = 6;
+            _context.n = 7;
+            return fs.readFile(pathname);
+          case 7:
+            data = _context.v;
+            _context.n = 8;
+            return fs.stat(pathname);
+          case 8:
+            stats = _context.v;
+            res.wappResponse.status(200);
+            res.wappResponse.sendData = {
+              data: data,
+              stats: stats,
+              parsedPath: parsedSanitizePath
+            };
+            stream = fsSync.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);
+            });
+            stream.on("open", function onopen() {
+              res.wapp.middleware.runSendMiddlewares(req, res, function next() {
+                res.wapp.log(req, res);
+                stream.pipe(res);
+              });
+            });
+            _context.n = 10;
+            break;
+          case 9:
+            _context.p = 9;
+            _t2 = _context.v;
+            endStream(req, res, stream);
+            res.wappResponse.status(_t2.statusCode || 500, _t2);
+            res.wapp.log(_t2, req, res);
+            next(_t2);
+          case 10:
+            return _context.a(2);
+        }
+      }, _callee, null, [[6, 9], [2, 4]]);
+    }));
+    function staticMiddleware(_x, _x2, _x3) {
+      return _staticMiddleware.apply(this, arguments);
     }
-  };
+    return staticMiddleware;
+  }();
 }

package/package.json

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