Hardcode hungryserv URL

README.md

@@ -126,8 +126,8 @@ used with the `--type` flag.
      received events to the bridge via HTTP. Since the HTTP requests are all on
      localhost, you don't need port forwarding or TLS certificates.
 
-Note that the homeserver URL may change if you're moved to a different cluster.
-In general, that shouldn't happen, but it's not impossible.
+Note that the homeserver URL is not guaranteed to be stable forever, it has
+changed in the past, and it may change again in the future.
 
 You can use `--json` with `register` to get the whole response as JSON instead
 of registration YAML and pretty-printed extra details. This may be useful if

api/hungryapi/appservice.go

@@ -3,6 +3,7 @@ package hungryapi
 import (
 	"context"
 	"net/http"
+	"net/url"
 	"time"
 
 	"go.mau.fi/util/jsontime"
@@ -16,8 +17,13 @@ type Client struct {
 	Username string
 }
 
-func NewClient(baseDomain, homeserverURL, username, accessToken string) *Client {
-	client, err := mautrix.NewClient(homeserverURL, id.NewUserID(username, baseDomain), accessToken)
+func NewClient(baseDomain, username, accessToken string) *Client {
+	hungryURL := url.URL{
+		Scheme: "https",
+		Host:   "matrix." + baseDomain,
+		Path:   "/_hungryserv/" + username,
+	}
+	client, err := mautrix.NewClient(hungryURL.String(), id.NewUserID(username, baseDomain), accessToken)
 	if err != nil {
 		panic(err)
 	}

cmd/bbctl/authconfig.go

@@ -27,7 +27,6 @@ type EnvConfig struct {
 	ClusterID     string `json:"cluster_id"`
 	Username      string `json:"username"`
 	AccessToken   string `json:"access_token"`
-	HungryAddress string `json:"hungry_address"`
 	BridgeDataDir string `json:"bridge_data_dir"`
 	DatabaseDir   string `json:"database_dir,omitempty"`
 }

cmd/bbctl/context.go

@@ -1,10 +1,6 @@
 package main
 
 import (
-	"fmt"
-	"os"
-
-	"github.com/fatih/color"
 	"github.com/urfave/cli/v2"
 	"maunium.net/go/mautrix"
 
@@ -43,14 +39,3 @@ func GetHungryClient(ctx *cli.Context) *hungryapi.Client {
 	}
 	return val.(*hungryapi.Client)
 }
-
-func SaveHungryURL(ctx *cli.Context, newURL string) {
-	env := GetEnvConfig(ctx)
-	if env.HungryAddress != newURL && newURL != "" {
-		env.HungryAddress = newURL
-		err := GetConfig(ctx).Save()
-		if err != nil {
-			_, _ = fmt.Fprintln(os.Stderr, color.RedString("Failed to save config: "+err.Error()))
-		}
-	}
-}

cmd/bbctl/login-email.go

@@ -90,7 +90,6 @@ func doMatrixLogin(ctx *cli.Context, req *mautrix.ReqLogin, whoami *beeperapi.Re
 	envCfg := GetEnvConfig(ctx)
 	envCfg.ClusterID = whoami.UserInfo.BridgeClusterID
 	envCfg.Username = whoami.UserInfo.Username
-	envCfg.HungryAddress = whoami.UserInfo.HungryURL
 	envCfg.AccessToken = resp.AccessToken
 	envCfg.BridgeDataDir = filepath.Join(UserDataDir, "bbctl", ctx.String("env"))
 	err = cfg.Save()

cmd/bbctl/main.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"
 	"path"
-	"strings"
 	"time"
 
 	"github.com/fatih/color"
@@ -83,16 +82,15 @@ func prepareApp(ctx *cli.Context) error {
 	ctx.Context = context.WithValue(ctx.Context, contextKeyConfig, cfg)
 	ctx.Context = context.WithValue(ctx.Context, contextKeyEnvConfig, envConfig)
 	if envConfig.HasCredentials() {
-		if envConfig.HungryAddress == "" || envConfig.ClusterID == "" || envConfig.Username == "" || !strings.Contains(envConfig.HungryAddress, "/_hungryserv") {
+		if envConfig.Username == "" {
 			log.Printf("Fetching whoami to fill missing env config details")
 			_, err = getCachedWhoami(ctx)
 			if err != nil {
 				return fmt.Errorf("failed to get whoami: %w", err)
 			}
 		}
-		homeserver := ctx.String("homeserver")
 		ctx.Context = context.WithValue(ctx.Context, contextKeyMatrixClient, NewMatrixAPI(homeserver, envConfig.Username, envConfig.AccessToken))
-		ctx.Context = context.WithValue(ctx.Context, contextKeyHungryClient, hungryapi.NewClient(homeserver, envConfig.HungryAddress, envConfig.Username, envConfig.AccessToken))
+		ctx.Context = context.WithValue(ctx.Context, contextKeyHungryClient, hungryapi.NewClient(homeserver, envConfig.Username, envConfig.AccessToken))
 	}
 	return nil
 }

cmd/bbctl/proxy.go

@@ -188,7 +188,7 @@ func prepareAppserviceWebsocketProxy(ctx *cli.Context, as *appservice.AppService
 		}
 		return proxyWebsocketRequest(parsedURL, cmd)
 	})
-	_ = as.SetHomeserverURL(GetEnvConfig(ctx).HungryAddress)
+	_ = as.SetHomeserverURL(GetHungryClient(ctx).HomeserverURL.String())
 }
 
 type wsPingData struct {

cmd/bbctl/whoami.go

@@ -3,7 +3,6 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"net/url"
 	"regexp"
 	"sort"
 	"strings"
@@ -172,15 +171,6 @@ func getCachedWhoami(ctx *cli.Context) (*beeperapi.RespWhoami, error) {
 		ec.ClusterID = resp.UserInfo.BridgeClusterID
 		changed = true
 	}
-	publicHungryURL := url.URL{
-		Scheme: "https",
-		Host:   "matrix." + ctx.String("homeserver"),
-		Path:   "/_hungryserv/" + resp.UserInfo.Username,
-	}
-	if ec.HungryAddress != publicHungryURL.String() {
-		ec.HungryAddress = publicHungryURL.String()
-		changed = true
-	}
 	if changed {
 		err = GetConfig(ctx).Save()
 		if err != nil {