Fix 500 Internal Server Error: Add error handling for D1 database access in Cloudflare Pages

This commit is contained in:
katelya
2025-09-05 16:05:52 +08:00
parent 142c780b50
commit 07cdaafcb2
3 changed files with 47 additions and 15 deletions
+13 -6
View File
@@ -14,12 +14,19 @@ const inter = Inter({ subsets: ['latin'] });
// 动态生成 metadata,支持配置更新后的标题变化 // 动态生成 metadata,支持配置更新后的标题变化
export async function generateMetadata(): Promise<Metadata> { export async function generateMetadata(): Promise<Metadata> {
let siteName = process.env.SITE_NAME || 'KatelyaTV'; let siteName = process.env.SITE_NAME || 'KatelyaTV';
if (
process.env.NEXT_PUBLIC_STORAGE_TYPE !== 'd1' && try {
process.env.NEXT_PUBLIC_STORAGE_TYPE !== 'upstash' // 只有在非 d1 和 upstash 存储类型时才尝试获取配置
) { if (
const config = await getConfig(); process.env.NEXT_PUBLIC_STORAGE_TYPE !== 'd1' &&
siteName = config.SiteConfig.SiteName; process.env.NEXT_PUBLIC_STORAGE_TYPE !== 'upstash'
) {
const config = await getConfig();
siteName = config.SiteConfig.SiteName;
}
} catch (error) {
// 如果配置获取失败,使用默认站点名称
// siteName 已经有默认值,不需要额外处理
} }
return { return {
+18 -8
View File
@@ -225,19 +225,24 @@ async function initConfig() {
export async function getConfig(): Promise<AdminConfig> { export async function getConfig(): Promise<AdminConfig> {
const storageType = process.env.NEXT_PUBLIC_STORAGE_TYPE || 'localstorage'; const storageType = process.env.NEXT_PUBLIC_STORAGE_TYPE || 'localstorage';
if (process.env.DOCKER_ENV === 'true' || storageType === 'localstorage') { if (process.env.DOCKER_ENV === 'true' || storageType === 'localstorage') {
await initConfig(); await initConfig();
return cachedConfig; return cachedConfig;
} }
// 非 docker 环境且 DB 存储,直接读 db 配置 // 非 docker 环境且 DB 存储,直接读 db 配置
const storage = getStorage(); try {
let adminConfig: AdminConfig | null = null; const storage = getStorage();
if (storage && typeof (storage as any).getAdminConfig === 'function') { let adminConfig: AdminConfig | null = null;
adminConfig = await (storage as any).getAdminConfig();
} if (storage && typeof (storage as any).getAdminConfig === 'function') {
if (adminConfig) { adminConfig = await (storage as any).getAdminConfig();
// 合并一些环境变量配置 }
adminConfig.SiteConfig.SiteName = process.env.SITE_NAME || 'KatelyaTV';
if (adminConfig) {
// 合并一些环境变量配置
adminConfig.SiteConfig.SiteName = process.env.SITE_NAME || 'KatelyaTV';
adminConfig.SiteConfig.Announcement = adminConfig.SiteConfig.Announcement =
process.env.ANNOUNCEMENT || process.env.ANNOUNCEMENT ||
'本网站仅提供影视信息搜索服务,所有内容均来自第三方网站。本站不存储任何视频资源,不对任何内容的准确性、合法性、完整性负责。'; '本网站仅提供影视信息搜索服务,所有内容均来自第三方网站。本站不存储任何视频资源,不对任何内容的准确性、合法性、完整性负责。';
@@ -306,6 +311,11 @@ export async function getConfig(): Promise<AdminConfig> {
await initConfig(); await initConfig();
} }
return cachedConfig; return cachedConfig;
} catch (error) {
// 如果数据库访问失败,回退到默认配置
await initConfig();
return cachedConfig;
}
} }
export async function resetConfig() { export async function resetConfig() {
+16 -1
View File
@@ -39,7 +39,22 @@ interface D1ExecResult {
// 获取全局D1数据库实例 // 获取全局D1数据库实例
function getD1Database(): D1Database { function getD1Database(): D1Database {
return (process.env as any).DB as D1Database; // 在 Cloudflare Pages/Workers 环境中,DB 是全局变量
if (typeof globalThis !== 'undefined' && (globalThis as any).DB) {
return (globalThis as any).DB as D1Database;
}
// 回退到 process.env(用于本地开发)
if ((process.env as any).DB) {
return (process.env as any).DB as D1Database;
}
// 最后尝试从 globalThis.process.env
if (typeof globalThis !== 'undefined' && (globalThis as any).process?.env?.DB) {
return (globalThis as any).process.env.DB as D1Database;
}
throw new Error('D1 database not available. Make sure DB binding is configured.');
} }
export class D1Storage implements IStorage { export class D1Storage implements IStorage {