Fix websocket PR lint issues and add coverage

Author: yahuio

dialer.go

@@ -33,11 +33,11 @@ type Dialer interface {
 	Dial(ctx context.Context, session *session, attempt int, tlsConfig *tls.Config) (net.Conn, error)
 }
 
-type TcpDialer struct {
+type TCPDialer struct {
 	ctxDialer proxy.ContextDialer
 }
 
-func (d *TcpDialer) Dial(ctx context.Context, session *session, attempt int, tlsConfig *tls.Config) (conn net.Conn, err error) {
+func (d *TCPDialer) Dial(ctx context.Context, session *session, attempt int, tlsConfig *tls.Config) (conn net.Conn, err error) {
 	address := session.SocketConnectAddress[attempt%len(session.SocketConnectAddress)]
 	session.log.OnEventf("Connecting to: %v", address)
 
@@ -107,7 +107,7 @@ func loadDialerConfig(settings *SessionSettings) (dialer Dialer, err error) {
 	}
 
 	stdDialer := &net.Dialer{}
-	dialer = &TcpDialer{
+	dialer = &TCPDialer{
 		ctxDialer: stdDialer,
 	}
 	if settings.HasSetting(config.SocketTimeout) {
@@ -163,7 +163,7 @@ func loadDialerConfig(settings *SessionSettings) (dialer Dialer, err error) {
 		}
 
 		if contextDialer, ok := proxyDialer.(proxy.ContextDialer); ok {
-			dialer = &TcpDialer{
+			dialer = &TCPDialer{
 				ctxDialer: contextDialer,
 			}
 		} else {

dialer_test.go

@@ -42,7 +42,7 @@ func (s *DialerTestSuite) TestLoadDialerNoSettings() {
 	dialer, err := loadDialerConfig(s.settings.GlobalSettings())
 	s.Require().Nil(err)
 
-	stdDialer, ok := dialer.(*TcpDialer).ctxDialer.(*net.Dialer)
+	stdDialer, ok := dialer.(*TCPDialer).ctxDialer.(*net.Dialer)
 	s.Require().True(ok)
 	s.Require().NotNil(stdDialer)
 	s.Zero(stdDialer.Timeout)
@@ -53,7 +53,7 @@ func (s *DialerTestSuite) TestLoadDialerWithTimeout() {
 	dialer, err := loadDialerConfig(s.settings.GlobalSettings())
 	s.Require().Nil(err)
 
-	stdDialer, ok := dialer.(*TcpDialer).ctxDialer.(*net.Dialer)
+	stdDialer, ok := dialer.(*TCPDialer).ctxDialer.(*net.Dialer)
 	s.Require().True(ok)
 	s.Require().NotNil(stdDialer)
 	s.EqualValues(10*time.Second, stdDialer.Timeout)
@@ -73,7 +73,7 @@ func (s *DialerTestSuite) TestLoadDialerSocksProxy() {
 	s.Require().Nil(err)
 	s.Require().NotNil(dialer)
 
-	_, ok := dialer.(*TcpDialer).ctxDialer.(*net.Dialer)
+	_, ok := dialer.(*TCPDialer).ctxDialer.(*net.Dialer)
 	s.Require().False(ok)
 }
 
@@ -90,3 +90,22 @@ func (s *DialerTestSuite) TestLoadDialerSocksProxyInvalidPort() {
 	_, err := loadDialerConfig(s.settings.GlobalSettings())
 	s.Require().NotNil(err)
 }
+
+func (s *DialerTestSuite) TestLoadDialerWebsocket() {
+	s.settings.GlobalSettings().Set(config.WebsocketLocation, "ws://example.com/ws")
+	s.settings.GlobalSettings().Set(config.WebsocketOrigin, "http://localhost/")
+
+	dialer, err := loadDialerConfig(s.settings.GlobalSettings())
+	s.Require().NoError(err)
+
+	wsDialer, ok := dialer.(*WebsocketDialer)
+	s.Require().True(ok)
+	s.Equal("ws://example.com/ws", wsDialer.wsConfig.Location.String())
+	s.Equal("http://localhost/", wsDialer.wsConfig.Origin.String())
+}
+
+func (s *DialerTestSuite) TestLoadDialerWebsocketMissingOrigin() {
+	s.settings.GlobalSettings().Set(config.WebsocketLocation, "ws://example.com/ws")
+	_, err := loadDialerConfig(s.settings.GlobalSettings())
+	s.Require().Error(err)
+}

initiator.go

@@ -181,10 +181,8 @@ func (i *Initiator) handleConnection(session *session, tlsConfig *tls.Config, di
 		if err != nil {
 			session.log.OnEventf("Failed to connect: %v", err)
 			goto reconnect
-		} else {
-			address := netConn.RemoteAddr().String()
-			session.log.OnEventf("connected to remote address: %v", address)
 		}
+		session.log.OnEventf("connected to remote address: %v", netConn.RemoteAddr().String())
 
 		msgIn = make(chan fixIn, session.InChanCapacity)
 		msgOut = make(chan []byte)

session_factory_test.go

@@ -649,6 +649,15 @@ func (s *SessionFactorySuite) TestConfigureSocketConnectAddress() {
 	}
 }
 
+func (s *SessionFactorySuite) TestConfigureSocketConnectAddressWebsocketOnly() {
+	sess := new(session)
+	s.SessionSettings.Set(config.WebsocketLocation, "wss://example.com/ws")
+
+	err := s.configureSocketConnectAddress(sess, s.SessionSettings)
+	s.Require().NoError(err)
+	s.Empty(sess.SocketConnectAddress)
+}
+
 func (s *SessionFactorySuite) TestConfigureSocketConnectAddressMulti() {
 	session := new(session)
 	s.SessionSettings.Set(config.SocketConnectHost, "127.0.0.1")