@dsh-plus/web-search-services 0.1.20 → 0.2.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dsh-plus/web-search-services",
-  "version": "0.1.20",
-  "description": "dsh-plus service plugin: web_search 免费后端聚合——经官方 ctx.web provider 扩展点桥接 search-services skill（Tavily/Exa/OpenAI Chat 免费额度，优先级+自动回退+key 配置），官方 web_search 工具与输出格式零修改",
+  "version": "0.2.0",
+  "description": "dsh-plus service plugin: web_search 多后端聚合——经官方 ctx.web provider 扩展点接入 Tavily/Exa/OpenAI 兼容/Context7/DeepSeek Search（顺序尝试 + 失败自动回退 + 官方 credentials 密钥），官方 web_search 工具与输出格式零修改",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,8 +18,7 @@
   },
   "files": [
     "lib",
-    "src",
-    "scripts"
+    "src"
   ],
   "dsh": {
     "client": {
@@ -32,21 +31,22 @@
     }
   },
   "dependencies": {
-    "@dsh-plus/shared": "0.1.42"
+    "@dsh-plus/shared": "0.1.43",
+    "@dsh-plus/web-providers-core": "0.1.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.5-alpha.2",
-    "@deepseek-ai/dsh-home-paths": "^0.2.1-alpha.4",
-    "@deepseek-ai/dsh-settings": "^0.2.1-alpha.4",
-    "@deepseek-ai/dsh-web": "^0.2.1-alpha.4",
-    "@deepseek-ai/schemastery": "^3.18.5-alpha.2"
+    "@deepseek-ai/cordis": "^4.0.5",
+    "@deepseek-ai/dsh-home-paths": "^0.2.1-rc.2",
+    "@deepseek-ai/dsh-settings": "^0.2.1-rc.2",
+    "@deepseek-ai/dsh-web": "^0.2.1-rc.2",
+    "@deepseek-ai/schemastery": "^3.18.5"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "4.0.5-alpha.2",
-    "@deepseek-ai/dsh-home-paths": "0.2.1-alpha.4",
-    "@deepseek-ai/dsh-settings": "0.2.1-alpha.4",
-    "@deepseek-ai/dsh-web": "0.2.1-alpha.4",
-    "@deepseek-ai/schemastery": "3.18.5-alpha.2",
+    "@deepseek-ai/cordis": "4.0.5",
+    "@deepseek-ai/dsh-home-paths": "0.2.1-rc.2",
+    "@deepseek-ai/dsh-settings": "0.2.1-rc.2",
+    "@deepseek-ai/dsh-web": "0.2.1-rc.2",
+    "@deepseek-ai/schemastery": "3.18.5",
     "@types/react": "~18.3.31",
     "react": "^18.2.0"
   },

package/src/client/card.tsx

@@ -1,56 +1,131 @@
 /**
  * 「搜索后端聚合」配置卡片：经 injectPluginConfigCard 注册（插件页
  * plugins.row.config / plugins.bundle.config，view 分发 summary/page）。
- * 字段：scriptPath / envFile / python / priority（每行一个后端）/ timeoutMs。
- * 密钥不走卡片：keys 段的 role(secret) 字段只允许 profile 行级注入，用户层
- * 写入会被脱敏遮蔽——卡片改为把密钥来源（env 文件）与覆盖方式写在页面上。
- * 外壳与控件走 @dsh-plus/shared/client 套件（CardChrome/TextField/
- * useNamespaceDraft）；纯校验逻辑在同目录 draft.ts（node --test 可直测）。
+ *
+ * 结构：总开关 / 暴露条目 / 代理 → 后端链（条目块）→ 密钥（官方 credentials）。
+ * 字段与默认值来自 `@dsh-plus/web-providers-core/spec`，校验逻辑来自其 `card` 工具箱，
+ * 本文件只负责布局与文案。
  * @module web-search-services/client/card
  */
-
 import {
   CardChrome,
   CardLoading,
+  type CardStatusState,
+  CheckRow,
+  type CredentialsRemoteFace,
+  CredentialsSection,
   type NamespaceSettingsApi,
   type PluginConfigViewProps,
   type Scope,
   TextField,
   useNamespaceDraft,
 } from '@dsh-plus/shared/client'
-import type { ReactElement } from 'react'
+import type { IssueCode } from '@dsh-plus/web-providers-core/card'
+import { EntryEditor, type EntryEditorLabels } from '@dsh-plus/web-providers-core/card-ui'
+import { type ReactElement, useMemo } from 'react'
 
 import {
   type ConfigValue,
   type Draft,
   draftFromValue,
-  priorityTextOk,
-  timeoutTextOk,
+  draftValid,
+  refsOf,
+  SEARCH_KIT,
   toPatch,
 } from './draft.ts'
-import type { Translate } from './i18n.ts'
+import type { DictKey, Translate } from './i18n.ts'
 
 export interface CardProps extends PluginConfigViewProps {
   t: Translate
   scope: Scope
   api: NamespaceSettingsApi
+  credentials: CredentialsRemoteFace
 }
 
 export function WebSearchServicesCard(props: CardProps): ReactElement | string | null {
-  const { t, scope, api } = props
+  const { t, scope, api, credentials } = props
   const { draft, dirty, saving, status, disabled, edit, reset, save } = useNamespaceDraft<
     ConfigValue,
     Draft
   >({ scope, api, from: draftFromValue, patch: toPatch, saveFailedLabel: t('saveFailed') })
-  // 插件页 page 视图为表单落地页，默认展开；旧槽位无 view，保持折叠。
 
   // 插件页 summary 视图只出一行简介（hooks 已全部落定，可安全提前返回）。
   if (props.view === 'summary') return t('summaryLine')
-
   if (draft === null) return <CardLoading prefix="wsv" text={t('loading')} />
 
-  const priorityInvalid = !priorityTextOk(draft.priorityText)
-  const timeoutInvalid = !timeoutTextOk(draft.timeoutMsText)
+  return (
+    <CardBody
+      t={t}
+      draft={draft}
+      status={status}
+      disabled={disabled}
+      dirty={dirty}
+      saving={saving}
+      credentials={credentials}
+      onEdit={edit}
+      onReset={reset}
+      onSave={save}
+    />
+  )
+}
+
+/** 校验代号 → 文案键。 */
+const ISSUE_KEYS: Record<IssueCode, DictKey> = {
+  'id-empty': 'issueIdEmpty',
+  required: 'issueRequired',
+  'id-duplicate': 'issueIdDuplicate',
+  'type-unknown': 'issueTypeUnknown',
+  int: 'issueInt',
+  'below-min': 'issueBelowMin',
+  'above-max': 'issueAboveMax',
+  option: 'issueOption',
+  json: 'issueJson',
+  'json-array': 'issueJsonArray',
+  'json-object': 'issueJsonObject',
+  'json-strings': 'issueJsonStrings',
+  'library-shape': 'issueLibraryShape',
+}
+
+/** 条目编辑器的已翻译文案（字段标签用 spec 的技术名，不做翻译）。 */
+function editorLabels(t: Translate): EntryEditorLabels {
+  return {
+    title: t('entriesTitle'),
+    description: t('entriesHint'),
+    addEntry: t('addEntry'),
+    empty: t('entriesEmpty'),
+    unknownType: t('unknownType'),
+    entryId: t('entryId'),
+    entryIdHint: t('entryIdHint'),
+    entryEnabled: t('entryEnabled'),
+    moveUp: t('moveUp'),
+    moveDown: t('moveDown'),
+    remove: t('remove'),
+    unsetOption: t('unsetOption'),
+    csvHint: t('csvHint'),
+    librariesHint: t('librariesHint'),
+    headersHint: t('headersHint'),
+    issue: (code) => t(ISSUE_KEYS[code]),
+  }
+}
+
+interface CardBodyProps {
+  t: Translate
+  draft: Draft
+  status: CardStatusState
+  disabled: boolean
+  dirty: boolean
+  saving: boolean
+  credentials: CredentialsRemoteFace
+  onEdit(patch: Partial<Draft>): void
+  onReset(): void
+  onSave(): void
+}
+
+function CardBody(props: CardBodyProps): ReactElement {
+  const { t, draft, status, disabled, dirty, saving, credentials } = props
+  const refs = useMemo(() => refsOf(draft), [draft])
+  const valid = draftValid(draft)
+
   return (
     <CardChrome
       prefix="wsv"
@@ -61,83 +136,66 @@ export function WebSearchServicesCard(props: CardProps): ReactElement | string |
       readOnlyNotice={disabled ? t('readOnly') : undefined}
       status={status}
       actions={[
-        {
-          key: 'discard',
-          label: t('discard'),
-          disabled: !dirty || saving,
-          onClick: reset,
-        },
+        { key: 'discard', label: t('discard'), disabled: !dirty || saving, onClick: props.onReset },
         {
           key: 'save',
           label: t(saving ? 'saving' : 'save'),
           variant: 'primary',
-          disabled: !dirty || priorityInvalid || timeoutInvalid || saving || disabled,
-          onClick: save,
+          disabled: !dirty || !valid || saving || disabled,
+          onClick: props.onSave,
         },
       ]}
     >
-      <TextField
+      <CheckRow
         prefix="wsv"
-        id="wsv-script"
-        label={t('scriptPath')}
-        hint={t('scriptPathHint')}
-        value={draft.scriptPath}
+        id="wsv-enabled"
+        label={t('enabled')}
+        checked={draft.enabled}
         disabled={disabled}
-        onEdit={(v) => edit({ scriptPath: v })}
+        onEdit={(checked) => props.onEdit({ enabled: checked })}
       />
-      <TextField
+      <CheckRow
         prefix="wsv"
-        id="wsv-envfile"
-        label={t('envFile')}
-        hint={t('envFileHint')}
-        value={draft.envFile}
+        id="wsv-expose"
+        label={t('exposeEntries')}
+        checked={draft.exposeEntries}
         disabled={disabled}
-        onEdit={(v) => edit({ envFile: v })}
+        onEdit={(checked) => props.onEdit({ exposeEntries: checked })}
       />
+      <p className="wsv-hint">{t('exposeEntriesHint')}</p>
       <TextField
         prefix="wsv"
-        id="wsv-python"
-        label={t('python')}
-        hint={t('pythonHint')}
-        value={draft.python}
+        id="wsv-proxy"
+        label={t('proxy')}
+        hint={t('proxyHint')}
+        value={draft.proxy}
         disabled={disabled}
-        onEdit={(v) => edit({ python: v })}
+        onEdit={(value) => props.onEdit({ proxy: value })}
       />
-      <div className="wsv-field">
-        <div className="wsv-head">
-          <label className="wsv-label" htmlFor="wsv-priority">
-            {t('priority')}
-          </label>
-        </div>
-        <textarea
-          id="wsv-priority"
-          className="wsv-priority"
-          rows={3}
-          value={draft.priorityText}
-          disabled={disabled}
-          onChange={(event) => edit({ priorityText: event.target.value })}
-        />
-        <p className={priorityInvalid ? 'wsv-invalid' : 'wsv-hint'}>
-          {priorityInvalid ? t('invalidPriority') : t('priorityHint')}
-        </p>
-      </div>
-      <TextField
+      <p className="wsv-hint">{t('enabledHint')}</p>
+      <EntryEditor
         prefix="wsv"
-        id="wsv-timeout"
-        label={t('timeoutMs')}
-        hint={t('timeoutMsHint')}
-        value={draft.timeoutMsText}
-        numeric
+        kit={SEARCH_KIT}
+        labels={editorLabels(t)}
+        draft={draft}
         disabled={disabled}
-        invalid={timeoutInvalid}
-        invalidLabel={t('invalidTimeout')}
-        onEdit={(v) => edit({ timeoutMsText: v })}
+        onChange={(next) => props.onEdit(next)}
+      />
+      <CredentialsSection
+        prefix="wsv"
+        title={t('secretsTitle')}
+        description={t('secretsBody')}
+        rows={refs.map((ref) => ({ ref, label: ref }))}
+        face={credentials}
+        labels={{
+          save: t('save'),
+          clear: t('secretClear'),
+          configured: t('secretConfigured'),
+          missing: t('secretMissing'),
+          shadowed: t('secretShadowed'),
+          failed: t('secretFailed'),
+        }}
       />
-      <div className="wsv-keys">
-        <p className="wsv-keysTitle">{t('keysGroup')}</p>
-        <p className="wsv-hint">{t('keysHint')}</p>
-        <p className="wsv-hint">{t('keysUserLayerHint')}</p>
-      </div>
       <p className="wsv-hint">{t('reloadHint')}</p>
     </CardChrome>
   )

package/src/client/client.ts

@@ -1,19 +1,20 @@
 /**
  * 浏览器半入口：注册 locale 字典 + 注册「搜索后端聚合」卡片
- * （injectPluginConfigCard 两槽位：插件页 plugins.row.config /
- * plugins.bundle.config）。
+ * （injectPluginConfigCard 两槽位：插件页 plugins.row.config / plugins.bundle.config）。
  * 构建产物为 window.__ModuleLoader__.load({id, factory}) 形式的 CJS factory
  * （包装见 tsdown.config.ts）；样式沿用官方 data-plugin-css 约定，HMR 据此卸载。
- * 配置读写经 ctx.remote.settings 直连（scope/api 来自 @dsh-plus/shared/client）；
- * 密钥不经卡片（role(secret) 只允许行级注入），见 card.tsx 的说明块。
+ * 配置读写经 ctx.remote.settings、密钥读写经 ctx.remote.credentials（均来自
+ * @dsh-plus/shared/client 的窄面）。
  * @module web-search-services/client
  */
 import type { Context } from '@deepseek-ai/cordis'
 import {
   createNamespaceApi,
   createSettingsScope,
+  credentialsFace,
   injectPluginConfigCard,
   type PluginClientContext,
+  type RemoteWithCredentials,
 } from '@dsh-plus/shared/client'
 
 import { SETTINGS_NS } from '../ns.ts'
@@ -23,8 +24,18 @@ import { injectStyle } from './styles.ts'
 
 export const name = 'dsh-plus-web-search-services'
 
-/** 浏览器半需要的 cordis 服务 key（loader 据此注入；package.json 的 dsh.client.inject 管包加载顺序）。 */
-export const inject = ['slots', 'locale', 'remote', 'remote.settings'] as const
+/**
+ * 浏览器半需要的 cordis 服务 key（loader 据此注入；package.json 的 dsh.client.inject
+ * 管包加载顺序）。`remote.credentials` 为硬依赖：卡片是密钥的唯一配置面，
+ * 命名空间缺席时整张卡片都不该挂（官方设置页同样如此声明）。
+ */
+export const inject = [
+  'slots',
+  'locale',
+  'remote',
+  'remote.settings',
+  'remote.credentials',
+] as const
 
 /** 宿主窄面收编在 @dsh-plus/shared/client；TKey 传入本包 DictKey 使键名受检。 */
 type ClientContext = PluginClientContext<DictKey>
@@ -41,11 +52,12 @@ export function apply(ctx: Context): void {
   c.effect(() => c.locale.register(NS, { zh, en }), 'web-search-services: locale')
   const scope = createSettingsScope(c, SETTINGS_NS, 'web-search-services: settings scope')
   const api = createNamespaceApi(c.get('remote').settings, SETTINGS_NS)
+  const credentials = credentialsFace(c.get('remote') as RemoteWithCredentials)
   injectPluginConfigCard(c.slots, {
     ns: SETTINGS_NS,
     rowId: 'dsh-plus-web-search-services',
     pkg: '@dsh-plus/web-search-services',
     component: WebSearchServicesCard,
-    inject: () => ({ t: c.locale.bind(NS), scope, api }),
+    inject: () => ({ t: c.locale.bind(NS), scope, api, credentials }),
   })
 }

package/src/client/draft.ts

@@ -1,92 +1,32 @@
 /**
- * 配置卡片草稿的纯逻辑（无 React/JSX，供 node --test 直接导入）：
- * 解析值 → 草稿、草稿 → 提交形状，以及优先级列表与超时的校验。
+ * 搜索插件的卡片逻辑绑定：字段清单/默认值/校验全部来自
+ * `@dsh-plus/web-providers-core`（与后端 schema 同源），本文件只把搜索那份 spec 绑上。
  * @module web-search-services/client/draft
  */
-import type { SearchBackend } from '../config.ts'
-
-/** 可选后端（与 config.ts 的 PRIORITY_ENTRY union 同源顺序）。 */
-export const SEARCH_BACKENDS: readonly SearchBackend[] = ['tavily', 'exa', 'openai-chat']
-
-/** 默认后端顺序（与 config.ts 的 DEFAULT_PRIORITY 一致）。 */
-export const DEFAULT_PRIORITY: readonly SearchBackend[] = ['tavily', 'exa', 'openai-chat']
-
-/** 单次搜索子进程超时下限（与 config.ts 的 .min(1000) 一致）。 */
-export const TIMEOUT_MIN_MS = 1000
-
-/** settings 命名空间的解析值（keys 内 secret 字段已被 describe 层遮蔽，卡片不消费）。 */
-export interface ConfigValue {
-  scriptPath: string
-  envFile: string
-  python: string
-  priority: SearchBackend[]
-  timeoutMs: number
-}
-
-/** 编辑草稿：字符串字段原样，数组与数值以文本承载（保存时校验并折算）。 */
-export interface Draft {
-  scriptPath: string
-  envFile: string
-  python: string
-  priorityText: string
-  timeoutMsText: string
-}
-
-export function draftFromValue(value: ConfigValue): Draft {
-  return {
-    scriptPath: value.scriptPath,
-    envFile: value.envFile,
-    python: value.python,
-    priorityText: value.priority.join('\n'),
-    timeoutMsText: String(value.timeoutMs),
-  }
-}
-
-/** 优先级文本 → 后端序列；顺带返回无法识别的行（供 UI 提示）。 */
-export function parsePriority(text: string): {
-  backends: SearchBackend[]
-  unknown: string[]
-  duplicated: string[]
-} {
-  const backends: SearchBackend[] = []
-  const unknown: string[] = []
-  const duplicated: string[] = []
-  for (const raw of text.split('\n')) {
-    const line = raw.trim()
-    if (line === '') continue
-    const match = SEARCH_BACKENDS.find((backend) => backend === line)
-    if (match === undefined) {
-      unknown.push(line)
-      continue
-    }
-    if (backends.includes(match)) {
-      duplicated.push(line)
-      continue
-    }
-    backends.push(match)
-  }
-  return { backends, unknown, duplicated }
-}
-
-/** 优先级是否可用：至少一个后端、无未知项、无重复项。 */
-export function priorityTextOk(text: string): boolean {
-  const { backends, unknown, duplicated } = parsePriority(text)
-  return backends.length > 0 && unknown.length === 0 && duplicated.length === 0
-}
-
-/** 超时是否可用：≥1000 的整数（对齐 schema 的 .natural().min(1000)）。 */
-export function timeoutTextOk(text: string): boolean {
-  if (!/^\d+$/.test(text.trim())) return false
-  return Number(text) >= TIMEOUT_MIN_MS
-}
-
-/** 草稿 → 提交形状（调用方保证已通过校验）。 */
-export function toPatch(draft: Draft): Record<string, unknown> {
-  return {
-    scriptPath: draft.scriptPath,
-    envFile: draft.envFile,
-    python: draft.python,
-    priority: parsePriority(draft.priorityText).backends,
-    timeoutMs: Number(draft.timeoutMsText),
-  }
-}
+import {
+  type ConfigValue,
+  createCardKit,
+  type Draft,
+  type EntryDraft,
+  type FieldValue,
+  type IssueCode,
+} from '@dsh-plus/web-providers-core/card'
+import { SEARCH_ENTRY_SPECS } from '@dsh-plus/web-providers-core/spec'
+
+export type { ConfigValue, Draft, EntryDraft, FieldValue, IssueCode }
+
+export const SEARCH_KIT = createCardKit(SEARCH_ENTRY_SPECS)
+
+const kit = SEARCH_KIT
+
+export const entryTypes = kit.entryTypes
+export const specOf = kit.specOf
+export const draftFromValue = kit.draftFromValue
+export const addEntry = kit.addEntry
+export const removeEntry = kit.removeEntry
+export const moveEntry = kit.moveEntry
+export const entryIssues = kit.entryIssues
+export const issuesOf = kit.issuesOf
+export const draftValid = kit.draftValid
+export const toPatch = kit.toPatch
+export const refsOf = kit.refsOf