Skip to content

fix(stream): http chucked upload issue #1152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(stream): http chucked upload issue #1152

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
440dd0b
fix(stream): http chucked upload issue
TwoOnefour Aug 25, 2025
d6dd66c
fix(stream): use MmapThreshold
TwoOnefour Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 38 additions & 28 deletions internal/stream/stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ import (
"context"
"errors"
"fmt"
"github.com/OpenListTeam/OpenList/v4/internal/conf"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

奇怪，这里为什么会跑上去

"github.com/rclone/rclone/lib/mmap"
"io"
"math"
"os"
"sync"

"github.com/OpenListTeam/OpenList/v4/internal/conf"
"github.com/OpenListTeam/OpenList/v4/internal/errs"
"github.com/OpenListTeam/OpenList/v4/internal/model"
"github.com/OpenListTeam/OpenList/v4/pkg/buffer"
"github.com/OpenListTeam/OpenList/v4/pkg/http_range"
"github.com/OpenListTeam/OpenList/v4/pkg/utils"
"github.com/rclone/rclone/lib/mmap"
"go4.org/readerutil"
)

Expand Down Expand Up @@ -179,47 +179,57 @@ func (f *FileStream) RangeRead(httpRange http_range.Range) (io.Reader, error) {
// 即使被写入的数据量与Buffer.Cap一致，Buffer也会扩大

func (f *FileStream) cache(maxCacheSize int64) (model.File, error) {
if maxCacheSize > int64(conf.MaxBufferLimit) {
tmpF, err := utils.CreateTempFile(f.Reader, f.GetSize())
if err != nil {
return nil, err
}
f.Add(tmpF)
f.tmpFile = tmpF
f.Reader = tmpF
return tmpF, nil
}
limit := int64(conf.MaxBufferLimit)

if f.peekBuff == nil {
f.peekBuff = &buffer.Reader{}
f.oriReader = f.Reader
}
bufSize := maxCacheSize - int64(f.peekBuff.Len())
var buf []byte
if conf.MmapThreshold > 0 && bufSize >= int64(conf.MmapThreshold) {
m, err := mmap.Alloc(int(bufSize))
bufSize := 64 << 10 // 64KB as default
if conf.MmapThreshold > 0 && bufSize >= conf.MmapThreshold {
m, err := mmap.Alloc(bufSize)
if err == nil {
f.Add(utils.CloseFunc(func() error {
return mmap.Free(m)
}))
buf = m
}
}
if buf == nil {
buf = make([]byte, bufSize)
}
n, err := io.ReadFull(f.oriReader, buf)
if bufSize != int64(n) {
return nil, fmt.Errorf("failed to read all data: (expect =%d, actual =%d) %w", bufSize, n, err)

var readBytes int
// precache first `limit` byte
for int64(readBytes) < limit {
if buf == nil {
buf = make([]byte, bufSize)
}

want := limit - int64(readBytes)
if want > int64(len(buf)) {
want = int64(len(buf))
}
n, err := f.oriReader.Read(buf[:want])
if n > 0 {
f.peekBuff.Append(buf[:n])
readBytes += n
}
if err == io.EOF {
f.Reader = f.peekBuff
f.oriReader = nil
// should update real file size here to solve `GetSize == 0` issue
f.size = int64(readBytes)
return f.peekBuff, nil
}
}
f.peekBuff.Append(buf)
if int64(f.peekBuff.Len()) >= f.GetSize() {
f.Reader = f.peekBuff
f.oriReader = nil
} else {
f.Reader = io.MultiReader(f.peekBuff, f.oriReader)
// if file is larger than MaxBufferLimit, fallback to disk
tmpF, err := utils.CreateTempFile(io.MultiReader(f.peekBuff, f.oriReader), f.GetSize())
if err != nil {
return nil, err
}
return f.peekBuff, nil
f.Add(tmpF)
f.tmpFile = tmpF
f.Reader = tmpF
return tmpF, nil
}

func (f *FileStream) SetTmpFile(file model.File) {
Expand Down