fix: canceled context should not start list before do listObjects (#2122)

jiuker · web-flow · commit 564e213321c9 · 2025-06-13T03:49:02.000-07:00
diff --git a/api-list.go b/api-list.go
@@ -759,13 +759,9 @@ func (c *Client) ListObjects(ctx context.Context, bucketName string, opts ListOb
 	objectStatCh := make(chan ObjectInfo, 1)
 	go func() {
 		defer close(objectStatCh)
-		send := func(obj ObjectInfo) bool {
-			select {
-			case <-ctx.Done():
-				return false
-			case objectStatCh <- obj:
-				return true
-			}
+		if contextCanceled(ctx) {
+			objectStatCh <- ObjectInfo{Err: ctx.Err()}
+			return
 		}
 
 		var objIter iter.Seq[ObjectInfo]
@@ -783,8 +779,11 @@ func (c *Client) ListObjects(ctx context.Context, bucketName string, opts ListOb
 			}
 		}
 		for obj := range objIter {
-			if !send(obj) {
+			select {
+			case <-ctx.Done():
+				objectStatCh <- ObjectInfo{Err: ctx.Err()}
 				return
+			case objectStatCh <- obj:
 			}
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -759,13 +759,9 @@ func (c *Client) ListObjects(ctx context.Context, bucketName string, opts ListOb`
`759`	`759`	`objectStatCh := make(chan ObjectInfo, 1)`
`760`	`760`	`go func() {`
`761`	`761`	`defer close(objectStatCh)`
`762`		`- send := func(obj ObjectInfo) bool {`
`763`		`- select {`
`764`		`- case <-ctx.Done():`
`765`		`- return false`
`766`		`- case objectStatCh <- obj:`
`767`		`- return true`
`768`		`- }`
	`762`	`+ if contextCanceled(ctx) {`
	`763`	`+ objectStatCh <- ObjectInfo{Err: ctx.Err()}`
	`764`	`+ return`
`769`	`765`	`}`
`770`	`766`
`771`	`767`	`var objIter iter.Seq[ObjectInfo]`
`@@ -783,8 +779,11 @@ func (c *Client) ListObjects(ctx context.Context, bucketName string, opts ListOb`
`783`	`779`	`}`
`784`	`780`	`}`
`785`	`781`	`for obj := range objIter {`
`786`		`- if !send(obj) {`
	`782`	`+ select {`
	`783`	`+ case <-ctx.Done():`
	`784`	`+ objectStatCh <- ObjectInfo{Err: ctx.Err()}`
`787`	`785`	`return`
	`786`	`+ case objectStatCh <- obj:`
`788`	`787`	`}`
`789`	`788`	`}`
`790`	`789`	`}()`