resolves merge conflicts

Author: stuartwk

api/main.go

@@ -55,7 +55,7 @@ Options:
 	defer cancel()
 
 	// drain on sigterm
-	go func() {
+	go server.HandleError(func() {
 		defer cancel()
 		select {
 		case <-ctx.Done():
@@ -67,7 +67,7 @@ Options:
 			case <-time.After(DrainTimeout):
 			}
 		}
-	}()
+	})
 
 	routes := []*router.Route{
 		router.NewRoute("GET", "/privacy.txt", router.Txt),

connect/connect_test.go

@@ -488,6 +488,7 @@ func testConnect(
 		settings.ConnectionAnnounceTimeout = 0
 		// settings.ConnectionRateLimitSettings.MaxTotalConnectionCount = 1000
 		settings.ConnectionRateLimitSettings.BurstConnectionCount = 1000
+		// settings.MaximumExchangeMessageByteCount = 2 * int(messageContentSizes[len(messageContentSizes)-1])
 		connectHandler := NewConnectHandler(ctx, server.NewId(), exchange, settings)
 
 		fmt.Printf("create server :%d (:%d :%d)\n", port, settings.ListenH3Port, settings.ListenDnsPort)

connect/main.go

@@ -3,10 +3,11 @@ package main
 import (
 	"context"
 	// "fmt"
-	// "net/http"
 	"net"
+	"net/http"
 	"os"
 	"strconv"
+	"strings"
 	"syscall"
 	"time"
 
@@ -16,6 +17,7 @@ import (
 
 	"github.com/urnetwork/glog"
 
+	"github.com/urnetwork/connect"
 	"github.com/urnetwork/server"
 	"github.com/urnetwork/server/model"
 	"github.com/urnetwork/server/router"
@@ -39,6 +41,9 @@ Options:
 		panic(err)
 	}
 
+	// use up to a 4gib message pool per instance
+	connect.ResizeMessagePools(connect.Gib(4))
+
 	// server.Logger().Printf("%s\n", opts)
 
 	quitEvent := server.NewEventWithContext(context.Background())
@@ -56,8 +61,10 @@ Options:
 	handlerId := model.CreateNetworkClientHandler(ctx)
 
 	connectHandler := NewConnectHandlerWithDefaults(ctx, handlerId, exchange)
+	proxyConnectHandler := NewProxyConnectHandlerWithDefaults(ctx, handlerId, exchange)
 	// update the heartbeat
-	go func() {
+	go server.HandleError(func() {
+		defer cancel()
 		for {
 			select {
 			case <-ctx.Done():
@@ -73,22 +80,38 @@ Options:
 				}
 			})
 		}
-	}()
+	})
 
 	// drain on sigterm
-	go func() {
+	go server.HandleError(func() {
 		defer cancel()
 		select {
 		case <-ctx.Done():
-			return
 		case <-quitEvent.Ctx.Done():
 			exchange.Drain()
 		}
-	}()
+	})
+
+	connectRouter := func(w http.ResponseWriter, r *http.Request) {
+		host := r.Header.Get("X-Forwarded-Host")
+		if host == "" {
+			host = r.Header.Get("Host")
+		}
+
+		sub := strings.SplitAfterN(host, ".", 2)[0]
+		if sub == "connect" {
+			// the host is connect.<domain>
+			connectHandler.Connect(w, r)
+		} else {
+			// the host is <auth>.connect.<domain>
+			proxyConnectHandler.Connect(w, r)
+		}
+	}
 
+	// FIXME multiplex connectHandler.Connect and proxyConnectHandler.Connect
 	routes := []*router.Route{
 		router.NewRoute("GET", "/status", router.WarpStatus),
-		router.NewRoute("GET", "/", connectHandler.Connect),
+		router.NewRoute("*", "/", connectRouter),
 	}
 
 	port, _ := opts.Int("--port")