refactor: remove net.URL and net.CIDR types, improved unmarshal handling

internal/net/types/cidr.go

@@ -1,39 +0,0 @@
-package types
-
-import (
-	"net"
-	"strings"
-)
-
-//nolint:recvcheck
-type CIDR net.IPNet
-
-func ParseCIDR(v string) (cidr CIDR, err error) {
-	err = cidr.Parse(v)
-	return
-}
-
-func (cidr *CIDR) Parse(v string) error {
-	if !strings.Contains(v, "/") {
-		v += "/32" // single IP
-	}
-	_, ipnet, err := net.ParseCIDR(v)
-	if err != nil {
-		return err
-	}
-	cidr.IP = ipnet.IP
-	cidr.Mask = ipnet.Mask
-	return nil
-}
-
-func (cidr CIDR) Contains(ip net.IP) bool {
-	return (*net.IPNet)(&cidr).Contains(ip)
-}
-
-func (cidr CIDR) String() string {
-	return (*net.IPNet)(&cidr).String()
-}
-
-func (cidr CIDR) MarshalText() ([]byte, error) {
-	return []byte(cidr.String()), nil
-}

internal/net/types/url.go

@@ -1,56 +0,0 @@
-package types
-
-import (
-	urlPkg "net/url"
-
-	"github.com/yusing/go-proxy/internal/utils"
-)
-
-type URL struct {
-	_ utils.NoCopy
-	urlPkg.URL
-}
-
-func MustParseURL(url string) *URL {
-	u, err := ParseURL(url)
-	if err != nil {
-		panic(err)
-	}
-	return u
-}
-
-func ParseURL(url string) (*URL, error) {
-	u := &URL{}
-	return u, u.Parse(url)
-}
-
-func NewURL(url *urlPkg.URL) *URL {
-	return &URL{URL: *url}
-}
-
-func (u *URL) Parse(url string) error {
-	uu, err := urlPkg.Parse(url)
-	if err != nil {
-		return err
-	}
-	u.URL = *uu
-	return nil
-}
-
-func (u *URL) String() string {
-	if u == nil {
-		return "nil"
-	}
-	return u.URL.String()
-}
-
-func (u *URL) MarshalJSON() (text []byte, err error) {
-	if u == nil {
-		return []byte("null"), nil
-	}
-	return []byte("\"" + u.URL.String() + "\""), nil
-}
-
-func (u *URL) Equals(other *URL) bool {
-	return u.String() == other.String()
-}