fix: http download timeout (#188)

This commit is contained in:
Levi authored and GitHub committed 2023-08-25 18:42:10 +08:00
1 parent e1684e755a
commit b6d60f6bdf
2 files changed
+7 -6

No files matched your search

+4 -5
View File
@@ -17,7 +17,6 @@ import (
"os" "os"
"path" "path"
"strconv" "strconv"
"time"
) )
type RequestError struct { type RequestError struct {
@@ -85,13 +84,14 @@ func (f *Fetcher) Resolve(req *base.Request) error {
return err return err
} }
client := buildClient() client := buildClient()
// 只访问一个字节,测试资源是否支持Range请求 // send Range request to check whether the server supports breakpoint continuation
// just test one byte, Range: bytes=0-0
httpReq.Header.Set(base.HttpHeaderRange, fmt.Sprintf(base.HttpHeaderRangeFormat, 0, 0)) httpReq.Header.Set(base.HttpHeaderRange, fmt.Sprintf(base.HttpHeaderRangeFormat, 0, 0))
httpResp, err := client.Do(httpReq) httpResp, err := client.Do(httpReq)
if err != nil { if err != nil {
return err return err
} }
// 拿到响应头就关闭,不用加defer // close response body immediately
httpResp.Body.Close() httpResp.Body.Close()
res := &base.Resource{ res := &base.Resource{
Range: false, Range: false,
@@ -395,8 +395,7 @@ func buildClient() *http.Client {
// Cookie handle // Cookie handle
jar, _ := cookiejar.New(nil) jar, _ := cookiejar.New(nil)
return &http.Client{ return &http.Client{
Jar: jar, Jar: jar,
Timeout: time.Second * 60,
} }
} }
+3 -1
View File
@@ -528,7 +528,9 @@ func (d *Downloader) watch(task *Task) {
d.emit(EventKeyDone, task) d.emit(EventKeyDone, task)
} }
d.emit(EventKeyFinally, task, err) d.emit(EventKeyFinally, task, err)
d.notifyRunning() if task.Status == EventKeyDone {
d.notifyRunning()
}
} }
func (d *Downloader) restoreFetcher(task *Task) error { func (d *Downloader) restoreFetcher(task *Task) error {