fix(storage): decouple details context, invalidate cache on refresh, and add singleflight

drivers/onedrive/util.go

@@ -310,7 +310,7 @@ func (d *Onedrive) getDrive(ctx context.Context) (*DriveResp, error) {
 	var resp DriveResp
 	_, err := d.Request(api, http.MethodGet, func(req *resty.Request) {
 		req.SetContext(ctx)
-	}, &resp, true)
+	}, &resp)
 	if err != nil {
 		return nil, err
 	}

drivers/onedrive_app/util.go

@@ -217,7 +217,7 @@ func (d *OnedriveAPP) getDrive(ctx context.Context) (*DriveResp, error) {
 	var resp DriveResp
 	_, err := d.Request(api, http.MethodGet, func(req *resty.Request) {
 		req.SetContext(ctx)
-	}, &resp, true)
+	}, &resp)
 	if err != nil {
 		return nil, err
 	}

internal/bootstrap/data/setting.go

@@ -124,6 +124,8 @@ func InitialSettings() []model.SettingItem {
 		{Key: conf.HideStorageDetails, Value: "true", Type: conf.TypeBool, Group: model.STYLE, Flag: model.PRIVATE},
 		{Key: conf.HideStorageDetailsInManagePage, Value: "true", Type: conf.TypeBool, Group: model.STYLE, Flag: model.PRIVATE},
 		{Key: "show_disk_usage_in_plain_text", Value: "false", Type: conf.TypeBool, Group: model.STYLE, Flag: model.PUBLIC},
+		{Key: conf.StorageDetailsCooldownSeconds, Value: "0", Type: conf.TypeNumber, Group: model.STYLE, Flag: model.PRIVATE},
+		{Key: conf.StorageDetailsTimeoutSeconds, Value: "15", Type: conf.TypeNumber, Group: model.STYLE, Flag: model.PRIVATE},
 		// preview settings
 		{Key: conf.TextTypes, Value: "txt,htm,html,xml,java,properties,sql,js,md,json,conf,ini,vue,php,py,bat,gitignore,yml,go,sh,c,cpp,h,hpp,tsx,vtt,srt,ass,rs,lrc,strm", Type: conf.TypeText, Group: model.PREVIEW, Flag: model.PRIVATE},
 		{Key: conf.AudioTypes, Value: "mp3,flac,ogg,m4a,wav,opus,wma", Type: conf.TypeText, Group: model.PREVIEW, Flag: model.PRIVATE},

internal/conf/const.go

@@ -22,6 +22,8 @@ const (
 	MainColor                      = "main_color"
 	HideStorageDetails             = "hide_storage_details"
 	HideStorageDetailsInManagePage = "hide_storage_details_in_manage_page"
+	StorageDetailsCooldownSeconds  = "storage_details_cooldown_seconds"
+	StorageDetailsTimeoutSeconds   = "storage_details_timeout_seconds"
 
 	// preview
 	TextTypes                     = "text_types"

internal/op/storage.go

@@ -6,11 +6,13 @@ import (
 	"reflect"
 	"runtime"
 	"sort"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
 
 	"github.com/OpenListTeam/OpenList/v4/internal/db"
+	"github.com/OpenListTeam/OpenList/v4/internal/conf"
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
@@ -242,6 +244,7 @@ func UpdateStorage(ctx context.Context, storage model.Storage) error {
 		storagesMap.Delete(oldStorage.MountPath)
 		Cache.DeleteDirectoryTree(storageDriver, "/")
 		Cache.InvalidateStorageDetails(storageDriver)
+		InvalidateStorageDetailsState(oldStorage.MountPath)
 	}
 	if err != nil {
 		return errors.WithMessage(err, "failed get storage driver")
@@ -276,6 +279,7 @@ func DeleteStorageById(ctx context.Context, id uint) error {
 		storagesMap.Delete(storage.MountPath)
 		Cache.DeleteDirectoryTree(storageDriver, "/")
 		Cache.InvalidateStorageDetails(storageDriver)
+		InvalidateStorageDetailsState(storage.MountPath)
 		go callStorageHooks("del", storageDriver)
 	}
 	// delete the storage in the database
@@ -344,10 +348,20 @@ func GetStorageVirtualFilesByPath(prefix string) []model.Obj {
 	return getStorageVirtualFilesByPath(prefix, nil, "")
 }
 
+func getSettingInt(key string, defaultValue int) int {
+	if item, err := GetSettingItemByKey(key); err == nil && item != nil {
+		if val, err := strconv.Atoi(item.Value); err == nil {
+			return val
+		}
+	}
+	return defaultValue
+}
+
 func GetStorageVirtualFilesWithDetailsByPath(ctx context.Context, prefix string, hideDetails, refresh bool, filterByName string) []model.Obj {
 	if hideDetails {
 		return getStorageVirtualFilesByPath(prefix, nil, filterByName)
 	}
+	timeoutSec := time.Duration(getSettingInt(conf.StorageDetailsTimeoutSeconds, 15)) * time.Second
 	return getStorageVirtualFilesByPath(prefix, func(d driver.Driver, obj model.Obj) model.Obj {
 		if _, ok := obj.(*model.ObjStorageDetails); ok {
 			return obj
@@ -357,8 +371,15 @@ func GetStorageVirtualFilesWithDetailsByPath(ctx context.Context, prefix string,
 			StorageDetails: nil,
 		}
 		resultChan := make(chan *model.StorageDetails, 1)
+		bgCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), timeoutSec)
 		go func(dri driver.Driver) {
-			details, err := GetStorageDetails(ctx, dri, refresh)
+			defer func() {
+				if r := recover(); r != nil {
+					log.Errorf("panic recovered in storage details probe for %s: %v", dri.GetStorage().MountPath, r)
+				}
+			}()
+			defer cancel()
+			details, err := GetStorageDetails(bgCtx, dri, refresh)
 			if err != nil {
 				if !errors.Is(err, errs.NotImplement) && !errors.Is(err, errs.StorageNotInit) {
 					log.Errorf("failed get %s storage details: %+v", dri.GetStorage().MountPath, err)
@@ -463,7 +484,29 @@ func GetBalancedStorage(path string) driver.Driver {
 	}
 }
 
-var detailsG singleflight.Group[*model.StorageDetails]
+// lastDoneExpireThreshold defines the expiration duration in seconds (24 hours) for recorded storage details cooldown timestamps.
+const lastDoneExpireThreshold = 86400
+
+var (
+	detailsG      singleflight.Group[*model.StorageDetails]
+	detailsLock   sync.RWMutex
+	lastDoneTimes = make(map[string]int64)
+)
+
+func InvalidateStorageDetailsState(mountPath string) {
+	detailsLock.Lock()
+	delete(lastDoneTimes, utils.GetActualMountPath(mountPath))
+	cleanExpiredLastDoneTimesLocked(time.Now().Unix())
+	detailsLock.Unlock()
+}
+
+func cleanExpiredLastDoneTimesLocked(now int64) {
+	for k, t := range lastDoneTimes {
+		if now-t > lastDoneExpireThreshold {
+			delete(lastDoneTimes, k)
+		}
+	}
+}
 
 func GetStorageDetails(ctx context.Context, storage driver.Driver, refresh ...bool) (*model.StorageDetails, error) {
 	if storage.Config().CheckStatus && storage.GetStorage().Status != WORK {
@@ -473,17 +516,45 @@ func GetStorageDetails(ctx context.Context, storage driver.Driver, refresh ...bo
 	if !ok {
 		return nil, errs.NotImplement
 	}
-	if !utils.IsBool(refresh...) {
+	mountPath := utils.GetActualMountPath(storage.GetStorage().MountPath)
+	cooldownSec := getSettingInt(conf.StorageDetailsCooldownSeconds, 0)
+
+	detailsLock.RLock()
+	lastDone := lastDoneTimes[mountPath]
+	detailsLock.RUnlock()
+
+	now := time.Now().Unix()
+	isRefresh := utils.IsBool(refresh...)
+
+	// 强刷时：若超出冷却期（或默认 cooldown=0），先主动清空旧缓存，保证强一致性
+	if isRefresh && (cooldownSec <= 0 || now-lastDone >= int64(cooldownSec)) {
+		Cache.InvalidateStorageDetails(storage)
+	} else {
+		// 普通读取 或 处于冷却期内：优先读取有效缓存
 		if ret, ok := Cache.GetStorageDetails(storage); ok {
 			return ret, nil
 		}
 	}
-	details, err, _ := detailsG.Do(storage.GetStorage().MountPath, func() (*model.StorageDetails, error) {
-		ret, err := wd.GetDetails(ctx)
+
+	details, err, _ := detailsG.Do(mountPath, func() (ret *model.StorageDetails, err error) {
+		defer func() {
+			if r := recover(); r != nil {
+				err = fmt.Errorf("panic in driver GetDetails: %v", r)
+				log.Errorf("panic recovered in driver GetDetails for %s: %v", mountPath, r)
+			}
+		}()
+		ret, err = wd.GetDetails(ctx)
 		if err != nil {
 			return nil, err
 		}
 		Cache.SetStorageDetails(storage, ret)
+		nowDone := time.Now().Unix()
+		detailsLock.Lock()
+		lastDoneTimes[mountPath] = nowDone
+		if len(lastDoneTimes) > 256 {
+			cleanExpiredLastDoneTimesLocked(nowDone)
+		}
+		detailsLock.Unlock()
 		return ret, nil
 	})
 	return details, err