@x-9lab/xlab 1.6.1 → 2.0.1

package/dist/components/assets/index.js

@@ -2,10 +2,15 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.get = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _fs = _interopRequireDefault(require("fs"));
-function _interopRequireDefault(obj) {
+Object.defineProperty(exports, "get", {
+    enumerable: true,
+    get: function() {
+        return get;
+    }
+});
+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
     };
@@ -26,4 +31,3 @@ try {
  */ function get(name) {
     return ASSETS[name] || null;
 }
-exports.get = get;

package/dist/components/cluster/index.js

@@ -2,7 +2,23 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.del = exports.add = exports.get = void 0;
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get add () {
+        return add;
+    },
+    get del () {
+        return del;
+    },
+    get get () {
+        return get;
+    }
+});
 /**
  * 消息注册存储对象
  */ const MSG_HANDLERS = {};
@@ -28,6 +44,3 @@ exports.del = exports.add = exports.get = void 0;
  */ function del(cmd) {
     delete MSG_HANDLERS[cmd];
 }
-exports.get = get;
-exports.add = add;
-exports.del = del;

package/dist/components/common/index.js

@@ -2,38 +2,70 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "sleep", {
-    enumerable: true,
-    get: function() {
-        return _utils.sleep;
-    }
-});
-Object.defineProperty(exports, "labelReplace", {
-    enumerable: true,
-    get: function() {
-        return _utils.labelReplace;
-    }
-});
-Object.defineProperty(exports, "fix0", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get asciiTobase64 () {
+        return asciiTobase64;
+    },
+    get base64Toascii () {
+        return base64Toascii;
+    },
+    get checkFileStat () {
+        return checkFileStat;
+    },
+    get fix0 () {
         return _utils.fix0;
-    }
-});
-Object.defineProperty(exports, "numberFormat", {
-    enumerable: true,
-    get: function() {
+    },
+    get formatJson () {
+        return formatJson;
+    },
+    get getMD5 () {
+        return getMD5;
+    },
+    get getRealDefaultMod () {
+        return getRealDefaultMod;
+    },
+    get labelReplace () {
+        return _utils.labelReplace;
+    },
+    get md5 () {
+        return md5;
+    },
+    get numberFormat () {
         return _utils.numberFormat;
+    },
+    get object2Array () {
+        return object2Array;
+    },
+    get params () {
+        return params;
+    },
+    get responseResult () {
+        return responseResult;
+    },
+    get sleep () {
+        return _utils.sleep;
+    },
+    get toJsonp () {
+        return toJsonp;
+    },
+    get walk () {
+        return walk;
     }
 });
-exports.getRealDefaultMod = exports.checkFileStat = exports.walk = exports.toJsonp = exports.formatJson = exports.object2Array = exports.md5 = exports.getMD5 = exports.responseResult = exports.params = exports.base64Toascii = exports.asciiTobase64 = void 0;
-var _utils = require("@x-drive/utils");
-var _returnCode = require("../return-code");
-var _querystring = _interopRequireDefault(require("querystring"));
-var _crypto = _interopRequireDefault(require("crypto"));
-var _path = _interopRequireDefault(require("path"));
-var _fs = _interopRequireDefault(require("fs"));
-function _interopRequireDefault(obj) {
+const _utils = require("@x-drive/utils");
+const _returncode = require("../return-code");
+const _log = require("../log");
+const _querystring = /*#__PURE__*/ _interop_require_default(require("querystring"));
+const _crypto = /*#__PURE__*/ _interop_require_default(require("crypto"));
+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
     };
@@ -41,7 +73,7 @@ function _interopRequireDefault(obj) {
 var logger;
 function checkLogger() {
     if (!logger) {
-        logger = log.getLogger("common");
+        logger = _log.globalLog.getLogger("common");
     }
     return logger;
 }
@@ -84,7 +116,7 @@ function checkLogger() {
  * @param  msg    返回的提示性信息
  * @return        数据对象
  */ function responseResult(status, result, msg) {
-    var code = (0, _utils).isObject(status) ? status : (0, _returnCode).getReturnCode(status);
+    var code = (0, _utils.isObject)(status) ? status : (0, _returncode.getReturnCode)(status);
     var dat = {
         "success": code.errorcode === 0,
         "code": code.errorcode,
@@ -103,9 +135,9 @@ function checkLogger() {
     return _crypto.default.createHash("md5").update(JSON.stringify(conditions), "utf8").digest("hex");
 }
 /**将一个输入字符串转为 md5 */ function md5(str) {
-    var md51 = _crypto.default.createHash("md5");
-    md51.update(str);
-    return md51.digest("hex");
+    var md5 = _crypto.default.createHash("md5");
+    md5.update(str);
+    return md5.digest("hex");
 }
 /**
  * 对象值转化为数组
@@ -186,15 +218,3 @@ function checkLogger() {
     }
     return mod;
 }
-exports.asciiTobase64 = asciiTobase64;
-exports.base64Toascii = base64Toascii;
-exports.params = params;
-exports.responseResult = responseResult;
-exports.getMD5 = getMD5;
-exports.md5 = md5;
-exports.object2Array = object2Array;
-exports.formatJson = formatJson;
-exports.toJsonp = toJsonp;
-exports.walk = walk;
-exports.checkFileStat = checkFileStat;
-exports.getRealDefaultMod = getRealDefaultMod;

package/dist/components/cron/index.js

@@ -2,27 +2,58 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.kill = exports.on = void 0;
-var _utils = require("@x-drive/utils");
-var _util = require("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 kill () {
+        return kill;
+    },
+    get on () {
+        return on;
+    }
+});
+const _utils = require("@x-drive/utils");
+const _log = require("../log");
+const _config = require("../../config");
+const _util = require("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 logger = log.getLogger("cron");
-const config = getSysConfig("cron") || {
-    "def": 60
-};
-/**
- * 默认间隔时间
- */ const DEF_TIME = config.def * 1000;
+const logger = _log.globalLog.getLogger("cron");
 /**
  * 计时器对象
  */ var CRON_TIMERS = {};
 /**任务执行状态, 确保同时只会有一个定时任务在执行 */ const JOB_STATUS = {};
+/**获取任务间隔时间(毫秒): 系统配置 crons[name].delay(秒) > 模块 getDelay()(毫秒) > cron.def(秒) */ function getJobDelay(mod, name) {
+    const sysConf = (0, _config.get)();
+    const jobConf = (sysConf.crons || {})[name] || {};
+    const defTime = (sysConf.cron && sysConf.cron.def || 60) * 1000;
+    if ((0, _utils.isNumber)(jobConf.delay) && jobConf.delay > 0) {
+        return jobConf.delay * 1000;
+    }
+    var time = (0, _utils.isExecutable)(mod.getDelay) ? mod.getDelay() : defTime;
+    // 非法或非正数的间隔一律回退默认值, 防止 0 间隔空转
+    if (isNaN(time) || time <= 0) {
+        logger.warn("[ %s ] Time Invalid.", name);
+        time = defTime;
+    }
+    return time;
+}
+/**获取任务启用状态: 系统配置 crons[name].enable > 模块 enable() */ function isJobEnabled(mod, name) {
+    const jobConf = ((0, _config.get)().crons || {})[name] || {};
+    if ((0, _utils.isBoolean)(jobConf.enable)) {
+        return jobConf.enable;
+    }
+    return (0, _utils.isExecutable)(mod.enable) ? mod.enable() === true : true;
+}
 /**
  * 定时刷新函数
  * @param mod  模块对象
@@ -33,25 +64,20 @@ const config = getSysConfig("cron") || {
     if (JOB_STATUS[name] === true) {
         return;
     }
-    var time = (0, _utils).isExecutable(mod.getDelay) ? mod.getDelay() : DEF_TIME;
-    if (isNaN(time)) {
-        logger.warn("[ %s ] Time Invalid.", name);
-        time = DEF_TIME;
-    }
-    const enable = (0, _utils).isExecutable(mod.enable) ? mod.enable() === true : true;
-    if (!enable) {
+    const time = getJobDelay(mod, name);
+    if (!isJobEnabled(mod, name)) {
         return null;
     }
     if (!dont) {
         JOB_STATUS[name] = true;
         try {
-            if ((0, _utils).isExecutable(mod)) {
+            if ((0, _utils.isExecutable)(mod)) {
                 mod();
-            } else if (mod.default && (0, _utils).isExecutable(mod.default())) {
+            } else if ((0, _utils.isExecutable)(mod.default)) {
                 mod.default();
             }
         } catch (e) {
-            logger.error((0, _util).inspect(e));
+            logger.error((0, _util.inspect)(e));
         }
         JOB_STATUS[name] = false;
     }
@@ -81,7 +107,6 @@ const config = getSysConfig("cron") || {
         dirStat = _fs.default.accessSync(cronPath, _fs.default.constants.F_OK);
     } catch (e) {
         dirStat = true;
-        logger.warn((0, _util).inspect(e));
     }
     // accessSync 在文件不存在的时候才会返回内容
     if (dirStat) {
@@ -103,7 +128,7 @@ const config = getSysConfig("cron") || {
             }
         }
     } catch (err) {
-        logger.error((0, _util).inspect(err));
+        logger.error((0, _util.inspect)(err));
     }
     console.log("");
 }
@@ -121,5 +146,3 @@ const config = getSysConfig("cron") || {
         });
     }
 }
-exports.on = on;
-exports.kill = kill;

package/dist/components/header/index.js

@@ -2,23 +2,42 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.lastModified = exports.contentType = exports.expire = exports.cacheControl = void 0;
-var _utils = require("@x-drive/utils");
-var _time = require("./time");
-var _mime = require("../mime");
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get cacheControl () {
+        return cacheControl;
+    },
+    get contentType () {
+        return contentType;
+    },
+    get expire () {
+        return expire;
+    },
+    get lastModified () {
+        return lastModified;
+    }
+});
+const _utils = require("@x-drive/utils");
+const _time = require("./time");
+const _mime = require("../mime");
 /**
  * 设置 Cache-Control
  * @param options max-age 缓存时间
  * @param res 请求上下文
  */ function cacheControl(options, res) {
     var age;
-    if ((0, _utils).isString(options)) {
+    if ((0, _utils.isString)(options)) {
         if (options.indexOf("max-age") === -1) {
             age = options;
         } else {
-            age = "max-age=" + (0, _time).string2seconds(options);
+            age = "max-age=" + (0, _time.string2seconds)(options);
         }
-    } else if ((0, _utils).isNumber(options)) {
+    } else if ((0, _utils.isNumber)(options)) {
         age = "max-age=" + options;
     }
     if (age) {
@@ -31,9 +50,9 @@ var _mime = require("../mime");
  * @param res 请求上下文
  */ function expire(options, res) {
     var exp;
-    if ((0, _utils).isString(options)) {
-        exp = new Date(Date.now() + (0, _time).string2seconds(options) * 1000);
-    } else if ((0, _utils).isNumber(options)) {
+    if ((0, _utils.isString)(options)) {
+        exp = new Date(Date.now() + (0, _time.string2seconds)(options) * 1000);
+    } else if ((0, _utils.isNumber)(options)) {
         exp = new Date(Date.now() + options * 1000);
     }
     if (exp) {
@@ -46,7 +65,7 @@ var _mime = require("../mime");
  * @param res 请求上下文
  */ function contentType(options, res) {
     var type;
-    if ((0, _utils).isString(options)) {
+    if ((0, _utils.isString)(options)) {
         type = _mime.MIME[options];
     }
     if (type) {
@@ -58,10 +77,6 @@ var _mime = require("../mime");
  * @param options 最后更新时间，传入非 String 类型时会使用当前时间
  * @param res 请求上下文
  */ function lastModified(options, res) {
-    var time = (0, _utils).isString(options) ? options : new Date().toUTCString();
-    res.set("Last-Modified", time);
+    var time = (0, _utils.isString)(options) ? options : new Date().toUTCString();
+    res.set('Last-Modified', time);
 }
-exports.cacheControl = cacheControl;
-exports.expire = expire;
-exports.contentType = contentType;
-exports.lastModified = lastModified;

package/dist/components/header/time.js

@@ -2,7 +2,12 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.string2seconds = void 0;
+Object.defineProperty(exports, "string2seconds", {
+    enumerable: true,
+    get: function() {
+        return string2seconds;
+    }
+});
 /**一年的秒数 */ const YEAR_SEC = 365 * 24 * 60 * 60;
 /**一月的秒数 */ const MONTH_SEC = 30 * 24 * 60 * 60;
 /**一天的秒数 */ const DAY_SEC = 24 * 60 * 60;
@@ -32,4 +37,3 @@ exports.string2seconds = void 0;
     }
     return sec;
 }
-exports.string2seconds = string2seconds;

package/dist/components/index.js

@@ -1,4 +1,4 @@
-"use strict";
+/**内置组件 */ "use strict";
 Object.defineProperty(exports, "__esModule", {
     value: true
 });

package/dist/components/log/index.js

@@ -2,104 +2,108 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.globalLog = exports.Log = void 0;
-var _log4Js = _interopRequireDefault(require("log4js"));
-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 Log () {
+        return Log;
+    },
+    get getLogger () {
+        return getLogger;
+    },
+    get globalLog () {
+        return globalLog;
+    }
+});
+const _log4js = /*#__PURE__*/ _interop_require_default(require("log4js"));
+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
     };
 }
-/**
- * 按照文件夹目录地址创建文件夹
- * @param  pathStr 文件夹目录地址
- */ function mkdir(pathStr) {
-    var level = pathStr.split(_path.default.sep);
-    if (level) {
-        let dirIndex = 1;
-        let last = level.length;
-        while(dirIndex <= last){
-            let dirPath = level.slice(0, dirIndex++).join(_path.default.sep);
-            let status;
-            try {
-                status = _fs.default.statSync(dirPath);
-            } catch (e) {
-                if (e.errno === -2) {
-                    status = null;
-                }
+/**默认配置 */ const DEF_CONFIG = {
+    "name": "app",
+    "level": "warn",
+    "dir": _path.default.join("private", "log"),
+    "fileLog": false
+};
+/**
+ * v1 风格的时间戳格式
+
+ * log4js 6 默认 layout 的时间戳为 ISO 格式(日期与时间之间是 T),
+ * 显式指定 pattern 保持与 v1 一致的空格分隔, 避免影响日志采集
+ */ const DATE_PATTERN = "yyyy-MM-dd hh:mm:ss.SSS";
+/**终端输出默认 layout(按日志等级着色) */ const STDOUT_LAYOUT = {
+    "type": "pattern",
+    "pattern": `%[[%d{${DATE_PATTERN}}] [%p] %c -%] %m`
+};
+/**文件输出默认 layout */ const FILE_LAYOUT = {
+    "type": "pattern",
+    "pattern": `[%d{${DATE_PATTERN}}] [%p] %c - %m`
+};
+/**日志模块 */ let Log = class Log {
+    /**当前实例配置 */ config;
+    /**日志实例缓存 */ loggers = {};
+    constructor(config){
+        this.config = Object.assign({}, DEF_CONFIG, config);
+        const appenders = {
+            "stdout": {
+                "type": "stdout",
+                "layout": this.config.layout || STDOUT_LAYOUT
             }
-            if (status) {
-                if (!status.isDirectory()) {
-                    console.error(`Target [${pathStr}] exists and is not a directory.`);
-                    break;
+        };
+        if (this.config.fileLog) {
+            _fs.default.mkdirSync(this.config.dir, {
+                "recursive": true
+            });
+            appenders.file = {
+                "type": "dateFile",
+                "filename": _path.default.join(this.config.dir, this.config.name),
+                "pattern": ".yyyyMMddhh.log",
+                "alwaysIncludePattern": true,
+                "layout": this.config.layout || FILE_LAYOUT
+            };
+        }
+        // log4js 的配置是进程级的,多次实例化以最后一次为准(与 v1 共享 appender 的行为一致)
+        _log4js.default.configure({
+            "appenders": appenders,
+            "categories": {
+                "default": {
+                    "appenders": Object.keys(appenders),
+                    "level": this.config.level
                 }
-            } else if (status === null) {
-                _fs.default.mkdirSync(dirPath);
             }
-        }
-        level = null;
+        });
     }
-}
-// 日志类型对象
-const LOGERS = {};
-function Log(config) {
-    this.config = {
-        "name": "app",
-        "level": "warn",
-        "dir": "private/log",
-        "fileLog": false
-    };
-    if (Object.prototype.toString.call(config) === "[object Object]") {
-        this.config = Object.assign(this.config, config);
-    }
-    if (this.config.fileLog) {
-        let tmp = _path.default.join(this.config.dir);
-        mkdir(tmp);
-        tmp = null;
-    }
-    _log4Js.default.clearAppenders();
-}
-var LP = Log.prototype;
-/**
- * 获取统计实例
- * @param  {String} cat 实例分类名称
- * @return {Object}     统计实例对象
- */ LP.getLogger = function(cat) {
-    var conf = this.config;
-    cat = "[" + cat + "]";
-    var logger = LOGERS[cat];
-    if (logger) {
-        return logger;
-    }
-    var dateFileConf = {
-        "filename": conf.name,
-        "pattern": ".yyyyMMddhh.log",
-        "alwaysIncludePattern": true
-    };
-    var stdoutConf = {};
-    if (conf.layout) {
-        dateFileConf.layout = conf.layout;
-        stdoutConf.layout = conf.layout;
-    }
-    if (this.config.fileLog) {
-        _log4Js.default.loadAppender("dateFile");
-        _log4Js.default.addAppender(_log4Js.default.appenderMakers.dateFile(dateFileConf, {
-            "cwd": conf.dir
-        }), cat);
+    /**
+     * 获取分类日志实例
+     * @param  cat 实例分类名称
+     * @return     日志实例对象
+     */ getLogger(cat) {
+        cat = `[${cat}]`;
+        if (!this.loggers[cat]) {
+            const logger = _log4js.default.getLogger(cat);
+            logger.level = this.config.level;
+            this.loggers[cat] = logger;
+        }
+        return this.loggers[cat];
     }
-    _log4Js.default.addAppender(_log4Js.default.appenderMakers.stdout(stdoutConf), cat);
-    logger = _log4Js.default.getLogger(cat);
-    logger.setLevel(conf.level);
-    LOGERS[cat] = logger;
-    return logger;
 };
 var meta = require(_path.default.resolve(process.cwd(), "package.json"));
-const globalLog = new Log({
+/**框架全局日志实例 */ const globalLog = new Log({
     "name": meta.name,
     "level": "all"
 });
-// 日志
-global.log = globalLog;
-exports.Log = Log;
-exports.globalLog = globalLog;
+/**
+ * 获取分类日志实例
+ * @param  cat 实例分类名称
+ * @return     日志实例对象
+ */ function getLogger(cat) {
+    return globalLog.getLogger(cat);
+}

package/dist/components/mime/index.js

@@ -2,7 +2,12 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.MIME = void 0;
+Object.defineProperty(exports, "MIME", {
+    enumerable: true,
+    get: function() {
+        return MIME;
+    }
+});
 const MIME = {
     "html": "text/html",
     "css": "text/css",
@@ -13,4 +18,3 @@ const MIME = {
     "xml": "application/xml",
     "json": "application/json"
 };
-exports.MIME = MIME;