elysia 1.2.13 → 1.2.14

package/dist/adapter/web-standard/handler.mjs

@@ -58,6 +58,45 @@ const parseSetCookies = (headers, setCookie) => {
   }
   return headers;
 };
+const responseToSetHeaders = (response, set2) => {
+  if (set2?.headers) {
+    if (response) {
+      if (hasHeaderShorthand)
+        Object.assign(set2.headers, response.headers.toJSON());
+      else
+        for (const [key, value] of response.headers.entries())
+          if (key in set2.headers) set2.headers[key] = value;
+    }
+    if (set2.status === 200) set2.status = response.status;
+    if (set2.headers["content-encoding"])
+      delete set2.headers["content-encoding"];
+    return set2;
+  }
+  if (!response)
+    return {
+      headers: {},
+      status: set2?.status ?? 200
+    };
+  if (hasHeaderShorthand) {
+    set2 = {
+      // @ts-expect-error
+      headers: response.headers.toJSON(),
+      status: set2?.status ?? 200
+    };
+    if (set2.headers["content-encoding"])
+      delete set2.headers["content-encoding"];
+    return set2;
+  }
+  set2 = {
+    headers: {},
+    status: set2?.status ?? 200
+  };
+  for (const [key, value] of response.headers.entries()) {
+    if (key === "content-encoding") continue;
+    if (key in set2.headers) set2.headers[key] = value;
+  }
+  return set2;
+};
 const handleStream = async (generator, set2, request) => {
   let init = generator.next();
   if (init instanceof Promise) init = await init;
@@ -65,6 +104,20 @@ const handleStream = async (generator, set2, request) => {
     if (set2) return mapResponse(init.value, set2, request);
     return mapCompactResponse(init.value, request);
   }
+  if (set2?.headers) {
+    if (!set2.headers["transfer-encoding"])
+      set2.headers["transfer-encoding"] = "chunked";
+    if (!set2.headers["content-type"])
+      set2.headers["content-type"] = "text/event-stream; charset=utf-8";
+  } else {
+    set2 = {
+      status: 200,
+      headers: {
+        "content-type": "text/event-stream; charset=utf-8",
+        "transfer-encoding": "chunked"
+      }
+    };
+  }
   return new Response(
     new ReadableStream({
       async start(controller) {
@@ -125,15 +178,7 @@ const handleStream = async (generator, set2, request) => {
         }
       }
     }),
-    {
-      ...set2,
-      headers: {
-        // Manually set transfer-encoding for direct response, eg. app.handle, eden
-        "transfer-encoding": "chunked",
-        "content-type": "text/event-stream; charset=utf-8",
-        ...set2?.headers
-      }
-    }
+    set2
   );
 };
 async function* streamResponse(response) {
@@ -231,10 +276,10 @@ const mapResponse = (response, set2, request) => {
           response,
           set2
         );
-        if (response.headers.get("transfer-encoding") === "chunked")
+        if (!response.headers.has("content-length") && response.headers.get("transfer-encoding") === "chunked")
           return handleStream(
             streamResponse(response),
-            set2,
+            responseToSetHeaders(response, set2),
             request
           );
         return response;
@@ -269,7 +314,7 @@ const mapResponse = (response, set2, request) => {
           ) === "chunked")
             return handleStream(
               streamResponse(response),
-              set2,
+              responseToSetHeaders(response, set2),
               request
             );
           return response;
@@ -306,9 +351,15 @@ const mapResponse = (response, set2, request) => {
         return new Response(response, set2);
     }
   }
+  if (response instanceof Response && !response.headers.has("content-length") && response.headers.get("transfer-encoding") === "chunked")
+    return handleStream(
+      streamResponse(response),
+      responseToSetHeaders(response, set2),
+      request
+    );
   if (
     // @ts-expect-error
-    typeof response?.next === "function" || response instanceof ReadableStream || response instanceof Response && response.headers.get("transfer-encoding") === "chunked"
+    typeof response?.next === "function" || response instanceof ReadableStream
   )
     return handleStream(response, set2, request);
   return mapCompactResponse(response, request);
@@ -360,10 +411,10 @@ const mapEarlyResponse = (response, set2, request) => {
           response,
           set2
         );
-        if (response.headers.get("transfer-encoding") === "chunked")
+        if (!response.headers.has("content-length") && response.headers.get("transfer-encoding") === "chunked")
           return handleStream(
             streamResponse(response),
-            set2,
+            responseToSetHeaders(response, set2),
             request
           );
         return response;
@@ -398,7 +449,7 @@ const mapEarlyResponse = (response, set2, request) => {
           ) === "chunked")
             return handleStream(
               streamResponse(response),
-              set2,
+              responseToSetHeaders(response, set2),
               request
             );
           return response;
@@ -478,9 +529,11 @@ const mapEarlyResponse = (response, set2, request) => {
           }
         });
       case "Response":
-        if (response.headers.get("transfer-encoding") === "chunked")
+        if (!response.headers.has("content-length") && response.headers.get("transfer-encoding") === "chunked")
           return handleStream(
-            streamResponse(response)
+            streamResponse(response),
+            responseToSetHeaders(response),
+            request
           );
         return response;
       case "Promise":
@@ -581,7 +634,11 @@ const mapCompactResponse = (response, request) => {
       });
     case "Response":
       if (response.headers.get("transfer-encoding") === "chunked")
-        return handleStream(streamResponse(response));
+        return handleStream(
+          streamResponse(response),
+          responseToSetHeaders(response),
+          request
+        );
       return response;
     case "Error":
       return errorToResponse(response);

package/dist/bun/index.d.ts

@@ -5,6 +5,7 @@ import { type Sucrose } from './sucrose';
 import type { WSLocalHook } from './ws/types';
 import type { ElysiaAdapter } from './adapter/types';
 import type { ListenCallback, Serve, Server } from './universal/server';
+import { PromiseGroup } from './utils';
 import { type DynamicHandler } from './dynamic-handle';
 import { ValidationError, type ParseError, type NotFoundError, type InternalServerError, ElysiaCustomStatusResponse } from './error';
 import type { TraceHandler } from './trace';
@@ -104,6 +105,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
     protected getGlobalRoutes(): InternalRoute[];
     protected inference: Sucrose.Inference;
     private getServer;
+    private getParent;
     '~parser': Record<string, BodyHandler<any, any>>;
     private _promisedModules;
     private get promisedModules();
@@ -998,6 +1000,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
         error: Prettify<Definitions['error'] & LazyLoadElysia['_types']['Definitions']['error']>;
         typebox: MergeTypeModule<Definitions['typebox'], LazyLoadElysia['_types']['Definitions']['typebox']>;
     }, Prettify2<Metadata & LazyLoadElysia['_types']['Metadata']>, BasePath extends `` ? Routes & LazyLoadElysia['_routes'] : Routes & CreateEden<BasePath, LazyLoadElysia['_routes']>, Ephemeral, Prettify2<Volatile & LazyLoadElysia['_ephemeral']>>;
+    private propagatePromiseModules;
     private _use;
     macro<const NewMacro extends BaseMacroFn>(macro: (route: MacroManager<MergeSchema<Metadata['schema'], MergeSchema<Ephemeral['schema'], Volatile['schema']>>, Singleton & {
         derive: Partial<Ephemeral['derive'] & Volatile['derive']>;
@@ -1743,7 +1746,7 @@ export default class Elysia<const in out BasePath extends string = '', const in
     /**
      * Wait until all lazy loaded modules all load is fully
      */
-    get modules(): Promise<any[]>;
+    get modules(): PromiseGroup;
 }
 export { Elysia };
 export { t } from './type-system';