Merge pull request #1163 from anyproto/go-3296-shared-space-broken-image

GO-3296: Gateway: retry serving images

.mockery.yaml

@@ -130,6 +130,8 @@ packages:
   github.com/anyproto/anytype-heart/core/files:
     interfaces:
       Service:
+      File:
+      Image:
   github.com/anyproto/anytype-heart/core/files/fileacl:
     interfaces:
       Service:

core/domain/errors.go

@@ -2,6 +2,4 @@ package domain
 
 import "errors"
 
-var ErrFileNotFound = errors.New("file not found")
-
 var ErrValidationFailed = errors.New("validation failed")

core/files/fileobject/fileindex.go

@@ -2,7 +2,6 @@ package fileobject
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"strings"
 	"sync"
@@ -207,11 +206,6 @@ func (ind *indexer) indexFile(ctx context.Context, id domain.FullID, fileId doma
 
 func (ind *indexer) injectMetadataToState(ctx context.Context, st *state.State, fileId domain.FullFileId, id domain.FullID) error {
 	details, typeKey, err := ind.buildDetails(ctx, fileId)
-	if errors.Is(err, domain.ErrFileNotFound) {
-		log.With("fileId", fileId.FileId, "objectId", id.ObjectID).Errorf("build details: %v", err)
-		ind.markFileAsNotFound(st)
-		return nil
-	}
 	if err != nil {
 		return fmt.Errorf("build details: %w", err)
 	}

core/files/files.go

@@ -672,7 +672,7 @@ func (s *service) FileByHash(ctx context.Context, id domain.FullFileId) (File, e
 		fileList, err = s.fileIndexInfo(ctx, id, false)
 		if err != nil {
 			log.With("fileId", id.FileId.String()).Errorf("FileByHash: failed to retrieve from IPFS: %s", err)
-			return nil, domain.ErrFileNotFound
+			return nil, err
 		}
 		ok, err := s.fileStore.IsFileImported(id.FileId)
 		if err != nil {

core/files/images.go

@@ -26,8 +26,7 @@ func (s *service) ImageByHash(ctx context.Context, id domain.FullFileId) (Image,
 		// index image files info from ipfs
 		files, err = s.fileIndexInfo(ctx, id, true)
 		if err != nil {
-			log.Errorf("ImageByHash: failed to retrieve from IPFS: %s", err)
-			return nil, domain.ErrFileNotFound
+			return nil, err
 		}
 	}
 

core/filestorage/filesync/filesync.go

@@ -44,7 +44,6 @@ type FileSync interface {
 	UpdateNodeUsage(ctx context.Context) error
 	NodeUsage(ctx context.Context) (usage NodeUsage, err error)
 	SpaceStat(ctx context.Context, spaceId string) (ss SpaceStat, err error)
-	FileStat(ctx context.Context, spaceId string, fileId domain.FileId) (fs FileStat, err error)
 	FileListStats(ctx context.Context, spaceId string, hashes []domain.FileId) ([]FileStat, error)
 	DebugQueue(*http.Request) (*QueueInfo, error)
 	SendImportEvents()