Merge pull request #27 from git-remote-gitopia/implement-fallback-provider

Author: gitopia1c2zfrmhra3spfrc2m5ft64hef30guf60lvtcm3

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes will be documented here.
 
+## [v2.1.1] - 2025-09-16
+
+- use fallback provider address when all providers are jailed
+
 ## [v2.1.0] - 2025-09-12
 
 - don't attempt to push if there is already a pending packfile update proposal

config/config.go

@@ -7,17 +7,18 @@ import (
 )
 
 const (
-	AppName                          = "git-remote-gitopia"
-	GitopiaConfigSection             = "gitopia"
-	GitopiaConfigChainIdOption       = "chainId"
-	GitopiaConfigGRPCHostOption      = "grpcHost"
-	GitopiaConfigTmAddrOption        = "tmAddr"
-	GitopiaConfigGitServerHostOption = "gitServerHost"
-	GitopiaConfigKeyOption           = "key"
-	GitopiaConfigBackendOption       = "backend"
-	GitopiaConfigGasPricesOption     = "gasPrices"
-	GitopiaConfigFeeGranterOption    = "feeGranter"
-	GitopiaConfigDenomOption         = "denom"
+	AppName                             = "git-remote-gitopia"
+	GitopiaConfigSection                = "gitopia"
+	GitopiaConfigChainIdOption          = "chainId"
+	GitopiaConfigGRPCHostOption         = "grpcHost"
+	GitopiaConfigTmAddrOption           = "tmAddr"
+	GitopiaConfigGitServerHostOption    = "gitServerHost"
+	GitopiaConfigKeyOption              = "key"
+	GitopiaConfigBackendOption          = "backend"
+	GitopiaConfigGasPricesOption        = "gasPrices"
+	GitopiaConfigFeeGranterOption       = "feeGranter"
+	GitopiaConfigDenomOption            = "denom"
+	GitopiaConfigFallbackProviderOption = "fallbackProvider"
 )
 
 func GitConfigGet(key string) (string, error) {
@@ -45,5 +46,8 @@ func LoadGitConfig() error {
 	if res, err := GitConfigGet(GitopiaConfigDenomOption); err == nil {
 		Denom = res
 	}
+	if res, err := GitConfigGet(GitopiaConfigFallbackProviderOption); err == nil {
+		FallbackProvider = res
+	}
 	return nil
 }

config/config_dev.go

@@ -3,8 +3,9 @@
 package config
 
 var (
-	ChainId        = "gitopia"
-	GasPrices      = "0.001ulore"
-	FeeGranterAddr = ""
-	Denom          = "ulore"
+	ChainId          = "gitopia"
+	GasPrices        = "0.001ulore"
+	FeeGranterAddr   = ""
+	Denom            = "ulore"
+	FallbackProvider = ""
 )

config/config_prod.go

@@ -3,8 +3,9 @@
 package config
 
 var (
-	ChainId        = "gitopia"
-	GasPrices      = "0.001ulore"
-	FeeGranterAddr = "gitopia13ashgc6j5xle4m47kqyn5psavq0u3klmscfxql"
-	Denom          = "ulore"
+	ChainId          = "gitopia"
+	GasPrices        = "0.001ulore"
+	FeeGranterAddr   = "gitopia13ashgc6j5xle4m47kqyn5psavq0u3klmscfxql"
+	Denom            = "ulore"
+	FallbackProvider = "gitopia15nv5vf6fmww8cxr6emrzxjvj36x5n8xvsxsqpw"
 )

config/config_testing.go

@@ -3,8 +3,9 @@
 package config
 
 var (
-	ChainId        = "localgitopia"
-	GasPrices      = "0.001ulore"
-	FeeGranterAddr = "gitopia12sjhqc3rqgvu3zpg8ekmwl005rp4ys58ekqg89"
-	Denom          = "ulore"
+	ChainId          = "localgitopia"
+	GasPrices        = "0.001ulore"
+	FeeGranterAddr   = "gitopia12sjhqc3rqgvu3zpg8ekmwl005rp4ys58ekqg89"
+	Denom            = "ulore"
+	FallbackProvider = ""
 )

core/api/gitserver.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/gitopia/git-remote-gitopia/config"
 	"github.com/gitopia/git-remote-gitopia/core"
 )
 
@@ -29,7 +30,8 @@ func checkHttpHostLatency(host string) time.Duration {
 func GetBestGitServerHost(grpcHost string) string {
 	providers := GetActiveStorageProviders(grpcHost)
 	if len(providers) == 0 {
-		return ""
+		// No active providers found, use fallback provider if configured
+		return GetFallbackProviderHost(grpcHost)
 	}
 
 	var bestHost string
@@ -46,6 +48,17 @@ func GetBestGitServerHost(grpcHost string) string {
 	return bestHost
 }
 
+// GetFallbackProviderHost queries for the fallback provider's API URL using the given gRPC host
+func GetFallbackProviderHost(grpcHost string) string {
+	if config.FallbackProvider != "" {
+		provider := GetStorageProvider(grpcHost, config.FallbackProvider)
+		if provider.ApiUrl != "" {
+			return provider.ApiUrl
+		}
+	}
+	return ""
+}
+
 func SetConfiguredGitServerHost(host string) error {
 	cmd := core.GitCommand("git", "config", "--global", "gitopia.gitServerHost", host)
 	return cmd.Run()

core/api/grpc.go

@@ -66,3 +66,20 @@ func GetActiveStorageProviders(host string) []storagetypes.Provider {
 	}
 	return res.Providers
 }
+
+func GetStorageProvider(host, address string) storagetypes.Provider {
+	conn, err := grpc.Dial(host, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	if err != nil {
+		return storagetypes.Provider{}
+	}
+	defer conn.Close()
+
+	client := storagetypes.NewQueryClient(conn)
+	res, err := client.Provider(context.Background(), &storagetypes.QueryProviderRequest{
+		Address: address,
+	})
+	if err != nil {
+		return storagetypes.Provider{}
+	}
+	return res.Provider
+}