1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-26 02:25:58 +01:00

Move client notifications into addClient and delClient.

This commit is contained in:
Juliusz Chroboczek 2020-05-31 20:41:17 +02:00
parent 8472f9bf0b
commit b8128f81a0
3 changed files with 48 additions and 54 deletions

View file

@ -36,6 +36,10 @@ func (client *diskClient) getUsername() string {
return "RECORDING" return "RECORDING"
} }
func (client *diskClient) pushClient(id, username string, add bool) error {
return nil
}
func (client *diskClient) Close() error { func (client *diskClient) Close() error {
client.mu.Lock() client.mu.Lock()
defer client.mu.Unlock() defer client.mu.Unlock()

View file

@ -26,6 +26,7 @@ type client interface {
getId() string getId() string
getUsername() string getUsername() string
pushConn(conn *upConnection, tracks []*upTrack, label string) error pushConn(conn *upConnection, tracks []*upTrack, label string) error
pushClient(id, username string, add bool) error
} }
type chatHistoryEntry struct { type chatHistoryEntry struct {
@ -202,23 +203,23 @@ type userid struct {
username string username string
} }
func addClient(name string, client client, user, pass string) (*group, []userid, error) { func addClient(name string, c client, user, pass string) (*group, error) {
g, err := addGroup(name, nil) g, err := addGroup(name, nil)
if err != nil { if err != nil {
return nil, nil, err return nil, err
} }
perms, err := getPermission(g.description, user, pass) perms, err := getPermission(g.description, user, pass)
if err != nil { if err != nil {
return nil, nil, err return nil, err
} }
c, ok := client.(*webClient) w, ok := c.(*webClient)
if ok { if ok {
c.permissions = perms w.permissions = perms
} }
if !perms.Op && atomic.LoadUint32(&g.locked) != 0 { if !perms.Op && atomic.LoadUint32(&g.locked) != 0 {
return nil, nil, userError("group is locked") return nil, userError("group is locked")
} }
g.mu.Lock() g.mu.Lock()
@ -226,19 +227,26 @@ func addClient(name string, client client, user, pass string) (*group, []userid,
if !perms.Op && g.description.MaxClients > 0 { if !perms.Op && g.description.MaxClients > 0 {
if len(g.clients) >= g.description.MaxClients { if len(g.clients) >= g.description.MaxClients {
return nil, nil, userError("too many users") return nil, userError("too many users")
} }
} }
if g.clients[client.getId()] != nil { if g.clients[c.getId()] != nil {
return nil, nil, protocolError("duplicate client id") return nil, protocolError("duplicate client id")
} }
var users []userid g.clients[c.getId()] = c
for _, c := range g.clients {
users = append(users, userid{c.getId(), c.getUsername()}) go func(clients []client) {
for _, cc := range clients {
err := c.pushClient(cc.getId(), cc.getUsername(), true)
if err == ErrClientDead {
return
} }
g.clients[client.getId()] = client cc.pushClient(c.getId(), c.getUsername(), true)
return g, users, nil }
}(g.getClientsUnlocked(c))
return g, nil
} }
func delClient(c client) { func delClient(c client) {
@ -251,11 +259,21 @@ func delClient(c client) {
return return
} }
delete(g.clients, c.getId()) delete(g.clients, c.getId())
go func(clients []client) {
for _, cc := range clients {
cc.pushClient(c.getId(), c.getUsername(), false)
}
}(g.getClientsUnlocked(c))
} }
func (g *group) getClients(except client) []client { func (g *group) getClients(except client) []client {
g.mu.Lock() g.mu.Lock()
defer g.mu.Unlock() defer g.mu.Unlock()
return g.getClientsUnlocked(except)
}
func (g *group) getClientsUnlocked(except client) []client {
clients := make([]client, 0, len(g.clients)) clients := make([]client, 0, len(g.clients))
for _, c := range g.clients { for _, c := range g.clients {
if c != except { if c != except {

View file

@ -119,6 +119,15 @@ func (c *webClient) getUsername() string {
return c.username return c.username
} }
func (c *webClient) pushClient(id, username string, add bool) error {
return c.write(clientMessage{
Type: "user",
Id: id,
Username: username,
Del: !add,
})
}
type rateMap map[string]uint32 type rateMap map[string]uint32
func (v *rateMap) UnmarshalJSON(b []byte) error { func (v *rateMap) UnmarshalJSON(b []byte) error {
@ -249,50 +258,13 @@ func startClient(conn *websocket.Conn) (err error) {
c.writerDone = make(chan struct{}) c.writerDone = make(chan struct{})
go clientWriter(conn, c.writeCh, c.writerDone) go clientWriter(conn, c.writeCh, c.writerDone)
g, users, err := addClient(m.Group, c, m.Username, m.Password) g, err := addClient(m.Group, c, m.Username, m.Password)
if err != nil { if err != nil {
return return
} }
c.group = g c.group = g
defer delClient(c) defer delClient(c)
for _, u := range users {
c.write(clientMessage{
Type: "user",
Id: u.id,
Username: u.username,
})
}
clients := g.getClients(nil)
u := clientMessage{
Type: "user",
Id: c.id,
Username: c.username,
}
for _, c := range clients {
c, ok := c.(*webClient)
if ok {
c.write(u)
}
}
defer func() {
clients := g.getClients(c)
u := clientMessage{
Type: "user",
Id: c.id,
Username: c.username,
Del: true,
}
for _, c := range clients {
c, ok := c.(*webClient)
if ok {
c.write(u)
}
}
}()
return clientLoop(c, conn) return clientLoop(c, conn)
} }
@ -1597,7 +1569,7 @@ func handleClientMessage(c *webClient, m clientMessage) error {
group: c.group, group: c.group,
id: "recording", id: "recording",
} }
_, _, err := addClient(c.group.name, disk, "", "") _, err := addClient(c.group.name, disk, "", "")
if err != nil { if err != nil {
disk.Close() disk.Close()
return c.error(err) return c.error(err)