milkio 1.0.0-alpha.0 → 1.0.0-alpha.2

package/context/index.ts

@@ -1,4 +1,4 @@
-import { type $types, type Logger } from "..";
+import { type MilkioHttpRequest, type MilkioHttpResponse, type $types, type Logger } from "..";
 
 export interface $context {
   executeId: string;
@@ -15,4 +15,6 @@ export type ContextHttp<ParamsParsed> = {
     string: string;
     parsed: ParamsParsed;
   };
+  request: MilkioHttpRequest;
+  response: MilkioHttpResponse;
 };

package/execute/index.ts

@@ -38,7 +38,6 @@ export const __initExecuter = <MilkioRuntime extends MilkioRuntimeInit<MilkioRun
       headers = options.headers;
     }
     let params: Record<any, unknown>;
-    if (runtime.port.develop === "disabled") throw reject("NOT_DEVELOP_MODE", "This feature must be in developer mode to use. Usually entering developer mode requires using a cookbook to start milkio and accessing it through localhost.");
     if (options.paramsType === "raw") {
       params = options.params;
       if (typeof params === "undefined") params = {};
@@ -55,13 +54,14 @@ export const __initExecuter = <MilkioRuntime extends MilkioRuntimeInit<MilkioRun
     }
     if (typeof params !== "object" || Array.isArray(params)) throw reject("PARAMS_TYPE_NOT_SUPPORTED", { expected: "json" });
     if ("$milkioGenerateParams" in params && params.$milkioGenerateParams === "enable") {
+      if (runtime.port.develop === "disabled") throw reject("NOT_DEVELOP_MODE", "This feature must be in developer mode to use. Usually entering developer mode requires using a cookbook to start milkio and accessing it through localhost.");
       delete params.$milkioGenerateParams;
       let paramsRand = routeSchema.randomParams();
       if (paramsRand === undefined || paramsRand === null) paramsRand = {};
       params = { ...paramsRand, ...params };
       options.createdLogger.debug("[milkio]", "🪄 generate params:", options.path, TSON.stringify(params));
     }
-    if (options.mixinContext?.detail?.params?.string) options.mixinContext.detail.params.parsed = params; // listen でパースしたパラメータを渡す
+    if (options.mixinContext?.http?.params?.string) options.mixinContext.http.params.parsed = params; // listen でパースしたパラメータを渡す
     const context = {
       ...(options.mixinContext ? options.mixinContext : {}),
       path: options.path,

package/listener/index.ts

@@ -56,7 +56,7 @@ export const __initListener = <MilkioRuntime extends MilkioRuntimeInit<MilkioRun
     };
 
     try {
-      const detail = (await (async () => {
+      const http = (await (async () => {
         const url = new URL(request.url);
         let pathArray = url.pathname.substring(1).split("/");
         if (runtime.ignorePathLevel !== undefined && runtime.ignorePathLevel !== 0) pathArray = pathArray.slice(runtime.ignorePathLevel);
@@ -69,25 +69,27 @@ export const __initListener = <MilkioRuntime extends MilkioRuntimeInit<MilkioRun
 
         return {
           url,
-          path: { string: pathString as keyof $types["generated"]["routeSchema"]["$types"], array: pathArray },
           ip,
+          path: { string: pathString as keyof $types["generated"]["routeSchema"]["$types"], array: pathArray },
           params,
+          request,
+          response,
         } as ContextHttp<undefined>;
       })())!;
 
       if (!request.headers.get("Accept")?.startsWith("text/event-stream")) {
         // action
-        const routeSchema = generated.routeSchema.routes.get(detail.path.string);
-        if (routeSchema === undefined) throw reject("NOT_FOUND", { path: detail.path.string as string });
+        const routeSchema = generated.routeSchema.routes.get(http.path.string);
+        if (routeSchema === undefined) throw reject("NOT_FOUND", { path: http.path.string as string });
         if (routeSchema.type !== "action") throw reject("UNACCEPTABLE", { expected: "stream", message: `Not acceptable, the Accept in the request header should be "text/event-stream". If you are using the "@milkio/stargate" package, please add \`type: "stream"\` to the execute options.` });
 
         const executed = await executer.__call(routeSchema, {
           createdExecuteId: executeId,
           createdLogger: logger,
-          path: detail.path.string as string,
+          path: http.path.string as string,
           headers: request.headers as Headers,
-          mixinContext: { detail },
-          params: detail.params.string,
+          mixinContext: { http },
+          params: http.params.string,
           paramsType: "string",
         });
 
@@ -97,17 +99,17 @@ export const __initListener = <MilkioRuntime extends MilkioRuntimeInit<MilkioRun
         return new Response(response.body, response);
       } else {
         // stream
-        const routeSchema = generated.routeSchema.routes.get(detail.path.string);
-        if (routeSchema === undefined) throw reject("NOT_FOUND", { path: detail.path.string as string });
+        const routeSchema = generated.routeSchema.routes.get(http.path.string);
+        if (routeSchema === undefined) throw reject("NOT_FOUND", { path: http.path.string as string });
         if (routeSchema.type !== "stream") throw reject("UNACCEPTABLE", { expected: "stream", message: `Not acceptable, the Accept in the request header should be "application/json". If you are using the "@milkio/stargate" package, please remove \`type: "stream"\` to the execute options.` });
 
         const executed = await executer.__call(routeSchema, {
           createdExecuteId: executeId,
           createdLogger: logger,
-          path: detail.path.string as string,
+          path: http.path.string as string,
           headers: request.headers as Headers,
-          mixinContext: { detail },
-          params: detail.params.string,
+          mixinContext: { http },
+          params: http.params.string,
           paramsType: "string",
         });
         let stream: ReadableStream;

package/package.json

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