Changeset 323 in code for trunk/conn.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/conn.go (modified) (4 diffs)

trunk/conn.go

@@ -2 +2 @@
 
 import (
+        "context"
         "fmt"
         "net"
@@ -8 +9 @@
 
         "gopkg.in/irc.v3"
+        "nhooyr.io/websocket"
 )
 
@@ -16 +18 @@
         WriteMessage(*irc.Message) error
         Close() error
+        SetReadDeadline(time.Time) error
         SetWriteDeadline(time.Time) error
-        SetReadDeadline(time.Time) error
 }
 
-func netIRCConn(c net.Conn) ircConn {
+func newNetIRCConn(c net.Conn) ircConn {
         type netConn net.Conn
         return struct {
@@ -26 +28 @@
                 netConn
         }{irc.NewConn(c), c}
+}
+
+type websocketIRCConn struct {
+        conn                        *websocket.Conn
+        readDeadline, writeDeadline time.Time
+}
+
+func newWebsocketIRCConn(c *websocket.Conn) ircConn {
+        return websocketIRCConn{conn: c}
+}
+
+func (wic websocketIRCConn) ReadMessage() (*irc.Message, error) {
+        ctx := context.Background()
+        if !wic.readDeadline.IsZero() {
+                var cancel context.CancelFunc
+                ctx, cancel = context.WithDeadline(ctx, wic.readDeadline)
+                defer cancel()
+        }
+        _, b, err := wic.conn.Read(ctx)
+        if err != nil {
+                return nil, err
+        }
+        return irc.ParseMessage(string(b))
+}
+
+func (wic websocketIRCConn) WriteMessage(msg *irc.Message) error {
+        b := []byte(msg.String())
+        ctx := context.Background()
+        if !wic.writeDeadline.IsZero() {
+                var cancel context.CancelFunc
+                ctx, cancel = context.WithDeadline(ctx, wic.writeDeadline)
+                defer cancel()
+        }
+        return wic.conn.Write(ctx, websocket.MessageText, b)
+}
+
+func (wic websocketIRCConn) Close() error {
+        return wic.conn.Close(websocket.StatusNormalClosure, "")
+}
+
+func (wic websocketIRCConn) SetReadDeadline(t time.Time) error {
+        wic.readDeadline = t
+        return nil
+}
+
+func (wic websocketIRCConn) SetWriteDeadline(t time.Time) error {
+        wic.writeDeadline = t
+        return nil
 }