@x-9lab/xlab 1.5.3 → 1.6.0

package/@types/components/cron/index.d.ts

@@ -1,3 +1,24 @@
+declare global {
+    namespace XLab {
+        /**定时任务配置对象 */
+        interface IConfigCronItem {
+            /**定时任务执行间隔 */
+            delay?: number;
+            /**是否启用 */
+            enable?: boolean;
+        }
+        interface IConfig {
+            /**
+             * 定时任务配置
+             * @see `@components/cron`
+            */
+            crons?: {
+                /**定时任务配置 */
+                [name: string]: IConfigCronItem;
+            };
+        }
+    }
+}
 /**定时任务模块 */
 interface ICronJob {
     /**定时任务 */

package/@types/env.d.ts

@@ -0,0 +1 @@
+export {};

package/@types/global.d.ts

@@ -118,6 +118,8 @@ declare global {
             enableComboCache?: boolean;
             /**是否开启定时任务 */
             enableCron?: boolean;
+            /**是否允许 worker 上也执行定时任务 */
+            enableWorkerCron?: boolean;
             /**
              * 开启的中间件列表
              * @deprecated since version 1.1.0, 已弃用, 请使用改用 `middlewares` 配置项

package/@types/init-env.d.ts

@@ -0,0 +1 @@
+export {};

package/@types/middleware/compress.d.ts

@@ -1,2 +1,3 @@
-declare function handler(config: Record<string, any>): any;
+import compress from "koa-compress";
+declare function handler(config: Record<string, any>): compress.CompressMiddleware;
 export default handler;

package/@types/server.d.ts

@@ -1,6 +1,8 @@
 import "./global";
+import "./init-env";
 import koa from "koa";
 declare const app: koa<koa.DefaultState, koa.DefaultContext>;
+export { app };
 /**启动服务 */
 declare function boot(): void;
 export { boot };

package/dist/@config/config.dev.js

@@ -2,12 +2,10 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: ()=>_default
-});
+exports.default = void 0;
 const CONFIG = {
     "304": false,
     "workers": 0
 };
-const _default = CONFIG;
+var _default = CONFIG;
+exports.default = _default;

package/dist/@config/config.js

@@ -2,10 +2,7 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: ()=>_default
-});
+exports.default = void 0;
 const CONFIG = {
     "host": "",
     "304": true,
@@ -17,8 +14,10 @@ const CONFIG = {
     "staticHtmlFileMaxage": 0,
     "enableComboCache": true,
     "enableCron": false,
+    "enableWorkerCron": false,
     "strictSSL": false,
     "root": "public",
     "timezone": "Asia/Shanghai"
 };
-const _default = CONFIG;
+var _default = CONFIG;
+exports.default = _default;

package/dist/@config/config.sand.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: ()=>_default
-});
+exports.default = void 0;
 const CONFIG = {};
-const _default = CONFIG;
+var _default = CONFIG;
+exports.default = _default;

package/dist/bin/watch.js

@@ -5,7 +5,7 @@ const crossSpawn = require("cross-spawn");
 const colors = require("colors/safe");
 const path = require("path");
 const fs = require("fs");
-/**输出内容名称 */ const X_LAB_STR = colors.bold(colors.cyan("🛸 XLab"));
+/**输出内容名称 */ const X_LAB_STR = colors.bold(colors.cyan("\uD83D\uDEF8 XLab"));
 /**
  * 子进程对象
  * @type child_process.ChildProcess
@@ -90,7 +90,7 @@ const fs = require("fs");
         } else {
             if (initing) {
                 initing = false;
-                log("Watch 模式启动\n");
+                log("Watch \u6A21\u5F0F\u542F\u52A8\n");
                 setTimeout(()=>{
                     inited = true;
                 }, wait);
@@ -133,14 +133,14 @@ const fs = require("fs");
                 watch(chokidar, config, wait);
                 start();
             } else {
-                log("业务自定义目录不存在, watch 模式启动失败");
+                log("\u4E1A\u52A1\u81EA\u5B9A\u4E49\u76EE\u5F55\u4E0D\u5B58\u5728, watch \u6A21\u5F0F\u542F\u52A8\u5931\u8D25");
             }
             stats = null;
         } else {
-            log("请将 chokidar 安装到开发依赖中以启用 watch 模式");
+            log("\u8BF7\u5C06 chokidar \u5B89\u88C5\u5230\u5F00\u53D1\u4F9D\u8D56\u4E2D\u4EE5\u542F\u7528 watch \u6A21\u5F0F");
         }
     } else {
-        log("配置不存在或 watch.enable 为 false, watch 模式启动失败\n", config);
+        log("\u914D\u7F6E\u4E0D\u5B58\u5728\u6216 watch.enable \u4E3A false, watch \u6A21\u5F0F\u542F\u52A8\u5931\u8D25\n", config);
     }
 }
 module.exports = setup;

package/dist/cluster.js

@@ -2,74 +2,53 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: ()=>_default
-});
-const _cluster = /*#__PURE__*/ _interopRequireWildcard(require("./components/cluster"));
-const _config = require("./config");
-const _cluster1 = /*#__PURE__*/ _interopRequireDefault(require("cluster"));
-const _server = /*#__PURE__*/ _interopRequireDefault(require("./server"));
-const _os = /*#__PURE__*/ _interopRequireDefault(require("os"));
+exports.default = void 0;
+var clusterCom = _interopRequireWildcard(require("./components/cluster"));
+var _config = require("./config");
+var _cluster = _interopRequireDefault(require("cluster"));
+var _server = _interopRequireDefault(require("./server"));
+var _os = _interopRequireDefault(require("os"));
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-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 _interopRequireWildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
+function _interopRequireWildcard(obj) {
+    if (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 = {};
-    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];
+    } 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];
+                    }
+                }
             }
         }
+        newObj.default = obj;
+        return newObj;
     }
-    newObj.default = obj;
-    if (cache) {
-        cache.set(obj, newObj);
-    }
-    return newObj;
 }
 const logger = log.getLogger("cluster");
 const CPUnum = _os.default.cpus().length;
-const config = (0, _config.get)();
+const config = (0, _config).get();
 /**
  * 消息处理函数
  * @param  msg 消息配置对象
  */ function masterMessageHandler(msg) {
     if (msg && msg.cmd) {
-        let handler = _cluster.get(msg.cmd);
+        let handler = clusterCom.get(msg.cmd);
         if (handler) {
             let args = msg.args || [];
             args.push(msg.returnData);
             let re = handler.apply(handler, args);
             if (msg.wid) {
-                let worker = _cluster1.default.workers[msg.wid];
+                let worker = _cluster.default.workers[msg.wid];
                 if (worker) {
                     worker.send({
                         "cmd": msg.cmd,
@@ -96,17 +75,17 @@ const config = (0, _config.get)();
             // 小于使用数则取一半
             let num = CPUnum < config.workers ? Math.ceil(CPUnum / 2) : config.workers;
             for(var i = 0; i < num; i++){
-                _cluster1.default.fork();
+                _cluster.default.fork();
             }
             // if(!config.isProd){
-            _cluster1.default.on("listening", function(worker, address) {
-                masterLog("cluster", "info", "\tWorker ", worker.process.pid, " online, Address: ", address.address, ":", address.port);
+            _cluster.default.on("listening", function(worker, address) {
+                masterLog("cluster", "info", "	Worker ", worker.process.pid, " online, Address: ", address.address, ":", address.port);
             });
-            _cluster1.default.on("message", masterMessageHandler);
+            _cluster.default.on("message", masterMessageHandler);
             // }
-            _cluster1.default.on("exit", function(worker) {
+            _cluster.default.on("exit", function(worker) {
                 logger.warn("Worker " + worker.process.pid + " is dead!");
-                _cluster1.default.fork();
+                _cluster.default.fork();
             });
         } else {
             server = _server.default.listen(serverListenConf);
@@ -117,4 +96,5 @@ const config = (0, _config.get)();
     }
     return server;
 }
-const _default = start;
+var _default = start;
+exports.default = _default;

package/dist/components/assets/index.js

@@ -2,12 +2,9 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "get", {
-    enumerable: true,
-    get: ()=>get
-});
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
+exports.get = void 0;
+var _path = _interopRequireDefault(require("path"));
+var _fs = _interopRequireDefault(require("fs"));
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -29,3 +26,4 @@ try {
  */ function get(name) {
     return ASSETS[name] || null;
 }
+exports.get = get;

package/dist/components/cluster/index.js

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

package/dist/components/common/index.js

@@ -2,36 +2,37 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    labelReplace: ()=>_utils.labelReplace,
-    fix0: ()=>_utils.fix0,
-    numberFormat: ()=>_utils.numberFormat,
-    sleep: ()=>_utils.sleep,
-    asciiTobase64: ()=>asciiTobase64,
-    base64Toascii: ()=>base64Toascii,
-    params: ()=>params,
-    responseResult: ()=>responseResult,
-    getMD5: ()=>getMD5,
-    md5: ()=>md5,
-    object2Array: ()=>object2Array,
-    formatJson: ()=>formatJson,
-    toJsonp: ()=>toJsonp,
-    walk: ()=>walk,
-    checkFileStat: ()=>checkFileStat,
-    getRealDefaultMod: ()=>getRealDefaultMod
+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() {
+        return _utils.fix0;
+    }
+});
+Object.defineProperty(exports, "numberFormat", {
+    enumerable: true,
+    get: function() {
+        return _utils.numberFormat;
+    }
 });
-const _utils = require("@x-drive/utils");
-const _returnCode = require("../return-code");
-const _querystring = /*#__PURE__*/ _interopRequireDefault(require("querystring"));
-const _crypto = /*#__PURE__*/ _interopRequireDefault(require("crypto"));
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
+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) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -83,7 +84,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,
@@ -102,9 +103,9 @@ function checkLogger() {
     return _crypto.default.createHash("md5").update(JSON.stringify(conditions), "utf8").digest("hex");
 }
 /**将一个输入字符串转为 md5 */ function md5(str) {
-    var md5 = _crypto.default.createHash("md5");
-    md5.update(str);
-    return md5.digest("hex");
+    var md51 = _crypto.default.createHash("md5");
+    md51.update(str);
+    return md51.digest("hex");
 }
 /**
  * 对象值转化为数组
@@ -185,3 +186,15 @@ 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,20 +2,11 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    on: ()=>on,
-    kill: ()=>kill
-});
-const _utils = require("@x-drive/utils");
-const _util = require("util");
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
+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) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -42,25 +33,25 @@ const config = getSysConfig("cron") || {
     if (JOB_STATUS[name] === true) {
         return;
     }
-    var time = (0, _utils.isFunction)(mod.getDelay) ? mod.getDelay() : DEF_TIME;
+    var time = (0, _utils).isExecutable(mod.getDelay) ? mod.getDelay() : DEF_TIME;
     if (isNaN(time)) {
         logger.warn("[ %s ] Time Invalid.", name);
         time = DEF_TIME;
     }
-    var enable = (0, _utils.isFunction)(mod.enable) ? mod.enable() === true : true;
+    const enable = (0, _utils).isExecutable(mod.enable) ? mod.enable() === true : true;
     if (!enable) {
         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 (mod.default && (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;
     }
@@ -90,7 +81,7 @@ const config = getSysConfig("cron") || {
         dirStat = _fs.default.accessSync(cronPath, _fs.default.constants.F_OK);
     } catch (e) {
         dirStat = true;
-        logger.warn((0, _util.inspect)(e));
+        logger.warn((0, _util).inspect(e));
     }
     // accessSync 在文件不存在的时候才会返回内容
     if (dirStat) {
@@ -112,7 +103,7 @@ const config = getSysConfig("cron") || {
             }
         }
     } catch (err) {
-        logger.error((0, _util.inspect)(err));
+        logger.error((0, _util).inspect(err));
     }
     console.log("");
 }
@@ -130,3 +121,5 @@ const config = getSysConfig("cron") || {
         });
     }
 }
+exports.on = on;
+exports.kill = kill;

package/dist/components/header/index.js

@@ -2,34 +2,23 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    cacheControl: ()=>cacheControl,
-    expire: ()=>expire,
-    contentType: ()=>contentType,
-    lastModified: ()=>lastModified
-});
-const _utils = require("@x-drive/utils");
-const _time = require("./time");
-const _mime = require("../mime");
+exports.lastModified = exports.contentType = exports.expire = exports.cacheControl = void 0;
+var _utils = require("@x-drive/utils");
+var _time = require("./time");
+var _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) {
@@ -42,9 +31,9 @@ const _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) {
@@ -57,7 +46,7 @@ const _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) {
@@ -69,6 +58,10 @@ const _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,10 +2,7 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "string2seconds", {
-    enumerable: true,
-    get: ()=>string2seconds
-});
+exports.string2seconds = void 0;
 /**一年的秒数 */ const YEAR_SEC = 365 * 24 * 60 * 60;
 /**一月的秒数 */ const MONTH_SEC = 30 * 24 * 60 * 60;
 /**一天的秒数 */ const DAY_SEC = 24 * 60 * 60;
@@ -35,3 +32,4 @@ Object.defineProperty(exports, "string2seconds", {
     }
     return sec;
 }
+exports.string2seconds = string2seconds;

package/dist/components/log/index.js

@@ -2,19 +2,10 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    Log: ()=>Log,
-    globalLog: ()=>globalLog
-});
-const _log4Js = /*#__PURE__*/ _interopRequireDefault(require("log4js"));
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
+exports.globalLog = exports.Log = void 0;
+var _log4Js = _interopRequireDefault(require("log4js"));
+var _path = _interopRequireDefault(require("path"));
+var _fs = _interopRequireDefault(require("fs"));
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -110,3 +101,5 @@ const globalLog = new Log({
 });
 // 日志
 global.log = globalLog;
+exports.Log = Log;
+exports.globalLog = globalLog;

package/dist/components/mime/index.js

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