@whatwg-node/server 0.6.0-alpha-20230120130300-bc9d705 → 0.6.0

package/README.md

@@ -1,8 +1,10 @@
 # WHATWG Node Generic Server Adapter
 
-`@whatwg-node/server` helps you to create a generic server implementation by using WHATWG Fetch API for Node.js, AWS Lambda, Cloudflare Workers, Deno, Express, Fastify, Koa, Next.js and Sveltekit.
+`@whatwg-node/server` helps you to create a generic server implementation by using WHATWG Fetch API
+for Node.js, AWS Lambda, Cloudflare Workers, Deno, Express, Fastify, Koa, Next.js and Sveltekit.
 
-Once you create an adapter with `createServerAdapter`, you don't need to install any other platform specific package since the generic adapter will handle it automatically.
+Once you create an adapter with `createServerAdapter`, you don't need to install any other platform
+specific package since the generic adapter will handle it automatically.
 
 ## How to start
 
@@ -26,8 +28,8 @@ You can use your server adapter with the following integrations:
 [Node.js](https://nodejs.org/api/http.html) is the most popular server side JavaScript runtime.
 
 ```ts
-import myServerAdapter from './myServerAdapter'
 import { createServer } from 'http'
+import myServerAdapter from './myServerAdapter'
 
 // You can create your Node server instance by using our adapter
 const nodeServer = createServer(myServerAdapter)
@@ -37,21 +39,71 @@ nodeServer.listen(4000)
 
 ### AWS Lambda
 
-AWS Lambda is a serverless computing platform that makes it easy to build applications that run on the AWS cloud. Our adaoter is platform agnostic so they can fit together easily. In order to reduce the boilerplate we prefer to use [Serverless Express from Vendia](https://github.com/vendia/serverless-express).
+AWS Lambda is a serverless computing platform that makes it easy to build applications that run on
+the AWS cloud. Our adaoter is platform agnostic so they can fit together easily. In order to reduce
+the boilerplate we prefer to use
+[Serverless Express from Vendia](https://github.com/vendia/serverless-express).
 
 ```ts
-import myServerAdapter from './myServerAdapter'
+import { APIGatewayEvent, APIGatewayProxyResult, Context } from 'aws-lambda'
 import type { Handler } from '@aws-cdk/aws-lambda'
-import { configure } from '@vendia/serverless-express'
+import myServerAdapter from './myServerAdapter'
 
-export const handler: Handler = configure({
-  app: myServerAdapter
-})
+interface ServerContext {
+  event: APIGatewayEvent
+  lambdaContext: Context
+}
+
+export async function handler(
+  event: APIGatewayEvent,
+  lambdaContext: Context
+): Promise<APIGatewayProxyResult> {
+  const url = new URL(event.path, 'http://localhost')
+  if (event.queryStringParameters != null) {
+    for (const name in event.queryStringParameters) {
+      const value = event.queryStringParameters[name]
+      if (value != null) {
+        url.searchParams.set(name, value)
+      }
+    }
+  }
+
+  const response = await myServerAdapter.fetch(
+    url,
+    {
+      // For v1.0 you should use event.httpMethod
+      method: event.requestContext.http.method,
+      headers: event.headers as HeadersInit,
+      body: event.body
+        ? Buffer.from(event.body, event.isBase64Encoded ? 'base64' : 'utf8')
+        : undefined
+    },
+    {
+      event,
+      lambdaContext
+    }
+  )
+
+  const responseHeaders: Record<string, string> = {}
+
+  response.headers.forEach((value, name) => {
+    responseHeaders[name] = value
+  })
+
+  return {
+    statusCode: response.status,
+    headers: responseHeaders,
+    body: await response.text(),
+    isBase64Encoded: false
+  }
+}
 ```
 
 ### Cloudflare Workers
 
-Cloudflare Workers provides a serverless execution environment that allows you to create entirely new applications or augment existing ones without configuring or maintaining infrastructure. It uses Fetch API already so we can use our adapter as an event listener like below;
+Cloudflare Workers provides a serverless execution environment that allows you to create entirely
+new applications or augment existing ones without configuring or maintaining infrastructure. It uses
+Fetch API already so we can use our adapter as an event listener like below;
 
 ```ts
 import myServerAdapter from './myServerAdapter'
@@ -65,18 +117,20 @@ self.addEventListener('fetch', myServerAdapter)
 You can use our adapter as a Deno request handler like below;
 
 ```ts
-import { serve } from 'https://deno.land/std@0.117.0/http/server.ts'
+import { serve } from 'https://deno.land/std@0.157.0/http/server.ts'
 import myServerAdapter from './myServerAdapter'
 
 serve(myServerAdapter, {
-  // Listen any port you want
-  addr: ':4000'
+  onListen({ hostname, port }) {
+    console.log(`Listening on http://${hostname}:${port}/graphql`)
+  }
 })
 ```
 
 ### Express
 
-[Express is the most popular web framework for Node.js.](https://expressjs.com/) It is a minimalist framework that provides a robust set of features to handle HTTP on Node.js applications.
+[Express is the most popular web framework for Node.js.](https://expressjs.com/) It is a minimalist
+framework that provides a robust set of features to handle HTTP on Node.js applications.
 
 You can easily integrate your adapter into your Express application with a few lines of code.
 
@@ -96,14 +150,15 @@ app.listen(4000, () => {
 
 ### Fastify
 
-[Fastify is one of the popular HTTP server frameworks for Node.js.](https://www.fastify.io/). You can use your adapter easily with Fastify.
+[Fastify is one of the popular HTTP server frameworks for Node.js.](https://www.fastify.io/). You
+can use your adapter easily with Fastify.
 
 So you can benefit from the powerful plugins of Fastify ecosystem.
 [See the ecosystem](https://www.fastify.io/docs/latest/Guides/Ecosystem/)
 
 ```ts
+import fastify, { FastifyReply, FastifyRequest } from 'fastify'
 import myServerAdapter from './myServerAdapter'
-import fastify, { FastifyRequest, FastifyReply } from 'fastify'
 
 // This is the fastify instance you have created
 const app = fastify({ logger: true })
@@ -127,7 +182,8 @@ app.route({
 
     reply.status(response.status)
 
-    reply.send(Readable.from(response.body))
+    // Fastify doesn't accept `null` as a response body
+    reply.send(response.body || undefined)
 
     return reply
   }
@@ -138,7 +194,9 @@ app.listen(4000)
 
 ### Koa
 
-[Koa is another Node.js server framework designed by the team behind Express, which aims to be a smaller, more expressive.](https://koajs.com/) You can add your adapter to your Koa application with a few lines of code then [benefit middlewares written for Koa.](https://github.com/koajs/koa/wiki)
+[Koa is another Node.js server framework designed by the team behind Express, which aims to be a smaller, more expressive.](https://koajs.com/)
+You can add your adapter to your Koa application with a few lines of code then
+[benefit middlewares written for Koa.](https://github.com/koajs/koa/wiki)
 
 ```ts
 import Koa from 'koa'
@@ -157,7 +215,7 @@ app.use(async ctx => {
     ctx.append(key, value)
   })
 
-  ctx.body = Readable.from(response.body)
+  ctx.body = response.body
 })
 
 app.listen(4000, () => {
@@ -167,13 +225,14 @@ app.listen(4000, () => {
 
 ### Next.js
 
-[Next.js](https://nextjs.org/) is a web framework that allows you to build websites very quickly and our new server adapter can be integrated with Next.js easily as an API Route.
+[Next.js](https://nextjs.org/) is a web framework that allows you to build websites very quickly and
+our new server adapter can be integrated with Next.js easily as an API Route.
 
 ```ts
 // pages/api/myEndpoint.ts
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
-import myServerAdapter from './myServerAdapter'
 import type { NextApiRequest, NextApiResponse } from 'next'
+import myServerAdapter from './myServerAdapter'
 
 export const config = {
   api: {
@@ -187,7 +246,8 @@ export default myServerAdapter
 
 ### SvelteKit
 
-[SvelteKit](https://kit.svelte.dev/) is the fastest way to build svelte apps. It is very simple, and let you build frontend & backend in a single place
+[SvelteKit](https://kit.svelte.dev/) is the fastest way to build svelte apps. It is very simple, and
+let you build frontend & backend in a single place
 
 ```ts
 import myServerAdapter from './myServerAdapter'
@@ -197,8 +257,8 @@ export { myServerAdapter as get, myServerAdapter as post }
 
 ### Bun
 
-[Bun](https://bun.sh/) is a modern JavaScript runtime like Node or Deno, and it supports Fetch API as a first class citizen.
-So the configuration is really simple like any other JS runtime;
+[Bun](https://bun.sh/) is a modern JavaScript runtime like Node or Deno, and it supports Fetch API
+as a first class citizen. So the configuration is really simple like any other JS runtime;
 
 ```ts
 import myServerAdapter from './myServerAdapter'
@@ -212,9 +272,11 @@ console.info(`Server is running on ${server.hostname}`)
 
 ## File Uploads / Multipart Requests
 
-Multipart requests are a type of HTTP request that allows you to send blobs together with regular text data which has a mime-type `multipart/form-data`.
+Multipart requests are a type of HTTP request that allows you to send blobs together with regular
+text data which has a mime-type `multipart/form-data`.
 
-For example, if you send a multipart request from a browser with `FormData`, you can get the same `FormData` object in your request handler.
+For example, if you send a multipart request from a browser with `FormData`, you can get the same
+`FormData` object in your request handler.
 
 ```ts
 import { createServerAdapter } from '@whatwg-node/server'
@@ -238,15 +300,21 @@ const myServerAdapter = createServerAdapter(async request => {
 })
 ```
 
-You can learn more about [File API](https://developer.mozilla.org/en-US/docs/Web/API/File) on MDN documentation.
+You can learn more about [File API](https://developer.mozilla.org/en-US/docs/Web/API/File) on MDN
+documentation.
 
 ## Routing and Middlewares
 
-We'd recommend to use `@whatwg-node/router` to handle routing and middleware approach. It uses `@whatwg-node/server` under the hood.
+We'd recommend to use `@whatwg-node/router` to handle routing and middleware approach. It uses
+`@whatwg-node/server` under the hood.
+
+> Learn more about `@whatwg-node/router` [here](../router)
 
 ### Basic Routing
 
 ```ts
+// Then use it in any environment
+import { createServer } from 'http'
 import { createRouter, Router } from '@whatwg-node/router'
 
 const router = createRouter()
@@ -266,15 +334,14 @@ router.get('/google', () => Response.redirect('http://www.google.com'))
 // 404 for everything else
 router.all('*', () => new Response('Not Found.', { status: 404 }))
 
-// Then use it in any environment
-import { createServer } from 'http'
 const httpServer = createServer(router)
 httpServer.listen(4000)
 ```
 
 ### Middlewares to handle CORS, cookies and more
 
-This package also provides some utilities for your platform agnostic server implementation. The following example shows how to get the cookies as an object from the request.
+This package also provides some utilities for your platform agnostic server implementation. The
+following example shows how to get the cookies as an object from the request.
 
 ```ts
 import { withCookies } from '@whatwg-node/server'

package/createServerAdapter.d.ts

@@ -1,9 +1,4 @@
-import { DefaultServerAdapterContext, FetchAPI, ServerAdapter, ServerAdapterBaseObject, ServerAdapterRequestHandler } from './types';
-import { ServerAdapterPlugin } from './plugins/types';
-export interface ServerAdapterOptions<TServerContext> {
-    plugins?: ServerAdapterPlugin<TServerContext>[];
-    fetchAPI?: Partial<FetchAPI>;
-}
-declare function createServerAdapter<TServerContext = DefaultServerAdapterContext, THandleRequest extends ServerAdapterRequestHandler<TServerContext> = ServerAdapterRequestHandler<TServerContext>>(serverAdapterRequestHandler: THandleRequest, options?: ServerAdapterOptions<TServerContext>): ServerAdapter<TServerContext, ServerAdapterBaseObject<TServerContext, THandleRequest>>;
-declare function createServerAdapter<TServerContext, TBaseObject extends ServerAdapterBaseObject<TServerContext>>(serverAdapterBaseObject: TBaseObject, options?: ServerAdapterOptions<TServerContext>): ServerAdapter<TServerContext, TBaseObject>;
+import { ServerAdapter, ServerAdapterBaseObject, ServerAdapterRequestHandler } from './types';
+declare function createServerAdapter<TServerContext = {}, THandleRequest extends ServerAdapterRequestHandler<TServerContext> = ServerAdapterRequestHandler<TServerContext>>(serverAdapterRequestHandler: THandleRequest, RequestCtor?: typeof Request): ServerAdapter<TServerContext, ServerAdapterBaseObject<TServerContext, THandleRequest>>;
+declare function createServerAdapter<TServerContext, TBaseObject extends ServerAdapterBaseObject<TServerContext>>(serverAdapterBaseObject: TBaseObject, RequestCtor?: typeof Request): ServerAdapter<TServerContext, TBaseObject>;
 export { createServerAdapter };

package/index.d.ts

@@ -1,7 +1,6 @@
 export * from './createServerAdapter';
 export * from './types';
 export * from './utils';
-export * from './plugins/types';
-export * from './plugins/useCors';
-export * from './plugins/useErrorHandling';
+export * from './middlewares/withCors';
+export * from './middlewares/withErrorHandling';
 export { Response } from '@whatwg-node/fetch';

package/index.js

@@ -2,32 +2,36 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const DefaultFetchAPI = require('@whatwg-node/fetch');
+const fetch = require('@whatwg-node/fetch');
 
 function isAsyncIterable(body) {
-    return body != null && typeof body === 'object' && typeof body[Symbol.asyncIterator] === 'function';
+    return (body != null && typeof body === 'object' && typeof body[Symbol.asyncIterator] === 'function');
 }
 function getPort(nodeRequest) {
     var _a, _b, _c, _d, _e;
     if ((_a = nodeRequest.socket) === null || _a === void 0 ? void 0 : _a.localPort) {
         return (_b = nodeRequest.socket) === null || _b === void 0 ? void 0 : _b.localPort;
     }
-    const portInHeader = (_e = (_d = (_c = nodeRequest.headers) === null || _c === void 0 ? void 0 : _c.host) === null || _d === void 0 ? void 0 : _d.split(':')) === null || _e === void 0 ? void 0 : _e[1];
+    const hostInHeader = ((_c = nodeRequest.headers) === null || _c === void 0 ? void 0 : _c[':authority']) || ((_d = nodeRequest.headers) === null || _d === void 0 ? void 0 : _d.host);
+    const portInHeader = (_e = hostInHeader === null || hostInHeader === void 0 ? void 0 : hostInHeader.split(':')) === null || _e === void 0 ? void 0 : _e[1];
     if (portInHeader) {
         return portInHeader;
     }
     return 80;
 }
 function getHostnameWithPort(nodeRequest) {
-    var _a, _b, _c;
-    if ((_a = nodeRequest.headers) === null || _a === void 0 ? void 0 : _a.host) {
-        return (_b = nodeRequest.headers) === null || _b === void 0 ? void 0 : _b.host;
+    var _a, _b, _c, _d, _e;
+    if ((_a = nodeRequest.headers) === null || _a === void 0 ? void 0 : _a[':authority']) {
+        return (_b = nodeRequest.headers) === null || _b === void 0 ? void 0 : _b[':authority'];
+    }
+    if ((_c = nodeRequest.headers) === null || _c === void 0 ? void 0 : _c.host) {
+        return (_d = nodeRequest.headers) === null || _d === void 0 ? void 0 : _d.host;
     }
     const port = getPort(nodeRequest);
     if (nodeRequest.hostname) {
         return nodeRequest.hostname + ':' + port;
     }
-    const localIp = (_c = nodeRequest.socket) === null || _c === void 0 ? void 0 : _c.localAddress;
+    const localIp = (_e = nodeRequest.socket) === null || _e === void 0 ? void 0 : _e.localAddress;
     if (localIp && !(localIp === null || localIp === void 0 ? void 0 : localIp.includes('::')) && !(localIp === null || localIp === void 0 ? void 0 : localIp.includes('ffff'))) {
         return `${localIp}:${port}`;
     }
@@ -111,8 +115,7 @@ function normalizeNodeRequest(nodeRequest, RequestCtor) {
         });
     }
     return new RequestCtor(fullUrl, {
-        headers: nodeRequest.headers,
-        method: nodeRequest.method,
+        ...baseRequestInit,
         body: rawRequest,
     });
 }
@@ -124,7 +127,11 @@ function isNodeRequest(request) {
 }
 function isServerResponse(stream) {
     // Check all used functions are defined
-    return (stream != null && stream.setHeader != null && stream.end != null && stream.once != null && stream.write != null);
+    return (stream != null &&
+        stream.setHeader != null &&
+        stream.end != null &&
+        stream.once != null &&
+        stream.write != null);
 }
 function isReadableStream(stream) {
     return stream != null && stream.getReader != null;
@@ -186,6 +193,7 @@ function isRequestInit(val) {
             'window' in val));
 }
 
+/* eslint-disable @typescript-eslint/ban-types */
 async function handleWaitUntils(waitUntilPromises) {
     const waitUntils = await Promise.allSettled(waitUntilPromises);
     waitUntils.forEach(waitUntil => {
@@ -194,60 +202,17 @@ async function handleWaitUntils(waitUntilPromises) {
         }
     });
 }
-function createServerAdapter(serverAdapterBaseObject, options) {
-    var _a;
-    const fetchAPI = {
-        ...DefaultFetchAPI,
-        ...options === null || options === void 0 ? void 0 : options.fetchAPI,
-    };
-    const givenHandleRequest = typeof serverAdapterBaseObject === 'function' ? serverAdapterBaseObject : serverAdapterBaseObject.handle;
-    const onRequestHooks = [];
-    const onResponseHooks = [];
-    for (const plugin of (_a = options === null || options === void 0 ? void 0 : options.plugins) !== null && _a !== void 0 ? _a : []) {
-        if (plugin.onRequest) {
-            onRequestHooks.push(plugin.onRequest);
-        }
-        if (plugin.onResponse) {
-            onResponseHooks.push(plugin.onResponse);
-        }
-    }
-    async function handleRequest(request, serverContext) {
-        const url = new URL(request.url, 'http://localhost');
-        let requestHandler = givenHandleRequest;
-        let response;
-        for (const onRequestHook of onRequestHooks) {
-            await onRequestHook({
-                request,
-                serverContext,
-                fetchAPI,
-                url,
-                requestHandler,
-                setRequestHandler(newRequestHandler) {
-                    requestHandler = newRequestHandler;
-                },
-                endResponse(newResponse) {
-                    response = newResponse;
-                },
-            });
-            if (response) {
-                break;
-            }
-        }
-        if (!response) {
-            response = await requestHandler(request, serverContext);
-        }
-        for (const onResponseHook of onResponseHooks) {
-            await onResponseHook({
-                request,
-                response,
-                serverContext,
-            });
-        }
-        return response;
-    }
+function createServerAdapter(serverAdapterBaseObject, 
+/**
+ * WHATWG Fetch spec compliant `Request` constructor.
+ */
+RequestCtor = fetch.Request) {
+    const handleRequest = typeof serverAdapterBaseObject === 'function'
+        ? serverAdapterBaseObject
+        : serverAdapterBaseObject.handle;
     function handleNodeRequest(nodeRequest, ...ctx) {
         const serverContext = ctx.length > 1 ? completeAssign({}, ...ctx) : ctx[0];
-        const request = normalizeNodeRequest(nodeRequest, fetchAPI.Request);
+        const request = normalizeNodeRequest(nodeRequest, RequestCtor);
         return handleRequest(request, serverContext);
     }
     async function requestListener(nodeRequest, serverResponse, ...ctx) {
@@ -307,9 +272,9 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         if (typeof input === 'string' || input instanceof URL) {
             const [initOrCtx, ...restOfCtx] = maybeCtx;
             if (isRequestInit(initOrCtx)) {
-                return handleRequestWithWaitUntil(new fetchAPI.Request(input, initOrCtx), ...restOfCtx);
+                return handleRequestWithWaitUntil(new RequestCtor(input, initOrCtx), ...restOfCtx);
             }
-            return handleRequestWithWaitUntil(new fetchAPI.Request(input), ...maybeCtx);
+            return handleRequestWithWaitUntil(new RequestCtor(input), ...maybeCtx);
         }
         return handleRequestWithWaitUntil(input, ...maybeCtx);
     };
@@ -386,24 +351,27 @@ function createServerAdapter(serverAdapterBaseObject, options) {
 // from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign#copying_accessors
 function completeAssign(target, ...sources) {
     sources.forEach(source => {
-        // modified Object.keys to Object.getOwnPropertyNames
-        // because Object.keys only returns enumerable properties
-        const descriptors = Object.getOwnPropertyNames(source).reduce((descriptors, key) => {
-            descriptors[key] = Object.getOwnPropertyDescriptor(source, key);
-            return descriptors;
-        }, {});
-        // By default, Object.assign copies enumerable Symbols, too
-        Object.getOwnPropertySymbols(source).forEach(sym => {
-            const descriptor = Object.getOwnPropertyDescriptor(source, sym);
-            if (descriptor.enumerable) {
-                descriptors[sym] = descriptor;
-            }
-        });
-        Object.defineProperties(target, descriptors);
+        if (source != null && typeof source === 'object') {
+            // modified Object.keys to Object.getOwnPropertyNames
+            // because Object.keys only returns enumerable properties
+            const descriptors = Object.getOwnPropertyNames(source).reduce((descriptors, key) => {
+                descriptors[key] = Object.getOwnPropertyDescriptor(source, key);
+                return descriptors;
+            }, {});
+            // By default, Object.assign copies enumerable Symbols, too
+            Object.getOwnPropertySymbols(source).forEach(sym => {
+                const descriptor = Object.getOwnPropertyDescriptor(source, sym);
+                if (descriptor.enumerable) {
+                    descriptors[sym] = descriptor;
+                }
+            });
+            Object.defineProperties(target, descriptors);
+        }
     });
     return target;
 }
 
+/* eslint-disable @typescript-eslint/ban-types */
 function getCORSHeadersByRequestAndOptions(request, corsOptions) {
     var _a, _b;
     const headers = {};
@@ -458,8 +426,7 @@ function getCORSHeadersByRequestAndOptions(request, corsOptions) {
         }
     }
     if ((_b = corsOptions.allowedHeaders) === null || _b === void 0 ? void 0 : _b.length) {
-        headers['Access-Control-Allow-Headers'] =
-            corsOptions.allowedHeaders.join(', ');
+        headers['Access-Control-Allow-Headers'] = corsOptions.allowedHeaders.join(', ');
     }
     else {
         const requestHeaders = request.headers.get('access-control-request-headers');
@@ -480,8 +447,7 @@ function getCORSHeadersByRequestAndOptions(request, corsOptions) {
         headers['Access-Control-Allow-Credentials'] = 'true';
     }
     if (corsOptions.exposedHeaders) {
-        headers['Access-Control-Expose-Headers'] =
-            corsOptions.exposedHeaders.join(', ');
+        headers['Access-Control-Expose-Headers'] = corsOptions.exposedHeaders.join(', ');
     }
     if (corsOptions.maxAge) {
         headers['Access-Control-Max-Age'] = corsOptions.maxAge.toString();
@@ -492,8 +458,7 @@ async function getCORSResponseHeaders(request, corsOptionsFactory, serverContext
     const corsOptions = await corsOptionsFactory(request, serverContext);
     return getCORSHeadersByRequestAndOptions(request, corsOptions);
 }
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function useCORS(options) {
+function withCORS(obj, options, ResponseCtor = fetch.Response) {
     let corsOptionsFactory = () => ({});
     if (options != null) {
         if (typeof options === 'function') {
@@ -509,32 +474,36 @@ function useCORS(options) {
             corsOptionsFactory = () => false;
         }
     }
-    return {
-        onRequest({ request, fetchAPI, endResponse }) {
-            if (request.method.toUpperCase() === 'OPTIONS') {
-                const response = new fetchAPI.Response(null, {
-                    status: 204,
-                    // Safari (and potentially other browsers) need content-length 0,
-                    // for 204 or they just hang waiting for a body
-                    // see: https://github.com/expressjs/cors/blob/master/lib/index.js#L176
-                    headers: {
-                        'Content-Length': '0',
-                    },
-                });
-                endResponse(response);
-            }
-        },
-        async onResponse({ request, serverContext, response }) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async function handleWithCORS(request, serverContext) {
+        let response;
+        if (request.method.toUpperCase() === 'OPTIONS') {
+            response = new ResponseCtor(null, {
+                status: 204,
+            });
+        }
+        else {
+            response = await obj.handle(request, serverContext);
+        }
+        if (response != null) {
             const headers = await getCORSResponseHeaders(request, corsOptionsFactory, serverContext);
             for (const headerName in headers) {
                 response.headers.set(headerName, headers[headerName]);
             }
+            return response;
+        }
+    }
+    return new Proxy(obj, {
+        get(_, prop, receiver) {
+            if (prop === 'handle') {
+                return handleWithCORS;
+            }
+            return Reflect.get(obj, prop, receiver);
         },
-    };
+    });
 }
 
-function createDefaultErrorHandler(ResponseCtor = DefaultFetchAPI.Response) {
+/* eslint-disable @typescript-eslint/ban-types */
+function createDefaultErrorHandler(ResponseCtor = fetch.Response) {
     return function defaultErrorHandler(e) {
         return new ResponseCtor(e.stack || e.message || e.toString(), {
             status: e.statusCode || e.status || 500,
@@ -542,23 +511,6 @@ function createDefaultErrorHandler(ResponseCtor = DefaultFetchAPI.Response) {
         });
     };
 }
-function useErrorHandling(onError) {
-    return {
-        onRequest({ requestHandler, setRequestHandler, fetchAPI }) {
-            const errorHandler = onError || createDefaultErrorHandler(fetchAPI.Response);
-            setRequestHandler(async function handlerWithErrorHandling(request, serverContext) {
-                try {
-                    const response = await requestHandler(request, serverContext);
-                    return response;
-                }
-                catch (e) {
-                    const response = await errorHandler(e, request, serverContext);
-                    return response;
-                }
-            });
-        }
-    };
-}
 function withErrorHandling(obj, onError = createDefaultErrorHandler()) {
     async function handleWithErrorHandling(request, ctx) {
         try {
@@ -582,7 +534,7 @@ function withErrorHandling(obj, onError = createDefaultErrorHandler()) {
 Object.defineProperty(exports, 'Response', {
     enumerable: true,
     get: function () {
-        return DefaultFetchAPI.Response;
+        return fetch.Response;
     }
 });
 exports.createDefaultErrorHandler = createDefaultErrorHandler;
@@ -597,6 +549,5 @@ exports.isRequestInit = isRequestInit;
 exports.isServerResponse = isServerResponse;
 exports.normalizeNodeRequest = normalizeNodeRequest;
 exports.sendNodeResponse = sendNodeResponse;
-exports.useCORS = useCORS;
-exports.useErrorHandling = useErrorHandling;
+exports.withCORS = withCORS;
 exports.withErrorHandling = withErrorHandling;

package/index.mjs

@@ -1,31 +1,34 @@
-import * as DefaultFetchAPI from '@whatwg-node/fetch';
-import { Response } from '@whatwg-node/fetch';
+import { Request, Response } from '@whatwg-node/fetch';
 export { Response } from '@whatwg-node/fetch';
 
 function isAsyncIterable(body) {
-    return body != null && typeof body === 'object' && typeof body[Symbol.asyncIterator] === 'function';
+    return (body != null && typeof body === 'object' && typeof body[Symbol.asyncIterator] === 'function');
 }
 function getPort(nodeRequest) {
     var _a, _b, _c, _d, _e;
     if ((_a = nodeRequest.socket) === null || _a === void 0 ? void 0 : _a.localPort) {
         return (_b = nodeRequest.socket) === null || _b === void 0 ? void 0 : _b.localPort;
     }
-    const portInHeader = (_e = (_d = (_c = nodeRequest.headers) === null || _c === void 0 ? void 0 : _c.host) === null || _d === void 0 ? void 0 : _d.split(':')) === null || _e === void 0 ? void 0 : _e[1];
+    const hostInHeader = ((_c = nodeRequest.headers) === null || _c === void 0 ? void 0 : _c[':authority']) || ((_d = nodeRequest.headers) === null || _d === void 0 ? void 0 : _d.host);
+    const portInHeader = (_e = hostInHeader === null || hostInHeader === void 0 ? void 0 : hostInHeader.split(':')) === null || _e === void 0 ? void 0 : _e[1];
     if (portInHeader) {
         return portInHeader;
     }
     return 80;
 }
 function getHostnameWithPort(nodeRequest) {
-    var _a, _b, _c;
-    if ((_a = nodeRequest.headers) === null || _a === void 0 ? void 0 : _a.host) {
-        return (_b = nodeRequest.headers) === null || _b === void 0 ? void 0 : _b.host;
+    var _a, _b, _c, _d, _e;
+    if ((_a = nodeRequest.headers) === null || _a === void 0 ? void 0 : _a[':authority']) {
+        return (_b = nodeRequest.headers) === null || _b === void 0 ? void 0 : _b[':authority'];
+    }
+    if ((_c = nodeRequest.headers) === null || _c === void 0 ? void 0 : _c.host) {
+        return (_d = nodeRequest.headers) === null || _d === void 0 ? void 0 : _d.host;
     }
     const port = getPort(nodeRequest);
     if (nodeRequest.hostname) {
         return nodeRequest.hostname + ':' + port;
     }
-    const localIp = (_c = nodeRequest.socket) === null || _c === void 0 ? void 0 : _c.localAddress;
+    const localIp = (_e = nodeRequest.socket) === null || _e === void 0 ? void 0 : _e.localAddress;
     if (localIp && !(localIp === null || localIp === void 0 ? void 0 : localIp.includes('::')) && !(localIp === null || localIp === void 0 ? void 0 : localIp.includes('ffff'))) {
         return `${localIp}:${port}`;
     }
@@ -109,8 +112,7 @@ function normalizeNodeRequest(nodeRequest, RequestCtor) {
         });
     }
     return new RequestCtor(fullUrl, {
-        headers: nodeRequest.headers,
-        method: nodeRequest.method,
+        ...baseRequestInit,
         body: rawRequest,
     });
 }
@@ -122,7 +124,11 @@ function isNodeRequest(request) {
 }
 function isServerResponse(stream) {
     // Check all used functions are defined
-    return (stream != null && stream.setHeader != null && stream.end != null && stream.once != null && stream.write != null);
+    return (stream != null &&
+        stream.setHeader != null &&
+        stream.end != null &&
+        stream.once != null &&
+        stream.write != null);
 }
 function isReadableStream(stream) {
     return stream != null && stream.getReader != null;
@@ -184,6 +190,7 @@ function isRequestInit(val) {
             'window' in val));
 }
 
+/* eslint-disable @typescript-eslint/ban-types */
 async function handleWaitUntils(waitUntilPromises) {
     const waitUntils = await Promise.allSettled(waitUntilPromises);
     waitUntils.forEach(waitUntil => {
@@ -192,60 +199,17 @@ async function handleWaitUntils(waitUntilPromises) {
         }
     });
 }
-function createServerAdapter(serverAdapterBaseObject, options) {
-    var _a;
-    const fetchAPI = {
-        ...DefaultFetchAPI,
-        ...options === null || options === void 0 ? void 0 : options.fetchAPI,
-    };
-    const givenHandleRequest = typeof serverAdapterBaseObject === 'function' ? serverAdapterBaseObject : serverAdapterBaseObject.handle;
-    const onRequestHooks = [];
-    const onResponseHooks = [];
-    for (const plugin of (_a = options === null || options === void 0 ? void 0 : options.plugins) !== null && _a !== void 0 ? _a : []) {
-        if (plugin.onRequest) {
-            onRequestHooks.push(plugin.onRequest);
-        }
-        if (plugin.onResponse) {
-            onResponseHooks.push(plugin.onResponse);
-        }
-    }
-    async function handleRequest(request, serverContext) {
-        const url = new URL(request.url, 'http://localhost');
-        let requestHandler = givenHandleRequest;
-        let response;
-        for (const onRequestHook of onRequestHooks) {
-            await onRequestHook({
-                request,
-                serverContext,
-                fetchAPI,
-                url,
-                requestHandler,
-                setRequestHandler(newRequestHandler) {
-                    requestHandler = newRequestHandler;
-                },
-                endResponse(newResponse) {
-                    response = newResponse;
-                },
-            });
-            if (response) {
-                break;
-            }
-        }
-        if (!response) {
-            response = await requestHandler(request, serverContext);
-        }
-        for (const onResponseHook of onResponseHooks) {
-            await onResponseHook({
-                request,
-                response,
-                serverContext,
-            });
-        }
-        return response;
-    }
+function createServerAdapter(serverAdapterBaseObject, 
+/**
+ * WHATWG Fetch spec compliant `Request` constructor.
+ */
+RequestCtor = Request) {
+    const handleRequest = typeof serverAdapterBaseObject === 'function'
+        ? serverAdapterBaseObject
+        : serverAdapterBaseObject.handle;
     function handleNodeRequest(nodeRequest, ...ctx) {
         const serverContext = ctx.length > 1 ? completeAssign({}, ...ctx) : ctx[0];
-        const request = normalizeNodeRequest(nodeRequest, fetchAPI.Request);
+        const request = normalizeNodeRequest(nodeRequest, RequestCtor);
         return handleRequest(request, serverContext);
     }
     async function requestListener(nodeRequest, serverResponse, ...ctx) {
@@ -305,9 +269,9 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         if (typeof input === 'string' || input instanceof URL) {
             const [initOrCtx, ...restOfCtx] = maybeCtx;
             if (isRequestInit(initOrCtx)) {
-                return handleRequestWithWaitUntil(new fetchAPI.Request(input, initOrCtx), ...restOfCtx);
+                return handleRequestWithWaitUntil(new RequestCtor(input, initOrCtx), ...restOfCtx);
             }
-            return handleRequestWithWaitUntil(new fetchAPI.Request(input), ...maybeCtx);
+            return handleRequestWithWaitUntil(new RequestCtor(input), ...maybeCtx);
         }
         return handleRequestWithWaitUntil(input, ...maybeCtx);
     };
@@ -384,24 +348,27 @@ function createServerAdapter(serverAdapterBaseObject, options) {
 // from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign#copying_accessors
 function completeAssign(target, ...sources) {
     sources.forEach(source => {
-        // modified Object.keys to Object.getOwnPropertyNames
-        // because Object.keys only returns enumerable properties
-        const descriptors = Object.getOwnPropertyNames(source).reduce((descriptors, key) => {
-            descriptors[key] = Object.getOwnPropertyDescriptor(source, key);
-            return descriptors;
-        }, {});
-        // By default, Object.assign copies enumerable Symbols, too
-        Object.getOwnPropertySymbols(source).forEach(sym => {
-            const descriptor = Object.getOwnPropertyDescriptor(source, sym);
-            if (descriptor.enumerable) {
-                descriptors[sym] = descriptor;
-            }
-        });
-        Object.defineProperties(target, descriptors);
+        if (source != null && typeof source === 'object') {
+            // modified Object.keys to Object.getOwnPropertyNames
+            // because Object.keys only returns enumerable properties
+            const descriptors = Object.getOwnPropertyNames(source).reduce((descriptors, key) => {
+                descriptors[key] = Object.getOwnPropertyDescriptor(source, key);
+                return descriptors;
+            }, {});
+            // By default, Object.assign copies enumerable Symbols, too
+            Object.getOwnPropertySymbols(source).forEach(sym => {
+                const descriptor = Object.getOwnPropertyDescriptor(source, sym);
+                if (descriptor.enumerable) {
+                    descriptors[sym] = descriptor;
+                }
+            });
+            Object.defineProperties(target, descriptors);
+        }
     });
     return target;
 }
 
+/* eslint-disable @typescript-eslint/ban-types */
 function getCORSHeadersByRequestAndOptions(request, corsOptions) {
     var _a, _b;
     const headers = {};
@@ -456,8 +423,7 @@ function getCORSHeadersByRequestAndOptions(request, corsOptions) {
         }
     }
     if ((_b = corsOptions.allowedHeaders) === null || _b === void 0 ? void 0 : _b.length) {
-        headers['Access-Control-Allow-Headers'] =
-            corsOptions.allowedHeaders.join(', ');
+        headers['Access-Control-Allow-Headers'] = corsOptions.allowedHeaders.join(', ');
     }
     else {
         const requestHeaders = request.headers.get('access-control-request-headers');
@@ -478,8 +444,7 @@ function getCORSHeadersByRequestAndOptions(request, corsOptions) {
         headers['Access-Control-Allow-Credentials'] = 'true';
     }
     if (corsOptions.exposedHeaders) {
-        headers['Access-Control-Expose-Headers'] =
-            corsOptions.exposedHeaders.join(', ');
+        headers['Access-Control-Expose-Headers'] = corsOptions.exposedHeaders.join(', ');
     }
     if (corsOptions.maxAge) {
         headers['Access-Control-Max-Age'] = corsOptions.maxAge.toString();
@@ -490,8 +455,7 @@ async function getCORSResponseHeaders(request, corsOptionsFactory, serverContext
     const corsOptions = await corsOptionsFactory(request, serverContext);
     return getCORSHeadersByRequestAndOptions(request, corsOptions);
 }
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function useCORS(options) {
+function withCORS(obj, options, ResponseCtor = Response) {
     let corsOptionsFactory = () => ({});
     if (options != null) {
         if (typeof options === 'function') {
@@ -507,31 +471,35 @@ function useCORS(options) {
             corsOptionsFactory = () => false;
         }
     }
-    return {
-        onRequest({ request, fetchAPI, endResponse }) {
-            if (request.method.toUpperCase() === 'OPTIONS') {
-                const response = new fetchAPI.Response(null, {
-                    status: 204,
-                    // Safari (and potentially other browsers) need content-length 0,
-                    // for 204 or they just hang waiting for a body
-                    // see: https://github.com/expressjs/cors/blob/master/lib/index.js#L176
-                    headers: {
-                        'Content-Length': '0',
-                    },
-                });
-                endResponse(response);
-            }
-        },
-        async onResponse({ request, serverContext, response }) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async function handleWithCORS(request, serverContext) {
+        let response;
+        if (request.method.toUpperCase() === 'OPTIONS') {
+            response = new ResponseCtor(null, {
+                status: 204,
+            });
+        }
+        else {
+            response = await obj.handle(request, serverContext);
+        }
+        if (response != null) {
             const headers = await getCORSResponseHeaders(request, corsOptionsFactory, serverContext);
             for (const headerName in headers) {
                 response.headers.set(headerName, headers[headerName]);
             }
+            return response;
+        }
+    }
+    return new Proxy(obj, {
+        get(_, prop, receiver) {
+            if (prop === 'handle') {
+                return handleWithCORS;
+            }
+            return Reflect.get(obj, prop, receiver);
         },
-    };
+    });
 }
 
+/* eslint-disable @typescript-eslint/ban-types */
 function createDefaultErrorHandler(ResponseCtor = Response) {
     return function defaultErrorHandler(e) {
         return new ResponseCtor(e.stack || e.message || e.toString(), {
@@ -540,23 +508,6 @@ function createDefaultErrorHandler(ResponseCtor = Response) {
         });
     };
 }
-function useErrorHandling(onError) {
-    return {
-        onRequest({ requestHandler, setRequestHandler, fetchAPI }) {
-            const errorHandler = onError || createDefaultErrorHandler(fetchAPI.Response);
-            setRequestHandler(async function handlerWithErrorHandling(request, serverContext) {
-                try {
-                    const response = await requestHandler(request, serverContext);
-                    return response;
-                }
-                catch (e) {
-                    const response = await errorHandler(e, request, serverContext);
-                    return response;
-                }
-            });
-        }
-    };
-}
 function withErrorHandling(obj, onError = createDefaultErrorHandler()) {
     async function handleWithErrorHandling(request, ctx) {
         try {
@@ -577,4 +528,4 @@ function withErrorHandling(obj, onError = createDefaultErrorHandler()) {
     });
 }
 
-export { createDefaultErrorHandler, createServerAdapter, getCORSHeadersByRequestAndOptions, isAsyncIterable, isFetchEvent, isNodeRequest, isReadable, isReadableStream, isRequestInit, isServerResponse, normalizeNodeRequest, sendNodeResponse, useCORS, useErrorHandling, withErrorHandling };
+export { createDefaultErrorHandler, createServerAdapter, getCORSHeadersByRequestAndOptions, isAsyncIterable, isFetchEvent, isNodeRequest, isReadable, isReadableStream, isRequestInit, isServerResponse, normalizeNodeRequest, sendNodeResponse, withCORS, withErrorHandling };

package/{plugins/useCors.d.ts → middlewares/withCors.d.ts}

@@ -1,4 +1,4 @@
-import { ServerAdapterPlugin } from './types';
+import { ServerAdapterBaseObject } from '../types';
 export type CORSOptions = {
     origin?: string[] | string;
     methods?: string[];
@@ -7,7 +7,7 @@ export type CORSOptions = {
     credentials?: boolean;
     maxAge?: number;
 } | false;
-export type CORSPluginOptions<TServerContext> = CORSOptionsFactory<TServerContext> | CORSOptions | boolean;
+export type WithCORSOptions<TServerContext> = CORSOptionsFactory<TServerContext> | CORSOptions | boolean;
 export type CORSOptionsFactory<TServerContext> = (request: Request, ...args: {} extends TServerContext ? [serverContext?: TServerContext | undefined] : [serverContext: TServerContext]) => Promise<CORSOptions> | CORSOptions;
 export declare function getCORSHeadersByRequestAndOptions(request: Request, corsOptions: CORSOptions): Record<string, string>;
-export declare function useCORS<TServerContext extends Record<string, any>>(options?: CORSPluginOptions<TServerContext>): ServerAdapterPlugin<TServerContext>;
+export declare function withCORS<TServerContext = {}, TBaseObject extends ServerAdapterBaseObject<TServerContext> = ServerAdapterBaseObject<TServerContext>>(obj: TBaseObject, options: WithCORSOptions<TServerContext>, ResponseCtor?: typeof Response): TBaseObject;

package/middlewares/withErrorHandling.d.ts

@@ -0,0 +1,4 @@
+import { ServerAdapterBaseObject } from '../types';
+export declare function createDefaultErrorHandler<TServerContext = {}>(ResponseCtor?: typeof Response): ErrorHandler<TServerContext>;
+export type ErrorHandler<TServerContext> = (e: any, request: Request, ctx: TServerContext) => Response | Promise<Response>;
+export declare function withErrorHandling<TServerContext = {}, TBaseObject extends ServerAdapterBaseObject<TServerContext> = ServerAdapterBaseObject<TServerContext>>(obj: TBaseObject, onError?: ErrorHandler<TServerContext>): TBaseObject;

package/package.json

@@ -1,13 +1,10 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.6.0-alpha-20230120130300-bc9d705",
+  "version": "0.6.0",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
-  "peerDependencies": {
-    "@types/node": "^18.0.6"
-  },
   "dependencies": {
-    "@whatwg-node/fetch": "0.6.2",
+    "@whatwg-node/fetch": "0.6.6",
     "tslib": "^2.3.1"
   },
   "repository": {

package/types.d.ts

@@ -13,11 +13,11 @@ export interface ServerAdapterBaseObject<TServerContext, THandleRequest extends
      */
     handle: THandleRequest;
 }
-export interface ServerAdapterObject<TServerContext> extends EventListenerObject {
+export interface ServerAdapterObject<TServerContext, TBaseObject extends ServerAdapterBaseObject<TServerContext, ServerAdapterRequestHandler<TServerContext>>> extends EventListenerObject {
     /**
      * A basic request listener that takes a `Request` with the server context and returns a `Response`.
      */
-    handleRequest: (request: Request, ctx: TServerContext) => Promise<Response>;
+    handleRequest: TBaseObject['handle'];
     /**
      * WHATWG Fetch spec compliant `fetch` function that can be used for testing purposes.
      */
@@ -46,11 +46,13 @@ export interface ServerAdapterObject<TServerContext> extends EventListenerObject
         request: Request;
     } & Partial<TServerContext>, ...ctx: Partial<TServerContext>[]): Promise<Response> | Response;
 }
-export type ServerAdapter<TServerContext, TBaseObject extends ServerAdapterBaseObject<TServerContext>> = TBaseObject & ServerAdapterObject<TServerContext>['handle'] & ServerAdapterObject<TServerContext>;
-export type ServerAdapterRequestHandler<TServerContext> = (request: Request, ctx: TServerContext) => Promise<Response> | Response;
-export type DefaultServerAdapterContext = {
+export type ServerAdapter<TServerContext, TBaseObject extends ServerAdapterBaseObject<TServerContext>> = TBaseObject & ServerAdapterObject<TServerContext, TBaseObject>['handle'] & ServerAdapterObject<TServerContext, TBaseObject>;
+export type ServerAdapterRequestHandler<TServerContext> = (request: Request, ctx: ServerAdapterContext<TServerContext>) => Promise<Response> | Response;
+export type ServerAdapterNodeContext = {
     req: NodeRequest;
     res: NodeResponse;
-    waitUntil(promise: Promise<void> | void): void;
 };
-export type FetchAPI = ReturnType<typeof import('@whatwg-node/fetch').createFetch>;
+export type WaitUntilFn = (promise: Promise<void> | void) => void;
+export type ServerAdapterContext<TServerContext> = TServerContext & {
+    waitUntil: WaitUntilFn;
+};

package/utils.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-import { IncomingMessage, ServerResponse } from 'node:http';
+import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
 import type { Socket } from 'node:net';
 import type { Readable } from 'node:stream';

package/plugins/cookies/CookieChangeEvent.d.ts

@@ -1,6 +0,0 @@
-import { CookieList, CookieChangeEventInit } from "./types";
-export declare class CookieChangeEvent extends Event {
-    changed: CookieList;
-    deleted: CookieList;
-    constructor(type: string, eventInitDict?: CookieChangeEventInit);
-}

package/plugins/cookies/CookieStore.d.ts

@@ -1,12 +0,0 @@
-import { CookieChangeEvent } from "./CookieChangeEvent";
-import { CookieStoreGetOptions, Cookie, CookieListItem, CookieStoreDeleteOptions } from "./types";
-export declare class CookieStore extends EventTarget {
-    cookieString: string;
-    onchange?: (event: CookieChangeEvent) => void;
-    get [Symbol.toStringTag](): 'CookieStore';
-    constructor(cookieString: string);
-    get(init?: CookieStoreGetOptions['name'] | CookieStoreGetOptions): Promise<Cookie | undefined>;
-    set(init: CookieListItem | string, possibleValue?: string): Promise<void>;
-    getAll(init?: CookieStoreGetOptions['name'] | CookieStoreGetOptions): Promise<Cookie[]>;
-    delete(init: CookieStoreDeleteOptions['name'] | CookieStoreDeleteOptions): Promise<void>;
-}

package/plugins/cookies/parse.d.ts

@@ -1,11 +0,0 @@
-import { Cookie } from './types';
-export interface ParseOptions {
-    decode?: boolean;
-}
-/**
- * Parse a cookie header.
- *
- * Parse the given cookie header string into an object
- * The object has the various cookies as keys(names) => values
- */
-export declare function parse(str: string, options?: ParseOptions): Cookie[];

package/plugins/cookies/types.d.ts

@@ -1,37 +0,0 @@
-export interface Cookie {
-    domain?: string;
-    expires?: number;
-    name: string;
-    path?: string;
-    secure?: boolean;
-    sameSite?: CookieSameSite;
-    value: string;
-}
-export interface CookieStoreDeleteOptions {
-    name: string;
-    domain?: string;
-    path?: string;
-}
-export interface CookieStoreGetOptions {
-    name?: string;
-    url?: string;
-}
-export declare enum CookieSameSite {
-    strict = "strict",
-    lax = "lax",
-    none = "none"
-}
-export interface CookieListItem {
-    name?: string;
-    value?: string;
-    domain: string | null;
-    path?: string;
-    expires: Date | number | null;
-    secure?: boolean;
-    sameSite?: CookieSameSite;
-}
-export type CookieList = CookieListItem[];
-export interface CookieChangeEventInit extends EventInit {
-    changed: CookieList;
-    deleted: CookieList;
-}

package/plugins/cookies/useCookies.d.ts

@@ -1,8 +0,0 @@
-import { ServerAdapterPlugin } from "../types";
-import { CookieStore } from "./CookieStore";
-declare global {
-    interface Request {
-        cookieStore?: CookieStore;
-    }
-}
-export declare function useCookies<TServerContext>(): ServerAdapterPlugin<TServerContext>;

package/plugins/types.d.ts

@@ -1,21 +0,0 @@
-import { DefaultServerAdapterContext, FetchAPI, ServerAdapterRequestHandler } from "../types";
-export interface ServerAdapterPlugin<TServerContext = DefaultServerAdapterContext> {
-    onRequest?: OnRequestHook<TServerContext>;
-    onResponse?: OnResponseHook<TServerContext>;
-}
-export type OnRequestHook<TServerContext> = (payload: OnRequestEventPayload<TServerContext>) => Promise<void> | void;
-export interface OnRequestEventPayload<TServerContext> {
-    request: Request;
-    serverContext: TServerContext | undefined;
-    fetchAPI: FetchAPI;
-    requestHandler: ServerAdapterRequestHandler<TServerContext>;
-    setRequestHandler(newRequestHandler: ServerAdapterRequestHandler<TServerContext>): void;
-    endResponse(response: Response): void;
-    url: URL;
-}
-export type OnResponseHook<TServerContext> = (payload: OnResponseEventPayload<TServerContext>) => Promise<void> | void;
-export interface OnResponseEventPayload<TServerContext> {
-    request: Request;
-    serverContext: TServerContext | undefined;
-    response: Response;
-}

package/plugins/useErrorHandling.d.ts

@@ -1,6 +0,0 @@
-import { DefaultServerAdapterContext, ServerAdapterBaseObject } from '../types';
-import { ServerAdapterPlugin } from './types';
-export declare function createDefaultErrorHandler<TServerContext = DefaultServerAdapterContext>(ResponseCtor?: typeof Response): ErrorHandler<TServerContext>;
-export type ErrorHandler<TServerContext> = (e: any, request: Request, ctx: TServerContext) => Response | Promise<Response>;
-export declare function useErrorHandling<TServerContext>(onError?: ErrorHandler<TServerContext>): ServerAdapterPlugin<TServerContext>;
-export declare function withErrorHandling<TServerContext = DefaultServerAdapterContext, TBaseObject extends ServerAdapterBaseObject<TServerContext> = ServerAdapterBaseObject<TServerContext>>(obj: TBaseObject, onError?: ErrorHandler<TServerContext>): TBaseObject;