wapplr 1.0.76 → 1.0.78

package/dist/common/requests.js

@@ -55,6 +55,7 @@ function createDefaultRequestManager() {
   }
   function _defaultSendRequest() {
     _defaultSendRequest = (0, _asyncToGenerator2["default"])( /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee() {
+      var _p$req, _p$req$wappRequest;
       var p,
         wapp,
         fetch,
@@ -79,7 +80,7 @@ function createDefaultRequestManager() {
           case 0:
             p = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
             wapp = requestManager.wapp;
-            fetch = requestManager.fetch;
+            fetch = ((_p$req = p.req) === null || _p$req === void 0 ? void 0 : (_p$req$wappRequest = _p$req.wappRequest) === null || _p$req$wappRequest === void 0 ? void 0 : _p$req$wappRequest.fetch) || requestManager.fetch;
             if (!fetch && typeof window !== "undefined" && window.fetch) {
               fetch = window.fetch;
             }

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 _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+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,92 @@ 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, _regeneratorRuntime2["default"])().mark(function _callee(req, res, next) {
+      var parsedUrl, sanitizePath, pathname, parsedSanitizePath, ext, stream, data, stats;
+      return (0, _regeneratorRuntime2["default"])().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          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.next = 10;
+              break;
+            }
+            _context.next = 9;
+            return next();
+          case 9:
+            return _context.abrupt("return", _context.sent);
+          case 10:
+            _context.prev = 10;
+            _context.next = 13;
+            return fs.access(pathname);
+          case 13:
+            _context.next = 20;
+            break;
+          case 15:
+            _context.prev = 15;
+            _context.t0 = _context["catch"](10);
+            _context.next = 19;
+            return next();
+          case 19:
+            return _context.abrupt("return", _context.sent);
+          case 20:
+            _context.prev = 20;
+            _context.next = 23;
+            return fs.readFile(pathname);
+          case 23:
+            data = _context.sent;
+            _context.next = 26;
+            return fs.stat(pathname);
+          case 26:
+            stats = _context.sent;
+            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.next = 41;
+            break;
+          case 35:
+            _context.prev = 35;
+            _context.t1 = _context["catch"](20);
+            endStream(req, res, stream);
+            res.wappResponse.status(_context.t1.statusCode || 500, _context.t1);
+            res.wapp.log(_context.t1, req, res);
+            next(_context.t1);
+          case 41:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[10, 15], [20, 35]]);
+    }));
+    function staticMiddleware(_x, _x2, _x3) {
+      return _staticMiddleware.apply(this, arguments);
     }
-  };
+    return staticMiddleware;
+  }();
 }

package/package.json

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