fix(upload): 加固上传冲突策略与批量处理 - #49
Merged
Merged
Conversation
📝 WalkthroughWalkthrough新增文件上传冲突策略，覆盖前端冲突规划、后端冲突目标快照、事务写入、版本/覆盖/重命名/跳过处理，以及完成声明取消和审计。 Changes上传冲突处理
Estimated code review effort: 5 (Critical) | ~120 minutes Possibly related PRs
Suggested labels: Poem
🚥 Pre-merge checks | ✅ 3 | ❌ 2❌ Failed checks (2 warnings)
✅ Passed checks (3 passed)
✨ Finishing Touches📝 Generate docstrings
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Owner
Author
|
@coderabbitai review |
✅ Action performedReview finished.
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 2
🧹 Nitpick comments (4)
backend/src/modules/files/file-nodes.repository.spec.ts (1)
992-992: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value建议改用重试上限常量替代硬编码 5。
serializableTransactionMaxAttempts调整后本断言会误报。从../../common/database/serializable-transaction-retry导出常量并引用更稳妥。🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@backend/src/modules/files/file-nodes.repository.spec.ts` at line 992, 更新相关测试断言，使用从 serializable-transaction-retry 导出的 serializableTransactionMaxAttempts 常量替代 createVersion 调用次数中的硬编码 5，确保重试上限调整后测试仍保持同步。backend/src/modules/files/file-upload-completion-write.ts (1)
233-243: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win建议复用
requestedStorageKeys.directoryKey，避免二次推导目录键。这里用
input.parentNodeId ?? ''手工推导directoryKey，而唯一索引与写入路径都使用createFileNodeStorageKeys的结果。一旦目录键编码规则变化，兄弟节点查询会与唯一约束脱节，导致重命名解析漏判并退化成重试直至报冲突。♻️ 建议改动
async function resolveAvailableUploadName( tx: Pick<Prisma.TransactionClient, 'fileNode'>, input: { + directoryKey: string; ownerScopeKey: string; parentNodeId: string | null; requestedFileName: string; spaceScope: FileNodeSpaceScope; workspaceId: string; }, ) { const siblings = await tx.fileNode.findMany({ where: { archivedAt: null, - directoryKey: input.parentNodeId ?? '', + directoryKey: input.directoryKey,调用处（Line 131-137）同步传入
directoryKey: requestedStorageKeys.directoryKey。🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@backend/src/modules/files/file-upload-completion-write.ts` around lines 233 - 243, 更新兄弟节点查询中的 directoryKey，复用 createFileNodeStorageKeys 生成的 requestedStorageKeys.directoryKey，不要再通过 input.parentNodeId ?? '' 二次推导；同时确保调用该查询的参数传入 requestedStorageKeys.directoryKey，使查询与唯一索引及写入路径使用同一目录键。frontend/src/views/drive/upload-conflict-planning.ts (2)
3-7: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win
UploadConflictResolutionStrategy与actions.ts的UploadConflictStrategy重复定义。两处联合类型字面量完全相同（
"overwrite" | "rename" | "skip" | "version"），但分别独立声明。由于 TypeScript 对联合类型是结构化比较，未来若一方新增/修改策略而忘记同步另一方，编译期不会报错，只会在运行时产生行为不一致。建议复用同一类型定义。♻️ 建议的重构
-export type UploadConflictResolutionStrategy = - | "overwrite" - | "rename" - | "skip" - | "version"; +import type { UploadConflictStrategy } from "`@/features/file/actions`"; + +export type UploadConflictResolutionStrategy = UploadConflictStrategy;🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@frontend/src/views/drive/upload-conflict-planning.ts` around lines 3 - 7, Remove the duplicate UploadConflictResolutionStrategy union in upload-conflict-planning.ts and reuse the existing UploadConflictStrategy type from actions.ts. Update imports and references as needed so both upload conflict planning and action handling share one canonical strategy definition.
86-99: 🚀 Performance & Scalability | 🔵 Trivial | ⚡ Quick win不同名分组缺少并发上限。
runUploadGroups对groups中的每个分组都通过Promise.all并行启动，组数即并发数。对于选择大量互不同名文件的批量上传场景（如数百个文件），会瞬间发起等量并发请求，可能触发浏览器每主机连接数限制排队、或对后端造成瞬时压力。建议引入并发上限（如 worker-pool 模式）控制同时进行的分组数。♻️ 建议的重构
export async function runUploadGroups<T>( groups: readonly (readonly T[])[], start: (item: T) => Promise<unknown> | void, + concurrency = 4, ) { - await Promise.all(groups.map(async (group) => { - for (const item of group) { - try { - await start(item); - } catch { - // A failed item must not prevent the remaining items in its canonical-name group. - } - } - })); + let cursor = 0; + async function worker() { + while (cursor < groups.length) { + const group = groups[cursor++]; + for (const item of group) { + try { + await start(item); + } catch { + // A failed item must not prevent the remaining items in its canonical-name group. + } + } + } + } + await Promise.all( + Array.from({ length: Math.min(concurrency, groups.length) }, worker), + ); }🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@frontend/src/views/drive/upload-conflict-planning.ts` around lines 86 - 99, 为 runUploadGroups 增加分组级并发上限，避免 Promise.all 一次性启动所有分组；使用 worker-pool 或等效调度方式控制同时处理的分组数量，并确保每个分组内仍按顺序处理项目、单个项目失败不会阻止同组后续项目，且所有分组最终完成。
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@backend/src/modules/files/upload-session-types.ts`:
- Around line 102-105: 修正 PrismaUploadSession 及其来源 row 的类型定义，使
requestedFileName、conflictTargetNodeId 和 conflictTargetObjectKey 与 Prisma
返回值保持明确且正确的强类型，消除这些字段赋值处的 no-unsafe-assignment。优先更新 Prisma schema
或生成类型并重新生成客户端，不要通过 String(...) 等运行时转换掩盖 unknown 或缺失值。
In
`@database/migrations/20260728120000_upload_session_conflict_snapshot/migration.sql`:
- Around line 3-13: 将迁移调整为可滚动发布的扩展/收缩流程：本次仅添加可空的
requested_file_name、conflict_target_node_id 和 conflict_target_object_key
列，移除全表回填及立即设置 requested_file_name 为 NOT NULL 的操作；保留后续由兼容代码双写 requested_file_name
的空间，并将分批回填、校验及约束收紧安排到后续迁移。
---
Nitpick comments:
In `@backend/src/modules/files/file-nodes.repository.spec.ts`:
- Line 992: 更新相关测试断言，使用从 serializable-transaction-retry 导出的
serializableTransactionMaxAttempts 常量替代 createVersion 调用次数中的硬编码
5，确保重试上限调整后测试仍保持同步。
In `@backend/src/modules/files/file-upload-completion-write.ts`:
- Around line 233-243: 更新兄弟节点查询中的 directoryKey，复用 createFileNodeStorageKeys 生成的
requestedStorageKeys.directoryKey，不要再通过 input.parentNodeId ?? ''
二次推导；同时确保调用该查询的参数传入 requestedStorageKeys.directoryKey，使查询与唯一索引及写入路径使用同一目录键。
In `@frontend/src/views/drive/upload-conflict-planning.ts`:
- Around line 3-7: Remove the duplicate UploadConflictResolutionStrategy union
in upload-conflict-planning.ts and reuse the existing UploadConflictStrategy
type from actions.ts. Update imports and references as needed so both upload
conflict planning and action handling share one canonical strategy definition.
- Around line 86-99: 为 runUploadGroups 增加分组级并发上限，避免 Promise.all 一次性启动所有分组；使用
worker-pool 或等效调度方式控制同时处理的分组数量，并确保每个分组内仍按顺序处理项目、单个项目失败不会阻止同组后续项目，且所有分组最终完成。
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro Plus
Run ID: 293ef0d7-3ca1-4356-88d1-fec04e5cd689
📒 Files selected for processing (30)
backend/src/common/database/serializable-transaction-retry.spec.tsbackend/src/common/database/serializable-transaction-retry.tsbackend/src/database/prisma.service.spec.tsbackend/src/database/prisma.service.tsbackend/src/modules/files/file-nodes.repository.spec.tsbackend/src/modules/files/file-nodes.repository.tsbackend/src/modules/files/file-upload-completion-write.tsbackend/src/modules/files/file-upload-completion.service.spec.tsbackend/src/modules/files/file-upload-policy.service.spec.tsbackend/src/modules/files/file-upload-policy.service.tsbackend/src/modules/files/file-upload-test-repository.helper.tsbackend/src/modules/files/file-upload-test-sessions.helper.tsbackend/src/modules/files/file-upload.service.tsbackend/src/modules/files/upload-session-completion.repository.spec.tsbackend/src/modules/files/upload-session-completion.tsbackend/src/modules/files/upload-session-test-fixtures.tsbackend/src/modules/files/upload-session-types.tsbackend/src/modules/files/upload-sessions.repository.tsbackend/src/modules/shares/share-download-commit.repository.tsbackend/src/modules/shares/shares.repository.tsdatabase/migrations/20260728120000_upload_session_conflict_snapshot/migration.sqldatabase/schema.prismafrontend/src/components/ui/upload-conflict-dialog.test.tsxfrontend/src/features/file/actions.test.tsfrontend/src/features/file/actions.tsfrontend/src/lib/drive-api-errors.test.tsfrontend/src/lib/drive-api-errors.tsfrontend/src/views/drive/upload-conflict-planning.test.tsfrontend/src/views/drive/upload-conflict-planning.tsfrontend/src/views/drive/use-drive-transfers.ts
Owner
Author
|
@coderabbitai review |
✅ Action performedReview finished.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
变更内容
审查修复
findReusable仅在requested_file_name为 NULL 时回退匹配旧file_name，并继续同时执行过期过滤。directoryKey，测试中的重试次数复用生产常量。string | null类型，未使用运行时强转掩盖缺失字段。公共重试模块说明
上传完成与分享下载都需要对 Prisma Serializable 冲突执行同一套 equal-jitter 退避。为避免在上传模块复制 shares 私有实现，本 PR 将该 helper 提取到
common/database，shares 中只调整导入路径，行为与重试参数未改变；这项跨模块改动直接服务于上传冲突的并发完成路径。验证
git diff --check：通过部署说明
本次 PostgreSQL 迁移只增加可空列。待旧实例全部退出后，应在独立的后续 contract 迁移中分批回填、校验数据，再收紧
requested_file_name的非空约束；本 PR 不提前执行该收缩步骤。Closes #29