@x-9lab/xlab 1.5.3 → 1.5.4

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/global.d.ts

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

package/dist/@config/config.js

@@ -17,6 +17,7 @@ const CONFIG = {
     "staticHtmlFileMaxage": 0,
     "enableComboCache": true,
     "enableCron": false,
+    "enableWorkerCron": false,
     "strictSSL": false,
     "root": "public",
     "timezone": "Asia/Shanghai"

package/dist/components/cron/index.js

@@ -42,12 +42,12 @@ 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;
     }

package/dist/dot-file.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "processDotFile", {
     get: ()=>processDotFile
 });
 const _utils = require("@x-drive/utils");
+const _nodeUtil = require("node:util");
 const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
 const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
 function _interopRequireDefault(obj) {
@@ -35,7 +36,7 @@ function _interopRequireDefault(obj) {
         }
     } catch (e) {
         if (e.code !== "ENOENT") {
-            logger.error(e);
+            logger.error((0, _nodeUtil.inspect)(e));
         }
     }
 }

package/dist/server.js

@@ -121,15 +121,17 @@ app.use((0, _koaStatic.default)(_path.default.resolve(process.cwd(), _config.def
 // 异常状态处理中间件
 app.use(_badRequest.default);
 if (_config.default.enableCron) {
-    // 定时任务
-    (0, _cron.on)(_path.default.resolve(process.cwd(), _defaultXConfig.default.businessDir, "cron"));
+    if (_config.default.isMaster || _config.default.enableWorkerCron) {
+        // 定时任务
+        (0, _cron.on)(_path.default.resolve(process.cwd(), _defaultXConfig.default.businessDir, "cron"));
+    }
 }
 /**启动服务 */ function boot() {
     (0, _cluster.default)();
     process.on("uncaughtException", (err)=>{
-        logger.error("uncaughtException:\n", err.stack);
+        logger.error(`uncaughtException:${err.message}\n`, err.stack);
     }).on("unhandledRejection", (err)=>{
-        logger.error("unhandledRejection:\n", err.stack);
+        logger.error(`unhandledRejection:${err.message}\n`, err.stack);
     });
 }
 /**退出服务 */ function exit() {

package/package.json

@@ -1,8 +1,8 @@
 {
     "name": "@x-9lab/xlab",
-    "version": "1.5.3",
+    "version": "1.5.4",
     "description": "9lab 服务端模块",
-    "versionDesc": "静态文件服务支持跨域",
+    "versionDesc": "日志信息输出优化",
     "scripts": {
         "dev": "swc src -D ./src/bin --config-file .swcrc -d dist -w",
         "compile": "swc src -D ./src/bin --config-file .swcrc -d dist",