fix(upload): 分片上传 - 先预留配额并原子提交容量 (#679)

Co-authored-by: ddcat666 <26564566+ddcat666@users.noreply.github.com>
This commit is contained in:
Catlaxy AIandddcat666 authored and GitHub committed 2026-10-06 09:42:48 +08:00
1 parent 398f8e36f5
commit 2cc53fa25c
16 files changed
+661 -36

No files matched your search

+40 -4
View File
@@ -6,6 +6,7 @@ import (
"log"
"time"
"infinite-canvas/backend/internal/model"
"infinite-canvas/backend/internal/repository"
)
@@ -18,14 +19,49 @@ func (s *Service) reserveUserUploadQuota(userID string, size int64) (string, err
return s.reserveUserStoredFileQuota(userID, size, megabytes(policy.Resource.ResourceUploadMB), megabytes(policy.Resource.DailyUploadMB), gigabytes(policy.Resource.StoredFileGB), fmt.Sprintf("单个上传文件必须小于 %dMB", policy.Resource.ResourceUploadMB))
}
// reserveChunkedUploadQuota 用于分片上传完成时预留额度:单文件上限对分片会话不适用(每片已独立校验),
// 仅受“今日上传”与“账号存储总量”约束;singleFileLimit 传 size+1 使单文件上限永不命中。
// 分片和普通上传使用相同的单文件上限。
func (s *Service) reserveChunkedUploadQuota(userID string, size int64) (string, error) {
return s.reserveUserUploadQuota(userID, size)
}
func (s *Service) ReserveChunkUploadSession(userID, id string, size int64, expires time.Time, maxSessions int) error {
policy, err := s.RuntimePolicy()
if err != nil {
return "", err
return err
}
return s.reserveUserStoredFileQuota(userID, size, size+1, megabytes(policy.Resource.DailyUploadMB), gigabytes(policy.Resource.StoredFileGB), "")
if size <= 0 || size >= megabytes(policy.Resource.ResourceUploadMB) {
return BadAuthRequest(fmt.Sprintf("单个上传文件必须小于 %dMB", policy.Resource.ResourceUploadMB))
}
if !expires.After(time.Now()) || maxSessions <= 0 {
return BadAuthRequest("上传会话参数无效")
}
err = s.repo.ReserveUploadSession(&model.UploadReservation{ID: id, UserID: userID, Size: size, Day: time.Now().UTC().Format("2006-01-02"), ExpiresAt: expires}, megabytes(policy.Resource.DailyUploadMB), gigabytes(policy.Resource.StoredFileGB), maxSessions)
return uploadReservationError(err)
}
func (s *Service) ReleaseChunkUploadSession(userID, id string) error {
return s.repo.ReleaseUploadSession(userID, id)
}
func uploadReservationError(err error) error {
if errors.Is(err, repository.ErrUploadSessionLimit) {
return NewAppError(429, err.Error())
}
if errors.Is(err, repository.ErrUploadStorageLimit) || errors.Is(err, repository.ErrDailyUploadLimitExceeded) {
return QuotaExceeded(err.Error())
}
if errors.Is(err, repository.ErrUploadReservationExpired) {
return BadAuthRequest(err.Error())
}
return err
}
func (s *Service) saveResourceWithinStorageLimit(resource *model.Resource, reservationID string) error {
policy, err := s.RuntimePolicy()
if err != nil {
return err
}
return uploadReservationError(s.repo.SaveResourceWithinStorageLimit(resource, gigabytes(policy.Resource.StoredFileGB), megabytes(policy.Resource.DailyUploadMB), reservationID))
}
func (s *Service) reserveGeneratedResourceQuota(userID string, size int64) (string, error) {