quality of life, updated config structure

ws/registry.go

@@ -13,14 +13,17 @@ func (q *BoundedQueue) Enqueue(m GatewayMessageOut) bool {
 	if q.capacity == 0 {
 		return false
 	}
+
 	if q.length < q.capacity {
 		q.buf[(q.start+q.length)%q.capacity] = m
 		q.length++
 		return true
 	}
+
 	// overwrite oldest
 	q.buf[q.start] = m
 	q.start = (q.start + 1) % q.capacity
+
 	return true
 }
 
@@ -30,12 +33,15 @@ func (q *BoundedQueue) PopAll() []GatewayMessageOut {
 	if q.length == 0 {
 		return nil
 	}
+
 	out := make([]GatewayMessageOut, 0, q.length)
 	for i := 0; i < q.length; i++ {
 		out = append(out, q.buf[(q.start+i)%q.capacity])
 	}
+
 	q.start = 0
 	q.length = 0
+
 	return out
 }
 
@@ -64,6 +70,19 @@ func (r *Registry) getOrCreate(channel string) *ChannelEntry {
 	return e
 }
 
+func (r *Registry) ForEach(cb func(channelID string)) {
+	r.mu.RLock()
+	ids := make([]string, 0, len(r.entries))
+	for id := range r.entries {
+		ids = append(ids, id)
+	}
+	r.mu.RUnlock()
+
+	for _, id := range ids {
+		cb(id)
+	}
+}
+
 //
 
 // RegisterMod : map channel_id -> mod conn (serverID)
@@ -71,9 +90,12 @@ func (r *Registry) RegisterMod(channelID, serverID string, conn *websocket.Conn)
 	e := r.getOrCreate(channelID)
 	e.mu.Lock()
 	defer e.mu.Unlock()
+
 	if e.Mod != nil && e.Mod.Conn != nil {
+
 		_ = e.Mod.Conn.Close()
 	}
+
 	e.Mod = &ConnWrapper{Conn: conn, ServerID: serverID, LastSeen: time.Now()}
 	// flush queued bot->mod messages for this channel
 	// caller should use FlushChannelWithSender to perform actual sends
@@ -82,9 +104,11 @@ func (r *Registry) RegisterMod(channelID, serverID string, conn *websocket.Conn)
 // RegisterBot : single connection for bot. after registration call FlushAllToBotWithSender
 func (r *Registry) RegisterBot(conn *websocket.Conn) {
 	r.botMu.Lock()
+
 	if r.bot != nil && r.bot.Conn != nil {
 		_ = r.bot.Conn.Close()
 	}
+
 	r.bot = &ConnWrapper{Conn: conn, LastSeen: time.Now()}
 	r.botMu.Unlock()
 }
@@ -103,13 +127,7 @@ func (r *Registry) UnregisterMod(channelID string) {
 	e.mu.Unlock()
 
 	if modConn != nil && modConn.Conn != nil {
-		_ = modConn.Conn.SetWriteDeadline(time.Now().Add(time.Second))
-		_ = modConn.Conn.WriteControl(
-			websocket.CloseMessage,
-			websocket.FormatCloseMessage(websocket.CloseNormalClosure, "Disconnecting."),
-			time.Now().Add(time.Second),
-		)
-		_ = modConn.Conn.Close()
+		closeConn(modConn.Conn)
 	}
 }
 
@@ -120,13 +138,7 @@ func (r *Registry) UnregisterBot() {
 	r.botMu.Unlock()
 
 	if botConn != nil && botConn.Conn != nil {
-		_ = botConn.Conn.SetWriteDeadline(time.Now().Add(time.Second))
-		_ = botConn.Conn.WriteControl(
-			websocket.CloseMessage,
-			websocket.FormatCloseMessage(websocket.CloseNormalClosure, "Disconnecting."),
-			time.Now().Add(time.Second),
-		)
-		_ = botConn.Conn.Close()
+		closeConn(botConn.Conn)
 	}
 }
 
@@ -135,6 +147,7 @@ func (r *Registry) Send(channelID string, out GatewayMessageOut, sendOverConn fu
 		r.botMu.Lock()
 		b := r.bot
 		r.botMu.Unlock()
+
 		if b != nil && b.Conn != nil {
 			if err := sendOverConn(b.Conn, out); err == nil {
 				return true, false, nil
@@ -147,6 +160,7 @@ func (r *Registry) Send(channelID string, out GatewayMessageOut, sendOverConn fu
 		e.mu.Lock()
 		enq := e.Queue.Enqueue(out)
 		e.mu.Unlock()
+
 		if !enq {
 			return false, false, fmt.Errorf("queue disabled")
 		}
@@ -157,6 +171,7 @@ func (r *Registry) Send(channelID string, out GatewayMessageOut, sendOverConn fu
 	e.mu.Lock()
 	mod := e.Mod
 	e.mu.Unlock()
+
 	if mod != nil && mod.Conn != nil {
 		if err := sendOverConn(mod.Conn, out); err == nil {
 			return true, false, nil
@@ -168,6 +183,7 @@ func (r *Registry) Send(channelID string, out GatewayMessageOut, sendOverConn fu
 	e.mu.Lock()
 	enq := e.Queue.Enqueue(out)
 	e.mu.Unlock()
+
 	if !enq {
 		return false, false, fmt.Errorf("queue disabled")
 	}
@@ -183,11 +199,13 @@ func (r *Registry) FlushChannelWithSender(channelID string, sendOverConn func(*w
 	if e == nil {
 		return
 	}
+
 	e.mu.Lock()
 	if e.Mod == nil || e.Mod.Conn == nil {
 		e.mu.Unlock()
 		return
 	}
+
 	msgs := e.Queue.PopAll()
 	modConn := e.Mod.Conn
 	e.mu.Unlock()
@@ -221,6 +239,7 @@ func (r *Registry) FlushAllToBotWithSender(sendOverConn func(*websocket.Conn, Ga
 		e.mu.Lock()
 		msgs := e.Queue.PopAll()
 		e.mu.Unlock()
+
 		if len(msgs) == 0 {
 			continue
 		}