Merge pull request #38 from Aptimex/main

More robust status command

src/api/api.go

@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"net/netip"
 	"strings"
+	"time"
 
 	"wiretap/peer"
 	serverapi "wiretap/transport/api"
@@ -27,7 +28,7 @@ type request struct {
 
 // MakeRequest attempts to send an API query to the Wiretap server.
 func makeRequest(req request) ([]byte, error) {
-	client := &http.Client{}
+	client := &http.Client{Timeout: 3 * time.Second}
 	reqBody := bytes.NewBuffer(req.Body)
 
 	r, err := http.NewRequest(req.Method, req.URL, reqBody)

src/cmd/status.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/netip"
 	"strings"
+	"log"
 
 	"github.com/fatih/color"
 	"github.com/m1gwings/treedrawer/tree"
@@ -77,11 +78,15 @@ func (c statusCmdConfig) Run() {
 	e2ee_peer_list := clientConfigE2EE.GetPeers()
 	for _, ep := range e2ee_peer_list {
 		relayConfig, e2eeConfig, err := api.ServerInfo(netip.AddrPortFrom(ep.GetApiAddr(), uint16(ApiPort)))
-		check("failed to fetch node's configuration as peer", err)
-		nodes[relayConfig.GetPublicKey()] = Node{
-			peerConfig:  ep,
-			relayConfig: relayConfig,
-			e2eeConfig:  e2eeConfig,
+		if err != nil {
+			message := "failed to fetch node's configuration as peer"
+			log.Printf("%s: %v", message, err)
+		} else {
+			nodes[relayConfig.GetPublicKey()] = Node{
+				peerConfig:  ep,
+				relayConfig: relayConfig,
+				e2eeConfig:  e2eeConfig,
+			}
 		}
 	}