feat: force reachability (#778)

cmd/waku/flags.go

@@ -177,13 +177,13 @@ var (
 		Destination: &options.CircuitRelay,
 		EnvVars:     []string{"WAKUNODE2_CIRCUIT_RELAY"},
 	})
-	ForceUnreachable = altsrc.NewBoolFlag(&cli.BoolFlag{
+	ForceReachability = altsrc.NewStringFlag(&cli.StringFlag{
-		Name:        "unreachable",
+		Name:        "force-reachability",
-		Usage:       "Force the node to be unreachable. WARNING: This flag is created for testing circuit relay and is not meant to be used in production",
+		Usage:       "Force the node reachability. WARNING: This flag is created for testing circuit relay and is not meant to be used in production. Use 'public' or 'private'",
-		Value:       false,
+		Value:       "",
 		Hidden:      true,
-		Destination: &options.ForceUnreachable,
+		Destination: &options.ForceReachability,
-		EnvVars:     []string{"WAKUNODE2_UNREACHABLE"},
+		EnvVars:     []string{"WAKUNODE2_REACHABILITY"},
 	})
 	ResourceScalingMemoryPercent = altsrc.NewFloat64Flag(&cli.Float64Flag{
 		Name:        "resource-scaling-memory-percentage",

cmd/waku/main.go

@@ -42,7 +42,7 @@ func main() {
 		ExtMultiaddresses,
 		ShowAddresses,
 		CircuitRelay,
-		ForceUnreachable,
+		ForceReachability,
 		ResourceScalingMemoryPercent,
 		ResourceScalingFDPercent,
 		LogLevel,

cmd/waku/node.go

@@ -170,10 +170,18 @@ func Execute(options NodeOptions) {
 		libp2pOpts = append(libp2pOpts, libp2p.EnableRelayService())
 	}
 
-	if options.ForceUnreachable {
+	if options.ForceReachability != "" {
-		logger.Warn("node forced to be unreachable!")
+		libp2pOpts = append(libp2pOpts, libp2p.EnableRelay())
-		libp2pOpts = append(libp2pOpts, libp2p.EnableRelay(), libp2p.ForceReachabilityPrivate())
 		nodeOpts = append(nodeOpts, node.WithCircuitRelayParams(2*time.Second, 2*time.Second))
+		if options.ForceReachability == "private" {
+			logger.Warn("node forced to be unreachable!")
+			libp2pOpts = append(libp2pOpts, libp2p.ForceReachabilityPrivate())
+		} else if options.ForceReachability == "public" {
+			logger.Warn("node forced to be publicly reachable!")
+			libp2pOpts = append(libp2pOpts, libp2p.ForceReachabilityPublic())
+		} else {
+			failOnErr(errors.New("invalid reachability value"), "Reachability")
+		}
 	}
 
 	if options.UserAgent != "" {

cmd/waku/options.go

@@ -157,7 +157,7 @@ type NodeOptions struct {
 	AdvertiseAddresses           []multiaddr.Multiaddr
 	ShowAddresses                bool
 	CircuitRelay                 bool
-	ForceUnreachable             bool
+	ForceReachability            string
 	ResourceScalingMemoryPercent float64
 	ResourceScalingFDPercent     float64
 	LogLevel                     string