Implementing RFC-8: Add TCP Protocol (#11)

* Implementing RFC-8

Signed-off-by: bokket <3100563328@qq.com>

* Use <host>:<port> as addr

Signed-off-by: bokket <3100563328@qq.com>

Author: bokket

endpoint.go

@@ -13,6 +13,8 @@ const (
 	ProtocolHTTPS = "https"
 	// ProtocolFile is the file endpoint protocol
 	ProtocolFile = "file"
+	// ProtocolTCP is the tcp endpoint protocol
+	ProtocolTCP = "tcp"
 )
 
 // Parse will parse config string to create a endpoint Endpoint.
@@ -44,6 +46,13 @@ func Parse(cfg string) (p Endpoint, err error) {
 		// See issue: https://github.com/beyondstorage/go-endpoint/issues/3
 		path := strings.Join(s[1:], ":")
 		return NewFile(path), nil
+	case ProtocolTCP:
+		//See issue: https://github.com/beyondstorage/go-endpoint/issues/7
+		host, port, err := parseHostPort(s[1:])
+		if err != nil {
+			return Endpoint{}, &Error{"parse", ErrInvalidValue, s[0], []string{s[1], s[2]}}
+		}
+		return NewTCP(host, port), nil
 	default:
 		return Endpoint{}, &Error{"parse", ErrUnsupportedProtocol, s[0], nil}
 	}
@@ -95,6 +104,13 @@ func NewFile(path string) Endpoint {
 	}
 }
 
+func NewTCP(host string, port int) Endpoint {
+	return Endpoint{
+		protocol: ProtocolTCP,
+		args:     hostPort{host, port},
+	}
+}
+
 func (p Endpoint) Protocol() string {
 	return p.protocol
 }
@@ -152,3 +168,16 @@ func (p Endpoint) File() (path string) {
 
 	return p.args.(string)
 }
+
+func (p Endpoint) TCP() (addr, host string, port int) {
+	if p.protocol != ProtocolTCP {
+		panic(Error{
+			Op:       "tcp",
+			Err:      ErrInvalidValue,
+			Protocol: p.protocol,
+			Values:   p.args,
+		})
+	}
+	hp := p.args.(hostPort)
+	return fmt.Sprintf("%s:%d", hp.host, hp.port), hp.host, hp.port
+}

endpoint_test.go

@@ -75,6 +75,18 @@ func TestParse(t *testing.T) {
 			Endpoint{ProtocolFile, "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\TestStorage_Stat286526883\\001\\199446694"},
 			nil,
 		},
+		{
+			"normal tcp",
+			"tcp:127.0.0.1:8000",
+			Endpoint{ProtocolTCP, hostPort{"127.0.0.1", 8000}},
+			nil,
+		},
+		{
+			"wrong port number in tcp",
+			"tcp:127.0.0.1:xxx",
+			Endpoint{},
+			ErrInvalidValue,
+		},
 	}
 
 	for _, tt := range cases {
@@ -108,12 +120,25 @@ func TestNewHTTPS(t *testing.T) {
 	)
 }
 
+func TestNewTCP(t *testing.T) {
+	assert.Equal(t,
+		Endpoint{ProtocolTCP, hostPort{"127.0.0.1", 8000}},
+		NewTCP("127.0.0.1", 8000),
+	)
+}
+
 func TestEndpoint_Protocol(t *testing.T) {
 	ep := NewFile("/test")
 
 	assert.Equal(t, ProtocolFile, ep.Protocol())
 }
 
+func TestEndpoint_Protocol2(t *testing.T) {
+	ep := NewTCP("127.0.0.1", 8000)
+
+	assert.Equal(t, ProtocolTCP, ep.Protocol())
+}
+
 func TestEndpoint_String(t *testing.T) {
 	cases := []struct {
 		name     string
@@ -145,6 +170,11 @@ func TestEndpoint_String(t *testing.T) {
 			Endpoint{ProtocolHTTPS, hostPort{"example.com", 4433}},
 			"https:example.com:4433",
 		},
+		{
+			"tcp with port",
+			Endpoint{ProtocolTCP, hostPort{"127.0.0.1", 8000}},
+			"tcp:127.0.0.1:8000",
+		},
 	}
 
 	for _, tt := range cases {
@@ -164,6 +194,10 @@ func TestEndpoint(t *testing.T) {
 		p.HTTPS()
 	})
 
+	assert.Panics(t, func() {
+		p.TCP()
+	})
+
 	assert.Equal(t, "/test", p.File())
 }
 
@@ -197,6 +231,15 @@ func TestEndpoint_HTTPS(t *testing.T) {
 	assert.Equal(t, 4433, port)
 }
 
+func TestEndpoint_TCP(t *testing.T) {
+	p := NewTCP("127.0.0.1", 8000)
+
+	addr, host, port := p.TCP()
+	assert.Equal(t, "127.0.0.1:8000", addr)
+	assert.Equal(t, "127.0.0.1", host)
+	assert.Equal(t, 8000, port)
+}
+
 func ExampleParse() {
 	ep, err := Parse("http:example.com")
 	if err != nil {
@@ -217,6 +260,11 @@ func ExampleParse() {
 	case ProtocolFile:
 		path := ep.File()
 		log.Println("path: ", path)
+	case ProtocolTCP:
+		addr, host, port := ep.TCP()
+		log.Println("addr:", addr)
+		log.Println("host:", host)
+		log.Println("port", port)
 	default:
 		panic("unsupported protocol")
 	}