kb-server 0.0.1-beta.37 → 0.0.1-beta.38

package/dist/common/call-service.js

@@ -1,13 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.callService = void 0;
-const node_fetch_1 = __importDefault(require("node-fetch"));
 const create_errors_1 = require("./create-errors");
 const callService = async (endpoint, body) => {
-    const response = await (0, node_fetch_1.default)(endpoint, {
+    const response = await fetch(endpoint, {
         headers: {
             "Content-Type": "application/json",
         },

package/dist/common/create-sse.d.ts

@@ -1,20 +1,14 @@
 import { Class } from "utility-types";
 import { ServerContext } from "./create-api";
+import { Session } from "better-sse";
 export type API<P, R> = (param: P) => Promise<R>;
 export type SseExecution<P, R, A> = (
 /** 请求入参 */
 params: P, 
+/** SSE 连接对象 */
+session: Session, 
 /** 请求上下文 */
-ctx: ServerContext<A>, 
-/**
- * 操作函数
- */
-operations: {
-    /**
-     * 向客户端推送消息
-     */
-    send: (event: string, message: string) => void;
-}) => Promise<R>;
+ctx: ServerContext<A>) => Promise<R>;
 export type AnySseExecution = SseExecution<any, any, any>;
 export type SseHandlers = Record<string, AnySseExecution>;
 export declare function createSseAPI<P, R, A>(ParamsClass: Class<P>, execution: SseExecution<P, R, A>): API<P, R>;

package/dist/common/create-sse.js

@@ -6,7 +6,7 @@ const class_validator_1 = require("class-validator");
 const create_errors_1 = require("./create-errors");
 const create_api_1 = require("./create-api");
 function createSseAPI(ParamsClass, execution) {
-    const runtime = async (params, ctx, operations) => {
+    const runtime = async (params, session, ctx) => {
         if (!params) {
             throw new create_errors_1.CommonErrors.InvalidParameter.EmptyParameter();
         }
@@ -20,7 +20,7 @@ function createSseAPI(ParamsClass, execution) {
             throw new create_errors_1.CommonErrors.InvalidParameter.ValidationError(errorMessages.join("\n"));
         }
         // 执行函数
-        return await execution(params, ctx, operations);
+        return await execution(params, session, ctx);
     };
     return runtime;
 }

package/dist/common/sse-middleware.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSSEMessage = exports.packSSE = void 0;
+const better_sse_1 = require("better-sse");
 const uuid_1 = require("uuid");
 const logger_1 = require("../helper/logger");
 const create_errors_1 = require("./create-errors");
 const short_id_1 = require("../helper/short-id");
-const sleep_1 = require("../helper/sleep");
 const packSSE = (sseHandlers, options) => {
     const { authFn, log = true, route = "/sse" } = options || {};
     return async (req, res, next) => {
@@ -63,44 +63,11 @@ const packSSE = (sseHandlers, options) => {
             if (typeof execution !== "function") {
                 throw new create_errors_1.CommonErrors.ResourceNotFound.APINotFound();
             }
-            // 在调用 execution 前添加中断监听
-            let isClientConnected = true;
-            // 监听客户端断开事件
-            res.on("close", () => {
-                isClientConnected = false; // 标记连接已断开
-                logger_1.logger.log("info", `客户端已断开 - RequestId: ${requestId}`);
-            });
-            // 写请求头
-            res.writeHead(200, {
-                "Content-Type": "text/event-stream",
-                "Cache-Control": "no-cache",
-                Connection: "keep-alive",
-            });
-            const send = (event, message) => {
-                if (!isClientConnected) {
-                    logger_1.logger.log("warning", "客户端已断开，停止发送");
-                    return; // 终止发送逻辑
-                }
-                const response = (0, exports.createSSEMessage)(event, message);
-                try {
-                    res.write(response);
-                    if (log) {
-                        logger_1.logger.log("info", `发送消息：\n${response}`);
-                    }
-                }
-                catch (err) {
-                    if (err.code === "EPIPE" || err.code === "ECONNRESET") {
-                        logger_1.logger.log("error", "客户端连接已关闭");
-                        isClientConnected = false;
-                    }
-                }
-            };
-            await execution(params, ctx, { send });
+            const session = await (0, better_sse_1.createSession)(req, res);
+            await execution(params, session, ctx);
             // 完成响应
             took = Date.now() - start;
             logger_1.logger.log("info", `耗时：${took} ms - RequestId: ${requestId}`);
-            // 延迟1ms关闭连接
-            await (0, sleep_1.sleep)(1);
             return res.end();
         }
         catch (rawError) {
@@ -134,8 +101,6 @@ const packSSE = (sseHandlers, options) => {
             logger_1.logger.log("info", `发送消息：\n${response}`);
             logger_1.logger.log("info", `耗时：${took} ms - RequestId: ${requestId}`);
             res.write(response);
-            // 延迟100ms关闭连接
-            await (0, sleep_1.sleep)(100);
             return res.end();
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kb-server",
-  "version": "0.0.1-beta.37",
+  "version": "0.0.1-beta.38",
   "description": "A fast server for Node.JS,made by express.",
   "main": "dist/index.js",
   "scripts": {
@@ -16,21 +16,23 @@
     "dist/",
     "README.md"
   ],
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "author": "broxiang",
   "license": "ISC",
   "dependencies": {
+    "better-sse": "^0.13.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "express": "^4.21.1",
     "is-plain-object": "^5.0.0",
     "moment": "^2.30.1",
     "nanoid": "^3.3.9",
-    "node-fetch": "^2.7.0",
     "utility-types": "^3.11.0",
     "uuid": "^11.0.3"
   },
   "devDependencies": {
-    "@types/express": "^4.17.21",
-    "@types/node-fetch": "^2.6.12"
+    "@types/express": "^4.17.21"
   }
 }