Changeset 485 in code for trunk/user.go

Timestamp:

Mar 29, 2021, 3:49:50 PM (4 years ago)

Author:

contact

Message:

Introduce deliveredStore

This hides the double-map complexity behind a dedicated type.

File:

• trunk/user.go (modified) (4 diffs)

trunk/user.go

@@ -58 +58 @@
 type deliveredClientMap map[string]string // client name -> msg ID
 
+type deliveredStore struct {
+        m deliveredCasemapMap
+}
+
+func newDeliveredStore() deliveredStore {
+        return deliveredStore{deliveredCasemapMap{newCasemapMap(0)}}
+}
+
+func (ds deliveredStore) HasTarget(target string) bool {
+        return ds.m.Value(target) != nil
+}
+
+func (ds deliveredStore) LoadID(target, clientName string) string {
+        clients := ds.m.Value(target)
+        if clients == nil {
+                return ""
+        }
+        return clients[clientName]
+}
+
+func (ds deliveredStore) StoreID(target, clientName, msgID string) {
+        clients := ds.m.Value(target)
+        if clients == nil {
+                clients = make(deliveredClientMap)
+                ds.m.SetValue(target, clients)
+        }
+        clients[clientName] = msgID
+}
+
+func (ds deliveredStore) ForEachTarget(f func(target string)) {
+        for _, entry := range ds.m.innerMap {
+                f(entry.originalKey)
+        }
+}
+
 type network struct {
         Network
@@ -65 +100 @@
         conn      *upstreamConn
         channels  channelCasemapMap
-        delivered deliveredCasemapMap
+        delivered deliveredStore
         lastError error
         casemap   casemapping
@@ -82 +117 @@
                 stopped:   make(chan struct{}),
                 channels:  m,
-                delivered: deliveredCasemapMap{newCasemapMap(0)},
+                delivered: newDeliveredStore(),
                 casemap:   casemapRFC1459,
         }
@@ -254 +289 @@
         net.casemap = newCasemap
         net.channels.SetCasemapping(newCasemap)
-        net.delivered.SetCasemapping(newCasemap)
+        net.delivered.m.SetCasemapping(newCasemap)
         if net.conn != nil {
                 net.conn.channels.SetCasemapping(newCasemap)