uniform re-exporting of sentinel errors and values

Author: endigma

v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/exports.go

@@ -3,6 +3,7 @@ package client
 import (
 	"github.com/wundergraph/graphql-go-tools/v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/common"
 	"github.com/wundergraph/graphql-go-tools/v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/protocol"
+	"github.com/wundergraph/graphql-go-tools/v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/transport"
 )
 
 // Re-export common types for single-import convenience.
@@ -18,6 +19,7 @@ type (
 )
 
 // Re-export constants.
+
 const (
 	TransportWS  = common.TransportWS
 	TransportSSE = common.TransportSSE
@@ -31,8 +33,19 @@ const (
 	SSEMethodGET  = common.SSEMethodGET
 )
 
+// Re-export error types.
+
+type (
+	ErrFailedUpgrade      = transport.ErrFailedUpgrade
+	ErrInvalidSubprotocol = transport.ErrInvalidSubprotocol
+)
+
 // Re-export sentinel errors.
+
 var (
-	ErrConnectionClosed = common.ErrConnectionClosed
-	ErrConnectionError  = protocol.ErrConnectionError
+	ErrConnectionClosed   = common.ErrConnectionClosed
+	ErrConnectionError    = protocol.ErrConnectionError
+	ErrAckTimeout         = protocol.ErrAckTimeout
+	ErrAckNotReceived     = protocol.ErrAckNotReceived
+	ErrSubscriptionExists = transport.ErrSubscriptionExists
 )

v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/protocol/graphql_transport_ws.go

@@ -68,7 +68,7 @@ func (p *GraphQLTransportWS) Init(ctx context.Context, conn *websocket.Conn, pay
 		var ackMessage incomingMessage
 		if err := wsjson.Read(ackCtx, conn, &ackMessage); err != nil {
 			if errors.Is(err, context.DeadlineExceeded) {
-				return errAckTimeout
+				return ErrAckTimeout
 			}
 			return fmt.Errorf("read connection_ack: %w", err)
 		}
@@ -82,7 +82,7 @@ func (p *GraphQLTransportWS) Init(ctx context.Context, conn *websocket.Conn, pay
 			}
 			continue
 		default:
-			return fmt.Errorf("%w: got %q", errAckNotReceived, ackMessage.Type)
+			return fmt.Errorf("%w: got %q", ErrAckNotReceived, ackMessage.Type)
 		}
 	}
 }

v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/protocol/graphql_transport_ws_test.go

@@ -56,7 +56,7 @@ func TestGraphQLTransportWS_Init(t *testing.T) {
 		p := &GraphQLTransportWS{AckTimeout: 50 * time.Millisecond}
 		err := p.Init(t.Context(), conn, nil)
 
-		require.ErrorIs(t, err, errAckTimeout)
+		require.ErrorIs(t, err, ErrAckTimeout)
 	})
 
 	t.Run("handles ping before ack", func(t *testing.T) {
@@ -106,7 +106,7 @@ func TestGraphQLTransportWS_Init(t *testing.T) {
 		p := NewGraphQLTransportWS()
 		err := p.Init(t.Context(), conn, nil)
 
-		assert.ErrorIs(t, err, errAckNotReceived)
+		assert.ErrorIs(t, err, ErrAckNotReceived)
 	})
 }
 

v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/protocol/graphql_ws.go

@@ -59,7 +59,7 @@ func (p *GraphQLWS) Init(ctx context.Context, conn *websocket.Conn, payload map[
 		var ackMessage incomingMessage
 		if err := wsjson.Read(ackCtx, conn, &ackMessage); err != nil {
 			if errors.Is(err, context.DeadlineExceeded) {
-				return errAckTimeout
+				return ErrAckTimeout
 			}
 			return fmt.Errorf("read connection_ack: %w", err)
 		}
@@ -78,7 +78,7 @@ func (p *GraphQLWS) Init(ctx context.Context, conn *websocket.Conn, payload map[
 			}
 			return fmt.Errorf("%w: %v", ErrConnectionError, errPayload)
 		default:
-			return fmt.Errorf("%w: got %q", errAckNotReceived, ackMessage.Type)
+			return fmt.Errorf("%w: got %q", ErrAckNotReceived, ackMessage.Type)
 		}
 	}
 }

v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/protocol/graphql_ws_test.go

@@ -56,7 +56,7 @@ func TestGraphQLWS_Init(t *testing.T) {
 		p := &GraphQLWS{AckTimeout: 50 * time.Millisecond}
 		err := p.Init(t.Context(), conn, nil)
 
-		require.ErrorIs(t, err, errAckTimeout)
+		require.ErrorIs(t, err, ErrAckTimeout)
 	})
 
 	t.Run("handles keep-alive before ack", func(t *testing.T) {
@@ -115,7 +115,7 @@ func TestGraphQLWS_Init(t *testing.T) {
 		p := NewGraphQLWS()
 		err := p.Init(t.Context(), conn, nil)
 
-		assert.ErrorIs(t, err, errAckNotReceived)
+		assert.ErrorIs(t, err, ErrAckNotReceived)
 	})
 }
 

v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/protocol/protocol.go

@@ -24,8 +24,8 @@ type Protocol interface {
 }
 
 var (
-	errAckTimeout      = errors.New("connection_ack timeout")
-	errAckNotReceived  = errors.New("expected connection_ack")
+	ErrAckTimeout      = errors.New("connection_ack timeout")
+	ErrAckNotReceived  = errors.New("expected connection_ack")
 	ErrConnectionError = errors.New("connection error from server")
 )
 

v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/transport/ws_conn.go

@@ -16,7 +16,7 @@ import (
 )
 
 var (
-	errSubscriptionExists = errors.New("subscription ID already exists")
+	ErrSubscriptionExists = errors.New("subscription ID already exists")
 
 	defaultWriteTimeout = 5 * time.Second
 	defaultReadLimit    = int64(1024 * 1024) // 1MB
@@ -121,7 +121,7 @@ func (c *wsConnection) subscribe(ctx context.Context, id string, req *common.Req
 
 	if _, exists := c.subs[id]; exists {
 		c.subsMu.Unlock()
-		return nil, nil, errSubscriptionExists
+		return nil, nil, ErrSubscriptionExists
 	}
 
 	c.subs[id] = ch

v2/pkg/engine/datasource/graphql_datasource/subscriptionclient/transport/ws_conn_test.go

@@ -52,7 +52,7 @@ func TestWSConnection_Subscribe(t *testing.T) {
 
 		_, _, err = wsc.subscribe(context.Background(), "sub-1", &common.Request{})
 
-		assert.ErrorIs(t, err, errSubscriptionExists)
+		assert.ErrorIs(t, err, ErrSubscriptionExists)
 	})
 
 	t.Run("returns error when connection is closed", func(t *testing.T) {