typespeed 2.6.1 → 2.6.3

package/CHANGELOG.md

@@ -4,6 +4,8 @@ typespeed 版本演进记录。本文件 2026-09-06 从 git 历史反推建立
 
 ## 2.6.x
 
+- **2.6.3**：框架内建优雅停机——`ExpressServer` 存储 `httpServer` + 新增 `stop()`（Promise 化 graceful close）；SIGTERM/SIGINT 优雅停机（close 后 exit 0，30s 兜底强制退出），停机时关闭 Redis；socket 模式一并处理（2026-09-07）
+- **2.6.2**：框架内建健康检查——新增 `HealthFactory`（abstract `ready()`）+ `HealthDefault`（默认恒就绪）；`ExpressServer` 内建 `GET /health`（liveness）与 `GET /ready`（readiness，读 HealthFactory，200/503），路径可经 config 覆盖（2026-09-07）
 - **2.6.1**：Node/TS 升级——TypeScript 4.9 → 5.9.3（legacy 装饰器零改动兼容，标准装饰器双轨同步验证）；`@types/node` 对齐 22；声明 `engines`（node >=18）（2026-09-07）
 
 ## 2.5.x

package/dist/default/express-server.class.js

@@ -22,9 +22,14 @@ const route_decorator_1 = require("../route.decorator");
 const socket_io_class_1 = require("../default/socket-io.class");
 const typespeed_1 = require("../typespeed");
 const core_decorator_1 = require("../core.decorator");
+const health_factory_class_1 = require("../factory/health-factory.class");
 const redis_class_1 = require("./redis.class");
 const authentication_factory_class_1 = require("../factory/authentication-factory.class");
 class ExpressServer extends server_factory_class_1.default {
+    constructor() {
+        super(...arguments);
+        this.httpServer = null;
+    }
     getSever() {
         const server = new ExpressServer();
         server.app = express();
@@ -38,13 +43,46 @@ class ExpressServer extends server_factory_class_1.default {
             this.app.use(middleware);
         });
         this.setDefaultMiddleware();
+        let server;
         if (this.socketIoConfig) {
             const newSocketApp = socket_io_class_1.SocketIo.setIoServer(this.app, this.socketIoConfig);
-            return newSocketApp.listen(port);
+            server = newSocketApp.listen(port);
         }
         else {
-            return this.app.listen(port);
+            server = this.app.listen(port);
         }
+        this.httpServer = server;
+        this.registerGracefulShutdown();
+        return server;
+    }
+    stop() {
+        return new Promise((resolve) => {
+            if (this.httpServer) {
+                this.httpServer.close(() => resolve());
+            }
+            else {
+                resolve();
+            }
+        });
+    }
+    registerGracefulShutdown() {
+        const shutdown = (signal) => {
+            (0, core_decorator_1.log)(`received ${signal}, gracefully shutting down...`);
+            // 30 秒兜底强制退出，防止连接迟迟不关闭
+            const forceExit = setTimeout(() => {
+                (0, core_decorator_1.log)("forced shutdown after timeout");
+                process.exit(1);
+            }, 30000);
+            forceExit.unref();
+            redis_class_1.Redis.close().catch(() => { });
+            this.httpServer.close(() => {
+                clearTimeout(forceExit);
+                (0, core_decorator_1.log)("server closed");
+                process.exit(0);
+            });
+        };
+        process.on("SIGTERM", () => shutdown("SIGTERM"));
+        process.on("SIGINT", () => shutdown("SIGINT"));
     }
     setDefaultMiddleware() {
         this.app.use(express.urlencoded({ extended: true }));
@@ -83,6 +121,23 @@ class ExpressServer extends server_factory_class_1.default {
         }
         (0, route_decorator_1.setRouter)(this.app);
         this.app.use(this.authentication.afterCompletion);
+        // 健康检查（k8s liveness / readiness 探针）
+        const healthConfig = (0, typespeed_1.config)("health") || {};
+        const livenessPath = healthConfig["liveness"] || "/health";
+        const readinessPath = healthConfig["readiness"] || "/ready";
+        this.app.get(livenessPath, (req, res) => {
+            res.status(200).json({ status: "up" });
+        });
+        this.app.get(readinessPath, (req, res) => {
+            let ready = true;
+            try {
+                ready = (0, core_decorator_1.getBean)(health_factory_class_1.default).ready();
+            }
+            catch (e) {
+                ready = false;
+            }
+            res.status(ready ? 200 : 503).json({ status: ready ? "ready" : "not-ready" });
+        });
         const errorPageDir = __dirname + "/pages";
         this.app.use((req, res) => {
             (0, core_decorator_1.error)("404 not found, for page: " + req.url);

package/dist/default/health-default.class.js

@@ -0,0 +1,32 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_decorator_1 = require("../core.decorator");
+const health_factory_class_1 = require("../factory/health-factory.class");
+/**
+ * 健康检查默认实现：恒为就绪。
+ * 应用继承 HealthFactory 并用 @bean 注册自定义实现，即可覆盖默认行为（如接入数据库/Redis 连通性检查）。
+ */
+class HealthDefault extends health_factory_class_1.default {
+    createHealth() {
+        return new HealthDefault();
+    }
+    ready() {
+        return true;
+    }
+}
+exports.default = HealthDefault;
+__decorate([
+    core_decorator_1.bean,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", health_factory_class_1.default)
+], HealthDefault.prototype, "createHealth", null);

package/dist/factory/health-factory.class.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * 健康检查工厂（抽象）。
+ * 实现 ready() 自定义「就绪检查」（readiness）——如检查数据库/Redis/MQ 连通性。
+ * 应用继承此类并用 @bean 注册自定义实现；默认实现见 HealthDefault（恒就绪）。
+ */
+class HealthFactory {
+}
+exports.default = HealthFactory;

package/dist/typespeed.d.ts

@@ -280,6 +280,14 @@ declare abstract class AuthenticationFactory {
      */
     afterCompletion(req: express.Request, res: express.Response, next: express.NextFunction): void;
 }
+/**健康检查工厂类，实现 ready() 自定义就绪检查（readiness） */
+declare abstract class HealthFactory {
+    abstract ready(): boolean;
+}
+/**健康检查默认实现类，默认恒为就绪 */
+declare class HealthDefault extends HealthFactory {
+    ready(): boolean;
+}
 /**Redis 操作类 */
 declare class Redis extends IoRedis {
     /**获取 Redis 实例 */
@@ -380,6 +388,10 @@ declare class ExpressServer extends ServerFactory {
     getSever(): ServerFactory;
     setMiddleware(middleware: any): void;
     start(port: number): void;
+    /**HTTP 服务实例（start 后可用） */
+    httpServer: any;
+    /**优雅停机：关闭 HTTP 服务（排空在途连接） */
+    stop(): Promise<void>;
     private setDefaultMiddleware;
 }
 /**Socket IO 装饰器类 */
@@ -400,4 +412,4 @@ declare class SocketIo {
 /**Socket IO 服务实现类 */
 declare const io: IoServer;
 
-export { ExpressServer, LogDefault, NodeCache, RabbitMQ, rabbitListener, redisSubscriber, ReadWriteDb, Redis, CacheFactory, DataSourceFactory, LogFactory, ServerFactory, AuthenticationFactory, next, reqBody, reqQuery, reqForm, reqParam, req, req as request, res, res as response, component, bean, resource, log, logx, app, before, after, value, error, config, autoware, getBean, getComponent, schedule, getMapping, postMapping, requestMapping, setRouter, upload, jwt, insert, update, remove, select, param, bind, resultType, cache, Model, SocketIo, io };
+export { ExpressServer, LogDefault, NodeCache, RabbitMQ, rabbitListener, redisSubscriber, ReadWriteDb, Redis, CacheFactory, DataSourceFactory, LogFactory, ServerFactory, AuthenticationFactory, HealthFactory, HealthDefault, next, reqBody, reqQuery, reqForm, reqParam, req, req as request, res, res as response, component, bean, resource, log, logx, app, before, after, value, error, config, autoware, getBean, getComponent, schedule, getMapping, postMapping, requestMapping, setRouter, upload, jwt, insert, update, remove, select, param, bind, resultType, cache, Model, SocketIo, io };

package/dist/typespeed.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReadWriteDb = exports.redisSubscriber = exports.Redis = exports.NodeCache = exports.LogDefault = exports.ExpressServer = exports.AuthenticationFactory = exports.ServerFactory = exports.DataSourceFactory = exports.CacheFactory = exports.LogFactory = void 0;
+exports.ReadWriteDb = exports.redisSubscriber = exports.Redis = exports.NodeCache = exports.HealthDefault = exports.LogDefault = exports.ExpressServer = exports.HealthFactory = exports.AuthenticationFactory = exports.ServerFactory = exports.DataSourceFactory = exports.CacheFactory = exports.LogFactory = void 0;
 exports.app = app;
 exports.value = value;
 exports.config = config;
@@ -145,10 +145,14 @@ var server_factory_class_1 = require("./factory/server-factory.class");
 Object.defineProperty(exports, "ServerFactory", { enumerable: true, get: function () { return server_factory_class_1.default; } });
 var authentication_factory_class_1 = require("./factory/authentication-factory.class");
 Object.defineProperty(exports, "AuthenticationFactory", { enumerable: true, get: function () { return authentication_factory_class_1.default; } });
+var health_factory_class_1 = require("./factory/health-factory.class");
+Object.defineProperty(exports, "HealthFactory", { enumerable: true, get: function () { return health_factory_class_1.default; } });
 var express_server_class_1 = require("./default/express-server.class");
 Object.defineProperty(exports, "ExpressServer", { enumerable: true, get: function () { return express_server_class_1.default; } });
 var log_default_class_1 = require("./default/log-default.class");
 Object.defineProperty(exports, "LogDefault", { enumerable: true, get: function () { return log_default_class_1.default; } });
+var health_default_class_1 = require("./default/health-default.class");
+Object.defineProperty(exports, "HealthDefault", { enumerable: true, get: function () { return health_default_class_1.default; } });
 var node_cache_class_1 = require("./default/node-cache.class");
 Object.defineProperty(exports, "NodeCache", { enumerable: true, get: function () { return node_cache_class_1.default; } });
 var redis_class_1 = require("./default/redis.class");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typespeed",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "description": "A new Framework for TypeScript.",
   "author": "speedphp",
   "license": "MIT License",