fix: respond with correct error

Author: akrem-chabchoub

pkg/api/bzz.go

@@ -696,6 +696,8 @@ FETCH:
 			}
 
 			jsonhttp.NotFound(w, "path address not found")
+		} else if errors.Is(err, topology.ErrNotFound) {
+			jsonhttp.ServiceUnavailable(w, "content could not be retrieved because no usable peer was available")
 		} else {
 			jsonhttp.NotFound(w, nil)
 		}
@@ -768,12 +770,18 @@ func (s *Service) downloadHandler(logger log.Logger, w http.ResponseWriter, r *h
 		reader, l, err = joiner.New(ctx, s.storer.Download(cache), s.storer.Cache(), reference, rLevel)
 	}
 	if err != nil {
-		if errors.Is(err, storage.ErrNotFound) || errors.Is(err, topology.ErrNotFound) {
+		if errors.Is(err, storage.ErrNotFound) {
 			logger.Debug("api download: not found ", "address", reference, "error", err)
 			logger.Error(nil, err.Error())
 			jsonhttp.NotFound(w, nil)
 			return
 		}
+		if errors.Is(err, topology.ErrNotFound) {
+			logger.Debug("api download: no peers available", "address", reference, "error", err)
+			logger.Error(nil, err.Error())
+			jsonhttp.ServiceUnavailable(w, "content could not be retrieved because no usable peer was available")
+			return
+		}
 		logger.Debug("api download: unexpected error", "address", reference, "error", err)
 		logger.Error(nil, "api download: unexpected error")
 		jsonhttp.InternalServerError(w, "joiner failed")

pkg/api/chunk.go

@@ -22,6 +22,7 @@ import (
 	"github.com/ethersphere/bee/v2/pkg/postage"
 	"github.com/ethersphere/bee/v2/pkg/storage"
 	"github.com/ethersphere/bee/v2/pkg/swarm"
+	"github.com/ethersphere/bee/v2/pkg/topology"
 	"github.com/gorilla/mux"
 )
 
@@ -256,15 +257,18 @@ func (s *Service) chunkGetHandler(w http.ResponseWriter, r *http.Request) {
 
 	chunk, err := s.storer.Download(cache).Get(r.Context(), address)
 	if err != nil {
-		if errors.Is(err, storage.ErrNotFound) {
+		switch {
+		case errors.Is(err, storage.ErrNotFound):
 			loggerV1.Debug("chunk not found", "address", address)
 			jsonhttp.NotFound(w, "chunk not found")
-			return
-
+		case errors.Is(err, topology.ErrNotFound):
+			loggerV1.Debug("no peers available to retrieve chunk", "address", address)
+			jsonhttp.ServiceUnavailable(w, "chunk could not be retrieved because no usable peer was available")
+		default:
+			logger.Debug("read chunk failed", "chunk_address", address, "error", err)
+			logger.Error(nil, "read chunk failed")
+			jsonhttp.InternalServerError(w, "read chunk failed")
 		}
-		logger.Debug("read chunk failed", "chunk_address", address, "error", err)
-		logger.Error(nil, "read chunk failed")
-		jsonhttp.InternalServerError(w, "read chunk failed")
 		return
 	}
 	w.Header().Set(ContentTypeHeader, "binary/octet-stream")