update

Author: admpub

string.go

@@ -532,23 +532,6 @@ func StripSlashes(s string) string {
 	return s
 }
 
-// SplitHost localhost:8080 => localhost,8080
-func SplitHost(host string) (domain string, port string) {
-	pos := strings.LastIndex(host, `:`)
-	if pos >= 0 {
-		domain = host[0:pos]
-		port = host[pos:]
-		port = strings.TrimPrefix(port, `:`)
-		if strings.HasPrefix(port, `[`) {
-			port = strings.TrimPrefix(port, `[`)
-			port = strings.TrimSuffix(port, `]`)
-		}
-	} else {
-		domain = host
-	}
-	return
-}
-
 // MaskString 0123456789 => 012****789
 func MaskString(v string, width ...float64) string {
 	size := len(v)

url.go

@@ -137,3 +137,36 @@ func IsLocalhost(host string) bool {
 		return localIPRegexp.MatchString(host)
 	}
 }
+
+// SplitHost localhost:8080 => localhost
+func SplitHost(hostport string) string {
+	host, _ := SplitHostPort(hostport)
+	return host
+}
+
+func SplitHostPort(hostport string) (host string, port string) {
+	if strings.HasSuffix(hostport, `]`) {
+		host = hostport
+		return
+	}
+	sep := `]:`
+	pos := strings.LastIndex(hostport, sep)
+	if pos > -1 {
+		host = hostport[0 : pos+1]
+		if len(hostport) > pos+2 {
+			port = hostport[pos+2:]
+		}
+		return
+	}
+	sep = `:`
+	pos = strings.LastIndex(hostport, sep)
+	if pos > -1 {
+		host = hostport[0:pos]
+		if len(hostport) > pos+1 {
+			port = hostport[pos+1:]
+		}
+		return
+	}
+	host = hostport
+	return
+}

url_test.go

@@ -0,0 +1,35 @@
+package com
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSplitHostPort(t *testing.T) {
+	host, port := SplitHostPort(`[1:2:2:3]:9999`)
+	assert.Equal(t, `[1:2:2:3]`, host)
+	assert.Equal(t, `9999`, port)
+
+	host, port = SplitHostPort(`example.com:9999`)
+	assert.Equal(t, `example.com`, host)
+	assert.Equal(t, `9999`, port)
+
+	host, port = SplitHostPort(`127.0.0.1:9999`)
+	assert.Equal(t, `127.0.0.1`, host)
+	assert.Equal(t, `9999`, port)
+}
+
+func TestSplitHostPort2(t *testing.T) {
+	host, port := SplitHostPort(`[1:2:2:3]`)
+	assert.Equal(t, `[1:2:2:3]`, host)
+	assert.Equal(t, ``, port)
+
+	host, port = SplitHostPort(`example.com`)
+	assert.Equal(t, `example.com`, host)
+	assert.Equal(t, ``, port)
+
+	host, port = SplitHostPort(`127.0.0.1`)
+	assert.Equal(t, `127.0.0.1`, host)
+	assert.Equal(t, ``, port)
+}