Drop support for FindBatch API (#71)

* Drop support for FindBatch API
* Use update go-libipni to latest
* Print "index not found" when dh lookup has no provider results
* update version

Author: gammazero

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/ipfs/go-log/v2 v2.5.1
 	github.com/ipld/go-car/v2 v2.13.1
 	github.com/ipld/go-ipld-prime v0.21.0
-	github.com/ipni/go-libipni v0.5.1
+	github.com/ipni/go-libipni v0.5.2
 	github.com/libp2p/go-libp2p v0.31.0
 	github.com/mattn/go-isatty v0.0.19
 	github.com/montanaflynn/stats v0.7.0

go.sum

@@ -271,8 +271,8 @@ github.com/ipld/go-codec-dagpb v1.6.0/go.mod h1:ANzFhfP2uMJxRBr8CE+WQWs5UsNa0pYt
 github.com/ipld/go-ipld-prime v0.21.0 h1:n4JmcpOlPDIxBcY037SVfpd1G+Sj1nKZah0m6QH9C2E=
 github.com/ipld/go-ipld-prime v0.21.0/go.mod h1:3RLqy//ERg/y5oShXXdx5YIp50cFGOanyMctpPjsvxQ=
 github.com/ipld/go-ipld-prime/storage/bsadapter v0.0.0-20230102063945-1a409dc236dd h1:gMlw/MhNr2Wtp5RwGdsW23cs+yCuj9k2ON7i9MiJlRo=
-github.com/ipni/go-libipni v0.5.1 h1:HumuJtKmV8RoDpBakLgxCSl5QPiD2ljTZl/NOyXO6nM=
-github.com/ipni/go-libipni v0.5.1/go.mod h1:UnrhEqjVI2Z2HXlaieOBONJmtW557nZkYpB4IIsMD+s=
+github.com/ipni/go-libipni v0.5.2 h1:9vaYOnR4dskd8p88NOboqI6yVqBwYPNCQ/zOaRSr59I=
+github.com/ipni/go-libipni v0.5.2/go.mod h1:UnrhEqjVI2Z2HXlaieOBONJmtW557nZkYpB4IIsMD+s=
 github.com/ipsn/go-secp256k1 v0.0.0-20180726113642-9d62b9f0bc52 h1:QG4CGBqCeuBo6aZlGAamSkxWdgWfZGeE49eUOWJPA4c=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=

pkg/find/find.go

@@ -2,13 +2,10 @@ package find
 
 import (
 	"encoding/base64"
-	"errors"
 	"fmt"
-	"net/http"
 	"strings"
 
 	"github.com/ipfs/go-cid"
-	"github.com/ipni/go-libipni/apierror"
 	"github.com/ipni/go-libipni/find/client"
 	"github.com/ipni/go-libipni/find/model"
 	"github.com/ipni/go-libipni/metadata"
@@ -115,22 +112,9 @@ func dhFind(cctx *cli.Context, mhs []multihash.Multihash) error {
 		return err
 	}
 
-	var resp *model.FindResponse
-	for _, mh := range mhs {
-		r, err := cl.Find(cctx.Context, mh)
-		if err != nil {
-			// TODO: Look for error that specifies double-hashing not supported.
-			var ae *apierror.Error
-			if errors.As(err, &ae) && ae.Status() == http.StatusNotFound {
-				continue
-			}
-			return err
-		}
-		if resp == nil {
-			resp = r
-		} else {
-			resp.MultihashResults = append(resp.MultihashResults, r.MultihashResults...)
-		}
+	resp, err := client.FindBatch(cctx.Context, cl, mhs)
+	if err != nil {
+		return err
 	}
 	if resp == nil && cctx.Bool("fallback") {
 		return clearFind(cctx, mhs)
@@ -149,16 +133,10 @@ func clearFind(cctx *cli.Context, mhs []multihash.Multihash) error {
 		return err
 	}
 
-	var resp *model.FindResponse
-	if len(mhs) == 1 {
-		resp, err = cl.Find(cctx.Context, mhs[0])
-	} else {
-		resp, err = cl.FindBatch(cctx.Context, mhs)
-	}
+	resp, err := client.FindBatch(cctx.Context, cl, mhs)
 	if err != nil {
 		return err
 	}
-
 	return printResults(cctx, resp)
 }
 
@@ -184,6 +162,10 @@ func printResults(cctx *cli.Context, resp *model.FindResponse) error {
 
 	for i := range resp.MultihashResults {
 		fmt.Println("Multihash:", resp.MultihashResults[i].Multihash.B58String())
+		if len(resp.MultihashResults[i].ProviderResults) == 0 {
+			fmt.Println("  index not found")
+			continue
+		}
 		// Group results by provider.
 		providers := make(map[string][]model.ProviderResult)
 		for _, pr := range resp.MultihashResults[i].ProviderResults {

pkg/verify/ingest.go

@@ -1,7 +1,6 @@
 package verify
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"math/rand"
@@ -651,26 +650,27 @@ func verifyIngestFromMhs(cctx *cli.Context, find *client.Client, dhFind *client.
 }
 
 func verifyIngest(cctx *cli.Context, find *client.Client, dhFind *client.DHashClient, wantProvID peer.ID, mhs []multihash.Multihash) (*verifyResult, error) {
-	result := &verifyResult{}
-	mhsCount := len(mhs)
-	result.TotalMhChecked = mhsCount
+	result := &verifyResult{
+		TotalMhChecked: len(mhs),
+	}
 
 	var response *model.FindResponse
 	var err error
 	if dhFind != nil {
-		response, err = doDHFind(cctx.Context, dhFind, mhs)
+		response, err = client.FindBatch(cctx.Context, dhFind, mhs)
+		fmt.Println("🔒 Reader privacy enabled")
 	} else {
-		response, err = doClearFind(cctx.Context, find, mhs)
+		response, err = client.FindBatch(cctx.Context, find, mhs)
 	}
 	if err != nil {
-		result.FailedToVerify = mhsCount
+		result.FailedToVerify = len(mhs)
 		err = fmt.Errorf("failed to connect to indexer: %w", err)
 		result.Errs = append(result.Errs, err)
 		return result, nil
 	}
 
 	if response == nil || len(response.MultihashResults) == 0 {
-		result.Absent = mhsCount
+		result.Absent = len(mhs)
 		return result, nil
 	}
 
@@ -701,32 +701,3 @@ func verifyIngest(cctx *cli.Context, find *client.Client, dhFind *client.DHashCl
 	}
 	return result, nil
 }
-
-func doDHFind(ctx context.Context, cl *client.DHashClient, mhs []multihash.Multihash) (*model.FindResponse, error) {
-	var resp *model.FindResponse
-	for _, mh := range mhs {
-		r, err := cl.Find(ctx, mh)
-		if err != nil {
-			// TODO: Look for error that specifies double-hashing not supported.
-			var ae *apierror.Error
-			if errors.As(err, &ae) && ae.Status() == http.StatusNotFound {
-				continue
-			}
-			return nil, err
-		}
-		if resp == nil {
-			resp = r
-		} else {
-			resp.MultihashResults = append(resp.MultihashResults, r.MultihashResults...)
-		}
-	}
-	fmt.Println("🔒 Reader privacy enabled")
-	return resp, nil
-}
-
-func doClearFind(ctx context.Context, cl *client.Client, mhs []multihash.Multihash) (*model.FindResponse, error) {
-	if len(mhs) == 1 {
-		return cl.Find(ctx, mhs[0])
-	}
-	return cl.FindBatch(ctx, mhs)
-}

version.json

@@ -1,3 +1,3 @@
 {
-  "version": "v0.1.1"
+  "version": "v0.1.2"
 }