@x-9lab/xlab 1.6.0 → 2.0.0

package/dist/index.js

@@ -0,0 +1,100 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get Log () {
+        return _log.Log;
+    },
+    get app () {
+        return _server.app;
+    },
+    get boot () {
+        return _server.boot;
+    },
+    get default () {
+        return _default;
+    },
+    get defineApi () {
+        return _router.defineApi;
+    },
+    get exit () {
+        return _server.exit;
+    },
+    get getApp () {
+        return _server.getApp;
+    },
+    get getLogger () {
+        return _log.getLogger;
+    },
+    get getSysConfig () {
+        return _global.getSysConfig;
+    },
+    get getXlabEnv () {
+        return _dotfile.getXlabEnv;
+    },
+    get globalLog () {
+        return _log.globalLog;
+    },
+    get masterLog () {
+        return _config.log;
+    },
+    get requireMod () {
+        return _global.requireMod;
+    },
+    get requireModel () {
+        return _global.requireModel;
+    },
+    get requireService () {
+        return _global.requireService;
+    },
+    get setSysConfig () {
+        return _global.setSysConfig;
+    },
+    get shutdown () {
+        return _server.shutdown;
+    }
+});
+const _server = /*#__PURE__*/ _interop_require_wildcard(require("./server"));
+const _global = require("./global");
+const _log = require("./components/log");
+const _config = require("./config");
+const _dotfile = require("./dot-file");
+const _router = require("./router");
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) return obj;
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") return {
+        default: obj
+    };
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) return cache.get(obj);
+    var newObj = {
+        __proto__: null
+    };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) Object.defineProperty(newObj, key, desc);
+            else newObj[key] = obj[key];
+        }
+    }
+    newObj.default = obj;
+    if (cache) cache.set(obj, newObj);
+    return newObj;
+}
+const _default = _server.default;

package/dist/init-env.js

@@ -1,19 +1,26 @@
 "use strict";
-var _common = require("./components/common");
-var _log = require("./components/log");
-var _defaultXConfig = _interopRequireDefault(require("./default-x-config"));
-var _path = require("path");
-function _interopRequireDefault(obj) {
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+const _common = require("./components/common");
+const _defaultxconfig = /*#__PURE__*/ _interop_require_default(require("./default-x-config"));
+const _path = require("path");
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-function tryToSetEnv() {
-    const envPath = (0, _path).resolve(process.cwd(), _defaultXConfig.default.businessDir, "@env", "index.js");
-    var hasInitModule = (0, _common).checkFileStat(envPath, true);
+/**执行业务的 @env 环境预处理模块 */ function initEnv() {
+    const envPath = (0, _path.resolve)(process.cwd(), _defaultxconfig.default.businessDir, "@env", "index.js");
+    var hasInitModule = (0, _common.checkFileStat)(envPath, true);
     if (hasInitModule) {
-        (0, _log).globalLog("InitEnv", "Try to init env");
         require(envPath);
     }
 }
-tryToSetEnv();
+const _default = initEnv;

package/dist/middleware/@bin/html-filter.js

@@ -2,9 +2,22 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = _default;
-exports.filter = void 0;
-var _utils = require("@x-drive/utils");
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get default () {
+        return _default;
+    },
+    get filter () {
+        return filter;
+    }
+});
+const _utils = require("@x-drive/utils");
+const _config = require("../../config");
 var conf;
 const VER_RE = /\d+\.\d+\.\d+/;
 var routeMobile;
@@ -38,8 +51,8 @@ var nowDay = new Date().getDate();
     shuffle(m4h);
     var logLen = 0;
     for(let j = 1; j <= 24; j++){
-        let sIndex = (0, _utils).random(59, 0);
-        let sLen = Math.min((0, _utils).random(PRE_MAX_NUM, PRE_MIN_NUM), 60 - sIndex);
+        let sIndex = (0, _utils.random)(59, 0);
+        let sLen = Math.min((0, _utils.random)(PRE_MAX_NUM, PRE_MIN_NUM), 60 - sIndex);
         if (sLen + logLen > MAX_COLLECT) {
             sLen = MAX_COLLECT - logLen;
         }
@@ -81,7 +94,6 @@ function filter(url) {
     return data;
 }
 function _default() {
-    conf = getSysConfig();
+    conf = (0, _config.get)();
     routeMobile = conf.routeMobile;
 }
-exports.filter = filter;

package/dist/middleware/bad-request.js

@@ -2,12 +2,17 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = void 0;
-var _common = require("../components/common");
-var _assets = require("../components/assets");
-const s5xx = (0, _assets).get("5xx");
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+const _common = require("../components/common");
+const _assets = require("../components/assets");
+const s5xx = (0, _assets.get)("5xx");
 const code_map = {
-    "404": (0, _assets).get("404"),
+    "404": (0, _assets.get)("404"),
     "503": s5xx,
     "504": s5xx
 };
@@ -26,9 +31,8 @@ function handler(ctx) {
                 dat = page_tpl.replace("{dat}", re);
         }
     } else {
-        dat = (0, _common).responseResult(false, re);
+        dat = (0, _common.responseResult)(false, re);
     }
     ctx.body = dat;
 }
-var _default = handler;
-exports.default = _default;
+const _default = handler;

package/dist/middleware/compress.js

@@ -2,10 +2,15 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = void 0;
-var _koaCompress = _interopRequireDefault(require("koa-compress"));
-var _zlib = _interopRequireDefault(require("zlib"));
-function _interopRequireDefault(obj) {
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+const _koacompress = /*#__PURE__*/ _interop_require_default(require("koa-compress"));
+const _zlib = /*#__PURE__*/ _interop_require_default(require("zlib"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
@@ -28,7 +33,6 @@ function handler(config) {
             gzipOpts.flush = _zlib.default[config.gzip.flush];
         }
     }
-    return (0, _koaCompress).default(gzipOpts);
+    return (0, _koacompress.default)(gzipOpts);
 }
-var _default = handler;
-exports.default = _default;
+const _default = handler;

package/dist/middleware/cors.js

@@ -2,8 +2,14 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = _default;
-var _utils = require("@x-drive/utils");
+Object.defineProperty(exports, /**跨域请求处理中间件初始化函数 */ "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+const _utils = require("@x-drive/utils");
+const _config = require("../config");
 /**
 一些本地的域名或 ip
 
@@ -15,22 +21,29 @@ var _utils = require("@x-drive/utils");
 /**根域获取正则 */ const ROOT_NAME_REGEXP = /[\w-]*\.(?:com|lo|cc|cn|asia|biz|coop|edu|gov|int|info|jobs|mobi|name|net|org|pro|tel|trave)(\.[a-z]{2})?/im;
 /**获取域名根域 */ function getRootName(host) {
     const match = host.match(ROOT_NAME_REGEXP);
-    if (match && (0, _utils).isString(match[0])) {
+    if (match && (0, _utils.isString)(match[0])) {
         return match[0];
     }
     return null;
 }
-/**系统绑定的域名对应的根域 */ const ServerHostRootName = getRootName(getSysConfig("host"));
+/**系统绑定的域名对应的根域, 首次使用时解析 */ var serverHostRootName = false;
+/**获取系统绑定域名对应的根域 */ function getServerHostRootName() {
+    if (serverHostRootName === false) {
+        serverHostRootName = getRootName((0, _config.get)().host || "");
+    }
+    return serverHostRootName;
+}
 /**判断是否允许跨域 */ function isOneOfUs(origin, url, config = {}) {
     if (config && config.enable === false) {
         return false;
     }
-    if ((0, _utils).isFunction(config.check)) {
+    if ((0, _utils.isFunction)(config.check)) {
         return config.check(origin, url);
-    } else if ((0, _utils).isString(config.type)) {
+    } else if ((0, _utils.isString)(config.type)) {
         if (config.type === "all") {
             return true;
         } else if (config.type === "sameroot") {
+            const ServerHostRootName = getServerHostRootName();
             if (ServerHostRootName && getRootName(origin) === ServerHostRootName) {
                 return true;
             } else {
@@ -42,7 +55,7 @@ var _utils = require("@x-drive/utils");
 }
 function _default(config) {
     /**跨域请求处理中间件 */ async function cors(ctx, next) {
-        const { origin  } = ctx.headers;
+        const { origin } = ctx.headers;
         if (!origin) {
             await next();
             return;

package/dist/middleware/fresh-filter.js

@@ -2,10 +2,16 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = _default;
-var _header = require("../components/header");
-const conf = getSysConfig();
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+const _header = require("../components/header");
+const _config = require("../config");
 async function handle(ctx, next) {
+    const conf = (0, _config.get)();
     // 头部字段
     var pageUrl = ctx.state.parsedUrl && ctx.state.parsedUrl.pathname || ctx.url;
     var queryMap = ctx.query;
@@ -22,7 +28,7 @@ async function handle(ctx, next) {
     // 没有最后修改时间，附加上当前时间并继续
     // 或者有nocache参数的话，也直接响应 200 操作
     if (!conf["304"] || !!queryMap.no_cache || !modifiedSince) {
-        (0, _header).lastModified(nowDateString, ctx);
+        (0, _header.lastModified)(nowDateString, ctx);
         await next();
     // 发现有修改时间，直接返回304头
     } else {
@@ -35,7 +41,7 @@ async function handle(ctx, next) {
                 ctx.status = 304;
                 ctx.body = "";
             } else {
-                (0, _header).lastModified(nowDateString, ctx);
+                (0, _header.lastModified)(nowDateString, ctx);
                 await next();
             }
         // 其他的js/css/image静态资源设置两周的缓存时间（可配置）
@@ -45,12 +51,12 @@ async function handle(ctx, next) {
                 ctx.status = 304;
                 ctx.body = "";
             } else {
-                (0, _header).lastModified(nowDateString, ctx);
+                (0, _header.lastModified)(nowDateString, ctx);
                 await next();
             }
         //其他类型的请求，比如Server API等等
         } else {
-            (0, _header).lastModified(nowDateString, ctx);
+            (0, _header.lastModified)(nowDateString, ctx);
             await next();
         }
     }

package/dist/middleware/handle-pre-dir.js

@@ -2,22 +2,27 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = void 0;
-var conf = getSysConfig();
-/**
- * 路径处理匹配正则
- */ const replace_reg = new RegExp(conf.pathReplaceRegExp);
-/**
- * 处理代理过来多余的地址层级
- */ async function handlPreDir(ctx, next) {
-    if (replace_reg.test(ctx.url)) {
-        ctx.set("X-Pre-Dir", "Hit");
-        ctx.url = ctx.url.replace(replace_reg, "");
-        if (ctx.url.charAt(0) !== "/") {
-            ctx.url = "/" + ctx.url;
-        }
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
     }
-    await next();
+});
+const _config = require("../config");
+function _default() {
+    /**
+     * 路径处理匹配正则
+     */ const replace_reg = new RegExp((0, _config.get)().pathReplaceRegExp);
+    /**
+     * 处理代理过来多余的地址层级
+     */ return async function handlPreDir(ctx, next) {
+        if (replace_reg.test(ctx.url)) {
+            ctx.set("X-Pre-Dir", "Hit");
+            ctx.url = ctx.url.replace(replace_reg, "");
+            if (ctx.url.charAt(0) !== "/") {
+                ctx.url = "/" + ctx.url;
+            }
+        }
+        await next();
+    };
 }
-var _default = handlPreDir;
-exports.default = _default;

package/dist/middleware/request-filter.js

@@ -2,34 +2,48 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = _default;
-var _htmlFilter = _interopRequireWildcard(require("./@bin/html-filter"));
-var _url = _interopRequireDefault(require("url"));
-function _interopRequireDefault(obj) {
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+const _htmlfilter = /*#__PURE__*/ _interop_require_wildcard(require("./@bin/html-filter"));
+const _url = /*#__PURE__*/ _interop_require_default(require("url"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-function _interopRequireWildcard(obj) {
-    if (obj && obj.__esModule) {
-        return obj;
-    } else {
-        var newObj = {};
-        if (obj != null) {
-            for(var key in obj){
-                if (Object.prototype.hasOwnProperty.call(obj, key)) {
-                    var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {};
-                    if (desc.get || desc.set) {
-                        Object.defineProperty(newObj, key, desc);
-                    } else {
-                        newObj[key] = obj[key];
-                    }
-                }
-            }
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) return obj;
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") return {
+        default: obj
+    };
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) return cache.get(obj);
+    var newObj = {
+        __proto__: null
+    };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) Object.defineProperty(newObj, key, desc);
+            else newObj[key] = obj[key];
         }
-        newObj.default = obj;
-        return newObj;
     }
+    newObj.default = obj;
+    if (cache) cache.set(obj, newObj);
+    return newObj;
 }
 const IS_STATIC_RE = /^\/.*\.(ttf|woff|eot|html|css|js|json|png|jpeg|jpg|gif|bmp|handlebars|mp3|mp4|m3u8|avi|mpg|mpeg|xml|json|tpl)$/i;
 const IS_IMG_RE = /\.(jpg|jpeg|png|gif)$/i;
@@ -94,13 +108,13 @@ async function filter(ctx, next) {
         // 提取页面必要的信息
         // 由于 dir 也可能直接返回 HTML 页面
         // 所以这里也需要经过 HTML 的过滤器处理
-        ctx.state.ver = (0, _htmlFilter).filter(ctx.url);
+        ctx.state.ver = (0, _htmlfilter.filter)(ctx.url);
     } else if (isStatic(pathname)) {
         srcType.static = true;
         if (isHtml(pathname)) {
             srcType.html = true;
             // 提取页面必要的信息
-            ctx.state.ver = (0, _htmlFilter).filter(ctx.url);
+            ctx.state.ver = (0, _htmlfilter.filter)(ctx.url);
         } else if (isJS(pathname)) {
             srcType.js = true;
         } else if (isImg(pathname)) {
@@ -117,6 +131,6 @@ async function filter(ctx, next) {
     await next();
 }
 function _default() {
-    (0, _htmlFilter).default();
+    (0, _htmlfilter.default)();
     return filter;
 }

package/dist/middleware/service-mark.js

@@ -2,31 +2,28 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = _default;
-var _utils = require("@x-drive/utils");
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+const _utils = require("@x-drive/utils");
+const _config = require("../config");
 const serverPackge = require("../../package.json");
-var info = {};
-// 业务名称
-info.mark = getSysConfig("mark") || getSysConfig("name");
-// 业务版本
-info.version = getSysConfig("version");
-// 服务端版本
-info.serverVer = serverPackge.version;
-info.serverName = serverPackge.name;
-// 业务启动时间
-// FIX ME : 服务器不是北京时间的时候这个数据跟实际启动的时间存在时差
-info.date = (0, _utils).date(new Date(), "Y-m-d H:i:s");
-// 模块版本信息
-const CLIENT_MARK = `${info.mark}@${info.version}`;
-const SERVER_MARK = `${info.serverName}@${info.serverVer}`;
-const MARK = `${CLIENT_MARK},${SERVER_MARK};Startup@${info.date}`;
-info = null;
-/**
- * 处理函数
- */ async function handler(ctx, next) {
-    ctx.set("X-Mark", MARK);
-    await next();
-}
 function _default() {
-    return handler;
+    const conf = (0, _config.get)();
+    // 业务名称与版本
+    const CLIENT_MARK = `${conf.mark || conf.name}@${conf.version}`;
+    // 服务端版本
+    const SERVER_MARK = `${serverPackge.name}@${serverPackge.version}`;
+    // 业务启动时间
+    // FIX ME : 服务器不是北京时间的时候这个数据跟实际启动的时间存在时差
+    const MARK = `${CLIENT_MARK},${SERVER_MARK};Startup@${(0, _utils.date)(new Date(), "Y-m-d H:i:s")}`;
+    /**
+     * 处理函数
+     */ return async function handler(ctx, next) {
+        ctx.set("X-Mark", MARK);
+        await next();
+    };
 }

package/dist/middlewares.js

@@ -2,11 +2,17 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = void 0;
-var _utils = require("@x-drive/utils");
-var _common = require("./components/common");
-var _defaultXConfig = _interopRequireDefault(require("./default-x-config"));
-function _interopRequireDefault(obj) {
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+const _utils = require("@x-drive/utils");
+const _common = require("./components/common");
+const _config = require("./config");
+const _defaultxconfig = /*#__PURE__*/ _interop_require_default(require("./default-x-config"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
@@ -23,7 +29,7 @@ const cwd = process.cwd();
     "cors": true
 };
 /**获取中间件加载执行列表 */ function getExeList() {
-    const config = getSysConfig();
+    const config = (0, _config.get)();
     var mConfig;
     if (config.middlewares) {
         mConfig = config.middlewares;
@@ -31,37 +37,34 @@ const cwd = process.cwd();
         mConfig = null;
     }
     if (mConfig) {
-        return Object.keys(mConfig).filter((key)=>(0, _utils).isBoolean(mConfig[key]) ? mConfig[key] : true
-        ).map((key, index)=>{
-            if ((0, _utils).isBoolean(mConfig[key])) {
+        return Object.keys(mConfig).filter((key)=>(0, _utils.isBoolean)(mConfig[key]) ? mConfig[key] : true).map((key, index)=>{
+            if ((0, _utils.isBoolean)(mConfig[key])) {
                 mConfig[key] = {};
             }
-            if (!(0, _utils).isString(mConfig[key].name)) {
+            if (!(0, _utils.isString)(mConfig[key].name)) {
                 mConfig[key].name = key;
             }
-            if (!(0, _utils).isNumber(mConfig[key].index)) {
+            if (!(0, _utils.isNumber)(mConfig[key].index)) {
                 mConfig[key].index = index;
             }
             return mConfig[key];
-        }).sort((now, next)=>now.index - next.index
-        );
+        }).sort((now, next)=>now.index - next.index);
     }
     return [];
 }
 // ［最后3个中间件固定是 系统路由，静态文件服务，错误请求处理模块］
 /**加载中间件 */ function loadMiddleware(app) {
     const list = getExeList();
-    if ((0, _utils).isArray(list) && list.length) {
+    if ((0, _utils.isArray)(list) && list.length) {
         list.forEach((item)=>{
             if (INTERNAL_MIDDLEWARE[item.name]) {
-                app.use((0, _common).getRealDefaultMod(require(`./middleware/${item.name}`))(item.config));
+                app.use((0, _common.getRealDefaultMod)(require(`./middleware/${item.name}`))(item.config));
             } else {
-                app.use((0, _common).getRealDefaultMod(require(`${cwd}/${_defaultXConfig.default.businessDir}/middleware/${item.name}`))(item.config));
+                app.use((0, _common.getRealDefaultMod)(require(`${cwd}/${_defaultxconfig.default.businessDir}/middleware/${item.name}`))(item.config));
             }
-            masterLog(`MIDDLEWARE >>> [${item.name}] launch`);
+            (0, _config.log)(`MIDDLEWARE >>> [${item.name}] launch`);
         });
         console.log("");
     }
 }
-var _default = loadMiddleware;
-exports.default = _default;
+const _default = loadMiddleware;