Moved code to top-level.

config.go

@@ -1,4 +1,4 @@
-package ws
+package honeybee
 
 import (
 	"git.wisehodl.dev/jay/go-honeybee/errors"

config_test.go

@@ -1,4 +1,4 @@
-package ws
+package honeybee
 
 import (
 	"git.wisehodl.dev/jay/go-honeybee/errors"

connection.go

@@ -1,8 +1,7 @@
-package ws
+package honeybee
 
 import (
 	"fmt"
-	"net/http"
 	"net/url"
 	"sync"
 	"time"
@@ -11,79 +10,6 @@ import (
 	"github.com/gorilla/websocket"
 )
 
-type Dialer interface {
-	Dial(urlStr string, requestHeader http.Header) (Socket, *http.Response, error)
-}
-
-func NewDialer() Dialer {
-	return NewGorillaDialer()
-}
-
-type GorillaDialer struct {
-	*websocket.Dialer
-}
-
-func NewGorillaDialer() *GorillaDialer {
-	return &GorillaDialer{
-		Dialer: &websocket.Dialer{
-			HandshakeTimeout: 45 * time.Second,
-			ReadBufferSize:   1024,
-			WriteBufferSize:  1024,
-		},
-	}
-}
-
-// Returns the Socket interface
-func (d *GorillaDialer) Dial(
-	urlStr string, requestHeader http.Header,
-) (
-	Socket, *http.Response, error,
-) {
-	conn, resp, err := d.Dialer.Dial(urlStr, requestHeader)
-	return conn, resp, err
-}
-
-type Socket interface {
-	WriteMessage(messageType int, data []byte) error
-	ReadMessage() (messageType int, p []byte, err error)
-	Close() error
-
-	SetReadDeadline(t time.Time) error
-	SetWriteDeadline(t time.Time) error
-	SetCloseHandler(h func(code int, text string) error)
-}
-
-func AcquireSocket(
-	retryMgr *RetryManager,
-	dialer Dialer,
-	urlStr string,
-) (Socket, *http.Response, error) {
-	if retryMgr == nil {
-		return nil, nil, errors.NewConnectionError("retry manager cannot be nil")
-	}
-	if dialer == nil {
-		return nil, nil, errors.NewConnectionError("dialer cannot be nil")
-	}
-	if urlStr == "" {
-		return nil, nil, errors.NewConnectionError("URL cannot be empty")
-	}
-
-	for {
-		socket, resp, err := dialer.Dial(urlStr, nil)
-		if err == nil {
-			return socket, resp, nil
-		}
-
-		if !retryMgr.ShouldRetry() {
-			return nil, nil, err
-		}
-
-		delay := retryMgr.CalculateDelay()
-		time.Sleep(delay)
-		retryMgr.RecordRetry()
-	}
-}
-
 type ConnectionState int
 
 const (

connection_close_test.go

@@ -1,4 +1,4 @@
-package ws
+package honeybee
 
 import (
 	"fmt"

connection_goroutine_test.go

@@ -1,4 +1,4 @@
-package ws
+package honeybee
 
 import (
 	"fmt"

connection_send_test.go

@@ -1,4 +1,4 @@
-package ws
+package honeybee
 
 import (
 	"fmt"

connection_test.go

@@ -1,4 +1,4 @@
-package ws
+package honeybee
 
 import (
 	"fmt"

honeybee.go

@@ -1 +0,0 @@
-package honeybee

mocks_test.go

@@ -1,4 +1,4 @@
-package ws
+package honeybee
 
 import (
 	"github.com/stretchr/testify/assert"

retry.go

@@ -1,4 +1,4 @@
-package ws
+package honeybee
 
 import (
 	"math"

retry_test.go

@@ -1,4 +1,4 @@
-package ws
+package honeybee
 
 import (
 	"github.com/stretchr/testify/assert"

socket.go

@@ -0,0 +1,82 @@
+package honeybee
+
+import (
+	"net/http"
+	"time"
+
+	"git.wisehodl.dev/jay/go-honeybee/errors"
+	"github.com/gorilla/websocket"
+)
+
+type Dialer interface {
+	Dial(urlStr string, requestHeader http.Header) (Socket, *http.Response, error)
+}
+
+func NewDialer() Dialer {
+	return NewGorillaDialer()
+}
+
+type GorillaDialer struct {
+	*websocket.Dialer
+}
+
+func NewGorillaDialer() *GorillaDialer {
+	return &GorillaDialer{
+		Dialer: &websocket.Dialer{
+			HandshakeTimeout: 45 * time.Second,
+			ReadBufferSize:   1024,
+			WriteBufferSize:  1024,
+		},
+	}
+}
+
+// Returns the Socket interface
+func (d *GorillaDialer) Dial(
+	urlStr string, requestHeader http.Header,
+) (
+	Socket, *http.Response, error,
+) {
+	conn, resp, err := d.Dialer.Dial(urlStr, requestHeader)
+	return conn, resp, err
+}
+
+type Socket interface {
+	WriteMessage(messageType int, data []byte) error
+	ReadMessage() (messageType int, p []byte, err error)
+	Close() error
+
+	SetReadDeadline(t time.Time) error
+	SetWriteDeadline(t time.Time) error
+	SetCloseHandler(h func(code int, text string) error)
+}
+
+func AcquireSocket(
+	retryMgr *RetryManager,
+	dialer Dialer,
+	urlStr string,
+) (Socket, *http.Response, error) {
+	if retryMgr == nil {
+		return nil, nil, errors.NewConnectionError("retry manager cannot be nil")
+	}
+	if dialer == nil {
+		return nil, nil, errors.NewConnectionError("dialer cannot be nil")
+	}
+	if urlStr == "" {
+		return nil, nil, errors.NewConnectionError("URL cannot be empty")
+	}
+
+	for {
+		socket, resp, err := dialer.Dial(urlStr, nil)
+		if err == nil {
+			return socket, resp, nil
+		}
+
+		if !retryMgr.ShouldRetry() {
+			return nil, nil, err
+		}
+
+		delay := retryMgr.CalculateDelay()
+		time.Sleep(delay)
+		retryMgr.RecordRetry()
+	}
+}

socket_test.go

@@ -1,4 +1,4 @@
-package ws
+package honeybee
 
 import (
 	"errors"

url.go

@@ -1,4 +1,4 @@
-package ws
+package honeybee
 
 import (
 	"net/url"

url_test.go

@@ -1,4 +1,4 @@
-package ws
+package honeybee
 
 import (
 	"git.wisehodl.dev/jay/go-honeybee/errors"

ws/ws_test.go

@@ -1,2 +0,0 @@
-// ws package end-to-end tests
-package ws