feat: 优化netTool，使用netTool封装的方法返回响应对象

index.ts

@@ -3,6 +3,7 @@ import { manageMessageReq } from "./routes/message";
 import { manageMicroAppReq } from "./routes/microApp";
 import { manageSheetReq } from "./routes/sheet";
 import { initSchedule } from "./schedule";
+import netTool from "./services/netTool";
 
 initSchedule();
 
@@ -11,7 +12,7 @@ const server = Bun.serve({
     try {
       const url = new URL(req.url);
       // 根路由
-      if (url.pathname === "/") return new Response("hello, glade to see you!");
+      if (url.pathname === "/") return netTool.ok("hello, glade to see you!");
       // 机器人
       if (url.pathname === "/bot") return await manageBotReq(req);
       // 消息代理发送
@@ -22,11 +23,11 @@ const server = Bun.serve({
       if (url.pathname.startsWith("/micro_app"))
         return await manageMicroAppReq(req);
       // 其他
-      return new Response("hello, glade to see you!");
+      return netTool.ok("hello, glade to see you!");
     } catch (error: any) {
       // 错误处理
       console.error("🚀 ~ serve ~ error", error);
-      return new Response(error.message || "server error", { status: 500 });
+      return netTool.serverError(error.message || "server error");
     }
   },
   port: 3000,

routes/bot/index.ts

@@ -1,3 +1,4 @@
+import netTool from "../../services/netTool";
 import { manageActionMsg } from "./actionMsg";
 import { manageEventMsg } from "./eventMsg";
 
@@ -9,8 +10,9 @@ export const manageBotReq = async (req: Request) => {
     return Response.json({ challenge: body?.challenge });
   }
   // 处理Event消息
-  if (manageEventMsg(body)) return new Response("success");
+  if (manageEventMsg(body)) return netTool.ok();
   // 处理Action消息
-  if (manageActionMsg(body)) return new Response("success");
-  return new Response("hello, glade to see you!");
+  if (manageActionMsg(body)) return netTool.ok();
+  // 其他
+  return netTool.ok();
 };

routes/microApp/index.ts

@@ -1,4 +1,5 @@
 import service from "../../services";
+import netTool from "../../services/netTool";
 import { trimPathPrefix } from "../../utils/pathTools";
 
 /**
@@ -11,7 +12,7 @@ const manageLogin = async (req: Request) => {
   const code = url.searchParams.get("code");
   const appName = url.searchParams.get("app_name") || undefined;
   if (!code) {
-    return new Response("code not found", { status: 400 });
+    return netTool.badRequest("code not found");
   }
   const {
     code: resCode,
@@ -46,10 +47,10 @@ const manageBatchUser = async (req: Request) => {
   console.log("🚀 ~ manageBatchUser ~ body:", body);
   const { user_ids, user_id_type, app_name } = body;
   if (!user_ids) {
-    return new Response("user_ids not found", { status: 400 });
+    return netTool.badRequest("user_ids not found");
   }
   if (!user_id_type) {
-    return new Response("user_id_type not found", { status: 400 });
+    return netTool.badRequest("user_id_type not found");
   }
 
   const { code, data, msg } = await service.lark.user.batchGet(app_name)(
@@ -88,5 +89,5 @@ export const manageMicroAppReq = async (req: Request) => {
   if (withoutPrefix === "/batch_user") {
     return manageBatchUser(req);
   }
-  return new Response("hello, glade to see you!");
+  return netTool.ok();
 };

services/netTool.ts

@@ -191,34 +191,41 @@ netTool.patch = <T = any>(
  * 创建一个表示400 Bad Request的响应对象。
  *
  * @param msg - 错误消息。
+ * @param requestId - 请求ID。
  * @returns 一个表示400 Bad Request的响应对象。
  */
-netTool.badRequest = (msg: string) => new Response(msg, { status: 400 });
+netTool.badRequest = (msg: string, requestId?: string) =>
+  Response.json({ code: 400, msg, requestId }, { status: 400 });
 
 /**
  * 创建一个表示404 Not Found的响应对象。
  *
  * @param msg - 错误消息。
+ * @param requestId - 请求ID。
  * @returns 一个表示404 Not Found的响应对象。
  */
-netTool.notFound = (msg: string) => new Response(msg, { status: 404 });
+netTool.notFound = (msg: string, requestId?: string) =>
+  Response.json({ code: 404, msg, requestId }, { status: 404 });
 
 /**
  * 创建一个表示500 Internal Server Error的响应对象。
  *
  * @param msg - 错误消息。
  * @param data - 错误数据。
+ * @param requestId - 请求ID。
  * @returns 一个表示500 Internal Server Error的响应对象。
  */
-netTool.serverError = (msg: string, data: any) =>
-  Response.json({ code: 500, msg, data }, { status: 500 });
+netTool.serverError = (msg: string, data?: any, requestId?: string) =>
+  Response.json({ code: 500, msg, data, requestId }, { status: 500 });
 
 /**
  * 创建一个表示200 OK的响应对象。
  *
  * @param data - 响应数据。
+ * @param requestId - 请求ID。
  * @returns 一个表示200 OK的响应对象。
  */
-netTool.ok = (data?: any) => Response.json({ code: 200, msg: "ok", data });
+netTool.ok = (data?: any, requestId?: string) =>
+  Response.json({ code: 200, msg: "ok", data, requestId });
 
 export default netTool;