more progress on refactor

server/internal/event/events.go

@@ -16,9 +16,10 @@ const CONTROL_LOCKED = "control/locked"
 const CONTROL_RELEASE = "control/release"
 const CONTROL_REQUEST = "control/request"
 const CONTROL_REQUESTING = "control/requesting"
+const CONTROL_GIVE = "control/give"
 
 const CHAT_MESSAGE = "chat/message"
-const CHAT_EMOJI = "chat/emoji"
+const CHAT_EMOTE = "chat/emote"
 
 const ADMIN_BAN = "admin/ban"
 const ADMIN_KICK = "admin/kick"
@@ -28,3 +29,4 @@ const ADMIN_UNLOCK = "admin/unlock"
 const ADMIN_UNMUTE = "admin/unmute"
 const ADMIN_CONTROL = "admin/control"
 const ADMIN_RELEASE = "admin/release"
+const ADMIN_GIVE = "admin/give"

server/internal/message/messages.go

@@ -45,6 +45,12 @@ type Control struct {
 	ID    string `json:"id"`
 }
 
+type ControlTarget struct {
+	Event  string `json:"event"`
+	ID     string `json:"id"`
+	Target string `json:"target"`
+}
+
 type ChatRecieve struct {
 	Event   string `json:"event"`
 	Content string `json:"content"`
@@ -56,15 +62,15 @@ type ChatSend struct {
 	Content string `json:"content"`
 }
 
-type EmojiRecieve struct {
+type EmoteRecieve struct {
 	Event string `json:"event"`
-	Emoji string `json:"emoji"`
+	Emote string `json:"emote"`
 }
 
-type EmojiSend struct {
+type EmoteSend struct {
 	Event string `json:"event"`
 	ID    string `json:"id"`
-	Emoji string `json:"emoji"`
+	Emote string `json:"emote"`
 }
 
 type Admin struct {

server/internal/websocket/admin.go

@@ -1,13 +1,21 @@
 package websocket
 
 import (
+	"strings"
+
 	"n.eko.moe/neko/internal/event"
 	"n.eko.moe/neko/internal/message"
 	"n.eko.moe/neko/internal/session"
 )
 
 func (h *MessageHandler) adminLock(id string, session *session.Session) error {
-	if !session.Admin || !h.locked {
+	if !session.Admin {
+		h.logger.Debug().Msg("user not admin")
+		return nil
+	}
+
+	if h.locked {
+		h.logger.Debug().Msg("server already locked...")
 		return nil
 	}
 
@@ -26,7 +34,13 @@ func (h *MessageHandler) adminLock(id string, session *session.Session) error {
 }
 
 func (h *MessageHandler) adminUnlock(id string, session *session.Session) error {
-	if !session.Admin || !h.locked {
+	if !session.Admin {
+		h.logger.Debug().Msg("user not admin")
+		return nil
+	}
+
+	if !h.locked {
+		h.logger.Debug().Msg("server not locked...")
 		return nil
 	}
 
@@ -46,6 +60,7 @@ func (h *MessageHandler) adminUnlock(id string, session *session.Session) error
 
 func (h *MessageHandler) adminControl(id string, session *session.Session) error {
 	if !session.Admin {
+		h.logger.Debug().Msg("user not admin")
 		return nil
 	}
 
@@ -79,6 +94,7 @@ func (h *MessageHandler) adminControl(id string, session *session.Session) error
 
 func (h *MessageHandler) adminRelease(id string, session *session.Session) error {
 	if !session.Admin {
+		h.logger.Debug().Msg("user not admin")
 		return nil
 	}
 
@@ -110,75 +126,28 @@ func (h *MessageHandler) adminRelease(id string, session *session.Session) error
 	return nil
 }
 
-func (h *MessageHandler) adminBan(id string, session *session.Session, payload *message.Admin) error {
+func (h *MessageHandler) adminGive(id string, session *session.Session, payload *message.Admin) error {
 	if !session.Admin {
+		h.logger.Debug().Msg("user not admin")
 		return nil
 	}
 
-	target, ok := h.sessions.Get(id)
-	if !ok {
+	if !h.sessions.Has(payload.ID) {
+		h.logger.Debug().Str("id", payload.ID).Msg("user does not exist")
 		return nil
 	}
 
-	if target.Admin {
-		return nil
-	}
-
-	address := target.RemoteAddr()
-	if address == nil {
-		return nil
-	}
-
-	h.banned[*address] = true
-
-	if err := session.Kick(message.Disconnect{
-		Event:   event.SYSTEM_DISCONNECT,
-		Message: "You have been banned",
-	}); err != nil {
-		return err
-	}
+	// set host
+	h.sessions.SetHost(payload.ID)
 
+	// let everyone know
 	if err := h.sessions.Brodcast(
 		message.AdminTarget{
-			Event:  event.ADMIN_BAN,
-			Target: target.ID,
+			Event:  event.CONTROL_GIVE,
 			ID:     id,
+			Target: payload.ID,
 		}, nil); err != nil {
-		h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.ADMIN_BAN)
-		return err
-	}
-
-	return nil
-}
-
-func (h *MessageHandler) adminKick(id string, session *session.Session, payload *message.Admin) error {
-	if !session.Admin {
-		return nil
-	}
-
-	target, ok := h.sessions.Get(payload.ID)
-	if !ok {
-		return nil
-	}
-
-	if target.Admin {
-		return nil
-	}
-
-	if err := target.Kick(message.Disconnect{
-		Event:   event.SYSTEM_DISCONNECT,
-		Message: "You have been kicked",
-	}); err != nil {
-		return err
-	}
-
-	if err := h.sessions.Brodcast(
-		message.AdminTarget{
-			Event:  event.ADMIN_KICK,
-			Target: target.ID,
-			ID:     id,
-		}, nil); err != nil {
-		h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.ADMIN_KICK)
+		h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.CONTROL_LOCKED)
 		return err
 	}
 
@@ -187,15 +156,18 @@ func (h *MessageHandler) adminKick(id string, session *session.Session, payload
 
 func (h *MessageHandler) adminMute(id string, session *session.Session, payload *message.Admin) error {
 	if !session.Admin {
+		h.logger.Debug().Msg("user not admin")
 		return nil
 	}
 
 	target, ok := h.sessions.Get(payload.ID)
 	if !ok {
+		h.logger.Debug().Str("id", payload.ID).Msg("can't find session id")
 		return nil
 	}
 
 	if target.Admin {
+		h.logger.Debug().Msg("target is an admin, baling")
 		return nil
 	}
 
@@ -216,11 +188,13 @@ func (h *MessageHandler) adminMute(id string, session *session.Session, payload
 
 func (h *MessageHandler) adminUnmute(id string, session *session.Session, payload *message.Admin) error {
 	if !session.Admin {
+		h.logger.Debug().Msg("user not admin")
 		return nil
 	}
 
 	target, ok := h.sessions.Get(payload.ID)
 	if !ok {
+		h.logger.Debug().Str("id", payload.ID).Msg("can't find target session")
 		return nil
 	}
 
@@ -238,3 +212,93 @@ func (h *MessageHandler) adminUnmute(id string, session *session.Session, payloa
 
 	return nil
 }
+
+func (h *MessageHandler) adminKick(id string, session *session.Session, payload *message.Admin) error {
+	if !session.Admin {
+		h.logger.Debug().Msg("user not admin")
+		return nil
+	}
+
+	target, ok := h.sessions.Get(payload.ID)
+	if !ok {
+		h.logger.Debug().Str("id", payload.ID).Msg("can't find session id")
+		return nil
+	}
+
+	if target.Admin {
+		h.logger.Debug().Msg("target is an admin, baling")
+		return nil
+	}
+
+	if err := target.Kick(message.Disconnect{
+		Event:   event.SYSTEM_DISCONNECT,
+		Message: "You have been kicked",
+	}); err != nil {
+		return err
+	}
+
+	if err := h.sessions.Brodcast(
+		message.AdminTarget{
+			Event:  event.ADMIN_KICK,
+			Target: target.ID,
+			ID:     id,
+		}, []string{payload.ID}); err != nil {
+		h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.ADMIN_KICK)
+		return err
+	}
+
+	return nil
+}
+
+func (h *MessageHandler) adminBan(id string, session *session.Session, payload *message.Admin) error {
+	if !session.Admin {
+		h.logger.Debug().Msg("user not admin")
+		return nil
+	}
+
+	target, ok := h.sessions.Get(payload.ID)
+	if !ok {
+		h.logger.Debug().Str("id", payload.ID).Msg("can't find session id")
+		return nil
+	}
+
+	if target.Admin {
+		h.logger.Debug().Msg("target is an admin, baling")
+		return nil
+	}
+
+	remote := target.RemoteAddr()
+	if remote == nil {
+		h.logger.Debug().Msg("no remote address, baling")
+		return nil
+	}
+
+	address := strings.SplitN(*remote, ":", -1)
+	if len(address[0]) < 1 {
+		h.logger.Debug().Str("address", *remote).Msg("no remote address, baling")
+		return nil
+	}
+
+	h.logger.Debug().Str("address", *remote).Msg("adding address to banned")
+
+	h.banned[address[0]] = true
+
+	if err := target.Kick(message.Disconnect{
+		Event:   event.SYSTEM_DISCONNECT,
+		Message: "You have been banned",
+	}); err != nil {
+		return err
+	}
+
+	if err := h.sessions.Brodcast(
+		message.AdminTarget{
+			Event:  event.ADMIN_BAN,
+			Target: target.ID,
+			ID:     id,
+		}, []string{payload.ID}); err != nil {
+		h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.ADMIN_BAN)
+		return err
+	}
+
+	return nil
+}

server/internal/websocket/chat.go

@@ -23,15 +23,15 @@ func (h *MessageHandler) chat(id string, session *session.Session, payload *mess
 	return nil
 }
 
-func (h *MessageHandler) chatEmoji(id string, session *session.Session, payload *message.EmojiRecieve) error {
+func (h *MessageHandler) chatEmote(id string, session *session.Session, payload *message.EmoteRecieve) error {
 	if session.Muted {
 		return nil
 	}
 
 	if err := h.sessions.Brodcast(
-		message.EmojiSend{
-			Event: event.CHAT_MESSAGE,
-			Emoji: payload.Emoji,
+		message.EmoteSend{
+			Event: event.CHAT_EMOTE,
+			Emote: payload.Emote,
 			ID:    id,
 		}, nil); err != nil {
 		h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.CONTROL_RELEASE)

server/internal/websocket/control.go

@@ -10,6 +10,7 @@ func (h *MessageHandler) controlRelease(id string, session *session.Session) err
 
 	// check if session is host
 	if !h.sessions.IsHost(id) {
+		h.logger.Debug().Str("id", id).Msg("is not the host")
 		return nil
 	}
 
@@ -31,8 +32,6 @@ func (h *MessageHandler) controlRelease(id string, session *session.Session) err
 }
 
 func (h *MessageHandler) controlRequest(id string, session *session.Session) error {
-	h.logger.Debug().Str("id", id).Msgf("user called %s", event.CONTROL_REQUEST)
-
 	// check for host
 	if !h.sessions.HasHost() {
 		// set host
@@ -76,3 +75,32 @@ func (h *MessageHandler) controlRequest(id string, session *session.Session) err
 
 	return nil
 }
+
+func (h *MessageHandler) controlGive(id string, session *session.Session, payload *message.Control) error {
+	// check if session is host
+	if !h.sessions.IsHost(id) {
+		h.logger.Debug().Str("id", id).Msg("is not the host")
+		return nil
+	}
+
+	if !h.sessions.Has(payload.ID) {
+		h.logger.Debug().Str("id", payload.ID).Msg("user does not exist")
+		return nil
+	}
+
+	// set host
+	h.sessions.SetHost(payload.ID)
+
+	// let everyone know
+	if err := h.sessions.Brodcast(
+		message.ControlTarget{
+			Event:  event.CONTROL_GIVE,
+			ID:     id,
+			Target: payload.ID,
+		}, nil); err != nil {
+		h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.CONTROL_LOCKED)
+		return err
+	}
+
+	return nil
+}

server/internal/websocket/handler.go

@@ -223,7 +223,6 @@ func (ws *WebSocketHandler) handle(socket *websocket.Conn, id string) {
 				Msg("recieved message from client")
 			if err := ws.handler.Message(id, raw); err != nil {
 				ws.logger.Error().Err(err).Msg("message handler has failed")
-				return
 			}
 		case <-cancel:
 			return

server/internal/websocket/messages.go

@@ -2,6 +2,7 @@ package websocket
 
 import (
 	"encoding/json"
+	"strings"
 
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
@@ -23,13 +24,24 @@ type MessageHandler struct {
 }
 
 func (h *MessageHandler) SocketConnected(id string, socket *websocket.Conn) (bool, string, error) {
-	ok, banned := h.banned[socket.RemoteAddr().String()]
-	if ok && banned {
-		return false, "you are banned", nil
+	remote := socket.RemoteAddr().String()
+	if remote != "" {
+		address := strings.SplitN(remote, ":", -1)
+		if len(address[0]) < 1 {
+			h.logger.Debug().Str("address", remote).Msg("no remote address, baling")
+		} else {
+
+			ok, banned := h.banned[address[0]]
+			if ok && banned {
+				h.logger.Debug().Str("address", remote).Msg("banned")
+				return false, "This IP has been banned", nil
+			}
+		}
 	}
 
 	if h.locked {
-		return false, "stream is currently locked", nil
+		h.logger.Debug().Str("address", remote).Msg("locked")
+		return false, "Server is currently locked", nil
 	}
 	return true, "", nil
 }
@@ -71,6 +83,12 @@ func (h *MessageHandler) Message(id string, raw []byte) error {
 		return errors.Wrapf(h.controlRelease(id, session), "%s failed", header.Event)
 	case event.CONTROL_REQUEST:
 		return errors.Wrapf(h.controlRequest(id, session), "%s failed", header.Event)
+	case event.CONTROL_GIVE:
+		payload := &message.Control{}
+		return errors.Wrapf(
+			utils.Unmarshal(payload, raw, func() error {
+				return h.controlGive(id, session, payload)
+			}), "%s failed", header.Event)
 
 	// Chat Events
 	case event.CHAT_MESSAGE:
@@ -79,11 +97,11 @@ func (h *MessageHandler) Message(id string, raw []byte) error {
 			utils.Unmarshal(payload, raw, func() error {
 				return h.chat(id, session, payload)
 			}), "%s failed", header.Event)
-	case event.CHAT_EMOJI:
-		payload := &message.EmojiRecieve{}
+	case event.CHAT_EMOTE:
+		payload := &message.EmoteRecieve{}
 		return errors.Wrapf(
 			utils.Unmarshal(payload, raw, func() error {
-				return h.chatEmoji(id, session, payload)
+				return h.chatEmote(id, session, payload)
 			}), "%s failed", header.Event)
 
 	// Admin Events
@@ -95,6 +113,12 @@ func (h *MessageHandler) Message(id string, raw []byte) error {
 		return errors.Wrapf(h.adminControl(id, session), "%s failed", header.Event)
 	case event.ADMIN_RELEASE:
 		return errors.Wrapf(h.adminRelease(id, session), "%s failed", header.Event)
+	case event.ADMIN_GIVE:
+		payload := &message.Admin{}
+		return errors.Wrapf(
+			utils.Unmarshal(payload, raw, func() error {
+				return h.adminGive(id, session, payload)
+			}), "%s failed", header.Event)
 	case event.ADMIN_BAN:
 		payload := &message.Admin{}
 		return errors.Wrapf(