Skip to content

feat: added NextFetchEvent support #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 9, 2024
Merged

feat: added NextFetchEvent support #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package/src/chain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { type NextRequest } from "next/server";
import type { NextRequest, NextFetchEvent } from "next/server";
import { collectData } from "./lib/collect-data";
import { ChainItem } from "./lib/types";
import { formatResponse } from "./lib/format-response";
export { FinalNextResponse } from "./lib/final-next-response";

export const chain = (middlewares: ChainItem[]) => async (req: NextRequest) => {
const summary = await collectData(req, middlewares);
export const chain = (middlewares: ChainItem[]) => async (req: NextRequest, event: NextFetchEvent) => {
const summary = await collectData(req, event, middlewares);
const next = formatResponse(summary);

return next;
Expand Down
6 changes: 3 additions & 3 deletions package/src/lib/collect-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { NextResponse, type NextRequest } from "next/server";
import { NextResponse, type NextRequest, type NextFetchEvent } from "next/server";
import { ChainItem, Middleware, type ChainNextResponse, type Summary } from "./types";
import { FinalSymbol } from "./final-next-response";
import { INTERNAL_HEADERS } from "./constants";

export const collectData = async (req: NextRequest, chainItems: ChainItem[]) => {
export const collectData = async (req: NextRequest, event: NextFetchEvent, chainItems: ChainItem[]) => {
const summary: Summary = {
type: "none",
destination: req.nextUrl,
Expand All @@ -28,7 +28,7 @@ export const collectData = async (req: NextRequest, chainItems: ChainItem[]) =>
} else {
middleware = chainItem;
}
const middlewareNext = await middleware(Object.assign(req, { summary: Object.freeze({ ...summary }) }));
const middlewareNext = await middleware(Object.assign(req, { summary: Object.freeze({ ...summary }) }), event);

if (!middlewareNext) continue;

Expand Down
4 changes: 2 additions & 2 deletions package/src/lib/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type ResponseCookie } from "next/dist/compiled/@edge-runtime/cookies";
import { type NextURL } from "next/dist/server/web/next-url";
import { NextResponse, type NextRequest } from "next/server";
import { NextResponse, type NextRequest, type NextFetchEvent } from "next/server";
import { FinalNextResponse, FinalSymbol } from "./final-next-response";

export type NextType = "rewrite" | "redirect" | "json" | "none" | undefined;
Expand All @@ -23,6 +23,6 @@ export type ChainNextResponse = FinalNextResponse | (NextResponse & { [FinalSymb

export type MiddlewareResult = ChainNextResponse | Response | void | undefined | null | Promise<MiddlewareResult>;

export type Middleware = (req: ChainNextRequest) => MiddlewareResult;
export type Middleware = (req: ChainNextRequest, event: NextFetchEvent) => MiddlewareResult;

export type ChainItem = Middleware | [Middleware, { include?: RegExp; exclude?: RegExp }?];