-
-
Notifications
You must be signed in to change notification settings - Fork 5.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(123): adapt new upload method (close #4141)
- Loading branch information
Showing
4 changed files
with
168 additions
and
27 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| package _123 | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "io" | ||
| "math" | ||
| "net/http" | ||
| "strconv" | ||
|
|
||
| "github.com/alist-org/alist/v3/drivers/base" | ||
| "github.com/alist-org/alist/v3/internal/driver" | ||
| "github.com/alist-org/alist/v3/internal/model" | ||
| "github.com/alist-org/alist/v3/pkg/utils" | ||
| "github.com/go-resty/resty/v2" | ||
| ) | ||
|
|
||
| func (d *Pan123) getS3PreSignedUrls(ctx context.Context, upReq *UploadResp, start, end int) (*S3PreSignedURLs, error) { | ||
| data := base.Json{ | ||
| "bucket": upReq.Data.Bucket, | ||
| "key": upReq.Data.Key, | ||
| "partNumberEnd": end, | ||
| "partNumberStart": start, | ||
| "uploadId": upReq.Data.UploadId, | ||
| "StorageNode": upReq.Data.StorageNode, | ||
| } | ||
| var s3PreSignedUrls S3PreSignedURLs | ||
| _, err := d.request(S3PreSignedUrls, http.MethodPost, func(req *resty.Request) { | ||
| req.SetBody(data).SetContext(ctx) | ||
| }, &s3PreSignedUrls) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return &s3PreSignedUrls, nil | ||
| } | ||
|
|
||
| func (d *Pan123) completeS3(ctx context.Context, upReq *UploadResp) error { | ||
| data := base.Json{ | ||
| "bucket": upReq.Data.Bucket, | ||
| "key": upReq.Data.Key, | ||
| "uploadId": upReq.Data.UploadId, | ||
| "StorageNode": upReq.Data.StorageNode, | ||
| } | ||
| _, err := d.request(S3Complete, http.MethodPost, func(req *resty.Request) { | ||
| req.SetBody(data).SetContext(ctx) | ||
| }, nil) | ||
| return err | ||
| } | ||
|
|
||
| func (d *Pan123) newUpload(ctx context.Context, upReq *UploadResp, file model.FileStreamer, reader io.Reader, up driver.UpdateProgress) error { | ||
| chunkSize := int64(1024 * 1024 * 5) | ||
| // fetch s3 pre signed urls | ||
| chunkCount := int(math.Ceil(float64(file.GetSize()) / float64(chunkSize))) | ||
| // upload 10 chunks each batch | ||
| batchSize := 10 | ||
| for i := 1; i <= chunkCount; i += batchSize { | ||
| if utils.IsCanceled(ctx) { | ||
| return ctx.Err() | ||
| } | ||
| start := i | ||
| end := i + batchSize | ||
| if end > chunkCount+1 { | ||
| end = chunkCount + 1 | ||
| } | ||
| s3PreSignedUrls, err := d.getS3PreSignedUrls(ctx, upReq, start, end) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| // upload each chunk | ||
| for j := start; j < end; j++ { | ||
| if utils.IsCanceled(ctx) { | ||
| return ctx.Err() | ||
| } | ||
| curSize := chunkSize | ||
| if j == chunkCount { | ||
| curSize = file.GetSize() - (int64(chunkCount)-1)*chunkSize | ||
| } | ||
| err = d.uploadS3Chunk(ctx, upReq, s3PreSignedUrls, j, end, io.LimitReader(reader, chunkSize), curSize, false) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| up(j * 100 / chunkCount) | ||
| } | ||
| } | ||
| // complete s3 upload | ||
| return d.completeS3(ctx, upReq) | ||
| } | ||
|
|
||
| func (d *Pan123) uploadS3Chunk(ctx context.Context, upReq *UploadResp, s3PreSignedUrls *S3PreSignedURLs, cur, end int, reader io.Reader, curSize int64, retry bool) error { | ||
| uploadUrl := s3PreSignedUrls.Data.PreSignedUrls[strconv.Itoa(cur)] | ||
| if uploadUrl == "" { | ||
| return fmt.Errorf("upload url is empty, s3PreSignedUrls: %+v", s3PreSignedUrls) | ||
| } | ||
| req, err := http.NewRequest("PUT", uploadUrl, reader) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| req = req.WithContext(ctx) | ||
| req.ContentLength = curSize | ||
| //req.Header.Set("Content-Length", strconv.FormatInt(curSize, 10)) | ||
| res, err := base.HttpClient.Do(req) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer res.Body.Close() | ||
| if res.StatusCode == http.StatusForbidden { | ||
| if retry { | ||
| return fmt.Errorf("upload s3 chunk %d failed, status code: %d", cur, res.StatusCode) | ||
| } | ||
| // refresh s3 pre signed urls | ||
| newS3PreSignedUrls, err := d.getS3PreSignedUrls(ctx, upReq, cur, end) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| s3PreSignedUrls.Data.PreSignedUrls = newS3PreSignedUrls.Data.PreSignedUrls | ||
| // retry | ||
| return d.uploadS3Chunk(ctx, upReq, s3PreSignedUrls, cur, end, reader, curSize, true) | ||
| } | ||
| if res.StatusCode != http.StatusOK { | ||
| body, err := io.ReadAll(res.Body) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return fmt.Errorf("upload s3 chunk %d failed, status code: %d, body: %s", cur, res.StatusCode, body) | ||
| } | ||
| return nil | ||
| } |
This file contains 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