diff --git a/app/lib/auth-client.ts b/app/lib/auth-client.ts
index ba3b7be..811590c 100644
--- a/app/lib/auth-client.ts
+++ b/app/lib/auth-client.ts
@@ -1,5 +1,7 @@
-import { createAuthClient } from "better-auth/react"
+import { anonymousClient } from "better-auth/client/plugins";
+import { createAuthClient } from "better-auth/react";
export const authClient = createAuthClient({
- /** The base URL of the server (optional if you're using the same domain) */
- // baseURL: "http://localhost:3000"
-})
+ /** The base URL of the server (optional if you're using the same domain) */
+ // baseURL: "http://localhost:3000"
+ plugins: [anonymousClient()],
+});
diff --git a/app/lib/auth.ts b/app/lib/auth.ts
index b6ac816..cf0021f 100644
--- a/app/lib/auth.ts
+++ b/app/lib/auth.ts
@@ -1,34 +1,40 @@
import { betterAuth } from "better-auth";
import { prismaAdapter } from "better-auth/adapters/prisma";
-import { PrismaClient } from "@/generated/prisma/client";
+import { PrismaClient } from "../generated/prisma/client";
import { getCloudflareContext } from "@opennextjs/cloudflare";
+import { anonymous } from "better-auth/plugins";
const prisma = new PrismaClient();
+// 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: async ({ anonymousUser, newUser }) => {
+ // TODO
+ },
+ }),
+ ],
socialProviders: {
github: {
- clientId:
- process.env.GITHUB_CLIENT_ID ??
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- (getCloudflareContext().env as any).GITHUB_CLIENT_ID,
+ clientId: process.env.GITHUB_CLIENT_ID ?? cloudflareEnv.GITHUB_CLIENT_ID,
clientSecret:
- process.env.GITHUB_CLIENT_SECRET ??
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- (getCloudflareContext().env as any).GITHUB_CLIENT_SECRET,
+ process.env.GITHUB_CLIENT_SECRET ?? cloudflareEnv.GITHUB_CLIENT_SECRET,
},
google: {
- clientId:
- process.env.GOOGLE_CLIENT_ID ??
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- (getCloudflareContext().env as any).GOOGLE_CLIENT_ID,
+ clientId: process.env.GOOGLE_CLIENT_ID ?? cloudflareEnv.GOOGLE_CLIENT_ID,
clientSecret:
- process.env.GOOGLE_CLIENT_SECRET ??
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- (getCloudflareContext().env as any).GOOGLE_CLIENT_SECRET,
+ process.env.GOOGLE_CLIENT_SECRET ?? cloudflareEnv.GOOGLE_CLIENT_SECRET,
},
},
});
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 3b3ce7f..8cda4cc 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -25,6 +25,8 @@ model User {
sessions Session[]
accounts Account[]
+ isAnonymous Boolean?
+
@@unique([email])
@@map("user")
}
From 44aca8042ac4f5038ca8bfd6734221da9a7fdc91 Mon Sep 17 00:00:00 2001
From: na-trium-144 <100704180+na-trium-144@users.noreply.github.com>
Date: Sun, 26 Oct 2025 00:20:52 +0900
Subject: [PATCH 4/8] =?UTF-8?q?=E3=83=81=E3=83=A3=E3=83=83=E3=83=88?=
=?UTF-8?q?=E3=81=8C=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E3=81=AB=E4=BF=9D?=
=?UTF-8?q?=E5=AD=98=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
=?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/[docs_id]/chatForm.tsx | 12 +++---
app/[docs_id]/chatHistory.tsx | 81 ++++++++---------------------------
app/[docs_id]/page.tsx | 5 ++-
app/[docs_id]/pageContent.tsx | 14 +++---
app/actions/chatActions.ts | 40 +++++++++--------
app/lib/auth.ts | 10 ++---
app/lib/chatHistory.ts | 72 +++++++++++++++++++++++++++++++
app/lib/prisma.ts | 5 +++
prisma/schema.prisma | 22 ++++++++++
9 files changed, 159 insertions(+), 102 deletions(-)
create mode 100644 app/lib/chatHistory.ts
create mode 100644 app/lib/prisma.ts
diff --git a/app/[docs_id]/chatForm.tsx b/app/[docs_id]/chatForm.tsx
index 932be11..381e014 100644
--- a/app/[docs_id]/chatForm.tsx
+++ b/app/[docs_id]/chatForm.tsx
@@ -1,7 +1,6 @@
"use client";
import { useState, FormEvent, useEffect } from "react";
-import { askAI } from "@/app/actions/chatActions";
import useSWR from "swr";
import {
getQuestionExample,
@@ -10,7 +9,8 @@ import {
import { getLanguageName } from "../pagesList";
import { DynamicMarkdownSection } from "./pageContent";
import { useEmbedContext } from "../terminal/embedContext";
-import { ChatMessage, useChatHistoryContext } from "./chatHistory";
+import { useChatHistoryContext } from "./chatHistory";
+import { askAI } from "@/actions/chatActions";
interface ChatFormProps {
docs_id: string;
@@ -71,8 +71,6 @@ export function ChatForm({
setIsLoading(true);
setErrorMessage(null); // Clear previous error message
- const userMessage: ChatMessage = { sender: "user", text: inputValue };
-
let userQuestion = inputValue;
if (!userQuestion && exampleData) {
// 質問が空欄なら、質問例を使用
@@ -83,6 +81,7 @@ export function ChatForm({
const result = await askAI({
userQuestion,
+ docsId: docs_id,
documentContent,
sectionContent,
replOutputs,
@@ -90,12 +89,11 @@ export function ChatForm({
execResults,
});
- if (result.error) {
+ if (result.error !== null) {
setErrorMessage(result.error);
console.log(result.error);
} else {
- const aiMessage: ChatMessage = { sender: "ai", text: result.response };
- const chatId = addChat(result.targetSectionId, [userMessage, aiMessage]);
+ addChat(result.chat);
// TODO: chatIdが指す対象の回答にフォーカス
setInputValue("");
close();
diff --git a/app/[docs_id]/chatHistory.tsx b/app/[docs_id]/chatHistory.tsx
index 65d95ce..fc92e5d 100644
--- a/app/[docs_id]/chatHistory.tsx
+++ b/app/[docs_id]/chatHistory.tsx
@@ -1,5 +1,6 @@
"use client";
+import { ChatWithMessages } from "@/lib/chatHistory";
import {
createContext,
ReactNode,
@@ -8,15 +9,10 @@ import {
useState,
} from "react";
-export interface ChatMessage {
- sender: "user" | "ai" | "error";
- text: string;
-}
-
export interface IChatHistoryContext {
- chatHistories: Record
>;
- addChat: (sectionId: string, messages: ChatMessage[]) => string;
- updateChat: (sectionId: string, chatId: string, message: ChatMessage) => void;
+ chatHistories: ChatWithMessages[];
+ addChat: (chat: ChatWithMessages) => void;
+ // updateChat: (sectionId: string, chatId: string, message: ChatMessage) => void;
}
const ChatHistoryContext = createContext(null);
export function useChatHistoryContext() {
@@ -29,65 +25,26 @@ export function useChatHistoryContext() {
return context;
}
-export function ChatHistoryProvider({ children }: { children: ReactNode }) {
- const [chatHistories, setChatHistories] = useState<
- Record>
- >({});
+export function ChatHistoryProvider({
+ children,
+ initialChatHistories,
+}: {
+ children: ReactNode;
+ initialChatHistories: ChatWithMessages[];
+}) {
+ const [chatHistories, setChatHistories] =
+ useState(initialChatHistories);
useEffect(() => {
- // Load chat histories from localStorage on mount
- const chatHistories: Record> = {};
- for (let i = 0; i < localStorage.length; i++) {
- const key = localStorage.key(i);
- if (key && key.startsWith("chat/") && key.split("/").length === 3) {
- const savedHistory = localStorage.getItem(key);
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
- const [_, sectionId, chatId] = key.split("/");
- if (savedHistory) {
- if (!chatHistories[sectionId]) {
- chatHistories[sectionId] = {};
- }
- chatHistories[sectionId][chatId] = JSON.parse(savedHistory);
- }
- }
- }
- setChatHistories(chatHistories);
- }, []);
+ setChatHistories(initialChatHistories);
+ }, [initialChatHistories]);
- const addChat = (sectionId: string, messages: ChatMessage[]): string => {
- const chatId = Date.now().toString();
- const newChatHistories = { ...chatHistories };
- if (!newChatHistories[sectionId]) {
- newChatHistories[sectionId] = {};
- }
- newChatHistories[sectionId][chatId] = messages;
- setChatHistories(newChatHistories);
- localStorage.setItem(
- `chat/${sectionId}/${chatId}`,
- JSON.stringify(messages)
- );
- return chatId;
- };
- const updateChat = (
- sectionId: string,
- chatId: string,
- message: ChatMessage
- ) => {
- const newChatHistories = { ...chatHistories };
- if (newChatHistories[sectionId] && newChatHistories[sectionId][chatId]) {
- newChatHistories[sectionId][chatId] = [
- ...newChatHistories[sectionId][chatId],
- message,
- ];
- setChatHistories(newChatHistories);
- localStorage.setItem(
- `chat/${sectionId}/${chatId}`,
- JSON.stringify(newChatHistories[sectionId][chatId])
- );
- }
+ const addChat = (chat: ChatWithMessages) => {
+ // サーバー側で追加された新しいchatをクライアント側にも反映する
+ setChatHistories([...chatHistories, chat]);
};
return (
-
+
{children}
);
diff --git a/app/[docs_id]/page.tsx b/app/[docs_id]/page.tsx
index 9c89033..7cf15dc 100644
--- a/app/[docs_id]/page.tsx
+++ b/app/[docs_id]/page.tsx
@@ -6,6 +6,7 @@ import { MarkdownSection, splitMarkdown } from "./splitMarkdown";
import pyodideLock from "pyodide/pyodide-lock.json";
import { PageContent } from "./pageContent";
import { ChatHistoryProvider } from "./chatHistory";
+import { getChat } from "@/lib/chatHistory";
export default async function Page({
params,
@@ -44,8 +45,10 @@ export default async function Page({
const splitMdContent: MarkdownSection[] = splitMarkdown(mdContent);
+ const initialChatHistories = await getChat(docs_id);
+
return (
-
+
{/* 右側に表示するチャット履歴欄 */}
- {Object.entries(chatHistories[section.sectionId] ?? {}).map(
- ([chatId, messages]) => (
+ {chatHistories.filter((c) => c.sectionId === section.sectionId).map(
+ ({chatId, messages}) => (
(
))}
diff --git a/app/actions/chatActions.ts b/app/actions/chatActions.ts
index 7adf58e..87dfa18 100644
--- a/app/actions/chatActions.ts
+++ b/app/actions/chatActions.ts
@@ -4,15 +4,21 @@
import { generateContent } from "./gemini";
import { DynamicMarkdownSection } from "../[docs_id]/pageContent";
import { ReplCommand, ReplOutput } from "../terminal/repl";
+import { addChat, ChatWithMessages } from "@/lib/chatHistory";
-interface FormState {
- response: string;
- error: string | null;
- targetSectionId: string;
-}
+type ChatResult =
+ | {
+ error: string;
+ }
+ | {
+ error: null;
+ // サーバー側でデータベースに新しく追加されたチャットデータ
+ chat: ChatWithMessages;
+ };
type ChatParams = {
userQuestion: string;
+ docsId: string;
documentContent: string;
sectionContent: DynamicMarkdownSection[];
replOutputs: Record
;
@@ -20,7 +26,7 @@ type ChatParams = {
execResults: Record;
};
-export async function askAI(params: ChatParams): Promise {
+export async function askAI(params: ChatParams): Promise {
// const parseResult = ChatSchema.safeParse(params);
// if (!parseResult.success) {
@@ -141,25 +147,21 @@ export async function askAI(params: ChatParams): Promise {
if (!text) {
throw new Error("AIからの応答が空でした");
}
+ // TODO: どのセクションへの回答にするかをAIに決めさせる
+ const targetSectionId =
+ sectionContent.find((s) => s.inView)?.sectionId || "";
+ const newChat = await addChat(params.docsId, targetSectionId, [
+ { role: "user", content: userQuestion },
+ { role: "ai", content: text },
+ ]);
return {
- response: text,
error: null,
- // TODO: どのセクションへの回答にするかをAIに決めさせる
- targetSectionId: sectionContent.find((s) => s.inView)?.sectionId || "",
+ chat: newChat,
};
} catch (error: unknown) {
console.error("Error calling Generative AI:", error);
- if (error instanceof Error) {
- return {
- response: "",
- error: `AIへのリクエスト中にエラーが発生しました: ${error.message}`,
- targetSectionId: sectionContent.find((s) => s.inView)?.sectionId || "",
- };
- }
return {
- response: "",
- error: "予期せぬエラーが発生しました。",
- targetSectionId: sectionContent.find((s) => s.inView)?.sectionId || "",
+ error: String(error),
};
}
}
diff --git a/app/lib/auth.ts b/app/lib/auth.ts
index cf0021f..1b91e16 100644
--- a/app/lib/auth.ts
+++ b/app/lib/auth.ts
@@ -1,10 +1,9 @@
import { betterAuth } from "better-auth";
import { prismaAdapter } from "better-auth/adapters/prisma";
-import { PrismaClient } from "../generated/prisma/client";
import { getCloudflareContext } from "@opennextjs/cloudflare";
import { anonymous } from "better-auth/plugins";
-
-const prisma = new PrismaClient();
+import prisma from "./prisma";
+import { migrateChatUser } from "./chatHistory";
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let cloudflareEnv: any;
@@ -20,9 +19,8 @@ export const auth = betterAuth({
}),
plugins: [
anonymous({
- onLinkAccount: async ({ anonymousUser, newUser }) => {
- // TODO
- },
+ onLinkAccount: ({ anonymousUser, newUser }) =>
+ migrateChatUser(anonymousUser.user.id, newUser.user.id),
}),
],
socialProviders: {
diff --git a/app/lib/chatHistory.ts b/app/lib/chatHistory.ts
new file mode 100644
index 0000000..7738d4c
--- /dev/null
+++ b/app/lib/chatHistory.ts
@@ -0,0 +1,72 @@
+import { headers } from "next/headers";
+import { auth } from "./auth";
+import prisma from "./prisma";
+
+export interface CreateChatMessage {
+ role: "user" | "ai" | "error";
+ content: string;
+}
+
+export async function addChat(
+ docsId: string,
+ sectionId: string,
+ messages: CreateChatMessage[]
+) {
+ const session = await auth.api.getSession({ headers: await headers() });
+ if (!session) {
+ throw new Error("Not authenticated");
+ }
+
+ return await prisma.chat.create({
+ data: {
+ userId: session.user.id,
+ docsId,
+ sectionId,
+ messages: {
+ createMany: {
+ data: messages,
+ },
+ },
+ },
+ include: {
+ messages: true,
+ },
+ });
+}
+
+export type ChatWithMessages = Awaited>;
+
+export async function getChat(docsId: string) {
+ const session = await auth.api.getSession({ headers: await headers() });
+ if (!session) {
+ return [];
+ }
+
+ return await prisma.chat.findMany({
+ where: {
+ userId: session.user.id,
+ docsId,
+ },
+ include: {
+ messages: {
+ orderBy: {
+ id: "asc",
+ },
+ },
+ },
+ orderBy: {
+ chatId: "asc",
+ },
+ });
+}
+
+export async function migrateChatUser(oldUserId: string, newUserId: string) {
+ await prisma.chat.updateMany({
+ where: {
+ userId: oldUserId,
+ },
+ data: {
+ userId: newUserId,
+ },
+ });
+}
diff --git a/app/lib/prisma.ts b/app/lib/prisma.ts
new file mode 100644
index 0000000..72dd8ef
--- /dev/null
+++ b/app/lib/prisma.ts
@@ -0,0 +1,5 @@
+import { PrismaClient } from "../generated/prisma/client";
+
+const prisma = new PrismaClient();
+export default prisma;
+
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 8cda4cc..93cfeb7 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -27,6 +27,8 @@ model User {
isAnonymous Boolean?
+ Chat Chat[]
+
@@unique([email])
@@map("user")
}
@@ -75,3 +77,23 @@ model Verification {
@@map("verification")
}
+
+// ここまでbetter-authが使う
+
+model Chat {
+ chatId Int @id @default(autoincrement())
+ userId String
+ user User @relation(fields: [userId], references: [id], onDelete: Cascade)
+ docsId String
+ sectionId String
+
+ messages Message[]
+}
+
+model Message {
+ id Int @id @default(autoincrement())
+ chatId Int
+ chat Chat @relation(fields: [chatId], references: [chatId], onDelete: Cascade)
+ role String
+ content String
+}
From 62960ebb75d41e958bc9c2c8717c9e511e74de4a Mon Sep 17 00:00:00 2001
From: na-trium-144 <100704180+na-trium-144@users.noreply.github.com>
Date: Sun, 26 Oct 2025 02:57:06 +0900
Subject: [PATCH 5/8] =?UTF-8?q?id=E3=81=AFincrement=E3=81=A7=E3=81=AA?=
=?UTF-8?q?=E3=81=84=E3=81=BB=E3=81=86=E3=81=8C=E3=82=88=E3=81=84=E8=AA=AC?=
=?UTF-8?q?=20(=E3=81=97=E3=82=89=E3=82=93=E3=81=91=E3=81=A9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/lib/chatHistory.ts | 4 ++--
prisma/schema.prisma | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/app/lib/chatHistory.ts b/app/lib/chatHistory.ts
index 7738d4c..a8faf0b 100644
--- a/app/lib/chatHistory.ts
+++ b/app/lib/chatHistory.ts
@@ -50,12 +50,12 @@ export async function getChat(docsId: string) {
include: {
messages: {
orderBy: {
- id: "asc",
+ createdAt: "asc",
},
},
},
orderBy: {
- chatId: "asc",
+ createdAt: "asc",
},
});
}
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 93cfeb7..adba390 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -81,19 +81,21 @@ model Verification {
// ここまでbetter-authが使う
model Chat {
- chatId Int @id @default(autoincrement())
+ chatId String @id @default(uuid())
userId String
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
docsId String
sectionId String
+ createdAt DateTime @default(now())
messages Message[]
}
model Message {
- id Int @id @default(autoincrement())
- chatId Int
+ id String @id @default(uuid())
+ chatId String
chat Chat @relation(fields: [chatId], references: [chatId], onDelete: Cascade)
role String
content String
+ createdAt DateTime @default(now())
}
From 3f3cb6f980d5b78f0fe0ecddf4f36b6bcc03ec19 Mon Sep 17 00:00:00 2001
From: na-trium-144 <100704180+na-trium-144@users.noreply.github.com>
Date: Sun, 26 Oct 2025 03:08:09 +0900
Subject: [PATCH 6/8] =?UTF-8?q?=E3=82=BD=E3=83=BC=E3=82=B7=E3=83=A3?=
=?UTF-8?q?=E3=83=AB=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3=E3=81=A8=E3=83=AD?=
=?UTF-8?q?=E3=82=B0=E3=82=A2=E3=82=A6=E3=83=88=E3=81=AE=E6=8C=99=E5=8B=95?=
=?UTF-8?q?=E3=82=92=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 11 ++++++++--
app/accountMenu.tsx | 51 ++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 4fcf484..15a95d7 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,6 @@ API_KEY=GeminiAPIキー
BETTER_AUTH_URL=http://localhost:3000
```
-
-
prismaの開発環境を起動
(.env にDATABASE_URLが自動的に追加される)
```bash
@@ -26,6 +24,15 @@ npx prisma dev
npx prisma db push
```
+### 本番環境の場合
+
+上記の環境変数以外に、
+* BETTER_AUTH_SECRET に任意の文字列
+* DATABASE_URL に本番用のPostgreSQLデータベースURL
+* GOOGLE_CLIENT_IDとGOOGLE_CLIENT_SECRETにGoogle OAuthのクライアントIDとシークレット https://www.better-auth.com/docs/authentication/google
+* GITHUB_CLIENT_IDとGITHUB_CLIENT_SECRETにGitHub OAuthのクライアントIDとシークレット https://www.better-auth.com/docs/authentication/github
+
+
## 開発環境
```bash
diff --git a/app/accountMenu.tsx b/app/accountMenu.tsx
index d7588f5..c5d0f4c 100644
--- a/app/accountMenu.tsx
+++ b/app/accountMenu.tsx
@@ -1,6 +1,7 @@
"use client";
import { authClient } from "@/lib/auth-client";
+import { usePathname } from "next/navigation";
import { useEffect } from "react";
export function AutoAnonymousLogin() {
@@ -16,6 +17,30 @@ export function AutoAnonymousLogin() {
export function AccountMenu() {
const { data: session, isPending } = authClient.useSession();
+ const pathname = usePathname();
+
+ const signout = () => {
+ if (
+ window.confirm(
+ "ログアウトしますか？\nチャット履歴はこの端末上で見られなくなりますが、再度ログインすることでアクセスできます。"
+ )
+ ) {
+ authClient.signOut({
+ fetchOptions: {
+ onSuccess: () => window.location.reload(),
+ },
+ });
+ }
+ };
+ const signoutFromAnonymous = () => {
+ if (window.confirm("チャット履歴は削除され、アクセスできなくなります。")) {
+ authClient.signOut({
+ fetchOptions: {
+ onSuccess: () => window.location.reload(),
+ },
+ });
+ }
+ };
if (isPending) {
return ;
@@ -40,7 +65,7 @@ export function AccountMenu() {
className="mt-3 z-[1] p-2 shadow menu menu-sm dropdown-content bg-base-100 rounded-box w-52"
>
- authClient.signOut()}>ログアウト
+ ログアウト
@@ -73,18 +98,38 @@ export function AccountMenu() {
+ {session?.user && (
+ <>
+
+
+
+
+
+ )}