feat(p2p): enable wss support and add autotls check

config/config.yaml

@@ -399,6 +399,9 @@ checks:
       postage-depth: 21
       postage-label: test-label
     type: feed
+  autotls:
+    timeout: 5m
+    type: autotls
 
 # simulations defines simulations Beekeeper can execute against the cluster
 # type filed allows defining same simulation with different names and options

config/local.yaml

@@ -47,6 +47,38 @@ clusters:
         config: local-light
         count: 2
         mode: node
+  local-dns-autotls:
+    _inherit: "local"
+    node-groups:
+      bootnode:
+        mode: bootnode
+        bee-config: bootnode-local-dns-autotls
+        config: local
+        nodes:
+          - name: bootnode-0
+            bootnodes: /dns4/bootnode-0-headless.%s.svc.cluster.local/tcp/1634/p2p/QmaHzvd3iZduu275CMkMVZKwbsjXSyH3GJRj4UvFJApKcb
+            libp2p-key: '{"address":"28678fe31f09f722d53e77ca2395569f19959fa5","crypto":{"cipher":"aes-128-ctr","ciphertext":"0ff319684c4f8decf9c998047febe3417cfc45832b8bb62fd818183d54cf5d0183bfa021ed95addce3b33e83ce7ee73e926f00eea8241d96b349266a4d299829d3d22db0d536315b52b34db4a6778bfd3ce7631ad7256ea0bb9c50abea9de35d740b6fdc50caf929b1d19494690d9ed649105d02c14f5ec49d","cipherparams":{"iv":"4e9a50fb5852b5e61964f696be78066b"},"kdf":"scrypt","kdfparams":{"n":32768,"r":8,"p":1,"dklen":32,"salt":"4d513e81647e4150bb648ed8d2dda28d460802336bf24d620119eac66ae0c0c4"},"mac":"9ae71db96e5ddc1c214538d42082212bbbe53aeac09fcc3e3a8eff815648331e"},"version":3,"id":"ae3bc991-d89f-405a-9e6a-60e27347e22d"}'
+            swarm-key: '{"address":"f176839c150e52fe30e5c2b5c648465c6fdfa532","crypto":{"cipher":"aes-128-ctr","ciphertext":"352af096f0fca9dfbd20a6861bde43d988efe7f179e0a9ffd812a285fdcd63b9","cipherparams":{"iv":"613003f1f1bf93430c92629da33f8828"},"kdf":"scrypt","kdfparams":{"n":32768,"r":8,"p":1,"dklen":32,"salt":"ad1d99a4c64c95c26131e079e8c8a82221d58bf66a7ceb767c33a4c376c564b8"},"mac":"cafda1bc8ca0ffc2b22eb69afd1cf5072fd09412243443be1b0c6832f57924b6"},"version":3}'
+      bee:
+        bee-config: bee-local-autotls
+        config: local
+        count: 3
+        mode: node
+      bee-autotls:
+        bee-config: bee-local-autotls
+        config: local
+        count: 2
+        mode: node
+      light:
+        bee-config: bee-local-light-autotls
+        config: local
+        count: 2
+        mode: node
+      ultra-light:
+        bee-config: bee-local-ultralight-autotls
+        config: local
+        count: 1
+        mode: node
   local-gc:
     _inherit: "local"
     node-groups:
@@ -111,6 +143,9 @@ bee-configs:
     _inherit: ""
     allow-private-cidrs: true
     api-addr: ":1633"
+    autotls-ca-endpoint: "https://pebble:14000/dir"
+    autotls-domain: "local.test"
+    autotls-registration-endpoint: http://p2p-forge.local.svc.cluster.local:8080
     block-time: 1
     blockchain-rpc-endpoint: "ws://geth-swap:8546"
     bootnode-mode: false
@@ -126,9 +161,12 @@ bee-configs:
     full-node: true
     mainnet: false
     nat-addr: ""
+    nat-wss-addr: ""
     network-id: 0
     p2p-addr: ":1634"
+    p2p-wss-addr: ":1635"
     p2p-ws-enable: false
+    p2p-wss-enable: false
     password: "beekeeper"
     payment-early-percent: 50
     payment-threshold: 13500000
@@ -147,7 +185,22 @@ bee-configs:
     warmup-time: 0s
     welcome-message: "Welcome to the Swarm, this is a local cluster!"
     withdrawal-addresses-whitelist: "0xec44cb15b1b033e74d55ac5d0e24d861bde54532"
-
+  bootnode-local-dns-autotls:
+    _inherit: "bee-local-dns"
+    bootnode-mode: true
+    p2p-wss-enable: true
+  bee-local-autotls:
+    _inherit: "bee-local-dns"
+    bootnode: /dnsaddr/bootnode-0-headless.local.svc.cluster.local
+    p2p-wss-enable: true
+  bee-local-light-autotls:
+    _inherit: "bee-local-light"
+    p2p-wss-enable: true
+  bee-local-ultralight-autotls:
+    _inherit: "bee-local-dns"
+    full-node: false
+    p2p-wss-enable: true
+    blockchain-rpc-endpoint: # ultralight nodes don't connect to the blockchain
   bootnode-local:
     _inherit: "bee-local"
     bootnode-mode: true
@@ -392,3 +445,9 @@ checks:
       postage-depth: 21
       postage-label: test-label
     type: feed
+  ci-autotls:
+    timeout: 15m
+    type: autotls
+    options:
+      ultra-light-group: ultra-light
+      autotls-group: bee-autotls

go.mod

@@ -16,6 +16,7 @@ require (
 	github.com/go-git/go-git/v5 v5.16.5
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.1
+	github.com/multiformats/go-multiaddr v0.12.3
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/prometheus/client_golang v1.21.1
 	github.com/prometheus/common v0.62.0
@@ -95,7 +96,6 @@ require (
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/multiformats/go-base32 v0.1.0 // indirect
 	github.com/multiformats/go-base36 v0.2.0 // indirect
-	github.com/multiformats/go-multiaddr v0.12.3 // indirect
 	github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
 	github.com/multiformats/go-multibase v0.2.0 // indirect
 	github.com/multiformats/go-multicodec v0.9.0 // indirect

pkg/bee/api/node.go

@@ -122,6 +122,24 @@ func (n *NodeService) Peers(ctx context.Context) (resp Peers, err error) {
 	return resp, err
 }
 
+// ConnectResponse represents the response from the connect endpoint
+type ConnectResponse struct {
+	Address string `json:"address"`
+}
+
+// Connect connects to a peer using the provided multiaddress.
+// The multiaddr should be in the format: /ip4/x.x.x.x/tcp/port/...
+// Returns the overlay address of the connected peer.
+func (n *NodeService) Connect(ctx context.Context, multiaddr string) (resp ConnectResponse, err error) {
+	err = n.client.requestJSON(ctx, http.MethodPost, "/connect"+multiaddr, nil, &resp)
+	return resp, err
+}
+
+// Disconnect disconnects from a peer with the given overlay address.
+func (n *NodeService) Disconnect(ctx context.Context, overlay swarm.Address) error {
+	return n.client.requestJSON(ctx, http.MethodDelete, "/peers/"+overlay.String(), nil, nil)
+}
+
 // Readiness represents node's readiness
 type Readiness struct {
 	Status string `json:"status"`

pkg/bee/client.go

@@ -318,6 +318,30 @@ func (c *Client) Peers(ctx context.Context) (peers []swarm.Address, err error) {
 	return peers, err
 }
 
+// Connect connects to a peer using the provided multiaddress.
+// Returns the overlay address of the connected peer.
+func (c *Client) Connect(ctx context.Context, multiaddr string) (swarm.Address, error) {
+	resp, err := c.api.Node.Connect(ctx, multiaddr)
+	if err != nil {
+		return swarm.ZeroAddress, fmt.Errorf("connect to %s: %w", multiaddr, err)
+	}
+
+	addr, err := swarm.ParseHexAddress(resp.Address)
+	if err != nil {
+		return swarm.ZeroAddress, fmt.Errorf("parse overlay address %s: %w", resp.Address, err)
+	}
+
+	return addr, nil
+}
+
+// Disconnect disconnects from a peer with the given overlay address.
+func (c *Client) Disconnect(ctx context.Context, overlay swarm.Address) error {
+	if err := c.api.Node.Disconnect(ctx, overlay); err != nil {
+		return fmt.Errorf("disconnect from %s: %w", overlay, err)
+	}
+	return nil
+}
+
 // PinRootHash pins root hash of given reference.
 func (c *Client) PinRootHash(ctx context.Context, ref swarm.Address) error {
 	return c.api.Pinning.PinRootHash(ctx, ref)