🧹 all: cleanup

database64128 · Jul 23, 2024 · e589b77 · e589b77
1 parent 0c1d7dc
commit e589b77
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/docs/config.json b/docs/config.json
@@ -409,7 +409,7 @@
         "certFile": "",
         "keyFile": "",
         "clientCertFile": "",
-        "secretPath": "4paZvyoK3dCjyQXU33md5huJMMYVD9o8",
+        "secretPath": "/4paZvyoK3dCjyQXU33md5huJMMYVD9o8",
         "fiberConfigPath": ""
     }
 }
diff --git a/jsonhelper/duration.go b/jsonhelper/duration.go
@@ -5,6 +5,11 @@ import "time"
 // Duration is [time.Duration] but implements [encoding.TextMarshaler] and [encoding.TextUnmarshaler].
 type Duration time.Duration
 
+// Value returns the duration as [time.Duration].
+func (d Duration) Value() time.Duration {
+	return time.Duration(d)
+}
+
 // MarshalText implements [encoding.TextMarshaler.MarshalText].
 func (d Duration) MarshalText() ([]byte, error) {
 	return []byte(time.Duration(d).String()), nil

diff --git a/router/router.go b/router/router.go
@@ -24,7 +24,7 @@ type Config struct {
 }
 
 // Router creates a router from the RouterConfig.
-func (rc *Config) Router(logger *zap.Logger, resolvers []dns.SimpleResolver, resolverMap map[string]dns.SimpleResolver, tcpClientMap map[string]zerocopy.TCPClient, udpClientMap map[string]zerocopy.UDPClient, serverIndexByName map[string]int) (*Router, error) {
+func (rc *Config) Router(logger *zap.Logger, resolvers []dns.SimpleResolver, resolverMap map[string]dns.SimpleResolver, tcpClientMap map[string]zerocopy.TCPClient, udpClientMap map[string]zerocopy.UDPClient, serverIndexByName map[string]int) (r *Router, err error) {
 	defaultRoute := Route{name: "default"}
 
 	switch rc.DefaultTCPClientName {
@@ -38,7 +38,7 @@ func (rc *Config) Router(logger *zap.Logger, resolvers []dns.SimpleResolver, res
 	default:
 		defaultRoute.tcpClient = tcpClientMap[rc.DefaultTCPClientName]
 		if defaultRoute.tcpClient == nil {
-			return nil, fmt.Errorf("default TCP client not found: %s", rc.DefaultTCPClientName)
+			return nil, fmt.Errorf("default TCP client not found: %q", rc.DefaultTCPClientName)
 		}
 	}
 
@@ -53,20 +53,22 @@ func (rc *Config) Router(logger *zap.Logger, resolvers []dns.SimpleResolver, res
 	default:
 		defaultRoute.udpClient = udpClientMap[rc.DefaultUDPClientName]
 		if defaultRoute.udpClient == nil {
-			return nil, fmt.Errorf("default UDP client not found: %s", rc.DefaultUDPClientName)
+			return nil, fmt.Errorf("default UDP client not found: %q", rc.DefaultUDPClientName)
 		}
 	}
 
-	var (
-		geoip *geoip2.Reader
-		err   error
-	)
+	var geoip *geoip2.Reader
 
 	if rc.GeoLite2CountryDbPath != "" {
 		geoip, err = geoip2.Open(rc.GeoLite2CountryDbPath)
 		if err != nil {
 			return nil, err
 		}
+		defer func() {
+			if err != nil {
+				_ = geoip.Close()
+			}
+		}()
 	}
 
 	domainSetMap := make(map[string]domainset.DomainSet, len(rc.DomainSets))

diff --git a/service/server.go b/service/server.go
@@ -114,7 +114,7 @@ func (lnc *TCPListenerConfig) Configure(listenConfigCache conn.ListenConfigCache
 		return tcpRelayListener{}, fmt.Errorf("invalid network: %s", lnc.Network)
 	}
 
-	initialPayloadWaitTimeout := time.Duration(lnc.InitialPayloadWaitTimeout)
+	initialPayloadWaitTimeout := lnc.InitialPayloadWaitTimeout.Value()
 
 	switch {
 	case initialPayloadWaitTimeout == 0:
@@ -177,7 +177,7 @@ func (lnc *UDPListenerConfig) Configure(listenConfigCache conn.ListenConfigCache
 		return udpRelayServerConn{}, err
 	}
 
-	natTimeout := time.Duration(lnc.NATTimeout)
+	natTimeout := lnc.NATTimeout.Value()
 
 	switch {
 	case natTimeout == 0: