feat: waiting for network before pulling subscriptions

cmd/run.go

@@ -2,16 +2,17 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/mohae/deepcopy"
-	"github.com/okzk/sdnotify"
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
 	"github.com/daeuniverse/dae/cmd/internal"
 	"github.com/daeuniverse/dae/common/subscription"
 	"github.com/daeuniverse/dae/config"
 	"github.com/daeuniverse/dae/control"
 	"github.com/daeuniverse/dae/pkg/config_parser"
 	"github.com/daeuniverse/dae/pkg/logger"
+	"github.com/mohae/deepcopy"
+	"github.com/okzk/sdnotify"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+	"net/http"
 	"os"
 	"os/signal"
 	"path/filepath"
@@ -19,6 +20,7 @@ import (
 	"strconv"
 	"strings"
 	"syscall"
+	"time"
 )
 
 const (
@@ -212,6 +214,22 @@ func newControlPlane(log *logrus.Logger, bpf interface{}, conf *config.Config) (
 	}
 	// Resolve subscriptions to nodes.
 	resolvingfailed := false
+	if !conf.Global.DisableWaitingNetwork && len(conf.Subscription) > 0 {
+		log.Infoln("Waiting for network...")
+		for {
+			resp, err := http.Get("http://www.msftconnecttest.com/connecttest.txt")
+			if err != nil {
+				time.Sleep(5 * time.Second)
+				continue
+			}
+			resp.Body.Close()
+			if resp.StatusCode >= 200 && resp.StatusCode < 500 {
+				break
+			}
+			log.Infof("Bad status: %v (%v)", resp.Status, resp.StatusCode)
+		}
+		log.Infoln("Network online.")
+	}
 	for _, sub := range conf.Subscription {
 		tag, nodes, err := subscription.ResolveSubscription(log, filepath.Dir(cfgFile), string(sub))
 		if err != nil {

config/config.go

@@ -17,14 +17,15 @@ type Global struct {
 	LogLevel   string `mapstructure:"log_level" default:"info"`
 	// We use DirectTcpCheckUrl to check (tcp)*(ipv4/ipv6) connectivity for direct.
 	//DirectTcpCheckUrl string `mapstructure:"direct_tcp_check_url" default:"http://www.qualcomm.cn/generate_204"`
-	TcpCheckUrl         string        `mapstructure:"tcp_check_url" default:"http://keep-alv.google.com/generate_204"`
-	UdpCheckDns         string        `mapstructure:"udp_check_dns" default:"dns.google:53"`
-	CheckInterval       time.Duration `mapstructure:"check_interval" default:"30s"`
-	CheckTolerance      time.Duration `mapstructure:"check_tolerance" default:"0"`
-	LanInterface        []string      `mapstructure:"lan_interface"`
-	WanInterface        []string      `mapstructure:"wan_interface"`
-	AllowInsecure       bool          `mapstructure:"allow_insecure" default:"false"`
-	DialMode            string        `mapstructure:"dial_mode" default:"domain"`
+	TcpCheckUrl           string        `mapstructure:"tcp_check_url" default:"http://keep-alv.google.com/generate_204"`
+	UdpCheckDns           string        `mapstructure:"udp_check_dns" default:"dns.google:53"`
+	CheckInterval         time.Duration `mapstructure:"check_interval" default:"30s"`
+	CheckTolerance        time.Duration `mapstructure:"check_tolerance" default:"0"`
+	LanInterface          []string      `mapstructure:"lan_interface"`
+	WanInterface          []string      `mapstructure:"wan_interface"`
+	AllowInsecure         bool          `mapstructure:"allow_insecure" default:"false"`
+	DialMode              string        `mapstructure:"dial_mode" default:"domain"`
+	DisableWaitingNetwork bool          `mapstructure:"disable_waiting_network" default:"false"`
 }
 
 type FunctionOrString interface{}

config/desc.go

@@ -49,6 +49,7 @@ var GlobalDesc = Desc{
 2. "domain". Dial proxy using the domain from sniffing. This will relieve DNS pollution problem to a great extent if have impure DNS environment. Generally, this mode brings faster proxy response time because proxy will re-resolve the domain in remote, thus get better IP result to connect. This policy does not impact routing. That is to say, domain rewrite will be after traffic split of routing and dae will not re-route it.
 3. "domain+". Based on domain mode but do not check the reality of sniffed domain. It is useful for users whose DNS requests do not go through dae but want faster proxy response time. Notice that, if DNS requests do not go through dae, dae cannot split traffic by domain.
 4. "domain++". Based on domain+ mode but force to re-route traffic using sniffed domain to partially recover domain based traffic split ability. It doesn't work for direct traffic and consumes more CPU resources.`,
+	"disable_waiting_network": "Disable waiting for network before pulling subscriptions.",
 }
 
 var DnsDesc = Desc{

example.dae

@@ -47,6 +47,9 @@ global {
     # 4. "domain++". Based on domain+ mode but force to re-route traffic using sniffed domain to partially recover
     #       domain based traffic split ability. It doesn't work for direct traffic and consumes more CPU resources.
     dial_mode: domain
+
+    # Disable waiting for network before pulling subscriptions.
+    disable_waiting_network: false
 }
 
 # Subscriptions defined here will be resolved as nodes and merged as a part of the global node pool.