mirror of
https://github.com/m1k1o/neko.git
synced 2025-05-22 05:27:05 +02:00
progress on server refactor
This commit is contained in:
parent
81abb88317
commit
78af798d68
14 changed files with 392 additions and 131 deletions
|
@ -20,36 +20,14 @@ type MessageHandler struct {
|
|||
webrtc *webrtc.WebRTCManager
|
||||
}
|
||||
|
||||
func (h *MessageHandler) Connected(id string, socket *websocket.Conn) error {
|
||||
func (h *MessageHandler) SocketConnected(id string, socket *websocket.Conn) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (h *MessageHandler) Disconnected(id string) error {
|
||||
func (h *MessageHandler) SocketDisconnected(id string) error {
|
||||
return h.sessions.Destroy(id)
|
||||
}
|
||||
|
||||
func (h *MessageHandler) Created(id string, session *session.Session) error {
|
||||
if err := session.Send(message.IdentityProvide{
|
||||
Message: message.Message{Event: event.IDENTITY_PROVIDE},
|
||||
ID: id,
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (h *MessageHandler) Destroyed(id string) error {
|
||||
if h.sessions.IsHost(id) {
|
||||
h.sessions.ClearHost()
|
||||
if err := h.sessions.Brodcast(message.Message{Event: event.CONTROL_RELEASED}, []string{id}); err != nil {
|
||||
h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.CONTROL_RELEASED)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (h *MessageHandler) Message(id string, raw []byte) error {
|
||||
header := message.Message{}
|
||||
if err := json.Unmarshal(raw, &header); err != nil {
|
||||
|
@ -62,9 +40,18 @@ func (h *MessageHandler) Message(id string, raw []byte) error {
|
|||
}
|
||||
|
||||
switch header.Event {
|
||||
case event.SDP_PROVIDE:
|
||||
payload := message.SDP{}
|
||||
return errors.Wrapf(utils.Unmarshal(&payload, raw, func() error { return h.webrtc.CreatePeer(id, payload.SDP) }), "%s failed", header.Event)
|
||||
case event.SIGNAL_PROVIDE:
|
||||
payload := message.Signal{}
|
||||
return errors.Wrapf(
|
||||
utils.Unmarshal(&payload, raw, func() error {
|
||||
return h.webrtc.CreatePeer(id, payload.SDP)
|
||||
}), "%s failed", header.Event)
|
||||
case event.IDENTITY_DETAILS:
|
||||
payload := &message.IdentityDetails{}
|
||||
return errors.Wrapf(
|
||||
utils.Unmarshal(payload, raw, func() error {
|
||||
return h.identityDetails(id, session, payload)
|
||||
}), "%s failed", header.Event)
|
||||
case event.CONTROL_RELEASE:
|
||||
return errors.Wrapf(h.controlRelease(id, session), "%s failed", header.Event)
|
||||
case event.CONTROL_REQUEST:
|
||||
|
@ -73,59 +60,3 @@ func (h *MessageHandler) Message(id string, raw []byte) error {
|
|||
return errors.Errorf("unknown message event %s", header.Event)
|
||||
}
|
||||
}
|
||||
|
||||
func (h *MessageHandler) controlRelease(id string, session *session.Session) error {
|
||||
if !h.sessions.IsHost(id) {
|
||||
return nil
|
||||
}
|
||||
|
||||
h.logger.Debug().Str("id", id).Msgf("host called %s", event.CONTROL_RELEASED)
|
||||
h.sessions.ClearHost()
|
||||
|
||||
if err := session.Send(message.Message{Event: event.CONTROL_RELEASE}); err != nil {
|
||||
h.logger.Warn().Err(err).Str("id", id).Msgf("sending event %s has failed", event.CONTROL_RELEASE)
|
||||
return err
|
||||
}
|
||||
|
||||
if err := h.sessions.Brodcast(message.Message{Event: event.CONTROL_RELEASED}, []string{session.ID}); err != nil {
|
||||
h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.CONTROL_RELEASED)
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (h *MessageHandler) controlRequest(id string, session *session.Session) error {
|
||||
h.logger.Debug().Str("id", id).Msgf("user called %s", event.CONTROL_REQUEST)
|
||||
|
||||
if !h.sessions.HasHost() {
|
||||
h.sessions.SetHost(id)
|
||||
|
||||
if err := session.Send(message.Message{Event: event.CONTROL_GIVE}); err != nil {
|
||||
h.logger.Warn().Err(err).Str("id", id).Msgf("sending event %s has failed", event.CONTROL_GIVE)
|
||||
return err
|
||||
}
|
||||
|
||||
if err := h.sessions.Brodcast(message.Message{Event: event.CONTROL_GIVEN}, []string{session.ID}); err != nil {
|
||||
h.logger.Warn().Err(err).Msgf("brodcasting event %s has failed", event.CONTROL_GIVEN)
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
if err := session.Send(message.Message{Event: event.CONTROL_LOCKED}); err != nil {
|
||||
h.logger.Warn().Err(err).Str("id", id).Msgf("sending event %s has failed", event.CONTROL_LOCKED)
|
||||
return err
|
||||
}
|
||||
|
||||
host, ok := h.sessions.GetHost()
|
||||
if ok {
|
||||
if err := host.Send(message.Message{Event: event.CONTROL_REQUESTING}); err != nil {
|
||||
h.logger.Warn().Err(err).Str("id", id).Msgf("sending event %s has failed", event.CONTROL_REQUESTING)
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue