gateway: do not send commands during identify

Author: jonas747

gateway.go

@@ -904,13 +904,7 @@ func (g *GatewayConnection) open(sessionID string, sequence int64) error {
 // startWorkers starts the background workers for reading, receiving and heartbeating
 func (g *GatewayConnection) startWorkers() error {
 	// The writer
-	writerWorker := &wsWriter{
-		conn:           g.conn,
-		session:        g.manager.session,
-		closer:         g.stopWorkers,
-		incoming:       make(chan interface{}),
-		sendCloseQueue: make(chan []byte),
-	}
+	writerWorker := newWSWriter(g.conn, g.manager.session, g.stopWorkers)
 	g.writer = writerWorker
 	go writerWorker.Run()
 
@@ -1250,6 +1244,8 @@ func (g *GatewayConnection) handleReady(r *Ready) {
 	g.status = GatewayStatusReady
 	g.mu.Unlock()
 
+	g.writer.readyRecv <- true
+
 	g.manager.SetSessionInfo(r.SessionID, 0)
 }
 
@@ -1312,7 +1308,7 @@ func (g *GatewayConnection) identify() error {
 }
 
 func (g *GatewayConnection) resume(sessionID string, sequence int64) error {
-	op := &outgoingEvent{
+	op := outgoingEvent{
 		Operation: GatewayOPResume,
 		Data: &resumeData{
 			Token:     g.manager.session.Token,
@@ -1333,7 +1329,7 @@ func (g *GatewayConnection) resume(sessionID string, sequence int64) error {
 }
 
 func (g *GatewayConnection) RequestGuildMembers(d *RequestGuildMembersData) {
-	op := &outgoingEvent{
+	op := outgoingEvent{
 		Operation: GatewayOPRequestGuildMembers,
 		Data:      d,
 	}

wsapi.go

@@ -14,16 +14,30 @@ import (
 type wsWriter struct {
 	session *Session
 
-	conn           net.Conn
-	closer         chan interface{}
-	incoming       chan interface{}
-	sendCloseQueue chan []byte
+	conn               net.Conn
+	closer             chan interface{}
+	incoming           chan outgoingEvent
+	sendCloseQueue     chan []byte
+	readyRecv          chan bool
+	waitingForIdentify bool
+	queuedEvents       []*outgoingEvent
 
 	writer *wsutil.Writer
 
 	sendRatelimiter chan bool
 }
 
+func newWSWriter(conn net.Conn, session *Session, closer chan interface{}) *wsWriter {
+	return &wsWriter{
+		conn:           conn,
+		session:        session,
+		closer:         closer,
+		incoming:       make(chan outgoingEvent, 10),
+		sendCloseQueue: make(chan []byte),
+		readyRecv:      make(chan bool),
+	}
+}
+
 func (w *wsWriter) Run() {
 	w.sendRatelimiter = make(chan bool)
 	go w.runSendRatelimiter()
@@ -41,20 +55,34 @@ func (w *wsWriter) Run() {
 			}
 			return
 		case msg := <-w.incoming:
-			var err error
-			switch t := msg.(type) {
-			case []byte:
-				err = w.writeRaw(t)
-			default:
-				err = w.writeJson(t)
+			if w.waitingForIdentify {
+				w.queuedEvents = append(w.queuedEvents, &msg)
+				continue
+			}
+
+			if msg.Operation == GatewayOPIdentify {
+				w.waitingForIdentify = true
 			}
 
+			err := w.writeJson(msg)
 			if err != nil {
 				w.session.log(LogError, "Error writing to gateway: %s", err.Error())
 				return
 			}
 		case body := <-w.sendCloseQueue:
 			w.sendClose(body)
+
+		case <-w.readyRecv:
+			w.waitingForIdentify = false
+			for _, msg := range w.queuedEvents {
+				err := w.writeJson(msg)
+				if err != nil {
+					w.session.log(LogError, "Error writing to gateway: %s", err.Error())
+					return
+				}
+			}
+
+			w.queuedEvents = nil
 		}
 	}
 }
@@ -106,7 +134,7 @@ func (w *wsWriter) sendClose(body []byte) error {
 
 }
 
-func (w *wsWriter) Queue(data interface{}) {
+func (w *wsWriter) Queue(data outgoingEvent) {
 	select {
 	case <-time.After(time.Second * 10):
 	case <-w.closer:
@@ -177,10 +205,10 @@ func (wh *wsHeartBeater) SendBeat() {
 	wh.Lock()
 	wh.lastSend = time.Now()
 	wh.Unlock()
-	
+
 	seq := atomic.LoadInt64(wh.sequence)
 
-	wh.writer.Queue(&outgoingEvent{
+	wh.writer.Queue(outgoingEvent{
 		Operation: GatewayOPHeartbeat,
 		Data:      seq,
 	})