@anjianshi/utils 2.4.1 → 2.4.3

package/env-service/controllers.d.ts

@@ -4,7 +4,7 @@
  *
  * 支持自定义 Controller 类，例如把 context 中的内容定义成属性。
  */
-type AnyObject = Record<string, unknown>;
+export type AnyObject = Record<string, unknown>;
 export type AnyController<Context> = Controller<Context, any>;
 type AnyControllerClass<Context> = typeof Controller<Context, any>;
 export type ControllersFrom<Context, T extends AnyObject> = {
@@ -17,9 +17,10 @@ export declare class Controller<Context, AllControllers extends Record<string, A
     /** 调用其他 controllers */
     protected readonly controllers: AllControllers;
     protected readonly context: Context;
+    protected readonly name: string;
     constructor(
     /** 调用其他 controllers */
-    controllers: AllControllers, context: Context);
+    controllers: AllControllers, context: Context, name?: string);
 }
 /**
  * 传入 Controller 类列表，返回 controller 实例集合。

package/env-service/controllers.js

@@ -10,11 +10,13 @@
 export class Controller {
     controllers;
     context;
+    name;
     constructor(
     /** 调用其他 controllers */
-    controllers, context) {
+    controllers, context, name = this.constructor.name) {
         this.controllers = controllers;
         this.context = context;
+        this.name = name;
     }
 }
 /**
@@ -30,7 +32,7 @@ export function initializeControllers(controllerClasses, context) {
                 return controllers[prop];
             if (prop in controllerClasses) {
                 const Class = controllerClasses[prop];
-                controllers[prop] = new Class(proxy, context);
+                controllers[prop] = new Class(proxy, context, prop);
                 return controllers[prop];
             }
         },

package/env-service/tasks.d.ts

@@ -1,6 +1,6 @@
 import { type Logger } from '../logging/index.js';
 /** 返回 false 可结束任务 */
-export type TaskExecutor<Context> = (context: Context) => Promise<undefined | false>;
+export type TaskExecutor<Context> = (context: Context, logger: Logger) => Promise<undefined | false>;
 /**
  * 执行定期任务
  */

package/env-service/tasks.js

@@ -20,7 +20,7 @@ export class TaskManager {
             logger.info(`#${id} 任务开始`);
             try {
                 const context = this.getContext(name);
-                const result = await executor(context);
+                const result = await executor(context, logger);
                 const cost = (Date.now() - start) / 1000;
                 logger.info(`#${id} 任务完成，耗时 ${cost}s`);
                 if (result === false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anjianshi/utils",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "Common JavaScript Utils",
   "homepage": "https://github.com/anjianshi/js-packages/utils",
   "bugs": {
@@ -28,10 +28,10 @@
     "typescript": "^5.6.3",
     "vconsole": "^3.15.1",
     "@anjianshi/presets-eslint-node": "4.0.8",
-    "@anjianshi/presets-eslint-typescript": "5.0.5",
     "@anjianshi/presets-eslint-react": "4.0.7",
-    "@anjianshi/presets-typescript": "3.2.2",
-    "@anjianshi/presets-prettier": "3.0.1"
+    "@anjianshi/presets-eslint-typescript": "5.0.5",
+    "@anjianshi/presets-prettier": "3.0.1",
+    "@anjianshi/presets-typescript": "3.2.2"
   },
   "peerDependencies": {
     "@emotion/react": "^11.13.3",