remoe autonat from wasm build

Author: v1rtl

pkg/p2p/libp2p/libp2p.go

@@ -842,3 +842,32 @@ func (s *Service) newStreamForPeerID(ctx context.Context, peerID libp2ppeer.ID,
 	s.metrics.CreatedStreamCount.Inc()
 	return st, nil
 }
+
+func (s *Service) Close() error {
+	if err := s.libp2pPeerstore.Close(); err != nil {
+		return err
+	}
+	if s.natManager != nil {
+		if err := s.natManager.Close(); err != nil {
+			return err
+		}
+	}
+	if err := s.autonatDialer.Close(); err != nil {
+		return err
+	}
+	if err := s.pingDialer.Close(); err != nil {
+		return err
+	}
+	if s.reacher != nil {
+		if err := s.reacher.Close(); err != nil {
+			return err
+		}
+	}
+	if s.autoNAT != nil {
+		if err := s.autoNAT.Close(); err != nil {
+			return err
+		}
+	}
+
+	return s.host.Close()
+}

pkg/p2p/libp2p/libp2p_js.go

@@ -31,7 +31,6 @@ import (
 	libp2ppeer "github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/peerstore"
 	"github.com/libp2p/go-libp2p/core/protocol"
-	"github.com/libp2p/go-libp2p/p2p/host/autonat"
 	basichost "github.com/libp2p/go-libp2p/p2p/host/basic"
 	"github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem"
 	rcmgr "github.com/libp2p/go-libp2p/p2p/host/resource-manager"
@@ -49,7 +48,6 @@ type Service struct {
 	host              host.Host
 	natManager        basichost.NATManager
 	natAddrResolver   *staticAddressResolver
-	autonatDialer     host.Host
 	pingDialer        host.Host
 	libp2pPeerstore   peerstore.Peerstore
 	networkID         uint64
@@ -70,7 +68,6 @@ type Service struct {
 	reacher           p2p.Reacher
 	networkStatus     atomic.Int32
 	HeadersRWTimeout  time.Duration
-	autoNAT           autonat.AutoNAT
 }
 
 type Options struct {
@@ -162,13 +159,6 @@ func New(ctx context.Context, signer beecrypto.Signer, networkID uint64, overlay
 		return nil, err
 	}
 
-	// Support same non default security and transport options as
-	// original host.
-	dialer, err := o.hostFactory(append(transports, security)...)
-	if err != nil {
-		return nil, err
-	}
-
 	if o.HeadersRWTimeout == 0 {
 		o.HeadersRWTimeout = defaultHeadersRWTimeout
 	}
@@ -208,7 +198,6 @@ func New(ctx context.Context, signer beecrypto.Signer, networkID uint64, overlay
 		host:              h,
 		natManager:        nil,
 		natAddrResolver:   natAddrResolver,
-		autonatDialer:     dialer,
 		pingDialer:        pingDialer,
 		handshakeService:  handshakeService,
 		libp2pPeerstore:   libp2pPeerstore,
@@ -223,7 +212,6 @@ func New(ctx context.Context, signer beecrypto.Signer, networkID uint64, overlay
 		halt:              make(chan struct{}),
 		lightNodes:        lightNodes,
 		HeadersRWTimeout:  o.HeadersRWTimeout,
-		autoNAT:           nil,
 	}
 
 	peerRegistry.setDisconnecter(s)
@@ -726,3 +714,25 @@ func (s *Service) newStreamForPeerID(ctx context.Context, peerID libp2ppeer.ID,
 	}
 	return st, nil
 }
+
+func (s *Service) Close() error {
+	if err := s.libp2pPeerstore.Close(); err != nil {
+		return err
+	}
+	if s.natManager != nil {
+		if err := s.natManager.Close(); err != nil {
+			return err
+		}
+	}
+
+	if err := s.pingDialer.Close(); err != nil {
+		return err
+	}
+	if s.reacher != nil {
+		if err := s.reacher.Close(); err != nil {
+			return err
+		}
+	}
+
+	return s.host.Close()
+}

pkg/p2p/libp2p/libp2p_shared.go

@@ -181,35 +181,6 @@ func (s *Service) BlocklistedPeers() ([]p2p.BlockListedPeer, error) {
 	return s.blocklist.Peers()
 }
 
-func (s *Service) Close() error {
-	if err := s.libp2pPeerstore.Close(); err != nil {
-		return err
-	}
-	if s.natManager != nil {
-		if err := s.natManager.Close(); err != nil {
-			return err
-		}
-	}
-	if err := s.autonatDialer.Close(); err != nil {
-		return err
-	}
-	if err := s.pingDialer.Close(); err != nil {
-		return err
-	}
-	if s.reacher != nil {
-		if err := s.reacher.Close(); err != nil {
-			return err
-		}
-	}
-	if s.autoNAT != nil {
-		if err := s.autoNAT.Close(); err != nil {
-			return err
-		}
-	}
-
-	return s.host.Close()
-}
-
 // SetWelcomeMessage sets the welcome message for the handshake protocol.
 func (s *Service) SetWelcomeMessage(val string) error {
 	return s.handshakeService.SetWelcomeMessage(val)