feat: update go-libipfs and switch gateway code to wrap offline error…

…s with more general gateway ones

core/corehttp/gateway.go

@@ -1,13 +1,20 @@
 package corehttp
 
 import (
+	"context"
+	"errors"
 	"fmt"
 	"github.com/ipfs/go-blockservice"
+	"github.com/ipfs/go-cid"
 	offline "github.com/ipfs/go-ipfs-exchange-offline"
 	offlineroute "github.com/ipfs/go-ipfs-routing/offline"
+	"github.com/ipfs/go-libipfs/files"
 	"github.com/ipfs/go-namesys"
+	iface "github.com/ipfs/interface-go-ipfs-core"
+	"github.com/ipfs/interface-go-ipfs-core/path"
 	"github.com/ipfs/kubo/core/node"
 	"github.com/libp2p/go-libp2p/core/routing"
+	"io"
 	"net"
 	"net/http"
 
@@ -145,9 +152,90 @@ func newGatewayAPI(n *core.IpfsNode) (gateway.API, error) {
 		}
 	}
 
-	return gateway.NewBlocksGateway(bserv, gateway.WithValueStore(vsRouting), gateway.WithNameSystem(nsys))
+	gw, err := gateway.NewBlocksGateway(bserv, gateway.WithValueStore(vsRouting), gateway.WithNameSystem(nsys))
+	if err != nil {
+		return nil, err
+	}
+	return &offlineGatewayErrWrapper{gwimpl: gw}, nil
+}
+
+type offlineGatewayErrWrapper struct {
+	gwimpl gateway.API
+}
+
+func offlineErrWrap(err error) error {
+	if errors.Is(err, iface.ErrOffline) {
+		return fmt.Errorf("%s : %w", err.Error(), gateway.ErrServiceUnavailable)
+	}
+	return err
+}
+
+func (o *offlineGatewayErrWrapper) Get(ctx context.Context, path gateway.ImmutablePath) (gateway.ContentPathMetadata, files.Node, error) {
+	md, n, err := o.gwimpl.Get(ctx, path)
+	err = offlineErrWrap(err)
+	return md, n, err
+}
+
+func (o *offlineGatewayErrWrapper) GetRange(ctx context.Context, path gateway.ImmutablePath, ranges ...gateway.GetRange) (gateway.ContentPathMetadata, files.File, error) {
+	md, n, err := o.gwimpl.GetRange(ctx, path, ranges...)
+	err = offlineErrWrap(err)
+	return md, n, err
+}
+
+func (o *offlineGatewayErrWrapper) GetAll(ctx context.Context, path gateway.ImmutablePath) (gateway.ContentPathMetadata, files.Node, error) {
+	md, n, err := o.gwimpl.GetAll(ctx, path)
+	err = offlineErrWrap(err)
+	return md, n, err
+}
+
+func (o *offlineGatewayErrWrapper) GetBlock(ctx context.Context, path gateway.ImmutablePath) (gateway.ContentPathMetadata, files.File, error) {
+	md, n, err := o.gwimpl.GetBlock(ctx, path)
+	err = offlineErrWrap(err)
+	return md, n, err
 }
 
+func (o *offlineGatewayErrWrapper) Head(ctx context.Context, path gateway.ImmutablePath) (gateway.ContentPathMetadata, files.Node, error) {
+	md, n, err := o.gwimpl.Head(ctx, path)
+	err = offlineErrWrap(err)
+	return md, n, err
+}
+
+func (o *offlineGatewayErrWrapper) ResolvePath(ctx context.Context, path gateway.ImmutablePath) (gateway.ContentPathMetadata, error) {
+	md, err := o.gwimpl.ResolvePath(ctx, path)
+	err = offlineErrWrap(err)
+	return md, err
+}
+
+func (o *offlineGatewayErrWrapper) GetCAR(ctx context.Context, path gateway.ImmutablePath) (gateway.ContentPathMetadata, io.ReadCloser, <-chan error, error) {
+	md, data, errCh, err := o.gwimpl.GetCAR(ctx, path)
+	err = offlineErrWrap(err)
+	return md, data, errCh, err
+}
+
+func (o *offlineGatewayErrWrapper) IsCached(ctx context.Context, path path.Path) bool {
+	return o.gwimpl.IsCached(ctx, path)
+}
+
+func (o *offlineGatewayErrWrapper) GetIPNSRecord(ctx context.Context, c cid.Cid) ([]byte, error) {
+	rec, err := o.gwimpl.GetIPNSRecord(ctx, c)
+	err = offlineErrWrap(err)
+	return rec, err
+}
+
+func (o *offlineGatewayErrWrapper) ResolveMutable(ctx context.Context, path path.Path) (gateway.ImmutablePath, error) {
+	imPath, err := o.gwimpl.ResolveMutable(ctx, path)
+	err = offlineErrWrap(err)
+	return imPath, err
+}
+
+func (o *offlineGatewayErrWrapper) GetDNSLinkRecord(ctx context.Context, s string) (path.Path, error) {
+	p, err := o.gwimpl.GetDNSLinkRecord(ctx, s)
+	err = offlineErrWrap(err)
+	return p, err
+}
+
+var _ gateway.API = (*offlineGatewayErrWrapper)(nil)
+
 var defaultPaths = []string{"/ipfs/", "/ipns/", "/api/", "/p2p/"}
 
 var subdomainGatewaySpec = &gateway.Specification{

docs/examples/kubo-as-a-library/go.mod

@@ -7,7 +7,7 @@ go 1.18
 replace github.com/ipfs/kubo => ./../../..
 
 require (
-	github.com/ipfs/go-libipfs v0.6.1-0.20230228004237-36918f45f260
+	github.com/ipfs/go-libipfs v0.6.1-0.20230306184940-4a49a38e3b61
 	github.com/ipfs/interface-go-ipfs-core v0.11.0
 	github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
 	github.com/libp2p/go-libp2p v0.26.1
@@ -103,7 +103,7 @@ require (
 	github.com/ipfs/go-namesys v0.7.0 // indirect
 	github.com/ipfs/go-path v0.3.1 // indirect
 	github.com/ipfs/go-peertaskqueue v0.8.1 // indirect
-	github.com/ipfs/go-unixfs v0.4.3 // indirect
+	github.com/ipfs/go-unixfs v0.4.4-0.20230301082657-5fd2773dcaaa // indirect
 	github.com/ipfs/go-unixfsnode v1.5.2 // indirect
 	github.com/ipfs/go-verifcid v0.0.2 // indirect
 	github.com/ipld/edelweiss v0.2.0 // indirect

docs/examples/kubo-as-a-library/go.sum

@@ -569,8 +569,8 @@ github.com/ipfs/go-ipld-legacy v0.1.1 h1:BvD8PEuqwBHLTKqlGFTHSwrwFOMkVESEvwIYwR2
 github.com/ipfs/go-ipld-legacy v0.1.1/go.mod h1:8AyKFCjgRPsQFf15ZQgDB8Din4DML/fOmKZkkFkrIEg=
 github.com/ipfs/go-ipns v0.3.0 h1:ai791nTgVo+zTuq2bLvEGmWP1M0A6kGTXUsgv/Yq67A=
 github.com/ipfs/go-ipns v0.3.0/go.mod h1:3cLT2rbvgPZGkHJoPO1YMJeh6LtkxopCkKFcio/wE24=
-github.com/ipfs/go-libipfs v0.6.1-0.20230228004237-36918f45f260 h1:QRLcCoITO9ZQo2pvjmrfngqKhUKjPopBva3MVH62LT8=
-github.com/ipfs/go-libipfs v0.6.1-0.20230228004237-36918f45f260/go.mod h1:3OoEQs95UkqFEf65SbRDpiMwuzI+C/jTsYQaHfBbJXI=
+github.com/ipfs/go-libipfs v0.6.1-0.20230306184940-4a49a38e3b61 h1:LuF+PRq4/xV0iYmmDUylkEcOzEcbFuNN2kSxlT92/HQ=
+github.com/ipfs/go-libipfs v0.6.1-0.20230306184940-4a49a38e3b61/go.mod h1:99T3WhiWRs9vVm8Km/4ZygvULB/WyEotZcIs8hx9G7E=
 github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
 github.com/ipfs/go-log v1.0.2/go.mod h1:1MNjMxe0u6xvJZgeqbJ8vdo2TKaGwZ1a0Bpza+sr2Sk=
 github.com/ipfs/go-log v1.0.3/go.mod h1:OsLySYkwIbiSUR/yBTdv1qPtcE4FW3WPWk/ewz9Ru+A=
@@ -606,8 +606,8 @@ github.com/ipfs/go-peertaskqueue v0.8.1 h1:YhxAs1+wxb5jk7RvS0LHdyiILpNmRIRnZVzte
 github.com/ipfs/go-peertaskqueue v0.8.1/go.mod h1:Oxxd3eaK279FxeydSPPVGHzbwVeHjatZ2GA8XD+KbPU=
 github.com/ipfs/go-unixfs v0.2.4/go.mod h1:SUdisfUjNoSDzzhGVxvCL9QO/nKdwXdr+gbMUdqcbYw=
 github.com/ipfs/go-unixfs v0.3.1/go.mod h1:h4qfQYzghiIc8ZNFKiLMFWOTzrWIAtzYQ59W/pCFf1o=
-github.com/ipfs/go-unixfs v0.4.3 h1:EdDc1sNZNFDUlo4UrVAvvAofVI5EwTnKu8Nv8mgXkWQ=
-github.com/ipfs/go-unixfs v0.4.3/go.mod h1:TSG7G1UuT+l4pNj91raXAPkX0BhJi3jST1FDTfQ5QyM=
+github.com/ipfs/go-unixfs v0.4.4-0.20230301082657-5fd2773dcaaa h1:X8DPpsI3xvdsNxrsHi+ji39rjIvfPna3+XD+iQehbNQ=
+github.com/ipfs/go-unixfs v0.4.4-0.20230301082657-5fd2773dcaaa/go.mod h1:TSG7G1UuT+l4pNj91raXAPkX0BhJi3jST1FDTfQ5QyM=
 github.com/ipfs/go-unixfsnode v1.1.2/go.mod h1:5dcE2x03pyjHk4JjamXmunTMzz+VUtqvPwZjIEkfV6s=
 github.com/ipfs/go-unixfsnode v1.5.2 h1:CvsiTt58W2uR5dD8bqQv+aAY0c1qolmXmSyNbPHYiew=
 github.com/ipfs/go-unixfsnode v1.5.2/go.mod h1:NlOebRwYx8lMCNMdhAhEspYPBD3obp7TE0LvBqHY+ks=

go.mod

@@ -45,7 +45,7 @@ require (
 	github.com/ipfs/go-ipld-git v0.1.1
 	github.com/ipfs/go-ipld-legacy v0.1.1
 	github.com/ipfs/go-ipns v0.3.0
-	github.com/ipfs/go-libipfs v0.6.1-0.20230305054501-7af0fc6e1ec3
+	github.com/ipfs/go-libipfs v0.6.1-0.20230307110602-8c1c4d026377
 	github.com/ipfs/go-log v1.0.5
 	github.com/ipfs/go-log/v2 v2.5.1
 	github.com/ipfs/go-merkledag v0.9.0

go.sum

@@ -591,8 +591,8 @@ github.com/ipfs/go-ipld-legacy v0.1.1 h1:BvD8PEuqwBHLTKqlGFTHSwrwFOMkVESEvwIYwR2
 github.com/ipfs/go-ipld-legacy v0.1.1/go.mod h1:8AyKFCjgRPsQFf15ZQgDB8Din4DML/fOmKZkkFkrIEg=
 github.com/ipfs/go-ipns v0.3.0 h1:ai791nTgVo+zTuq2bLvEGmWP1M0A6kGTXUsgv/Yq67A=
 github.com/ipfs/go-ipns v0.3.0/go.mod h1:3cLT2rbvgPZGkHJoPO1YMJeh6LtkxopCkKFcio/wE24=
-github.com/ipfs/go-libipfs v0.6.1-0.20230305054501-7af0fc6e1ec3 h1:ClmPrV+RRzVDFxfaghnRzfcg6b9JhDcOz+AcMcbGY4o=
-github.com/ipfs/go-libipfs v0.6.1-0.20230305054501-7af0fc6e1ec3/go.mod h1:fumWk4eRvPZx9VPWX7ucviIkqnmz0Gt5cLiBuU1e34I=
+github.com/ipfs/go-libipfs v0.6.1-0.20230307110602-8c1c4d026377 h1:a5VELT+tlZJ1BoVW5bZULL41TYRnvAwPykL4fERVsJQ=
+github.com/ipfs/go-libipfs v0.6.1-0.20230307110602-8c1c4d026377/go.mod h1:99T3WhiWRs9vVm8Km/4ZygvULB/WyEotZcIs8hx9G7E=
 github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
 github.com/ipfs/go-log v1.0.2/go.mod h1:1MNjMxe0u6xvJZgeqbJ8vdo2TKaGwZ1a0Bpza+sr2Sk=
 github.com/ipfs/go-log v1.0.3/go.mod h1:OsLySYkwIbiSUR/yBTdv1qPtcE4FW3WPWk/ewz9Ru+A=