Skip to content

Feat: Allow overriding the proxying for external rewrite #630

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 12 commits into from
Nov 19, 2024
+285 −152
Merged

Feat: Allow overriding the proxying for external rewrite #630

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5ecfc3e
proxyRequest is now an override
conico974 Nov 14, 2024
055d1a8
handle errors in request handler
conico974 Nov 14, 2024
e744a79
review fix
conico974 Nov 15, 2024
143f1c4
add dummy type everywhere
conico974 Nov 15, 2024
ba535b7
handle error in middleware
conico974 Nov 15, 2024
2c73d9a
review fix
conico974 Nov 15, 2024
3b41f89
Update packages/open-next/src/core/requestHandler.ts
conico974 Nov 18, 2024
b677414
review
conico974 Nov 18, 2024
d409b7d
added comment
conico974 Nov 18, 2024
fc0f0a4
review fix
conico974 Nov 18, 2024
b165231
fix build
conico974 Nov 18, 2024
8ea7d39
Create strong-keys-ring.md
conico974 Nov 19, 2024
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
1 change: 1 addition & 0 deletions packages/open-next/src/build/validateConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const compatibilityMatrix: Record<IncludedWrapper, IncludedConverter[]> = {
"aws-lambda-streaming": ["aws-apigw-v2"],
cloudflare: ["edge"],
node: ["node"],
dummy: [],
};

function validateFunctionOptions(fnOptions: FunctionOptions) {
Expand Down
3 changes: 2 additions & 1 deletion packages/open-next/src/core/resolve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type {
BaseEventOrResult,
DefaultOverrideOptions,
IncludedProxyExternalRequest,
IncludedWarmer,
InternalEvent,
InternalResult,
LazyLoadedOverride,
Expand Down Expand Up @@ -124,7 +125,7 @@ export async function resolveOriginResolver(
* @__PURE__
*/
export async function resolveWarmerInvoke(
warmer?: LazyLoadedOverride<Warmer> | "aws-lambda",
warmer?: LazyLoadedOverride<Warmer> | IncludedWarmer,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you update l 115 in a similar way string -> IncludedOriginResolver

Copy link
Contributor

@vicb vicb Nov 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l 101 as well.
Maybe use the same as l86 everywhere

) {
if (typeof warmer === "function") {
return warmer();
Expand Down
17 changes: 9 additions & 8 deletions packages/open-next/src/types/open-next.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ export type IncludedWrapper =
| "aws-lambda"
| "aws-lambda-streaming"
| "node"
| "cloudflare";
| "cloudflare"
| "dummy";

export type IncludedConverter =
| "aws-apigw-v2"
Expand All @@ -91,19 +92,19 @@ export type IncludedConverter =
| "sqs-revalidate"
| "dummy";

export type IncludedQueue = "sqs" | "sqs-lite";
export type IncludedQueue = "sqs" | "sqs-lite" | "dummy";

export type IncludedIncrementalCache = "s3" | "s3-lite";
export type IncludedIncrementalCache = "s3" | "s3-lite" | "dummy";

export type IncludedTagCache = "dynamodb" | "dynamodb-lite";
export type IncludedTagCache = "dynamodb" | "dynamodb-lite" | "dummy";

export type IncludedImageLoader = "s3" | "host";
export type IncludedImageLoader = "s3" | "host" | "dummy";

export type IncludedOriginResolver = "pattern-env";
export type IncludedOriginResolver = "pattern-env" | "dummy";

export type IncludedWarmer = "aws-lambda";
export type IncludedWarmer = "aws-lambda" | "dummy";

export type IncludedProxyExternalRequest = "node" | "fetch";
export type IncludedProxyExternalRequest = "node" | "fetch" | "dummy";

export interface DefaultOverrideOptions<
E extends BaseEventOrResult = InternalEvent,
Expand Down