Changeset 682 in code for trunk

Timestamp:

Nov 9, 2021, 9:09:17 PM (4 years ago)

Author:

contact

Message:

Add a queue for WHO commands

This has the following upsides:

• We can now routes WHO replies to the correct client, without broadcasting them to everybody.
• We are less likely to hit server rate limits when multiple downstreams are issuing WHO commands at the same time.

Location:

trunk

Files:

• downstream.go (modified) (2 diffs)
• upstream.go (modified) (12 diffs)
• user.go (modified) (1 diff)

trunk/downstream.go

@@ -1865 +1865 @@
                 }
 
-                uc.enqueueLIST(dc, msg)
+                uc.enqueueCommand(dc, msg)
         case "NAMES":
                 if len(msg.Params) == 0 {
@@ -1987 +1987 @@
                 }
 
-                uc.SendMessageLabeled(dc.id, &irc.Message{
+                uc.enqueueCommand(dc, &irc.Message{
                         Command: "WHO",
                         Params:  params,

trunk/upstream.go

@@ -75 +75 @@
 type pendingUpstreamCommand struct {
         downstreamID uint64
-        cmd          *irc.Message
+        msg          *irc.Message
 }
 
@@ -110 +110 @@
         casemapIsSet bool
 
-        // Queue of LIST commands in progress. The first entry has been sent to the
-        // server and is awaiting reply. The following entries have not been sent
-        // yet.
-        pendingLIST []pendingUpstreamCommand
+        // Queue of commands in progress, indexed by type. The first entry has been
+        // sent to the server and is awaiting reply. The following entries have not
+        // been sent yet.
+        pendingCmds map[string][]pendingUpstreamCommand
 
         gotMotd bool
@@ -209 +209 @@
                 availableMemberships:  stdMemberships,
                 isupport:              make(map[string]*string),
+                pendingCmds:           make(map[string][]pendingUpstreamCommand),
         }
         return uc, nil
@@ -226 +227 @@
 }
 
+func (uc *upstreamConn) downstreamByID(id uint64) *downstreamConn {
+        for _, dc := range uc.user.downstreamConns {
+                if dc.id == id {
+                        return dc
+                }
+        }
+        return nil
+}
+
 func (uc *upstreamConn) getChannel(name string) (*upstreamChannel, error) {
         ch := uc.channels.Value(name)
@@ -242 +252 @@
 }
 
-func (uc *upstreamConn) endPendingLISTs() {
-        for _, pendingCmd := range uc.pendingLIST {
-                uc.forEachDownstreamByID(pendingCmd.downstreamID, func(dc *downstreamConn) {
-                        dc.SendMessage(&irc.Message{
-                                Prefix:  dc.srv.prefix(),
-                                Command: irc.RPL_LISTEND,
-                                Params:  []string{dc.nick, "End of /LIST"},
-                        })
-                })
-        }
-        uc.pendingLIST = nil
-}
-
-func (uc *upstreamConn) sendNextPendingLIST() {
-        if len(uc.pendingLIST) == 0 {
+func (uc *upstreamConn) endPendingCommands() {
+        for _, l := range uc.pendingCmds {
+                for _, pendingCmd := range l {
+                        dc := uc.downstreamByID(pendingCmd.downstreamID)
+                        if dc == nil {
+                                continue
+                        }
+
+                        switch pendingCmd.msg.Command {
+                        case "LIST":
+                                dc.SendMessage(&irc.Message{
+                                        Prefix:  dc.srv.prefix(),
+                                        Command: irc.RPL_LISTEND,
+                                        Params:  []string{dc.nick, "End of /LIST"},
+                                })
+                        case "WHO":
+                                mask := "*"
+                                if len(pendingCmd.msg.Params) > 0 {
+                                        mask = pendingCmd.msg.Params[0]
+                                }
+                                dc.SendMessage(&irc.Message{
+                                        Prefix:  dc.srv.prefix(),
+                                        Command: irc.RPL_ENDOFWHO,
+                                        Params:  []string{dc.nick, mask, "End of /WHO"},
+                                })
+                        default:
+                                panic(fmt.Errorf("Unsupported pending command %q", pendingCmd.msg.Command))
+                        }
+                }
+        }
+
+        uc.pendingCmds = make(map[string][]pendingUpstreamCommand)
+}
+
+func (uc *upstreamConn) sendNextPendingCommand(cmd string) {
+        if len(uc.pendingCmds[cmd]) == 0 {
                 return
         }
-        uc.SendMessage(uc.pendingLIST[0].cmd)
-}
-
-func (uc *upstreamConn) enqueueLIST(dc *downstreamConn, cmd *irc.Message) {
-        uc.pendingLIST = append(uc.pendingLIST, pendingUpstreamCommand{
+        uc.SendMessage(uc.pendingCmds[cmd][0].msg)
+}
+
+func (uc *upstreamConn) enqueueCommand(dc *downstreamConn, msg *irc.Message) {
+        switch msg.Command {
+        case "LIST", "WHO":
+                // Supported
+        default:
+                panic(fmt.Errorf("Unsupported pending command %q", msg.Command))
+        }
+
+        uc.pendingCmds[msg.Command] = append(uc.pendingCmds[msg.Command], pendingUpstreamCommand{
                 downstreamID: dc.id,
-                cmd:          cmd,
+                msg:          msg,
         })
 
-        if len(uc.pendingLIST) == 1 {
-                uc.sendNextPendingLIST()
-        }
-}
-
-func (uc *upstreamConn) currentPendingLIST() (*downstreamConn, *irc.Message) {
-        if len(uc.pendingLIST) == 0 {
+        if len(uc.pendingCmds[msg.Command]) == 1 {
+                uc.sendNextPendingCommand(msg.Command)
+        }
+}
+
+func (uc *upstreamConn) currentPendingCommand(cmd string) (*downstreamConn, *irc.Message) {
+        if len(uc.pendingCmds[cmd]) == 0 {
                 return nil, nil
         }
 
-        pendingCmd := uc.pendingLIST[0]
-        for _, dc := range uc.user.downstreamConns {
-                if dc.id == pendingCmd.downstreamID {
-                        return dc, pendingCmd.cmd
-                }
-        }
-
-        return nil, pendingCmd.cmd
-}
-
-func (uc *upstreamConn) dequeueLIST() (*downstreamConn, *irc.Message) {
-        dc, cmd := uc.currentPendingLIST()
-
-        if len(uc.pendingLIST) > 0 {
-                copy(uc.pendingLIST, uc.pendingLIST[1:])
-                uc.pendingLIST = uc.pendingLIST[:len(uc.pendingLIST)-1]
-        }
-
-        uc.sendNextPendingLIST()
-
-        return dc, cmd
+        pendingCmd := uc.pendingCmds[cmd][0]
+        return uc.downstreamByID(pendingCmd.downstreamID), pendingCmd.msg
+}
+
+func (uc *upstreamConn) dequeueCommand(cmd string) (*downstreamConn, *irc.Message) {
+        dc, msg := uc.currentPendingCommand(cmd)
+
+        if len(uc.pendingCmds[cmd]) > 0 {
+                copy(uc.pendingCmds[cmd], uc.pendingCmds[cmd][1:])
+                uc.pendingCmds[cmd] = uc.pendingCmds[cmd][:len(uc.pendingCmds[cmd])-1]
+        }
+
+        uc.sendNextPendingCommand(cmd)
+
+        return dc, msg
 }
 
@@ -1096 +1128 @@
                 }
 
-                dc, cmd := uc.currentPendingLIST()
+                dc, cmd := uc.currentPendingCommand("LIST")
                 if cmd == nil {
                         return fmt.Errorf("unexpected RPL_LIST: no matching pending LIST")
@@ -1109 +1141 @@
                 })
         case irc.RPL_LISTEND:
-                dc, cmd := uc.dequeueLIST()
+                dc, cmd := uc.dequeueCommand("LIST")
                 if cmd == nil {
                         return fmt.Errorf("unexpected RPL_LISTEND: no matching pending LIST")
@@ -1196 +1228 @@
                 }
 
+                dc, cmd := uc.currentPendingCommand("WHO")
+                if cmd == nil {
+                        return fmt.Errorf("unexpected RPL_WHOREPLY: no matching pending WHO")
+                } else if dc == nil {
+                        return nil
+                }
+
                 parts := strings.SplitN(trailing, " ", 2)
                 if len(parts) != 2 {
@@ -1209 +1248 @@
                 trailing = strconv.Itoa(hops) + " " + realname
 
-                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
-                        channel := channel
-                        if channel != "*" {
-                                channel = dc.marshalEntity(uc.network, channel)
-                        }
-                        nick := dc.marshalEntity(uc.network, nick)
-                        dc.SendMessage(&irc.Message{
-                                Prefix:  dc.srv.prefix(),
-                                Command: irc.RPL_WHOREPLY,
-                                Params:  []string{dc.nick, channel, username, host, server, nick, mode, trailing},
-                        })
-                })
+                if channel != "*" {
+                        channel = dc.marshalEntity(uc.network, channel)
+                }
+                nick = dc.marshalEntity(uc.network, nick)
+                dc.SendMessage(&irc.Message{
+                        Prefix:  dc.srv.prefix(),
+                        Command: irc.RPL_WHOREPLY,
+                        Params:  []string{dc.nick, channel, username, host, server, nick, mode, trailing},
+                })
+        case rpl_whospcrpl:
+                dc, cmd := uc.currentPendingCommand("WHO")
+                if cmd == nil {
+                        return fmt.Errorf("unexpected RPL_WHOSPCRPL: no matching pending WHO")
+                } else if dc == nil {
+                        return nil
+                }
+
+                // Only supported in single-upstream mode, so forward as-is
+                dc.SendMessage(msg)
         case irc.RPL_ENDOFWHO:
                 var name string
@@ -1227 +1273 @@
                 }
 
-                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
-                        name := name
-                        if name != "*" {
-                                // TODO: support WHO masks
-                                name = dc.marshalEntity(uc.network, name)
-                        }
-                        dc.SendMessage(&irc.Message{
-                                Prefix:  dc.srv.prefix(),
-                                Command: irc.RPL_ENDOFWHO,
-                                Params:  []string{dc.nick, name, "End of /WHO list"},
-                        })
+                dc, cmd := uc.dequeueCommand("WHO")
+                if cmd == nil {
+                        return fmt.Errorf("unexpected RPL_ENDOFWHO: no matching pending WHO")
+                } else if dc == nil {
+                        return nil
+                }
+
+                mask := "*"
+                if len(cmd.Params) > 0 {
+                        mask = cmd.Params[0]
+                }
+                dc.SendMessage(&irc.Message{
+                        Prefix:  dc.srv.prefix(),
+                        Command: irc.RPL_ENDOFWHO,
+                        Params:  []string{dc.nick, mask, "End of /WHO list"},
                 })
         case irc.RPL_WHOISUSER:
@@ -1437 +1487 @@
                 }
 
-                if command == "LIST" {
-                        uc.endPendingLISTs()
+                if command == "LIST" || command == "WHO" {
+                        dc, _ := uc.dequeueCommand(command)
+                        if dc != nil && downstreamID == 0 {
+                                downstreamID = dc.id
+                        }
                 }
 
@@ -1454 +1507 @@
         case irc.RPL_YOURHOST, irc.RPL_CREATED:
                 // Ignore
-        case rpl_whospcrpl:
-                // Not supported in multi-upstream mode, forward as-is
-                uc.forEachDownstream(func(dc *downstreamConn) {
-                        dc.SendMessage(msg)
-                })
         case irc.RPL_LUSERCLIENT, irc.RPL_LUSEROP, irc.RPL_LUSERUNKNOWN, irc.RPL_LUSERCHANNELS, irc.RPL_LUSERME:
                 fallthrough

trunk/user.go

@@ -682 +682 @@
         uc.network.conn = nil
 
-        uc.endPendingLISTs()
+        uc.endPendingCommands()
 
         for _, entry := range uc.channels.innerMap {