fix: 修复 CodeRabbit webhook 反馈

messages/en/settings.json

@@ -429,6 +429,11 @@
     "dingtalkSecretPlaceholder": "Optional, used for signing",
     "customHeaders": "Custom Headers (JSON)",
     "customHeadersPlaceholder": "{\"X-Token\":\"...\"}",
+    "errors": {
+      "headersInvalidJson": "Headers must be valid JSON",
+      "headersMustBeObject": "Headers must be a JSON object",
+      "headersValueMustBeString": "Header values must be strings"
+    },
     "types": {
       "wechat": "WeCom",
       "feishu": "Feishu",

messages/ja/settings.json

@@ -420,6 +420,11 @@
     "dingtalkSecretPlaceholder": "任意（署名用）",
     "customHeaders": "カスタムヘッダー（JSON）",
     "customHeadersPlaceholder": "{\"X-Token\":\"...\"}",
+    "errors": {
+      "headersInvalidJson": "Headers は有効な JSON である必要があります",
+      "headersMustBeObject": "Headers は JSON オブジェクトである必要があります",
+      "headersValueMustBeString": "Headers の値は文字列である必要があります"
+    },
     "types": {
       "wechat": "WeCom",
       "feishu": "Feishu",

messages/ru/settings.json

@@ -420,6 +420,11 @@
     "dingtalkSecretPlaceholder": "Необязательно, для подписи",
     "customHeaders": "Пользовательские заголовки (JSON)",
     "customHeadersPlaceholder": "{\"X-Token\":\"...\"}",
+    "errors": {
+      "headersInvalidJson": "Заголовки должны быть корректным JSON",
+      "headersMustBeObject": "Заголовки должны быть JSON-объектом",
+      "headersValueMustBeString": "Значения заголовков должны быть строками"
+    },
     "types": {
       "wechat": "WeCom",
       "feishu": "Feishu",

messages/zh-CN/settings.json

@@ -1678,6 +1678,11 @@
     "dingtalkSecretPlaceholder": "可选，用于签名",
     "customHeaders": "自定义 Headers（JSON）",
     "customHeadersPlaceholder": "{\"X-Token\":\"...\"}",
+    "errors": {
+      "headersInvalidJson": "Headers 不是有效 JSON",
+      "headersMustBeObject": "Headers 必须是 JSON 对象",
+      "headersValueMustBeString": "Headers 的值必须为字符串"
+    },
     "types": {
       "wechat": "企业微信",
       "feishu": "飞书",

messages/zh-TW/settings.json

@@ -420,6 +420,11 @@
     "dingtalkSecretPlaceholder": "可選，用於簽名",
     "customHeaders": "自訂 Headers（JSON）",
     "customHeadersPlaceholder": "{\"X-Token\":\"...\"}",
+    "errors": {
+      "headersInvalidJson": "Headers 不是有效 JSON",
+      "headersMustBeObject": "Headers 必須是 JSON 物件",
+      "headersValueMustBeString": "Headers 的值必須為字串"
+    },
     "types": {
       "wechat": "企業微信",
       "feishu": "飛書",

src/actions/notifications.ts

@@ -11,6 +11,7 @@ import {
   type UpdateNotificationSettingsInput,
   updateNotificationSettings,
 } from "@/repository/notifications";
+import type { ActionResult } from "./types";
 
 /**
  * 获取通知设置
@@ -28,11 +29,11 @@ export async function getNotificationSettingsAction(): Promise<NotificationSetti
  */
 export async function updateNotificationSettingsAction(
   payload: UpdateNotificationSettingsInput
-): Promise<{ success: boolean; data?: NotificationSettings; error?: string }> {
+): Promise<ActionResult<NotificationSettings>> {
   try {
     const session = await getSession();
     if (!session || session.user.role !== "admin") {
-      return { success: false, error: "无权限执行此操作" };
+      return { ok: false, error: "无权限执行此操作" };
     }
 
     const updated = await updateNotificationSettings(payload);
@@ -50,10 +51,10 @@ export async function updateNotificationSettingsAction(
       });
     }
 
-    return { success: true, data: updated };
+    return { ok: true, data: updated };
   } catch (error) {
     return {
-      success: false,
+      ok: false,
       error: error instanceof Error ? error.message : "更新通知设置失败",
     };
   }

src/actions/webhook-targets.ts

@@ -25,15 +25,27 @@ function trimToNull(value: string | null | undefined): string | null {
   return trimmed ? trimmed : null;
 }
 
-function parseCustomTemplate(value: string | null | undefined): Record<string, unknown> | null {
-  const trimmed = trimToNull(value);
-  if (!trimmed) return null;
+function parseCustomTemplate(value: unknown): Record<string, unknown> | null {
+  if (value === null || value === undefined) {
+    return null;
+  }
+
+  if (typeof value === "string") {
+    const trimmed = trimToNull(value);
+    if (!trimmed) return null;
 
-  const parsed = JSON.parse(trimmed) as unknown;
-  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-    throw new Error("自定义模板必须是 JSON 对象");
+    const parsed = JSON.parse(trimmed) as unknown;
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+      throw new Error("自定义模板必须是 JSON 对象");
+    }
+    return parsed as Record<string, unknown>;
   }
-  return parsed as Record<string, unknown>;
+
+  if (typeof value === "object" && !Array.isArray(value)) {
+    return value as Record<string, unknown>;
+  }
+
+  throw new Error("自定义模板必须是 JSON 对象");
 }
 
 function validateProviderConfig(params: {
@@ -66,6 +78,8 @@ const NotificationTypeSchema = z.enum(["circuit_breaker", "daily_leaderboard", "
 
 export type NotificationType = z.infer<typeof NotificationTypeSchema>;
 
+const CustomTemplateSchema = z.union([z.string().trim(), z.record(z.string(), z.unknown())]);
+
 const BaseTargetSchema = z.object({
   name: z.string().trim().min(1, "目标名称不能为空").max(100, "目标名称不能超过100个字符"),
   providerType: ProviderTypeSchema,
@@ -77,7 +91,7 @@ const BaseTargetSchema = z.object({
 
   dingtalkSecret: z.string().trim().optional().nullable(),
 
-  customTemplate: z.string().trim().optional().nullable(),
+  customTemplate: CustomTemplateSchema.optional().nullable(),
   customHeaders: z.record(z.string(), z.string()).optional().nullable(),
 
   proxyUrl: z.string().trim().optional().nullable(),

src/app/[locale]/dashboard/_components/webhook-migration-dialog.tsx

@@ -22,6 +22,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
+import { logger } from "@/lib/logger";
 import { setOnboardingCompleted, shouldShowOnboarding } from "@/lib/onboarding";
 import { cn } from "@/lib/utils";
 import {
@@ -135,7 +136,7 @@ export function WebhookMigrationDialog() {
         }
       } catch (error) {
         // Don't block user if settings fetch fails, but log for debugging
-        console.warn("[WebhookMigrationDialog] Failed to load notification settings:", error);
+        logger.warn("[WebhookMigrationDialog] Failed to load notification settings", { error });
       }
     };
 

src/app/[locale]/settings/notifications/_components/webhook-target-dialog.tsx

@@ -67,20 +67,52 @@ function toJsonString(value: unknown): string {
   }
 }
 
-function parseHeadersJson(value: string | null | undefined): Record<string, string> | null {
+type TranslateFn = (key: string) => string;
+
+function parseTemplateJson(
+  value: string | null | undefined,
+  t: TranslateFn
+): Record<string, unknown> | null {
   const trimmed = value?.trim();
   if (!trimmed) return null;
 
-  const parsed = JSON.parse(trimmed) as unknown;
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(trimmed) as unknown;
+  } catch {
+    throw new Error(t("notifications.templateEditor.jsonInvalid"));
+  }
+
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw new Error(t("notifications.templateEditor.jsonInvalid"));
+  }
+
+  return parsed as Record<string, unknown>;
+}
+
+function parseHeadersJson(
+  value: string | null | undefined,
+  t: TranslateFn
+): Record<string, string> | null {
+  const trimmed = value?.trim();
+  if (!trimmed) return null;
+
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(trimmed) as unknown;
+  } catch {
+    throw new Error(t("notifications.targetDialog.errors.headersInvalidJson"));
+  }
+
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-    throw new Error("Headers 必须是 JSON 对象");
+    throw new Error(t("notifications.targetDialog.errors.headersMustBeObject"));
   }
 
   const record = parsed as Record<string, unknown>;
   const out: Record<string, string> = {};
   for (const [k, v] of Object.entries(record)) {
     if (typeof v !== "string") {
-      throw new Error("Headers 的值必须为字符串");
+      throw new Error(t("notifications.targetDialog.errors.headersValueMustBeString"));
     }
     out[k] = v;
   }
@@ -160,8 +192,9 @@ export function WebhookTargetDialog({
         telegramBotToken: values.telegramBotToken || null,
         telegramChatId: values.telegramChatId || null,
         dingtalkSecret: values.dingtalkSecret || null,
-        customTemplate: values.customTemplate || null,
-        customHeaders: parseHeadersJson(values.customHeaders),
+        customTemplate:
+          normalizedType === "custom" ? parseTemplateJson(values.customTemplate, t) : null,
+        customHeaders: parseHeadersJson(values.customHeaders, t),
         proxyUrl: values.proxyUrl || null,
         proxyFallbackToDirect: values.proxyFallbackToDirect,
         isEnabled: values.isEnabled,