Handle application-level/ipfs-based deletions

models/results/error.go

@@ -1,5 +1,11 @@
 package results
 
+import (
+	"errors"
+)
+
+var ErrTokenNotFound = errors.New("token not found")
+
 type Error struct {
 	Message string `json:"errorMessage"`
 	Type    string `json:"errorType"`

network/web2/metadata_fetcher.go

@@ -33,22 +33,18 @@ func NewMetadataFetcher(options ...MetadataOption) *MetadataFetcher {
 	return &m
 }
 
-func (m *MetadataFetcher) Payload(_ context.Context, uri string) ([]byte, error) {
+func (m *MetadataFetcher) Payload(_ context.Context, uri string) ([]byte, int, error) {
 
 	res, err := m.client.Get(uri)
 	if err != nil {
-		return nil, fmt.Errorf("could not execute request: %w", err)
+		return nil, 0, fmt.Errorf("could not execute request: %w", err)
 	}
 	defer res.Body.Close()
 
-	if res.StatusCode != 200 {
-		return nil, fmt.Errorf("bad response code (%d)", res.StatusCode)
-	}
-
 	payload, err := io.ReadAll(res.Body)
 	if err != nil {
-		return nil, fmt.Errorf("could not read response body: %w", err)
+		return nil, res.StatusCode, fmt.Errorf("could not read response body: %w", err)
 	}
 
-	return payload, nil
+	return payload, res.StatusCode, nil
 }

service/pipeline/addition_stage.go

@@ -3,8 +3,8 @@ package pipeline
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
-	"strings"
 
 	"github.com/nsqio/go-nsq"
 	"github.com/rs/zerolog"
@@ -139,7 +139,7 @@ func (a *AdditionStage) process(payload []byte) error {
 	if err != nil {
 		return fmt.Errorf("could not decode execution error: %w", err)
 	}
-	if execErr != nil && strings.Contains(execErr.Error(), "URI query for nonexistent token") {
+	if errors.Is(execErr, results.ErrTokenNotFound) {
 		return a.delete(payload)
 	}
 	if execErr != nil {

service/workers/addition_handler.go

@@ -5,6 +5,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"strings"
 
 	"github.com/ipfs/go-cid"
@@ -169,13 +170,20 @@ func (a *AdditionHandler) Handle(ctx context.Context, addition *jobs.Addition) (
 
 	// Finally, we check if we have a payload already, or if we need to fetch it remotely.
 	var payload []byte
+	var code int
 	switch {
 
 	case strings.HasPrefix(privateURI, protocol.HTTP), strings.HasPrefix(privateURI, protocol.HTTPS):
-		payload, err = fetchMetadata.Payload(ctx, privateURI)
+		payload, code, err = fetchMetadata.Payload(ctx, privateURI)
 		if err != nil {
 			return nil, fmt.Errorf("could not fetch remote metadata: %w", err)
 		}
+		if code == http.StatusInternalServerError && isTokenNotFound(payload) {
+			return nil, results.ErrTokenNotFound
+		}
+		if code == http.StatusNotFound && isIPFSMissingLink(payload) {
+			return nil, results.ErrTokenNotFound
+		}
 		log.Debug().
 			Str("payload", string(payload)).
 			Msg("remote payload fetched")
@@ -264,3 +272,28 @@ func (a *AdditionHandler) Handle(ctx context.Context, addition *jobs.Addition) (
 
 	return &result, nil
 }
+
+func isTokenNotFound(payload []byte) bool {
+	var reqErr *results.Error
+	err := json.Unmarshal(payload, &reqErr)
+	if err != nil {
+		return false
+	}
+	if reqErr.Error() == "Token not found" {
+		return true
+	}
+	return false
+}
+
+func isIPFSMissingLink(payload []byte) bool {
+	var reqErr *results.Error
+	err := json.Unmarshal(payload, &reqErr)
+	if err != nil {
+		return false
+	}
+	if strings.Contains(reqErr.Error(), "URI query for nonexistent token") ||
+		strings.Contains(reqErr.Error(), "no link named") {
+		return true
+	}
+	return false
+}