* feat(editor): 编辑器实施 M0-M1 - 剪辑入口占位与插件 SDK v2 垂直切片 - detail.tsx 新增剪辑成片视图(editor tab,常驻),概览页插入剪辑步骤卡 - plugin-types.ts 新增 v2 类型(EditorSlotKind/EditorPluginPermission/PluginManifestV2),修复权限数组交叉归约 bug - editor-slot-registry.ts 插槽注册表(优先级排序、幂等注册、订阅机制) - plugin-registry.ts 注册器 v1/v2 分支校验,v1 路径零改动 - editor-shell.tsx 垂直切片插件:timeline-panel 插槽真实渲染,验证插件链路全通 - 测试:插槽注册表 5 用例 + 命令测试骨架,v1 插件回归 21 例零回归 * feat(editor): 命令协议黄金文件 - editor-commands 纯函数 reducer + 8 个黄金 op * feat(editor): 快照撤销历史 - editor-history 有界 200 层 undo/redo * feat(editor): 命令状态机 store - dispatch/手势预览/1.5s 防抖保存/串行保存链 * fix(editor): createEditorStore 返回 zustand hook 类型修复 typecheck * feat(editor): 手势 echo 最小件 - 时间线面板拖拽移动/裁剪 + store 接线与本地持久化 * docs(editor): M2 完成状态记录 * feat(editor): M3.1 时间线面板选中联动 - store 选中状态 + 片段高亮/点击取消 * feat(editor): M3.2 预览监视器 - preview-renderer 插槽 + 真实媒体帧/播放头/时间码 * feat(editor): M3.3 片段检查器 - inspector 插槽 + 属性编辑入队可撤销 * feat(editor): M3.4 asset-ingest 素材库插件(addClip 命令入轨) * feat(editor): M3.4 补充 - host 上下文(项目信息+资产)、editor.tsx 接线、asset-ingest 纯函数、死代码清理 * feat(editor): M3.5 subtitle-tools - SRT import/export + rebuild from node snapshot * feat(editor): M3.6 transcription - deterministic mock ASR to subtitle track * feat(editor): M3.7 export - render plan + ffmpeg.wasm fallback export * feat(editor): M3.8 - render all 8 editor slots in three-pane layout + ai-assistant placeholder * docs(editor): M3 完成状态 - 8 插件 + 全插槽接线,冒烟待确认 * feat(editor): 编辑器媒体与时间线打磨 - 资产来源分组筛选、时间线全宽布局、拖拽末片段修复、OSS 降级本地存储、Concat 风格控制条与检查器 * fix(plugins): 合并上游后修复插件分类筛选对 v2 清单的类型兼容 * feat(editor): 时间线工具态与轨道操作打磨 - 工具按钮选中仅图标变色、监视器 Concat 式控制条、removeTrack 黄金命令与轨道行头移除按钮、maskClosable 迁移 * fix(api): 资源上传超 MaxBytesReader 上限时报中文大小限制而非英文裸 400 * fix(editor): 监视器控制条 - 修复播放按钮 JSX 模板闭合花括号缺失导致的编译错误 * feat(api): 本地媒体导入分片化对齐 Concat - >50MB 视频不再失败 - 分片会话三接口(POST开始/PUT单片/complete合并)、前端超50MB自动切8MB分片并失败整传重试、默认配额放宽(日200MB→2GB、总2GB→20GB)、UploadResourceFile 豁免单文件限 * feat(editor): 轨道行头新增可见性/静音开关按钮 - 复用现有图标资源,按轨道类型显隐;命令层新增 setTrackFlag 黄金命令(flag 白名单 fail-closed)并补单测 * docs(progress): 记录轨道可见/静音开关改动与复测项 * docs(editor): M4 转写与渲染任务设计 - 复用 Task 表与状态机、独立创建 API、worker 领取类型过滤、whisper HTTP provider(OpenAI 兼容 /v1/audio) * fix(api): OSS 上传失败自动降级本地存储时 body 已被 Transport 关闭 - newOSSRequest 用 NopCloser 包装请求体,服务端提前返回(签名 403)时不再关闭调用方持有的文件,降级分支 Seek 重读生效;补回归测试 * docs(progress): 记录媒体导入根治(分片+OSS 降级修复)复测项 * feat(api): 视频播放副本转码 H.265→H.264 + variant=playback 服务与启动回填 - 上传视频后异步探测 codec,H.265/AV1 走 moov 快速探测并转码 H.264 播放副本;GET /api/user-data/...?variant=playback 就绪时服务副本(独立 ETag :pb),未就绪回退原件并撤销后缀防 304 黑屏;storeResource 触发、启动幂等回填存量;前端播放失败自动轮询副本就绪后刷新 * fix(editor): 轨道至少保留一条 - 不可移除轨道点击 X 时居中浮现原因提示(2.2s 自动消失, aria-live);修正可见性 toggle 传参 (visible===false 语义) ;轨道行内移除按钮改为常驻(不可移除时点击给提示) * feat(timeline): M4.1 字幕转写后台任务 - whisper.cpp 本地执行 - 新增 timeline_transcription 任务类型,worker 按类型分叉独立执行器(不走计费与模型渠道);输入 resourceId+language,读取用户资源后 ffmpeg 预处理 16k 单声道 wav,POST 本地 whisper.cpp /inference,结果写回 segments+srt+language;未配置 CANVAS_WHISPER_BASE_URL 等失败均落明确终态;feature 门控;进度分阶段;含解析/SRT/快速失败单元测试 * feat(media): 素材卡片时长与媒体面板打磨 - 导入媒体解析时长(前端 media-metadata + 后端 project_asset durationMs 透出)随卡片展示;媒体面板/监视器/时间线相关样式细节收尾 * docs(progress): 阶段 C 监视器播放复检清单 - H.265 播放副本/真实播放驱动/时长链路待浏览器确认 * feat(timeline): M4.1 转写任务创建 API - POST /api/timeline/transcriptions - service CreateTimelineTranscriptionTask:IsDraining 守护 + feature 门控 + 资源归属与可转写类型校验 + 排队计 active 限额(含任务级/项目级存储估算);local/whisper.cpp 标记,任务不经过模型路由与计费;createTaskWithinStorageQuota 复用与 ErrActiveTaskLimit 用户可读映射;测试覆盖排队成功(owner/type/provider 断言)、跨用户资源拒绝、非音视频拒绝 * feat(timeline): M4.3 字幕转写前端接线 - 真实任务替换 mock - 新增 services/api/timeline-tasks.ts(POST /timeline/transcriptions,复用 apiClient+request);EditorTranscription 改为 创建任务→waitForGenerationTask 轮询(25min)→结果 segments 映射 SrtEntry[]→rebuildSubtitleClips 写入字幕轨道;实时展示 stage/progress,失败/空识别/无字幕轨道分别提示;素材选择支持音频与视频(取 storageKey 中的 resource id 提交) * fix(media): 播放副本状态收敛与轮询终态 - 无ffmpeg/远端存储/编码不可处理落 none 避免重复探测;前端 none 停轮询回原生播放并加 processing 上限 * feat(timeline): M4.2 时间线渲染任务 - POST /api/timeline/renders 创建(buildRenderPlan 校验含可渲染媒体、配额入队、local/ffmpeg、60min 超时);worker 顶部按类型分叉 processTimelineRender;ffmpeg 合成产物写资源存储并经 ResultJSON 记 resourceId;render 计划/结果测试 PASS * fix(resource): 转码原子抢占与 OSS 请求体加固 - ClaimPlaybackTranscode 空/none→processing 单实例抢占避免重复转码,runPlaybackTranscode defer recover 落 failed;If-Range 与带 :pb 后缀的 serveETag 比较;无请求体的 OSS 请求不再包 NopCloser(nil)(防 Go 1.26 body 探测 nil 解引用) * style(editor): 修正字幕回写面板缩进 * docs(timeline): M4 设计文档按实现回写 - 单一 worker 池 + processClaimedTask 顶部按类型分叉(决策 3/4),端点统一为复数 /api/timeline/transcriptions 与 /api/timeline/renders(注册于 RegisterTaskRoutes),ResultJSON/feature gate/ffmpeg env 同步;Runbook M4 表格与状态行更新;auth.go API 前缀白名单补 timeline * fix(service): 修复上游 v1.2.5 公告配图删除保护自锁与测试夹具缺口 上游 #385 资源引用走查器对公告配图/草稿做了硬性引用检查,导致三个问题: - UpdateAnnouncement 在更新公告前对旧配图走查,必然命中当前公告自身引用而自锁, 公告替换配图功能实际不可用;DiscardAnnouncementImage 同理被草稿自身引用阻塞。 修复:ensureResourceHasNoBusinessReferences 支持忽略指定引用(当前公告/当前草稿), 其余引用仍按原语义拦截。 - admin DeleteAdminResources 将公告草稿引用视为阻塞,但删除事务会级联清理草稿与 资源绑定,service 层永不进入事务,回滚审计注入测试无法到达预期路径。修复:service 预检时过滤公告草稿引用,与 repository 级联语义对齐。 - project_settings_test.go 夹具未建 ResourceReferenceSnapshot 走查的 Task/Session/ Message/TaskLog/Result/Announcement/AnnouncementImageDraft 表,报 no such table。 修复:夹具 AutoMigrate 补齐。 后端全量 go test ./... 通过。 * feat(editor): 成片导出接入后端渲染任务(M4.2 前端接线)- timeline-tasks 增 createTimelineRenderTask;editor-export 主路径改 POST /timeline/renders 轮询取 resourceId 内嵌预览/下载,ffmpeg.wasm 降级保留 * feat(editor): M5 插件权限执行(fail-closed)- plugin-permission-check 新建(8 插槽最小权限表/判定/断言);SlotStack 渲染前过滤缺权限插槽改诊断条;editor-shell manifest 补 timeline.command/export.run;测试 10 用例含 editor-shell 真实回归 * feat(editor): M6.1 AI 命令 schema + M6.2 时间线摘要 - ai-command-schema(parse/dry-run 校验/12-op 提示词契约/版本化+golden);timeline-summary(确定性中文摘要/折叠上限);各 20/10 用例全绿 * docs(progress): M6 质检清单 - M6.1 schema/M6.2 摘要标记完成(含测试计数),M6.3 待模型源确认;清理 M5.1 重复条目 * feat(editor): AI 命令 schema 支持只读问答 - commands 空数组合法化(无法执行/纯提问时 reasoning 直接作答),新增 AI_EDITING_MAX_COMMANDS=8 上限防失控编辑,提示词同步 * feat(editor): AI 助手重构为右上悬浮对话面板(M6.3)+ 素材入库原子化收尾 - editor-ai-assistant.tsx: 占位面板替换为 OpenAI Canvas 风格右上悬浮对话面板; 面板内文本模型选择器(effective.textModels,选择即持久化并覆写请求模型), 消息流 user/assistant/error/preview 四类气泡 + 思考中占位,空态引导示例 chips 一键发送,底部输入条;顶部工具栏常驻 Sparkles 入口(aria-pressed 切换)。 修复上一版重复/截断函数声明(appendToEntry 双定义、settleAnswer 三声明等)。 宿主链路:buildAiEditingSystemPrompt(summarizeTimeline(project)) 喂上下文 → parseAiCommandPlan → validateAiCommandBatch dry-run(任一非法整批拒绝)→ ≤3 条 dispatch 直执行 / >3 条预览确认卡片;宿主拒绝时 failTurn 回填 FAILED_MARK 可重试。 - editor-asset-ingest/editor-preview-monitor/detail/editor.tsx: 配套接线与打磨 (编辑器顶栏 AI 入口、素材导入面板、预览监视、项目页顶栏整理)。 - backend: LinkProjectAsset 事务内原子创建资产 + 项目链接(OnConflict 幂等), 资产首次入库不再预落库,失败整体回滚,消除"有资产无链接"孤儿记录。 - docs: pending-test.mdx / runbook M6.3 状态更新(tsc + 测试 + 构建通过, 浏览器冒烟待真实文本渠道)。
283 lines
10 KiB
Go
283 lines
10 KiB
Go
package service
|
|
|
|
import (
|
|
"errors"
|
|
"sort"
|
|
"strings"
|
|
|
|
"infinite-canvas/backend/internal/model"
|
|
"infinite-canvas/backend/internal/repository"
|
|
)
|
|
|
|
const maxAdminResourceDeleteCount = 100
|
|
|
|
type AdminResourceDeleteRequest struct {
|
|
ResourceIDs []string `json:"resourceIds"`
|
|
}
|
|
|
|
type AdminResourceReferenceView struct {
|
|
Kind string `json:"kind"`
|
|
ID string `json:"id"`
|
|
Title string `json:"title"`
|
|
}
|
|
|
|
type AdminResourceDeleteBlocked struct {
|
|
ID string `json:"id"`
|
|
Reason string `json:"reason"`
|
|
References []AdminResourceReferenceView `json:"references"`
|
|
}
|
|
|
|
type AdminResourceDeleteResult struct {
|
|
Deleted []string `json:"deleted"`
|
|
Blocked []AdminResourceDeleteBlocked `json:"blocked"`
|
|
}
|
|
|
|
func (s *Service) DeleteAdminResources(actor *model.User, req AdminResourceDeleteRequest) (*AdminResourceDeleteResult, error) {
|
|
if err := s.RequireAdmin(actor); err != nil {
|
|
return nil, err
|
|
}
|
|
resourceIDs, err := normalizeAdminResourceDeleteIDs(req.ResourceIDs)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
s.storageMu.Lock()
|
|
defer s.storageMu.Unlock()
|
|
|
|
resources, err := s.repo.AdminResourcesByIDs(resourceIDs)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
resourcesByID := make(map[string]model.Resource, len(resources))
|
|
resourcesByUser := make(map[string][]model.Resource)
|
|
for _, resource := range resources {
|
|
resourcesByID[resource.ID] = resource
|
|
resourcesByUser[resource.UserID] = append(resourcesByUser[resource.UserID], resource)
|
|
}
|
|
blockedByID := make(map[string]AdminResourceDeleteBlocked)
|
|
for _, resourceID := range resourceIDs {
|
|
if _, exists := resourcesByID[resourceID]; !exists {
|
|
blockedByID[resourceID] = AdminResourceDeleteBlocked{ID: resourceID, Reason: "资源不存在", References: []AdminResourceReferenceView{}}
|
|
}
|
|
}
|
|
for userID, userResources := range resourcesByUser {
|
|
userResourceIDs := make([]string, 0, len(userResources))
|
|
for _, resource := range userResources {
|
|
userResourceIDs = append(userResourceIDs, resource.ID)
|
|
}
|
|
snapshot, snapshotErr := s.repo.ResourceReferenceSnapshot(userID, "", userResourceIDs)
|
|
if snapshotErr != nil {
|
|
return nil, snapshotErr
|
|
}
|
|
for resourceID, references := range adminResourceReferences(snapshot, userResources) {
|
|
blocking := make([]AdminResourceReferenceView, 0, len(references))
|
|
for _, reference := range references {
|
|
if reference.Kind == "公告草稿" {
|
|
// 公告草稿及其资源绑定在删除事务内级联清理,不构成阻塞引用。
|
|
continue
|
|
}
|
|
blocking = append(blocking, reference)
|
|
}
|
|
if len(blocking) == 0 {
|
|
continue
|
|
}
|
|
blockedByID[resourceID] = AdminResourceDeleteBlocked{ID: resourceID, Reason: "资源仍被业务数据引用", References: blocking}
|
|
}
|
|
}
|
|
announcementReferences, err := s.repo.AnnouncementResourceReferences(resourceIDs)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
for _, reference := range announcementReferences {
|
|
blocked := blockedByID[reference.ResourceID]
|
|
blocked.ID = reference.ResourceID
|
|
blocked.Reason = "资源仍被业务数据引用"
|
|
blocked.References = appendUniqueAdminResourceReference(blocked.References, AdminResourceReferenceView{Kind: reference.Kind, ID: reference.ID, Title: reference.Title})
|
|
blockedByID[reference.ResourceID] = blocked
|
|
}
|
|
for resourceID, references := range s.appearanceResourceReferences(resourceIDs) {
|
|
for _, reference := range references {
|
|
blocked := blockedByID[resourceID]
|
|
blocked.ID = resourceID
|
|
blocked.Reason = "资源仍被业务数据引用"
|
|
blocked.References = appendUniqueAdminResourceReference(blocked.References, reference)
|
|
blockedByID[resourceID] = blocked
|
|
}
|
|
}
|
|
|
|
deletable := make([]model.Resource, 0, len(resources))
|
|
deletableIDs := make([]string, 0, len(resources))
|
|
for _, resourceID := range resourceIDs {
|
|
resource, exists := resourcesByID[resourceID]
|
|
if !exists {
|
|
continue
|
|
}
|
|
if _, blocked := blockedByID[resourceID]; blocked {
|
|
continue
|
|
}
|
|
if !supportedResourceDeleteProvider(resource.Provider) {
|
|
blockedByID[resourceID] = AdminResourceDeleteBlocked{ID: resourceID, Reason: "资源使用了不支持的存储类型,无法安全删除", References: []AdminResourceReferenceView{}}
|
|
continue
|
|
}
|
|
deletable = append(deletable, resource)
|
|
deletableIDs = append(deletableIDs, resource.ID)
|
|
}
|
|
|
|
physicalObjects := map[string]*model.Resource{}
|
|
checkedPhysical := map[string]bool{}
|
|
for index := range deletable {
|
|
resource := &deletable[index]
|
|
if strings.TrimSpace(resource.ObjectKey) == "" {
|
|
continue
|
|
}
|
|
identity := resourceStorageIdentity(resource)
|
|
if checkedPhysical[identity] {
|
|
continue
|
|
}
|
|
checkedPhysical[identity] = true
|
|
sharedCount, countErr := s.repo.ResourceStorageReferenceCount(resource, deletableIDs)
|
|
if countErr != nil {
|
|
return nil, countErr
|
|
}
|
|
if sharedCount == 0 {
|
|
physicalObjects[identity] = resource
|
|
}
|
|
}
|
|
deletionJobs := resourceDeletionJobsForResources(physicalObjects)
|
|
queuedResourceIDs := make(map[string]bool, len(deletionJobs))
|
|
for _, job := range deletionJobs {
|
|
queuedResourceIDs[job.ResourceID] = true
|
|
}
|
|
audits := make([]model.AdminAuditEvent, 0, len(deletable))
|
|
for _, resource := range deletable {
|
|
event, eventErr := newAdminAuditEvent(actor, "resource.delete", "resource", resource.ID, "管理员删除存储资源", map[string]any{
|
|
"userId": resource.UserID, "kind": resource.Kind, "provider": normalizedResourceProvider(resource.Provider),
|
|
"objectKey": resource.ObjectKey, "physicalDeleteQueued": queuedResourceIDs[resource.ID],
|
|
})
|
|
if eventErr != nil {
|
|
return nil, eventErr
|
|
}
|
|
audits = append(audits, *event)
|
|
}
|
|
if err := s.repo.DeleteAdminResources(deletable, deletionJobs, audits); err != nil {
|
|
if errors.Is(err, repository.ErrAdminResourceDeleteChanged) || errors.Is(err, repository.ErrAdminResourceStillReferenced) {
|
|
return nil, BadAuthRequest("资源状态或引用已变化,请刷新后重试")
|
|
}
|
|
return nil, err
|
|
}
|
|
if len(deletionJobs) > 0 {
|
|
go s.drainResourceDeletionJobs(len(deletionJobs))
|
|
}
|
|
|
|
result := &AdminResourceDeleteResult{Deleted: []string{}, Blocked: []AdminResourceDeleteBlocked{}}
|
|
deletedSet := make(map[string]struct{}, len(deletable))
|
|
for _, resource := range deletable {
|
|
deletedSet[resource.ID] = struct{}{}
|
|
}
|
|
for _, resourceID := range resourceIDs {
|
|
if _, deleted := deletedSet[resourceID]; deleted {
|
|
result.Deleted = append(result.Deleted, resourceID)
|
|
} else if blocked, exists := blockedByID[resourceID]; exists {
|
|
result.Blocked = append(result.Blocked, blocked)
|
|
}
|
|
}
|
|
return result, nil
|
|
}
|
|
|
|
func normalizeAdminResourceDeleteIDs(values []string) ([]string, error) {
|
|
if len(values) == 0 {
|
|
return nil, BadAuthRequest("请选择要删除的资源")
|
|
}
|
|
result := make([]string, 0, len(values))
|
|
seen := make(map[string]struct{}, len(values))
|
|
for _, value := range values {
|
|
value = strings.TrimSpace(value)
|
|
if value == "" || len(value) > 80 {
|
|
return nil, BadAuthRequest("资源 ID 无效")
|
|
}
|
|
if _, exists := seen[value]; exists {
|
|
continue
|
|
}
|
|
seen[value] = struct{}{}
|
|
result = append(result, value)
|
|
}
|
|
if len(result) == 0 || len(result) > maxAdminResourceDeleteCount {
|
|
return nil, BadAuthRequest("单次最多删除 100 个资源")
|
|
}
|
|
return result, nil
|
|
}
|
|
|
|
func adminResourceReferences(snapshot repository.ResourceReferenceSnapshot, resources []model.Resource) map[string][]AdminResourceReferenceView {
|
|
result := make(map[string][]AdminResourceReferenceView)
|
|
seen := make(map[string]map[string]struct{})
|
|
for _, reference := range snapshot.Direct {
|
|
appendAdminResourceReference(result, seen, reference.ResourceID, AdminResourceReferenceView{Kind: reference.Kind, ID: reference.ID, Title: reference.Title})
|
|
}
|
|
for _, resource := range resources {
|
|
candidate := map[string]struct{}{resource.ID: {}}
|
|
for _, document := range snapshot.Documents {
|
|
if documentReferencesResources(document.PrimaryJSON, candidate) || documentReferencesResources(document.SecondaryJSON, candidate) {
|
|
appendAdminResourceReference(result, seen, resource.ID, AdminResourceReferenceView{Kind: document.Kind, ID: document.ID, Title: document.Title})
|
|
}
|
|
}
|
|
}
|
|
for resourceID := range result {
|
|
sort.Slice(result[resourceID], func(i, j int) bool {
|
|
left, right := result[resourceID][i], result[resourceID][j]
|
|
if left.Kind != right.Kind {
|
|
return left.Kind < right.Kind
|
|
}
|
|
return left.ID < right.ID
|
|
})
|
|
}
|
|
return result
|
|
}
|
|
|
|
func appendAdminResourceReference(result map[string][]AdminResourceReferenceView, seen map[string]map[string]struct{}, resourceID string, reference AdminResourceReferenceView) {
|
|
if resourceID == "" {
|
|
return
|
|
}
|
|
if seen[resourceID] == nil {
|
|
seen[resourceID] = map[string]struct{}{}
|
|
}
|
|
key := reference.Kind + "\x00" + reference.ID
|
|
if _, exists := seen[resourceID][key]; exists {
|
|
return
|
|
}
|
|
seen[resourceID][key] = struct{}{}
|
|
result[resourceID] = append(result[resourceID], reference)
|
|
}
|
|
|
|
func appendUniqueAdminResourceReference(references []AdminResourceReferenceView, reference AdminResourceReferenceView) []AdminResourceReferenceView {
|
|
for _, existing := range references {
|
|
if existing.Kind == reference.Kind && existing.ID == reference.ID {
|
|
return references
|
|
}
|
|
}
|
|
return append(references, reference)
|
|
}
|
|
|
|
func supportedResourceDeleteProvider(provider string) bool {
|
|
provider = normalizedResourceProvider(provider)
|
|
return oneOf(provider, "local", aliyunOSSProvider, tencentCOSProvider, qiniuKodoProvider, s3Provider)
|
|
}
|
|
|
|
func resourceDeletionJobsForResources(physicalObjects map[string]*model.Resource) []model.ResourceDeletionJob {
|
|
resourcesByUser := make(map[string]map[string]*model.Resource)
|
|
for identity, resource := range physicalObjects {
|
|
if resourcesByUser[resource.UserID] == nil {
|
|
resourcesByUser[resource.UserID] = map[string]*model.Resource{}
|
|
}
|
|
resourcesByUser[resource.UserID][identity] = resource
|
|
}
|
|
userIDs := make([]string, 0, len(resourcesByUser))
|
|
for userID := range resourcesByUser {
|
|
userIDs = append(userIDs, userID)
|
|
}
|
|
sort.Strings(userIDs)
|
|
jobs := []model.ResourceDeletionJob{}
|
|
for _, userID := range userIDs {
|
|
jobs = append(jobs, resourceDeletionJobs(userID, resourcesByUser[userID])...)
|
|
}
|
|
return jobs
|
|
}
|