workerで動くよう修正

Author: na-trium-144

.gitignore

@@ -42,5 +42,3 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
-
-/app/generated/prisma

app/api/auth/[...all]/route.ts

@@ -1,4 +1,8 @@
-import { auth } from "@/lib/auth"; // path to your auth file
+import { getAuthServer } from "@/lib/auth";
+import { getPrismaClient } from "@/lib/prisma";
 import { toNextJsHandler } from "better-auth/next-js";
 
-export const { POST, GET } = toNextJsHandler(auth);
+export const { POST, GET } = toNextJsHandler({
+  handler: async (req) =>
+    (await getAuthServer(await getPrismaClient())).handler(req),
+});

app/lib/auth.ts

@@ -2,37 +2,43 @@ import { betterAuth } from "better-auth";
 import { prismaAdapter } from "better-auth/adapters/prisma";
 import { getCloudflareContext } from "@opennextjs/cloudflare";
 import { anonymous } from "better-auth/plugins";
-import prisma from "./prisma";
 import { migrateChatUser } from "./chatHistory";
+import { PrismaClient } from "@prisma/client";
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let cloudflareEnv: any;
-try {
-  cloudflareEnv = getCloudflareContext().env;
-} catch {
-  // @better-auth/cli generate を実行する際には initOpenNextCloudflareForDev がセットアップされていない環境になっている
-  cloudflareEnv = {};
-}
-export const auth = betterAuth({
-  database: prismaAdapter(prisma, {
-    provider: "postgresql",
-  }),
-  plugins: [
-    anonymous({
-      onLinkAccount: ({ anonymousUser, newUser }) =>
-        migrateChatUser(anonymousUser.user.id, newUser.user.id),
+export async function getAuthServer(prisma: PrismaClient) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let cloudflareEnv: any;
+  try {
+    cloudflareEnv = getCloudflareContext().env;
+  } catch {
+    // @better-auth/cli generate を実行する際には initOpenNextCloudflareForDev がセットアップされていない環境になっている
+    cloudflareEnv = {};
+  }
+  return betterAuth({
+    database: prismaAdapter(prisma, {
+      provider: "sqlite",
     }),
-  ],
-  socialProviders: {
-    github: {
-      clientId: process.env.GITHUB_CLIENT_ID ?? cloudflareEnv.GITHUB_CLIENT_ID,
-      clientSecret:
-        process.env.GITHUB_CLIENT_SECRET ?? cloudflareEnv.GITHUB_CLIENT_SECRET,
-    },
-    google: {
-      clientId: process.env.GOOGLE_CLIENT_ID ?? cloudflareEnv.GOOGLE_CLIENT_ID,
-      clientSecret:
-        process.env.GOOGLE_CLIENT_SECRET ?? cloudflareEnv.GOOGLE_CLIENT_SECRET,
+    plugins: [
+      anonymous({
+        onLinkAccount: ({ anonymousUser, newUser }) =>
+          migrateChatUser(anonymousUser.user.id, newUser.user.id),
+      }),
+    ],
+    socialProviders: {
+      github: {
+        clientId:
+          process.env.GITHUB_CLIENT_ID ?? cloudflareEnv.GITHUB_CLIENT_ID,
+        clientSecret:
+          process.env.GITHUB_CLIENT_SECRET ??
+          cloudflareEnv.GITHUB_CLIENT_SECRET,
+      },
+      google: {
+        clientId:
+          process.env.GOOGLE_CLIENT_ID ?? cloudflareEnv.GOOGLE_CLIENT_ID,
+        clientSecret:
+          process.env.GOOGLE_CLIENT_SECRET ??
+          cloudflareEnv.GOOGLE_CLIENT_SECRET,
+      },
     },
-  },
-});
+  });
+}

app/lib/chatHistory.ts

@@ -1,6 +1,6 @@
 import { headers } from "next/headers";
-import { auth } from "./auth";
-import prisma from "./prisma";
+import { getAuthServer } from "./auth";
+import { getPrismaClient } from "./prisma";
 
 export interface CreateChatMessage {
   role: "user" | "ai" | "error";
@@ -12,6 +12,8 @@ export async function addChat(
   sectionId: string,
   messages: CreateChatMessage[]
 ) {
+  const prisma = await getPrismaClient();
+  const auth = await getAuthServer(prisma);
   const session = await auth.api.getSession({ headers: await headers() });
   if (!session) {
     throw new Error("Not authenticated");
@@ -37,6 +39,8 @@ export async function addChat(
 export type ChatWithMessages = Awaited<ReturnType<typeof addChat>>;
 
 export async function getChat(docsId: string) {
+  const prisma = await getPrismaClient();
+  const auth = await getAuthServer(prisma);
   const session = await auth.api.getSession({ headers: await headers() });
   if (!session) {
     return [];
@@ -61,6 +65,7 @@ export async function getChat(docsId: string) {
 }
 
 export async function migrateChatUser(oldUserId: string, newUserId: string) {
+  const prisma = await getPrismaClient();
   await prisma.chat.updateMany({
     where: {
       userId: oldUserId,

app/lib/prisma.ts

@@ -1,24 +1,16 @@
-import { PrismaClient } from "../generated/prisma/client";
-import { PrismaPg } from "@prisma/adapter-pg";
-import { PrismaNeon } from "@prisma/adapter-neon";
 import { getCloudflareContext } from "@opennextjs/cloudflare";
+import { PrismaClient } from "@prisma/client";
+import { PrismaD1 } from "@prisma/adapter-d1";
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let cloudflareEnv: any;
-try {
-  cloudflareEnv = getCloudflareContext().env;
-} catch {
-  // @better-auth/cli generate を実行する際には initOpenNextCloudflareForDev がセットアップされていない環境になっている
-  cloudflareEnv = {};
-}
-const DATABASE_URL =
-  process.env.DATABASE_URL ?? cloudflareEnv.DATABASE_URL ?? "";
+export async function getPrismaClient() {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let cloudflareEnv: any;
+  try {
+    cloudflareEnv = (await getCloudflareContext({ async: true })).env;
+  } catch {
+    // @better-auth/cli generate を実行する際には initOpenNextCloudflareForDev がセットアップされていない環境になっている
+    cloudflareEnv = {};
+  }
 
-let adapter;
-if (DATABASE_URL.includes("neon")) {
-  adapter = new PrismaNeon({ connectionString: DATABASE_URL });
-} else {
-  adapter = new PrismaPg({ connectionString: DATABASE_URL });
+  return new PrismaClient({ adapter: new PrismaD1(cloudflareEnv.my_code_db) });
 }
-const prisma = new PrismaClient({ adapter });
-export default prisma;

next.config.ts

@@ -15,6 +15,7 @@ const nextConfig: NextConfig = {
   env: {
     PYODIDE_VERSION: pyodideVersion,
   },
+  serverExternalPackages: ["@prisma/client", ".prisma/client"],
 };
 
 export default nextConfig;

package.json

@@ -9,7 +9,7 @@
     "lint": "prisma generate && npm run cf-typegen && next lint",
     "tsc": "prisma generate && npm run cf-typegen && tsc",
     "format": "prettier --write app/",
-    "cf-preview": "opennextjs-cloudflare build && opennextjs-cloudflare preview",
+    "cf-preview": "opennextjs-cloudflare build && opennextjs-cloudflare preview --port 3000",
     "cf-deploy": "opennextjs-cloudflare build && opennextjs-cloudflare deploy",
     "cf-typegen": "wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts"
   },

prisma/schema.prisma

@@ -5,9 +5,10 @@
 // Try Prisma Accelerate: https://pris.ly/cli/accelerate-init
 
 generator client {
-  provider = "prisma-client"
-  output   = "../app/generated/prisma"
-  engineType = "client"
+  provider = "prisma-client-js"
+  // outputを指定すると動作しない: https://opennext.js.org/cloudflare/howtos/db#schemaprisma
+  // output   = "../app/generated/prisma"
+  // engineType = "client"
 }
 
 datasource db {