@dsh-plus/image-studio 0.1.22 → 0.1.24

package/src/client/client.ts

@@ -2,8 +2,8 @@
  * 浏览器半入口：
  * - sidebar.footer.action：侧栏底部入口按钮（与文件/终端入口 flex 等分行宽）；
  * - shell.overlay：图像工作室面板（文生图/图生图/画廊 + 任务条）；
- * - 配置卡片：injectPluginConfigCard 三槽位（三组预设 + 凭据 + 高级项；
- *   legacy settings.plugin.item 与 0.1.6-alpha.2 插件页 row/bundle config）。
+ * - 配置卡片：injectPluginConfigCard 两槽位（三组预设 + 凭据 + 高级项；
+ *   插件页 row/bundle config）。
  * 模式与 web-files 一致：CJS factory 产物、data-plugin-css 样式
  * 约定、slot 失配静默降级；配置读写经 ctx.remote.settings 直连（远程域名可用）。
  * @module @dsh-plus/image-studio/client

package/src/client/draft.ts

@@ -0,0 +1,128 @@
+/**
+ * 配置卡片草稿模型与草稿 ↔ settings 载荷转换（无 React/JSX，供 node --test 直接导入）：
+ * JSON 字段（extraHeaders / paramSpecs）以文本镜像承载，保存时解析并做本地校验。
+ * @module image-studio/client/draft
+ */
+import type { ImageStudioConfig } from '../config.ts'
+import { credentialRefNameOf, isValidPresetId } from '../credentials.ts'
+import { validateParamSpecs } from '../params/spec.ts'
+
+/** 编辑态草稿：JSON 字段与数值以文本承载（保存时解析校验）。 */
+export interface ProviderDraft {
+  id: string
+  name: string
+  protocol: string
+  baseUrl: string
+  model: string
+  extraHeadersText: string
+}
+
+export interface ParamDraft {
+  id: string
+  name: string
+  endpoint: string
+  specsText: string
+}
+
+export interface PromptDraft {
+  id: string
+  name: string
+  text: string
+}
+
+export interface Draft {
+  providers: ProviderDraft[]
+  params: ParamDraft[]
+  prompts: PromptDraft[]
+  maxConcurrent: string
+  requestTimeoutMs: string
+  proxy: string
+  galleryMaxItems: string
+  uploadTtlHours: string
+}
+
+/** 配置值 → 编辑草稿。 */
+export function draftOf(value: ImageStudioConfig): Draft {
+  return {
+    providers: value.providerPresets.map((p) => ({
+      id: p.id,
+      name: p.name,
+      protocol: p.protocol,
+      baseUrl: p.baseUrl,
+      model: p.model,
+      extraHeadersText: JSON.stringify(p.extraHeaders ?? {}, null, 2),
+    })),
+    params: value.paramPresets.map((p) => ({
+      id: p.id,
+      name: p.name,
+      endpoint: p.endpoint,
+      specsText: JSON.stringify(p.paramSpecs ?? {}, null, 2),
+    })),
+    prompts: value.promptPresets.map((p) => ({ id: p.id, name: p.name, text: p.text })),
+    maxConcurrent: String(value.maxConcurrent),
+    requestTimeoutMs: String(value.requestTimeoutMs),
+    proxy: value.proxy,
+    galleryMaxItems: String(value.galleryMaxItems),
+    uploadTtlHours: String(value.uploadTtlHours),
+  }
+}
+
+function parseJson(text: string, label: string): unknown {
+  try {
+    return JSON.parse(text)
+  } catch (error) {
+    throw new Error(`${label} ${error instanceof Error ? error.message : String(error)}`)
+  }
+}
+
+/** 草稿 → settings 载荷（边界校验：JSON 解析、参数表校验、预设 id 形态）。 */
+export function payloadOf(draft: Draft): Record<string, unknown> {
+  const providers = draft.providers.map((p) => {
+    if (!isValidPresetId(p.id)) throw new Error(p.id)
+    return {
+      id: p.id,
+      name: p.name,
+      protocol: p.protocol,
+      baseUrl: p.baseUrl,
+      model: p.model,
+      credentialRef: credentialRefNameOf(p.id),
+      extraHeaders: parseJson(p.extraHeadersText, p.id) as Record<string, string>,
+    }
+  })
+  const params = draft.params.map((p) => ({
+    id: p.id,
+    name: p.name,
+    endpoint: p.endpoint,
+    paramSpecs: validateParamSpecs(parseJson(p.specsText, p.id)),
+  }))
+  return {
+    promptPresets: draft.prompts.map((p) => ({ id: p.id, name: p.name, text: p.text })),
+    paramPresets: params,
+    providerPresets: providers,
+    maxConcurrent: Math.max(0, Math.floor(Number(draft.maxConcurrent) || 0)),
+    requestTimeoutMs: Math.max(10_000, Math.floor(Number(draft.requestTimeoutMs) || 300_000)),
+    proxy: draft.proxy,
+    galleryMaxItems: Math.max(0, Math.floor(Number(draft.galleryMaxItems) || 0)),
+    uploadTtlHours: Math.max(1, Math.floor(Number(draft.uploadTtlHours) || 24)),
+  }
+}
+
+/** 空提供商预设（新增行用；协议取目录首项）。 */
+export function emptyProviderDraft(protocol: string): ProviderDraft {
+  return { id: '', name: '', protocol, baseUrl: '', model: '', extraHeadersText: '{}' }
+}
+
+/** 空参数预设（新增行用；id 由时间戳生成，行序即身份）。 */
+export function emptyParamDraft(): ParamDraft {
+  return {
+    id: `param-${Date.now().toString(36)}`,
+    name: '',
+    endpoint: 'generation',
+    specsText: '{}',
+  }
+}
+
+/** 空提示词预设（新增行用）。 */
+export function emptyPromptDraft(): PromptDraft {
+  return { id: `prompt-${Date.now().toString(36)}`, name: '', text: '' }
+}

package/src/client/preset-sections.tsx

@@ -0,0 +1,321 @@
+/**
+ * 配置卡片的三组预设编辑区：提供商（含逐条 API Key 管理）、提示词、参数。
+ * 从 card.tsx 拆出，避免单组件过长；草稿类型与纯转换在 ./draft.ts。
+ * @module image-studio/client/preset-sections
+ */
+import { TextField } from '@dsh-plus/shared/client'
+import { type ReactElement, useEffect, useState } from 'react'
+
+import { isValidPresetId } from '../credentials.ts'
+import { fetchCredentialStatus, setCredential, unsetCredential } from './api.ts'
+import {
+  type Draft,
+  emptyParamDraft,
+  emptyPromptDraft,
+  emptyProviderDraft,
+  type ParamDraft,
+  type PromptDraft,
+  type ProviderDraft,
+} from './draft.ts'
+import type { Translate } from './i18n.ts'
+
+/** 单个提供商预设的 API Key 行（describe 徽标 + 设置/删除，值不回显）。 */
+function CredentialRow(props: { t: Translate; presetId: string; disabled: boolean }): ReactElement {
+  const { t, presetId, disabled } = props
+  const [configured, setConfigured] = useState<boolean | null>(null)
+  const [value, setValue] = useState('')
+  const [busy, setBusy] = useState(false)
+
+  useEffect(() => {
+    if (!isValidPresetId(presetId)) return
+    let alive = true
+    fetchCredentialStatus(presetId)
+      .then((res) => {
+        if (alive) setConfigured(res.configured)
+      })
+      .catch(() => {})
+    return () => {
+      alive = false
+    }
+  }, [presetId])
+
+  const act = (fn: () => Promise<unknown>): void => {
+    setBusy(true)
+    fn()
+      .then(() => fetchCredentialStatus(presetId))
+      .then((res) => {
+        setConfigured(res.configured)
+        setValue('')
+      })
+      .catch(() => {})
+      .finally(() => setBusy(false))
+  }
+
+  return (
+    <div className="imsc-credRow">
+      <input
+        className="imsc-input"
+        type="password"
+        autoComplete="off"
+        placeholder={t('card.credential.placeholder')}
+        aria-label={t('card.credential.label')}
+        value={value}
+        disabled={disabled || busy}
+        onChange={(event) => setValue(event.target.value)}
+      />
+      {configured !== null ? (
+        <span className={`imsc-badge ${configured ? 'imsc-badgeSet' : 'imsc-badgeUnset'}`}>
+          {t(configured ? 'card.credential.configured' : 'card.credential.unconfigured')}
+        </span>
+      ) : null}
+      <button
+        type="button"
+        className="imsc-btn imsc-btnGhost"
+        disabled={disabled || busy || value === '' || !isValidPresetId(presetId)}
+        onClick={() => act(() => setCredential(presetId, value))}
+      >
+        {t('card.credential.set')}
+      </button>
+      <button
+        type="button"
+        className="imsc-btn imsc-btnGhost"
+        disabled={disabled || busy || configured !== true || !isValidPresetId(presetId)}
+        onClick={() => act(() => unsetCredential(presetId))}
+      >
+        {t('card.credential.unset')}
+      </button>
+    </div>
+  )
+}
+
+/** 三组预设编辑区共用的 props（各组按需取用其中一部分）。 */
+export interface PresetSectionsProps {
+  t: Translate
+  draft: Draft
+  disabled: boolean
+  protocols: Array<{ id: string; label: string }>
+  onPatch(patch: Partial<Draft>): void
+  onPatchProvider(index: number, patch: Partial<ProviderDraft>): void
+  onPatchParam(index: number, patch: Partial<ParamDraft>): void
+  onPatchPrompt(index: number, patch: Partial<PromptDraft>): void
+}
+
+export function ProviderPresetSection(props: PresetSectionsProps): ReactElement {
+  const { t, draft, disabled, protocols, onPatch, onPatchProvider } = props
+  return (
+    <>
+      <h4 className="imsc-groupTitle">{t('card.providers')}</h4>
+      {draft.providers.map((provider, index) => (
+        // biome-ignore lint/suspicious/noArrayIndexKey: 草稿行无稳定 id（id 字段本身可编辑），行序即身份
+        <div className="imsc-presetBox" key={`provider-${index}`}>
+          <div className="imsc-presetHead">
+            <span className="imsc-presetName">{provider.name || provider.id || '—'}</span>
+            <button
+              type="button"
+              className="imsc-btn imsc-btnGhost"
+              disabled={disabled}
+              onClick={() => onPatch({ providers: draft.providers.filter((_, i) => i !== index) })}
+            >
+              {t('common.delete')}
+            </button>
+          </div>
+          <div className="imsc-grid2">
+            <TextField
+              prefix="imsc"
+              id={`imsc-pid-${index}`}
+              label={t('card.field.id')}
+              hint={t('card.idHint')}
+              value={provider.id}
+              invalid={provider.id !== '' && !isValidPresetId(provider.id)}
+              invalidLabel={t('card.idInvalid')}
+              disabled={disabled}
+              onEdit={(v) => onPatchProvider(index, { id: v })}
+            />
+            <TextField
+              prefix="imsc"
+              id={`imsc-pname-${index}`}
+              label={t('card.field.name')}
+              value={provider.name}
+              disabled={disabled}
+              onEdit={(v) => onPatchProvider(index, { name: v })}
+            />
+          </div>
+          <div className="imsc-grid2">
+            <div className="imsc-field">
+              <div className="imsc-head">
+                <label className="imsc-label" htmlFor={`imsc-pproto-${index}`}>
+                  {t('card.field.protocol')}
+                </label>
+              </div>
+              <select
+                id={`imsc-pproto-${index}`}
+                className="imsc-select"
+                value={provider.protocol}
+                disabled={disabled}
+                onChange={(event) => onPatchProvider(index, { protocol: event.target.value })}
+              >
+                {(protocols.length > 0
+                  ? protocols
+                  : [{ id: provider.protocol, label: provider.protocol }]
+                ).map((protocol) => (
+                  <option key={protocol.id} value={protocol.id}>
+                    {protocol.label}
+                  </option>
+                ))}
+              </select>
+            </div>
+            <TextField
+              prefix="imsc"
+              id={`imsc-pmodel-${index}`}
+              label={t('card.field.model')}
+              value={provider.model}
+              disabled={disabled}
+              onEdit={(v) => onPatchProvider(index, { model: v })}
+            />
+          </div>
+          <TextField
+            prefix="imsc"
+            id={`imsc-purl-${index}`}
+            label={t('card.field.baseUrl')}
+            value={provider.baseUrl}
+            disabled={disabled}
+            onEdit={(v) => onPatchProvider(index, { baseUrl: v })}
+          />
+          <div className="imsc-field">
+            <div className="imsc-head">
+              <label className="imsc-label" htmlFor={`imsc-pheaders-${index}`}>
+                {t('card.field.extraHeaders')}
+              </label>
+            </div>
+            <textarea
+              id={`imsc-pheaders-${index}`}
+              className="imsc-textarea"
+              value={provider.extraHeadersText}
+              disabled={disabled}
+              onChange={(event) => onPatchProvider(index, { extraHeadersText: event.target.value })}
+            />
+          </div>
+          <CredentialRow t={t} presetId={provider.id} disabled={disabled} />
+        </div>
+      ))}
+      <button
+        type="button"
+        className="imsc-btn imsc-btnGhost"
+        disabled={disabled}
+        onClick={() =>
+          onPatch({
+            providers: [
+              ...draft.providers,
+              emptyProviderDraft(protocols[0]?.id ?? 'openai-images'),
+            ],
+          })
+        }
+      >
+        {t('card.add')} · {t('card.providers')}
+      </button>
+    </>
+  )
+}
+
+export function PromptPresetSection(props: PresetSectionsProps): ReactElement {
+  const { t, draft, disabled, onPatch, onPatchPrompt } = props
+  return (
+    <>
+      <h4 className="imsc-groupTitle">{t('card.prompts')}</h4>
+      {draft.prompts.map((prompt, index) => (
+        // biome-ignore lint/suspicious/noArrayIndexKey: 草稿行无稳定 id，行序即身份
+        <div className="imsc-presetBox" key={`prompt-${index}`}>
+          <div className="imsc-presetHead">
+            <input
+              className="imsc-input"
+              aria-label={t('card.field.name')}
+              value={prompt.name}
+              disabled={disabled}
+              onChange={(event) => onPatchPrompt(index, { name: event.target.value })}
+            />
+            <button
+              type="button"
+              className="imsc-btn imsc-btnGhost"
+              disabled={disabled}
+              onClick={() => onPatch({ prompts: draft.prompts.filter((_, i) => i !== index) })}
+            >
+              {t('common.delete')}
+            </button>
+          </div>
+          <textarea
+            className="imsc-textarea"
+            aria-label={t('card.field.text')}
+            value={prompt.text}
+            disabled={disabled}
+            onChange={(event) => onPatchPrompt(index, { text: event.target.value })}
+          />
+        </div>
+      ))}
+      <button
+        type="button"
+        className="imsc-btn imsc-btnGhost"
+        disabled={disabled}
+        onClick={() => onPatch({ prompts: [...draft.prompts, emptyPromptDraft()] })}
+      >
+        {t('card.add')} · {t('card.prompts')}
+      </button>
+    </>
+  )
+}
+
+export function ParamPresetSection(props: PresetSectionsProps): ReactElement {
+  const { t, draft, disabled, onPatch, onPatchParam } = props
+  return (
+    <>
+      <h4 className="imsc-groupTitle">{t('card.params')}</h4>
+      {draft.params.map((param, index) => (
+        // biome-ignore lint/suspicious/noArrayIndexKey: 草稿行无稳定 id，行序即身份
+        <div className="imsc-presetBox" key={`param-${index}`}>
+          <div className="imsc-presetHead">
+            <input
+              className="imsc-input"
+              aria-label={t('card.field.name')}
+              value={param.name}
+              disabled={disabled}
+              onChange={(event) => onPatchParam(index, { name: event.target.value })}
+            />
+            <select
+              className="imsc-select"
+              aria-label={t('card.field.endpoint')}
+              value={param.endpoint}
+              disabled={disabled}
+              onChange={(event) => onPatchParam(index, { endpoint: event.target.value })}
+            >
+              <option value="generation">{t('tab.generation')}</option>
+              <option value="edit">{t('tab.edit')}</option>
+            </select>
+            <button
+              type="button"
+              className="imsc-btn imsc-btnGhost"
+              disabled={disabled}
+              onClick={() => onPatch({ params: draft.params.filter((_, i) => i !== index) })}
+            >
+              {t('common.delete')}
+            </button>
+          </div>
+          <textarea
+            className="imsc-textarea"
+            aria-label={t('card.field.paramSpecs')}
+            placeholder='{ "size": { "enabled": true, "value": "1024x1024" } }'
+            value={param.specsText}
+            disabled={disabled}
+            onChange={(event) => onPatchParam(index, { specsText: event.target.value })}
+          />
+        </div>
+      ))}
+      <button
+        type="button"
+        className="imsc-btn imsc-btnGhost"
+        disabled={disabled}
+        onClick={() => onPatch({ params: [...draft.params, emptyParamDraft()] })}
+      >
+        {t('card.add')} · {t('card.params')}
+      </button>
+    </>
+  )
+}

package/src/client/styles.ts

@@ -561,10 +561,8 @@ export const imageStudioCss = `
 .imsc-loading{padding:14px 16px;margin:0;font-size:13px;color:var(--dsw-alias-label-tertiary)}
 .imsc-groupTitle { margin: 14px 0 6px; font-size: 13px; font-weight: 600; }
 .imsc-presetBox {
-  border: 1px solid var(--dsw-alias-border-l3);
-  border-radius: 10px;
-  padding: 10px;
-  margin-bottom: 10px;
+  border-top: 1px solid var(--dsw-alias-border-l3);
+  padding: 10px 0 2px;
   display: grid;
   gap: 8px;
 }
@@ -587,6 +585,7 @@ export const imageStudioCss = `
 .imsc-credRow { display: flex; align-items: center; gap: 8px; }
 .imsc-credRow .imsc-input { flex: 1; min-width: 0; }
 
+
 /* ── 移动端（≤767px，与 ui-mobile-fit 同断点）── */
 @media (max-width: 767px) {
   .ims-modal {

package/src/ns.ts

@@ -2,8 +2,8 @@
  * settings 命名空间字面量（纯常量，零依赖，浏览器半可安全引入）。
  * 服务端直接以字面量注册（0.1.2-alpha.2 起 dsh-settings 对命名空间做编译期
  * 语法校验，见 config.ts）；浏览器半把它作为配置卡片的注册键
- * （legacy settings.plugin.item keyed 槽位按「卡片编辑的 settings 命名空间」
- * 分发；0.1.6-alpha.2 起改挂插件页 row/bundle config，见 shared/config-slots），
+ * （插件页配置卡片挂在 row/bundle config 槽位上，与命名空间解耦，
+ * 见 shared/config-slots），
  * 同一字面量两处共用，防止漂移。
  * @module image-studio/ns
  */