iridium/neko-custom
Archived
2
0
Fork 0
Code Pull Requests Activity

lint fix.

Browse Source
This commit is contained in:
Miroslav Šedivý
2021-10-05 23:10:10 +02:00
parent 1ff743c598
commit 9c014336ff
16 changed files with 76 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/internal/websocket/admin.go
View File

@ -66,7 +66,10 @@ func (h *MessageHandler) adminControl(id string, session types.Session) error {
host, ok := h.sessions.GetHost()
h.sessions.SetHost(id)
err := h.sessions.SetHost(id)
if err != nil {
return err
}
if ok {
if err := h.sessions.Broadcast(
@ -138,7 +141,10 @@ func (h *MessageHandler) adminGive(id string, session types.Session, payload *me
}
// set host
h.sessions.SetHost(payload.ID)
err := h.sessions.SetHost(payload.ID)
if err != nil {
return err
}
// let everyone know
if err := h.sessions.Broadcast(

10
server/internal/websocket/control.go
View File

@ -35,7 +35,10 @@ func (h *MessageHandler) controlRequest(id string, session types.Session) error
// check for host
if !h.sessions.HasHost() {
// set host
h.sessions.SetHost(id)
err := h.sessions.SetHost(id)
if err != nil {
return err
}
// let everyone know
if err := h.sessions.Broadcast(
@ -89,7 +92,10 @@ func (h *MessageHandler) controlGive(id string, session types.Session, payload *
}
// set host
h.sessions.SetHost(payload.ID)
err := h.sessions.SetHost(payload.ID)
if err != nil {
return err
}
// let everyone know
if err := h.sessions.Broadcast(

4
server/internal/websocket/handler.go
View File

@ -42,8 +42,8 @@ func (h *MessageHandler) Connected(admin bool, socket *WebSocket) (bool, string,
return true, "", nil
}
func (h *MessageHandler) Disconnected(id string) error {
return h.sessions.Destroy(id)
func (h *MessageHandler) Disconnected(id string) {
h.sessions.Destroy(id)
}
func (h *MessageHandler) Message(id string, raw []byte) error {

38
server/internal/websocket/websocket.go
View File

@ -60,7 +60,7 @@ type WebSocketHandler struct {
conns uint32
}
func (ws *WebSocketHandler) Start() error {
func (ws *WebSocketHandler) Start() {
ws.sessions.OnCreated(func(id string, session types.Session) {
if err := ws.handler.SessionCreated(id, session); err != nil {
ws.logger.Warn().Str("id", id).Err(err).Msg("session created with and error")
@ -99,25 +99,33 @@ func (ws *WebSocketHandler) Start() error {
case <-ws.shutdown:
return
default:
if ws.sessions.HasHost() {
text := ws.remote.ReadClipboard()
if text != current {
session, ok := ws.sessions.GetHost()
if ok {
session.Send(message.Clipboard{
Event: event.CONTROL_CLIPBOARD,
Text: text,
})
}
current = text
time.Sleep(100 * time.Millisecond)
if !ws.sessions.HasHost() {
continue
}
text := ws.remote.ReadClipboard()
if text == current {
continue
}
session, ok := ws.sessions.GetHost()
if ok {
err := session.Send(message.Clipboard{
Event: event.CONTROL_CLIPBOARD,
Text: text,
})
if err != nil {
ws.logger.Err(err).Msg("unable to synchronize clipboard")
}
}
time.Sleep(100 * time.Millisecond)
current = text
}
}
}()
return nil
}
func (ws *WebSocketHandler) Shutdown() error {