whitespace diffs

Author: sukunrt

config/config.go

@@ -439,8 +439,6 @@ func (cfg *Config) newBasicHost(swrm *swarm.Swarm, eventBus event.Bus) (*bhost.B
 		DisableIdentifyAddressDiscovery: cfg.DisableIdentifyAddressDiscovery,
 		EnableAutoNATv2:                 cfg.EnableAutoNATv2,
 		AutoNATv2Dialer:                 autonatv2Dialer,
-		EnableAutoRelay:                 cfg.EnableAutoRelay,
-		AutoRelayOpts:                   cfg.AutoRelayOpts,
 	})
 	if err != nil {
 		return nil, err
@@ -544,6 +542,28 @@ func (cfg *Config) NewNode() (host.Host, error) {
 		)
 	}
 
+	// enable autorelay
+	fxopts = append(fxopts,
+		fx.Invoke(func(h *bhost.BasicHost, lifecycle fx.Lifecycle) error {
+			if cfg.EnableAutoRelay {
+				if !cfg.DisableMetrics {
+					mt := autorelay.WithMetricsTracer(
+						autorelay.NewMetricsTracer(autorelay.WithRegisterer(cfg.PrometheusRegisterer)))
+					mtOpts := []autorelay.Option{mt}
+					cfg.AutoRelayOpts = append(mtOpts, cfg.AutoRelayOpts...)
+				}
+
+				ar, err := autorelay.NewAutoRelay(h, cfg.AutoRelayOpts...)
+				if err != nil {
+					return err
+				}
+				lifecycle.Append(fx.StartStopHook(ar.Start, ar.Close))
+				return nil
+			}
+			return nil
+		}),
+	)
+
 	var bh *bhost.BasicHost
 	fxopts = append(fxopts, fx.Invoke(func(bho *bhost.BasicHost) { bh = bho }))
 	fxopts = append(fxopts, fx.Invoke(func(h *bhost.BasicHost, lifecycle fx.Lifecycle) {
@@ -558,10 +578,12 @@ func (cfg *Config) NewNode() (host.Host, error) {
 	fxopts = append(fxopts, cfg.UserFxOptions...)
 
 	app := fx.New(fxopts...)
-	if app.Err() != nil {
-		return nil, fmt.Errorf("failed to create host: %w", app.Err())
+	if err := app.Start(context.Background()); err != nil {
+		return nil, err
 	}
+
 	if err := cfg.addAutoNAT(bh); err != nil {
+		app.Stop(context.Background())
 		if cfg.Routing != nil {
 			rh.Close()
 		} else {
@@ -570,10 +592,6 @@ func (cfg *Config) NewNode() (host.Host, error) {
 		return nil, err
 	}
 
-	if err := app.Start(context.Background()); err != nil {
-		return nil, err
-	}
-
 	if cfg.Routing != nil {
 		return &closableRoutedHost{App: app, RoutedHost: rh}, nil
 	}

p2p/host/basic/address_service.go

@@ -219,7 +219,9 @@ func (a *addressManager) GetDirectAddrs() []ma.Multiaddr {
 	addrs = slices.Clone(a.addrsFactory(addrs))
 	// AllAddrs may ignore observed addresses in favour of NAT mappings.
 	// Use both for hole punching.
-	addrs = append(addrs, a.observedAddrsService.OwnObservedAddrs()...)
+	if a.observedAddrsService != nil {
+		addrs = append(addrs, a.observedAddrsService.OwnObservedAddrs()...)
+	}
 	addrs = ma.Unique(addrs)
 	return slices.DeleteFunc(addrs, func(a ma.Multiaddr) bool { return !manet.IsPublicAddr(a) })
 }
@@ -338,6 +340,9 @@ func (a *addressManager) appendNATAddrs(dst []ma.Multiaddr, listenAddrs []ma.Mul
 }
 
 func (a *addressManager) appendObservedAddrs(dst []ma.Multiaddr, listenAddr ma.Multiaddr, ifaceAddrs []ma.Multiaddr) []ma.Multiaddr {
+	if a.observedAddrsService == nil {
+		return dst
+	}
 	// Add it for the listenAddr first.
 	// listenAddr maybe unspecified. That's okay as connections on UDP transports
 	// will have the unspecified address as the local address.
@@ -369,10 +374,6 @@ func (a *addressManager) addCertHashes(addrs []ma.Multiaddr) []ma.Multiaddr {
 	// but that is only convenient if we're using the same port for listening on
 	// all transports which share the same thinwaist protocol. If you listen
 	// on 4001 for tcp, and 4002 for websocket, then it's a terrible API.
-	type transportForListeninger interface {
-		TransportForListening(a ma.Multiaddr) transport.Transport
-	}
-
 	type addCertHasher interface {
 		AddCertHashes(m ma.Multiaddr) (ma.Multiaddr, bool)
 	}