feat: options to disable update check & fix client lazy mode

app/cmd/client.go

@@ -361,15 +361,21 @@ func runClient(cmd *cobra.Command, args []string) {
 		logger.Fatal("failed to load client config", zap.Error(err))
 	}
 
-	c, err := client.NewReconnectableClient(hyConfig, connectLog, config.Lazy)
+	c, err := client.NewReconnectableClient(hyConfig, func(c client.Client, count int) {
+		connectLog(count)
+		// On the client side, we start checking for updates after we successfully connect
+		// to the server, which, depending on whether lazy mode is enabled, may or may not
+		// be immediately after the client starts. We don't want the update check request
+		// to interfere with the lazy mode option.
+		if count == 1 && !disableUpdateCheck {
+			go runCheckUpdateClient(c)
+		}
+	}, config.Lazy)
 	if err != nil {
 		logger.Fatal("failed to initialize client", zap.Error(err))
 	}
 	defer c.Close()
 
-	// TODO: add option to disable update checking
-	go runCheckUpdateClient(c) // TODO: fix lazy mode
-
 	uri := config.URI()
 	logger.Info("use this URI to share your server", zap.String("uri", uri))
 	if showQR {
@@ -622,12 +628,7 @@ func (f *obfsConnFactory) New(addr net.Addr) (net.PacketConn, error) {
 }
 
 func connectLog(count int) {
-	if count == 1 {
+	logger.Info("connected to server", zap.Int("count", count))
-		logger.Info("connected to server")
-	} else {
-		// Not the first time, we have reconnected
-		logger.Info("reconnected to server", zap.Int("count", count))
-	}
 }
 
 type socks5Logger struct{}

app/cmd/root.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"strconv"
 	"strings"
 
 	"github.com/spf13/cobra"
@@ -20,8 +21,9 @@ const (
 	appDesc    = "a powerful, censorship-resistant proxy tool optimized for lossy networks"
 	appAuthors = "Aperture Internet Laboratory <https://github.com/apernet>"
 
-	appLogLevelEnv  = "HYSTERIA_LOG_LEVEL"
+	appLogLevelEnv           = "HYSTERIA_LOG_LEVEL"
-	appLogFormatEnv = "HYSTERIA_LOG_FORMAT"
+	appLogFormatEnv          = "HYSTERIA_LOG_FORMAT"
+	appDisableUpdateCheckEnv = "HYSTERIA_DISABLE_UPDATE_CHECK"
 )
 
 var (
@@ -48,9 +50,10 @@ var logger *zap.Logger
 
 // Flags
 var (
-	cfgFile   string
+	cfgFile            string
-	logLevel  string
+	logLevel           string
-	logFormat string
+	logFormat          string
+	disableUpdateCheck bool
 )
 
 var rootCmd = &cobra.Command{
@@ -105,8 +108,9 @@ func init() {
 
 func initFlags() {
 	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "", "config file")
-	rootCmd.PersistentFlags().StringVarP(&logLevel, "log-level", "l", envOrDefault(appLogLevelEnv, "info"), "log level")
+	rootCmd.PersistentFlags().StringVarP(&logLevel, "log-level", "l", envOrDefaultString(appLogLevelEnv, "info"), "log level")
-	rootCmd.PersistentFlags().StringVarP(&logFormat, "log-format", "f", envOrDefault(appLogFormatEnv, "console"), "log format")
+	rootCmd.PersistentFlags().StringVarP(&logFormat, "log-format", "f", envOrDefaultString(appLogFormatEnv, "console"), "log format")
+	rootCmd.PersistentFlags().BoolVar(&disableUpdateCheck, "disable-update-check", envOrDefaultBool(appDisableUpdateCheckEnv, false), "disable update check")
 }
 
 func initConfig() {
@@ -149,9 +153,17 @@ func initLogger() {
 	}
 }
 
-func envOrDefault(key, def string) string {
+func envOrDefaultString(key, def string) string {
 	if v := os.Getenv(key); v != "" {
 		return v
 	}
 	return def
 }
+
+func envOrDefaultBool(key string, def bool) bool {
+	if v := os.Getenv(key); v != "" {
+		b, _ := strconv.ParseBool(v)
+		return b
+	}
+	return def
+}

app/cmd/server.go

@@ -606,7 +606,9 @@ func runServer(cmd *cobra.Command, args []string) {
 	}
 	logger.Info("server up and running")
 
-	go runCheckUpdateServer()
+	if !disableUpdateCheck {
+		go runCheckUpdateServer()
+	}
 
 	if err := s.Serve(); err != nil {
 		logger.Fatal("failed to serve", zap.Error(err))

core/client/reconnect.go

@@ -13,12 +13,12 @@ type reconnectableClientImpl struct {
 	config        *Config
 	client        Client
 	count         int
-	connectedFunc func(int) // called when successfully connected
+	connectedFunc func(Client, int) // called when successfully connected
 	m             sync.Mutex
 	closed        bool // permanent close
 }
 
-func NewReconnectableClient(config *Config, connectedFunc func(int), lazy bool) (Client, error) {
+func NewReconnectableClient(config *Config, connectedFunc func(Client, int), lazy bool) (Client, error) {
 	// Make sure we capture any error in config and return it here,
 	// so that the caller doesn't have to wait until the first call
 	// to TCP() or UDP() to get the error (when lazy is true).
@@ -48,7 +48,7 @@ func (rc *reconnectableClientImpl) reconnect() error {
 	} else {
 		rc.count++
 		if rc.connectedFunc != nil {
-			rc.connectedFunc(rc.count)
+			rc.connectedFunc(rc, rc.count)
 		}
 		return nil
 	}