Changeset 165 in code for trunk

Timestamp:

Mar 27, 2020, 3:33:19 PM (5 years ago)

Author:

contact

Message:

Introduce a user.events channel

This allows to easily add new events, and also guarantees ordering
between different event types.

Location:

trunk

Files:

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

trunk/downstream.go

@@ -228 +228 @@
 }
 
-func (dc *downstreamConn) readMessages(ch chan<- downstreamIncomingMessage) error {
+func (dc *downstreamConn) readMessages(ch chan<- event) error {
         for {
                 msg, err := dc.irc.ReadMessage()
@@ -241 +241 @@
                 }
 
-                ch <- downstreamIncomingMessage{msg, dc}
+                ch <- eventDownstreamMessage{msg, dc}
         }
 

trunk/server.go

@@ -120 +120 @@
                                 dc.logger.Print(err)
                         } else {
-                                if err := dc.readMessages(dc.user.downstreamIncoming); err != nil {
+                                if err := dc.readMessages(dc.user.events); err != nil {
                                         dc.logger.Print(err)
                                 }

trunk/upstream.go

@@ -1168 +1168 @@
 }
 
-func (uc *upstreamConn) readMessages(ch chan<- upstreamIncomingMessage) error {
+func (uc *upstreamConn) readMessages(ch chan<- event) error {
         for {
                 msg, err := uc.irc.ReadMessage()
@@ -1181 +1181 @@
                 }
 
-                ch <- upstreamIncomingMessage{msg, uc}
+                ch <- eventUpstreamMessage{msg, uc}
         }
 

trunk/user.go

@@ -8 +8 @@
 )
 
-type upstreamIncomingMessage struct {
+type event interface{}
+
+type eventUpstreamMessage struct {
         msg *irc.Message
         uc  *upstreamConn
 }
 
-type downstreamIncomingMessage struct {
+type eventDownstreamMessage struct {
         msg *irc.Message
         dc  *downstreamConn
@@ -59 +61 @@
                 net.lock.Unlock()
 
-                if err := uc.readMessages(net.user.upstreamIncoming); err != nil {
+                if err := uc.readMessages(net.user.events); err != nil {
                         uc.logger.Printf("failed to handle messages: %v", err)
                 }
@@ -80 +82 @@
         srv *Server
 
-        upstreamIncoming   chan upstreamIncomingMessage
-        downstreamIncoming chan downstreamIncomingMessage
+        events chan event
 
         lock            sync.Mutex
@@ -90 +91 @@
 func newUser(srv *Server, record *User) *user {
         return &user{
-                User:               *record,
-                srv:                srv,
-                upstreamIncoming:   make(chan upstreamIncomingMessage, 64),
-                downstreamIncoming: make(chan downstreamIncomingMessage, 64),
+                User:   *record,
+                srv:    srv,
+                events: make(chan event, 64),
         }
 }
@@ -150 +150 @@
         u.lock.Unlock()
 
-        for {
-                select {
-                case upstreamMsg := <-u.upstreamIncoming:
-                        msg, uc := upstreamMsg.msg, upstreamMsg.uc
+        for e := range u.events {
+                switch e := e.(type) {
+                case eventUpstreamMessage:
+                        msg, uc := e.msg, e.uc
                         if uc.closed {
                                 uc.logger.Printf("ignoring message on closed connection: %v", msg)
@@ -161 +161 @@
                                 uc.logger.Printf("failed to handle message %q: %v", msg, err)
                         }
-                case downstreamMsg := <-u.downstreamIncoming:
-                        msg, dc := downstreamMsg.msg, downstreamMsg.dc
+                case eventDownstreamMessage:
+                        msg, dc := e.msg, e.dc
                         if dc.isClosed() {
                                 dc.logger.Printf("ignoring message on closed connection: %v", msg)
@@ -175 +175 @@
                                 dc.Close()
                         }
+                default:
+                        u.srv.Logger.Printf("received unknown event type: %T", e)
                 }
         }