@dsh-plus/notify-email 0.1.35 → 0.1.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/notify-email",
-  "version": "0.1.35",
+  "version": "0.1.37",
   "description": "dsh-plus service+ui plugin: 任务结束/等待决策/出错时向指定邮箱发送邮件通知",
   "type": "module",
   "main": "lib/index.js",
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "nodemailer": "9.0.6",
-    "@dsh-plus/shared": "0.1.29"
+    "@dsh-plus/shared": "0.1.31"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.4",

package/src/client/card.tsx

@@ -13,18 +13,29 @@
  */
 
 import {
+  type CardAction,
   CardChrome,
+  CardLoading,
   type CardStatusState,
   CheckRow,
+  cardVariantFor,
   IDLE_STATUS,
   type NamespaceSettingsApi,
   type PluginConfigViewProps,
   type Scope,
-  TextField,
 } from '@dsh-plus/shared/client'
 import { type ReactElement, useEffect, useMemo, useState, useSyncExternalStore } from 'react'
 import { SETTINGS_NS } from '../ns.ts'
 import { sendTest } from './api.ts'
+import {
+  type ConfigValue,
+  type Draft,
+  draftFromValue,
+  isPositiveInt,
+  type TriggerKey,
+  toPatch,
+} from './draft.ts'
+import { SmtpFields, TriggerFields } from './fields.tsx'
 import type { Translate } from './i18n.ts'
 
 export interface CardProps extends PluginConfigViewProps {
@@ -33,88 +44,95 @@ export interface CardProps extends PluginConfigViewProps {
   api: NamespaceSettingsApi
 }
 
-/** settings 命名空间的脱敏解析值（smtp.pass 被脱敏剥除）。 */
-export interface ConfigValue {
-  enabled: boolean
-  smtp: {
-    host: string
-    port: number
-    secure: boolean
-    user: string
-    from: string
-  }
-  to: string[]
-  triggers: {
-    onComplete: boolean
-    onError: boolean
-    onAborted: boolean
-    onQuestion: boolean
-    onPlanReview: boolean
-  }
-  idleDebounceMs: number
-  maxBodyChars: number
-  dryRun: boolean
-}
-
-interface Draft {
-  enabled: boolean
-  host: string
-  port: string
-  secure: boolean
-  user: string
-  pass: string
-  from: string
-  toText: string
-  triggers: ConfigValue['triggers']
-  idleDebounceMs: string
-  maxBodyChars: string
-  dryRun: boolean
-}
-
-function draftFromValue(value: ConfigValue): Draft {
-  return {
-    enabled: value.enabled,
-    host: value.smtp.host,
-    port: String(value.smtp.port),
-    secure: value.smtp.secure,
-    user: value.smtp.user,
-    pass: '',
-    from: value.smtp.from,
-    toText: value.to.join(', '),
-    triggers: { ...value.triggers },
-    idleDebounceMs: String(value.idleDebounceMs),
-    maxBodyChars: String(value.maxBodyChars),
-    dryRun: value.dryRun,
-  }
-}
-
-function isPositiveInt(text: string): boolean {
-  return /^[0-9]+$/.test(text) && Number(text) > 0
+/**
+ * passConfigured 探测：scope 快照不含 secrets，经 describe 的 secrets 列表判断；
+ * snapshot 变化（保存后 revision 推进）时刻意重探。
+ */
+function usePassConfigured(api: NamespaceSettingsApi, snapshot: unknown): boolean {
+  const [passConfigured, setPassConfigured] = useState(false)
+  // biome-ignore lint/correctness/useExhaustiveDependencies: snapshot 变化（保存后 revision 推进）时刻意重探 secrets 状态
+  useEffect(() => {
+    let alive = true
+    api
+      .describe()
+      .then((view) => {
+        if (!alive) return
+        const ns = view.namespaces.find((candidate) => candidate.ns === SETTINGS_NS)
+        setPassConfigured(
+          ns?.secrets.some((secret) => secret.path.join('.') === 'smtp.pass' && secret.set) ??
+            false,
+        )
+      })
+      .catch(() => {})
+    return () => {
+      alive = false
+    }
+  }, [api, snapshot])
+  return passConfigured
 }
 
-function toPatch(draft: Draft): Record<string, unknown> {
-  return {
-    enabled: draft.enabled,
-    smtp: {
-      host: draft.host.trim(),
-      port: Number(draft.port),
-      secure: draft.secure,
-      user: draft.user.trim(),
-      pass: draft.pass,
-      from: draft.from.trim(),
+/** 卡片动作：发送测试、放弃、保存（保存受无效字段与只读限制）。 */
+function cardActions(options: {
+  t: Translate
+  dirty: boolean
+  invalid: boolean
+  saving: boolean
+  testing: boolean
+  disabled: boolean
+  onTest(): void
+  onDiscard(): void
+  onSave(): void
+}): CardAction[] {
+  const { t } = options
+  return [
+    {
+      key: 'test',
+      label: t(options.testing ? 'testing' : 'test'),
+      disabled: options.testing,
+      onClick: options.onTest,
     },
-    to: draft.toText
-      .split(',')
-      .map((s) => s.trim())
-      .filter((s) => s.length > 0),
-    triggers: { ...draft.triggers },
-    idleDebounceMs: Number(draft.idleDebounceMs),
-    maxBodyChars: Number(draft.maxBodyChars),
-    dryRun: draft.dryRun,
-  }
+    {
+      key: 'discard',
+      label: t('discard'),
+      disabled: !options.dirty || options.saving,
+      onClick: options.onDiscard,
+    },
+    {
+      key: 'save',
+      label: t(options.saving ? 'saving' : 'save'),
+      variant: 'primary',
+      disabled: !options.dirty || options.invalid || options.saving || options.disabled,
+      onClick: options.onSave,
+    },
+  ]
 }
 
-const TRIGGER_KEYS = ['onComplete', 'onError', 'onAborted', 'onQuestion', 'onPlanReview'] as const
+/** 发送测试邮件：端点结果折算成状态行文案（不改草稿）；finally 收尾由调用方给。 */
+function sendTestMail(
+  t: Translate,
+  onStatus: (status: CardStatusState) => void,
+  onSettled: () => void,
+): void {
+  sendTest()
+    .then((result) => {
+      if (result.ok) {
+        onStatus({
+          kind: 'ok',
+          text: result.detail === 'dry-run' ? t('testDryRun') : t('testOk'),
+        })
+        return
+      }
+      const why = result.detail === 'incomplete' ? t('incomplete') : result.detail
+      onStatus({ kind: 'error', text: `${t('testFailed')}${why}` })
+    })
+    .catch((error: unknown) => {
+      onStatus({
+        kind: 'error',
+        text: `${t('testFailed')}${error instanceof Error ? error.message : ''}`,
+      })
+    })
+    .finally(onSettled)
+}
 
 export function NotifyEmailCard(props: CardProps): ReactElement | string | null {
   const { t, scope, api } = props
@@ -126,10 +144,10 @@ export function NotifyEmailCard(props: CardProps): ReactElement | string | null
   // 0.1.6-alpha.2 插件页 page 视图为表单落地页，默认展开；旧槽位无 view，保持折叠。
   const [open, setOpen] = useState(props.view === 'page')
   const [draft, setDraft] = useState<Draft | null>(null)
-  const [passConfigured, setPassConfigured] = useState(false)
   const [saving, setSaving] = useState(false)
   const [testing, setTesting] = useState(false)
   const [status, setStatus] = useState<CardStatusState>(IDLE_STATUS)
+  const passConfigured = usePassConfigured(api, snapshot)
 
   // 首次拿到解析值后播种草稿；后续 Host 更新不覆盖在途编辑（与官方 staged 表单一致）。
   useEffect(() => {
@@ -137,26 +155,6 @@ export function NotifyEmailCard(props: CardProps): ReactElement | string | null
     setDraft(draftFromValue(value))
   }, [value, draft])
 
-  // passConfigured 探测：scope 快照不含 secrets，经 describe 的 secrets 列表判断。
-  // biome-ignore lint/correctness/useExhaustiveDependencies: snapshot 变化（保存后 revision 推进）时刻意重探 secrets 状态
-  useEffect(() => {
-    let alive = true
-    api
-      .describe()
-      .then((view) => {
-        if (!alive) return
-        const ns = view.namespaces.find((candidate) => candidate.ns === SETTINGS_NS)
-        setPassConfigured(
-          ns?.secrets.some((secret) => secret.path.join('.') === 'smtp.pass' && secret.set) ??
-            false,
-        )
-      })
-      .catch(() => {})
-    return () => {
-      alive = false
-    }
-  }, [api, snapshot])
-
   const dirty = useMemo(
     () =>
       value !== undefined &&
@@ -177,18 +175,17 @@ export function NotifyEmailCard(props: CardProps): ReactElement | string | null
   // 插件页 summary 视图只出一行简介（hooks 已全部落定，可安全提前返回）。
   if (props.view === 'summary') return t('summaryLine')
 
+  // 插件页 page 视图内嵌宿主页面容器（已带页面级内边距与标题），用无边框分节。
+  const variant = cardVariantFor(props.view)
+
   if (value === undefined || draft === null) {
-    return (
-      <li className="dne-card">
-        <p className="dne-readOnly">{t('loading')}</p>
-      </li>
-    )
+    return <CardLoading prefix="dne" variant={variant} text={t('loading')} />
   }
   const edit = <K extends keyof Draft>(key: K, editValue: Draft[K]): void => {
     setDraft({ ...draft, [key]: editValue })
     setStatus(IDLE_STATUS)
   }
-  const editTrigger = (key: (typeof TRIGGER_KEYS)[number], checked: boolean): void => {
+  const editTrigger = (key: TriggerKey, checked: boolean): void => {
     edit('triggers', { ...draft.triggers, [key]: checked })
   }
   const onSave = (): void => {
@@ -214,25 +211,7 @@ export function NotifyEmailCard(props: CardProps): ReactElement | string | null
   }
   const onTest = (): void => {
     setTesting(true)
-    sendTest()
-      .then((result) => {
-        if (result.ok) {
-          setStatus({
-            kind: 'ok',
-            text: result.detail === 'dry-run' ? t('testDryRun') : t('testOk'),
-          })
-        } else {
-          const why = result.detail === 'incomplete' ? t('incomplete') : result.detail
-          setStatus({ kind: 'error', text: `${t('testFailed')}${why}` })
-        }
-      })
-      .catch((error: unknown) => {
-        setStatus({
-          kind: 'error',
-          text: `${t('testFailed')}${error instanceof Error ? error.message : ''}`,
-        })
-      })
-      .finally(() => setTesting(false))
+    sendTestMail(t, setStatus, () => setTesting(false))
   }
 
   const disabled = !snapshot.writable
@@ -243,35 +222,26 @@ export function NotifyEmailCard(props: CardProps): ReactElement | string | null
       description={t('description')}
       open={open}
       onToggle={setOpen}
+      variant={variant}
       statusBadge={{ text: t(draft.enabled ? 'enabledOn' : 'enabledOff'), on: draft.enabled }}
       dirty={dirty}
       dirtyLabel={t('unsaved')}
       readOnlyNotice={disabled ? t('readOnly') : undefined}
       status={status}
-      actions={[
-        {
-          key: 'test',
-          label: t(testing ? 'testing' : 'test'),
-          disabled: testing,
-          onClick: onTest,
-        },
-        {
-          key: 'discard',
-          label: t('discard'),
-          disabled: !dirty || saving,
-          onClick: () => {
-            setDraft(draftFromValue(value))
-            setStatus(IDLE_STATUS)
-          },
-        },
-        {
-          key: 'save',
-          label: t(saving ? 'saving' : 'save'),
-          variant: 'primary',
-          disabled: !dirty || invalid || saving || disabled,
-          onClick: onSave,
+      actions={cardActions({
+        t,
+        dirty,
+        invalid,
+        saving,
+        testing,
+        disabled,
+        onTest,
+        onDiscard: () => {
+          setDraft(draftFromValue(value))
+          setStatus(IDLE_STATUS)
         },
-      ]}
+        onSave,
+      })}
     >
       <CheckRow
         prefix="dne"
@@ -281,119 +251,19 @@ export function NotifyEmailCard(props: CardProps): ReactElement | string | null
         disabled={disabled}
         onEdit={(v) => edit('enabled', v)}
       />
-      <TextField
-        prefix="dne"
-        id="dne-host"
-        label={t('host')}
-        hint={t('hostHint')}
-        value={draft.host}
-        disabled={disabled}
-        onEdit={(v) => edit('host', v)}
-      />
-      <TextField
-        prefix="dne"
-        id="dne-port"
-        label={t('port')}
-        hint={t('portHint')}
-        value={draft.port}
-        numeric
-        disabled={disabled}
-        invalid={!isPositiveInt(draft.port)}
-        invalidLabel={t('invalidNumber')}
-        onEdit={(v) => edit('port', v)}
-      />
-      <CheckRow
-        prefix="dne"
-        id="dne-secure"
-        label={t('secure')}
-        checked={draft.secure}
-        disabled={disabled}
-        onEdit={(v) => edit('secure', v)}
-      />
-      <TextField
-        prefix="dne"
-        id="dne-user"
-        label={t('user')}
-        hint={t('userHint')}
-        value={draft.user}
-        disabled={disabled}
-        onEdit={(v) => edit('user', v)}
-      />
-      <TextField
-        prefix="dne"
-        id="dne-pass"
-        label={t('pass')}
-        hint={t('passHint')}
-        value={draft.pass}
-        password
-        disabled={disabled}
-        badge={{
-          text: passConfigured ? t('passSet') : t('passUnset'),
-          set: passConfigured,
-        }}
-        onEdit={(v) => edit('pass', v)}
-      />
-      <TextField
-        prefix="dne"
-        id="dne-from"
-        label={t('from')}
-        hint={t('fromHint')}
-        value={draft.from}
+      <SmtpFields
+        t={t}
+        draft={draft}
         disabled={disabled}
-        onEdit={(v) => edit('from', v)}
+        passConfigured={passConfigured}
+        onEdit={edit}
       />
-      <TextField
-        prefix="dne"
-        id="dne-to"
-        label={t('to')}
-        hint={t('toHint')}
-        value={draft.toText}
-        disabled={disabled}
-        onEdit={(v) => edit('toText', v)}
-      />
-      <p className="dne-groupLabel">{t('triggerGroup')}</p>
-      {TRIGGER_KEYS.map((key) => (
-        <CheckRow
-          prefix="dne"
-          key={key}
-          id={`dne-${key}`}
-          label={t(key)}
-          checked={draft.triggers[key]}
-          disabled={disabled}
-          onEdit={(v) => editTrigger(key, v)}
-        />
-      ))}
-      <TextField
-        prefix="dne"
-        id="dne-debounce"
-        label={t('idleDebounceMs')}
-        hint={t('idleDebounceMsHint')}
-        value={draft.idleDebounceMs}
-        numeric
-        disabled={disabled}
-        invalid={!isPositiveInt(draft.idleDebounceMs)}
-        invalidLabel={t('invalidNumber')}
-        onEdit={(v) => edit('idleDebounceMs', v)}
-      />
-      <TextField
-        prefix="dne"
-        id="dne-maxchars"
-        label={t('maxBodyChars')}
-        hint={t('maxBodyCharsHint')}
-        value={draft.maxBodyChars}
-        numeric
-        disabled={disabled}
-        invalid={!isPositiveInt(draft.maxBodyChars) || Number(draft.maxBodyChars) < 200}
-        invalidLabel={t('invalidNumber')}
-        onEdit={(v) => edit('maxBodyChars', v)}
-      />
-      <CheckRow
-        prefix="dne"
-        id="dne-dryrun"
-        label={t('dryRun')}
-        checked={draft.dryRun}
+      <TriggerFields
+        t={t}
+        draft={draft}
         disabled={disabled}
-        onEdit={(v) => edit('dryRun', v)}
+        onEdit={edit}
+        onTrigger={editTrigger}
       />
     </CardChrome>
   )

package/src/client/draft.ts

@@ -0,0 +1,99 @@
+/**
+ * 卡片草稿模型与纯校验（无 React/JSX，供 node --test 直接导入）：
+ * 脱敏解析值 → 草稿、草稿 → 提交形状、触发键表与正整数判定。
+ * @module notify-email/client/draft
+ */
+
+/** settings 命名空间的脱敏解析值（smtp.pass 被脱敏剥除）。 */
+export interface ConfigValue {
+  enabled: boolean
+  smtp: {
+    host: string
+    port: number
+    secure: boolean
+    user: string
+    from: string
+  }
+  to: string[]
+  triggers: {
+    onComplete: boolean
+    onError: boolean
+    onAborted: boolean
+    onQuestion: boolean
+    onPlanReview: boolean
+  }
+  idleDebounceMs: number
+  maxBodyChars: number
+  dryRun: boolean
+}
+
+/** 编辑草稿：数值字段以文本承载（保存时校验并折算）。 */
+export interface Draft {
+  enabled: boolean
+  host: string
+  port: string
+  secure: boolean
+  user: string
+  pass: string
+  from: string
+  toText: string
+  triggers: ConfigValue['triggers']
+  idleDebounceMs: string
+  maxBodyChars: string
+  dryRun: boolean
+}
+
+/** 通知触发点（key 同时是 i18n 文案键与 settings 字段名）。 */
+export const TRIGGER_KEYS = [
+  'onComplete',
+  'onError',
+  'onAborted',
+  'onQuestion',
+  'onPlanReview',
+] as const
+
+export type TriggerKey = (typeof TRIGGER_KEYS)[number]
+
+export function isPositiveInt(text: string): boolean {
+  return /^[0-9]+$/.test(text) && Number(text) > 0
+}
+
+export function draftFromValue(value: ConfigValue): Draft {
+  return {
+    enabled: value.enabled,
+    host: value.smtp.host,
+    port: String(value.smtp.port),
+    secure: value.smtp.secure,
+    user: value.smtp.user,
+    pass: '',
+    from: value.smtp.from,
+    toText: value.to.join(', '),
+    triggers: { ...value.triggers },
+    idleDebounceMs: String(value.idleDebounceMs),
+    maxBodyChars: String(value.maxBodyChars),
+    dryRun: value.dryRun,
+  }
+}
+
+/** 草稿 → 提交形状（pass 为空表示「保持已存密钥」，由调用方剔除该键）。 */
+export function toPatch(draft: Draft): Record<string, unknown> {
+  return {
+    enabled: draft.enabled,
+    smtp: {
+      host: draft.host.trim(),
+      port: Number(draft.port),
+      secure: draft.secure,
+      user: draft.user.trim(),
+      pass: draft.pass,
+      from: draft.from.trim(),
+    },
+    to: draft.toText
+      .split(',')
+      .map((s) => s.trim())
+      .filter((s) => s.length > 0),
+    triggers: { ...draft.triggers },
+    idleDebounceMs: Number(draft.idleDebounceMs),
+    maxBodyChars: Number(draft.maxBodyChars),
+    dryRun: draft.dryRun,
+  }
+}