Go Peer Updates

go-peer/flag.go

@@ -0,0 +1,16 @@
+package main
+
+// Things to do with flags should try to live here
+
+import "strings"
+
+type stringSlice []string
+
+func (s *stringSlice) String() string {
+    return strings.Join(*s, ", ")
+}
+
+func (s *stringSlice) Set(value string) error {
+    *s = append(*s, value)
+    return nil
+}

go-peer/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"crypto/tls"
 	"flag"
 	"fmt"
 	"io/ioutil"
@@ -20,7 +21,9 @@ import (
 	"github.com/libp2p/go-libp2p/p2p/discovery/routing"
 	discovery "github.com/libp2p/go-libp2p/p2p/discovery/util"
 	quicTransport "github.com/libp2p/go-libp2p/p2p/transport/quic"
+	tcpTransport "github.com/libp2p/go-libp2p/p2p/transport/tcp"
 	webtransport "github.com/libp2p/go-libp2p/p2p/transport/webtransport"
+	ws "github.com/libp2p/go-libp2p/p2p/transport/websocket"
 	"github.com/multiformats/go-multiaddr"
 )
 
@@ -120,7 +123,16 @@ func main() {
 	nickFlag := flag.String("nick", "", "nickname to use in chat. will be generated if empty")
 	roomFlag := flag.String("room", "universal-connectivity", "name of chat room to join")
 	idPath := flag.String("identity", "identity.key", "path to the private key (PeerID) file")
+	certPath := flag.String("tls-cert-path", "", "path to the tls cert file (for websockets)")
+	keyPath := flag.String("tls-key-path", "", "path to the tls key file (for websockets")
 	useLogger := flag.Bool("logger", false, "write logs to file")
+
+	var addrsToConnectTo stringSlice
+	flag.Var(&addrsToConnectTo, "connect", "address to connect to (can be used multiple times)")
+
+	var announceAddrs stringSlice
+	flag.Var(&announceAddrs, "announce", "address to announce (can be used multiple times)")
+
 	flag.Parse()
 
 	if *useLogger {
@@ -144,13 +156,45 @@ func main() {
 		panic(err)
 	}
 
-	// create a new libp2p Host that listens on a random TCP port
-	h, err := libp2p.New(
+	// TLS stuff
+	var opts []libp2p.Option
+
+	if *certPath != "" && *keyPath != "" {
+		certs := make([]tls.Certificate, 1)
+		certs[0], err = tls.LoadX509KeyPair(*certPath, *keyPath)
+		if err != nil {
+			panic(err)
+		}
+
+		opts = append(opts,
+			libp2p.Transport(ws.New, ws.WithTLSConfig(&tls.Config{Certificates: certs})),
+			libp2p.ListenAddrStrings("/ip4/0.0.0.0/tcp/0/ws", "/ip6/::/tcp/0/ws"),
+		)
+	}
+
+	if len(announceAddrs) > 0 {
+		var announce []multiaddr.Multiaddr
+		for _, addr := range announceAddrs {
+			announce = append(announce, multiaddr.StringCast(addr))
+		}
+		opts = append(opts, libp2p.AddrsFactory(func([]multiaddr.Multiaddr) []multiaddr.Multiaddr {
+			return announce
+		}))
+	}
+
+	opts = append(opts,
 		libp2p.Identity(privk),
 		libp2p.Transport(quicTransport.NewTransport),
+		libp2p.Transport(tcpTransport.NewTCPTransport),
 		libp2p.Transport(webtransport.New),
-		libp2p.ListenAddrStrings("/ip4/0.0.0.0/udp/0/quic-v1", "/ip4/0.0.0.0/udp/0/quic-v1/webtransport", "/ip6/::/udp/0/quic-v1", "/ip6/::/udp/0/quic-v1/webtransport"),
+		libp2p.ListenAddrStrings("/ip4/0.0.0.0/udp/0/quic-v1", "/ip4/0.0.0.0/udp/0/quic-v1/webtransport", "/ip6/::/udp/0/quic-v1", "/ip6/::/udp/0/quic-v1/webtransport",
+			"/ip4/0.0.0.0/udp/0/quic", "/ip6/::/udp/0/quic",
+			"/ip4/0.0.0.0/tcp/0", "/ip6/::/tcp/0",
+		),
 	)
+
+	// create a new libp2p Host with lots of options
+	h, err := libp2p.New(opts...)
 	if err != nil {
 		panic(err)
 	}
@@ -180,8 +224,7 @@ func main() {
 	// setup DHT with empty discovery peers
 	// so this will be a discovery peer for others
 	// this peer should run on cloud(with public ip address)
-	discoveryPeers := dht.DefaultBootstrapPeers
-	dht, err := NewDHT(ctx, h, discoveryPeers)
+	dht, err := NewDHT(ctx, h, nil)
 	if err != nil {
 		panic(err)
 	}
@@ -194,16 +237,22 @@ func main() {
 		panic(err)
 	}
 
-	// addrInfo, err := peer.AddrInfoFromString("/dns4/universal.thedisco.zone/udp/40218/quic-v1/webtransport/certhash/uEiCL77ktMDMDCWnb7swiiR-aE7h2e_d_pPFg1c4gWF0Z8g/certhash/uEiACZMdNmhIYS1lmYY5Jd0Na6udCbl8Dar0KJlxkT94eFg/p2p/12D3KooWAUy4xNnyZwakzhF4vbTzBp4jHXmt4FwHd5tggjr8vRJM")
-	/*addrInfo, err := peer.AddrInfoFromString("/dns4/universal.thedisco.zone/udp/45127/quic-v1/p2p/12D3KooWAUy4xNnyZwakzhF4vbTzBp4jHXmt4FwHd5tggjr8vRJM")
+	if len(addrsToConnectTo) > 0 {
+		for _, addr := range addrsToConnectTo {
+			// convert to a peer.AddrInfo struct
+			peerinfo, err := peer.AddrInfoFromString(addr)
+			if err != nil {
+				LogMsgf("Failed to parse multiaddr: %s", err.Error())
+				continue
+			}
 
-	if err != nil {
-		panic(err)
+			// connect to the peer
+			if err := h.Connect(ctx, *peerinfo); err != nil {
+				LogMsgf("Failed to connect to peer: %s", err.Error())
+				continue
+			}
+		}
 	}
-	err = h.Connect(ctx, *addrInfo)
-	if err != nil {
-		panic(err)
-	}*/
 
 	LogMsgf("PeerID: %s", h.ID().String())
 	for _, addr := range h.Addrs() {