@dickpy/dsh-imagegen 1.5.2 → 1.5.4

package/src/routes.ts

@@ -6,7 +6,11 @@
  */
 
 import type { IncomingMessage, ServerResponse } from 'node:http'
+import { spawn } from 'node:child_process'
+import { mkdir as fsMkdir } from 'node:fs/promises'
 import { randomUUID } from 'node:crypto'
+import { homedir } from 'node:os'
+import path from 'node:path'
 import type { WebRoute } from '@deepseek-ai/dsh-host-webserver'
 import type { ImageAttachmentRef, ImageMediaType, SaveImageAttachment } from '@deepseek-ai/dsh-attachment'
 import { SettingsConflictError, type SettingsDescriptor } from '@deepseek-ai/dsh-settings'
@@ -16,11 +20,13 @@ import { normalizeImageModels } from './image-models.ts'
 import { ImageGenerationRuntime, type ChannelsView } from './generation-runtime.ts'
 import { appendHistory, clearHistory, listHistory, readHistoryImage, removeHistory } from './history-store.ts'
 import { appendGallery, clearGallery, listGallery, readGalleryImage, removeGallery, updateGalleryTags } from './gallery-store.ts'
+import { canvasStore, CanvasConflictError, type CanvasImageInput, type CanvasStore } from './canvas-store.ts'
 import { listTemplates, readTemplateImage, refreshTemplates, sampleTemplates } from './templates-store.ts'
 import { addTemplateFavorite, listTemplateFavorites, removeTemplateFavorite } from './template-favorites.ts'
+import { testStorage, type StorageSyncConfig } from './storage-sync.ts'
 import { checkForUpdate, CURRENT_VERSION, installUpdate } from './updater.ts'
 import { IMAGE_PRESETS } from './presets.ts'
-import { AGENT_IMAGE_API, CONVERSATION_IMAGE_API, DEFAULT_TEMPLATE_SOURCE_ID, GALLERY_API, GENERATE_API, HISTORY_API, IMAGEGEN_SETTINGS_NAMESPACE, IMAGE_MODEL_API, PRESETS_API, PROMPT_ENHANCE_API, SETTINGS_API, TASK_API, TEMPLATE_FAVORITES_API, TEMPLATES_API, UPDATE_API, USAGE_API, isTemplateSourceId, type GeneratedImage, type GenerateRequest, type HistoryEntry, type HistoryEntryInput, type ModelMapping, type PresetProviderView, type TemplateFavorite, type TemplateListResult, type TemplateRefreshResult, type TemplateSample } from './protocol.ts'
+import { AGENT_IMAGE_API, CANVAS_API, CONVERSATION_IMAGE_API, DATA_FOLDER_API, DEFAULT_TEMPLATE_SOURCE_ID, GALLERY_API, GENERATE_API, HISTORY_API, IMAGEGEN_SETTINGS_NAMESPACE, IMAGE_MODEL_API, PRESETS_API, PROMPT_ENHANCE_API, SETTINGS_API, STORAGE_API, TASK_API, TEMPLATE_FAVORITES_API, TEMPLATES_API, UPDATE_API, USAGE_API, isTemplateSourceId, type CanvasDocument, type GeneratedImage, type GenerateRequest, type HistoryEntry, type HistoryEntryInput, type ModelMapping, type PresetProviderView, type TemplateFavorite, type TemplateListResult, type TemplateRefreshResult, type TemplateSample } from './protocol.ts'
 
 /** Cap on JSON request bodies (settings ops and generate payloads are small). */
 const MAX_JSON_BODY_BYTES = 24 * 1024 * 1024
@@ -73,6 +79,8 @@ export interface ImageGenRoutesDeps {
     updateTags?: (id: string, tags: string[]) => Promise<HistoryEntry[]>
     readImage: (file: string) => Promise<{ data: Buffer; mime: string } | undefined>
   }
+  /** Overrideable canvas backend, primarily for host integration tests. */
+  canvas?: CanvasBackend
   /** Overrideable template-library backend, primarily for host integration tests. */
   templates?: {
     list: (sourceId: string) => Promise<TemplateListResult>
@@ -86,10 +94,23 @@ export interface ImageGenRoutesDeps {
     add: (sourceId: string, item: TemplateFavorite['case']) => Promise<TemplateFavorite[]>
     remove: (key: string) => Promise<TemplateFavorite[]>
   }
+  /** Resolve the object-storage sync settings (with the real secret). */
+  resolveStorage?: () => StorageSyncConfig
   /** Shared host queue, used by Agent tools and browser task endpoints. */
   runtime?: ImageGenerationRuntime
 }
 
+/** Minimal canvas store contract so hosts can inject an isolated test backend. */
+export interface CanvasBackend {
+  list: () => Promise<Awaited<ReturnType<CanvasStore['list']>>>
+  create: (title?: string) => Promise<Awaited<ReturnType<CanvasStore['create']>>>
+  read: (id: string) => Promise<Awaited<ReturnType<CanvasStore['read']>>>
+  save: (document: CanvasDocument, expectedRevision?: number) => Promise<Awaited<ReturnType<CanvasStore['save']>>>
+  remove: (id: string) => Promise<Awaited<ReturnType<CanvasStore['remove']>>>
+  putImage: (input: CanvasImageInput) => Promise<Awaited<ReturnType<CanvasStore['putImage']>>>
+  readAsset: (file: string) => Promise<Awaited<ReturnType<CanvasStore['readAsset']>>>
+}
+
 /** Loopback literal check plus browser same-origin markers (mirrors dsh-ssh). */
 function isLoopbackRequest(request: IncomingMessage): boolean {
   const address = request.socket.remoteAddress
@@ -156,6 +177,7 @@ function parseGenerateRequest(body: Record<string, unknown>): GenerateRequest |
   const comparisonModels = Array.isArray(body.comparisonModels)
     ? [...new Set(body.comparisonModels.filter((model): model is string => typeof model === 'string').map(model => model.trim()).filter(Boolean))]
     : []
+  const canvas = parseCanvasMeta(body.canvas)
   return {
     mode: body.mode === 'edit' ? 'edit' : 'text',
     model: typeof body.model === 'string' ? body.model : '',
@@ -169,6 +191,7 @@ function parseGenerateRequest(body: Record<string, unknown>): GenerateRequest |
     ...typeof body.channelId === 'string' && body.channelId !== '' ? { channelId: body.channelId } : {},
     ...typeof body.comparisonId === 'string' && body.comparisonId !== '' ? { comparisonId: body.comparisonId } : {},
     ...comparisonModels.length > 1 ? { comparisonModels } : {},
+    ...canvas === undefined ? {} : { canvas },
     ...body.workflow === 'ecommerce' ? { workflow: 'ecommerce' as const } : {},
     ...typeof body.projectId === 'string' && body.projectId !== '' ? { projectId: body.projectId } : {},
     ...typeof body.projectName === 'string' && body.projectName !== '' ? { projectName: body.projectName } : {},
@@ -177,6 +200,19 @@ function parseGenerateRequest(body: Record<string, unknown>): GenerateRequest |
   }
 }
 
+function parseCanvasMeta(value: unknown): GenerateRequest['canvas'] {
+  if (value === null || typeof value !== 'object') return undefined
+  const raw = value as Record<string, unknown>
+  if (typeof raw.canvasId !== 'string' || raw.canvasId.trim() === '') return undefined
+  return {
+    canvasId: raw.canvasId.trim(),
+    ...typeof raw.sourceNodeId === 'string' && raw.sourceNodeId.trim() !== '' ? { sourceNodeId: raw.sourceNodeId.trim() } : {},
+    ...typeof raw.annotationNodeId === 'string' && raw.annotationNodeId.trim() !== '' ? { annotationNodeId: raw.annotationNodeId.trim() } : {},
+    ...typeof raw.parentNodeId === 'string' && raw.parentNodeId.trim() !== '' ? { parentNodeId: raw.parentNodeId.trim() } : {},
+    ...raw.placement === 'right' || raw.placement === 'below' ? { placement: raw.placement } : {},
+  }
+}
+
 /** Validate a submitted history entry (images carry base64). */
 function parseHistoryEntryInput(body: Record<string, unknown>): HistoryEntryInput | undefined {
   const raw = body.entry
@@ -202,6 +238,7 @@ function parseHistoryEntryInput(body: Record<string, unknown>): HistoryEntryInpu
   const comparisonModels = Array.isArray(entry.comparisonModels)
     ? [...new Set(entry.comparisonModels.filter((model): model is string => typeof model === 'string').map(model => model.trim()).filter(Boolean))]
     : []
+  const canvas = parseCanvasMeta(entry.canvas)
   return {
     id: entry.id,
     createdAt: entry.createdAt,
@@ -218,6 +255,7 @@ function parseHistoryEntryInput(body: Record<string, unknown>): HistoryEntryInpu
     ...typeof entry.channel === 'string' ? { channel: entry.channel } : {},
     ...typeof entry.comparisonId === 'string' ? { comparisonId: entry.comparisonId } : {},
     ...comparisonModels.length > 1 ? { comparisonModels } : {},
+    ...canvas === undefined ? {} : { canvas },
     ...entry.workflow === 'ecommerce' ? { workflow: 'ecommerce' as const } : {},
     ...typeof entry.projectId === 'string' ? { projectId: entry.projectId } : {},
     ...typeof entry.projectName === 'string' ? { projectName: entry.projectName } : {},
@@ -323,6 +361,7 @@ export function makeRoutes(deps: ImageGenRoutesDeps): WebRoute[] {
     updateTags: updateGalleryTags,
     readImage: readGalleryImage,
   }
+  const canvas = deps.canvas ?? canvasStore
   const templates = deps.templates ?? {
     list: listTemplates,
     refresh: refreshTemplates,
@@ -923,6 +962,148 @@ export function makeRoutes(deps: ImageGenRoutesDeps): WebRoute[] {
         res.end(found.data)
       },
     },
+    // ------------------------------------------------------ canvas list
+    {
+      kind: 'exact',
+      path: CANVAS_API.list,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        try { writeJson(res, 200, { ok: true, projects: await canvas.list() }) }
+        catch (error) { writeJson(res, 200, { ok: false, code: 'canvas-failed', message: messageOf(error) }) }
+      },
+    },
+    // ---------------------------------------------------- canvas create
+    {
+      kind: 'exact',
+      path: CANVAS_API.create,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        const body = await readJsonBody(req)
+        const title = typeof body?.title === 'string' ? body.title : '未命名画布'
+        try { writeJson(res, 200, { ok: true, document: await canvas.create(title) }) }
+        catch (error) { writeJson(res, 200, { ok: false, code: 'canvas-failed', message: messageOf(error) }) }
+      },
+    },
+    // ------------------------------------------------------ canvas read
+    {
+      kind: 'exact',
+      path: CANVAS_API.read,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        const body = await readJsonBody(req)
+        const id = typeof body?.id === 'string' ? body.id : ''
+        const document = id === '' ? undefined : await canvas.read(id)
+        if (document === undefined) writeJson(res, 200, { ok: false, code: 'not-found', message: '画布不存在' })
+        else writeJson(res, 200, { ok: true, document })
+      },
+    },
+    // ------------------------------------------------------ canvas save
+    {
+      kind: 'exact',
+      path: CANVAS_API.save,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        const body = await readJsonBody(req)
+        const document = body?.document as CanvasDocument | undefined
+        const expectedRevision = typeof body?.expectedRevision === 'number' ? body.expectedRevision : undefined
+        if (document === undefined || typeof document !== 'object') {
+          writeJson(res, 200, { ok: false, code: 'bad-request', message: 'canvas document is required' })
+          return
+        }
+        try { writeJson(res, 200, { ok: true, document: await canvas.save(document, expectedRevision) }) }
+        catch (error) {
+          const code = error instanceof CanvasConflictError ? error.code : 'canvas-failed'
+          writeJson(res, 200, { ok: false, code, message: messageOf(error) })
+        }
+      },
+    },
+    // ---------------------------------------------------- canvas remove
+    {
+      kind: 'exact',
+      path: CANVAS_API.remove,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        const body = await readJsonBody(req)
+        const id = typeof body?.id === 'string' ? body.id : ''
+        if (id === '') { writeJson(res, 200, { ok: false, code: 'bad-request', message: 'canvas id is required' }); return }
+        try { writeJson(res, 200, { ok: true, projects: await canvas.remove(id) }) }
+        catch (error) { writeJson(res, 200, { ok: false, code: 'canvas-failed', message: messageOf(error) }) }
+      },
+    },
+    // ------------------------------------------------ canvas asset upload
+    {
+      kind: 'exact',
+      path: CANVAS_API.assetUpload,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        const body = await readJsonBody(req, MAX_HISTORY_BODY_BYTES)
+        const parsed = typeof body?.dataUrl === 'string' ? imageDataUrl(body.dataUrl) : undefined
+        const width = Number(body?.width)
+        const height = Number(body?.height)
+        if (parsed === undefined || !Number.isSafeInteger(width) || width < 1 || !Number.isSafeInteger(height) || height < 1) {
+          writeJson(res, 200, { ok: false, code: 'bad-request', message: 'image data and dimensions are required' })
+          return
+        }
+        try {
+          const asset = await canvas.putImage({
+            data: parsed.data,
+            mime: parsed.mediaType,
+            width,
+            height,
+            origin: body?.origin === 'history' || body?.origin === 'gallery' || body?.origin === 'generated' ? body.origin : 'upload',
+            ...typeof body?.originId === 'string' ? { originId: body.originId } : {},
+            ...typeof body?.entryId === 'string' ? { entryId: body.entryId } : {},
+            ...Number.isSafeInteger(Number(body?.imageIndex)) ? { imageIndex: Number(body?.imageIndex) } : {},
+          })
+          writeJson(res, 200, { ok: true, asset })
+        } catch (error) { writeJson(res, 200, { ok: false, code: 'canvas-asset-failed', message: messageOf(error) }) }
+      },
+    },
+    // ----------------------------------------------- canvas asset import
+    {
+      kind: 'exact',
+      path: CANVAS_API.assetImport,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        const body = await readJsonBody(req)
+        const source = body?.source === 'history' || body?.source === 'gallery' ? body.source : undefined
+        const entryId = typeof body?.entryId === 'string' ? body.entryId : ''
+        const imageIndex = Number(body?.imageIndex)
+        const width = Number(body?.width)
+        const height = Number(body?.height)
+        if (source === undefined || entryId === '' || !Number.isSafeInteger(imageIndex) || imageIndex < 0
+          || !Number.isSafeInteger(width) || width < 1 || !Number.isSafeInteger(height) || height < 1) {
+          writeJson(res, 200, { ok: false, code: 'bad-request', message: 'source, entryId, imageIndex and dimensions are required' })
+          return
+        }
+        try {
+          const backend = source === 'history' ? history : gallery
+          const entry = (await backend.list()).find(item => item.id === entryId)
+          const image = entry?.images[imageIndex]
+          if (image === undefined) { writeJson(res, 200, { ok: false, code: 'not-found', message: 'image not found' }); return }
+          const base = source === 'history' ? HISTORY_API.image : GALLERY_API.image
+          const file = imageFileFrom(image.url, base)
+          const found = file === undefined ? undefined : await backend.readImage(file)
+          if (found === undefined) { writeJson(res, 200, { ok: false, code: 'not-found', message: 'image not found' }); return }
+          const asset = await canvas.putImage({ data: found.data, mime: found.mime, width, height, origin: source, originId: entryId, entryId, imageIndex })
+          writeJson(res, 200, { ok: true, asset })
+        } catch (error) { writeJson(res, 200, { ok: false, code: 'canvas-asset-failed', message: messageOf(error) }) }
+      },
+    },
+    // ------------------------------------------- canvas asset (prefix)
+    {
+      kind: 'prefix',
+      path: CANVAS_API.asset,
+      handler: async (req, res) => {
+        if (!isLoopbackRequest(req)) { writeJson(res, 403, { error: 'forbidden: loopback-only' }); return }
+        if (req.method !== 'GET') { writeJson(res, 405, { error: `method not allowed: ${req.method}` }); return }
+        const file = imageFileFrom(req.url, CANVAS_API.asset)
+        const found = file === undefined ? undefined : await canvas.readAsset(file)
+        if (found === undefined) { writeJson(res, 404, { error: 'not found' }); return }
+        res.writeHead(200, { 'content-type': found.mime, 'content-length': found.data.length, 'cache-control': 'private, max-age=3600' })
+        res.end(found.data)
+      },
+    },
     // --------------------------------------------------- templates list
     {
       kind: 'exact',
@@ -1076,5 +1257,54 @@ export function makeRoutes(deps: ImageGenRoutesDeps): WebRoute[] {
         }
       },
     },
+    // ------------------------------------------- data folder: reveal in OS
+    {
+      kind: 'exact',
+      path: DATA_FOLDER_API,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        const body = await readJsonBody(req)
+        const dir = path.join(homedir(), '.dsh', 'dsh-imagegen')
+        try {
+          await fsMkdir(dir, { recursive: true })
+        } catch { /* reveal still works when the directory already exists */ }
+        if (body?.open === false) {
+          // Wiring probe for tests: resolve the path without spawning a shell.
+          writeJson(res, 200, { ok: true, path: dir })
+          return
+        }
+        try {
+          const command = process.platform === 'win32'
+            ? 'explorer.exe'
+            : process.platform === 'darwin'
+              ? 'open'
+              : 'xdg-open'
+          const child = spawn(command, [dir], { detached: true, stdio: 'ignore' })
+          child.unref()
+          writeJson(res, 200, { ok: true, path: dir })
+        } catch (error) {
+          writeJson(res, 200, { ok: false, code: 'data-folder-failed', message: messageOf(error) })
+        }
+      },
+    },
+    // ------------------------------------------------- storage: probe upload
+    {
+      kind: 'exact',
+      path: STORAGE_API.test,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        const storage = deps.resolveStorage?.()
+        if (storage === undefined) {
+          writeJson(res, 200, { ok: false, code: 'storage-unavailable', message: '存储配置不可用' })
+          return
+        }
+        try {
+          const result = await testStorage(storage)
+          writeJson(res, 200, { ok: true, ms: result.ms, key: result.key })
+        } catch (error) {
+          writeJson(res, 200, { ok: false, code: 'storage-test-failed', message: messageOf(error) })
+        }
+      },
+    },
   ]
 }

package/src/storage-sync.ts

@@ -0,0 +1,105 @@
+/**
+ * Object-storage sync for saved images: one S3-compatible uploader (SigV4,
+ * zero dependencies) that covers Tencent COS / Alibaba OSS / Qiniu S3 /
+ * MinIO / R2 style endpoints, plus a fire-and-forget hook the image stores
+ * call after a file lands on disk. The handler is registered by the plugin
+ * root (it owns the live settings), so framework-free stores stay decoupled
+ * from the settings seam.
+ *
+ * Object keys: `${prefix}/gallery/<file>` and `${prefix}/images/<file>` —
+ * content-addressed file names dedupe re-uploads naturally.
+ */
+
+import { createHash, createHmac } from 'node:crypto'
+
+/** The storage section of the plugin settings document. */
+export interface StorageSyncConfig {
+  endpoint: string
+  region: string
+  accessKey: string
+  secretKey: string
+  prefix: string
+}
+
+/** Registered by index.ts: uploads `filePath` when the settings allow it. */
+export type StorageUploadHandler = (kind: 'gallery' | 'history', filePath: string) => void
+
+let uploadHandler: StorageUploadHandler | undefined
+
+/** Register the live uploader (index.ts apply). Pass undefined to clear. */
+export function setStorageSyncHandler(handler: StorageUploadHandler | undefined): void {
+  uploadHandler = handler
+}
+
+/** Fire-and-forget notification from the image stores after a file write. */
+export function notifyImageSaved(kind: 'gallery' | 'history', filePath: string): void {
+  try {
+    uploadHandler?.(kind, filePath)
+  } catch {
+    // A sync failure must never break the save path.
+  }
+}
+
+/** URL-encode per RFC 3986 (AWS SigV4 canonical forms). */
+function uriEncode(value: string, encodeSlash = true): string {
+  return value.replace(/[^A-Za-z0-9-_.~]/g, char => {
+    const hex = char.charCodeAt(0).toString(16).toUpperCase()
+    return `%${hex.padStart(2, '0')}`
+  }).replace(/%2F/g, encodeSlash ? '%2F' : '/')
+}
+
+/** HMAC-SHA256 helper. */
+function hmac(key: Buffer | string, data: string): Buffer {
+  return createHmac('sha256', key).update(data, 'utf8').digest()
+}
+
+/**
+ * PUT one object to an S3-compatible endpoint (SigV4, virtual-hosted or
+ * path-style — the endpoint URL already includes the bucket). Returns the
+ * elapsed milliseconds so the settings card can show a latency reading.
+ */
+export async function putObject(config: StorageSyncConfig, key: string, data: Buffer, contentType = 'application/octet-stream'): Promise<{ ms: number }> {
+  const endpoint = config.endpoint.trim().replace(/\/+$/, '')
+  if (endpoint === '' || config.accessKey.trim() === '' || config.secretKey.trim() === '') {
+    throw new Error('对象存储配置不完整：请填写接口地址与密钥')
+  }
+  const url = new URL(`${endpoint}/${key.split('/').map(part => uriEncode(part)).join('/')}`)
+  const payloadHash = createHash('sha256').update(data).digest('hex')
+  const now = new Date()
+  const amzDate = `${now.toISOString().replace(/[:-]|\.\d{3}/g, '')}` // YYYYMMDDTHHMMSSZ
+  const dateStamp = amzDate.slice(0, 8)
+  const host = url.host
+  const canonicalUri = url.pathname
+  const canonicalHeaders = `content-type:${contentType}\nhost:${host}\nx-amz-content-sha256:${payloadHash}\nx-amz-date:${amzDate}\n`
+  const signedHeaders = 'content-type;host;x-amz-content-sha256;x-amz-date'
+  const canonicalRequest = `PUT\n${canonicalUri}\n\n${canonicalHeaders}\n${signedHeaders}\n${payloadHash}`
+  const scope = `${dateStamp}/${config.region.trim() || 'us-east-1'}/s3/aws4_request`
+  const stringToSign = `AWS4-HMAC-SHA256\n${amzDate}\n${scope}\n${createHash('sha256').update(canonicalRequest, 'utf8').digest('hex')}`
+  const signingKey = hmac(hmac(hmac(hmac(`AWS4${config.secretKey.trim()}`, dateStamp), config.region.trim() || 'us-east-1'), 's3'), 'aws4_request')
+  const signature = createHmac('sha256', signingKey).update(stringToSign, 'utf8').digest('hex')
+  const authorization = `AWS4-HMAC-SHA256 Credential=${config.accessKey.trim()}/${scope}, SignedHeaders=${signedHeaders}, Signature=${signature}`
+
+  const started = Date.now()
+  const response = await fetch(url, {
+    method: 'PUT',
+    headers: {
+      'content-type': contentType,
+      'x-amz-content-sha256': payloadHash,
+      'x-amz-date': amzDate,
+      authorization,
+    },
+    body: new Uint8Array(data),
+  })
+  if (!response.ok) {
+    const text = await response.text().catch(() => '')
+    throw new Error(`对象存储拒绝上传（HTTP ${response.status}）${text !== '' ? `：${text.slice(0, 200)}` : ''}`)
+  }
+  return { ms: Date.now() - started }
+}
+
+/** Upload a small probe object; used by the settings card's test button. */
+export async function testStorage(config: StorageSyncConfig): Promise<{ ms: number; key: string }> {
+  const key = `${config.prefix.trim() || 'dsh-imagegen'}/ping.txt`
+  const { ms } = await putObject(config, key, Buffer.from('dsh-imagegen storage ok', 'utf8'), 'text/plain')
+  return { ms, key }
+}