refactor: remove edge compatibility

This commit is contained in:
Henry
2025-05-15 22:27:03 +01:00
parent 66de4b6c42
commit d065ae73e1
11 changed files with 108 additions and 167 deletions

View File

@@ -8,7 +8,3 @@ export const config = { api: { bodyParser: false } };
const auth = initAuth(createDrizzleClient());
export default toNodeHandler(auth.handler);
// export const runtime = "edge";
// export const preferredRegion = "lhr1";
// export const dynamic = "force-dynamic";

View File

@@ -1,5 +1,5 @@
// import type { EmailOtpType } from "@supabase/supabase-js";
// import type { NextRequest } from "next/server";
// import type { NextApiRequest } from "next";
// import { NextResponse } from "next/server";
// import { createDrizzleClient } from "@kan/db/client";
@@ -8,7 +8,7 @@
// import { stripe } from "@kan/stripe";
// import { createNextApiClient } from "@kan/";
// export default async function handler(req: NextRequest) {
// export default async function handler(req: NextApiRequest) {
// if (req.method !== "GET") {
// return new NextResponse(null, {
// status: 405,
@@ -96,7 +96,3 @@
// return redirectResponse;
// }
// export const runtime = "edge";
// export const preferredRegion = "lhr1";
// export const dynamic = "force-dynamic";

View File

@@ -1,29 +1,23 @@
import type { NextRequest } from "next/server";
import type { NextApiRequest, NextApiResponse } from "next";
import { createNextApiContext } from "@kan/api/trpc";
import { createStripeClient } from "@kan/stripe";
export default async function handler(req: NextRequest) {
export default async function handler(
req: NextApiRequest,
res: NextApiResponse,
) {
const stripe = createStripeClient();
if (req.method !== "POST") {
return new Response(JSON.stringify({ error: "Method not allowed" }), {
status: 405,
headers: { "Content-Type": "application/json" },
});
return res.status(405).json({ error: "Method not allowed" });
}
try {
const { user } = await createNextApiContext(req);
if (!user?.stripeCustomerId) {
return new Response(
JSON.stringify({ error: "No billing account found" }),
{
status: 404,
headers: { "Content-Type": "application/json" },
},
);
return res.status(404).json({ error: "No billing account found" });
}
const session = await stripe.billingPortal.sessions.create({
@@ -31,22 +25,9 @@ export default async function handler(req: NextRequest) {
return_url: `${process.env.WEBSITE_URL}/settings`,
});
return new Response(JSON.stringify({ url: session.url }), {
status: 200,
headers: { "Content-Type": "application/json" },
});
return res.status(200).json({ url: session.url });
} catch (error) {
console.error("Error:", error);
return new Response(
JSON.stringify({ error: "Error creating portal session" }),
{
status: 500,
headers: { "Content-Type": "application/json" },
},
);
return res.status(500).json({ error: "Error creating portal session" });
}
}
export const runtime = "edge";
export const preferredRegion = "lhr1";
export const dynamic = "force-dynamic";

View File

@@ -1,4 +1,4 @@
import type { NextRequest } from "next/server";
import type { NextApiRequest, NextApiResponse } from "next";
import { z } from "zod";
import { createNextApiContext } from "@kan/api/trpc";
@@ -19,37 +19,28 @@ interface CheckoutSessionRequest {
stripeCustomerId: string;
}
export default async function handler(req: NextRequest) {
export default async function handler(
req: NextApiRequest,
res: NextApiResponse,
) {
const stripe = createStripeClient();
if (req.method !== "POST") {
return new Response(JSON.stringify({ error: "Method not allowed" }), {
status: 405,
headers: { "Content-Type": "application/json" },
});
return res.status(405).json({ error: "Method not allowed" });
}
try {
const { user, db } = await createNextApiContext(req);
if (!user) {
return new Response(JSON.stringify({ error: "User not found" }), {
status: 404,
headers: { "Content-Type": "application/json" },
});
return res.status(404).json({ error: "User not found" });
}
const body = (await req.json()) as CheckoutSessionRequest;
const body = req.body as CheckoutSessionRequest;
const { successUrl, cancelUrl, slug, workspacePublicId } = body;
if (!successUrl || !cancelUrl || !slug || !workspacePublicId) {
return new Response(
JSON.stringify({ error: "Missing required fields" }),
{
status: 400,
headers: { "Content-Type": "application/json" },
},
);
return res.status(400).json({ error: "Missing required fields" });
}
const slugResult = workspaceSlugSchema.safeParse(slug);
@@ -91,22 +82,9 @@ export default async function handler(req: NextRequest) {
},
});
return new Response(JSON.stringify({ url: session.url }), {
status: 200,
headers: { "Content-Type": "application/json" },
});
return res.status(200).json({ url: session.url });
} catch (error) {
console.error("Error:", error);
return new Response(
JSON.stringify({ error: "Error creating checkout session" }),
{
status: 500,
headers: { "Content-Type": "application/json" },
},
);
return res.status(500).json({ error: "Error creating checkout session" });
}
}
export const runtime = "edge";
export const preferredRegion = "lhr1";
export const dynamic = "force-dynamic";

View File

@@ -1,4 +1,4 @@
import type { NextRequest } from "next/server";
import type { NextApiRequest, NextApiResponse } from "next";
import { Stripe } from "stripe";
import { createNextApiContext } from "@kan/api/trpc";
@@ -7,25 +7,24 @@ import { createStripeClient } from "@kan/stripe";
export const webCrypto = Stripe.createSubtleCryptoProvider();
export default async function handler(req: NextRequest) {
export default async function handler(
req: NextApiRequest,
res: NextApiResponse,
) {
const stripe = createStripeClient();
if (req.method !== "POST") {
return new Response(JSON.stringify({ message: "Method not allowed" }), {
status: 405,
});
return res.status(405).json({ message: "Method not allowed" });
}
const sig = req.headers.get("stripe-signature");
const sig = req.headers["stripe-signature"];
if (!sig) {
return new Response(JSON.stringify({ message: "No signature found" }), {
status: 400,
});
return res.status(400).json({ message: "No signature found" });
}
try {
const body = await req.text();
const body = req.body;
const event = await stripe.webhooks.constructEventAsync(
body,
@@ -55,15 +54,9 @@ export default async function handler(req: NextRequest) {
console.log(`Unhandled event type: ${event.type}`);
}
return new Response(JSON.stringify({ received: true }), { status: 200 });
return res.status(200).json({ received: true });
} catch (err) {
console.error("Webhook error:", err);
return new Response(JSON.stringify({ message: "Webhook handler failed" }), {
status: 400,
});
return res.status(400).json({ message: "Webhook handler failed" });
}
}
export const runtime = "edge";
export const preferredRegion = "lhr1";
export const dynamic = "force-dynamic";

View File

@@ -1,26 +1,30 @@
import { type NextRequest } from "next/server";
import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
import { type NextApiRequest, type NextApiResponse } from "next";
import { createNextApiHandler } from "@trpc/server/adapters/next";
import { appRouter } from "@kan/api/root";
import { createTRPCContext } from "@kan/api/trpc";
export default async function handler(req: NextRequest) {
return fetchRequestHandler({
endpoint: "/api/trpc",
router: appRouter,
req,
createContext: createTRPCContext,
onError:
process.env.NODE_ENV === "development"
? ({ path, error }) => {
console.error(
`❌ tRPC failed on ${path ?? "<no-path>"}: ${error.message}`,
);
}
: undefined,
});
}
const nextApiHandler = createNextApiHandler({
router: appRouter,
createContext: createTRPCContext,
onError:
process.env.NODE_ENV === "development"
? ({ path, error }) => {
console.error(
`❌ tRPC failed on ${path ?? "<no-path>"}: ${error.message}`,
);
}
: undefined,
});
export const runtime = "edge";
export const preferredRegion = "lhr1";
export const dynamic = "force-dynamic";
export default async function handler(
req: NextApiRequest,
res: NextApiResponse,
) {
if (req.method === "OPTIONS") {
res.writeHead(200);
return res.end();
}
return nextApiHandler(req, res);
}

View File

@@ -1,19 +1,19 @@
import type { NextRequest } from "next/server";
import type { NextApiRequest, NextApiResponse } from "next";
import { S3Client } from "@aws-sdk/client-s3";
import { createPresignedPost } from "@aws-sdk/s3-presigned-post";
import { env } from "~/env";
export default async function POST(req: NextRequest) {
export default async function handler(
req: NextApiRequest,
res: NextApiResponse,
) {
if (req.method !== "POST") {
return new Response(JSON.stringify({ error: "Method not allowed" }), {
status: 405,
headers: { "Content-Type": "application/json" },
});
return res.status(405).json({ error: "Method not allowed" });
}
try {
const { filename, contentType } = await req.json();
const { filename, contentType } = req.body;
const client = new S3Client({
forcePathStyle: true,
@@ -41,12 +41,8 @@ export default async function POST(req: NextRequest) {
const { url, fields } = signedUrl;
return Response.json({ url, fields });
return res.status(200).json({ url, fields });
} catch (error) {
return Response.json({ error: (error as Error).message });
return res.status(500).json({ error: (error as Error).message });
}
}
export const runtime = "edge";
export const preferredRegion = "lhr1";
export const dynamic = "force-dynamic";