Fixing error where connection was re-established incorrectly

internal/dispatcher/dispatcher.go

@@ -113,7 +113,15 @@ func (d *Dispatcher) dispatchMessage(msg *message.Message) {
 				return
 			}
 			log.Println("Websocket terminated: reconnecting")
+			err := d.Disconnect()
+			if err != nil {
+				log.Println(err)
+			}
 			d.Connect()
+			if err != nil {
+				log.Println(err)
+			}
+
 			subsList := d.store.GetAll()
 			for i := range subsList {
 				sub := subsList[i]

subscription/subscription.go

@@ -32,11 +32,18 @@ func NewSubscription(chanel string, unsub Unsubscriber, authToken string, msgCh
 
 func (s *Subscription) OnMessage(onMessage func(channel string, msg message.Data)) error {
 	var inMsg *message.Message
+	go s.StartMessageLoop(inMsg, onMessage)
+
+	return nil
+}
+
+func (s *Subscription) StartMessageLoop(inMsg *message.Message, callback func(channel string, msg message.Data)) error {
 	for inMsg = range s.msgCh {
 		if inMsg.GetError() != nil {
+
 			return inMsg.GetError()
 		}
-		onMessage(inMsg.Channel, inMsg.Data)
+		callback(inMsg.Channel, inMsg.Data)
 	}
 	return nil
 }

transport/websocket/websocket.go

@@ -46,6 +46,10 @@ func (w *Websocket) Init(endpoint string, options *transport.Options) error {
 
 	w.stopCh = make(chan error)
 	w.conn, _, err = websocket.DefaultDialer.Dial(endpoint, options.Headers)
+	if err != nil {
+		return err
+	}
+
 	err = w.conn.UnderlyingConn().(*tls.Conn).NetConn().(*net.TCPConn).SetKeepAlive(true)
 	if err != nil {
 		return err
@@ -138,7 +142,8 @@ func (w *Websocket) Handshake(msg *message.Message) (resp *message.Message, err
 // a connection is established by sending a message to the /meta/connect channel
 func (w *Websocket) Connect(msg *message.Message) error {
 	go func() {
-		log.Fatal(w.readWorker())
+		err := w.readWorker()
+		log.Fatal(err)
 	}()
 	return w.SendMessage(msg)
 }