feat(http): allow custom response code (#855)

denoland · May 11, 2021 · 1b4eff0 · 1b4eff0
1 parent b850d01
commit 1b4eff0
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/http/_io.ts b/http/_io.ts
@@ -237,10 +237,12 @@ export async function writeResponse(
   const protoMajor = 1;
   const protoMinor = 1;
   const statusCode = r.status || 200;
-  const statusText = STATUS_TEXT.get(statusCode);
+  const statusText = r.statusText ?? STATUS_TEXT.get(statusCode) ?? null;
   const writer = BufWriter.create(w);
-  if (!statusText) {
-    throw new Deno.errors.InvalidData("Bad status code");
+  if (statusText === null) {
+    throw new Deno.errors.InvalidData(
+      "Empty statusText (explicitely pass an empty string if this was intentional)",
+    );
   }
   if (!r.body) {
     r.body = new Uint8Array();

diff --git a/http/server.ts b/http/server.ts
@@ -391,6 +391,7 @@ export async function listenAndServeTLS(
  */
 export interface Response {
   status?: number;
+  statusText?: string;
   headers?: Headers;
   body?: Uint8Array | Deno.Reader | string;
   trailers?: () => Promise<Headers> | Headers;

diff --git a/http/server_test.ts b/http/server_test.ts
@@ -49,6 +49,20 @@ const responseTests: ResponseTest[] = [
     },
     raw: "HTTP/1.1 404 Not Found\r\n" + "content-length: 0" + "\r\n\r\n",
   },
+  {
+    response: {
+      status: 893,
+      statusText: "Custom error",
+    },
+    raw: "HTTP/1.1 893 Custom error\r\n" + "content-length: 0" + "\r\n\r\n",
+  },
+  {
+    response: {
+      status: 893,
+      statusText: "",
+    },
+    raw: "HTTP/1.1 893 \r\n" + "content-length: 0" + "\r\n\r\n",
+  },
   // HTTP/1.1, chunked coding; empty trailer; close
   {
     response: {
@@ -518,12 +532,16 @@ Deno.test({
     const serverRoutine = async () => {
       const server = serve(":8124");
       for await (const req of server) {
-        await assertThrowsAsync(async () => {
-          await req.respond({
-            status: 12345,
-            body: new TextEncoder().encode("Hello World"),
-          });
-        }, Deno.errors.InvalidData);
+        await assertThrowsAsync(
+          async () => {
+            await req.respond({
+              status: 12345,
+              body: new TextEncoder().encode("Hello World"),
+            });
+          },
+          Deno.errors.InvalidData,
+          "Empty statusText",
+        );
         // The connection should be destroyed
         assert(!(req.conn.rid in Deno.resources()));
         server.close();