milkio 0.2.11 → 0.2.13

package/defines/define-http-handler.ts

@@ -18,6 +18,7 @@ export type ExecuteHttpServerOptions = {
 	 * @returns
 	 */
 	executeIdGenerator?: (request: Request) => string | Promise<string>;
+	getRealIp?: (request: Request) => string;
 };
 
 export function defineHttpHandler(app: MilkioApp, options: ExecuteHttpServerOptions = {}) {
@@ -26,7 +27,7 @@ export function defineHttpHandler(app: MilkioApp, options: ExecuteHttpServerOpti
 		const executeId = (options?.executeIdGenerator ? await options.executeIdGenerator(request.request) : createUlid()) as ExecuteId;
 		runtime.execute.executeIds.add(executeId);
 		const logger = useLogger(executeId);
-		const ip = (request.request.headers.get("x-forwarded-for") as string | undefined)?.split(",")[0] ?? "0.0.0.0";
+		const ip = options.getRealIp ? options.getRealIp(request.request) : (request.request.headers.get("X-Forwarded-For") as string | undefined)?.split(",")[0] ?? "0.0.0.0";
 		const headers = request.request.headers;
 
 		loggerPushTags(executeId, {
@@ -92,7 +93,11 @@ export function defineHttpHandler(app: MilkioApp, options: ExecuteHttpServerOpti
 						body: rawbody || "no body",
 					});
 
-					if (!detail.response.body) detail.response.body = `{"executeId":"${executeId}","success":false,"fail":{"code":"NOT_FOUND","message":${JSON.stringify(failCode.NOT_FOUND())}}}`;
+					if (!detail.response.body) {
+						if (!detail.response.headers["Content-Type"]) detail.response.headers["Content-Type"] = "application/json";
+						if (!detail.response.headers["Cache-Control"]) detail.response.headers["Cache-Control"] = "no-cache";
+						detail.response.body = `{"executeId":"${executeId}","success":false,"fail":{"code":"NOT_FOUND","message":"${failCode.NOT_FOUND()}"}}`;
+					}
 					await MiddlewareEvent.handle("httpNotFound", [detail]);
 
 					loggerPushTags(executeId, {
@@ -159,10 +164,12 @@ export function defineHttpHandler(app: MilkioApp, options: ExecuteHttpServerOpti
 			};
 			await MiddlewareEvent.handle("beforeHttpResponse", [middlewareResponse, detail]);
 
+			if (!detail.response.headers["Content-Type"]) detail.response.headers["Content-Type"] = "application/json";
 			if (!detail.response.headers["Cache-Control"]) detail.response.headers["Cache-Control"] = "no-cache";
 			if (!detail.response.body) detail.response.body = middlewareResponse.value;
 		} catch (error) {
 			const result = hanldeCatchError(error, executeId);
+			if (!response.headers["Content-Type"]) response.headers["Content-Type"] = "application/json";
 			if (!response.headers["Cache-Control"]) response.headers["Cache-Control"] = "no-cache";
 			if (!response.body) response.body = TSON.stringify(result);
 		}

package/kernel/logger.ts

@@ -23,10 +23,10 @@ export type Logger = {
 };
 
 export const loggerController = (() => {
-	const logs = new Map<ExecuteId, { __LOG_DEATIL__: Array<LoggerItem>; [key: string]: any }>();
+	const logs = new Map<ExecuteId, { __LOG_DETAIL__: Array<LoggerItem>; [key: string]: any }>();
 
 	const loggerPushTags = (executeId: ExecuteId, tags: Record<string, any>) => {
-		if (!logs.has(executeId)) logs.set(executeId, { __LOG_DEATIL__: [] });
+		if (!logs.has(executeId)) logs.set(executeId, { __LOG_DETAIL__: [] });
 		const logItem = logs.get(executeId);
 		for (const key in tags) {
 			logItem![key] = tags[key];
@@ -41,11 +41,11 @@ export const loggerController = (() => {
 		};
 		const log = logs.get(executeId)!;
 		for (const key in log) {
-			if (key === "__LOG_DEATIL__") continue;
+			if (key === "__LOG_DETAIL__") continue;
 			loggerSubmitOptions[key] = log[key];
 		}
 		logs.delete(executeId);
-		loggerOptions.onSubmit(loggerSubmitOptions, log.__LOG_DEATIL__);
+		loggerOptions.onSubmit(loggerSubmitOptions, log.__LOG_DETAIL__);
 	};
 
 	const loggerSubmitAll = async () => {
@@ -63,7 +63,7 @@ export const loggerController = (() => {
 		}
 
 		for (const executeId of executeIds) {
-			if (!logs.has(executeId as ExecuteId)) logs.set(executeId as ExecuteId, { __LOG_DEATIL__: [] });
+			if (!logs.has(executeId as ExecuteId)) logs.set(executeId as ExecuteId, { __LOG_DETAIL__: [] });
 			const loggerItem = {
 				executeId: executeId as ExecuteId,
 				loggerLevel: level,
@@ -71,7 +71,7 @@ export const loggerController = (() => {
 				params,
 			} satisfies LoggerItem;
 			if (!loggerOptions.onInsert(loggerItem)) return;
-			logs.get(executeId as ExecuteId)!.__LOG_DEATIL__.push(loggerItem);
+			logs.get(executeId as ExecuteId)!.__LOG_DETAIL__.push(loggerItem);
 		}
 	};
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "milkio",
   "type": "module",
   "module": "index.ts",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "peerDependencies": {
     "typescript": "^5.4.2"
   },