Changeset 302 in code

Timestamp:

May 27, 2020, 9:47:49 PM (5 years ago)

Author:

delthas

Message:

Forward all labeled errors and unknown messages to their downstream

This adds support for forwarding all errors and unknown messages labeled
with a specific downstream to that downstream.

Provided that the upstream supports labeled-response, users will now be
able to receive an error only on their client when making a command that
returns an error, as well as receiving any reply unknown to soju.

File:

• trunk/upstream.go (modified) (3 diffs)

trunk/upstream.go

@@ -1183 +1183 @@
                         })
                 })
-        case irc.ERR_UNKNOWNCOMMAND, irc.RPL_TRYAGAIN:
-                var command, reason string
-                if err := parseMessageParams(msg, nil, &command, &reason); err != nil {
-                        return err
-                }
-
-                if command == "LIST" {
-                        ok := uc.endPendingLISTs(false)
-                        if !ok {
-                                return fmt.Errorf("unexpected response for LIST: %q: no matching pending LIST", msg.Command)
-                        }
-                        uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
-                                dc.SendMessage(&irc.Message{
-                                        Prefix:  uc.srv.prefix(),
-                                        Command: msg.Command,
-                                        Params:  []string{dc.nick, "LIST", reason},
-                                })
-                        })
-                }
         case irc.RPL_AWAY:
                 var nick, reason string
@@ -1272 +1253 @@
                         })
                 })
+        case irc.ERR_UNKNOWNCOMMAND, irc.RPL_TRYAGAIN:
+                var command, reason string
+                if err := parseMessageParams(msg, nil, &command, &reason); err != nil {
+                        return err
+                }
+
+                if command == "LIST" {
+                        ok := uc.endPendingLISTs(false)
+                        if !ok {
+                                return fmt.Errorf("unexpected response for LIST: %q: no matching pending LIST", msg.Command)
+                        }
+                }
+
+                if downstreamID != 0 {
+                        uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
+                                dc.SendMessage(&irc.Message{
+                                        Prefix:  uc.srv.prefix(),
+                                        Command: msg.Command,
+                                        Params:  []string{dc.nick, command, reason},
+                                })
+                        })
+                }
         case "TAGMSG":
                 // TODO: relay to downstream connections that accept message-tags
@@ -1292 +1295 @@
         default:
                 uc.logger.Printf("unhandled message: %v", msg)
+                if downstreamID != 0 {
+                        uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
+                                // best effort marshaling for unknown messages, replies and errors:
+                                // most numerics start with the user nick, marshal it if that's the case
+                                // otherwise, conservately keep the params without marshaling
+                                params := msg.Params
+                                if _, err := strconv.Atoi(msg.Command); err == nil { // numeric
+                                        if len(msg.Params) > 0 && isOurNick(uc.network, msg.Params[0]) {
+                                                params[0] = dc.nick
+                                        }
+                                }
+                                dc.SendMessage(&irc.Message{
+                                        Prefix:  uc.srv.prefix(),
+                                        Command: msg.Command,
+                                        Params:  params,
+                                })
+                        })
+                }
         }
         return nil