feat: expose transport options on the graphqlws package (#37)

Author: dirkmc

graphqlws/http.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/gorilla/websocket"
 
@@ -54,6 +55,7 @@ type Option interface {
 
 type options struct {
 	contextGenerators []ContextGenerator
+	connectOptions    []connection.Option
 }
 
 type optionFunc func(*options)
@@ -70,6 +72,22 @@ func WithContextGenerator(f ContextGenerator) Option {
 	})
 }
 
+// WithReadLimit limits the maximum size of incoming messages
+func WithReadLimit(limit int64) Option {
+	return optionFunc(func(o *options) {
+		connOpt := connection.ReadLimit(limit)
+		o.connectOptions = append(o.connectOptions, connOpt)
+	})
+}
+
+// WithWriteTimeout sets a timeout for outgoing messages
+func WithWriteTimeout(d time.Duration) Option {
+	return optionFunc(func(o *options) {
+		connOpt := connection.WriteTimeout(d)
+		o.connectOptions = append(o.connectOptions, connOpt)
+	})
+}
+
 func applyOptions(opts ...Option) *options {
 	var o options
 
@@ -115,7 +133,7 @@ func (h *handler) NewHandlerFunc(svc connection.GraphQLService, httpHandler http
 				return
 			}
 
-			go connection.Connect(ctx, ws, svc)
+			go connection.Connect(ctx, ws, svc, o.connectOptions...)
 			return
 		}
 

graphqlws/internal/connection/connection.go

@@ -93,29 +93,31 @@ func (o *operationMap) delete(name string) {
 	o.mtx.Unlock()
 }
 
+type Option func(conn *connection)
+
 // ReadLimit limits the maximum size of incoming messages
-func ReadLimit(limit int64) func(conn *connection) {
+func ReadLimit(limit int64) Option {
 	return func(conn *connection) {
 		conn.ws.SetReadLimit(limit)
 	}
 }
 
 // WriteTimeout sets a timeout for outgoing messages
-func WriteTimeout(d time.Duration) func(conn *connection) {
+func WriteTimeout(d time.Duration) Option {
 	return func(conn *connection) {
 		conn.writeTimeout = d
 	}
 }
 
 // Connect implements the apollographql subscriptions-transport-ws [email protected]
 // https://github.com/apollographql/subscriptions-transport-ws/blob/v0.9.4/PROTOCOL.md
-func Connect(ctx context.Context, ws wsConnection, service GraphQLService, options ...func(conn *connection)) func() {
+func Connect(ctx context.Context, ws wsConnection, service GraphQLService, options ...Option) func() {
 	conn := &connection{
 		service: service,
 		ws:      ws,
 	}
 
-	defaultOpts := []func(conn *connection){
+	defaultOpts := []Option{
 		ReadLimit(4096),
 		WriteTimeout(time.Second),
 	}
@@ -202,7 +204,7 @@ func (conn *connection) addSubscription(ctx context.Context,
 		case <-t:
 			// setup timed out
 			ops.delete(message.ID)
-			ep := errPayload(errors.New("subscription connect timeout"))
+			ep := errPayload(fmt.Errorf("server subscription connect timeout after %s", conn.writeTimeout))
 			send(message.ID, typeError, ep)
 			send(message.ID, typeComplete, nil)
 			kill <- true