Changeset 155 in code

Timestamp:

Mar 25, 2020, 10:20:56 PM (5 years ago)

Author:

delthas

Message:

Add upstream labeled-response capability support

Location:

trunk

Files:

• irc.go (modified) (1 diff)
• upstream.go (modified) (10 diffs)

trunk/irc.go

@@ -199 +199 @@
         Params []string
         Outer  *batch // if not-nil, this batch is nested in Outer
-}
+        Label  string
+}

trunk/upstream.go

@@ -4 +4 @@
         "crypto/tls"
         "encoding/base64"
+        "errors"
         "fmt"
         "io"
@@ -52 +53 @@
         batches    map[string]batch
 
-        tagsSupported bool
+        tagsSupported   bool
+        labelsSupported bool
+        nextLabelId     uint64
 
         saslClient  sasl.Client
@@ -128 +131 @@
 }
 
+func (uc *upstreamConn) forEachDownstreamById(id uint64, f func(*downstreamConn)) {
+        uc.forEachDownstream(func(dc *downstreamConn) {
+                if id != 0 && id != dc.id {
+                        return
+                }
+                f(dc)
+        })
+}
+
 func (uc *upstreamConn) getChannel(name string) (*upstreamChannel, error) {
         ch, ok := uc.channels[name]
@@ -153 +165 @@
 
 func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
+        var label string
+        if l, ok := msg.GetTag("label"); ok {
+                label = l
+        }
+
         var msgBatch *batch
         if batchName, ok := msg.GetTag("batch"); ok {
@@ -160 +177 @@
                 }
                 msgBatch = &b
+                if label == "" {
+                        label = msgBatch.Label
+                }
+        }
+
+        var downstreamId uint64 = 0
+        if label != "" {
+                var labelOffset uint64
+                n, err := fmt.Sscanf(label, "sd-%d-%d", &downstreamId, &labelOffset)
+                if err == nil && n < 2 {
+                        err = errors.New("not enough arguments")
+                }
+                if err != nil {
+                        return fmt.Errorf("unexpected message label: invalid downstream reference for label %q: %v", label, err)
+                }
         }
 
@@ -205 +237 @@
 
                         requestCaps := make([]string, 0, 16)
-                        for _, c := range []string{"message-tags", "batch"} {
+                        for _, c := range []string{"message-tags", "batch", "labeled-response"} {
                                 if _, ok := uc.caps[c]; ok {
                                         requestCaps = append(requestCaps, c)
@@ -432 +464 @@
                                 return err
                         }
+                        label := label
+                        if label == "" && msgBatch != nil {
+                                label = msgBatch.Label
+                        }
                         uc.batches[tag] = batch{
                                 Type:   batchType,
                                 Params: msg.Params[2:],
                                 Outer:  msgBatch,
+                                Label:  label,
                         }
                 } else if strings.HasPrefix(tag, "-") {
@@ -950 +987 @@
         case "TAGMSG":
                 // TODO: relay to downstream connections that accept message-tags
+        case "ACK":
+                // Ignore
         case irc.RPL_YOURHOST, irc.RPL_CREATED:
                 // Ignore
@@ -1048 +1087 @@
         case "message-tags":
                 uc.tagsSupported = ok
+        case "labeled-response":
+                uc.labelsSupported = ok
         }
         return nil
@@ -1074 +1115 @@
         uc.outgoing <- msg
 }
+
+func (uc *upstreamConn) SendMessageLabeled(dc *downstreamConn, msg *irc.Message) {
+        if uc.labelsSupported {
+                if msg.Tags == nil {
+                        msg.Tags = make(map[string]irc.TagValue)
+                }
+                msg.Tags["label"] = irc.TagValue(fmt.Sprintf("sd-%d-%d", dc.id, uc.nextLabelId))
+                uc.nextLabelId++
+        }
+        uc.SendMessage(msg)
+}