Keeping connected to peerbook

Author: daonb

CHANGELOG.md

@@ -15,7 +15,8 @@ Known issues:
 
 ### Fixed
 
-- removing a hidden loop taht cause webexec to hang
+- forever trying to reconnect to peerbook
+- removing a hidden loop that could cause webexec to hang
 
 
 ## [0.10.5] - 2021-4-25

conf.go

@@ -33,6 +33,7 @@ disconnect = 3000
 failed = 6000
 keep_alive = 500
 ice_gathering = 5000
+peerbook = 3000
 [env]
 COLORTERM = "truecolor"
 TERM = "xterm"
@@ -48,6 +49,7 @@ var Conf struct {
 	failedTimeout     time.Duration
 	keepAliveInterval time.Duration
 	gatheringTimeout  time.Duration
+	peerbookTimeout   time.Duration
 	iceServers        []string
 	httpServer        string
 	logFilePath       string
@@ -108,6 +110,12 @@ func parseConf(s string) error {
 	} else {
 		Conf.gatheringTimeout = 3 * time.Second
 	}
+	v = t.Get("timeouts.peerbook")
+	if v != nil {
+		Conf.peerbookTimeout = time.Duration(v.(int64)) * time.Millisecond
+	} else {
+		Conf.peerbookTimeout = 3 * time.Second
+	}
 	v = t.Get("net.ice_servers")
 	if v != nil {
 		urls := v.([]interface{})

docs/conf.md

@@ -29,6 +29,7 @@ All values are in Milliseconds
 - failed: the failed timeout, default: 6000
 - keep_alive: how long to wait between keep alive messages, default 500
 - ice_gathering: gathering timeout, default 5000
+- peerbook: how long to wait before peerbook reconnnect, default 3000
 
 ### env 
 

signaling.go

@@ -17,7 +17,6 @@ import (
 var wsWriteM sync.Mutex
 
 func signalingGo() {
-start:
 	c, err := dialWS()
 	if err != nil {
 		Logger.Errorf("Failed to dial the signaling server: %q", err)
@@ -29,8 +28,7 @@ start:
 		mType, m, err := c.ReadMessage()
 		if err != nil {
 			Logger.Errorf("Signaling read error", err)
-			c.Close()
-			goto start
+			break
 		}
 		if mType == websocket.TextMessage {
 			Logger.Info("Received text message", string(m))
@@ -40,6 +38,7 @@ start:
 			}
 		}
 	}
+	time.AfterFunc(Conf.peerbookTimeout, signalingGo)
 }
 func getFP() string {
 	certs, err := GetCerts()