@server/next 0.36.0 → 0.36.2

package/index.d.ts

@@ -15,6 +15,38 @@ declare class UploadPipeline {
 }
 declare function upload(bucket?: Bucket | string | null): UploadPipeline;
 
+type CookieOptions = string | string[] | Cookie | Cookie[] | null;
+interface ResponseData {
+    headers: Headers;
+    status?: number;
+}
+declare class Reply$1 {
+    res: ResponseData;
+    constructor();
+    status(status: number): this;
+    type(type?: string): this;
+    download(name?: string): this;
+    headers(key: string | Record<string, string>, value?: string): this;
+    cache(value: CacheOption): this;
+    cookies(key: string | Record<string, CookieOptions>, value?: CookieOptions): this;
+    json(body: unknown): Response;
+    redirect(path: string): Response;
+    file(path: string): Promise<Response>;
+    send(body?: string | Buffer | ReadableStream | any): Response;
+}
+type Params<K extends keyof Reply$1> = Reply$1[K] extends (...args: infer A) => any ? A : never;
+declare const status: (...args: Params<"status">) => Reply$1;
+declare const headers: (...args: Params<"headers">) => Reply$1;
+declare const type: (...args: Params<"type">) => Reply$1;
+declare const cache: (...args: Params<"cache">) => Reply$1;
+declare const download: (...args: Params<"download">) => Reply$1;
+declare const cookies: (...args: Params<"cookies">) => Reply$1;
+declare const send: (...args: Params<"send">) => Response;
+declare const json: (...args: Params<"json">) => Response;
+declare const file: (...args: Params<"file">) => Promise<Response>;
+declare const redirect: (...args: Params<"redirect">) => Response;
+
+type Reply = ReturnType<typeof status>;
 type Method = "get" | "post" | "put" | "patch" | "delete" | "head" | "options" | "socket";
 type ServerConfig<Session = {}, User = {}> = {
     Session?: Session;
@@ -266,7 +298,7 @@ type Context<Params extends Record<string, string | undefined> = Record<string,
     };
     app: Server;
 };
-type InlineReply = Response | {
+type InlineReply = Response | Reply | {
     body: string;
     headers?: Headers;
 } | SerializableValue | JSX.Element | Buffer | ReadableStream;
@@ -337,37 +369,6 @@ declare class Router<O extends ServerConfig = object> {
 }
 declare function router(): Router;
 
-type CookieOptions = string | string[] | Cookie | Cookie[] | null;
-interface ResponseData {
-    headers: Headers;
-    status?: number;
-}
-declare class Reply {
-    res: ResponseData;
-    constructor();
-    status(status: number): this;
-    type(type?: string): this;
-    download(name?: string): this;
-    headers(key: string | Record<string, string>, value?: string): this;
-    cache(value: CacheOption): this;
-    cookies(key: string | Record<string, CookieOptions>, value?: CookieOptions): this;
-    json(body: unknown): Response;
-    redirect(path: string): Response;
-    file(path: string): Promise<Response>;
-    send(body?: string | Buffer | ReadableStream | any): Response;
-}
-type Params<K extends keyof Reply> = Reply[K] extends (...args: infer A) => any ? A : never;
-declare const status: (...args: Params<"status">) => Reply;
-declare const headers: (...args: Params<"headers">) => Reply;
-declare const type: (...args: Params<"type">) => Reply;
-declare const cache: (...args: Params<"cache">) => Reply;
-declare const download: (...args: Params<"download">) => Reply;
-declare const cookies: (...args: Params<"cookies">) => Reply;
-declare const send: (...args: Params<"send">) => Response;
-declare const json: (...args: Params<"json">) => Response;
-declare const file: (...args: Params<"file">) => Promise<Response>;
-declare const redirect: (...args: Params<"redirect">) => Response;
-
 declare class Server<O extends ServerConfig = {}> extends Router<O> {
     settings: Settings;
     platform: Platform;

package/index.js

@@ -1836,6 +1836,9 @@ async function parseResponse(out, ctx) {
   if (typeof out === "function") {
     out = await out(ctx);
   }
+  if (out && typeof out.send === "function" && out.res?.headers instanceof Headers) {
+    out = out.send();
+  }
   if (out instanceof Blob) {
     out = new Response(out, { headers: { "Content-Type": out.type } });
   }
@@ -2064,22 +2067,14 @@ async function hash2(password) {
   });
 }
 
-// src/helpers/iterate.ts
-async function iterate(stream, cb) {
-  const reader = stream.getReader();
-  while (true) {
-    const chunk = await reader.read();
-    if (chunk.done || !chunk.value) return;
-    cb(chunk.value);
-  }
-}
-
 // src/helpers/iteratorAsyncToReadable.ts
 function iteratorAsyncToReadable(asyncGenerator) {
+  let cancelled = false;
   return new ReadableStream({
     async pull(controller) {
       try {
         const { value, done } = await asyncGenerator.next();
+        if (cancelled) return;
         if (done) {
           controller.close();
           return;
@@ -2090,8 +2085,10 @@ function iteratorAsyncToReadable(asyncGenerator) {
         controller.error(err);
       }
     },
-    cancel() {
-      console.log("Stream cancelled");
+    // Return the generator so its `finally {}` runs and releases resources.
+    async cancel(reason) {
+      cancelled = true;
+      await asyncGenerator.return?.(reason);
     }
   });
 }
@@ -2989,7 +2986,14 @@ var Node = async (app) => {
       response.writeHead(out.status || 200, parseHeaders_default(out.headers));
       try {
         if (out.body instanceof ReadableStream) {
-          await iterate(out.body, (chunk) => response.write(chunk));
+          const reader = out.body.getReader();
+          response.on("close", () => reader.cancel().catch(() => {
+          }));
+          while (true) {
+            const { value, done } = await reader.read();
+            if (done) break;
+            response.write(value);
+          }
         } else {
           response.write(out.body || "");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@server/next",
-  "version": "0.36.0",
+  "version": "0.36.2",
   "description": "A fully-fledged web server with routing, file uploads, sessions, static files, schema validation, websockets, testing, etc.",
   "homepage": "https://server-js.com/",
   "repository": "github:franciscop/server-next",