h3 0.8.1 → 0.8.3

package/dist/index.cjs

@@ -155,6 +155,9 @@ function readRawBody(event, encoding = "utf-8") {
   if ("body" in event.req) {
     return Promise.resolve(event.req.body);
   }
+  if (!parseInt(event.req.headers["content-length"] || "")) {
+    return Promise.resolve(void 0);
+  }
   const promise = event.req[RawBodySymbol] = new Promise((resolve, reject) => {
     const bodyData = [];
     event.req.on("error", (err) => {
@@ -284,21 +287,43 @@ function sendStream(event, data) {
     data.on("error", (error) => reject(createError(error)));
   });
 }
-function writeEarlyHints(event, links, callback) {
+const noop = () => {
+};
+function writeEarlyHints(event, hints, cb = noop) {
   if (!event.res.socket && !("writeEarlyHints" in event.res)) {
-    if (callback) {
-      callback();
-    }
+    cb();
     return;
   }
+  if (typeof hints === "string" || Array.isArray(hints)) {
+    hints = { link: hints };
+  }
+  if (hints.link) {
+    hints.link = Array.isArray(hints.link) ? hints.link : hints.link.split(",");
+    hints.link = hints.link.map((l) => l.trim().replace(/; crossorigin/g, ""));
+  }
   if ("writeEarlyHints" in event.res) {
-    return event.res.writeEarlyHints(links, callback);
+    return event.res.writeEarlyHints(hints, cb);
+  }
+  const headers = Object.entries(hints).map((e) => [e[0].toLowerCase(), e[1]]);
+  if (!headers.length) {
+    cb();
+    return;
+  }
+  let hint = "HTTP/1.1 103 Early Hints";
+  if (hints.link) {
+    hint += `\r
+Link: ${hints.link.join(", ")}`;
+  }
+  for (const [header, value] of headers) {
+    if (header === "link") {
+      continue;
+    }
+    hint += `\r
+${header}: ${value}`;
   }
-  const _links = Array.isArray(links) ? links : [links];
-  event.res.socket.write(`HTTP/1.1 103 Early Hints\r
-Link: ${_links.join("\r\n")}\r
+  event.res.socket.write(`${hint}\r
 \r
-`, "utf-8", callback);
+`, "utf-8", cb);
 }
 
 function parseCookies(event) {

package/dist/index.d.ts

@@ -16,7 +16,7 @@ declare type LazyEventHandler = () => EventHandler | Promise<EventHandler>;
 
 declare type NodeListener = (req: IncomingMessage, res: ServerResponse) => void;
 declare type NodePromisifiedHandler = (req: IncomingMessage, res: ServerResponse) => Promise<any>;
-declare type NodeMiddleware = (req: IncomingMessage, res: ServerResponse, next?: (err?: Error) => any) => any;
+declare type NodeMiddleware = (req: IncomingMessage, res: ServerResponse, next: (err?: Error) => any) => any;
 declare const defineNodeListener: (handler: NodeListener) => NodeListener;
 declare const defineNodeMiddleware: (middleware: NodeMiddleware) => NodeMiddleware;
 declare function fromNodeMiddleware(handler: NodeListener | NodeMiddleware): EventHandler;
@@ -159,7 +159,7 @@ declare function useBase(base: string, handler: EventHandler): EventHandler;
  *
  * @return {String|Buffer} Encoded raw string or raw Buffer of the body
  */
-declare function readRawBody(event: H3Event, encoding?: Encoding): Encoding extends false ? Buffer : Promise<string | Buffer>;
+declare function readRawBody(event: H3Event, encoding?: Encoding): Encoding extends false ? Buffer : Promise<string | Buffer | undefined>;
 /** @deprecated Use `h3.readRawBody` */
 declare const useRawBody: typeof readRawBody;
 /**
@@ -270,7 +270,7 @@ declare function appendResponseHeader(event: H3Event, name: string, value: strin
 declare const appendHeader: typeof appendResponseHeader;
 declare function isStream(data: any): any;
 declare function sendStream(event: H3Event, data: any): Promise<void>;
-declare function writeEarlyHints(event: H3Event, links: string | string[], callback?: () => void): void;
+declare function writeEarlyHints(event: H3Event, hints: string | string[] | Record<string, string | string[]>, cb?: () => void): void;
 
 declare type RouterMethod = Lowercase<HTTPMethod>;
 declare type RouterUse = (path: string, handler: EventHandler, method?: RouterMethod | RouterMethod[]) => Router;

package/dist/index.mjs

@@ -153,6 +153,9 @@ function readRawBody(event, encoding = "utf-8") {
   if ("body" in event.req) {
     return Promise.resolve(event.req.body);
   }
+  if (!parseInt(event.req.headers["content-length"] || "")) {
+    return Promise.resolve(void 0);
+  }
   const promise = event.req[RawBodySymbol] = new Promise((resolve, reject) => {
     const bodyData = [];
     event.req.on("error", (err) => {
@@ -282,21 +285,43 @@ function sendStream(event, data) {
     data.on("error", (error) => reject(createError(error)));
   });
 }
-function writeEarlyHints(event, links, callback) {
+const noop = () => {
+};
+function writeEarlyHints(event, hints, cb = noop) {
   if (!event.res.socket && !("writeEarlyHints" in event.res)) {
-    if (callback) {
-      callback();
-    }
+    cb();
     return;
   }
+  if (typeof hints === "string" || Array.isArray(hints)) {
+    hints = { link: hints };
+  }
+  if (hints.link) {
+    hints.link = Array.isArray(hints.link) ? hints.link : hints.link.split(",");
+    hints.link = hints.link.map((l) => l.trim().replace(/; crossorigin/g, ""));
+  }
   if ("writeEarlyHints" in event.res) {
-    return event.res.writeEarlyHints(links, callback);
+    return event.res.writeEarlyHints(hints, cb);
+  }
+  const headers = Object.entries(hints).map((e) => [e[0].toLowerCase(), e[1]]);
+  if (!headers.length) {
+    cb();
+    return;
+  }
+  let hint = "HTTP/1.1 103 Early Hints";
+  if (hints.link) {
+    hint += `\r
+Link: ${hints.link.join(", ")}`;
+  }
+  for (const [header, value] of headers) {
+    if (header === "link") {
+      continue;
+    }
+    hint += `\r
+${header}: ${value}`;
   }
-  const _links = Array.isArray(links) ? links : [links];
-  event.res.socket.write(`HTTP/1.1 103 Early Hints\r
-Link: ${_links.join("\r\n")}\r
+  event.res.socket.write(`${hint}\r
 \r
-`, "utf-8", callback);
+`, "utf-8", cb);
 }
 
 function parseCookies(event) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h3",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "Tiny JavaScript Server",
   "repository": "unjs/h3",
   "license": "MIT",
@@ -23,7 +23,7 @@
     "cookie-es": "^0.5.0",
     "destr": "^1.1.1",
     "radix3": "^0.2.1",
-    "ufo": "^0.8.5"
+    "ufo": "^0.8.6"
   },
   "devDependencies": {
     "0x": "^5.4.1",
@@ -33,7 +33,7 @@
     "@types/supertest": "^2.0.12",
     "@vitest/coverage-c8": "^0.24.3",
     "autocannon": "^7.10.0",
-    "changelogen": "^0.3.2",
+    "changelogen": "^0.3.5",
     "connect": "^3.7.0",
     "eslint": "^8.25.0",
     "express": "^4.18.2",
@@ -42,10 +42,10 @@
     "listhen": "^0.3.4",
     "supertest": "^6.3.0",
     "typescript": "^4.8.4",
-    "unbuild": "^0.9.2",
+    "unbuild": "^0.9.4",
     "vitest": "^0.24.3"
   },
-  "packageManager": "pnpm@7.13.4",
+  "packageManager": "pnpm@7.13.5",
   "scripts": {
     "build": "unbuild",
     "dev": "vitest",