dekun/zhimingge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: decouple AI completion from history save failures and improve history API errors

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
dekun
2026-06-16 21:31:20 +08:00
parent 123a5cce6d
commit 187b08c3e1
8 changed files with 145 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/api/history/[id]/route.ts
+12 -1
View File
@@ -1,11 +1,15 @@
import { NextResponse } from "next/server";
import { getHistoryUsername } from "@/lib/history/request-user";
import { deleteHistoryEntry } from "@/lib/history/server-store";
import {
deleteHistoryEntry,
historyStoreErrorMessage,
} from "@/lib/history/server-store";
export async function DELETE(
_req: Request,
{ params }: { params: Promise<{ id: string }> },
) {
try {
const username = await getHistoryUsername();
if (!username) {
return NextResponse.json({ error: "请先登录" }, { status: 401 });
@@ -18,4 +22,11 @@ export async function DELETE(
}
return NextResponse.json({ ok: true });
} catch (err) {
console.error("[history DELETE]", err);
return NextResponse.json(
{ error: historyStoreErrorMessage(err) },
{ status: 500 },
);
}
}
app/api/history/route.ts
+17
View File
@@ -2,11 +2,13 @@ import { NextResponse } from "next/server";
import { getHistoryUsername } from "@/lib/history/request-user";
import {
addHistoryEntry,
historyStoreErrorMessage,
listHistoryEntries,
} from "@/lib/history/server-store";
import type { CalcHistoryCreate } from "@/lib/history/types";
export async function GET() {
try {
const username = await getHistoryUsername();
if (!username) {
return NextResponse.json({ error: "请先登录" }, { status: 401 });
@@ -14,9 +16,17 @@ export async function GET() {
const items = await listHistoryEntries(username);
return NextResponse.json({ items });
} catch (err) {
console.error("[history GET]", err);
return NextResponse.json(
{ error: historyStoreErrorMessage(err) },
{ status: 500 },
);
}
}
export async function POST(req: Request) {
try {
const username = await getHistoryUsername();
if (!username) {
return NextResponse.json({ error: "请先登录" }, { status: 401 });
@@ -46,4 +56,11 @@ export async function POST(req: Request) {
});
return NextResponse.json({ entry });
} catch (err) {
console.error("[history POST]", err);
return NextResponse.json(
{ error: historyStoreErrorMessage(err) },
{ status: 500 },
);
}
}
components/modes/bazi-form.tsx
+8 -2
View File
@@ -16,7 +16,7 @@ import RegionSelect, {
} from "@/components/shared/region-select";
import { calculateBazi, type BaziChart } from "@/lib/calc/bazi";
import { streamAiCompletion } from "@/lib/ai/client-stream";
import { saveHistoryEntry } from "@/lib/history/storage";
import { saveHistoryEntrySafe } from "@/lib/history/storage";
export default function BaziForm() {
const [date, setDate] = useState(todaySolarYmd());
@@ -29,6 +29,7 @@ export default function BaziForm() {
const [chart, setChart] = useState<BaziChart | null>(null);
const [completion, setCompletion] = useState("");
const [error, setError] = useState("");
const [warning, setWarning] = useState("");
const [isLoading, setIsLoading] = useState(false);
const location = useRegionLocation(provinceCode, cityCode);
@@ -77,6 +78,7 @@ export default function BaziForm() {
}
setError("");
setWarning("");
setCompletion("");
setIsLoading(true);
@@ -92,7 +94,7 @@ export default function BaziForm() {
},
setCompletion,
);
await saveHistoryEntry({
const saveResult = await saveHistoryEntrySafe({
mode: "bazi",
title: "生辰八字解读",
question,
@@ -115,6 +117,9 @@ export default function BaziForm() {
四柱: `${activeChart.pillars.year.ganZhi} ${activeChart.pillars.month.ganZhi} ${activeChart.pillars.day.ganZhi} ${activeChart.pillars.time.ganZhi}`,
},
});
if (!saveResult.ok) {
setWarning(saveResult.error);
}
} catch (err) {
setError(err instanceof Error ? err.message : String(err));
} finally {
@@ -137,6 +142,7 @@ export default function BaziForm() {
isLoading={isLoading}
onCompletion={handleAnalyze}
error={error}
warning={warning}
emptyHint="排盘后点击「AI 测算」获取解读"
downloadFilename={completion ? "生辰八字解读.md" : undefined}
downloadPreamble={downloadPreamble}
components/modes/combined-form.tsx
+8 -2
View File
@@ -23,7 +23,7 @@ import RegionSelect, {
import { calculateBazi, type BaziChart } from "@/lib/calc/bazi";
import type { GuaResult } from "@/lib/calc/hexagram";
import { streamAiCompletion } from "@/lib/ai/client-stream";
import { saveHistoryEntry } from "@/lib/history/storage";
import { saveHistoryEntrySafe } from "@/lib/history/storage";
export default function CombinedForm() {
const [birthDate, setBirthDate] = useState(todaySolarYmd());
@@ -45,6 +45,7 @@ export default function CombinedForm() {
const [chart, setChart] = useState<BaziChart | null>(null);
const [completion, setCompletion] = useState("");
const [error, setError] = useState("");
const [warning, setWarning] = useState("");
const [isLoading, setIsLoading] = useState(false);
const birthLocation = useRegionLocation(birthProvince, birthCity);
@@ -112,6 +113,7 @@ export default function CombinedForm() {
}
setError("");
setWarning("");
setCompletion("");
setIsLoading(true);
@@ -155,7 +157,7 @@ export default function CombinedForm() {
},
setCompletion,
);
await saveHistoryEntry({
const saveResult = await saveHistoryEntrySafe({
mode: "combined",
title: "综合测算解读",
question,
@@ -189,6 +191,9 @@ export default function CombinedForm() {
六爻: withHexagram && guaData ? guaData.result.guaTitle : "无",
},
});
if (!saveResult.ok) {
setWarning(saveResult.error);
}
} catch (e) {
setError(e instanceof Error ? e.message : String(e));
} finally {
@@ -211,6 +216,7 @@ export default function CombinedForm() {
isLoading={isLoading}
onCompletion={handleAnalyze}
error={error}
warning={warning}
emptyHint="填写完整信息后，点击「综合测算」"
downloadFilename={completion ? "综合测算解读.md" : undefined}
downloadPreamble={downloadPreamble}
components/modes/liuyao-form.tsx
+10 -2
View File
@@ -17,7 +17,7 @@ import RegionSelect, {
useRegionLocation,
} from "@/components/shared/region-select";
import { streamAiCompletion } from "@/lib/ai/client-stream";
import { saveHistoryEntry } from "@/lib/history/storage";
import { saveHistoryEntrySafe } from "@/lib/history/storage";
import type { GuaResult } from "@/lib/calc/hexagram";
import todayJson from "@/lib/data/today.json";
@@ -34,6 +34,7 @@ export default function LiuyaoForm() {
const [guaData, setGuaData] = useState<GuaResult | null>(null);
const [completion, setCompletion] = useState("");
const [error, setError] = useState("");
const [warning, setWarning] = useState("");
const [isLoading, setIsLoading] = useState(false);
const location = useRegionLocation(provinceCode, cityCode);
@@ -65,6 +66,7 @@ export default function LiuyaoForm() {
}
setError("");
setWarning("");
setCompletion("");
setIsLoading(true);
@@ -86,7 +88,7 @@ export default function LiuyaoForm() {
},
setCompletion,
);
await saveHistoryEntry({
const saveResult = await saveHistoryEntrySafe({
mode: "liuyao",
title: guaData!.result.guaTitle,
question,
@@ -104,6 +106,9 @@ export default function LiuyaoForm() {
卦象: guaData!.result.guaTitle,
},
});
if (!saveResult.ok) {
setWarning(saveResult.error);
}
} catch (e) {
setError(e instanceof Error ? e.message : String(e));
} finally {
@@ -122,6 +127,7 @@ export default function LiuyaoForm() {
setGuaData(null);
setCompletion("");
setError("");
setWarning("");
setIsLoading(false);
}
@@ -129,6 +135,7 @@ export default function LiuyaoForm() {
setGuaData(data);
setCompletion("");
setError("");
setWarning("");
}
const downloadPreamble =
@@ -145,6 +152,7 @@ export default function LiuyaoForm() {
isLoading={isLoading}
onCompletion={handleAnalyze}
error={error}
warning={warning}
emptyHint="完成起卦后，点击「AI 解读」"
downloadFilename={
completion && guaData
components/result-ai.tsx
+10
View File
@@ -11,6 +11,7 @@ function ResultAI({
isLoading,
onCompletion,
error,
warning,
panel = false,
emptyHint = "完成左侧填写并起卦/排盘后，点击「AI 解读」",
downloadFilename,
@@ -20,6 +21,7 @@ function ResultAI({
isLoading: boolean;
onCompletion: () => void;
error: string;
warning?: string;
panel?: boolean;
emptyHint?: string;
downloadFilename?: string;
@@ -94,9 +96,17 @@ function ResultAI({
<p className="mt-1 whitespace-pre-wrap">{error}</p>
</div>
) : completion ? (
<>
{warning && (
<div className="mb-3 rounded-md border border-amber-500/40 bg-amber-500/10 px-3 py-2 text-sm text-amber-700 dark:text-amber-300">
<p className="font-medium">解读已完成，但历史未保存</p>
<p className="mt-1 whitespace-pre-wrap">{warning}</p>
</div>
)}
<Markdown className="prose max-w-none text-sm dark:prose-invert prose-p:leading-relaxed">
{completion}
</Markdown>
</>
) : isLoading ? (
<p className="text-sm text-muted-foreground">正在等待 AI 响应...</p>
) : (
lib/history/server-store.ts
+18
View File
@@ -15,6 +15,24 @@ function getDataDir(): string {
return path.join(process.cwd(), "data", "history");
}
export function historyStoreErrorMessage(err: unknown): string {
if (!(err instanceof Error)) {
return "保存测算历史失败";
}
const code = (err as NodeJS.ErrnoException).code;
const dir = getDataDir();
if (code === "EACCES" || code === "EPERM") {
return `测算历史目录无写入权限（${dir}），请检查 HISTORY_DATA_DIR 或目录权限`;
}
if (code === "ENOENT") {
return `测算历史目录不存在（${dir}），请创建目录或配置 HISTORY_DATA_DIR`;
}
if (code === "ENOSPC") {
return "磁盘空间不足，无法保存测算历史";
}
return `保存测算历史失败：${err.message}`;
}
function sanitizeUsername(username: string): string {
const safe = username.replace(/[^a-zA-Z0-9_-]/g, "_");
return safe || "guest";
lib/history/storage.ts
+16
View File
@@ -34,6 +34,22 @@ export async function saveHistoryEntry(
return data.entry;
}
export async function saveHistoryEntrySafe(
entry: CalcHistoryCreate,
): Promise<
{ ok: true; entry: CalcHistoryEntry } | { ok: false; error: string }
> {
try {
const saved = await saveHistoryEntry(entry);
return { ok: true, entry: saved };
} catch (err) {
return {
ok: false,
error: err instanceof Error ? err.message : String(err),
};
}
}
export async function deleteHistoryEntry(id: string): Promise<void> {
const res = await fetch(`/api/history/${encodeURIComponent(id)}`, {
method: "DELETE",