milkio 0.5.1 → 0.5.2-alpha.1

package/defines/define-command-handler.ts

@@ -27,13 +27,13 @@ export function defineCommandHandler(app: MilkioApp, options: CommandOptions = {
 			}
 		}
 		if (argv.length === 2) params.path = `$/default`;
-		else params.path = `$/${argv[2]}`;
+		else params.path = `$/${argv[2] ?? 'default'}`;
 
 		// @ts-ignore
 		const result = await app.execute(params.path as any, { params: params });
 		if (!result.success) {
 			if (result.fail.code === "NOT_FOUND") {
-				if (options.notFoundHandler) await options.notFoundHandler({ ...params, name: argv.length === 2 ? "default" : argv[2] });
+				if (options.notFoundHandler) await options.notFoundHandler({ ...params, name: argv.length === 2 ? "default" : (argv[2] ?? 'default') });
 				return;
 			}
 			if (result.fail.code !== "INTERNAL_SERVER_ERROR") {

package/defines/define-http-handler.ts

@@ -32,7 +32,8 @@ export function defineHttpHandler(app: MilkioApp, options: ExecuteHttpServerOpti
 
 		loggerPushTags(executeId, {
 			from: "http-server",
-			fullUrl: fullurl.pathname,
+			url: fullurl.pathname,
+			fullurl: fullurl.pathname,
 			ip,
 			method: request.request.method,
 			// @ts-ignore

package/defines/define-use.ts

@@ -1,5 +1,4 @@
 export const defineUse = <CreatorFn extends () => Promise<unknown> | unknown>(creatorFn: CreatorFn): (() => Promise<Awaited<ReturnType<CreatorFn>>>) => {
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	let use: any | undefined;
 
 	const getUse = async () => {

package/kernel/fail.ts

@@ -1,7 +1,6 @@
 import { failCode } from "../../../src/fail-code";
 
 export function reject<Code extends keyof typeof failCode, FailData extends (typeof failCode)[Code]>(code: Code, data: Parameters<FailData>[0]) {
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
 	const message = failCode[code]?.(data as any) ?? "";
 	const error = {
 		name: "MilkioReject",
@@ -18,5 +17,4 @@ export function reject<Code extends keyof typeof failCode, FailData extends (typ
 
 export type MilkioReject = ReturnType<typeof reject>;
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type MilkioFailCode = Record<string, (arg: any) => string>;

package/kernel/logger.ts

@@ -1,5 +1,5 @@
-import { runtime, type ExecuteId } from "..";
-import { loggerOptions } from "../../../src/logger";
+import { ExecuteResultFail, runtime, type ExecuteId } from "..";
+import { loggerOptions, LoggerTags } from "../../../src/logger";
 
 export type LoggerItem = {
 	executeId: ExecuteId;
@@ -8,11 +8,26 @@ export type LoggerItem = {
 	params: Array<unknown>;
 };
 
-export type LoggerTags = Record<string, any>;
+export type MilkioLoggerTags = {
+	executeId: string;
+	from?: "http-server" | "execute";
+	method?: "POST" | "GET" | "PUT" | "DELETE" | "PATCH" | "OPTIONS" | string;
+	ip?: string;
+	path?: string;
+	status?: number;
+	url?: string;
+	params?: any;
+	body?: string;
+	fail?: ExecuteResultFail;
+	timein?: number;
+	timeout?: number;
+	requestHeaders?: Record<string, string>;
+	responseHeaders?: Record<string, string>;
+};
 
 export type LoggerOptions = {
 	onInsert: (options: LoggerItem) => boolean;
-	onSubmit: (tags: LoggerTags, logs: Array<LoggerItem>) => Promise<void> | void;
+	onSubmit: (tags: MilkioLoggerTags & LoggerTags, logs: Array<LoggerItem>) => Promise<void> | void;
 };
 
 export type Logger = {
@@ -26,18 +41,18 @@ export type Logger = {
 export const loggerController = (() => {
 	const logs = new Map<ExecuteId, { __LOG_DETAIL__: Array<LoggerItem>;[key: string]: any }>();
 
-	const loggerPushTags = (executeId: ExecuteId, tags: Record<string, any>) => {
+	const loggerPushTags = (executeId: ExecuteId, tags: Partial<MilkioLoggerTags & LoggerTags>) => {
 		if (!logs.has(executeId)) logs.set(executeId, { __LOG_DETAIL__: [] });
 		const logItem = logs.get(executeId);
 		for (const key in tags) {
-			logItem![key] = tags[key];
+			logItem![key] = (tags as any)[key];
 		}
 	};
 
 	const loggerSubmit = async (executeId: ExecuteId) => {
 		if (!logs.has(executeId)) return;
 		if (executeId === "global") return;
-		const loggerSubmitOptions: Record<string, string> = {
+		const loggerSubmitOptions: any = {
 			executeId,
 		};
 		const log = logs.get(executeId)!;

package/package.json

@@ -2,7 +2,7 @@
   "name": "milkio",
   "type": "module",
   "module": "index.ts",
-  "version": "0.5.1",
+  "version": "0.5.2-alpha.1",
   "peerDependencies": {
     "typescript": "^5.4.2"
   },

package/utils/exec.ts

@@ -13,7 +13,6 @@ export const exec = async (cwd: string, command: Array<string>, options: Partial
 		if (!("env" in options)) options.env = { ...env };
 
 		options.onExit = (proc, exitCode, signalCode, error) => {
-			// eslint-disable-next-line prefer-promise-reject-errors
 			if (exitCode !== 0) reject({ proc, exitCode, signalCode, error });
 			else resolve({ proc, exitCode, signalCode, error });
 		};

package/utils/handle-catch-error.ts

@@ -1,8 +1,7 @@
 import { failCode } from "../../../src/fail-code";
-import { useLogger, type ExecuteId, type ExecuteResult } from "..";
+import { loggerPushTags, useLogger, type ExecuteId, type ExecuteResult } from "..";
 import { configMilkio } from "../../../src/config/milkio";
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function handleCatchError(error: any, executeId: ExecuteId): ExecuteResult<any> {
 	const logger = useLogger(executeId);
 
@@ -12,13 +11,15 @@ export function handleCatchError(error: any, executeId: ExecuteId): ExecuteResul
 		else logger.error("Error Stack: ", error);
 	}
 
+	let result: ExecuteResult<any>;
+
 	if (error.name !== "MilkioReject") {
 		if (configMilkio.debug === true) {
 			// If it is not MilkioReject, it is considered an internal server error that should not be exposed
 			logger.error(`FailCode: INTERNAL_SERVER_ERROR`);
 		}
 
-		return {
+		result = {
 			executeId,
 			success: false,
 			fail: {
@@ -27,19 +28,25 @@ export function handleCatchError(error: any, executeId: ExecuteId): ExecuteResul
 				data: undefined,
 			},
 		};
-	}
+	} else {
+		if (configMilkio.debug === true) {
+			logger.error(`FailCode: ${error.code}`);
+		}
 
-	if (configMilkio.debug === true) {
-		logger.error(`FailCode: ${error.code}`);
+		result = {
+			executeId,
+			success: false,
+			fail: {
+				code: error.code,
+				message: error.message,
+				data: error.data,
+			},
+		};
 	}
 
-	return {
-		executeId,
-		success: false,
-		fail: {
-			code: error.code,
-			message: error.message,
-			data: error.data,
-		},
-	};
+	loggerPushTags(executeId, {
+		fail: result
+	});
+
+	return result;
 }