upgrade to v4.1.5

cmd/flags/config.go

@@ -2,6 +2,7 @@ package flags
 
 var (
 	DataDir     string
+	ConfigPath  string
 	Debug       bool
 	NoPrefix    bool
 	Dev         bool

cmd/root.go

@@ -27,7 +27,8 @@ func Execute() {
 }
 
 func init() {
-	RootCmd.PersistentFlags().StringVar(&flags.DataDir, "data", "data", "data folder")
+	RootCmd.PersistentFlags().StringVar(&flags.DataDir, "data", "data", "data directory (relative paths are resolved against the current working directory)")
+	RootCmd.PersistentFlags().StringVar(&flags.ConfigPath, "config", "", "path to config.json (relative to current working directory; defaults to [data directory]/config.json, where [data directory] is set by --data)")
 	RootCmd.PersistentFlags().BoolVar(&flags.Debug, "debug", false, "start with debug mode")
 	RootCmd.PersistentFlags().BoolVar(&flags.NoPrefix, "no-prefix", false, "disable env prefix")
 	RootCmd.PersistentFlags().BoolVar(&flags.Dev, "dev", false, "start with dev mode")

cmd/server.go

@@ -27,6 +27,8 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/h2c"
+
+	"github.com/quic-go/quic-go/http3"
 )
 
 // ServerCmd represents the server command
@@ -63,6 +65,7 @@ the address is defined in config file`,
 			httpHandler = h2c.NewHandler(r, &http2.Server{})
 		}
 		var httpSrv, httpsSrv, unixSrv *http.Server
+		var quicSrv *http3.Server
 		if conf.Conf.Scheme.HttpPort != -1 {
 			httpBase := fmt.Sprintf("%s:%d", conf.Conf.Scheme.Address, conf.Conf.Scheme.HttpPort)
 			fmt.Printf("start HTTP server @ %s\n", httpBase)
@@ -86,6 +89,24 @@ the address is defined in config file`,
 					utils.Log.Fatalf("failed to start https: %s", err.Error())
 				}
 			}()
+			if conf.Conf.Scheme.EnableH3 {
+				fmt.Printf("start HTTP3 (quic) server @ %s\n", httpsBase)
+				utils.Log.Infof("start HTTP3 (quic) server @ %s", httpsBase)
+				r.Use(func(c *gin.Context) {
+					if c.Request.TLS != nil {
+						port := conf.Conf.Scheme.HttpsPort
+						c.Header("Alt-Svc", fmt.Sprintf("h3=\":%d\"; ma=86400", port))
+					}
+					c.Next()
+				})
+				quicSrv = &http3.Server{Addr: httpsBase, Handler: r}
+				go func() {
+					err := quicSrv.ListenAndServeTLS(conf.Conf.Scheme.CertFile, conf.Conf.Scheme.KeyFile)
+					if err != nil && !errors.Is(err, http.ErrServerClosed) {
+						utils.Log.Fatalf("failed to start http3 (quic): %s", err.Error())
+					}
+				}()
+			}
 		}
 		if conf.Conf.Scheme.UnixFile != "" {
 			fmt.Printf("start unix server @ %s\n", conf.Conf.Scheme.UnixFile)
@@ -203,6 +224,15 @@ the address is defined in config file`,
 					utils.Log.Fatal("HTTPS server shutdown err: ", err)
 				}
 			}()
+			if conf.Conf.Scheme.EnableH3 {
+				wg.Add(1)
+				go func() {
+					defer wg.Done()
+					if err := quicSrv.Shutdown(ctx); err != nil {
+						utils.Log.Fatal("HTTP3 (quic) server shutdown err: ", err)
+					}
+				}()
+			}
 		}
 		if conf.Conf.Scheme.UnixFile != "" {
 			wg.Add(1)

drivers/115/driver.go

@@ -266,4 +266,17 @@ func (d *Pan115) DeleteOfflineTasks(ctx context.Context, hashes []string, delete
 	return d.client.DeleteOfflineTasks(hashes, deleteFiles)
 }
 
+func (d *Pan115) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
+	info, err := d.client.GetInfo()
+	if err != nil {
+		return nil, err
+	}
+	return &model.StorageDetails{
+		DiskUsage: model.DiskUsage{
+			TotalSpace: uint64(info.SpaceInfo.AllTotal.Size),
+			FreeSpace:  uint64(info.SpaceInfo.AllRemain.Size),
+		},
+	}, nil
+}
+
 var _ driver.Driver = (*Pan115)(nil)

drivers/115/meta.go

@@ -19,10 +19,9 @@ type Addition struct {
 }
 
 var config = driver.Config{
-	Name:        "115 Cloud",
-	DefaultRoot: "0",
-	// OnlyProxy:   true,
-	// NoOverwriteUpload: true,
+	Name:          "115 Cloud",
+	DefaultRoot:   "0",
+	LinkCacheMode: driver.LinkCacheUA,
 }
 
 func init() {

drivers/115_open/driver.go

@@ -344,6 +344,27 @@ func (d *Open115) OfflineList(ctx context.Context) (*sdk.OfflineTaskListResp, er
 	return resp, nil
 }
 
+func (d *Open115) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
+	userInfo, err := d.client.UserInfo(ctx)
+	if err != nil {
+		return nil, err
+	}
+	total, err := userInfo.RtSpaceInfo.AllTotal.Size.Int64()
+	if err != nil {
+		return nil, err
+	}
+	free, err := userInfo.RtSpaceInfo.AllRemain.Size.Int64()
+	if err != nil {
+		return nil, err
+	}
+	return &model.StorageDetails{
+		DiskUsage: model.DiskUsage{
+			TotalSpace: uint64(total),
+			FreeSpace:  uint64(free),
+		},
+	}, nil
+}
+
 // func (d *Open115) GetArchiveMeta(ctx context.Context, obj model.Obj, args model.ArchiveArgs) (model.ArchiveMeta, error) {
 // 	// TODO get archive file meta-info, return errs.NotImplement to use an internal archive tool, optional
 // 	return nil, errs.NotImplement

drivers/115_open/meta.go

@@ -20,8 +20,9 @@ type Addition struct {
 }
 
 var config = driver.Config{
-	Name:        "115 Open",
-	DefaultRoot: "0",
+	Name:          "115 Open",
+	DefaultRoot:   "0",
+	LinkCacheMode: driver.LinkCacheUA,
 }
 
 func init() {

drivers/123/driver.go

@@ -288,4 +288,15 @@ func (d *Pan123) APIRateLimit(ctx context.Context, api string) error {
 	return limiter.Wait(ctx)
 }
 
+func (d *Pan123) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
+	userInfo, err := d.getUserInfo(ctx)
+	if err != nil {
+		return nil, err
+	}
+	total := userInfo.Data.SpacePermanent + userInfo.Data.SpaceTemp
+	return &model.StorageDetails{
+		DiskUsage: driver.DiskUsageFromUsedAndTotal(userInfo.Data.SpaceUsed, total),
+	}, nil
+}
+
 var _ driver.Driver = (*Pan123)(nil)

drivers/123/types.go

@@ -28,7 +28,7 @@ func (f File) CreateTime() time.Time {
 }
 
 func (f File) GetHash() utils.HashInfo {
-	return utils.HashInfo{}
+	return utils.NewHashInfo(utils.MD5, f.Etag)
 }
 
 func (f File) GetPath() string {
@@ -140,3 +140,14 @@ type QrCodeResultResp struct {
 		ScanPlatform           int       `json:"scanPlatform"`
 	} `json:"data"`
 }
+
+type UserInfoResp struct {
+	Data struct {
+		Uid            int64  `json:"UID"`
+		Nickname       string `json:"Nickname"`
+		SpaceUsed      uint64 `json:"SpaceUsed"`
+		SpacePermanent uint64 `json:"SpacePermanent"`
+		SpaceTemp      uint64 `json:"SpaceTemp"`
+		FileCount      int    `json:"FileCount"`
+	} `json:"data"`
+}

drivers/123/upload.go

@@ -124,7 +124,7 @@ func (d *Pan123) newUpload(ctx context.Context, upReq *UploadResp, file model.Fi
 			if cur == chunkCount {
 				curSize = lastChunkSize
 			}
-			var reader *stream.SectionReader
+			var reader io.ReadSeeker
 			var rateLimitedRd io.Reader
 			threadG.GoWithLifecycle(errgroup.Lifecycle{
 				Before: func(ctx context.Context) error {

drivers/123/util.go

@@ -432,3 +432,14 @@ func generateAuthKey() string {
 	uuidStr := strings.ReplaceAll(uuid.New().String(), "-", "")     // 去掉 UUID 中的所有 -
 	return fmt.Sprintf("%d-%09d-%s", timestamp, randomInt, uuidStr) // 确保随机整数是9位
 }
+
+func (d *Pan123) getUserInfo(ctx context.Context) (*UserInfoResp, error) {
+	var resp UserInfoResp
+	_, err := d.Request(UserInfo, http.MethodGet, func(req *resty.Request) {
+		req.SetContext(ctx)
+	}, &resp)
+	if err != nil {
+		return nil, err
+	}
+	return &resp, nil
+}

drivers/123_open/driver.go

@@ -17,6 +17,7 @@ import (
 type Open123 struct {
 	model.Storage
 	Addition
+	UID uint64
 }
 
 func (d *Open123) Config() driver.Config {
@@ -83,15 +84,15 @@ func (d *Open123) Link(ctx context.Context, file model.Obj, args model.LinkArgs)
 			}, nil
 		}
 
-		u, err := d.getUserInfo()
+		uid, err := d.getUID(ctx)
 		if err != nil {
 			return nil, err
 		}
 
 		duration := time.Duration(d.DirectLinkValidDuration) * time.Minute
 
 		newURL, err := d.SignURL(res.Data.URL, d.DirectLinkPrivateKey,
-			u.Data.UID, duration)
+			uid, duration)
 		if err != nil {
 			return nil, err
 		}
@@ -213,5 +214,30 @@ func (d *Open123) Put(ctx context.Context, dstDir model.Obj, file model.FileStre
 	return nil, fmt.Errorf("upload complete timeout")
 }
 
-var _ driver.Driver = (*Open123)(nil)
-var _ driver.PutResult = (*Open123)(nil)
+func (d *Open123) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
+	userInfo, err := d.getUserInfo(ctx)
+	if err != nil {
+		return nil, err
+	}
+	total := userInfo.Data.SpacePermanent + userInfo.Data.SpaceTemp
+	free := total - userInfo.Data.SpaceUsed
+	return &model.StorageDetails{
+		DiskUsage: model.DiskUsage{
+			TotalSpace: total,
+			FreeSpace:  free,
+		},
+	}, nil
+}
+
+func (d *Open123) OfflineDownload(ctx context.Context, url string, dir model.Obj, callback string) (int, error) {
+	return d.createOfflineDownloadTask(ctx, url, dir.GetID(), callback)
+}
+
+func (d *Open123) OfflineDownloadProcess(ctx context.Context, taskID int) (float64, int, error) {
+	return d.queryOfflineDownloadStatus(ctx, taskID)
+}
+
+var (
+	_ driver.Driver    = (*Open123)(nil)
+	_ driver.PutResult = (*Open123)(nil)
+)

drivers/123_open/meta.go

@@ -24,7 +24,7 @@ type Addition struct {
 	UploadThread int `json:"UploadThread" type:"number" default:"3" help:"the threads of upload"`
 
 	//  使用直链
-	DirectLink              bool   `json:"DirectLink" type:"boolean" default:"false" required:"false" help:"use direct link when download file"`
+	DirectLink              bool   `json:"DirectLink" type:"bool" default:"false" required:"false" help:"use direct link when download file"`
 	DirectLinkPrivateKey    string `json:"DirectLinkPrivateKey" required:"false" help:"private key for direct link, if URL authentication is enabled"`
 	DirectLinkValidDuration int64  `json:"DirectLinkValidDuration" type:"number" default:"30" required:"false" help:"minutes, if URL authentication is enabled"`
 

drivers/123_open/types.go

@@ -19,20 +19,24 @@ func (a *ApiInfo) Require() {
 		a.token <- struct{}{}
 	}
 }
+
 func (a *ApiInfo) Release() {
 	if a.qps > 0 {
 		time.AfterFunc(time.Second, func() {
 			<-a.token
 		})
 	}
 }
+
 func (a *ApiInfo) SetQPS(qps int) {
 	a.qps = qps
 	a.token = make(chan struct{}, qps)
 }
+
 func (a *ApiInfo) NowLen() int {
 	return len(a.token)
 }
+
 func InitApiInfo(url string, qps int) *ApiInfo {
 	return &ApiInfo{
 		url:   url,
@@ -127,19 +131,19 @@ type RefreshTokenResp struct {
 type UserInfoResp struct {
 	BaseResp
 	Data struct {
-		UID            uint64 `json:"uid"`
-		Username       string `json:"username"`
-		DisplayName    string `json:"displayName"`
-		HeadImage      string `json:"headImage"`
-		Passport       string `json:"passport"`
-		Mail           string `json:"mail"`
-		SpaceUsed      int64  `json:"spaceUsed"`
-		SpacePermanent int64  `json:"spacePermanent"`
-		SpaceTemp      int64  `json:"spaceTemp"`
-		SpaceTempExpr  string `json:"spaceTempExpr"`
-		Vip            bool   `json:"vip"`
-		DirectTraffic  int64  `json:"directTraffic"`
-		IsHideUID      bool   `json:"isHideUID"`
+		UID uint64 `json:"uid"`
+		// Username       string `json:"username"`
+		// DisplayName    string `json:"displayName"`
+		// HeadImage      string `json:"headImage"`
+		// Passport       string `json:"passport"`
+		// Mail           string `json:"mail"`
+		SpaceUsed      uint64 `json:"spaceUsed"`
+		SpacePermanent uint64 `json:"spacePermanent"`
+		SpaceTemp      uint64 `json:"spaceTemp"`
+		// SpaceTempExpr  int64  `json:"spaceTempExpr"`
+		// Vip            bool   `json:"vip"`
+		// DirectTraffic  int64  `json:"directTraffic"`
+		// IsHideUID      bool   `json:"isHideUID"`
 	} `json:"data"`
 }
 
@@ -185,3 +189,18 @@ type UploadCompleteResp struct {
 		FileID    int64 `json:"fileID"`
 	} `json:"data"`
 }
+
+type OfflineDownloadResp struct {
+	BaseResp
+	Data struct {
+		TaskID int `json:"taskID"`
+	} `json:"data"`
+}
+
+type OfflineDownloadProcessResp struct {
+	BaseResp
+	Data struct {
+		Process float64 `json:"process"`
+		Status  int     `json:"status"`
+	} `json:"data"`
+}

drivers/123_open/upload.go

@@ -67,7 +67,7 @@ func (d *Open123) Upload(ctx context.Context, file model.FileStreamer, createRes
 		partNumber := partIndex + 1 // 分片号从1开始
 		offset := partIndex * chunkSize
 		size := min(chunkSize, size-offset)
-		var reader *stream.SectionReader
+		var reader io.ReadSeeker
 		var rateLimitedRd io.Reader
 		sliceMD5 := ""
 		// 表单