Changeset 323 in code for trunk/server.go

Timestamp:

Jun 7, 2020, 12:13:46 PM (5 years ago)

Author:

contact

Message:

Add support for WebSocket connections

WebSocket connections allow web-based clients to connect to IRC. This
commit implements the WebSocket sub-protocol as specified by the pending
IRCv3 proposal [1].

WebSocket listeners can now be set up via a "wss" protocol in the
listen directive. The new http-origin directive allows the CORS
allowed origins to be configured.

[1]: ​https://github.com/ircv3/ircv3-specifications/pull/342

File:

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

trunk/server.go

@@ -5 +5 @@
         "log"
         "net"
+        "net/http"
         "sync"
+        "sync/atomic"
         "time"
 
         "gopkg.in/irc.v3"
+        "nhooyr.io/websocket"
 )
 
@@ -45 +48 @@
         LogPath      string
         Debug        bool
+        HTTPOrigins  []string
 
         db *DB
@@ -92 +96 @@
 }
 
+var lastDownstreamID uint64 = 0
+
+func (s *Server) handle(ic ircConn, remoteAddr string) {
+        id := atomic.AddUint64(&lastDownstreamID, 1)
+        dc := newDownstreamConn(s, ic, remoteAddr, id)
+        if err := dc.runUntilRegistered(); err != nil {
+                dc.logger.Print(err)
+        } else {
+                dc.user.events <- eventDownstreamConnected{dc}
+                if err := dc.readMessages(dc.user.events); err != nil {
+                        dc.logger.Print(err)
+                }
+                dc.user.events <- eventDownstreamDisconnected{dc}
+        }
+        dc.Close()
+}
+
 func (s *Server) Serve(ln net.Listener) error {
-        var nextDownstreamID uint64 = 1
         for {
-                netConn, err := ln.Accept()
+                conn, err := ln.Accept()
                 if err != nil {
                         return fmt.Errorf("failed to accept connection: %v", err)
                 }
 
-                dc := newDownstreamConn(s, netConn, nextDownstreamID)
-                nextDownstreamID++
-                go func() {
-                        if err := dc.runUntilRegistered(); err != nil {
-                                dc.logger.Print(err)
-                        } else {
-                                dc.user.events <- eventDownstreamConnected{dc}
-                                if err := dc.readMessages(dc.user.events); err != nil {
-                                        dc.logger.Print(err)
-                                }
-                                dc.user.events <- eventDownstreamDisconnected{dc}
-                        }
-                        dc.Close()
-                }()
+                go s.handle(newNetIRCConn(conn), conn.RemoteAddr().String())
         }
 }
+
+func (s *Server) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+        conn, err := websocket.Accept(w, req, &websocket.AcceptOptions{
+                OriginPatterns: s.HTTPOrigins,
+        })
+        if err != nil {
+                s.Logger.Printf("failed to serve HTTP connection: %v", err)
+                return
+        }
+        s.handle(newWebsocketIRCConn(conn), req.RemoteAddr)
+}