wapplr 1.0.75 → 1.0.76

package/dist/server/createServer.js

@@ -1,73 +1,52 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = createServer;
-
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
-
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
 var _nodeHttp = _interopRequireDefault(require("node:http"));
-
 var _nodeHttp2 = _interopRequireDefault(require("node:http2"));
-
 var _nodeFs = _interopRequireDefault(require("node:fs"));
-
 var _nodePath = _interopRequireDefault(require("node:path"));
-
 var _common = _interopRequireDefault(require("../common"));
-
 var _app = _interopRequireDefault(require("./app.js"));
-
 var _middlewares = _interopRequireDefault(require("./middlewares"));
-
 var _config = _interopRequireDefault(require("./config"));
-
 var _utils = require("../common/utils.js");
-
 var _excluded = ["port", "portSSL", "publicPath", "assets", "credentials", "disableUseDefaultMiddlewares"],
-    _excluded2 = ["wapp"];
-
+  _excluded2 = ["wapp"];
 function createServer() {
   var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var wapp = (0, _common["default"])(p);
   var app = (0, _app["default"])({
     wapp: wapp
   });
-
   var _createConfig = (0, _config["default"])(p),
-      config = _createConfig.config;
-
+    config = _createConfig.config;
   var serverConfig = config.server || {};
   var port = serverConfig.port,
-      portSSL = serverConfig.portSSL,
-      publicPath = serverConfig.publicPath,
-      _serverConfig$assets = serverConfig.assets,
-      assets = _serverConfig$assets === void 0 ? {} : _serverConfig$assets,
-      _serverConfig$credent = serverConfig.credentials,
-      credentials = _serverConfig$credent === void 0 ? {} : _serverConfig$credent,
-      _serverConfig$disable = serverConfig.disableUseDefaultMiddlewares,
-      disableUseDefaultMiddlewares = _serverConfig$disable === void 0 ? false : _serverConfig$disable,
-      rest = (0, _objectWithoutProperties2["default"])(serverConfig, _excluded);
+    portSSL = serverConfig.portSSL,
+    publicPath = serverConfig.publicPath,
+    _serverConfig$assets = serverConfig.assets,
+    assets = _serverConfig$assets === void 0 ? {} : _serverConfig$assets,
+    _serverConfig$credent = serverConfig.credentials,
+    credentials = _serverConfig$credent === void 0 ? {} : _serverConfig$credent,
+    _serverConfig$disable = serverConfig.disableUseDefaultMiddlewares,
+    disableUseDefaultMiddlewares = _serverConfig$disable === void 0 ? false : _serverConfig$disable,
+    rest = (0, _objectWithoutProperties2["default"])(serverConfig, _excluded);
   var defaultCssToInlineStyle = Object.create(Object.prototype, {
     loadCssToStyle: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
       value: function value(a) {
         if (Array.isArray(a) && a.length) {
           var getThemeCss = function getThemeCss() {
             var themeCss = [];
-
             if (assets && assets.chunks) {
               Object.keys(assets.chunks).forEach(function (key) {
                 if (key === 'client') {
@@ -80,25 +59,20 @@ function createServer() {
                 }
               });
             }
-
             return themeCss;
           };
-
           var intersection = a.filter(function (x) {
             return wapp.server.config.assets.cssToInlineStyle.css.includes(x);
           });
-
           if (intersection.length === a.length) {
             return;
           }
-
           var themeCss = getThemeCss();
           var text = "";
           var css = [];
           themeCss.forEach(function (cssPath) {
             if (_nodeFs["default"].existsSync(_nodePath["default"].join(publicPath, cssPath))) {
               var cssContent = _nodeFs["default"].readFileSync(_nodePath["default"].join(publicPath, cssPath));
-
               if (cssContent) {
                 text = [text, cssContent].filter(function (t) {
                   return t;
@@ -138,7 +112,6 @@ function createServer() {
       enumerable: false,
       value: function value() {
         var chunks = [];
-
         if (assets && assets.chunks) {
           Object.keys(assets.chunks).forEach(function (key) {
             if (key === 'client') {
@@ -150,9 +123,7 @@ function createServer() {
             }
           });
         }
-
         var scripts = [].concat(chunks);
-
         if (assets) {
           Object.keys(assets).forEach(function (key) {
             if (key !== "chunks" && scripts.indexOf(assets[key]) === -1) {
@@ -162,7 +133,6 @@ function createServer() {
             }
           });
         }
-
         return scripts;
       }
     }),
@@ -174,14 +144,12 @@ function createServer() {
       enumerable: false,
       value: function value() {
         var chunks = [];
-
         if (assets && assets.chunks) {
           Object.keys(assets.chunks).forEach(function (key) {
             if (key === 'client') {
               var files = assets.chunks[key].sort();
               files.forEach(function (style) {
                 var _wapp$server$config$a;
-
                 if (style && style.match(".css") && chunks.indexOf(style) === -1 && !(((_wapp$server$config$a = wapp.server.config.assets.cssToInlineStyle.css) === null || _wapp$server$config$a === void 0 ? void 0 : _wapp$server$config$a.indexOf(style)) > -1)) {
                   chunks.push(style);
                 }
@@ -189,21 +157,17 @@ function createServer() {
             }
           });
         }
-
         var styles = [].concat(chunks);
-
         if (assets) {
           Object.keys(assets).forEach(function (key) {
             if (key !== "chunks" && styles.indexOf(assets[key]) === -1) {
               var _wapp$server$config$a2;
-
               if (assets[key] && assets[key].match(".css") && !(((_wapp$server$config$a2 = wapp.server.config.assets.cssToInlineStyle.css) === null || _wapp$server$config$a2 === void 0 ? void 0 : _wapp$server$config$a2.indexOf(assets[key])) > -1)) {
                 styles.push(assets[key]);
               }
             }
           });
         }
-
         return styles;
       }
     })
@@ -245,53 +209,46 @@ function createServer() {
       value: _nodeHttp["default"].createServer(app)
     })
   });
-
   function defaultListen() {
+    var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : p,
+      hostname = _ref.hostname;
     var _wapplrServer$config = wapplrServer.config,
-        port = _wapplrServer$config.port,
-        portSSL = _wapplrServer$config.portSSL,
-        credentials = _wapplrServer$config.credentials;
+      port = _wapplrServer$config.port,
+      portSSL = _wapplrServer$config.portSSL,
+      credentials = _wapplrServer$config.credentials;
     var key = credentials.key,
-        cert = credentials.cert;
+      cert = credentials.cert;
     var httpServer = port ? wapplrServer.servers[port] : null;
     var httpsServer = portSSL ? wapplrServer.servers[portSSL] : null;
-
     if (httpServer && httpServer.listening) {
       httpServer.close();
     }
-
     if (httpsServer && httpsServer.listening) {
       httpsServer.close();
     }
-
     var app = typeof wapplrServer.app == "function" ? wapplrServer.app : (0, _app["default"])({
       wapp: wapp
     });
-
     if (port) {
+      var _httpServer;
       if (!httpServer) {
         httpServer = _nodeHttp["default"].createServer(app);
         wapplrServer.servers[port] = httpServer;
       }
-
-      httpServer.listen(port, function () {
-        console.log("The server is running at http://localhost:".concat(port, "/"));
-      });
+      (_httpServer = httpServer).listen.apply(_httpServer, [port].concat((0, _toConsumableArray2["default"])(hostname ? [hostname] : []), [function () {
+        console.log("The server is running at http://".concat(hostname || '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;
-
+          _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var socket = _step.value;
@@ -304,8 +261,8 @@ function createServer() {
         }
       };
     }
-
     if (key && cert && portSSL) {
+      var _httpsServer;
       if (!httpsServer) {
         httpsServer = _nodeHttp2["default"].createSecureServer({
           key: key,
@@ -314,25 +271,20 @@ function createServer() {
         }, app);
         wapplrServer.servers[portSSL] = httpsServer;
       }
-
-      httpsServer.listen(portSSL, function () {
-        console.log("The server is running at https://localhost:".concat(portSSL, "/ with HTTP2 protocol"));
-      });
+      (_httpsServer = httpsServer).listen.apply(_httpsServer, [portSSL].concat((0, _toConsumableArray2["default"])(hostname ? [hostname] : []), [function () {
+        console.log("The server is running at https://".concat(hostname || '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;
-
+          _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
             var socket = _step2.value;
@@ -346,14 +298,12 @@ function createServer() {
       };
     }
   }
-
   function defaultClose(callback) {
     wapplrServer.app = null;
     var servers = wapplrServer.servers;
     var shouldClose = [];
     Object.keys(servers).forEach(function (port) {
       var httpServer = servers[port];
-
       if (httpServer && httpServer.listening) {
         shouldClose.push(httpServer);
       }
@@ -361,28 +311,22 @@ function createServer() {
     var closed = 0;
     shouldClose.forEach(function (httpServer) {
       httpServer.__destroySockets();
-
       httpServer.close(function () {
         closed = closed + 1;
         servers[port] = null;
       });
     });
-
     function waiting() {
       if (shouldClose.length === closed) {
         clearInterval(_int);
-
         if (callback) {
           callback();
         }
       }
     }
-
     var _int = setInterval(waiting, 1);
-
     waiting();
   }
-
   var defaultMiddlewares = (0, _middlewares["default"])((0, _objectSpread2["default"])({
     wapp: wapp
   }, p));
@@ -416,138 +360,109 @@ function createServer() {
   Object.defineProperty(wapp, "server", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
     value: wapplrServer
   }));
-
   if (wapplrServer.config.publicPath) {
     var _wapplrServer$middlew = wapplrServer.middlewares,
-        _wapp = _wapplrServer$middlew.wapp,
-        _rest = (0, _objectWithoutProperties2["default"])(_wapplrServer$middlew, _excluded2);
-
+      _wapp = _wapplrServer$middlew.wapp,
+      _rest = (0, _objectWithoutProperties2["default"])(_wapplrServer$middlew, _excluded2);
     wapplrServer.middlewares = (0, _objectSpread2["default"])({
       wapp: wapplrServer.middlewares.wapp,
       "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) {
-            case 0:
-              if (wapplrServer.config.disableUseDefaultMiddlewares) {
-                _context3.next = 7;
-                break;
-              }
-
-              next = /*#__PURE__*/function () {
-                var _ref = (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) {
-                        case 0:
-                          if (!middlewares[index]) {
-                            _context2.next = 19;
-                            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) {
-                                  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.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:
-                          if (!(typeof out === "function")) {
-                            _context2.next = 22;
-                            break;
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if (wapplrServer.config.disableUseDefaultMiddlewares) {
+              _context3.next = 7;
+              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) {
+                    case 0:
+                      if (!middlewares[index]) {
+                        _context2.next = 19;
+                        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) {
+                            case 0:
+                              _context.next = 2;
+                              return next(err);
+                            case 2:
+                            case "end":
+                              return _context.stop();
                           }
-
-                          index = 0;
-                          return _context2.abrupt("return", out(err));
-
-                        case 22:
-                          return _context2.abrupt("return", null);
-
-                        case 23:
-                        case "end":
-                          return _context2.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.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:
+                      if (!(typeof out === "function")) {
+                        _context2.next = 22;
+                        break;
                       }
-                    }
-                  }, _callee2, null, [[5, 11]]);
-                }));
-
-                return function next(_x4) {
-                  return _ref.apply(this, arguments);
-                };
-              }();
-
-              middlewares = Object.keys(wapplrServer.middlewares).map(function (key) {
-                return wapplrServer.middlewares[key];
-              });
-              index = 0;
-              _context3.next = 6;
-              return next();
-
-            case 6:
-              return _context3.abrupt("return", _context3.sent);
-
-            case 7:
-              _context3.next = 9;
-              return out();
-
-            case 9:
-              return _context3.abrupt("return", _context3.sent);
-
-            case 10:
-            case "end":
-              return _context3.stop();
-          }
+                      index = 0;
+                      return _context2.abrupt("return", out(err));
+                    case 22:
+                      return _context2.abrupt("return", null);
+                    case 23:
+                    case "end":
+                      return _context2.stop();
+                  }
+                }, _callee2, null, [[5, 11]]);
+              }));
+              return function next(_x4) {
+                return _ref2.apply(this, arguments);
+              };
+            }();
+            middlewares = Object.keys(wapplrServer.middlewares).map(function (key) {
+              return wapplrServer.middlewares[key];
+            });
+            index = 0;
+            _context3.next = 6;
+            return next();
+          case 6:
+            return _context3.abrupt("return", _context3.sent);
+          case 7:
+            _context3.next = 9;
+            return out();
+          case 9:
+            return _context3.abrupt("return", _context3.sent);
+          case 10:
+          case "end":
+            return _context3.stop();
         }
       }, _callee3);
     }));
-
     function defaultMiddlewaresWrapper(_x, _x2, _x3) {
       return _defaultMiddlewaresWrapper.apply(this, arguments);
     }
-
     return defaultMiddlewaresWrapper;
   }());
-
   if (!process._addedUnhandledExceptions) {
     var wapplrUnhandledHandler = function wapplrUnhandledHandler(err) {
       console.log(err);
@@ -555,7 +470,6 @@ function createServer() {
         process.exit(1);
       });
     };
-
     process.on('uncaughtException', wapplrUnhandledHandler);
     process.on('unhandledRejection', wapplrUnhandledHandler);
     Object.defineProperty(process, "_addedUnhandledExceptions", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
@@ -564,6 +478,5 @@ function createServer() {
       value: wapplrUnhandledHandler
     }));
   }
-
   return wapp;
 }