exclude tcp and tcpreuse from JS as well

v1rtl · v1rtl · commit 4b161b31594b · 2025-05-10T21:33:42.000+03:00
diff --git a/config/config_js.go b/config/config_js.go
@@ -33,7 +33,6 @@ import (
 	relayv2 "github.com/libp2p/go-libp2p/p2p/protocol/circuitv2/relay"
 	"github.com/libp2p/go-libp2p/p2p/protocol/holepunch"
 	"github.com/libp2p/go-libp2p/p2p/protocol/identify"
-	"github.com/libp2p/go-libp2p/p2p/transport/tcpreuse"
 	ma "github.com/multiformats/go-multiaddr"
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/fx"
@@ -125,12 +124,6 @@ func (cfg *Config) addTransports() ([]fx.Option, error) {
 		fx.Provide(func() connmgr.ConnectionGater { return cfg.ConnectionGater }),
 		fx.Provide(func() pnet.PSK { return cfg.PSK }),
 		fx.Provide(func() network.ResourceManager { return cfg.ResourceManager }),
-		fx.Provide(func(upgrader transport.Upgrader) *tcpreuse.ConnMgr {
-			if !cfg.ShareTCPListener {
-				return nil
-			}
-			return tcpreuse.NewConnMgr(tcpreuse.EnvReuseportVal, upgrader)
-		}),
 	}
 	fxopts = append(fxopts, cfg.Transports...)
 	if cfg.Insecure {
diff --git a/p2p/net/swarm/peers_test.go b/p2p/net/swarm/peers_test.go
@@ -1,3 +1,6 @@
+//go:build !js
+// +build !js
+
 package swarm_test
 
 import (
diff --git a/p2p/transport/tcp/metrics.go b/p2p/transport/tcp/metrics.go
@@ -1,4 +1,4 @@
-//go:build !windows && !riscv64 && !loong64
+//go:build !js && !windows && !riscv64 && !loong64
 
 package tcp
 
diff --git a/p2p/transport/tcp/metrics_general.go b/p2p/transport/tcp/metrics_general.go
@@ -1,4 +1,4 @@
-//go:build !linux && !darwin && !windows && !riscv64 && !loong64
+//go:build !linux && !darwin && !windows && !riscv64 && !loong64 && !js
 
 package tcp
 
diff --git a/p2p/transport/tcp/metrics_none.go b/p2p/transport/tcp/metrics_none.go
@@ -1,6 +1,6 @@
 // riscv64 see: https://github.com/marten-seemann/tcp/pull/1
 
-//go:build windows || riscv64 || loong64
+//go:build windows || riscv64 || loong64 || js
 
 package tcp
 
diff --git a/p2p/transport/tcp/metrics_test.go b/p2p/transport/tcp/metrics_test.go
@@ -1,3 +1,6 @@
+//go:build !js
+// +build !js
+
 package tcp
 
 import (
diff --git a/p2p/transport/tcp/tcp.go b/p2p/transport/tcp/tcp.go
@@ -1,3 +1,6 @@
+//go:build !js
+// +build !js
+
 package tcp
 
 import (
diff --git a/p2p/transport/tcp/tcp_test.go b/p2p/transport/tcp/tcp_test.go
@@ -1,3 +1,6 @@
+//go:build !js
+// +build !js
+
 package tcp
 
 import (
diff --git a/p2p/transport/tcpreuse/connwithscope.go b/p2p/transport/tcpreuse/connwithscope.go
@@ -1,3 +1,6 @@
+//go:build !js
+// +build !js
+
 package tcpreuse
 
 import (
diff --git a/p2p/transport/tcpreuse/demultiplex.go b/p2p/transport/tcpreuse/demultiplex.go
@@ -1,3 +1,6 @@
+//go:build !js
+// +build !js
+
 package tcpreuse
 
 import (
diff --git a/p2p/transport/tcpreuse/demultiplex_test.go b/p2p/transport/tcpreuse/demultiplex_test.go
@@ -1,3 +1,6 @@
+//go:build !js
+// +build !js
+
 package tcpreuse
 
 import "testing"
diff --git a/p2p/transport/tcpreuse/dialer.go b/p2p/transport/tcpreuse/dialer.go
@@ -1,3 +1,6 @@
+//go:build !js
+// +build !js
+
 package tcpreuse
 
 import (
diff --git a/p2p/transport/tcpreuse/internal/sampledconn/sampledconn.go b/p2p/transport/tcpreuse/internal/sampledconn/sampledconn.go
@@ -1,3 +1,6 @@
+//go:build !js
+// +build !js
+
 package sampledconn
 
 import (
diff --git a/p2p/transport/tcpreuse/internal/sampledconn/sampledconn_test.go b/p2p/transport/tcpreuse/internal/sampledconn/sampledconn_test.go
@@ -1,3 +1,6 @@
+//go:build !js
+// +build !js
+
 package sampledconn
 
 import (
diff --git a/p2p/transport/tcpreuse/listener.go b/p2p/transport/tcpreuse/listener.go
@@ -1,3 +1,6 @@
+//go:build !js
+// +build !js
+
 package tcpreuse
 
 import (
diff --git a/p2p/transport/tcpreuse/listener_test.go b/p2p/transport/tcpreuse/listener_test.go
@@ -1,3 +1,6 @@
+//go:build !js
+// +build !js
+
 package tcpreuse
 
 import (
diff --git a/p2p/transport/tcpreuse/reuseport.go b/p2p/transport/tcpreuse/reuseport.go
@@ -1,3 +1,6 @@
+//go:build !js
+// +build !js
+
 package tcpreuse
 
 import (

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:build !windows && !riscv64 && !loong64`
	`1`	`+//go:build !js && !windows && !riscv64 && !loong64`
`2`	`2`
`3`	`3`	`package tcp`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:build !linux && !darwin && !windows && !riscv64 && !loong64`
	`1`	`+//go:build !linux && !darwin && !windows && !riscv64 && !loong64 && !js`
`2`	`2`
`3`	`3`	`package tcp`
`4`	`4`