@x-9lab/xlab 1.5.2 → 1.5.3

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

@@ -2,6 +2,8 @@
 interface ICronJob {
     /**定时任务 */
     (): void;
+    /**定时任务 */
+    default?: () => void;
     /**获取定时任务间隔时间 */
     getDelay?: () => number;
     /**获取定时任务开启状态 */

package/dist/components/cron/index.js

@@ -12,7 +12,6 @@ _export(exports, {
     on: ()=>on,
     kill: ()=>kill
 });
-const _common = require("../common");
 const _utils = require("@x-drive/utils");
 const _util = require("util");
 const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
@@ -55,7 +54,11 @@ const config = getSysConfig("cron") || {
     if (!dont) {
         JOB_STATUS[name] = true;
         try {
-            mod();
+            if ((0, _utils.isExecutable)(mod)) {
+                mod();
+            } else if (mod.default && (0, _utils.isExecutable)(mod.default())) {
+                mod.default();
+            }
         } catch (e) {
             logger.error((0, _util.inspect)(e));
         }
@@ -103,8 +106,8 @@ const config = getSysConfig("cron") || {
                 var stats = _fs.default.statSync(tmpPath);
                 if (stats.isFile()) {
                     var name = cron.replace(".js", "");
-                    CRON_TIMERS[name] = fetch((0, _common.getRealDefaultMod)(require(_path.default.resolve(tmpPath))), name);
-                    logger.info("\t>>> [ %s ] %s.", name, CRON_TIMERS[name] ? "running" : "disabled");
+                    CRON_TIMERS[name] = fetch(require(_path.default.resolve(tmpPath)), name);
+                    logger.info("[ %s ] %s.", name, CRON_TIMERS[name] ? "running" : "disabled");
                 }
             }
         }

package/dist/router.js

@@ -91,28 +91,31 @@ function _interopRequireDefault(obj) {
                 api = buildApi(api.join("/"));
             }
             // 是对象则取对应的字段
-            if ((0, _utils.isObject)(mod) && ((0, _utils.isFunction)(mod.handler) || (0, _utils.isAsyncFunction)(mod.handler))) {
-                modName = mod.method || "get";
-                api = mod.api || api;
-                apiPart = api.split("/");
-                if (apiPart[0] !== "") {
-                    apiPart.unshift("");
-                }
-                // 保证一定是以 api 开头的
-                if (!IS_API_REGEXP.test(api)) {
-                    api = buildApi(api);
-                }
-                if ((0, _utils.isArray)(mod.middleware)) {
-                    mod = [
-                        api,
-                        ...mod.middleware,
-                        mod.handler
-                    ];
-                } else {
-                    mod = [
-                        api,
-                        mod.handler
-                    ];
+            if ((0, _utils.isObject)(mod)) {
+                const subjectMod = mod;
+                if ((0, _utils.isFunction)(subjectMod.handler) || (0, _utils.isAsyncFunction)(subjectMod.handler)) {
+                    modName = subjectMod.method || "get";
+                    api = subjectMod.api || api;
+                    apiPart = api.split("/");
+                    if (apiPart[0] !== "") {
+                        apiPart.unshift("");
+                    }
+                    // 如果没有声明忽略检测则保证接口一定是以 api 开头的
+                    if (!subjectMod.ignoreApiNameCheck && !IS_API_REGEXP.test(api)) {
+                        api = buildApi(api);
+                    }
+                    if ((0, _utils.isArray)(subjectMod.middleware)) {
+                        mod = [
+                            api,
+                            ...subjectMod.middleware,
+                            subjectMod.handler
+                        ];
+                    } else {
+                        mod = [
+                            api,
+                            subjectMod.handler
+                        ];
+                    }
                 }
             }
             var dirMws = [];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@x-9lab/xlab",
-    "version": "1.5.2",
+    "version": "1.5.3",
     "description": "9lab 服务端模块",
     "versionDesc": "静态文件服务支持跨域",
     "scripts": {