h3 1.2.0 → 1.3.0

package/README.md

@@ -148,6 +148,8 @@ H3 has a concept of composable utilities that accept `event` (from `eventHandler
 - `createError({ statusCode, statusMessage, data? })`
 - `sendProxy(event, { target, headers?, fetchOptions?, fetch?, sendStream? })`
 - `proxyRequest(event, { target, headers?, fetchOptions?, fetch?, sendStream? })`
+- `fetchWithEvent(event, req, init, { fetch? }?)`
+- `getProxyRequestHeaders(event)`
 - `sendNoContent(event, code = 204)`
 - `setResponseStatus(event, status)`
 - `getResponseStatus(event)`

package/dist/index.cjs

@@ -4,8 +4,8 @@ const ufo = require('ufo');
 const radix3 = require('radix3');
 const destr = require('destr');
 const cookieEs = require('cookie-es');
-const ironWebcrypto = require('iron-webcrypto');
 const crypto = require('uncrypto');
+const ironWebcrypto = require('iron-webcrypto');
 
 function useBase(base, handler) {
   base = ufo.withoutTrailingSlash(base);
@@ -395,13 +395,7 @@ async function proxyRequest(event, target, opts = {}) {
   if (PayloadMethods.has(method)) {
     body = await readRawBody(event).catch(() => void 0);
   }
-  const headers = /* @__PURE__ */ Object.create(null);
-  const reqHeaders = getRequestHeaders(event);
-  for (const name in reqHeaders) {
-    if (!ignoredHeaders.has(name)) {
-      headers[name] = reqHeaders[name];
-    }
-  }
+  const headers = getProxyRequestHeaders(event);
   if (opts.fetchOptions?.headers) {
     Object.assign(headers, opts.fetchOptions.headers);
   }
@@ -419,13 +413,7 @@ async function proxyRequest(event, target, opts = {}) {
   });
 }
 async function sendProxy(event, target, opts = {}) {
-  const _fetch = opts.fetch || globalThis.fetch;
-  if (!_fetch) {
-    throw new Error(
-      "fetch is not available. Try importing `node-fetch-native/polyfill` for Node.js."
-    );
-  }
-  const response = await _fetch(target, {
+  const response = await _getFetch(opts.fetch)(target, {
     headers: opts.headers,
     ...opts.fetchOptions
   });
@@ -440,22 +428,49 @@ async function sendProxy(event, target, opts = {}) {
     }
     event.node.res.setHeader(key, value);
   }
-  try {
-    if (response.body) {
-      if (opts.sendStream === false) {
-        const data = new Uint8Array(await response.arrayBuffer());
-        event.node.res.end(data);
-      } else {
-        for await (const chunk of response.body) {
-          event.node.res.write(chunk);
-        }
-        event.node.res.end();
-      }
+  if (response._data !== void 0) {
+    return response._data;
+  }
+  if (opts.sendStream === false) {
+    const data = new Uint8Array(await response.arrayBuffer());
+    return event.node.res.end(data);
+  }
+  for await (const chunk of response.body) {
+    event.node.res.write(chunk);
+  }
+  return event.node.res.end();
+}
+function getProxyRequestHeaders(event) {
+  const headers = /* @__PURE__ */ Object.create(null);
+  const reqHeaders = getRequestHeaders(event);
+  for (const name in reqHeaders) {
+    if (!ignoredHeaders.has(name)) {
+      headers[name] = reqHeaders[name];
     }
-  } catch (error) {
-    event.node.res.end();
-    throw error;
   }
+  return headers;
+}
+function fetchWithEvent(event, req, init, options) {
+  return _getFetch(options?.fetch)(req, {
+    ...init,
+    // @ts-ignore (context is used for unenv and local fetch)
+    context: init.context || event.context,
+    headers: {
+      ...getProxyRequestHeaders(event),
+      ...init?.headers
+    }
+  });
+}
+function _getFetch(_fetch) {
+  if (_fetch) {
+    return _fetch;
+  }
+  if (globalThis.fetch) {
+    return globalThis.fetch;
+  }
+  throw new Error(
+    "fetch is not available. Try importing `node-fetch-native/polyfill` for Node.js."
+  );
 }
 
 const defer = typeof setImmediate !== "undefined" ? setImmediate : (fn) => fn();
@@ -1142,11 +1157,13 @@ exports.defineNodeMiddleware = defineNodeMiddleware;
 exports.deleteCookie = deleteCookie;
 exports.dynamicEventHandler = dynamicEventHandler;
 exports.eventHandler = eventHandler;
+exports.fetchWithEvent = fetchWithEvent;
 exports.fromNodeMiddleware = fromNodeMiddleware;
 exports.getCookie = getCookie;
 exports.getHeader = getHeader;
 exports.getHeaders = getHeaders;
 exports.getMethod = getMethod;
+exports.getProxyRequestHeaders = getProxyRequestHeaders;
 exports.getQuery = getQuery;
 exports.getRequestHeader = getRequestHeader;
 exports.getRequestHeaders = getRequestHeaders;

package/dist/index.d.ts

@@ -1,10 +1,10 @@
-import { SealOptions } from 'iron-webcrypto';
 import { CookieSerializeOptions } from 'cookie-es';
+import { SealOptions } from 'iron-webcrypto';
 import { IncomingMessage, ServerResponse, OutgoingMessage } from 'node:http';
 export { IncomingMessage as NodeIncomingMessage, ServerResponse as NodeServerResponse } from 'node:http';
 import * as ufo from 'ufo';
 
-type SessionDataT = Record<string, string | number | boolean>;
+type SessionDataT = Record<string, any>;
 type SessionData<T extends SessionDataT = SessionDataT> = T;
 interface Session<T extends SessionDataT = SessionDataT> {
     id: string;
@@ -292,8 +292,12 @@ interface ProxyOptions {
     fetch?: typeof fetch;
     sendStream?: boolean;
 }
-declare function proxyRequest(event: H3Event, target: string, opts?: ProxyOptions): Promise<void>;
-declare function sendProxy(event: H3Event, target: string, opts?: ProxyOptions): Promise<void>;
+declare function proxyRequest(event: H3Event, target: string, opts?: ProxyOptions): Promise<any>;
+declare function sendProxy(event: H3Event, target: string, opts?: ProxyOptions): Promise<any>;
+declare function getProxyRequestHeaders(event: H3Event): any;
+declare function fetchWithEvent(event: H3Event, req: RequestInfo | URL, init?: RequestInit, options?: {
+    fetch: typeof fetch;
+}): Promise<Response>;
 
 declare function getQuery(event: H3Event): ufo.QueryObject;
 declare function getRouterParams(event: H3Event): H3Event["context"];
@@ -349,4 +353,4 @@ interface CreateRouterOptions {
 }
 declare function createRouter(opts?: CreateRouterOptions): Router;
 
-export { AddRouteShortcuts, App, AppOptions, AppUse, CacheConditions, CreateRouterOptions, DynamicEventHandler, Encoding, EventHandler, EventHandlerResponse, H3Error, H3Event, H3EventContext, H3Headers, H3Response, HTTPMethod, InputLayer, InputStack, Layer, LazyEventHandler, MIMES, Matcher, NodeEventContext, NodeListener, NodeMiddleware, NodePromisifiedHandler, ProxyOptions, RequestHeaders, Router, RouterMethod, RouterUse, Session, SessionConfig, SessionData, Stack, appendHeader, appendHeaders, appendResponseHeader, appendResponseHeaders, assertMethod, callNodeListener, clearSession, createApp, createAppEventHandler, createError, createEvent, createRouter, defaultContentType, defineEventHandler, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, deleteCookie, dynamicEventHandler, eventHandler, fromNodeMiddleware, getCookie, getHeader, getHeaders, getMethod, getQuery, getRequestHeader, getRequestHeaders, getResponseHeader, getResponseHeaders, getResponseStatus, getResponseStatusText, getRouterParam, getRouterParams, getSession, handleCacheHeaders, isError, isEvent, isEventHandler, isMethod, isStream, lazyEventHandler, parseCookies, promisifyNodeListener, proxyRequest, readBody, readMultipartFormData, readRawBody, send, sendError, sendNoContent, sendProxy, sendRedirect, sendStream, setCookie, setHeader, setHeaders, setResponseHeader, setResponseHeaders, setResponseStatus, toEventHandler, toNodeListener, updateSession, use, useBase, useSession, writeEarlyHints };
+export { AddRouteShortcuts, App, AppOptions, AppUse, CacheConditions, CreateRouterOptions, DynamicEventHandler, Encoding, EventHandler, EventHandlerResponse, H3Error, H3Event, H3EventContext, H3Headers, H3Response, HTTPMethod, InputLayer, InputStack, Layer, LazyEventHandler, MIMES, Matcher, NodeEventContext, NodeListener, NodeMiddleware, NodePromisifiedHandler, ProxyOptions, RequestHeaders, Router, RouterMethod, RouterUse, Session, SessionConfig, SessionData, Stack, appendHeader, appendHeaders, appendResponseHeader, appendResponseHeaders, assertMethod, callNodeListener, clearSession, createApp, createAppEventHandler, createError, createEvent, createRouter, defaultContentType, defineEventHandler, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, deleteCookie, dynamicEventHandler, eventHandler, fetchWithEvent, fromNodeMiddleware, getCookie, getHeader, getHeaders, getMethod, getProxyRequestHeaders, getQuery, getRequestHeader, getRequestHeaders, getResponseHeader, getResponseHeaders, getResponseStatus, getResponseStatusText, getRouterParam, getRouterParams, getSession, handleCacheHeaders, isError, isEvent, isEventHandler, isMethod, isStream, lazyEventHandler, parseCookies, promisifyNodeListener, proxyRequest, readBody, readMultipartFormData, readRawBody, send, sendError, sendNoContent, sendProxy, sendRedirect, sendStream, setCookie, setHeader, setHeaders, setResponseHeader, setResponseHeaders, setResponseStatus, toEventHandler, toNodeListener, updateSession, use, useBase, useSession, writeEarlyHints };

package/dist/index.mjs

@@ -2,8 +2,8 @@ import { withoutTrailingSlash, withoutBase, getQuery as getQuery$1 } from 'ufo';
 import { createRouter as createRouter$1 } from 'radix3';
 import destr from 'destr';
 import { parse as parse$1, serialize } from 'cookie-es';
-import { unseal, defaults, seal } from 'iron-webcrypto';
 import crypto from 'uncrypto';
+import { unseal, defaults, seal } from 'iron-webcrypto';
 
 function useBase(base, handler) {
   base = withoutTrailingSlash(base);
@@ -393,13 +393,7 @@ async function proxyRequest(event, target, opts = {}) {
   if (PayloadMethods.has(method)) {
     body = await readRawBody(event).catch(() => void 0);
   }
-  const headers = /* @__PURE__ */ Object.create(null);
-  const reqHeaders = getRequestHeaders(event);
-  for (const name in reqHeaders) {
-    if (!ignoredHeaders.has(name)) {
-      headers[name] = reqHeaders[name];
-    }
-  }
+  const headers = getProxyRequestHeaders(event);
   if (opts.fetchOptions?.headers) {
     Object.assign(headers, opts.fetchOptions.headers);
   }
@@ -417,13 +411,7 @@ async function proxyRequest(event, target, opts = {}) {
   });
 }
 async function sendProxy(event, target, opts = {}) {
-  const _fetch = opts.fetch || globalThis.fetch;
-  if (!_fetch) {
-    throw new Error(
-      "fetch is not available. Try importing `node-fetch-native/polyfill` for Node.js."
-    );
-  }
-  const response = await _fetch(target, {
+  const response = await _getFetch(opts.fetch)(target, {
     headers: opts.headers,
     ...opts.fetchOptions
   });
@@ -438,22 +426,49 @@ async function sendProxy(event, target, opts = {}) {
     }
     event.node.res.setHeader(key, value);
   }
-  try {
-    if (response.body) {
-      if (opts.sendStream === false) {
-        const data = new Uint8Array(await response.arrayBuffer());
-        event.node.res.end(data);
-      } else {
-        for await (const chunk of response.body) {
-          event.node.res.write(chunk);
-        }
-        event.node.res.end();
-      }
+  if (response._data !== void 0) {
+    return response._data;
+  }
+  if (opts.sendStream === false) {
+    const data = new Uint8Array(await response.arrayBuffer());
+    return event.node.res.end(data);
+  }
+  for await (const chunk of response.body) {
+    event.node.res.write(chunk);
+  }
+  return event.node.res.end();
+}
+function getProxyRequestHeaders(event) {
+  const headers = /* @__PURE__ */ Object.create(null);
+  const reqHeaders = getRequestHeaders(event);
+  for (const name in reqHeaders) {
+    if (!ignoredHeaders.has(name)) {
+      headers[name] = reqHeaders[name];
     }
-  } catch (error) {
-    event.node.res.end();
-    throw error;
   }
+  return headers;
+}
+function fetchWithEvent(event, req, init, options) {
+  return _getFetch(options?.fetch)(req, {
+    ...init,
+    // @ts-ignore (context is used for unenv and local fetch)
+    context: init.context || event.context,
+    headers: {
+      ...getProxyRequestHeaders(event),
+      ...init?.headers
+    }
+  });
+}
+function _getFetch(_fetch) {
+  if (_fetch) {
+    return _fetch;
+  }
+  if (globalThis.fetch) {
+    return globalThis.fetch;
+  }
+  throw new Error(
+    "fetch is not available. Try importing `node-fetch-native/polyfill` for Node.js."
+  );
 }
 
 const defer = typeof setImmediate !== "undefined" ? setImmediate : (fn) => fn();
@@ -1115,4 +1130,4 @@ function createRouter(opts = {}) {
   return router;
 }
 
-export { H3Error, H3Event, H3Headers, H3Response, MIMES, appendHeader, appendHeaders, appendResponseHeader, appendResponseHeaders, assertMethod, callNodeListener, clearSession, createApp, createAppEventHandler, createError, createEvent, createRouter, defaultContentType, defineEventHandler, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, deleteCookie, dynamicEventHandler, eventHandler, fromNodeMiddleware, getCookie, getHeader, getHeaders, getMethod, getQuery, getRequestHeader, getRequestHeaders, getResponseHeader, getResponseHeaders, getResponseStatus, getResponseStatusText, getRouterParam, getRouterParams, getSession, handleCacheHeaders, isError, isEvent, isEventHandler, isMethod, isStream, lazyEventHandler, parseCookies, promisifyNodeListener, proxyRequest, readBody, readMultipartFormData, readRawBody, send, sendError, sendNoContent, sendProxy, sendRedirect, sendStream, setCookie, setHeader, setHeaders, setResponseHeader, setResponseHeaders, setResponseStatus, toEventHandler, toNodeListener, updateSession, use, useBase, useSession, writeEarlyHints };
+export { H3Error, H3Event, H3Headers, H3Response, MIMES, appendHeader, appendHeaders, appendResponseHeader, appendResponseHeaders, assertMethod, callNodeListener, clearSession, createApp, createAppEventHandler, createError, createEvent, createRouter, defaultContentType, defineEventHandler, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, deleteCookie, dynamicEventHandler, eventHandler, fetchWithEvent, fromNodeMiddleware, getCookie, getHeader, getHeaders, getMethod, getProxyRequestHeaders, getQuery, getRequestHeader, getRequestHeaders, getResponseHeader, getResponseHeaders, getResponseStatus, getResponseStatusText, getRouterParam, getRouterParams, getSession, handleCacheHeaders, isError, isEvent, isEventHandler, isMethod, isStream, lazyEventHandler, parseCookies, promisifyNodeListener, proxyRequest, readBody, readMultipartFormData, readRawBody, send, sendError, sendNoContent, sendProxy, sendRedirect, sendStream, setCookie, setHeader, setHeaders, setResponseHeader, setResponseHeaders, setResponseStatus, toEventHandler, toNodeListener, updateSession, use, useBase, useSession, writeEarlyHints };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h3",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Tiny JavaScript Server",
   "repository": "unjs/h3",
   "license": "MIT",
@@ -22,17 +22,17 @@
   "dependencies": {
     "cookie-es": "^0.5.0",
     "destr": "^1.2.2",
-    "iron-webcrypto": "^0.2.7",
+    "iron-webcrypto": "^0.4.0",
     "radix3": "^1.0.0",
     "ufo": "^1.0.1",
     "uncrypto": "^0.1.2"
   },
   "devDependencies": {
     "0x": "^5.4.1",
-    "@types/express": "^4.17.16",
-    "@types/node": "^18.11.18",
+    "@types/express": "^4.17.17",
+    "@types/node": "^18.13.0",
     "@types/supertest": "^2.0.12",
-    "@vitest/coverage-c8": "^0.28.3",
+    "@vitest/coverage-c8": "^0.28.4",
     "autocannon": "^7.10.0",
     "changelogen": "^0.4.1",
     "connect": "^3.7.0",
@@ -43,11 +43,11 @@
     "jiti": "^1.16.2",
     "listhen": "^1.0.2",
     "node-fetch-native": "^1.0.1",
-    "prettier": "^2.8.3",
+    "prettier": "^2.8.4",
     "supertest": "^6.3.3",
     "typescript": "^4.9.5",
     "unbuild": "^1.1.1",
-    "vitest": "^0.28.3"
+    "vitest": "^0.28.4"
   },
   "packageManager": "pnpm@7.26.3",
   "scripts": {