@x-9lab/xlab 1.6.1 → 2.0.1

package/dist/default-x-config.js

@@ -2,18 +2,22 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.default = void 0;
-var _utils = require("@x-drive/utils");
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+const _utils = require("@x-drive/utils");
 /**默认业务目录 */ var businessDir = "@server";
 let Config = class Config {
     get businessDir() {
         return businessDir;
     }
     set businessDir(val) {
-        if ((0, _utils).isString(val)) {
+        if ((0, _utils.isString)(val)) {
             businessDir = val;
         }
     }
 };
-var _default = new Config;
-exports.default = _default;
+const _default = new Config;

package/dist/dot-file.js

@@ -2,17 +2,37 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.processDotFile = void 0;
-var _utils = require("@x-drive/utils");
-var _nodeUtil = require("node:util");
-var _path = _interopRequireDefault(require("path"));
-var _fs = _interopRequireDefault(require("fs"));
-function _interopRequireDefault(obj) {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get getXlabEnv () {
+        return getXlabEnv;
+    },
+    get processDotFile () {
+        return processDotFile;
+    }
+});
+const _utils = require("@x-drive/utils");
+const _nodeutil = require("node:util");
+const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 /**行分割正则 */ const LINE_SPLIT_REGEXP = /[\s]?=[\s]?/;
+/**`.xlab` 环境数据存储对象 */ const XLAB = {};
+/**
+ * 获取 `.xlab` 系列文件定义的环境数据
+ * @return 环境数据对象
+ */ function getXlabEnv() {
+    return XLAB;
+}
 /**处理根目录下可能存在的配置文件 */ function processDotFile(env, logger) {
     env = env.toLowerCase();
     if (env === "production") {
@@ -21,20 +41,25 @@ function _interopRequireDefault(obj) {
         env = `.${env}`;
     }
     const dotFile = _path.default.resolve(process.cwd(), `.xlab${env}`);
+    var fileStr;
     try {
-        const fileStr = _fs.default.readFileSync(dotFile, "utf8");
-        const lines = fileStr.split("\n");
-        for(let i = 0; i < lines.length; i++){
-            const line = lines[i];
-            const linePart = line.split(LINE_SPLIT_REGEXP);
-            if ((0, _utils).isArray(linePart) && linePart.length === 2) {
-                global.XLAB[linePart[0]] = JSON.parse(linePart[1]);
-            }
-        }
+        fileStr = _fs.default.readFileSync(dotFile, "utf8");
     } catch (e) {
         if (e.code !== "ENOENT") {
-            logger.error((0, _nodeUtil).inspect(e));
+            logger.error((0, _nodeutil.inspect)(e));
+        }
+        return;
+    }
+    const lines = fileStr.split("\n");
+    for(let i = 0; i < lines.length; i++){
+        const linePart = lines[i].split(LINE_SPLIT_REGEXP);
+        if ((0, _utils.isArray)(linePart) && linePart.length === 2) {
+            // 按行解析, 单行数据异常不影响其他行
+            try {
+                XLAB[linePart[0]] = JSON.parse(linePart[1]);
+            } catch (e) {
+                logger.error(`.xlab${env} 第 ${i + 1} 行解析失败:`, (0, _nodeutil.inspect)(e));
+            }
         }
     }
 }
-exports.processDotFile = processDotFile;

package/dist/global.js

@@ -1,8 +1,34 @@
 "use strict";
-var _defaultXConfig = _interopRequireDefault(require("./default-x-config"));
-var _config = require("./config");
-var _path = _interopRequireDefault(require("path"));
-function _interopRequireDefault(obj) {
+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 getSysConfig () {
+        return getSysConfig;
+    },
+    get requireMod () {
+        return requireMod;
+    },
+    get requireModel () {
+        return requireModel;
+    },
+    get requireService () {
+        return requireService;
+    },
+    get setSysConfig () {
+        return setSysConfig;
+    }
+});
+const _defaultxconfig = /*#__PURE__*/ _interop_require_default(require("./default-x-config"));
+const _config = require("./config");
+const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
@@ -16,51 +42,31 @@ function _interopRequireDefault(obj) {
     return _path.default.resolve(root || __dirname, "components", name);
 }
 /**
- * 获取 components 模块
+ * 获取内置组件
  * @param  name 模块名
  * @return      模块对象
  */ function requireMod(name) {
     return require(getModulePath(name));
 }
-global.requireMod = requireMod;
-/**
- * model 存放路径
- */ const MODEL_PATH = _path.default.resolve(process.cwd(), _defaultXConfig.default.businessDir, "business", "@models");
-/**
- * 全局获取 model 的方法
- * @param  name model 名称
- * @return      model 模块
- */ function requireModel(name) {
-    return require(_path.default.resolve(MODEL_PATH, name));
+function requireModel(name) {
+    return require(_path.default.resolve(process.cwd(), _defaultxconfig.default.businessDir, "business", "@models", name));
 }
-global.requireModel = requireModel;
-/**
- * services 存放目录
- */ const SERVICES_PATH = _path.default.resolve(process.cwd(), _defaultXConfig.default.businessDir, "business", "@services");
-/**
- * 全局获取 service 的方法
- * @param  name service 名称
- * @return      service 模块
- */ function requireService(name) {
-    return require(_path.default.resolve(SERVICES_PATH, name));
+function requireService(name) {
+    return require(_path.default.resolve(process.cwd(), _defaultxconfig.default.businessDir, "business", "@services", name));
 }
-global.requireService = requireService;
 /**
  * 获取系统配置
  * @param  key 配置项
  */ function getSysConfig(key) {
-    const conf = (0, _config).get();
+    const conf = (0, _config.get)();
     if (key) {
         return conf[key];
     }
     return conf;
 }
-global.getSysConfig = getSysConfig;
 /**
  * 更新系统配置
  * @param  conf 配置项
  */ function setSysConfig(conf) {
-    (0, _config).update(conf);
+    (0, _config.update)(conf);
 }
-global.setSysConfig = setSysConfig;
-global.XLAB = {}; // globalLogger.log("global")

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,18 +1,26 @@
 "use strict";
-var _common = require("./components/common");
-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) {
-        // 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;