Changeset 323 in code for trunk/cmd

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/cmd/soju/main.go (modified) (3 diffs)

trunk/cmd/soju/main.go

@@ -6 +6 @@
         "log"
         "net"
+        "net/http"
         "net/url"
         "strings"
@@ -57 +58 @@
         srv.Hostname = cfg.Hostname
         srv.LogPath = cfg.LogPath
+        srv.HTTPOrigins = cfg.HTTPOrigins
         srv.Debug = debug
 
@@ -98 +100 @@
                                 log.Fatal(srv.Serve(ln))
                         }()
+                case "wss":
+                        addr := u.Host
+                        if _, _, err := net.SplitHostPort(addr); err != nil {
+                                addr = addr + ":https"
+                        }
+                        httpSrv := http.Server{
+                                Addr:      addr,
+                                TLSConfig: tlsCfg,
+                                Handler:   srv,
+                        }
+                        go func() {
+                                log.Fatal(httpSrv.ListenAndServeTLS("", ""))
+                        }()
+                case "ws+insecure":
+                        addr := u.Host
+                        if _, _, err := net.SplitHostPort(addr); err != nil {
+                                addr = addr + ":http"
+                        }
+                        httpSrv := http.Server{
+                                Addr:    addr,
+                                Handler: srv,
+                        }
+                        go func() {
+                                log.Fatal(httpSrv.ListenAndServe())
+                        }()
                 default:
                         log.Fatalf("failed to listen on %q: unsupported scheme", listen)