feat: Better self-service commands for DHT providing

core/commands/bitswap.go

@@ -24,7 +24,6 @@ var BitswapCmd = &cmds.Command{
 		"stat":      bitswapStatCmd,
 		"wantlist":  showWantlistCmd,
 		"ledger":    ledgerCmd,
-		"reprovide": reprovideCmd,
 	},
 }
 
@@ -200,29 +199,3 @@ prints the ledger associated with a given peer.
 		}),
 	},
 }
-
-var reprovideCmd = &cmds.Command{
-	Helptext: cmds.HelpText{
-		Tagline: "Trigger reprovider.",
-		ShortDescription: `
-Trigger reprovider to announce our data to network.
-`,
-	},
-	Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
-		nd, err := cmdenv.GetNode(env)
-		if err != nil {
-			return err
-		}
-
-		if !nd.IsOnline {
-			return ErrNotOnline
-		}
-
-		err = nd.Provider.Reprovide(req.Context)
-		if err != nil {
-			return err
-		}
-
-		return nil
-	},
-}

core/commands/routing.go

@@ -42,6 +42,7 @@ var RoutingCmd = &cmds.Command{
 		"get":       getValueRoutingCmd,
 		"put":       putValueRoutingCmd,
 		"provide":   provideRefRoutingCmd,
+		"reprovide": reprovideRoutingCmd,
 	},
 }
 
@@ -235,6 +236,33 @@ var provideRefRoutingCmd = &cmds.Command{
 	Type: routing.QueryEvent{},
 }
 
+var reprovideRoutingCmd = &cmds.Command{
+	Status: cmds.Experimental,
+	Helptext: cmds.HelpText{
+		Tagline: "Trigger reprovider.",
+		ShortDescription: `
+Trigger reprovider to announce our data to network.
+`,
+	},
+	Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
+		nd, err := cmdenv.GetNode(env)
+		if err != nil {
+			return err
+		}
+
+		if !nd.IsOnline {
+			return ErrNotOnline
+		}
+
+		err = nd.Provider.Reprovide(req.Context)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	},
+}
+
 func provideKeys(ctx context.Context, r routing.Routing, cids []cid.Cid) error {
 	for _, c := range cids {
 		err := r.Provide(ctx, c, true)

core/commands/stat_provide.go

@@ -53,7 +53,10 @@ This interface is not stable and may change from release to release.
 			fmt.Fprintf(wtr, "TotalProvides:\t%s\n", humanNumber(s.TotalProvides))
 			fmt.Fprintf(wtr, "AvgProvideDuration:\t%s\n", humanDuration(s.AvgProvideDuration))
 			fmt.Fprintf(wtr, "LastReprovideDuration:\t%s\n", humanDuration(s.LastReprovideDuration))
-			fmt.Fprintf(wtr, "LastReprovideBatchSize:\t%s\n", humanNumber(s.LastReprovideBatchSize))
+			if !s.LastRun.IsZero() {
+				fmt.Fprintf(wtr, "LastRun:\t%s\n", humanTime(s.LastRun))
+				fmt.Fprintf(wtr, "NextRun:\t%s\n", humanTime(s.NextRun))
+			}
 			return nil
 		}),
 	},
@@ -64,6 +67,10 @@ func humanDuration(val time.Duration) string {
 	return val.Truncate(time.Microsecond).String()
 }
 
+func humanTime(val time.Time) string {
+	return val.Format("2006-01-02 15:04:05")
+}
+
 func humanNumber[T constraints.Float | constraints.Integer](n T) string {
 	nf := float64(n)
 	str := humanSI(nf, 0)

docs/changelogs/v0.33.md

@@ -18,6 +18,8 @@
   - [New DoH resolvers for non-ICANN DNSLinks](#new-doh-resolvers-for-non-icann-dnslinks)
   - [📦️ Important dependency updates](#-important-dependency-updates)
   - [Escape Redirect URL for Directory](#escape-redirect-url-for-directory)
+  - [Reprovide command moved to routing](#reprovide-command-moved-to-routing)
+  - [LastRun and NextRun in `stats reprovide`](#lastrun-and-nextrun-in-stats-reprovide)
 - [📝 Changelog](#-changelog)
 - [👨‍👩‍👧‍👦 Contributors](#-contributors)
 
@@ -112,6 +114,14 @@ We have fixed a number of issues that were triggered by writing or copying many
 
 When navigating to a subdirectory, served by the Kubo web server, a subdirectory without a trailing slash gets redirected to a URL with a trailing slash. If there are special characters such as "%" in the subdirectory name then these must be escaped in the redirect URL. Previously this was not being done and was preventing navigation to such subdirectories, requiring the user to manually add a trailing slash to the subdirectory URL. This is now fixed to handle the redirect to URLs with characters that must be escaped.
 
+### Reprovide command moved to routing
+
+Moved the `bitswap reprovide` command to `routing reprovide`.
+
+### LastRun and NextRun in `stats reprovide`
+
+The `stats reprovide` command now shows additional stats, indicating the last and the next run of `routing provide` and `routing reprovide`.
+
 ### 📝 Changelog
 
 ### 👨‍👩‍👧‍👦 Contributors

go.mod

@@ -2,6 +2,8 @@ module github.com/ipfs/kubo
 
 go 1.23
 
+replace github.com/ipfs/boxo => github.com/gsergey418alt/boxo v0.0.0-20250130100910-c664359ed14f
+
 require (
 	bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc
 	contrib.go.opencensus.io/exporter/prometheus v0.4.2

go.sum

@@ -340,6 +340,8 @@ github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:Fecb
 github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 h1:asbCHRVmodnJTuQ3qamDwqVOIjwqUPTYmYuemVOx+Ys=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0/go.mod h1:ggCgvZ2r7uOoQjOyu2Y1NhHmEPPzzuhWgcza5M1Ji1I=
+github.com/gsergey418alt/boxo v0.0.0-20250130100910-c664359ed14f h1:LhjTi4cSNmD/c2mM2LwjmRi+ZHGCfJVl1LCa/0UBFZc=
+github.com/gsergey418alt/boxo v0.0.0-20250130100910-c664359ed14f/go.mod h1:qEIRrGNr0bitDedTCzyzBHxzNWqYmyuHgK8LG9Q83EM=
 github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU=
 github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -368,8 +370,6 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.25.0 h1:OqNqsGZPX8zh3eFMO8Lf8EHRRnSGBMqcd
 github.com/ipfs-shipyard/nopfs/ipfs v0.25.0/go.mod h1:BxhUdtBgOXg1B+gAPEplkg/GpyTZY+kCMSfsJvvydqU=
 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
-github.com/ipfs/boxo v0.27.2 h1:sGo4KdwBaMjdBjH08lqPJyt27Z4CO6sugne3ryX513s=
-github.com/ipfs/boxo v0.27.2/go.mod h1:qEIRrGNr0bitDedTCzyzBHxzNWqYmyuHgK8LG9Q83EM=
 github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
 github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
 github.com/ipfs/go-bitswap v0.11.0 h1:j1WVvhDX1yhG32NTC9xfxnqycqYIlhzEzLXG/cU1HyQ=