milkio 0.7.0-alpha.12 → 0.7.0-alpha.13

package/defines/define-http-handler.ts

@@ -29,12 +29,11 @@ export function defineHttpHandler(app: MilkioApp, options: ExecuteHttpServerOpti
 		runtime.execute.executeIds.add(executeId);
 		const logger = useLogger(executeId);
 		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;
+		const headers = request.request.headers as Headers;
 
 		loggerPushTags(executeId, {
 			from: "http-server",
 			url: fullurl.pathname,
-			fullurl: fullurl.pathname,
 			ip,
 			method: request.request.method,
 			// @ts-ignore
@@ -81,7 +80,7 @@ export function defineHttpHandler(app: MilkioApp, options: ExecuteHttpServerOpti
 				path: pathstr,
 				ip,
 				executeId,
-				fullurl,
+				fullurl: fullurl as URL,
 				request: request.request,
 				response,
 			};
@@ -221,7 +220,7 @@ export function defineHttpHandler(app: MilkioApp, options: ExecuteHttpServerOpti
 							cancel() {
 								control.close();
 							},
-						} as unknown as UnderlyingByteSource);
+						});
 					} else {
 						// node.js or others
 						stream = new ReadableStream({
@@ -285,7 +284,11 @@ export type MilkioHttpRequest = {
 export type MilkioHttpResponse = Mixin<
 	ResponseInit,
 	{
-		body: string | BodyInit;
+		body: string
+		| Blob
+		| FormData
+		| URLSearchParams
+		| ReadableStream<Uint8Array>;
 		status: number;
 		headers: Record<string, string>;
 	}

package/kernel/execute.ts

@@ -1,7 +1,7 @@
 import type { Context } from "../../../src/context";
 import { failCode } from "../../../src/fail-code";
 import schema from "../../../generated/api-schema";
-import { type ExecuteId, type ExecuteOptions, type ExecuteResult, createUlid, useLogger, runtime, loggerPushTags, headerToPlainObject, loggerSubmit, type ExecuteCoreOptions, TSON, MiddlewareEvent, reject, _validate, ExecuteStreamResult, createStep } from "..";
+import { type ExecuteId, type ExecuteOptions, type ExecuteResult, createUlid, useLogger, runtime, loggerPushTags, headerToPlainObject, loggerSubmit, type ExecuteCoreOptions, TSON, MiddlewareEvent, reject, _validate, ExecuteStreamResult, createStep, Steps } from "..";
 import { handleCatchError } from "../utils/handle-catch-error";
 
 const apis = new Map<string, any>();
@@ -56,7 +56,7 @@ export async function _call(
 		headers,
 		logger: options.logger,
 		detail: options?.detail ?? {} as any,
-		step: createStep(),
+		step: createStep() as any,
 	};
 
 	let result: { value: unknown };
@@ -126,7 +126,7 @@ export async function _execute<Path extends keyof (typeof schema)["apiMethodsTyp
 		logger,
 		onAfterHeaders: (headers) => {
 			loggerPushTags(executeId, {
-				headers: headerToPlainObject(headers),
+				requestHeaders: headerToPlainObject(headers),
 			});
 		},
 	});
@@ -183,7 +183,7 @@ export async function _executeStream<Path extends keyof (typeof schema)["apiMeth
 		logger,
 		onAfterHeaders: (headers) => {
 			loggerPushTags(executeId, {
-				headers: headerToPlainObject(headers),
+				requestHeaders: headerToPlainObject(headers)
 			});
 		},
 	});

package/kernel/logger.ts

@@ -21,6 +21,7 @@ export type MilkioLoggerTags = {
 	fail?: ExecuteResultFail;
 	timein?: number;
 	timeout?: number;
+	result?: unknown;
 	requestHeaders?: Record<string, string>;
 	responseHeaders?: Record<string, string>;
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "milkio",
   "type": "module",
   "module": "index.ts",
-  "version": "0.7.0-alpha.12",
+  "version": "0.7.0-alpha.13",
   "peerDependencies": {
     "typescript": "^5.4.2"
   },

package/utils/header-to-plain-object.ts

@@ -1,8 +1,8 @@
-export const headerToPlainObject = (headers: Headers) => {
+export const headerToPlainObject = (headers: Headers): Record<string, string> => {
 	if (headers.toJSON) return headers.toJSON();
 	const plainHeaders: Record<string, string> = {};
 	headers.forEach((value, key) => {
 		plainHeaders[key] = value;
 	});
-	return headers;
+	return plainHeaders;
 };