h3 0.3.4 → 0.3.8

package/dist/index.cjs

@@ -195,26 +195,61 @@ function destr(val) {
   }
 }
 
+function useQuery(req) {
+  return getQuery(req.url || "");
+}
+function useMethod(req, defaultMethod = "GET") {
+  return (req.method || defaultMethod).toUpperCase();
+}
+function isMethod(req, expected, allowHead) {
+  const method = useMethod(req);
+  if (allowHead && method === "HEAD") {
+    return true;
+  }
+  if (typeof expected === "string") {
+    if (method === expected) {
+      return true;
+    }
+  } else if (expected.includes(method)) {
+    return true;
+  }
+  return false;
+}
+function assertMethod(req, expected, allowHead) {
+  if (!isMethod(req, expected, allowHead)) {
+    throw createError({
+      statusCode: 405,
+      statusMessage: "HTTP method is not allowed."
+    });
+  }
+}
+
 const RawBodySymbol = Symbol("h3RawBody");
 const ParsedBodySymbol = Symbol("h3RawBody");
+const PayloadMethods = ["PATCH", "POST", "PUT", "DELETE"];
 function useRawBody(req, encoding = "utf-8") {
-  if (req[RawBodySymbol]) {
-    return Promise.resolve(encoding ? req[RawBodySymbol].toString(encoding) : req[RawBodySymbol]);
+  assertMethod(req, PayloadMethods);
+  if (RawBodySymbol in req) {
+    const promise2 = Promise.resolve(req[RawBodySymbol]);
+    return encoding ? promise2.then((buff) => buff.toString(encoding)) : promise2;
   }
-  return new Promise((resolve, reject) => {
+  if ("body" in req) {
+    return Promise.resolve(req.body);
+  }
+  const promise = req[RawBodySymbol] = new Promise((resolve, reject) => {
     const bodyData = [];
     req.on("error", (err) => {
       reject(err);
     }).on("data", (chunk) => {
       bodyData.push(chunk);
     }).on("end", () => {
-      req[RawBodySymbol] = Buffer.concat(bodyData);
-      resolve(encoding ? req[RawBodySymbol].toString(encoding) : req[RawBodySymbol]);
+      resolve(Buffer.concat(bodyData));
     });
   });
+  return encoding ? promise.then((buff) => buff.toString(encoding)) : promise;
 }
 async function useBody(req) {
-  if (req[ParsedBodySymbol]) {
+  if (ParsedBodySymbol in req) {
     return req[ParsedBodySymbol];
   }
   const body = await useRawBody(req);
@@ -470,35 +505,6 @@ function setCookie(res, name, value, serializeOptions) {
   appendHeader(res, "Set-Cookie", cookieStr);
 }
 
-function useQuery(req) {
-  return getQuery(req.url || "");
-}
-function useMethod(req, defaultMethod = "GET") {
-  return (req.method || defaultMethod).toUpperCase();
-}
-function isMethod(req, expected, allowHead) {
-  const method = useMethod(req);
-  if (allowHead && method === "HEAD") {
-    return true;
-  }
-  if (typeof expected === "string") {
-    if (method === expected) {
-      return true;
-    }
-  } else if (expected.includes(method)) {
-    return true;
-  }
-  return false;
-}
-function assertMethod(req, expected, allowHead) {
-  if (!isMethod(req, expected, allowHead)) {
-    throw createError({
-      statusCode: 405,
-      statusMessage: "HTTP method is not allowed."
-    });
-  }
-}
-
 class H3Error extends Error {
   constructor() {
     super(...arguments);

package/dist/index.d.ts

@@ -84,6 +84,12 @@ declare function createError(input: Partial<H3Error>): H3Error;
  */
 declare function sendError(res: ServerResponse, error: Error | H3Error, debug?: boolean): void;
 
+declare const RawBodySymbol: unique symbol;
+interface _IncomingMessage extends IncomingMessage {
+    [RawBodySymbol]?: Promise<Buffer>;
+    ParsedBodySymbol?: any;
+    body?: any;
+}
 /**
  * Reads body of the request and returns encoded raw string (default) or `Buffer` if encoding if falsy.
  * @param req {IncomingMessage} An IncomingMessage object is created by [http.Server](https://nodejs.org/api/http.html#http_class_http_server)
@@ -91,7 +97,7 @@ declare function sendError(res: ServerResponse, error: Error | H3Error, debug?:
  *
  * @return {String|Buffer} Encoded raw string or raw Buffer of the body
  */
-declare function useRawBody(req: IncomingMessage, encoding?: Encoding): Encoding extends false ? Buffer : Promise<string>;
+declare function useRawBody(req: _IncomingMessage, encoding?: Encoding): Encoding extends false ? Buffer : Promise<string>;
 /**
  * Reads request body and try to safely parse using [destr](https://github.com/unjs/destr)
  * @param req {IncomingMessage} An IncomingMessage object created by [http.Server](https://nodejs.org/api/http.html#http_class_http_server)
@@ -103,7 +109,7 @@ declare function useRawBody(req: IncomingMessage, encoding?: Encoding): Encoding
  * const body = await useBody(req)
  * ```
  */
-declare function useBody<T = any>(req: IncomingMessage): Promise<T>;
+declare function useBody<T = any>(req: _IncomingMessage): Promise<T>;
 
 declare const MIMES: {
     html: string;

package/dist/index.mjs

@@ -191,26 +191,61 @@ function destr(val) {
   }
 }
 
+function useQuery(req) {
+  return getQuery(req.url || "");
+}
+function useMethod(req, defaultMethod = "GET") {
+  return (req.method || defaultMethod).toUpperCase();
+}
+function isMethod(req, expected, allowHead) {
+  const method = useMethod(req);
+  if (allowHead && method === "HEAD") {
+    return true;
+  }
+  if (typeof expected === "string") {
+    if (method === expected) {
+      return true;
+    }
+  } else if (expected.includes(method)) {
+    return true;
+  }
+  return false;
+}
+function assertMethod(req, expected, allowHead) {
+  if (!isMethod(req, expected, allowHead)) {
+    throw createError({
+      statusCode: 405,
+      statusMessage: "HTTP method is not allowed."
+    });
+  }
+}
+
 const RawBodySymbol = Symbol("h3RawBody");
 const ParsedBodySymbol = Symbol("h3RawBody");
+const PayloadMethods = ["PATCH", "POST", "PUT", "DELETE"];
 function useRawBody(req, encoding = "utf-8") {
-  if (req[RawBodySymbol]) {
-    return Promise.resolve(encoding ? req[RawBodySymbol].toString(encoding) : req[RawBodySymbol]);
+  assertMethod(req, PayloadMethods);
+  if (RawBodySymbol in req) {
+    const promise2 = Promise.resolve(req[RawBodySymbol]);
+    return encoding ? promise2.then((buff) => buff.toString(encoding)) : promise2;
   }
-  return new Promise((resolve, reject) => {
+  if ("body" in req) {
+    return Promise.resolve(req.body);
+  }
+  const promise = req[RawBodySymbol] = new Promise((resolve, reject) => {
     const bodyData = [];
     req.on("error", (err) => {
       reject(err);
     }).on("data", (chunk) => {
       bodyData.push(chunk);
     }).on("end", () => {
-      req[RawBodySymbol] = Buffer.concat(bodyData);
-      resolve(encoding ? req[RawBodySymbol].toString(encoding) : req[RawBodySymbol]);
+      resolve(Buffer.concat(bodyData));
     });
   });
+  return encoding ? promise.then((buff) => buff.toString(encoding)) : promise;
 }
 async function useBody(req) {
-  if (req[ParsedBodySymbol]) {
+  if (ParsedBodySymbol in req) {
     return req[ParsedBodySymbol];
   }
   const body = await useRawBody(req);
@@ -466,35 +501,6 @@ function setCookie(res, name, value, serializeOptions) {
   appendHeader(res, "Set-Cookie", cookieStr);
 }
 
-function useQuery(req) {
-  return getQuery(req.url || "");
-}
-function useMethod(req, defaultMethod = "GET") {
-  return (req.method || defaultMethod).toUpperCase();
-}
-function isMethod(req, expected, allowHead) {
-  const method = useMethod(req);
-  if (allowHead && method === "HEAD") {
-    return true;
-  }
-  if (typeof expected === "string") {
-    if (method === expected) {
-      return true;
-    }
-  } else if (expected.includes(method)) {
-    return true;
-  }
-  return false;
-}
-function assertMethod(req, expected, allowHead) {
-  if (!isMethod(req, expected, allowHead)) {
-    throw createError({
-      statusCode: 405,
-      statusMessage: "HTTP method is not allowed."
-    });
-  }
-}
-
 class H3Error extends Error {
   constructor() {
     super(...arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h3",
-  "version": "0.3.4",
+  "version": "0.3.8",
   "description": "Tiny JavaScript Server",
   "repository": "unjs/h3",
   "license": "MIT",