wapplr 1.0.43 → 1.0.44

package/dist/server/app.js

@@ -1,356 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = createApp;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _utils = require("../common/utils.js");
-
-var _static = _interopRequireDefault(require("./static"));
-
-var _url = require("url");
-
-function createApp() {
-  var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var wapp = p.wapp;
-  var defaultConfig = Object.create(Object.prototype, {});
-  var defaultMiddlewares = [function next(req, res, next) {
-    if (next) {
-      return next();
-    }
-
-    return null;
-  }];
-
-  function defaultErrorHandler(err, req, res, next) {
-    var wapp = app.wapp;
-    var _wapp$log = wapp.log,
-        log = _wapp$log === void 0 ? function () {
-      return "";
-    } : _wapp$log;
-    res.status(500, err);
-    var text = log(err, req, res);
-
-    if (res.headersSent) {
-      if (next) {
-        return next(err);
-      }
-
-      return;
-    }
-
-    var config = wapp.server.config;
-    var _config$siteName = config.siteName,
-        siteName = _config$siteName === void 0 ? "Wapplr" : _config$siteName;
-    var renderedContent = wapp.log.renderedContent({
-      title: err.message + " | " + siteName,
-      text: text.split("\n")[0],
-      toConsole: JSON.stringify(text.split("[500]")[0] + "[500] " + err.stack.replace("Error: ", ""))
-    });
-    res.send(renderedContent);
-  }
-
-  function defaultHandle(_x, _x2, _x3) {
-    return _defaultHandle.apply(this, arguments);
-  }
-
-  function _defaultHandle() {
-    _defaultHandle = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(req, res, out) {
-      var middlewares, index, next, _next;
-
-      return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              _next = function _next3() {
-                _next = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(err) {
-                  var func, defaultArgs, args, requestMethod, requestUrl;
-                  return _regenerator["default"].wrap(function _callee2$(_context2) {
-                    while (1) {
-                      switch (_context2.prev = _context2.next) {
-                        case 0:
-                          if (!middlewares[index]) {
-                            _context2.next = 19;
-                            break;
-                          }
-
-                          func = middlewares[index];
-                          index = index + 1;
-                          defaultArgs = [req, res, err ? /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-                            return _regenerator["default"].wrap(function _callee$(_context) {
-                              while (1) {
-                                switch (_context.prev = _context.next) {
-                                  case 0:
-                                    _context.next = 2;
-                                    return next(err);
-
-                                  case 2:
-                                  case "end":
-                                    return _context.stop();
-                                }
-                              }
-                            }, _callee);
-                          })) : next];
-                          args = func.length === 4 && err ? [err].concat(defaultArgs) : defaultArgs;
-                          _context2.prev = 5;
-                          _context2.next = 8;
-                          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.status(500, _context2.t0);
-                          _context2.next = 16;
-                          return next(_context2.t0);
-
-                        case 16:
-                          return _context2.abrupt("return", _context2.sent);
-
-                        case 17:
-                          _context2.next = 25;
-                          break;
-
-                        case 19:
-                          if (!(typeof out === "function")) {
-                            _context2.next = 24;
-                            break;
-                          }
-
-                          index = 0;
-                          return _context2.abrupt("return", out(err));
-
-                        case 24:
-                          if (err) {
-                            index = 0;
-                            app.errorHandler(err, req, res, out);
-                          } else if (!res.headersSent) {
-                            index = 0;
-                            res.status(404);
-                            requestMethod = req.method;
-                            requestUrl = req.url;
-                            res.send(requestMethod + " " + requestUrl);
-                          }
-
-                        case 25:
-                          return _context2.abrupt("return", null);
-
-                        case 26:
-                        case "end":
-                          return _context2.stop();
-                      }
-                    }
-                  }, _callee2, null, [[5, 11]]);
-                }));
-                return _next.apply(this, arguments);
-              };
-
-              next = function _next2(_x4) {
-                return _next.apply(this, arguments);
-              };
-
-              middlewares = app.middlewares;
-              index = 0;
-              _context3.next = 6;
-              return next();
-
-            case 6:
-              return _context3.abrupt("return", _context3.sent);
-
-            case 7:
-            case "end":
-              return _context3.stop();
-          }
-        }
-      }, _callee3);
-    }));
-    return _defaultHandle.apply(this, arguments);
-  }
-
-  function defaultUse(fn) {
-    var fns = typeof fn === "function" ? [fn] : typeof fn === "object" && fn.length ? fn : [];
-
-    if (fns.length === 0) {
-      throw new TypeError('app.use() requires a middleware function');
-    }
-
-    var middlewares = app.middlewares;
-    fns.forEach(function (fn, i) {
-      middlewares.push(fn);
-    });
-    return this;
-  }
-
-  function defaultPost(path, fn) {
-    function post(req, res, next) {
-      if (req.method === "POST" && req.path === path) {
-        return fn(req, res, next);
-      }
-
-      next();
-    }
-
-    app.use(post);
-    return this;
-  }
-
-  function defaultGet(path, fn) {
-    function get(req, res, next) {
-      if (req.method === "GET" && req.path === path) {
-        return fn(req, res, next);
-      }
-
-      next();
-    }
-
-    app.use(get);
-    return this;
-  }
-
-  var appProperties = Object.create(Object.prototype, {
-    config: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      writable: false,
-      value: defaultConfig
-    }),
-    middlewares: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      writable: false,
-      value: defaultMiddlewares
-    }),
-    errorHandler: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: defaultErrorHandler
-    }),
-    handle: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: defaultHandle
-    }),
-    use: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: defaultUse
-    }),
-    post: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: defaultPost
-    }),
-    get: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: defaultGet
-    }),
-    "static": (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-      value: _static["default"]
-    })
-  });
-
-  function app() {
-    return _app.apply(this, arguments);
-  }
-
-  function _app() {
-    _app = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-      var req,
-          res,
-          next,
-          defaultOut,
-          fullUrl,
-          _args4 = arguments;
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              req = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
-              res = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : {};
-              next = _args4.length > 2 ? _args4[2] : undefined;
-
-              if (!(typeof app.handle === "function")) {
-                _context4.next = 13;
-                break;
-              }
-
-              defaultOut = function defaultOut(err) {
-                if (err) {
-                  return app.errorHandler(err, req, res);
-                }
-
-                if (!res.headersSent) {
-                  res.status(404);
-                  var requestMethod = req.method;
-                  var requestUrl = req.url;
-                  return res.send(requestMethod + " " + requestUrl);
-                }
-
-                return null;
-              };
-
-              // these properties and functions what usually there are in req and res, but there is not in NodeJs default
-              // req: path,
-              // res: status, send, json
-              // need some other properties, but those set in NodeJs default
-              // req: url, hostname, protocol, secure, method, httpVersion,
-              // res: statusCode, headersSent
-              // and some function in res: end, setHeader
-              fullUrl = req.protocol + "://" + req.hostname + req.url;
-
-              if (!req.path) {
-                try {
-                  req.path = new _url.URL(fullUrl).pathname;
-                } catch (e) {}
-              }
-
-              if (!req.query) {
-                try {
-                  req.query = Object.fromEntries(new _url.URL(fullUrl).searchParams);
-                } catch (e) {}
-              }
-
-              if (!res.status) {
-                res.status = function (sc) {
-                  res.statusCode = sc;
-                  return res;
-                };
-              }
-
-              if (!res.send) {
-                res.send = function (html) {
-                  res.end(html);
-                };
-              }
-
-              if (!res.json) {
-                res.json = function (json) {
-                  res.setHeader('Content-Type', 'application/json');
-                  res.send(JSON.stringify(json));
-                };
-              }
-
-              _context4.next = 13;
-              return app.handle(req, res, next || defaultOut);
-
-            case 13:
-              return _context4.abrupt("return", app);
-
-            case 14:
-            case "end":
-              return _context4.stop();
-          }
-        }
-      }, _callee4);
-    }));
-    return _app.apply(this, arguments);
-  }
-
-  (0, _utils.mergeProperties)(app, appProperties);
-  Object.defineProperty(app, "wapp", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
-    writable: false,
-    enumerable: false,
-    value: wapp
-  }));
-  return app;
-}

package/dist/server/config.js

@@ -1,69 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = getConfig;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
-var _fs = _interopRequireDefault(require("fs"));
-
-var _path = _interopRequireDefault(require("path"));
-
-var _config = _interopRequireDefault(require("../common/config"));
-
-function getConfig() {
-  var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var _p$config = p.config,
-      config = _p$config === void 0 ? {} : _p$config;
-  var serverConfig = config.server || {};
-  var commonConfig = (0, _config["default"])(p).config;
-  var globals = (0, _objectSpread2["default"])({}, commonConfig.globals);
-  var common = (0, _objectSpread2["default"])({}, commonConfig.common);
-  var assets = serverConfig.assets;
-  var credentials = serverConfig.credentials;
-  var dirname = globals.ROOT || __dirname;
-
-  try {
-    if (!assets && _fs["default"].existsSync(_path["default"].resolve(dirname, "./asset-manifest.json"))) {
-      assets = JSON.parse(_fs["default"].readFileSync(_path["default"].resolve(dirname, "./asset-manifest.json"), "utf-8"));
-    }
-
-    if (_fs["default"].existsSync(_path["default"].resolve(dirname, "./chunk-manifest.json"))) {
-      var chunks = JSON.parse(_fs["default"].readFileSync(_path["default"].resolve(dirname, "./chunk-manifest.json"), "utf-8"));
-
-      if (chunks) {
-        assets.chunks = (0, _objectSpread2["default"])({}, chunks);
-      }
-    }
-  } catch (e) {}
-
-  try {
-    var credentialsFolder = "secure/";
-
-    if (!credentials && _fs["default"].existsSync(_path["default"].resolve(dirname, credentialsFolder, "localhost.key")) && _fs["default"].existsSync(_path["default"].resolve(dirname, credentialsFolder, "localhost.crt"))) {
-      credentials = {
-        key: _fs["default"].readFileSync(_path["default"].resolve(dirname, credentialsFolder, "localhost.key"), "utf8"),
-        cert: _fs["default"].readFileSync(_path["default"].resolve(dirname, credentialsFolder, "localhost.crt"), "utf8")
-      };
-    }
-  } catch (e) {}
-
-  var server = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, serverConfig), {}, {
-    port: serverConfig.port || 80,
-    portSSL: serverConfig.portSSL || 443,
-    publicPath: _path["default"].resolve(dirname, "public"),
-    assets: assets,
-    credentials: credentials
-  });
-  return {
-    config: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, config), {}, {
-      globals: globals,
-      common: common,
-      server: server
-    })
-  };
-}