imean-service-engine 1.5.0 → 1.6.0

package/dist/mod.cjs

@@ -779,10 +779,11 @@ var Microservice = class {
   lease;
   scheduler;
   abortController;
-  isShuttingDown = false;
   statisticsTimer;
   wsHandler;
   actionHandlers = /* @__PURE__ */ new Map();
+  activeRequests = /* @__PURE__ */ new Map();
+  status = "running";
   modules = /* @__PURE__ */ new Map();
   fetch;
   options;
@@ -805,6 +806,10 @@ var Microservice = class {
       websocket: { enabled: false },
       cacheAdapter: new MemoryCacheAdapter(),
       plugins: [],
+      gracefulShutdown: {
+        timeout: 3e4,
+        cleanupHooks: []
+      },
       ...options
     };
     this.cache = this.options.cacheAdapter;
@@ -883,7 +888,7 @@ var Microservice = class {
     this.app.get(prefix, (ctx) => {
       const name = this.options.name ?? "Microservice";
       const version = this.options.version ?? "1.0.0";
-      return ctx.text(`${name} is running. version: ${version}`);
+      return ctx.text(`${name} is ${this.status}. version: ${version}`);
     });
     this.app.get(`${prefix}/health`, (ctx) => {
       return ctx.json({
@@ -899,7 +904,9 @@ var Microservice = class {
         version: this.options.version,
         env: this.options.env,
         modules: this.getModules(),
-        stats: Object.fromEntries(this.statsMap)
+        stats: Object.fromEntries(this.statsMap),
+        activeRequests: this.getActiveRequestCount(),
+        status: this.status
       });
     });
     this.app.get(`${prefix}/client.ts`, async (ctx) => {
@@ -1096,7 +1103,12 @@ var Microservice = class {
     process.on("SIGINT", () => {
       logger_default.info(`
 Received SIGINT signal`);
-      this.gracefulShutdown();
+      this.shutdown();
+    });
+    process.on("SIGTERM", () => {
+      logger_default.info(`
+Received SIGTERM signal`);
+      this.shutdown();
     });
     process.on("unhandledrejection", (event) => {
       logger_default.error("Unhandled rejection:", event.reason);
@@ -1108,14 +1120,16 @@ Received SIGINT signal`);
   /**
    * 优雅停机
    */
-  async gracefulShutdown() {
-    if (this.isShuttingDown) return;
-    this.isShuttingDown = true;
-    logger_default.info("\nGraceful shutdown initiated...");
+  async shutdown() {
+    if (this.status === "shutting_down") return;
+    this.status = "shutting_down";
+    logger_default.info("\nshutdown initiated...");
     if (this.statisticsTimer) clearInterval(this.statisticsTimer);
     try {
+      await this.waitForActiveRequests();
+      await this.executeCleanupHooks();
       await this.stop();
-      logger_default.info("Graceful shutdown completed");
+      logger_default.info("shutdown completed");
     } catch (error) {
       logger_default.error("Error during shutdown:", error);
       process.exit(1);
@@ -1123,6 +1137,57 @@ Received SIGINT signal`);
       process.exit(0);
     }
   }
+  /**
+   * 等待所有活跃请求完成
+   */
+  async waitForActiveRequests() {
+    const timeout = this.options.gracefulShutdown?.timeout || 3e4;
+    const startTime = Date.now();
+    logger_default.info(`Waiting for ${this.activeRequests.size} active requests to complete...`);
+    return new Promise((resolve) => {
+      const checkInterval = setInterval(() => {
+        const elapsed = Date.now() - startTime;
+        if (this.activeRequests.size === 0) {
+          clearInterval(checkInterval);
+          logger_default.info("All active requests completed");
+          resolve();
+        } else if (elapsed >= timeout) {
+          clearInterval(checkInterval);
+          logger_default.warn(`Timeout waiting for requests to complete. ${this.activeRequests.size} requests still active`);
+          resolve();
+        } else {
+          logger_default.info(`Still waiting for ${this.activeRequests.size} requests... (${elapsed}ms elapsed)`);
+        }
+      }, 1e3);
+    });
+  }
+  /**
+   * 执行清理hook
+   */
+  async executeCleanupHooks() {
+    const hooks = this.options.gracefulShutdown?.cleanupHooks || [];
+    if (hooks.length === 0) {
+      logger_default.info("No cleanup hooks configured");
+      return;
+    }
+    logger_default.info(`Executing ${hooks.length} cleanup hooks...`);
+    for (const hook of hooks) {
+      try {
+        const timeout = hook.timeout || 5e3;
+        logger_default.info(`Executing cleanup hook: ${hook.name}`);
+        await Promise.race([
+          Promise.resolve(hook.cleanup()),
+          new Promise(
+            (_, reject) => setTimeout(() => reject(new Error(`Cleanup hook ${hook.name} timeout`)), timeout)
+          )
+        ]);
+        logger_default.info(`Cleanup hook ${hook.name} completed successfully`);
+      } catch (error) {
+        logger_default.error(`Cleanup hook ${hook.name} failed:`, error);
+      }
+    }
+    logger_default.info("All cleanup hooks completed");
+  }
   initStatsEventManager() {
     this.statisticsTimer = setInterval(async () => {
       await this.updateStats();
@@ -1164,14 +1229,54 @@ Received SIGINT signal`);
     }
     return handler;
   }
+  /**
+   * 添加活跃请求跟踪
+   */
+  addActiveRequest(requestId, requestInfo) {
+    this.activeRequests.set(requestId, requestInfo);
+  }
+  /**
+   * 移除活跃请求跟踪
+   */
+  removeActiveRequest(requestId) {
+    this.activeRequests.delete(requestId);
+  }
+  /**
+   * 获取当前活跃请求数量
+   */
+  getActiveRequestCount() {
+    return this.activeRequests.size;
+  }
+  /**
+   * 获取当前活跃请求信息
+   */
+  getActiveRequests() {
+    return Array.from(this.activeRequests.values());
+  }
   handleRequest = async (ctx) => {
     const { moduleName, actionName } = ctx.req.param();
     const handler = this.getActionHandler(moduleName, actionName);
+    const requestId = crypto.randomUUID();
+    const startTime = Date.now();
+    if (this.status === "shutting_down") {
+      return ctx.json({
+        success: false,
+        error: "Service is shutting down"
+      }, 503);
+    }
     try {
       const paramsText = await ctx.req.text();
+      this.addActiveRequest(requestId, {
+        id: requestId,
+        moduleName,
+        actionName,
+        startTime,
+        params: paramsText
+      });
       const result = await handler.handle(paramsText);
       if (handler.metadata.stream) {
         const encoder = new TextEncoder();
+        const microservice = this;
         const stream = new ReadableStream({
           async start(controller) {
             try {
@@ -1195,6 +1300,8 @@ Received SIGINT signal`);
                 encoder.encode(ejson4__default.default.stringify(response) + "\n")
               );
               controller.close();
+            } finally {
+              microservice.removeActiveRequest(requestId);
             }
           }
         });
@@ -1206,8 +1313,10 @@ Received SIGINT signal`);
           }
         });
       }
+      this.removeActiveRequest(requestId);
       return ctx.text(ejson4__default.default.stringify({ success: true, data: result }));
     } catch (error) {
+      this.removeActiveRequest(requestId);
       return ctx.json({ success: false, error: error.message });
     }
   };

package/dist/mod.d.cts

@@ -155,6 +155,32 @@ interface MicroserviceOptions {
     };
     cacheAdapter?: CacheAdapter;
     plugins?: Plugin[];
+    gracefulShutdown?: {
+        /** 优雅停机超时时间（毫秒），默认 30 秒 */
+        timeout?: number;
+        /** 清理hook列表 */
+        cleanupHooks?: CleanupHook[];
+    };
+}
+interface CleanupHook {
+    /** hook名称 */
+    name: string;
+    /** 清理函数 */
+    cleanup: () => Promise<void> | void;
+    /** 超时时间（毫秒），默认 5 秒 */
+    timeout?: number;
+}
+interface RequestInfo {
+    /** 请求ID */
+    id: string;
+    /** 模块名称 */
+    moduleName: string;
+    /** 动作名称 */
+    actionName: string;
+    /** 开始时间 */
+    startTime: number;
+    /** 请求参数 */
+    params?: any;
 }
 interface ModuleInfo extends ModuleOptions {
     actions: Record<string, ActionMetadata>;
@@ -197,10 +223,11 @@ declare class Microservice {
     private lease?;
     private scheduler?;
     private abortController?;
-    private isShuttingDown;
     private statisticsTimer?;
     private wsHandler?;
     private actionHandlers;
+    private activeRequests;
+    private status;
     modules: Map<string, ModuleInfo>;
     readonly fetch: typeof fetch;
     options: Required<MicroserviceOptions>;
@@ -236,7 +263,7 @@ declare class Microservice {
     /**
      * 停止服务
      */
-    stop(): Promise<void>;
+    private stop;
     /**
      * 初始化停机处理
      */
@@ -244,10 +271,34 @@ declare class Microservice {
     /**
      * 优雅停机
      */
-    private gracefulShutdown;
+    shutdown(): Promise<void>;
+    /**
+     * 等待所有活跃请求完成
+     */
+    private waitForActiveRequests;
+    /**
+     * 执行清理hook
+     */
+    private executeCleanupHooks;
     private initStatsEventManager;
     private updateStats;
     getActionHandler(moduleName: string, actionName: string): ActionHandler;
+    /**
+     * 添加活跃请求跟踪
+     */
+    private addActiveRequest;
+    /**
+     * 移除活跃请求跟踪
+     */
+    private removeActiveRequest;
+    /**
+     * 获取当前活跃请求数量
+     */
+    getActiveRequestCount(): number;
+    /**
+     * 获取当前活跃请求信息
+     */
+    getActiveRequests(): RequestInfo[];
     private handleRequest;
     private initPlugins;
     init(): Promise<void>;
@@ -286,4 +337,4 @@ declare function Schedule(options: ScheduleOptions): Function;
 
 declare const logger: winston.Logger;
 
-export { Action, type ActionErrorEvent, type ActionMetadata, type ActionOptions, CacheAdapter, type CacheFn, type EtcdConfig, type EventServiceInfo, type McpOptions, MemoryCacheAdapter, Microservice, type MicroserviceOptions, ModelContextProtocolPlugin, Module, type ModuleInfo, type ModuleMetadata, type ModuleOptions, Plugin, type PreStartChecker, RedisCacheAdapter, Schedule, type ScheduleMetadata, ScheduleMode, type ScheduleOptions, ServiceContext, type ServiceInfo, type ServiceStats, type StatisticsEvent, type StreamResponse, logger, startCheck };
+export { Action, type ActionErrorEvent, type ActionMetadata, type ActionOptions, CacheAdapter, type CacheFn, type CleanupHook, type EtcdConfig, type EventServiceInfo, type McpOptions, MemoryCacheAdapter, Microservice, type MicroserviceOptions, ModelContextProtocolPlugin, Module, type ModuleInfo, type ModuleMetadata, type ModuleOptions, Plugin, type PreStartChecker, RedisCacheAdapter, type RequestInfo, Schedule, type ScheduleMetadata, ScheduleMode, type ScheduleOptions, ServiceContext, type ServiceInfo, type ServiceStats, type StatisticsEvent, type StreamResponse, logger, startCheck };

package/dist/mod.d.ts

@@ -155,6 +155,32 @@ interface MicroserviceOptions {
     };
     cacheAdapter?: CacheAdapter;
     plugins?: Plugin[];
+    gracefulShutdown?: {
+        /** 优雅停机超时时间（毫秒），默认 30 秒 */
+        timeout?: number;
+        /** 清理hook列表 */
+        cleanupHooks?: CleanupHook[];
+    };
+}
+interface CleanupHook {
+    /** hook名称 */
+    name: string;
+    /** 清理函数 */
+    cleanup: () => Promise<void> | void;
+    /** 超时时间（毫秒），默认 5 秒 */
+    timeout?: number;
+}
+interface RequestInfo {
+    /** 请求ID */
+    id: string;
+    /** 模块名称 */
+    moduleName: string;
+    /** 动作名称 */
+    actionName: string;
+    /** 开始时间 */
+    startTime: number;
+    /** 请求参数 */
+    params?: any;
 }
 interface ModuleInfo extends ModuleOptions {
     actions: Record<string, ActionMetadata>;
@@ -197,10 +223,11 @@ declare class Microservice {
     private lease?;
     private scheduler?;
     private abortController?;
-    private isShuttingDown;
     private statisticsTimer?;
     private wsHandler?;
     private actionHandlers;
+    private activeRequests;
+    private status;
     modules: Map<string, ModuleInfo>;
     readonly fetch: typeof fetch;
     options: Required<MicroserviceOptions>;
@@ -236,7 +263,7 @@ declare class Microservice {
     /**
      * 停止服务
      */
-    stop(): Promise<void>;
+    private stop;
     /**
      * 初始化停机处理
      */
@@ -244,10 +271,34 @@ declare class Microservice {
     /**
      * 优雅停机
      */
-    private gracefulShutdown;
+    shutdown(): Promise<void>;
+    /**
+     * 等待所有活跃请求完成
+     */
+    private waitForActiveRequests;
+    /**
+     * 执行清理hook
+     */
+    private executeCleanupHooks;
     private initStatsEventManager;
     private updateStats;
     getActionHandler(moduleName: string, actionName: string): ActionHandler;
+    /**
+     * 添加活跃请求跟踪
+     */
+    private addActiveRequest;
+    /**
+     * 移除活跃请求跟踪
+     */
+    private removeActiveRequest;
+    /**
+     * 获取当前活跃请求数量
+     */
+    getActiveRequestCount(): number;
+    /**
+     * 获取当前活跃请求信息
+     */
+    getActiveRequests(): RequestInfo[];
     private handleRequest;
     private initPlugins;
     init(): Promise<void>;
@@ -286,4 +337,4 @@ declare function Schedule(options: ScheduleOptions): Function;
 
 declare const logger: winston.Logger;
 
-export { Action, type ActionErrorEvent, type ActionMetadata, type ActionOptions, CacheAdapter, type CacheFn, type EtcdConfig, type EventServiceInfo, type McpOptions, MemoryCacheAdapter, Microservice, type MicroserviceOptions, ModelContextProtocolPlugin, Module, type ModuleInfo, type ModuleMetadata, type ModuleOptions, Plugin, type PreStartChecker, RedisCacheAdapter, Schedule, type ScheduleMetadata, ScheduleMode, type ScheduleOptions, ServiceContext, type ServiceInfo, type ServiceStats, type StatisticsEvent, type StreamResponse, logger, startCheck };
+export { Action, type ActionErrorEvent, type ActionMetadata, type ActionOptions, CacheAdapter, type CacheFn, type CleanupHook, type EtcdConfig, type EventServiceInfo, type McpOptions, MemoryCacheAdapter, Microservice, type MicroserviceOptions, ModelContextProtocolPlugin, Module, type ModuleInfo, type ModuleMetadata, type ModuleOptions, Plugin, type PreStartChecker, RedisCacheAdapter, type RequestInfo, Schedule, type ScheduleMetadata, ScheduleMode, type ScheduleOptions, ServiceContext, type ServiceInfo, type ServiceStats, type StatisticsEvent, type StreamResponse, logger, startCheck };

package/dist/mod.js

@@ -770,10 +770,11 @@ var Microservice = class {
   lease;
   scheduler;
   abortController;
-  isShuttingDown = false;
   statisticsTimer;
   wsHandler;
   actionHandlers = /* @__PURE__ */ new Map();
+  activeRequests = /* @__PURE__ */ new Map();
+  status = "running";
   modules = /* @__PURE__ */ new Map();
   fetch;
   options;
@@ -796,6 +797,10 @@ var Microservice = class {
       websocket: { enabled: false },
       cacheAdapter: new MemoryCacheAdapter(),
       plugins: [],
+      gracefulShutdown: {
+        timeout: 3e4,
+        cleanupHooks: []
+      },
       ...options
     };
     this.cache = this.options.cacheAdapter;
@@ -874,7 +879,7 @@ var Microservice = class {
     this.app.get(prefix, (ctx) => {
       const name = this.options.name ?? "Microservice";
       const version = this.options.version ?? "1.0.0";
-      return ctx.text(`${name} is running. version: ${version}`);
+      return ctx.text(`${name} is ${this.status}. version: ${version}`);
     });
     this.app.get(`${prefix}/health`, (ctx) => {
       return ctx.json({
@@ -890,7 +895,9 @@ var Microservice = class {
         version: this.options.version,
         env: this.options.env,
         modules: this.getModules(),
-        stats: Object.fromEntries(this.statsMap)
+        stats: Object.fromEntries(this.statsMap),
+        activeRequests: this.getActiveRequestCount(),
+        status: this.status
       });
     });
     this.app.get(`${prefix}/client.ts`, async (ctx) => {
@@ -1087,7 +1094,12 @@ var Microservice = class {
     process.on("SIGINT", () => {
       logger_default.info(`
 Received SIGINT signal`);
-      this.gracefulShutdown();
+      this.shutdown();
+    });
+    process.on("SIGTERM", () => {
+      logger_default.info(`
+Received SIGTERM signal`);
+      this.shutdown();
     });
     process.on("unhandledrejection", (event) => {
       logger_default.error("Unhandled rejection:", event.reason);
@@ -1099,14 +1111,16 @@ Received SIGINT signal`);
   /**
    * 优雅停机
    */
-  async gracefulShutdown() {
-    if (this.isShuttingDown) return;
-    this.isShuttingDown = true;
-    logger_default.info("\nGraceful shutdown initiated...");
+  async shutdown() {
+    if (this.status === "shutting_down") return;
+    this.status = "shutting_down";
+    logger_default.info("\nshutdown initiated...");
     if (this.statisticsTimer) clearInterval(this.statisticsTimer);
     try {
+      await this.waitForActiveRequests();
+      await this.executeCleanupHooks();
       await this.stop();
-      logger_default.info("Graceful shutdown completed");
+      logger_default.info("shutdown completed");
     } catch (error) {
       logger_default.error("Error during shutdown:", error);
       process.exit(1);
@@ -1114,6 +1128,57 @@ Received SIGINT signal`);
       process.exit(0);
     }
   }
+  /**
+   * 等待所有活跃请求完成
+   */
+  async waitForActiveRequests() {
+    const timeout = this.options.gracefulShutdown?.timeout || 3e4;
+    const startTime = Date.now();
+    logger_default.info(`Waiting for ${this.activeRequests.size} active requests to complete...`);
+    return new Promise((resolve) => {
+      const checkInterval = setInterval(() => {
+        const elapsed = Date.now() - startTime;
+        if (this.activeRequests.size === 0) {
+          clearInterval(checkInterval);
+          logger_default.info("All active requests completed");
+          resolve();
+        } else if (elapsed >= timeout) {
+          clearInterval(checkInterval);
+          logger_default.warn(`Timeout waiting for requests to complete. ${this.activeRequests.size} requests still active`);
+          resolve();
+        } else {
+          logger_default.info(`Still waiting for ${this.activeRequests.size} requests... (${elapsed}ms elapsed)`);
+        }
+      }, 1e3);
+    });
+  }
+  /**
+   * 执行清理hook
+   */
+  async executeCleanupHooks() {
+    const hooks = this.options.gracefulShutdown?.cleanupHooks || [];
+    if (hooks.length === 0) {
+      logger_default.info("No cleanup hooks configured");
+      return;
+    }
+    logger_default.info(`Executing ${hooks.length} cleanup hooks...`);
+    for (const hook of hooks) {
+      try {
+        const timeout = hook.timeout || 5e3;
+        logger_default.info(`Executing cleanup hook: ${hook.name}`);
+        await Promise.race([
+          Promise.resolve(hook.cleanup()),
+          new Promise(
+            (_, reject) => setTimeout(() => reject(new Error(`Cleanup hook ${hook.name} timeout`)), timeout)
+          )
+        ]);
+        logger_default.info(`Cleanup hook ${hook.name} completed successfully`);
+      } catch (error) {
+        logger_default.error(`Cleanup hook ${hook.name} failed:`, error);
+      }
+    }
+    logger_default.info("All cleanup hooks completed");
+  }
   initStatsEventManager() {
     this.statisticsTimer = setInterval(async () => {
       await this.updateStats();
@@ -1155,14 +1220,54 @@ Received SIGINT signal`);
     }
     return handler;
   }
+  /**
+   * 添加活跃请求跟踪
+   */
+  addActiveRequest(requestId, requestInfo) {
+    this.activeRequests.set(requestId, requestInfo);
+  }
+  /**
+   * 移除活跃请求跟踪
+   */
+  removeActiveRequest(requestId) {
+    this.activeRequests.delete(requestId);
+  }
+  /**
+   * 获取当前活跃请求数量
+   */
+  getActiveRequestCount() {
+    return this.activeRequests.size;
+  }
+  /**
+   * 获取当前活跃请求信息
+   */
+  getActiveRequests() {
+    return Array.from(this.activeRequests.values());
+  }
   handleRequest = async (ctx) => {
     const { moduleName, actionName } = ctx.req.param();
     const handler = this.getActionHandler(moduleName, actionName);
+    const requestId = crypto.randomUUID();
+    const startTime = Date.now();
+    if (this.status === "shutting_down") {
+      return ctx.json({
+        success: false,
+        error: "Service is shutting down"
+      }, 503);
+    }
     try {
       const paramsText = await ctx.req.text();
+      this.addActiveRequest(requestId, {
+        id: requestId,
+        moduleName,
+        actionName,
+        startTime,
+        params: paramsText
+      });
       const result = await handler.handle(paramsText);
       if (handler.metadata.stream) {
         const encoder = new TextEncoder();
+        const microservice = this;
         const stream = new ReadableStream({
           async start(controller) {
             try {
@@ -1186,6 +1291,8 @@ Received SIGINT signal`);
                 encoder.encode(ejson4.stringify(response) + "\n")
               );
               controller.close();
+            } finally {
+              microservice.removeActiveRequest(requestId);
             }
           }
         });
@@ -1197,8 +1304,10 @@ Received SIGINT signal`);
           }
         });
       }
+      this.removeActiveRequest(requestId);
       return ctx.text(ejson4.stringify({ success: true, data: result }));
     } catch (error) {
+      this.removeActiveRequest(requestId);
       return ctx.json({ success: false, error: error.message });
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imean-service-engine",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "microservice engine",
   "keywords": [
     "microservice",