mirror of
https://github.com/truewhile/MeBox.git
synced 2026-10-08 22:36:37 +08:00
优化上传逻辑
优化上传逻辑
This commit is contained in:
truewhile
@@ -371,62 +371,61 @@ func TestThrottleCodeHandling(t *testing.T) {
|
||||
if err == nil {
|
||||
t.Fatal("expected throttle error")
|
||||
}
|
||||
if !tm.IsThrottled() {
|
||||
t.Fatal("code 770004 should trigger throttle status")
|
||||
}
|
||||
if !tm.IsThrottled() {
|
||||
t.Fatal("code 770004 should trigger throttle status")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRemoteFileDetailRelativePath(t *testing.T) {
|
||||
rootCID := "3238787832374488117" // 影视库
|
||||
|
||||
// 场景 1：115 目录 paths 中只有祖先目录链，不包含自身
|
||||
d1 := &RemoteFileDetail{
|
||||
FileId: "3251154147730910635",
|
||||
FileName: "出包王女",
|
||||
Paths: []struct {
|
||||
FileId string `json:"file_id"`
|
||||
Name string `json:"file_name"`
|
||||
}{
|
||||
{FileId: "0", Name: "根目录"},
|
||||
{FileId: "3238787832374488117", Name: "影视库"},
|
||||
{FileId: "3238787913223892116", Name: "动漫"},
|
||||
},
|
||||
}
|
||||
if got := d1.RelativePath(rootCID); got != "动漫/出包王女" {
|
||||
t.Errorf("d1.RelativePath = %q, want %q", got, "动漫/出包王女")
|
||||
}
|
||||
|
||||
func TestRemoteFileDetailRelativePath(t *testing.T) {
|
||||
rootCID := "3238787832374488117" // 影视库
|
||||
|
||||
// 场景 1：115 目录 paths 中只有祖先目录链，不包含自身
|
||||
d1 := &RemoteFileDetail{
|
||||
FileId: "3251154147730910635",
|
||||
FileName: "出包王女",
|
||||
Paths: []struct {
|
||||
FileId string `json:"file_id"`
|
||||
Name string `json:"file_name"`
|
||||
}{
|
||||
{FileId: "0", Name: "根目录"},
|
||||
{FileId: "3238787832374488117", Name: "影视库"},
|
||||
{FileId: "3238787913223892116", Name: "动漫"},
|
||||
},
|
||||
}
|
||||
if got := d1.RelativePath(rootCID); got != "动漫/出包王女" {
|
||||
t.Errorf("d1.RelativePath = %q, want %q", got, "动漫/出包王女")
|
||||
}
|
||||
|
||||
// 场景 2：祖先中间目录，自身在 paths 末尾
|
||||
d2 := &RemoteFileDetail{
|
||||
FileId: "3238787913223892116",
|
||||
FileName: "动漫",
|
||||
Paths: []struct {
|
||||
FileId string `json:"file_id"`
|
||||
Name string `json:"file_name"`
|
||||
}{
|
||||
{FileId: "0", Name: "根目录"},
|
||||
{FileId: "3238787832374488117", Name: "影视库"},
|
||||
{FileId: "3238787913223892116", Name: "动漫"},
|
||||
},
|
||||
}
|
||||
if got := d2.RelativePath(rootCID); got != "动漫" {
|
||||
t.Errorf("d2.RelativePath = %q, want %q", got, "动漫")
|
||||
}
|
||||
|
||||
// 场景 3：根同步目录自身
|
||||
d3 := &RemoteFileDetail{
|
||||
FileId: rootCID,
|
||||
FileName: "影视库",
|
||||
Paths: []struct {
|
||||
FileId string `json:"file_id"`
|
||||
Name string `json:"file_name"`
|
||||
}{
|
||||
{FileId: "0", Name: "根目录"},
|
||||
{FileId: rootCID, Name: "影视库"},
|
||||
},
|
||||
}
|
||||
if got := d3.RelativePath(rootCID); got != "" {
|
||||
t.Errorf("d3.RelativePath = %q, want %q", got, "")
|
||||
}
|
||||
// 场景 2：祖先中间目录，自身在 paths 末尾
|
||||
d2 := &RemoteFileDetail{
|
||||
FileId: "3238787913223892116",
|
||||
FileName: "动漫",
|
||||
Paths: []struct {
|
||||
FileId string `json:"file_id"`
|
||||
Name string `json:"file_name"`
|
||||
}{
|
||||
{FileId: "0", Name: "根目录"},
|
||||
{FileId: "3238787832374488117", Name: "影视库"},
|
||||
{FileId: "3238787913223892116", Name: "动漫"},
|
||||
},
|
||||
}
|
||||
if got := d2.RelativePath(rootCID); got != "动漫" {
|
||||
t.Errorf("d2.RelativePath = %q, want %q", got, "动漫")
|
||||
}
|
||||
|
||||
// 场景 3：根同步目录自身
|
||||
d3 := &RemoteFileDetail{
|
||||
FileId: rootCID,
|
||||
FileName: "影视库",
|
||||
Paths: []struct {
|
||||
FileId string `json:"file_id"`
|
||||
Name string `json:"file_name"`
|
||||
}{
|
||||
{FileId: "0", Name: "根目录"},
|
||||
{FileId: rootCID, Name: "影视库"},
|
||||
},
|
||||
}
|
||||
if got := d3.RelativePath(rootCID); got != "" {
|
||||
t.Errorf("d3.RelativePath = %q, want %q", got, "")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -185,7 +185,6 @@ func (d *RemoteFileDetail) RelativePath(rootCID string) string {
|
||||
return strings.Join(segments, "/")
|
||||
}
|
||||
|
||||
|
||||
// ─── 下载直链 ──────────────────────────────────────────────────────────────────
|
||||
|
||||
type downloadURLData struct {
|
||||
|
||||
@@ -0,0 +1,347 @@
|
||||
// 阿里云 OSS multipart 分片上传（用于 115 元数据上传直传）。
|
||||
// 使用 115 下发的临时 STS 凭证，将本地文件分片上传到 OSS，并经 complete 回调
|
||||
// 通知 115 完成落盘。参考 QMediaSync 的 OSSMultipartUploader 实现。
|
||||
package cloud115
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"sort"
|
||||
|
||||
"github.com/aliyun/alibabacloud-oss-go-sdk-v2/oss"
|
||||
"github.com/aliyun/alibabacloud-oss-go-sdk-v2/oss/credentials"
|
||||
)
|
||||
|
||||
const (
|
||||
defaultMultipartPartSize int64 = 32 * 1024 * 1024
|
||||
multipartPartAlign int64 = 1024 * 1024
|
||||
maxMultipartParts int64 = 9999
|
||||
maxMultipartPartSize int64 = 5 * 1024 * 1024 * 1024
|
||||
)
|
||||
|
||||
type ossMultipartClient interface {
|
||||
InitiateMultipartUpload(context.Context, *oss.InitiateMultipartUploadRequest, ...func(*oss.Options)) (*oss.InitiateMultipartUploadResult, error)
|
||||
UploadPart(context.Context, *oss.UploadPartRequest, ...func(*oss.Options)) (*oss.UploadPartResult, error)
|
||||
ListParts(context.Context, *oss.ListPartsRequest, ...func(*oss.Options)) (*oss.ListPartsResult, error)
|
||||
CompleteMultipartUpload(context.Context, *oss.CompleteMultipartUploadRequest, ...func(*oss.Options)) (*oss.CompleteMultipartUploadResult, error)
|
||||
AbortMultipartUpload(context.Context, *oss.AbortMultipartUploadRequest, ...func(*oss.Options)) (*oss.AbortMultipartUploadResult, error)
|
||||
}
|
||||
|
||||
// OSSMultipartUploader 封装 OSS multipart 上传。
|
||||
type OSSMultipartUploader struct {
|
||||
client ossMultipartClient
|
||||
}
|
||||
|
||||
// OSSMultipartUploadInput 是 multipart 上传输入。
|
||||
type OSSMultipartUploadInput struct {
|
||||
Bucket string
|
||||
Object string
|
||||
Callback string
|
||||
CallbackVar string
|
||||
FilePath string
|
||||
FileSize int64
|
||||
UploadId string
|
||||
PartSize int64
|
||||
PartRetryMax int
|
||||
refreshClient func(context.Context) (ossMultipartClient, error)
|
||||
}
|
||||
|
||||
// OSSMultipartUploadResult 是 multipart 上传后的结果。
|
||||
type OSSMultipartUploadResult struct {
|
||||
CallbackResult map[string]any
|
||||
UploadId string
|
||||
PartSize int64
|
||||
TotalParts int
|
||||
UploadedBytes int64
|
||||
UploadedParts int
|
||||
}
|
||||
|
||||
// CalculateMultipartPartSize 计算 OSS multipart 分片大小与分片数量。
|
||||
func CalculateMultipartPartSize(fileSize int64) (int64, int, error) {
|
||||
if fileSize < 0 {
|
||||
return 0, 0, fmt.Errorf("文件大小不能为负数：%d", fileSize)
|
||||
}
|
||||
partSize := defaultMultipartPartSize
|
||||
minPartSize := ceilDiv(fileSize, maxMultipartParts)
|
||||
if minPartSize > partSize {
|
||||
partSize = roundUp(minPartSize, multipartPartAlign)
|
||||
}
|
||||
if partSize > maxMultipartPartSize {
|
||||
return 0, 0, fmt.Errorf("文件过大，所需分片大小 %d 超过 OSS 上限 %d", partSize, maxMultipartPartSize)
|
||||
}
|
||||
totalParts := int(ceilDiv(fileSize, partSize))
|
||||
if totalParts == 0 {
|
||||
totalParts = 1
|
||||
}
|
||||
if int64(totalParts) > maxMultipartParts {
|
||||
return 0, 0, fmt.Errorf("分片数量 %d 超过上限 %d", totalParts, maxMultipartParts)
|
||||
}
|
||||
return partSize, totalParts, nil
|
||||
}
|
||||
|
||||
// NewOSSMultipartUploader 创建 OSS multipart 上传器。
|
||||
func NewOSSMultipartUploader(endpoint, accessKeyId, accessKeySecret, securityToken string) *OSSMultipartUploader {
|
||||
return &OSSMultipartUploader{client: newOSSMultipartClient(endpoint, accessKeyId, accessKeySecret, securityToken)}
|
||||
}
|
||||
|
||||
func newOSSMultipartClient(endpoint, accessKeyId, accessKeySecret, securityToken string) ossMultipartClient {
|
||||
cfg := oss.LoadDefaultConfig().
|
||||
WithCredentialsProvider(credentials.NewStaticCredentialsProvider(accessKeyId, accessKeySecret, securityToken)).
|
||||
WithRegion("cn-shenzhen").
|
||||
WithEndpoint(endpoint)
|
||||
return oss.NewClient(cfg)
|
||||
}
|
||||
|
||||
// UploadFile 上传文件并完成 OSS multipart，返回 complete callback 结果。
|
||||
func (u *OSSMultipartUploader) UploadFile(ctx context.Context, input OSSMultipartUploadInput) (map[string]any, error) {
|
||||
result, err := u.UploadFileWithResult(ctx, input)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result.CallbackResult, nil
|
||||
}
|
||||
|
||||
// UploadFileWithResult 上传文件并返回 multipart 结果。
|
||||
func (u *OSSMultipartUploader) UploadFileWithResult(ctx context.Context, input OSSMultipartUploadInput) (OSSMultipartUploadResult, error) {
|
||||
if input.PartRetryMax <= 0 {
|
||||
input.PartRetryMax = 3
|
||||
}
|
||||
partSize := input.PartSize
|
||||
totalParts := 0
|
||||
var err error
|
||||
if partSize <= 0 {
|
||||
partSize, totalParts, err = CalculateMultipartPartSize(input.FileSize)
|
||||
if err != nil {
|
||||
return OSSMultipartUploadResult{}, err
|
||||
}
|
||||
} else {
|
||||
totalParts = int(ceilDiv(input.FileSize, partSize))
|
||||
}
|
||||
|
||||
uploadId := input.UploadId
|
||||
if uploadId == "" {
|
||||
initResult, err := u.client.InitiateMultipartUpload(ctx, &oss.InitiateMultipartUploadRequest{
|
||||
Bucket: oss.Ptr(input.Bucket),
|
||||
Key: oss.Ptr(input.Object),
|
||||
RequestCommon: oss.RequestCommon{
|
||||
Parameters: map[string]string{"sequential": "1"},
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
return OSSMultipartUploadResult{}, fmt.Errorf("初始化 OSS multipart 失败：%w", err)
|
||||
}
|
||||
if initResult.UploadId == nil || *initResult.UploadId == "" {
|
||||
return OSSMultipartUploadResult{}, fmt.Errorf("初始化 OSS multipart 返回空 upload_id")
|
||||
}
|
||||
uploadId = *initResult.UploadId
|
||||
}
|
||||
|
||||
existingPartMap := make(map[int32]int64)
|
||||
existingParts, err := u.ListUploadedParts(ctx, input.Bucket, input.Object, uploadId)
|
||||
if err == nil {
|
||||
for _, part := range existingParts {
|
||||
existingPartMap[part.PartNumber] = part.Size
|
||||
}
|
||||
}
|
||||
|
||||
file, err := os.Open(input.FilePath)
|
||||
if err != nil {
|
||||
return OSSMultipartUploadResult{}, fmt.Errorf("打开待上传文件失败：%w", err)
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
var uploadedBytes int64
|
||||
uploadedParts := 0
|
||||
completeParts := make([]oss.UploadPart, 0, totalParts)
|
||||
for partNumber := 1; partNumber <= totalParts; partNumber++ {
|
||||
offset := int64(partNumber-1) * partSize
|
||||
length := minInt64(partSize, input.FileSize-offset)
|
||||
if length < 0 {
|
||||
length = 0
|
||||
}
|
||||
if existingSize, ok := existingPartMap[int32(partNumber)]; ok && existingSize == length {
|
||||
uploadedBytes += length
|
||||
uploadedParts++
|
||||
}
|
||||
etag, err := u.uploadPartWithRetry(ctx, input, uploadId, int32(partNumber), file, offset, length)
|
||||
if err != nil {
|
||||
return OSSMultipartUploadResult{}, err
|
||||
}
|
||||
uploadedBytes += length
|
||||
uploadedParts++
|
||||
completeParts = append(completeParts, oss.UploadPart{
|
||||
PartNumber: int32(partNumber),
|
||||
ETag: oss.Ptr(etag),
|
||||
})
|
||||
}
|
||||
sort.Slice(completeParts, func(i, j int) bool {
|
||||
return completeParts[i].PartNumber < completeParts[j].PartNumber
|
||||
})
|
||||
|
||||
completeResult, err := u.client.CompleteMultipartUpload(ctx, &oss.CompleteMultipartUploadRequest{
|
||||
Bucket: oss.Ptr(input.Bucket),
|
||||
Key: oss.Ptr(input.Object),
|
||||
UploadId: oss.Ptr(uploadId),
|
||||
CompleteMultipartUpload: &oss.CompleteMultipartUpload{
|
||||
Parts: completeParts,
|
||||
},
|
||||
Callback: oss.Ptr(input.Callback),
|
||||
CallbackVar: oss.Ptr(input.CallbackVar),
|
||||
})
|
||||
if err != nil {
|
||||
return OSSMultipartUploadResult{}, fmt.Errorf("完成 OSS multipart 失败：%w", err)
|
||||
}
|
||||
return OSSMultipartUploadResult{
|
||||
CallbackResult: completeResult.CallbackResult,
|
||||
UploadId: uploadId,
|
||||
PartSize: partSize,
|
||||
TotalParts: totalParts,
|
||||
UploadedBytes: uploadedBytes,
|
||||
UploadedParts: uploadedParts,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// ListUploadedParts 查询 OSS 已上传分片。
|
||||
func (u *OSSMultipartUploader) ListUploadedParts(ctx context.Context, bucket, object, uploadId string) ([]struct {
|
||||
PartNumber int32
|
||||
Size int64
|
||||
}, error) {
|
||||
parts := []struct {
|
||||
PartNumber int32
|
||||
Size int64
|
||||
}{}
|
||||
result, err := u.client.ListParts(ctx, &oss.ListPartsRequest{
|
||||
Bucket: oss.Ptr(bucket),
|
||||
Key: oss.Ptr(object),
|
||||
UploadId: oss.Ptr(uploadId),
|
||||
MaxParts: 1000,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询 OSS 已上传分片失败：%w", err)
|
||||
}
|
||||
for _, part := range result.Parts {
|
||||
parts = append(parts, struct {
|
||||
PartNumber int32
|
||||
Size int64
|
||||
}{PartNumber: part.PartNumber, Size: part.Size})
|
||||
}
|
||||
return parts, nil
|
||||
}
|
||||
|
||||
func (u *OSSMultipartUploader) uploadPartWithRetry(
|
||||
ctx context.Context,
|
||||
input OSSMultipartUploadInput,
|
||||
uploadId string,
|
||||
partNumber int32,
|
||||
file *os.File,
|
||||
offset, length int64,
|
||||
) (string, error) {
|
||||
var lastErr error
|
||||
for attempt := 0; attempt < input.PartRetryMax; attempt++ {
|
||||
reader := io.NewSectionReader(file, offset, length)
|
||||
result, err := u.client.UploadPart(ctx, &oss.UploadPartRequest{
|
||||
Bucket: oss.Ptr(input.Bucket),
|
||||
Key: oss.Ptr(input.Object),
|
||||
PartNumber: partNumber,
|
||||
UploadId: oss.Ptr(uploadId),
|
||||
Body: reader,
|
||||
ContentLength: oss.Ptr(length),
|
||||
})
|
||||
if err == nil {
|
||||
if result.ETag == nil || *result.ETag == "" {
|
||||
return "", fmt.Errorf("OSS part %d 返回空 ETag", partNumber)
|
||||
}
|
||||
return *result.ETag, nil
|
||||
}
|
||||
lastErr = err
|
||||
if attempt < input.PartRetryMax-1 && input.refreshClient != nil {
|
||||
refreshed, refreshErr := input.refreshClient(ctx)
|
||||
if refreshErr != nil {
|
||||
lastErr = refreshErr
|
||||
continue
|
||||
}
|
||||
u.client = refreshed
|
||||
}
|
||||
}
|
||||
return "", fmt.Errorf("上传 OSS part %d 失败：%w", partNumber, lastErr)
|
||||
}
|
||||
|
||||
// ParseCompleteCallbackResult 校验并解析 OSS complete 后的 115 callback 结果。
|
||||
func ParseCompleteCallbackResult(result map[string]any) (UploadCompleteResult, error) {
|
||||
if result == nil {
|
||||
return UploadCompleteResult{}, errors.New("OSS complete callback 结果为空")
|
||||
}
|
||||
if state, ok := result["state"].(bool); ok && !state {
|
||||
return UploadCompleteResult{}, fmt.Errorf("115 callback 返回失败：%s", anyToString(result["message"]))
|
||||
}
|
||||
if message := anyToString(result["message"]); message != "" {
|
||||
return UploadCompleteResult{}, fmt.Errorf("115 callback 返回错误：%s", message)
|
||||
}
|
||||
data, ok := result["data"].(map[string]any)
|
||||
if !ok {
|
||||
return UploadCompleteResult{}, errors.New("115 callback 缺少 data")
|
||||
}
|
||||
complete := UploadCompleteResult{
|
||||
FileId: anyToString(data["file_id"]),
|
||||
PickCode: anyToString(data["pick_code"]),
|
||||
ParentId: anyToString(data["parent_id"]),
|
||||
Sha1: anyToString(data["sha1"]),
|
||||
Size: anyToInt64(data["size"]),
|
||||
Mtime: anyToInt64(data["mtime"]),
|
||||
}
|
||||
if complete.FileId == "" || complete.PickCode == "" {
|
||||
return UploadCompleteResult{}, errors.New("115 callback 缺少 file_id/pick_code")
|
||||
}
|
||||
return complete, nil
|
||||
}
|
||||
|
||||
func ceilDiv(n, d int64) int64 {
|
||||
if d <= 0 {
|
||||
return 0
|
||||
}
|
||||
if n <= 0 {
|
||||
return 0
|
||||
}
|
||||
return (n + d - 1) / d
|
||||
}
|
||||
|
||||
func roundUp(n, align int64) int64 {
|
||||
if align <= 0 {
|
||||
return n
|
||||
}
|
||||
return ceilDiv(n, align) * align
|
||||
}
|
||||
|
||||
func minInt64(a, b int64) int64 {
|
||||
if a < b {
|
||||
return a
|
||||
}
|
||||
return b
|
||||
}
|
||||
|
||||
func anyToInt64(v any) int64 {
|
||||
switch t := v.(type) {
|
||||
case string:
|
||||
var n int64
|
||||
fmt.Sscanf(t, "%d", &n)
|
||||
return n
|
||||
case float64:
|
||||
return int64(t)
|
||||
case int64:
|
||||
return t
|
||||
case int:
|
||||
return int64(t)
|
||||
default:
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
func anyToString(v any) string {
|
||||
if s, ok := v.(string); ok {
|
||||
return s
|
||||
}
|
||||
return fmt.Sprintf("%v", v)
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package cloud115
|
||||
|
||||
import (
|
||||
"crypto/sha1"
|
||||
"encoding/hex"
|
||||
"io"
|
||||
"os"
|
||||
)
|
||||
|
||||
// FileSHA1 计算文件完整 SHA1（小写 hex）。
|
||||
func FileSHA1(path string) (string, error) {
|
||||
f, err := os.Open(path)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer f.Close()
|
||||
h := sha1.New()
|
||||
if _, err := io.Copy(h, f); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return hex.EncodeToString(h.Sum(nil)), nil
|
||||
}
|
||||
|
||||
// FileSHA1Partial 计算文件 [start,end]（含）字节区间的 SHA1（小写 hex）。
|
||||
// 用于 115 上传二次签名按 sign_check 指定的区间重算哈希。
|
||||
func FileSHA1Partial(path string, start, end int64) (string, error) {
|
||||
if start < 0 {
|
||||
start = 0
|
||||
}
|
||||
if end < start {
|
||||
end = start
|
||||
}
|
||||
f, err := os.Open(path)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer f.Close()
|
||||
if _, err := f.Seek(start, io.SeekStart); err != nil {
|
||||
return "", err
|
||||
}
|
||||
length := end - start + 1
|
||||
h := sha1.New()
|
||||
if _, err := io.CopyN(h, f, length); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return hex.EncodeToString(h.Sum(nil)), nil
|
||||
}
|
||||
@@ -0,0 +1,355 @@
|
||||
// 115 网盘元数据上传能力：115 开放平台调度 + 阿里云 OSS 直传。
|
||||
// 参考 QMediaSync 的上传流程实现：
|
||||
//
|
||||
// POST /open/upload/init 上传初始化/秒传调度（含二次签名）
|
||||
// GET /open/upload/get_token 获取 OSS 临时上传凭证（STS）
|
||||
// OSS multipart 分片直传 + callback 完成
|
||||
//
|
||||
// 上传目标父目录为 115 目录 ID（cid），而非路径字符串。
|
||||
package cloud115
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// 115 上传状态码。
|
||||
const (
|
||||
UploadInitStatusNeedUpload = 1 // 需要真实上传
|
||||
UploadInitStatusRapidUploaded = 2 // 秒传成功
|
||||
UploadInitStatusSignFailed = 6 // 签名验证失败
|
||||
UploadInitStatusNeedSign = 7 // 需要二次签名
|
||||
UploadInitStatusSignRejected = 8 // 签名认证失败
|
||||
)
|
||||
|
||||
// UploadInitRequest 是 /open/upload/init 的结构化请求。
|
||||
type UploadInitRequest struct {
|
||||
FileName string
|
||||
FileSize int64
|
||||
ParentFileId string
|
||||
FileSha1 string
|
||||
Preid string
|
||||
PickCode string
|
||||
TopUpload string
|
||||
SignKey string
|
||||
SignVal string
|
||||
}
|
||||
|
||||
// UploadInitResult 是 /open/upload/init 的调度结果。
|
||||
type UploadInitResult struct {
|
||||
PickCode string
|
||||
Status int
|
||||
FileId string
|
||||
Target string
|
||||
Bucket string
|
||||
Object string
|
||||
SignKey string
|
||||
SignCheck string
|
||||
Callback UploadResultCallBack
|
||||
}
|
||||
|
||||
type uploadScheduleAPIResult struct {
|
||||
PickCode string `json:"pick_code"`
|
||||
Status int `json:"status"`
|
||||
FileId string `json:"file_id"`
|
||||
Target string `json:"target"`
|
||||
Version string `json:"version"`
|
||||
Bucket string `json:"bucket"`
|
||||
Object string `json:"object"`
|
||||
SignKey string `json:"sign_key"`
|
||||
SignCheck string `json:"sign_check"`
|
||||
Callback json.RawMessage `json:"callback"`
|
||||
}
|
||||
|
||||
// UploadResultCallBack 是 init 返回给 OSS complete 使用的 callback 内容。
|
||||
type UploadResultCallBack struct {
|
||||
Callback string `json:"callback"`
|
||||
CallbackVar string `json:"callback_var"`
|
||||
}
|
||||
|
||||
// UploadToken 是 /open/upload/get_token 返回的 OSS STS 临时凭证。
|
||||
type UploadToken struct {
|
||||
Endpoint string `json:"endpoint"`
|
||||
AccessKeySecret string `json:"AccessKeySecret"`
|
||||
AccessKeySecrett string `json:"AccessKeySecrett"`
|
||||
SecurityToken string `json:"SecurityToken"`
|
||||
Expiration string `json:"Expiration"`
|
||||
AccessKeyId string `json:"AccessKeyId"`
|
||||
}
|
||||
|
||||
func (token *UploadToken) normalize() {
|
||||
if token == nil {
|
||||
return
|
||||
}
|
||||
if token.AccessKeySecret == "" {
|
||||
token.AccessKeySecret = token.AccessKeySecrett
|
||||
}
|
||||
}
|
||||
|
||||
// UploadCompleteResult 是 OSS complete callback 成功后的远端文件定位结果。
|
||||
type UploadCompleteResult struct {
|
||||
FileId string
|
||||
PickCode string
|
||||
ParentId string
|
||||
Sha1 string
|
||||
Size int64
|
||||
Mtime int64
|
||||
}
|
||||
|
||||
// SignCheckRange 是 115 二次认证要求的闭区间 [start,end]。
|
||||
type SignCheckRange struct {
|
||||
Start int64
|
||||
End int64
|
||||
}
|
||||
|
||||
// UploadInit 调用 115 上传初始化/秒传调度接口。
|
||||
func (c *OpenClient) UploadInit(ctx context.Context, input UploadInitRequest) (*UploadInitResult, error) {
|
||||
params := buildUploadInitForm(input)
|
||||
resp, err := c.doAuthJSON(ctx, "POST", ProAPIBase+"/open/upload/init", params, 2)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var raw uploadScheduleAPIResult
|
||||
if err := json.Unmarshal(resp.Data, &raw); err != nil {
|
||||
return nil, fmt.Errorf("115: 解析 upload/init 结果失败：%w", err)
|
||||
}
|
||||
callback, err := decodeUploadCallback(raw.Callback)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &UploadInitResult{
|
||||
PickCode: raw.PickCode,
|
||||
Status: raw.Status,
|
||||
FileId: raw.FileId,
|
||||
Target: raw.Target,
|
||||
Bucket: raw.Bucket,
|
||||
Object: raw.Object,
|
||||
SignKey: raw.SignKey,
|
||||
SignCheck: raw.SignCheck,
|
||||
Callback: callback,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func buildUploadInitForm(input UploadInitRequest) map[string]string {
|
||||
topUpload := input.TopUpload
|
||||
if topUpload == "" {
|
||||
topUpload = "0"
|
||||
}
|
||||
params := map[string]string{
|
||||
"file_name": input.FileName,
|
||||
"file_size": strconv.FormatInt(input.FileSize, 10),
|
||||
"target": fmt.Sprintf("U_1_%s", input.ParentFileId),
|
||||
"fileid": input.FileSha1,
|
||||
"preid": input.Preid,
|
||||
"topupload": topUpload,
|
||||
}
|
||||
if input.PickCode != "" {
|
||||
params["pick_code"] = input.PickCode
|
||||
}
|
||||
if input.SignKey != "" && input.SignVal != "" {
|
||||
params["sign_key"] = input.SignKey
|
||||
params["sign_val"] = input.SignVal
|
||||
}
|
||||
return params
|
||||
}
|
||||
|
||||
func decodeUploadCallback(raw json.RawMessage) (UploadResultCallBack, error) {
|
||||
if len(raw) == 0 || string(raw) == "null" {
|
||||
return UploadResultCallBack{}, nil
|
||||
}
|
||||
if raw[0] == '[' {
|
||||
var callbacks []UploadResultCallBack
|
||||
if err := json.Unmarshal(raw, &callbacks); err != nil {
|
||||
return UploadResultCallBack{}, err
|
||||
}
|
||||
if len(callbacks) == 0 {
|
||||
return UploadResultCallBack{}, nil
|
||||
}
|
||||
return callbacks[0], nil
|
||||
}
|
||||
var callback UploadResultCallBack
|
||||
if err := json.Unmarshal(raw, &callback); err != nil {
|
||||
return UploadResultCallBack{}, err
|
||||
}
|
||||
return callback, nil
|
||||
}
|
||||
|
||||
func parseSignCheckRange(value string) (SignCheckRange, error) {
|
||||
parts := strings.Split(value, "-")
|
||||
if len(parts) != 2 {
|
||||
return SignCheckRange{}, fmt.Errorf("sign_check 格式错误：%s", value)
|
||||
}
|
||||
start, err := strconv.ParseInt(strings.TrimSpace(parts[0]), 10, 64)
|
||||
if err != nil {
|
||||
return SignCheckRange{}, err
|
||||
}
|
||||
end, err := strconv.ParseInt(strings.TrimSpace(parts[1]), 10, 64)
|
||||
if err != nil {
|
||||
return SignCheckRange{}, err
|
||||
}
|
||||
if start < 0 || end < start {
|
||||
return SignCheckRange{}, fmt.Errorf("sign_check 范围非法：%s", value)
|
||||
}
|
||||
return SignCheckRange{Start: start, End: end}, nil
|
||||
}
|
||||
|
||||
// GetUploadToken 获取 115 下发的 OSS 临时上传凭证。
|
||||
func (c *OpenClient) GetUploadToken(ctx context.Context) (*UploadToken, error) {
|
||||
resp, err := c.doAuthJSON(ctx, "GET", ProAPIBase+"/open/upload/get_token", nil, 2)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var token UploadToken
|
||||
if err := json.Unmarshal(resp.Data, &token); err != nil {
|
||||
return nil, fmt.Errorf("115: 解析 get_token 结果失败：%w", err)
|
||||
}
|
||||
token.normalize()
|
||||
return &token, nil
|
||||
}
|
||||
|
||||
// Upload 上传单个本地文件到 115 指定父目录（cid），返回成功后的远端文件信息。
|
||||
// filePath 必须是落到磁盘的真实文件路径（调用方负责把 io.Reader 落盘为临时文件）。
|
||||
func (c *OpenClient) Upload(ctx context.Context, filePath, parentCID, signKey, signVal string) (*UploadCompleteResult, error) {
|
||||
fileSize := fileSizeOf(filePath)
|
||||
if fileSize < 0 {
|
||||
return nil, fmt.Errorf("115: 无法获取文件大小：%s", filePath)
|
||||
}
|
||||
fileSha1, err := FileSHA1(filePath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("115: 计算文件 SHA1 失败：%w", err)
|
||||
}
|
||||
preSha1, err := FileSHA1Partial(filePath, 0, 128*1024-1)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("115: 计算文件前 128 KiB SHA1 失败：%w", err)
|
||||
}
|
||||
request := UploadInitRequest{
|
||||
FileName: baseNameOf(filePath),
|
||||
FileSize: fileSize,
|
||||
ParentFileId: parentCID,
|
||||
FileSha1: fileSha1,
|
||||
Preid: preSha1,
|
||||
TopUpload: "0",
|
||||
SignKey: signKey,
|
||||
SignVal: signVal,
|
||||
}
|
||||
initResult, err := c.UploadInit(ctx, request)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("115: 上传初始化失败：%w", err)
|
||||
}
|
||||
status := initResult.Status
|
||||
if status == UploadInitStatusNeedSign {
|
||||
// 二次签名：按 sign_check 指定区间重算 sha1
|
||||
rng, err := parseSignCheckRange(initResult.SignCheck)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
signValue, err := FileSHA1Partial(filePath, rng.Start, rng.End)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
request.SignKey = initResult.SignKey
|
||||
request.SignVal = signValue
|
||||
initResult, err = c.UploadInit(ctx, request)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("115: 上传二次签名失败：%w", err)
|
||||
}
|
||||
status = initResult.Status
|
||||
}
|
||||
switch status {
|
||||
case UploadInitStatusRapidUploaded:
|
||||
// 秒传成功
|
||||
return &UploadCompleteResult{FileId: initResult.FileId, PickCode: initResult.PickCode}, nil
|
||||
case UploadInitStatusSignFailed:
|
||||
return nil, fmt.Errorf("115: 签名验证后失败")
|
||||
case UploadInitStatusSignRejected:
|
||||
return nil, fmt.Errorf("115: 签名认证失败")
|
||||
case UploadInitStatusNeedUpload:
|
||||
// 真实上传：OSS multipart
|
||||
default:
|
||||
return &UploadCompleteResult{FileId: initResult.FileId, PickCode: initResult.PickCode}, nil
|
||||
}
|
||||
|
||||
if initResult.Bucket == "" || initResult.Object == "" {
|
||||
return nil, fmt.Errorf("115: upload/init 缺少 bucket/object 信息")
|
||||
}
|
||||
token, err := c.GetUploadToken(ctx)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("115: 获取上传凭证失败：%w", err)
|
||||
}
|
||||
if token == nil || token.Endpoint == "" || token.AccessKeyId == "" || token.AccessKeySecret == "" {
|
||||
return nil, fmt.Errorf("115: 上传凭证不完整")
|
||||
}
|
||||
uploader := NewOSSMultipartUploader(token.Endpoint, token.AccessKeyId, token.AccessKeySecret, token.SecurityToken)
|
||||
result, err := uploader.UploadFile(ctx, OSSMultipartUploadInput{
|
||||
Bucket: initResult.Bucket,
|
||||
Object: initResult.Object,
|
||||
Callback: initResult.Callback.Callback,
|
||||
CallbackVar: initResult.Callback.CallbackVar,
|
||||
FilePath: filePath,
|
||||
FileSize: fileSize,
|
||||
refreshClient: func(ctx context.Context) (ossMultipartClient, error) {
|
||||
refreshed, rerr := c.GetUploadToken(ctx)
|
||||
if rerr != nil || refreshed == nil {
|
||||
return nil, rerr
|
||||
}
|
||||
return newOSSMultipartClient(refreshed.Endpoint, refreshed.AccessKeyId, refreshed.AccessKeySecret, refreshed.SecurityToken), nil
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("115: OSS 上传失败：%w", err)
|
||||
}
|
||||
complete, err := ParseCompleteCallbackResult(result)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &complete, nil
|
||||
}
|
||||
|
||||
// MkDir 在 115 的 parentCid 下创建目录，返回新目录 cid。
|
||||
func (c *OpenClient) MkDir(ctx context.Context, parentCID, name string) (string, error) {
|
||||
params := map[string]string{
|
||||
"cname": name,
|
||||
"pid": parentCID,
|
||||
}
|
||||
resp, err := c.doAuthJSON(ctx, "POST", ProAPIBase+"/open/folder/add", params, 2)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
// /open/folder/add 结构：{ aid, cid, fid, name, pid, ... }，单一对象
|
||||
var r struct {
|
||||
Cid string `json:"cid"`
|
||||
}
|
||||
if err := json.Unmarshal(resp.Data, &r); err != nil {
|
||||
return "", fmt.Errorf("115: 解析 folder/add 结果失败：%w", err)
|
||||
}
|
||||
if r.Cid == "" {
|
||||
return "", errors.New("115: folder/add 未返回 cid")
|
||||
}
|
||||
return r.Cid, nil
|
||||
}
|
||||
|
||||
func fileSizeOf(path string) int64 {
|
||||
info, err := os.Stat(path)
|
||||
if err != nil {
|
||||
return -1
|
||||
}
|
||||
if info.IsDir() {
|
||||
return -1
|
||||
}
|
||||
return info.Size()
|
||||
}
|
||||
|
||||
func baseNameOf(path string) string {
|
||||
s := path
|
||||
for i := len(s) - 1; i >= 0; i-- {
|
||||
if s[i] == '/' || s[i] == '\\' {
|
||||
return s[i+1:]
|
||||
}
|
||||
}
|
||||
return s
|
||||
}
|
||||
@@ -0,0 +1,94 @@
|
||||
package cloud115
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestFileSHA1(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
path := filepath.Join(dir, "a.txt")
|
||||
if err := os.WriteFile(path, []byte("hello"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
sum, err := FileSHA1(path)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// sha1("hello") = aaf4c61ddcc5e8a2dabede0f3b482cd9aea9434d
|
||||
if sum != "aaf4c61ddcc5e8a2dabede0f3b482cd9aea9434d" {
|
||||
t.Errorf("unexpected sha1: %s", sum)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFileSHA1Partial(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
path := filepath.Join(dir, "b.txt")
|
||||
// 10 bytes: "0123456789"
|
||||
if err := os.WriteFile(path, []byte("0123456789"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// bytes [2,4] = "234"
|
||||
sum, err := FileSHA1Partial(path, 2, 4)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if sum != "0ec09ef9836da03f1add21e3ef607627e687e790" {
|
||||
t.Errorf("unexpected partial sha1: %s", sum)
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseSignCheckRange(t *testing.T) {
|
||||
rng, err := parseSignCheckRange("0-131071")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if rng.Start != 0 || rng.End != 131071 {
|
||||
t.Errorf("unexpected range: %+v", rng)
|
||||
}
|
||||
if _, err := parseSignCheckRange("bad"); err == nil {
|
||||
t.Error("expected error for bad range")
|
||||
}
|
||||
if _, err := parseSignCheckRange("100-50"); err == nil {
|
||||
t.Error("expected error for end<start")
|
||||
}
|
||||
}
|
||||
|
||||
func TestCalculateMultipartPartSize(t *testing.T) {
|
||||
// small file: 1 MiB -> partSize 32MiB, 1 part
|
||||
ps, parts, err := CalculateMultipartPartSize(1 << 20)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if ps != defaultMultipartPartSize {
|
||||
t.Errorf("partSize=%d, want %d", ps, defaultMultipartPartSize)
|
||||
}
|
||||
if parts != 1 {
|
||||
t.Errorf("parts=%d, want 1", parts)
|
||||
}
|
||||
// zero-size -> 1 part
|
||||
_, parts, err = CalculateMultipartPartSize(0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if parts != 1 {
|
||||
t.Errorf("zero-size parts=%d, want 1", parts)
|
||||
}
|
||||
// negative -> error
|
||||
if _, _, err := CalculateMultipartPartSize(-1); err == nil {
|
||||
t.Error("expected error for negative size")
|
||||
}
|
||||
}
|
||||
|
||||
func TestBaseNameOf(t *testing.T) {
|
||||
if got := baseNameOf("/a/b/file.nfo"); got != "file.nfo" {
|
||||
t.Errorf("got %s", got)
|
||||
}
|
||||
if got := baseNameOf("a\\b\\c.jpg"); got != "c.jpg" {
|
||||
t.Errorf("got %s", got)
|
||||
}
|
||||
if got := baseNameOf("top.txt"); got != "top.txt" {
|
||||
t.Errorf("got %s", got)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user