identify control messages

transport/transport.go

@@ -23,7 +23,7 @@ type Transport interface {
 	Publish(subscription string, message *message.Message) error
 }
 
-type Event string
+type Event = string
 
 const (
 	Subscribe   Event = "/meta/subscribe"
@@ -33,6 +33,17 @@ const (
 	Disconnect  Event = "/meta/disconnect"
 )
 
+var ControlEvents = []Event{Subscribe, Connect, Unsubscribe, Handshake, Disconnect}
+
+func IsControlMsg(channel string) bool {
+	for i := range ControlEvents {
+		if channel == ControlEvents[i] {
+			return true
+		}
+	}
+	return false
+}
+
 var registeredTransports = map[string]Transport{}
 
 func RegisterTransport(t Transport) {

transport/websocket/websocket.go

@@ -7,7 +7,6 @@ import (
 	"github.com/thesyncim/faye/transport"
 	"log"
 	"strconv"
-	"strings"
 	"sync"
 	"sync/atomic"
 )
@@ -62,15 +61,21 @@ func (w *Websocket) readWorker() error {
 		}
 		//dispatch
 		msg := payload[0]
-		if strings.HasPrefix(msg.Channel, "/meta") {
-			continue //todo update introspect message and update state
+
+		if transport.IsControlMsg(msg.Channel) {
+			//handle it
+			log.Println("recv control message", debugJson(msg))
+
+			continue
 		}
 
 		w.subsMu.Lock()
 		subscription := w.subs[msg.Channel]
 		w.subsMu.Unlock()
 
-		subscription <- &msg
+		if subscription != nil {
+			subscription <- &msg
+		}
 	}
 
 }