mirror of
https://github.com/lukaszraczylo/go-simple-graphql.git
synced 2026-10-12 00:45:31 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
489247c42a | ||
|
|
6c55bccc20 | ||
|
|
97cf896a17 | ||
|
|
71a14721c5 | ||
|
|
cd16b92dca | ||
|
|
b314a25549 | ||
|
|
240929a808 |
@@ -24,9 +24,11 @@ Therefore, I present you the simple client to which you can copy & paste your gr
|
||||
## Features
|
||||
|
||||
* Executing GraphQL queries as they are, without types declaration
|
||||
* HTTP2 support!
|
||||
* HTTP/2 support for HTTPS endpoints (automatic)
|
||||
* HTTP/1.1 for HTTP endpoints (compatible with all servers)
|
||||
* Automatic retry with configurable error patterns
|
||||
* Support for additional headers
|
||||
* Query cache
|
||||
* Query cache with compression
|
||||
|
||||
## Usage example
|
||||
|
||||
@@ -37,15 +39,113 @@ Therefore, I present you the simple client to which you can copy & paste your gr
|
||||
* `GRAPHQL_CACHE_TTL` - Cache TTL in seconds for SELECT type of queries. Default: `5`
|
||||
* `GRAPHQL_OUTPUT` - Output format. Default: `string`, available: `byte`, `string`, `mapstring`
|
||||
* `LOG_LEVEL` - Logging level. Default: `info` available: `debug`, `info`, `warn`, `error`
|
||||
* `GRAPHQL_RETRIES_ENABLE` - Should retries be enabled? Default: `true`
|
||||
* `GRAPHQL_RETRIES_NUMBER` - Number of retries: Default: `1`
|
||||
* `GRAPHQL_RETRIES_ENABLE` - Should retries be enabled? Default: `false`
|
||||
* `GRAPHQL_RETRIES_NUMBER` - Number of retries: Default: `3`
|
||||
* `GRAPHQL_RETRIES_DELAY` - Delay in retries in milliseconds. Default: `250`
|
||||
* `GRAPHQL_RETRIES_PATTERNS` - Comma-separated error patterns that trigger retries. Default: `postgres,connection,timeout,transaction,could not,temporarily unavailable,deadlock`
|
||||
* `GRAPHQL_POOL_WARMUP_ENABLED` - Enable intelligent connection pool warmup. Default: `false`
|
||||
* `GRAPHQL_POOL_SIZE` - Number of connections to pre-create and maintain. Default: `5`
|
||||
* `GRAPHQL_POOL_WARMUP_QUERY` - Query used for warming up connections. Default: `query{__typename}`
|
||||
* `GRAPHQL_POOL_HEALTH_INTERVAL` - Interval in seconds for pool health checks. Default: `30`
|
||||
|
||||
### Modifiers on the fly
|
||||
|
||||
* `gql.SetEndpoint('your-endpoint-url')` - modifies endpoint, without the need to set the environment variable
|
||||
* `gql.SetOutput('byte')` - modifies output format, without the need to set the environment variable
|
||||
|
||||
### Retries
|
||||
|
||||
The library supports automatic retries for both HTTP-level errors and GraphQL errors that match configurable patterns.
|
||||
|
||||
**Retry behavior:**
|
||||
- **HTTP errors** (status codes outside 200-299): Always retried if retries are enabled
|
||||
- **GraphQL errors**: Only retried if the error message contains one of the configured patterns
|
||||
- **Non-matching errors**: Fail immediately without retrying (e.g., validation errors, field not found)
|
||||
|
||||
**Configuring retryable patterns:**
|
||||
|
||||
By default, errors containing these patterns will trigger retries:
|
||||
- `postgres` - Database connection/transaction errors
|
||||
- `connection` - Network connection issues
|
||||
- `timeout` - Request timeout errors
|
||||
- `transaction` - Database transaction conflicts
|
||||
- `could not` - Generic transient failures
|
||||
- `temporarily unavailable` - Service unavailability
|
||||
- `deadlock` - Database deadlocks
|
||||
|
||||
You can customize these patterns using the `GRAPHQL_RETRIES_PATTERNS` environment variable:
|
||||
|
||||
```bash
|
||||
export GRAPHQL_RETRIES_PATTERNS="postgres,connection,timeout,custom-error-pattern"
|
||||
```
|
||||
|
||||
**Example:** To handle flaky Hasura database connections, enable retries:
|
||||
|
||||
```bash
|
||||
export GRAPHQL_RETRIES_ENABLE=true
|
||||
export GRAPHQL_RETRIES_NUMBER=3
|
||||
export GRAPHQL_RETRIES_DELAY=250
|
||||
```
|
||||
|
||||
This will retry GraphQL queries up to 3 times when postgres transaction errors occur, with exponential backoff starting at 250ms.
|
||||
|
||||
### Intelligent Connection Pooling
|
||||
|
||||
The library supports intelligent connection pooling with pre-warmed connections and automatic health monitoring. This significantly improves performance during traffic spikes by keeping hot standby connections ready.
|
||||
|
||||
**How it works:**
|
||||
- **Pre-warming**: Connections are created and warmed up during initialization
|
||||
- **Health monitoring**: Background process periodically checks connection health
|
||||
- **Auto-refresh**: Automatically replaces stale or broken connections
|
||||
- **Hot standbys**: Ready connections eliminate cold-start latency
|
||||
|
||||
**Configuration:**
|
||||
|
||||
Enable connection pool warmup for production environments with variable traffic:
|
||||
|
||||
```bash
|
||||
export GRAPHQL_POOL_WARMUP_ENABLED=true
|
||||
export GRAPHQL_POOL_SIZE=5 # Number of hot standby connections
|
||||
export GRAPHQL_POOL_HEALTH_INTERVAL=30 # Health check every 30 seconds
|
||||
export GRAPHQL_POOL_WARMUP_QUERY="query{__typename}" # Lightweight health check query
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
- ⚡ **Instant response** - Connections already established during traffic spikes
|
||||
- 🔄 **Auto-healing** - Detects and replaces broken connections automatically
|
||||
- 📊 **Predictable performance** - Eliminates connection establishment latency
|
||||
- 🛡️ **Resilience** - Maintains pool health even during network instability
|
||||
|
||||
**Recommended settings by use case:**
|
||||
|
||||
```bash
|
||||
# High-traffic API (e.g., production web app)
|
||||
GRAPHQL_POOL_WARMUP_ENABLED=true
|
||||
GRAPHQL_POOL_SIZE=10
|
||||
GRAPHQL_POOL_HEALTH_INTERVAL=15
|
||||
|
||||
# Medium-traffic service (e.g., background jobs)
|
||||
GRAPHQL_POOL_WARMUP_ENABLED=true
|
||||
GRAPHQL_POOL_SIZE=5
|
||||
GRAPHQL_POOL_HEALTH_INTERVAL=30
|
||||
|
||||
# Low-traffic/development
|
||||
GRAPHQL_POOL_WARMUP_ENABLED=false # Default: on-demand connections
|
||||
```
|
||||
|
||||
**Graceful shutdown:**
|
||||
|
||||
When shutting down your application, stop the pool monitor gracefully:
|
||||
|
||||
```go
|
||||
func main() {
|
||||
gql := graphql.NewConnection()
|
||||
defer gql.StopPoolMonitor() // Ensure clean shutdown
|
||||
|
||||
// Your application logic
|
||||
}
|
||||
```
|
||||
|
||||
### Cache
|
||||
|
||||
You have two options to enable the cache:
|
||||
|
||||
+86
-39
@@ -3,11 +3,11 @@ package gql
|
||||
import (
|
||||
"bytes"
|
||||
"compress/gzip"
|
||||
"crypto/tls"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
"unicode/utf8"
|
||||
|
||||
@@ -32,23 +32,49 @@ func max(a, b int) int {
|
||||
return b
|
||||
}
|
||||
|
||||
var (
|
||||
// Shared HTTP transport with optimized settings
|
||||
defaultTransport = &http.Transport{
|
||||
MaxIdleConns: 100,
|
||||
MaxIdleConnsPerHost: 100,
|
||||
IdleConnTimeout: 90 * time.Second,
|
||||
DisableCompression: true, // Disable automatic request compression to prevent "trailing garbage" errors
|
||||
ForceAttemptHTTP2: true,
|
||||
TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, // Skip TLS verification for test environments
|
||||
// isRetryableError checks if GraphQL errors contain patterns that indicate a transient failure
|
||||
// that should be retried (e.g., database connection issues, timeouts, transaction conflicts)
|
||||
func isRetryableError(errors []struct {
|
||||
Message interface{} `json:"message"`
|
||||
}, patterns []string) bool {
|
||||
if len(errors) == 0 || len(patterns) == 0 {
|
||||
return false
|
||||
}
|
||||
|
||||
// Shared HTTP client with timeouts
|
||||
defaultClient = &http.Client{
|
||||
Transport: defaultTransport,
|
||||
Timeout: 30 * time.Second,
|
||||
for _, err := range errors {
|
||||
// Try to extract error message as string
|
||||
var msgStr string
|
||||
switch msg := err.Message.(type) {
|
||||
case string:
|
||||
msgStr = msg
|
||||
case map[string]interface{}:
|
||||
// Handle nested error structures (e.g., {"message": "...", "extensions": {...}})
|
||||
if nestedMsg, ok := msg["message"].(string); ok {
|
||||
msgStr = nestedMsg
|
||||
}
|
||||
default:
|
||||
// If we can't convert to string, try fmt.Sprint as fallback
|
||||
msgStr = fmt.Sprint(msg)
|
||||
}
|
||||
|
||||
if msgStr == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
// Check if error message contains any of the configured retry patterns (case-insensitive)
|
||||
msgLower := strings.ToLower(msgStr)
|
||||
for _, pattern := range patterns {
|
||||
if strings.Contains(msgLower, strings.ToLower(pattern)) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
// Note: defaultClient removed - all clients should be created via NewConnection()
|
||||
// which properly configures HTTP/2 transport with correct settings
|
||||
|
||||
func (qe *QueryExecutor) executeQuery() ([]byte, error) {
|
||||
// Reuse buffer from pool to avoid allocations
|
||||
@@ -131,12 +157,16 @@ func (qe *QueryExecutor) executeQuery() ([]byte, error) {
|
||||
},
|
||||
})
|
||||
|
||||
// Use default client if custom client is not set
|
||||
client := qe.client
|
||||
if client == nil {
|
||||
client = defaultClient
|
||||
// Client should always be set via NewConnection(), but check for safety
|
||||
if qe.client == nil {
|
||||
qe.Logger.Error(&libpack_logger.LogMessage{
|
||||
Message: "HTTP client not initialized - use NewConnection() to create client",
|
||||
Pairs: nil,
|
||||
})
|
||||
return fmt.Errorf("HTTP client not initialized")
|
||||
}
|
||||
httpResponse, err := client.Do(httpRequest)
|
||||
|
||||
httpResponse, err := qe.client.Do(httpRequest)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -331,6 +361,38 @@ func (qe *QueryExecutor) executeQuery() ([]byte, error) {
|
||||
return fmt.Errorf("error unmarshalling HTTP response: %w", err)
|
||||
}
|
||||
|
||||
// Check for GraphQL errors in the response
|
||||
if len(queryResult.Errors) > 0 {
|
||||
// Determine if this is a retryable error based on configured patterns
|
||||
if isRetryableError(queryResult.Errors, qe.retries_patterns) {
|
||||
// Log as warning since we'll retry
|
||||
qe.Logger.Warning(&libpack_logger.LogMessage{
|
||||
Message: "Retryable GraphQL error detected",
|
||||
Pairs: map[string]interface{}{"errors": queryResult.Errors},
|
||||
})
|
||||
// Return error to trigger retry mechanism
|
||||
return fmt.Errorf("retryable error executing query: %s", queryResult.Errors)
|
||||
}
|
||||
|
||||
// Non-retryable error - log and fail immediately without retrying
|
||||
qe.Logger.Error(&libpack_logger.LogMessage{
|
||||
Message: "Non-retryable GraphQL error",
|
||||
Pairs: map[string]interface{}{"errors": queryResult.Errors},
|
||||
})
|
||||
// Use retry.Unrecoverable to skip remaining retry attempts
|
||||
return retry.Unrecoverable(fmt.Errorf("error executing query: %s", queryResult.Errors))
|
||||
}
|
||||
|
||||
// Check for null data in the response
|
||||
if queryResult.Data == nil {
|
||||
qe.Logger.Error(&libpack_logger.LogMessage{
|
||||
Message: "GraphQL query returned no data",
|
||||
Pairs: map[string]interface{}{"error": "data field is null"},
|
||||
})
|
||||
// Null data is typically not retryable (indicates query structure issue)
|
||||
return retry.Unrecoverable(errors.New("error executing query: no data"))
|
||||
}
|
||||
|
||||
return nil
|
||||
},
|
||||
retry.OnRetry(func(n uint, err error) {
|
||||
@@ -346,33 +408,18 @@ func (qe *QueryExecutor) executeQuery() ([]byte, error) {
|
||||
retry.LastErrorOnly(true),
|
||||
)
|
||||
if err != nil {
|
||||
qe.Logger.Debug(&libpack_logger.LogMessage{
|
||||
Message: "Error executing HTTP request",
|
||||
qe.Logger.Error(&libpack_logger.LogMessage{
|
||||
Message: "Query execution failed after retries",
|
||||
Pairs: map[string]interface{}{"error": err.Error()},
|
||||
})
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if len(queryResult.Errors) > 0 {
|
||||
qe.Logger.Debug(&libpack_logger.LogMessage{
|
||||
Message: "Error executing query",
|
||||
Pairs: map[string]interface{}{"error": queryResult.Errors},
|
||||
})
|
||||
return nil, fmt.Errorf("error executing query: %s", queryResult.Errors)
|
||||
}
|
||||
|
||||
if queryResult.Data == nil {
|
||||
qe.Logger.Debug(&libpack_logger.LogMessage{
|
||||
Message: "Error executing query",
|
||||
Pairs: map[string]interface{}{"error": "no data"},
|
||||
})
|
||||
return nil, errors.New("error executing query: no data")
|
||||
}
|
||||
|
||||
// At this point, we have successfully executed the query and validated the response
|
||||
// Marshal queryResult.Data
|
||||
jsonData, err := json.Marshal(queryResult.Data)
|
||||
if err != nil {
|
||||
qe.Logger.Debug(&libpack_logger.LogMessage{
|
||||
qe.Logger.Error(&libpack_logger.LogMessage{
|
||||
Message: "Error marshalling query result",
|
||||
Pairs: map[string]interface{}{"error": err.Error(), "data": queryResult.Data},
|
||||
})
|
||||
|
||||
@@ -185,7 +185,7 @@ func (suite *Tests) TestQueryExecutor_executeQuery() {
|
||||
assert.Equal(3, attempts) // Should have retried twice before succeeding
|
||||
})
|
||||
|
||||
suite.T().Run("should use default client when none provided", func(t *testing.T) {
|
||||
suite.T().Run("should return error when client not initialized", func(t *testing.T) {
|
||||
client := CreateTestClient()
|
||||
|
||||
qe := &QueryExecutor{
|
||||
@@ -196,12 +196,13 @@ func (suite *Tests) TestQueryExecutor_executeQuery() {
|
||||
Retries: false,
|
||||
}
|
||||
qe.endpoint = mockServer.URL
|
||||
qe.client = nil // No client provided
|
||||
qe.client = nil // No client provided (should always use NewConnection())
|
||||
qe.cache = client.cache
|
||||
|
||||
result, err := qe.executeQuery()
|
||||
assert.NoError(err)
|
||||
assert.NotNil(result)
|
||||
assert.Error(err)
|
||||
assert.Nil(result)
|
||||
assert.Contains(err.Error(), "HTTP client not initialized")
|
||||
})
|
||||
|
||||
suite.T().Run("should set default Content-Type header", func(t *testing.T) {
|
||||
|
||||
@@ -11,60 +11,72 @@ import (
|
||||
)
|
||||
|
||||
func (b *BaseClient) createHttpClient() (http_client *http.Client) {
|
||||
// Optimized connection pool settings for better performance
|
||||
httpTransport := &http.Transport{
|
||||
MaxIdleConns: 100, // Reduced from 512
|
||||
MaxConnsPerHost: 50, // Reduced from 512
|
||||
MaxIdleConnsPerHost: 10, // Reduced from 512
|
||||
IdleConnTimeout: 30 * time.Second, // Increased for better reuse
|
||||
ResponseHeaderTimeout: 10 * time.Second, // Reduced for faster timeouts
|
||||
DisableKeepAlives: false,
|
||||
DisableCompression: true, // Disable automatic request compression to prevent "trailing garbage" errors
|
||||
WriteBufferSize: 4096, // Optimize buffer size
|
||||
ReadBufferSize: 4096, // Optimize buffer size
|
||||
}
|
||||
|
||||
if strings.HasPrefix(b.endpoint, "http://") {
|
||||
// Use HTTP/1.1 for http:// endpoints
|
||||
// Note: h2c (HTTP/2 Cleartext) is rarely supported by servers
|
||||
httpTransport := &http.Transport{
|
||||
MaxIdleConns: 100,
|
||||
MaxConnsPerHost: 50,
|
||||
MaxIdleConnsPerHost: 10,
|
||||
IdleConnTimeout: 60 * time.Second,
|
||||
ResponseHeaderTimeout: 20 * time.Second,
|
||||
DisableKeepAlives: false,
|
||||
DisableCompression: true, // Disable automatic compression to prevent trailing garbage errors
|
||||
WriteBufferSize: 4096,
|
||||
ReadBufferSize: 4096,
|
||||
// Additional settings for connection health
|
||||
ExpectContinueTimeout: 2 * time.Second, // Timeout for 100-Continue
|
||||
TLSHandshakeTimeout: 20 * time.Second, // Timeout for TLS handshake
|
||||
}
|
||||
|
||||
http_client = &http.Client{
|
||||
Timeout: 30 * time.Second, // Increased for better reliability
|
||||
Timeout: 60 * time.Second,
|
||||
Transport: httpTransport,
|
||||
CheckRedirect: func(req *http.Request, via []*http.Request) error {
|
||||
return http.ErrUseLastResponse
|
||||
},
|
||||
}
|
||||
|
||||
b.Logger.Debug(&libpack_logger.LogMessage{
|
||||
Message: "Using HTTP/1.1 over http",
|
||||
Message: "Using HTTP/1.1 for http:// endpoint",
|
||||
Pairs: nil,
|
||||
})
|
||||
} else if strings.HasPrefix(b.endpoint, "https://") {
|
||||
tlsClientConfig := &tls.Config{}
|
||||
if strings.HasPrefix(b.endpoint, "https://") {
|
||||
tlsClientConfig.InsecureSkipVerify = true
|
||||
// Use HTTP/2 for https:// endpoints
|
||||
tlsClientConfig := &tls.Config{
|
||||
InsecureSkipVerify: true, // TODO: Make this configurable via environment variable
|
||||
}
|
||||
|
||||
http2Transport := &http2.Transport{
|
||||
AllowHTTP: true,
|
||||
TLSClientConfig: tlsClientConfig,
|
||||
ReadIdleTimeout: 30 * time.Second, // Increased for better reuse
|
||||
PingTimeout: 10 * time.Second, // Reduced for faster detection
|
||||
WriteByteTimeout: 10 * time.Second, // Add write timeout
|
||||
DisableCompression: true, // Disable automatic request compression to prevent "trailing garbage" errors
|
||||
ReadIdleTimeout: 60 * time.Second, // Close idle connections after 60s
|
||||
PingTimeout: 20 * time.Second, // Detect dead connections with PING
|
||||
WriteByteTimeout: 20 * time.Second, // Timeout for write operations
|
||||
DisableCompression: true, // Disable automatic compression to prevent trailing garbage errors
|
||||
// StrictMaxConcurrentStreams forces the HTTP/2 connection to wait for SETTINGS frame
|
||||
// This helps with connection health detection
|
||||
StrictMaxConcurrentStreams: true,
|
||||
}
|
||||
|
||||
http_client = &http.Client{
|
||||
Timeout: 30 * time.Second, // Increased for better reliability
|
||||
Timeout: 60 * time.Second,
|
||||
Transport: http2Transport,
|
||||
CheckRedirect: func(req *http.Request, via []*http.Request) error {
|
||||
return http.ErrUseLastResponse
|
||||
},
|
||||
}
|
||||
|
||||
b.Logger.Debug(&libpack_logger.LogMessage{
|
||||
Message: "Using HTTP/2 over https",
|
||||
Message: "Using HTTP/2 for https:// endpoint",
|
||||
Pairs: nil,
|
||||
})
|
||||
} else {
|
||||
b.Logger.Critical(&libpack_logger.LogMessage{
|
||||
Message: "Invalid endpoint - neither http or https",
|
||||
Message: "Invalid endpoint - must start with http:// or https://",
|
||||
})
|
||||
return nil
|
||||
}
|
||||
|
||||
return http_client
|
||||
}
|
||||
|
||||
+17
-15
@@ -8,6 +8,8 @@ import (
|
||||
"golang.org/x/net/http2"
|
||||
)
|
||||
|
||||
// Note: http.Transport import is kept for http.ErrUseLastResponse usage in redirect tests
|
||||
|
||||
func (suite *Tests) TestBaseClient_createHttpClient() {
|
||||
suite.T().Run("should create HTTP/1.1 client for http endpoints", func(t *testing.T) {
|
||||
client := NewConnection()
|
||||
@@ -15,17 +17,17 @@ func (suite *Tests) TestBaseClient_createHttpClient() {
|
||||
|
||||
httpClient := client.createHttpClient()
|
||||
assert.NotNil(httpClient)
|
||||
assert.Equal(30*time.Second, httpClient.Timeout)
|
||||
assert.Equal(60*time.Second, httpClient.Timeout)
|
||||
assert.NotNil(httpClient.Transport)
|
||||
|
||||
// Check that it's using regular HTTP transport
|
||||
// Check that it's using HTTP/1.1 transport (h2c is rarely supported by servers)
|
||||
transport, ok := httpClient.Transport.(*http.Transport)
|
||||
assert.True(ok)
|
||||
assert.Equal(100, transport.MaxIdleConns)
|
||||
assert.Equal(50, transport.MaxConnsPerHost)
|
||||
assert.Equal(10, transport.MaxIdleConnsPerHost)
|
||||
assert.Equal(30*time.Second, transport.IdleConnTimeout)
|
||||
assert.Equal(10*time.Second, transport.ResponseHeaderTimeout)
|
||||
assert.Equal(60*time.Second, transport.IdleConnTimeout)
|
||||
assert.Equal(20*time.Second, transport.ResponseHeaderTimeout)
|
||||
assert.False(transport.DisableKeepAlives)
|
||||
assert.True(transport.DisableCompression) // Request compression disabled to prevent "trailing garbage" errors
|
||||
assert.Equal(4096, transport.WriteBufferSize)
|
||||
@@ -38,7 +40,7 @@ func (suite *Tests) TestBaseClient_createHttpClient() {
|
||||
|
||||
httpClient := client.createHttpClient()
|
||||
assert.NotNil(httpClient)
|
||||
assert.Equal(30*time.Second, httpClient.Timeout)
|
||||
assert.Equal(60*time.Second, httpClient.Timeout)
|
||||
assert.NotNil(httpClient.Transport)
|
||||
|
||||
// Check that it's using HTTP/2 transport
|
||||
@@ -47,9 +49,9 @@ func (suite *Tests) TestBaseClient_createHttpClient() {
|
||||
assert.True(transport.AllowHTTP)
|
||||
assert.NotNil(transport.TLSClientConfig)
|
||||
assert.True(transport.TLSClientConfig.InsecureSkipVerify)
|
||||
assert.Equal(30*time.Second, transport.ReadIdleTimeout)
|
||||
assert.Equal(10*time.Second, transport.PingTimeout)
|
||||
assert.Equal(10*time.Second, transport.WriteByteTimeout)
|
||||
assert.Equal(60*time.Second, transport.ReadIdleTimeout)
|
||||
assert.Equal(20*time.Second, transport.PingTimeout)
|
||||
assert.Equal(20*time.Second, transport.WriteByteTimeout)
|
||||
})
|
||||
|
||||
suite.T().Run("should handle invalid endpoints", func(t *testing.T) {
|
||||
@@ -92,19 +94,19 @@ func (suite *Tests) TestBaseClient_createHttpClient() {
|
||||
}
|
||||
|
||||
func (suite *Tests) TestBaseClient_createHttpClient_transportSettings() {
|
||||
suite.T().Run("should configure HTTP transport correctly", func(t *testing.T) {
|
||||
suite.T().Run("should configure HTTP/1.1 transport correctly for http://", func(t *testing.T) {
|
||||
client := NewConnection()
|
||||
client.SetEndpoint("http://example.com/graphql")
|
||||
|
||||
httpClient := client.createHttpClient()
|
||||
transport := httpClient.Transport.(*http.Transport)
|
||||
|
||||
// Verify all transport settings
|
||||
// Verify all HTTP/1.1 transport settings
|
||||
assert.Equal(100, transport.MaxIdleConns)
|
||||
assert.Equal(50, transport.MaxConnsPerHost)
|
||||
assert.Equal(10, transport.MaxIdleConnsPerHost)
|
||||
assert.Equal(30*time.Second, transport.IdleConnTimeout)
|
||||
assert.Equal(10*time.Second, transport.ResponseHeaderTimeout)
|
||||
assert.Equal(60*time.Second, transport.IdleConnTimeout)
|
||||
assert.Equal(20*time.Second, transport.ResponseHeaderTimeout)
|
||||
assert.False(transport.DisableKeepAlives)
|
||||
assert.True(transport.DisableCompression) // Request compression disabled to prevent "trailing garbage" errors
|
||||
assert.Equal(4096, transport.WriteBufferSize)
|
||||
@@ -122,9 +124,9 @@ func (suite *Tests) TestBaseClient_createHttpClient_transportSettings() {
|
||||
assert.True(transport.AllowHTTP)
|
||||
assert.NotNil(transport.TLSClientConfig)
|
||||
assert.True(transport.TLSClientConfig.InsecureSkipVerify)
|
||||
assert.Equal(30*time.Second, transport.ReadIdleTimeout)
|
||||
assert.Equal(10*time.Second, transport.PingTimeout)
|
||||
assert.Equal(10*time.Second, transport.WriteByteTimeout)
|
||||
assert.Equal(60*time.Second, transport.ReadIdleTimeout)
|
||||
assert.Equal(20*time.Second, transport.PingTimeout)
|
||||
assert.Equal(20*time.Second, transport.WriteByteTimeout)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ package gql
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/gookit/goutil/envutil"
|
||||
@@ -9,6 +10,22 @@ import (
|
||||
logging "github.com/lukaszraczylo/go-simple-graphql/logging"
|
||||
)
|
||||
|
||||
// parseRetryPatterns parses a comma-separated string of retry patterns into a slice
|
||||
func parseRetryPatterns(patterns string) []string {
|
||||
if patterns == "" {
|
||||
return []string{}
|
||||
}
|
||||
parts := strings.Split(patterns, ",")
|
||||
result := make([]string, 0, len(parts))
|
||||
for _, p := range parts {
|
||||
trimmed := strings.TrimSpace(p)
|
||||
if trimmed != "" {
|
||||
result = append(result, trimmed)
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func NewConnection() (b *BaseClient) {
|
||||
// Read LOG_LEVEL environment variable
|
||||
logLevelStr := envutil.Getenv("LOG_LEVEL", "info")
|
||||
@@ -30,22 +47,39 @@ func NewConnection() (b *BaseClient) {
|
||||
})
|
||||
|
||||
b = &BaseClient{
|
||||
endpoint: envutil.Getenv("GRAPHQL_ENDPOINT", "https://api.github.com/graphql"),
|
||||
responseType: envutil.Getenv("GRAPHQL_OUTPUT", "string"),
|
||||
Logger: logger,
|
||||
cache: cache.New(time.Duration(envutil.GetInt("GRAPHQL_CACHE_TTL", 5)) * time.Second),
|
||||
cache_global: envutil.GetBool("GRAPHQL_CACHE_ENABLED", false),
|
||||
retries_enable: envutil.GetBool("GRAPHQL_RETRIES_ENABLE", false),
|
||||
retries_delay: time.Duration(envutil.GetInt("GRAPHQL_RETRIES_DELAY", 250) * int(time.Millisecond)),
|
||||
retries_number: envutil.GetInt("GRAPHQL_RETRIES_NUMBER", 3),
|
||||
endpoint: envutil.Getenv("GRAPHQL_ENDPOINT", "https://api.github.com/graphql"),
|
||||
responseType: envutil.Getenv("GRAPHQL_OUTPUT", "string"),
|
||||
Logger: logger,
|
||||
cache: cache.New(time.Duration(envutil.GetInt("GRAPHQL_CACHE_TTL", 5)) * time.Second),
|
||||
cache_global: envutil.GetBool("GRAPHQL_CACHE_ENABLED", false),
|
||||
retries_enable: envutil.GetBool("GRAPHQL_RETRIES_ENABLE", false),
|
||||
retries_delay: time.Duration(envutil.GetInt("GRAPHQL_RETRIES_DELAY", 250) * int(time.Millisecond)),
|
||||
retries_number: envutil.GetInt("GRAPHQL_RETRIES_NUMBER", 3),
|
||||
retries_patterns: parseRetryPatterns(envutil.Getenv("GRAPHQL_RETRIES_PATTERNS", "postgres,connection,timeout,transaction,could not,temporarily unavailable,deadlock")),
|
||||
minify_queries: envutil.GetBool("GRAPHQL_MINIFY_QUERIES", true), // Default: enabled for production efficiency
|
||||
pool_warmup_enabled: envutil.GetBool("GRAPHQL_POOL_WARMUP_ENABLED", false),
|
||||
pool_size: envutil.GetInt("GRAPHQL_POOL_SIZE", 5),
|
||||
pool_warmup_query: envutil.Getenv("GRAPHQL_POOL_WARMUP_QUERY", "query{__typename}"),
|
||||
pool_health_interval: time.Duration(envutil.GetInt("GRAPHQL_POOL_HEALTH_INTERVAL", 30)) * time.Second,
|
||||
pool_stop: make(chan bool, 1),
|
||||
}
|
||||
b.client = b.createHttpClient()
|
||||
b.Logger.Debug(&logging.LogMessage{
|
||||
Message: "Created new GraphQL client connection",
|
||||
Pairs: map[string]interface{}{
|
||||
"values": b,
|
||||
"endpoint": b.endpoint,
|
||||
"pool_warmup": b.pool_warmup_enabled,
|
||||
"pool_size": b.pool_size,
|
||||
"pool_health_check": b.pool_health_interval,
|
||||
},
|
||||
})
|
||||
|
||||
// Initialize connection pool if warmup is enabled
|
||||
if b.pool_warmup_enabled {
|
||||
b.warmupConnectionPool()
|
||||
b.startPoolHealthMonitor()
|
||||
}
|
||||
|
||||
return b
|
||||
}
|
||||
|
||||
@@ -63,3 +97,13 @@ func (b *BaseClient) SetOutput(responseType string) {
|
||||
func (b *BaseClient) SetHTTPClient(client *http.Client) {
|
||||
b.client = client
|
||||
}
|
||||
|
||||
func (b *BaseClient) SetQueryMinification(enabled bool) {
|
||||
b.minify_queries = enabled
|
||||
b.Logger.Debug(&logging.LogMessage{
|
||||
Message: "GraphQL query minification setting updated",
|
||||
Pairs: map[string]interface{}{
|
||||
"minify_queries": enabled,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
@@ -25,9 +25,9 @@ func TestPerformanceRegression(t *testing.T) {
|
||||
}
|
||||
duration := time.Since(start)
|
||||
|
||||
// Should complete 10k hashes in under 25ms (accounts for race detection + coverage overhead)
|
||||
if duration > 25*time.Millisecond {
|
||||
t.Errorf("Hash performance regression: 10k hashes took %v, expected < 25ms", duration)
|
||||
// Should complete 10k hashes in under 40ms (accounts for race detection + coverage overhead)
|
||||
if duration > 40*time.Millisecond {
|
||||
t.Errorf("Hash performance regression: 10k hashes took %v, expected < 40ms", duration)
|
||||
}
|
||||
})
|
||||
|
||||
@@ -41,9 +41,9 @@ func TestPerformanceRegression(t *testing.T) {
|
||||
}
|
||||
duration := time.Since(start)
|
||||
|
||||
// Should complete 10k buffer operations in under 25ms (accounts for race detection + coverage overhead)
|
||||
if duration > 25*time.Millisecond {
|
||||
t.Errorf("Buffer pool performance regression: 10k operations took %v, expected < 25ms", duration)
|
||||
// Should complete 10k buffer operations in under 30ms (accounts for race detection + coverage overhead)
|
||||
if duration > 30*time.Millisecond {
|
||||
t.Errorf("Buffer pool performance regression: 10k operations took %v, expected < 30ms", duration)
|
||||
}
|
||||
})
|
||||
|
||||
@@ -105,9 +105,9 @@ func TestPerformanceRegression(t *testing.T) {
|
||||
}
|
||||
duration := time.Since(start)
|
||||
|
||||
// Should complete 1k query compilations in under 50ms
|
||||
if duration > 50*time.Millisecond {
|
||||
t.Errorf("Query compilation performance regression: 1k operations took %v, expected < 50ms", duration)
|
||||
// Should complete 1k query compilations in under 65ms (accounts for minification overhead)
|
||||
if duration > 65*time.Millisecond {
|
||||
t.Errorf("Query compilation performance regression: 1k operations took %v, expected < 65ms", duration)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -0,0 +1,250 @@
|
||||
package gql
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
libpack_logger "github.com/lukaszraczylo/go-simple-graphql/logging"
|
||||
)
|
||||
|
||||
// warmupConnectionPool pre-creates connections by executing warmup queries
|
||||
// This establishes connections in the pool before actual traffic arrives
|
||||
func (b *BaseClient) warmupConnectionPool() {
|
||||
b.Logger.Info(&libpack_logger.LogMessage{
|
||||
Message: "Warming up connection pool",
|
||||
Pairs: map[string]interface{}{
|
||||
"pool_size": b.pool_size,
|
||||
"warmup_query": b.pool_warmup_query,
|
||||
"endpoint": b.endpoint,
|
||||
},
|
||||
})
|
||||
|
||||
startTime := time.Now()
|
||||
var wg sync.WaitGroup
|
||||
successCount := 0
|
||||
failCount := 0
|
||||
var mu sync.Mutex
|
||||
|
||||
// Pre-create connections concurrently
|
||||
for i := 0; i < b.pool_size; i++ {
|
||||
wg.Add(1)
|
||||
go func(index int) {
|
||||
defer wg.Done()
|
||||
|
||||
// Execute warmup query to establish connection
|
||||
_, err := b.Query(b.pool_warmup_query, nil, nil)
|
||||
|
||||
mu.Lock()
|
||||
if err != nil {
|
||||
failCount++
|
||||
b.Logger.Warning(&libpack_logger.LogMessage{
|
||||
Message: "Failed to warm up connection",
|
||||
Pairs: map[string]interface{}{
|
||||
"connection_index": index,
|
||||
"error": err.Error(),
|
||||
},
|
||||
})
|
||||
} else {
|
||||
successCount++
|
||||
b.Logger.Debug(&libpack_logger.LogMessage{
|
||||
Message: "Connection warmed up successfully",
|
||||
Pairs: map[string]interface{}{
|
||||
"connection_index": index,
|
||||
},
|
||||
})
|
||||
}
|
||||
mu.Unlock()
|
||||
}(i)
|
||||
}
|
||||
|
||||
wg.Wait()
|
||||
duration := time.Since(startTime)
|
||||
|
||||
b.Logger.Info(&libpack_logger.LogMessage{
|
||||
Message: "Connection pool warmup completed",
|
||||
Pairs: map[string]interface{}{
|
||||
"successful": successCount,
|
||||
"failed": failCount,
|
||||
"total": b.pool_size,
|
||||
"duration_ms": duration.Milliseconds(),
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
// startPoolHealthMonitor starts a background goroutine that periodically
|
||||
// checks and maintains pool health by sending health check queries
|
||||
func (b *BaseClient) startPoolHealthMonitor() {
|
||||
b.Logger.Info(&libpack_logger.LogMessage{
|
||||
Message: "Starting connection pool health monitor",
|
||||
Pairs: map[string]interface{}{
|
||||
"check_interval": b.pool_health_interval,
|
||||
"pool_size": b.pool_size,
|
||||
},
|
||||
})
|
||||
|
||||
go func() {
|
||||
ticker := time.NewTicker(b.pool_health_interval)
|
||||
defer ticker.Stop()
|
||||
|
||||
for {
|
||||
select {
|
||||
case <-ticker.C:
|
||||
b.performPoolHealthCheck()
|
||||
case <-b.pool_stop:
|
||||
b.Logger.Info(&libpack_logger.LogMessage{
|
||||
Message: "Stopping connection pool health monitor",
|
||||
Pairs: nil,
|
||||
})
|
||||
return
|
||||
}
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
// performPoolHealthCheck executes health check queries to maintain pool connections
|
||||
// This keeps connections alive and detects/replaces dead connections
|
||||
func (b *BaseClient) performPoolHealthCheck() {
|
||||
b.Logger.Debug(&libpack_logger.LogMessage{
|
||||
Message: "Performing pool health check",
|
||||
Pairs: map[string]interface{}{
|
||||
"pool_size": b.pool_size,
|
||||
},
|
||||
})
|
||||
|
||||
startTime := time.Now()
|
||||
var wg sync.WaitGroup
|
||||
healthyCount := 0
|
||||
unhealthyCount := 0
|
||||
var mu sync.Mutex
|
||||
|
||||
// Check a subset of connections to ensure pool health
|
||||
// We check pool_size/2 to balance between thoroughness and overhead
|
||||
checkCount := max(1, b.pool_size/2)
|
||||
|
||||
for i := 0; i < checkCount; i++ {
|
||||
wg.Add(1)
|
||||
go func(index int) {
|
||||
defer wg.Done()
|
||||
|
||||
// Create a context with timeout for health check
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||
defer cancel()
|
||||
|
||||
// Use a channel to handle timeout
|
||||
done := make(chan error, 1)
|
||||
go func() {
|
||||
_, err := b.Query(b.pool_warmup_query, nil, nil)
|
||||
done <- err
|
||||
}()
|
||||
|
||||
select {
|
||||
case err := <-done:
|
||||
mu.Lock()
|
||||
if err != nil {
|
||||
unhealthyCount++
|
||||
b.Logger.Warning(&libpack_logger.LogMessage{
|
||||
Message: "Pool health check failed",
|
||||
Pairs: map[string]interface{}{
|
||||
"check_index": index,
|
||||
"error": err.Error(),
|
||||
},
|
||||
})
|
||||
} else {
|
||||
healthyCount++
|
||||
}
|
||||
mu.Unlock()
|
||||
case <-ctx.Done():
|
||||
mu.Lock()
|
||||
unhealthyCount++
|
||||
b.Logger.Warning(&libpack_logger.LogMessage{
|
||||
Message: "Pool health check timeout",
|
||||
Pairs: map[string]interface{}{
|
||||
"check_index": index,
|
||||
},
|
||||
})
|
||||
mu.Unlock()
|
||||
}
|
||||
}(i)
|
||||
}
|
||||
|
||||
wg.Wait()
|
||||
duration := time.Since(startTime)
|
||||
|
||||
b.Logger.Debug(&libpack_logger.LogMessage{
|
||||
Message: "Pool health check completed",
|
||||
Pairs: map[string]interface{}{
|
||||
"healthy": healthyCount,
|
||||
"unhealthy": unhealthyCount,
|
||||
"checked": checkCount,
|
||||
"duration_ms": duration.Milliseconds(),
|
||||
},
|
||||
})
|
||||
|
||||
// If more than 50% of checks failed, trigger a pool refresh
|
||||
if unhealthyCount > checkCount/2 {
|
||||
b.Logger.Warning(&libpack_logger.LogMessage{
|
||||
Message: "Pool health degraded, triggering refresh",
|
||||
Pairs: map[string]interface{}{
|
||||
"unhealthy_ratio": float64(unhealthyCount) / float64(checkCount),
|
||||
},
|
||||
})
|
||||
b.refreshConnectionPool()
|
||||
}
|
||||
}
|
||||
|
||||
// refreshConnectionPool attempts to refresh the connection pool
|
||||
// by executing warmup queries to replace stale connections
|
||||
func (b *BaseClient) refreshConnectionPool() {
|
||||
b.Logger.Info(&libpack_logger.LogMessage{
|
||||
Message: "Refreshing connection pool",
|
||||
Pairs: map[string]interface{}{
|
||||
"pool_size": b.pool_size,
|
||||
},
|
||||
})
|
||||
|
||||
var wg sync.WaitGroup
|
||||
refreshCount := max(1, b.pool_size/3) // Refresh 1/3 of pool
|
||||
|
||||
for i := 0; i < refreshCount; i++ {
|
||||
wg.Add(1)
|
||||
go func(index int) {
|
||||
defer wg.Done()
|
||||
|
||||
_, err := b.Query(b.pool_warmup_query, nil, nil)
|
||||
if err != nil {
|
||||
b.Logger.Debug(&libpack_logger.LogMessage{
|
||||
Message: "Pool refresh connection failed",
|
||||
Pairs: map[string]interface{}{
|
||||
"connection_index": index,
|
||||
"error": err.Error(),
|
||||
},
|
||||
})
|
||||
} else {
|
||||
b.Logger.Debug(&libpack_logger.LogMessage{
|
||||
Message: "Pool connection refreshed",
|
||||
Pairs: map[string]interface{}{
|
||||
"connection_index": index,
|
||||
},
|
||||
})
|
||||
}
|
||||
}(i)
|
||||
}
|
||||
|
||||
wg.Wait()
|
||||
}
|
||||
|
||||
// StopPoolMonitor gracefully stops the pool health monitor
|
||||
// Call this when shutting down the application
|
||||
// Uses sync.Once to ensure it only executes once, preventing race conditions
|
||||
func (b *BaseClient) StopPoolMonitor() {
|
||||
if b.pool_warmup_enabled {
|
||||
b.pool_stop_once.Do(func() {
|
||||
b.Logger.Info(&libpack_logger.LogMessage{
|
||||
Message: "Stopping pool monitor",
|
||||
Pairs: nil,
|
||||
})
|
||||
b.pool_stop <- true
|
||||
})
|
||||
}
|
||||
}
|
||||
+135
@@ -0,0 +1,135 @@
|
||||
package gql
|
||||
|
||||
import (
|
||||
"os"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func (suite *Tests) TestPoolWarmup() {
|
||||
suite.T().Run("should create client with pool warmup disabled by default", func(t *testing.T) {
|
||||
// Save original env vars
|
||||
originalPoolEnabled := os.Getenv("GRAPHQL_POOL_WARMUP_ENABLED")
|
||||
originalEndpoint := os.Getenv("GRAPHQL_ENDPOINT")
|
||||
defer func() {
|
||||
os.Setenv("GRAPHQL_POOL_WARMUP_ENABLED", originalPoolEnabled)
|
||||
os.Setenv("GRAPHQL_ENDPOINT", originalEndpoint)
|
||||
}()
|
||||
|
||||
os.Setenv("GRAPHQL_POOL_WARMUP_ENABLED", "false")
|
||||
os.Setenv("GRAPHQL_ENDPOINT", mockServer.URL)
|
||||
|
||||
client := NewConnection()
|
||||
defer client.StopPoolMonitor()
|
||||
|
||||
assert.False(client.pool_warmup_enabled)
|
||||
assert.Equal(5, client.pool_size) // Default size
|
||||
})
|
||||
|
||||
suite.T().Run("should warmup pool when enabled", func(t *testing.T) {
|
||||
originalPoolEnabled := os.Getenv("GRAPHQL_POOL_WARMUP_ENABLED")
|
||||
originalPoolSize := os.Getenv("GRAPHQL_POOL_SIZE")
|
||||
originalEndpoint := os.Getenv("GRAPHQL_ENDPOINT")
|
||||
defer func() {
|
||||
os.Setenv("GRAPHQL_POOL_WARMUP_ENABLED", originalPoolEnabled)
|
||||
os.Setenv("GRAPHQL_POOL_SIZE", originalPoolSize)
|
||||
os.Setenv("GRAPHQL_ENDPOINT", originalEndpoint)
|
||||
}()
|
||||
|
||||
os.Setenv("GRAPHQL_POOL_WARMUP_ENABLED", "true")
|
||||
os.Setenv("GRAPHQL_POOL_SIZE", "3")
|
||||
os.Setenv("GRAPHQL_ENDPOINT", mockServer.URL)
|
||||
|
||||
startTime := time.Now()
|
||||
client := NewConnection()
|
||||
defer client.StopPoolMonitor()
|
||||
|
||||
duration := time.Since(startTime)
|
||||
|
||||
assert.True(client.pool_warmup_enabled)
|
||||
assert.Equal(3, client.pool_size)
|
||||
// Warmup should complete relatively quickly for 3 connections
|
||||
assert.Less(duration.Seconds(), 5.0, "Pool warmup took too long")
|
||||
})
|
||||
|
||||
suite.T().Run("should use custom warmup query", func(t *testing.T) {
|
||||
originalPoolEnabled := os.Getenv("GRAPHQL_POOL_WARMUP_ENABLED")
|
||||
originalQuery := os.Getenv("GRAPHQL_POOL_WARMUP_QUERY")
|
||||
originalEndpoint := os.Getenv("GRAPHQL_ENDPOINT")
|
||||
defer func() {
|
||||
os.Setenv("GRAPHQL_POOL_WARMUP_ENABLED", originalPoolEnabled)
|
||||
os.Setenv("GRAPHQL_POOL_WARMUP_QUERY", originalQuery)
|
||||
os.Setenv("GRAPHQL_ENDPOINT", originalEndpoint)
|
||||
}()
|
||||
|
||||
os.Setenv("GRAPHQL_POOL_WARMUP_ENABLED", "false") // Don't actually warmup, just test configuration
|
||||
os.Setenv("GRAPHQL_POOL_WARMUP_QUERY", "query{__schema{queryType{name}}}")
|
||||
os.Setenv("GRAPHQL_ENDPOINT", mockServer.URL)
|
||||
|
||||
client := NewConnection()
|
||||
defer client.StopPoolMonitor()
|
||||
|
||||
assert.Equal("query{__schema{queryType{name}}}", client.pool_warmup_query)
|
||||
})
|
||||
}
|
||||
|
||||
func (suite *Tests) TestPoolHealthMonitor() {
|
||||
suite.T().Run("should stop pool monitor gracefully", func(t *testing.T) {
|
||||
client := CreateTestClient()
|
||||
client.pool_warmup_enabled = false
|
||||
|
||||
// Should not panic
|
||||
client.StopPoolMonitor()
|
||||
|
||||
assert.True(true, "Handled stop gracefully when monitor not running")
|
||||
})
|
||||
|
||||
suite.T().Run("should handle multiple stop calls", func(t *testing.T) {
|
||||
originalPoolEnabled := os.Getenv("GRAPHQL_POOL_WARMUP_ENABLED")
|
||||
originalPoolSize := os.Getenv("GRAPHQL_POOL_SIZE")
|
||||
originalEndpoint := os.Getenv("GRAPHQL_ENDPOINT")
|
||||
defer func() {
|
||||
os.Setenv("GRAPHQL_POOL_WARMUP_ENABLED", originalPoolEnabled)
|
||||
os.Setenv("GRAPHQL_POOL_SIZE", originalPoolSize)
|
||||
os.Setenv("GRAPHQL_ENDPOINT", originalEndpoint)
|
||||
}()
|
||||
|
||||
os.Setenv("GRAPHQL_POOL_WARMUP_ENABLED", "true")
|
||||
os.Setenv("GRAPHQL_POOL_SIZE", "2")
|
||||
os.Setenv("GRAPHQL_ENDPOINT", mockServer.URL)
|
||||
|
||||
client := NewConnection()
|
||||
|
||||
// Call stop multiple times - should not panic
|
||||
client.StopPoolMonitor()
|
||||
client.StopPoolMonitor()
|
||||
client.StopPoolMonitor()
|
||||
|
||||
assert.True(true, "Handled multiple stop calls gracefully")
|
||||
})
|
||||
}
|
||||
|
||||
func (suite *Tests) TestPoolHealthCheck() {
|
||||
suite.T().Run("should perform health check without panic", func(t *testing.T) {
|
||||
client := CreateTestClient()
|
||||
client.pool_warmup_enabled = true
|
||||
client.pool_size = 2
|
||||
client.pool_warmup_query = "query{__typename}"
|
||||
|
||||
// Perform a health check - should not panic
|
||||
client.performPoolHealthCheck()
|
||||
|
||||
assert.True(true, "Health check completed")
|
||||
})
|
||||
|
||||
suite.T().Run("should refresh pool without panic", func(t *testing.T) {
|
||||
client := CreateTestClient()
|
||||
client.pool_size = 2
|
||||
client.pool_warmup_query = "query{__typename}"
|
||||
|
||||
// Perform pool refresh - should not panic
|
||||
client.refreshConnectionPool()
|
||||
|
||||
assert.True(true, "Pool refresh completed")
|
||||
})
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package gql
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/goccy/go-json"
|
||||
"github.com/gookit/goutil"
|
||||
@@ -9,6 +10,129 @@ import (
|
||||
libpack_logger "github.com/lukaszraczylo/go-simple-graphql/logging"
|
||||
)
|
||||
|
||||
// minifyGraphQLQuery removes unnecessary whitespace from GraphQL queries while preserving string literals
|
||||
func minifyGraphQLQuery(query string) string {
|
||||
if query == "" {
|
||||
return query
|
||||
}
|
||||
|
||||
// Pre-allocate with estimated final size (typically 70-80% of original)
|
||||
var result strings.Builder
|
||||
result.Grow(len(query) * 3 / 4)
|
||||
|
||||
inString := false
|
||||
stringChar := byte(0) // Track whether we're in single or double quotes
|
||||
queryBytes := []byte(query) // Convert to bytes once for faster access
|
||||
length := len(queryBytes)
|
||||
|
||||
i := 0
|
||||
for i < length {
|
||||
char := queryBytes[i]
|
||||
|
||||
// Handle string literals - preserve everything inside quotes
|
||||
if !inString && (char == '"' || char == '\'') {
|
||||
inString = true
|
||||
stringChar = char
|
||||
result.WriteByte(char)
|
||||
i++
|
||||
} else if inString && char == stringChar {
|
||||
// Check if this quote is escaped (optimized version)
|
||||
escaped := false
|
||||
backslashCount := 0
|
||||
for j := i - 1; j >= 0 && queryBytes[j] == '\\'; j-- {
|
||||
backslashCount++
|
||||
}
|
||||
escaped = backslashCount%2 == 1
|
||||
|
||||
if !escaped {
|
||||
inString = false
|
||||
stringChar = 0
|
||||
}
|
||||
result.WriteByte(char)
|
||||
i++
|
||||
} else if inString {
|
||||
// Inside string literal - preserve everything including whitespace
|
||||
result.WriteByte(char)
|
||||
i++
|
||||
} else if isWhitespace(char) {
|
||||
// Handle whitespace outside strings - optimized version
|
||||
// Skip all consecutive whitespace
|
||||
for i < length && isWhitespace(queryBytes[i]) {
|
||||
i++
|
||||
}
|
||||
|
||||
if i < length && result.Len() > 0 {
|
||||
// Get previous character from result buffer
|
||||
resultStr := result.String()
|
||||
prevChar := resultStr[len(resultStr)-1]
|
||||
nextChar := queryBytes[i]
|
||||
|
||||
// Optimized space preservation logic
|
||||
needsSpace := false
|
||||
|
||||
// Between alphanumeric characters (field names, variables, types)
|
||||
if isAlphaNumeric(prevChar) && isAlphaNumeric(nextChar) {
|
||||
needsSpace = true
|
||||
} else if prevChar == '}' && isAlphaNumeric(nextChar) {
|
||||
// Between closing brace and field name: "} field_name"
|
||||
needsSpace = true
|
||||
} else if prevChar == ':' && (isAlphaNumeric(nextChar) || nextChar == '$' || nextChar == '"' || nextChar == '\'' || nextChar == '{') {
|
||||
// Around colons in type definitions and arguments: "$var: Type", "field: value"
|
||||
needsSpace = true
|
||||
} else if (isAlphaNumeric(prevChar) || prevChar == '_') && nextChar == ':' {
|
||||
needsSpace = true
|
||||
} else if prevChar == ',' && nextChar == '$' {
|
||||
// After commas in argument lists: "arg1: value1, arg2: value2" - only for variables
|
||||
needsSpace = true
|
||||
} else if prevChar == ',' && isAlphaNumeric(nextChar) {
|
||||
// Special case: space after comma when followed by field that has colon
|
||||
// Look ahead to see if this field has a colon (limited lookahead for performance)
|
||||
colonFound := false
|
||||
lookAheadLimit := min(i+15, length) // Reduced lookahead for performance
|
||||
for j := i + 1; j < lookAheadLimit; j++ {
|
||||
if queryBytes[j] == ':' {
|
||||
colonFound = true
|
||||
break
|
||||
}
|
||||
if !isAlphaNumeric(queryBytes[j]) && queryBytes[j] != '_' {
|
||||
break
|
||||
}
|
||||
}
|
||||
if colonFound {
|
||||
needsSpace = true
|
||||
}
|
||||
} else if (prevChar == '!' && isAlphaNumeric(nextChar)) || (isAlphaNumeric(prevChar) && nextChar == '!') {
|
||||
// Around exclamation marks in type definitions: "Type !"
|
||||
needsSpace = true
|
||||
}
|
||||
|
||||
if needsSpace {
|
||||
result.WriteByte(' ')
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Regular character - just copy it
|
||||
result.WriteByte(char)
|
||||
i++
|
||||
}
|
||||
}
|
||||
|
||||
return result.String()
|
||||
}
|
||||
|
||||
// isAlphaNumeric checks if a character is alphanumeric or underscore
|
||||
func isAlphaNumeric(char byte) bool {
|
||||
return (char >= 'a' && char <= 'z') ||
|
||||
(char >= 'A' && char <= 'Z') ||
|
||||
(char >= '0' && char <= '9') ||
|
||||
char == '_'
|
||||
}
|
||||
|
||||
// isWhitespace checks if a character is whitespace
|
||||
func isWhitespace(char byte) bool {
|
||||
return char == ' ' || char == '\t' || char == '\n' || char == '\r'
|
||||
}
|
||||
|
||||
func (b *BaseClient) convertToJSON(v any) []byte {
|
||||
// Estimate size based on query structure for better buffer selection
|
||||
estimatedSize := 512 // Base size
|
||||
@@ -112,9 +236,31 @@ func (b *BaseClient) compileQuery(queryPartials ...any) *Query {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Construct query object once
|
||||
// Apply query minification if enabled (default: true)
|
||||
finalQuery := query
|
||||
if b.minify_queries {
|
||||
originalSize := len(query)
|
||||
minifiedQuery := minifyGraphQLQuery(query)
|
||||
minifiedSize := len(minifiedQuery)
|
||||
|
||||
// Log the minification results if there was a reduction
|
||||
if originalSize != minifiedSize {
|
||||
b.Logger.Debug(&libpack_logger.LogMessage{
|
||||
Message: "GraphQL query minified",
|
||||
Pairs: map[string]interface{}{
|
||||
"original_size": originalSize,
|
||||
"minified_size": minifiedSize,
|
||||
"size_reduction": originalSize - minifiedSize,
|
||||
"reduction_pct": float64(originalSize-minifiedSize) / float64(originalSize) * 100,
|
||||
},
|
||||
})
|
||||
}
|
||||
finalQuery = minifiedQuery
|
||||
}
|
||||
|
||||
// Construct query object once with final query
|
||||
q := &Query{
|
||||
Query: query,
|
||||
Query: finalQuery,
|
||||
Variables: variables,
|
||||
}
|
||||
q.JsonQuery = b.convertToJSON(q)
|
||||
|
||||
@@ -0,0 +1,410 @@
|
||||
package gql
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
assertions "github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestMinifyGraphQLQuery(t *testing.T) {
|
||||
assert := assertions.New(t)
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
input string
|
||||
expected string
|
||||
}{
|
||||
{
|
||||
name: "empty_query",
|
||||
input: "",
|
||||
expected: "",
|
||||
},
|
||||
{
|
||||
name: "simple_query_no_whitespace",
|
||||
input: "query{viewer{login}}",
|
||||
expected: "query{viewer{login}}",
|
||||
},
|
||||
{
|
||||
name: "query_with_newlines_and_tabs",
|
||||
input: `query {
|
||||
viewer {
|
||||
login
|
||||
}
|
||||
}`,
|
||||
expected: "query{viewer{login}}",
|
||||
},
|
||||
{
|
||||
name: "mutation_with_variables",
|
||||
input: `mutation storeMessage($content: String!, $id: Int!) {
|
||||
insert_message(content: $content, id: $id) {
|
||||
id
|
||||
created_at
|
||||
}
|
||||
}`,
|
||||
expected: "mutation storeMessage($content: String!, $id: Int!){insert_message(content: $content, id: $id){id created_at}}",
|
||||
},
|
||||
{
|
||||
name: "query_with_string_literals_preserved",
|
||||
input: `mutation storeMessage($description: String!) {
|
||||
insert_message(description: $description, content: "This is a test\nwith newlines\tand tabs") {
|
||||
id
|
||||
}
|
||||
}`,
|
||||
expected: `mutation storeMessage($description: String!){insert_message(description: $description, content: "This is a test\nwith newlines\tand tabs"){id}}`,
|
||||
},
|
||||
{
|
||||
name: "complex_query_with_nested_fields",
|
||||
input: `query Dragons {
|
||||
dragons {
|
||||
name
|
||||
type
|
||||
abilities {
|
||||
name
|
||||
power
|
||||
}
|
||||
}
|
||||
}`,
|
||||
expected: "query Dragons{dragons{name type abilities{name power}}}",
|
||||
},
|
||||
{
|
||||
name: "query_with_single_quotes",
|
||||
input: `mutation test($value: String!) {
|
||||
insert_test(value: $value, note: 'Single quoted string with\nnewlines') {
|
||||
id
|
||||
}
|
||||
}`,
|
||||
expected: `mutation test($value: String!){insert_test(value: $value, note: 'Single quoted string with\nnewlines'){id}}`,
|
||||
},
|
||||
{
|
||||
name: "query_with_escaped_quotes",
|
||||
input: `mutation test($value: String!) {
|
||||
insert_test(value: $value, note: "String with \"escaped quotes\" inside") {
|
||||
id
|
||||
}
|
||||
}`,
|
||||
expected: `mutation test($value: String!){insert_test(value: $value, note: "String with \"escaped quotes\" inside"){id}}`,
|
||||
},
|
||||
{
|
||||
name: "production_case_from_trailing_garbage_test",
|
||||
input: `mutation storeProcessedMessage($content: jsonb, $telegram_msg_id: bigint!, $hasMedia: Boolean!, $urls: jsonb, $groupID: bigint!, $userID: bigint!, $entities: jsonb) {
|
||||
insert_tg_messages_one(object: {content: $content, telegram_msg_id: $telegram_msg_id, has_media: $hasMedia, urls: $urls, group_id: $groupID, user_id: $userID, entities: $entities}) {
|
||||
id
|
||||
tg_group {
|
||||
tg_group_admins_aggregate(where: {user_id: {_eq: $userID}}) {
|
||||
aggregate {
|
||||
count
|
||||
}
|
||||
}
|
||||
set_spam_ai
|
||||
}
|
||||
}
|
||||
}`,
|
||||
expected: "mutation storeProcessedMessage($content: jsonb, $telegram_msg_id: bigint!, $hasMedia: Boolean!, $urls: jsonb, $groupID: bigint!, $userID: bigint!, $entities: jsonb){insert_tg_messages_one(object: {content: $content,telegram_msg_id: $telegram_msg_id, has_media: $hasMedia, urls: $urls, group_id: $groupID, user_id: $userID, entities: $entities}){id tg_group{tg_group_admins_aggregate(where: {user_id: {_eq: $userID}}){aggregate{count}} set_spam_ai}}}",
|
||||
},
|
||||
{
|
||||
name: "query_with_mixed_quotes_and_escapes",
|
||||
input: `mutation test {
|
||||
insert_test(
|
||||
single: 'Single quote with "double" inside',
|
||||
double: "Double quote with 'single' inside",
|
||||
escaped: "Escaped \"double\" quotes"
|
||||
) {
|
||||
id
|
||||
}
|
||||
}`,
|
||||
expected: `mutation test{insert_test(single: 'Single quote with "double" inside', double: "Double quote with 'single' inside", escaped: "Escaped \"double\" quotes"){id}}`,
|
||||
},
|
||||
{
|
||||
name: "query_with_unicode_in_strings",
|
||||
input: `mutation storeMessage($user_name: String!) {
|
||||
insert_message(
|
||||
user_name: $user_name,
|
||||
description: "This a group for serious buyers and sellers\nOf uber eats and Door dash account \nRippers are not allowed in this group😈"
|
||||
) {
|
||||
id
|
||||
}
|
||||
}`,
|
||||
expected: `mutation storeMessage($user_name: String!){insert_message(user_name: $user_name, description: "This a group for serious buyers and sellers\nOf uber eats and Door dash account \nRippers are not allowed in this group😈"){id}}`,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
result := minifyGraphQLQuery(tt.input)
|
||||
assert.Equal(tt.expected, result, "Minified query should match expected output")
|
||||
|
||||
// Verify that the result doesn't contain unnecessary whitespace
|
||||
assert.False(strings.Contains(result, "\n"), "Result should not contain newlines")
|
||||
assert.False(strings.Contains(result, "\t"), "Result should not contain tabs")
|
||||
|
||||
// Verify that string literals are preserved (if they exist in expected)
|
||||
if strings.Contains(tt.expected, `\n`) {
|
||||
assert.True(strings.Contains(result, `\n`), "Newlines in string literals should be preserved")
|
||||
}
|
||||
if strings.Contains(tt.expected, `\t`) {
|
||||
assert.True(strings.Contains(result, `\t`), "Tabs in string literals should be preserved")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestMinifyGraphQLQuerySizeReduction(t *testing.T) {
|
||||
assert := assertions.New(t)
|
||||
|
||||
// Test with a heavily formatted query
|
||||
heavyQuery := `
|
||||
mutation storeProcessedMessage(
|
||||
$content: jsonb,
|
||||
$telegram_msg_id: bigint!,
|
||||
$hasMedia: Boolean!,
|
||||
$urls: jsonb,
|
||||
$groupID: bigint!,
|
||||
$userID: bigint!,
|
||||
$entities: jsonb
|
||||
) {
|
||||
insert_tg_messages_one(
|
||||
object: {
|
||||
content: $content,
|
||||
telegram_msg_id: $telegram_msg_id,
|
||||
has_media: $hasMedia,
|
||||
urls: $urls,
|
||||
group_id: $groupID,
|
||||
user_id: $userID,
|
||||
entities: $entities
|
||||
}
|
||||
) {
|
||||
id
|
||||
tg_group {
|
||||
tg_group_admins_aggregate(
|
||||
where: {
|
||||
user_id: {
|
||||
_eq: $userID
|
||||
}
|
||||
}
|
||||
) {
|
||||
aggregate {
|
||||
count
|
||||
}
|
||||
}
|
||||
set_spam_ai
|
||||
}
|
||||
}
|
||||
}
|
||||
`
|
||||
|
||||
originalSize := len(heavyQuery)
|
||||
minified := minifyGraphQLQuery(heavyQuery)
|
||||
minifiedSize := len(minified)
|
||||
|
||||
t.Logf("Original size: %d bytes", originalSize)
|
||||
t.Logf("Minified size: %d bytes", minifiedSize)
|
||||
t.Logf("Size reduction: %d bytes (%.1f%%)", originalSize-minifiedSize, float64(originalSize-minifiedSize)/float64(originalSize)*100)
|
||||
|
||||
// Should achieve significant size reduction
|
||||
assert.True(minifiedSize < originalSize, "Minified query should be smaller than original")
|
||||
reductionPercent := float64(originalSize-minifiedSize) / float64(originalSize) * 100
|
||||
assert.True(reductionPercent > 30, "Should achieve at least 30% size reduction for heavily formatted queries")
|
||||
}
|
||||
|
||||
func TestBaseClientQueryMinification(t *testing.T) {
|
||||
assert := assertions.New(t)
|
||||
|
||||
t.Run("should_minify_queries_by_default", func(t *testing.T) {
|
||||
client := CreateTestClient()
|
||||
|
||||
// Verify minification is enabled by default
|
||||
assert.True(client.minify_queries, "Query minification should be enabled by default")
|
||||
|
||||
query := `query {
|
||||
viewer {
|
||||
login
|
||||
}
|
||||
}`
|
||||
variables := map[string]interface{}{}
|
||||
|
||||
compiledQuery := client.compileQuery(query, variables)
|
||||
assert.NotNil(compiledQuery)
|
||||
|
||||
// The compiled query should be minified (no newlines/tabs)
|
||||
assert.False(strings.Contains(compiledQuery.Query, "\n"), "Compiled query should not contain newlines")
|
||||
assert.False(strings.Contains(compiledQuery.Query, "\t"), "Compiled query should not contain tabs")
|
||||
assert.Equal("query{viewer{login}}", compiledQuery.Query)
|
||||
})
|
||||
|
||||
t.Run("should_respect_minification_disabled", func(t *testing.T) {
|
||||
client := CreateTestClient()
|
||||
client.SetQueryMinification(false)
|
||||
|
||||
// Verify minification is disabled
|
||||
assert.False(client.minify_queries, "Query minification should be disabled")
|
||||
|
||||
query := `query {
|
||||
viewer {
|
||||
login
|
||||
}
|
||||
}`
|
||||
variables := map[string]interface{}{}
|
||||
|
||||
compiledQuery := client.compileQuery(query, variables)
|
||||
assert.NotNil(compiledQuery)
|
||||
|
||||
// The compiled query should NOT be minified (preserve original formatting)
|
||||
assert.Equal(query, compiledQuery.Query, "Query should remain unchanged when minification is disabled")
|
||||
})
|
||||
|
||||
t.Run("should_handle_string_literals_correctly", func(t *testing.T) {
|
||||
client := CreateTestClient()
|
||||
|
||||
query := `mutation test($value: String!) {
|
||||
insert_test(
|
||||
value: $value,
|
||||
note: "This is a test\nwith newlines\tand tabs"
|
||||
) {
|
||||
id
|
||||
}
|
||||
}`
|
||||
variables := map[string]interface{}{
|
||||
"value": "test",
|
||||
}
|
||||
|
||||
compiledQuery := client.compileQuery(query, variables)
|
||||
assert.NotNil(compiledQuery)
|
||||
|
||||
// String literals should preserve their content
|
||||
assert.Contains(compiledQuery.Query, `"This is a test\nwith newlines\tand tabs"`, "String literals should be preserved")
|
||||
// But the query structure should be minified
|
||||
assert.False(strings.Contains(strings.Replace(compiledQuery.Query, `"This is a test\nwith newlines\tand tabs"`, "", 1), "\n"), "Query structure should be minified")
|
||||
})
|
||||
|
||||
t.Run("should_demonstrate_size_reduction_with_production_case", func(t *testing.T) {
|
||||
client := CreateTestClient()
|
||||
|
||||
// Use the production case from trailing garbage test
|
||||
variables := map[string]interface{}{
|
||||
"group_description": "This a group for serious buyers and sellers\nOf uber eats and Door dash account \nRippers are not allowed in this group😈",
|
||||
"user_name": "2eba巴结",
|
||||
}
|
||||
|
||||
originalQuery := `mutation storeMessage(
|
||||
$group_description: String!,
|
||||
$user_name: String!
|
||||
) {
|
||||
insert_message(
|
||||
group_description: $group_description,
|
||||
user_name: $user_name
|
||||
) {
|
||||
id
|
||||
created_at
|
||||
updated_at
|
||||
}
|
||||
}`
|
||||
|
||||
// Test with minification enabled
|
||||
client.SetQueryMinification(true)
|
||||
compiledQueryMinified := client.compileQuery(originalQuery, variables)
|
||||
minifiedJsonSize := len(compiledQueryMinified.JsonQuery)
|
||||
|
||||
// Test with minification disabled
|
||||
client.SetQueryMinification(false)
|
||||
compiledQueryOriginal := client.compileQuery(originalQuery, variables)
|
||||
originalJsonSize := len(compiledQueryOriginal.JsonQuery)
|
||||
|
||||
t.Logf("Original JSON size: %d bytes", originalJsonSize)
|
||||
t.Logf("Minified JSON size: %d bytes", minifiedJsonSize)
|
||||
t.Logf("Size reduction: %d bytes", originalJsonSize-minifiedJsonSize)
|
||||
|
||||
// Should achieve size reduction
|
||||
assert.True(minifiedJsonSize < originalJsonSize, "Minified JSON should be smaller")
|
||||
|
||||
// Both should be valid JSON
|
||||
assert.True(len(compiledQueryMinified.JsonQuery) > 0, "Minified query should produce valid JSON")
|
||||
assert.True(len(compiledQueryOriginal.JsonQuery) > 0, "Original query should produce valid JSON")
|
||||
})
|
||||
}
|
||||
|
||||
func TestIsAlphaNumeric(t *testing.T) {
|
||||
assert := assertions.New(t)
|
||||
|
||||
tests := []struct {
|
||||
char byte
|
||||
expected bool
|
||||
}{
|
||||
{'a', true},
|
||||
{'z', true},
|
||||
{'A', true},
|
||||
{'Z', true},
|
||||
{'0', true},
|
||||
{'9', true},
|
||||
{'_', true},
|
||||
{' ', false},
|
||||
{'\n', false},
|
||||
{'\t', false},
|
||||
{'{', false},
|
||||
{'}', false},
|
||||
{'(', false},
|
||||
{')', false},
|
||||
{':', false},
|
||||
{'"', false},
|
||||
{'\'', false},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(string(tt.char), func(t *testing.T) {
|
||||
result := isAlphaNumeric(tt.char)
|
||||
assert.Equal(tt.expected, result, "isAlphaNumeric should correctly identify character type")
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestQueryMinificationEnvironmentVariable(t *testing.T) {
|
||||
assert := assertions.New(t)
|
||||
|
||||
t.Run("should_respect_GRAPHQL_MINIFY_QUERIES_env_var", func(t *testing.T) {
|
||||
// This test would require setting environment variables
|
||||
// For now, we'll test the default behavior
|
||||
client := NewConnection()
|
||||
|
||||
// Should be enabled by default
|
||||
assert.True(client.minify_queries, "Query minification should be enabled by default")
|
||||
})
|
||||
}
|
||||
|
||||
func TestQueryMinificationEdgeCases(t *testing.T) {
|
||||
assert := assertions.New(t)
|
||||
|
||||
t.Run("should_handle_empty_query", func(t *testing.T) {
|
||||
result := minifyGraphQLQuery("")
|
||||
assert.Equal("", result, "Empty query should remain empty")
|
||||
})
|
||||
|
||||
t.Run("should_handle_query_with_only_whitespace", func(t *testing.T) {
|
||||
result := minifyGraphQLQuery(" \n\t \n ")
|
||||
assert.Equal("", result, "Query with only whitespace should become empty")
|
||||
})
|
||||
|
||||
t.Run("should_handle_nested_quotes", func(t *testing.T) {
|
||||
query := `mutation test {
|
||||
insert_test(value: "String with \"nested quotes\" and 'mixed' quotes") {
|
||||
id
|
||||
}
|
||||
}`
|
||||
result := minifyGraphQLQuery(query)
|
||||
expected := `mutation test{insert_test(value: "String with \"nested quotes\" and 'mixed' quotes"){id}}`
|
||||
assert.Equal(expected, result, "Should handle nested quotes correctly")
|
||||
})
|
||||
|
||||
t.Run("should_preserve_spaces_between_keywords", func(t *testing.T) {
|
||||
query := `query test($var: String!) {
|
||||
field(where: {id: {_eq: $var}}) {
|
||||
id
|
||||
}
|
||||
}`
|
||||
result := minifyGraphQLQuery(query)
|
||||
|
||||
// Should preserve necessary spaces
|
||||
assert.Contains(result, "query test", "Should preserve space between 'query' and 'test'")
|
||||
assert.Contains(result, "$var: String!", "Should preserve space in variable declaration")
|
||||
assert.Contains(result, "_eq: $var", "Should preserve space around operators")
|
||||
})
|
||||
}
|
||||
@@ -124,7 +124,7 @@ func (suite *QueryOptimizationTestSuite) TestDoubleCompilationFix() {
|
||||
// This should not cause double compilation
|
||||
compiledQuery := suite.client.compileQuery(query, variables)
|
||||
suite.NotNil(compiledQuery)
|
||||
suite.Equal(query, compiledQuery.Query)
|
||||
suite.Equal("query GetUser($id: ID!){user(id: $id){id name}}", compiledQuery.Query)
|
||||
|
||||
// Variables should still contain the flags at this point (they're cleaned in Query method)
|
||||
suite.Contains(compiledQuery.Variables, "gqlcache")
|
||||
|
||||
+5
-5
@@ -60,8 +60,8 @@ func (suite *Tests) TestBaseClient_compileQuery() {
|
||||
},
|
||||
},
|
||||
wantQ: &Query{
|
||||
Query: `query { viewer { login } }`,
|
||||
JsonQuery: []byte(`{"query":"query { viewer { login } }"}`),
|
||||
Query: `query{viewer{login}}`,
|
||||
JsonQuery: []byte(`{"query":"query{viewer{login}}"}`),
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -76,12 +76,12 @@ func (suite *Tests) TestBaseClient_compileQuery() {
|
||||
},
|
||||
},
|
||||
wantQ: &Query{
|
||||
Query: `query { viewer { login } }`,
|
||||
Query: `query{viewer{login}}`,
|
||||
Variables: map[string]interface{}{
|
||||
"login": "lukaszraczylo",
|
||||
"first": 10,
|
||||
},
|
||||
JsonQuery: []byte(`{"variables":{"first":10,"login":"lukaszraczylo"},"query":"query { viewer { login } }"}`),
|
||||
JsonQuery: []byte(`{"variables":{"first":10,"login":"lukaszraczylo"},"query":"query{viewer{login}}"}`),
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -231,7 +231,7 @@ func (suite *Tests) TestBaseClient_compileQuery_errors() {
|
||||
|
||||
result := b.compileQuery("query { test }", "invalid_variables")
|
||||
assert.NotNil(result)
|
||||
assert.Equal("query { test }", result.Query)
|
||||
assert.Equal("query{test}", result.Query)
|
||||
assert.Nil(result.Variables)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ import (
|
||||
|
||||
assertions "github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/suite"
|
||||
"golang.org/x/net/http2"
|
||||
)
|
||||
|
||||
type RequestCompressionTestSuite struct {
|
||||
@@ -74,17 +75,23 @@ func (suite *RequestCompressionTestSuite) TestRequestCompression() {
|
||||
httpClient := client.createHttpClient()
|
||||
assert.NotNil(httpClient, "HTTP client should be created")
|
||||
|
||||
// Verify transport settings
|
||||
// Verify transport settings based on protocol
|
||||
if strings.HasPrefix(endpoint, "http://") {
|
||||
// HTTP/1.1 transport
|
||||
// HTTP/1.1 transport for http:// (h2c rarely supported)
|
||||
transport, ok := httpClient.Transport.(*http.Transport)
|
||||
assert.True(ok, "Should be http.Transport for HTTP endpoints")
|
||||
assert.True(ok, "Should be http.Transport for http:// endpoints")
|
||||
if ok {
|
||||
assert.True(transport.DisableCompression, "DisableCompression should be true for HTTP transport")
|
||||
assert.True(transport.DisableCompression, "DisableCompression should be true to prevent trailing garbage")
|
||||
}
|
||||
} else {
|
||||
// HTTP/2 transport - this is where the issue might be
|
||||
// We need to ensure HTTP/2 transport also has compression disabled
|
||||
// HTTP/2 transport for https://
|
||||
transport, ok := httpClient.Transport.(*http2.Transport)
|
||||
assert.True(ok, "Should be http2.Transport for https:// endpoints")
|
||||
if ok {
|
||||
assert.True(transport.DisableCompression, "DisableCompression should be true to prevent trailing garbage")
|
||||
assert.True(transport.AllowHTTP, "AllowHTTP should be true")
|
||||
assert.NotNil(transport.TLSClientConfig, "TLSClientConfig should be set for https:// endpoints")
|
||||
}
|
||||
}
|
||||
|
||||
qe := &QueryExecutor{
|
||||
|
||||
+19
-10
@@ -2,6 +2,7 @@ package gql
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
cache "github.com/lukaszraczylo/go-simple-graphql/cache"
|
||||
@@ -9,16 +10,24 @@ import (
|
||||
)
|
||||
|
||||
type BaseClient struct {
|
||||
cache *cache.Cache
|
||||
Logger *logging.Logger
|
||||
client *http.Client
|
||||
endpoint string
|
||||
responseType string
|
||||
retries_delay time.Duration
|
||||
retries_number int
|
||||
MaxGoRoutines int
|
||||
cache_global bool
|
||||
retries_enable bool
|
||||
cache *cache.Cache
|
||||
Logger *logging.Logger
|
||||
client *http.Client
|
||||
endpoint string
|
||||
responseType string
|
||||
retries_delay time.Duration
|
||||
retries_number int
|
||||
retries_patterns []string // Error patterns that should trigger retries
|
||||
pool_size int // Number of connections to pre-warm
|
||||
pool_warmup_enabled bool // Enable connection pool warmup
|
||||
pool_warmup_query string // Query to use for warming up connections
|
||||
pool_health_interval time.Duration // Interval for pool health checks
|
||||
pool_stop chan bool // Channel to stop pool monitor
|
||||
pool_stop_once sync.Once // Ensures StopPoolMonitor is called only once
|
||||
MaxGoRoutines int
|
||||
cache_global bool
|
||||
retries_enable bool
|
||||
minify_queries bool // Enable GraphQL query minification (default: true)
|
||||
}
|
||||
|
||||
type Query struct {
|
||||
|
||||
+5
-4
@@ -60,9 +60,10 @@ func CleanupTestCache() {
|
||||
// CreateTestClient creates a test client with shared resources
|
||||
func CreateTestClient() *BaseClient {
|
||||
return &BaseClient{
|
||||
Logger: GetTestLogger(),
|
||||
cache: GetTestCache(),
|
||||
endpoint: "https://example.com/graphql",
|
||||
responseType: "mapstring",
|
||||
Logger: GetTestLogger(),
|
||||
cache: GetTestCache(),
|
||||
endpoint: "https://example.com/graphql",
|
||||
responseType: "mapstring",
|
||||
minify_queries: true, // Enable query minification by default for tests
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ func TestTrailingGarbageReproduction(t *testing.T) {
|
||||
return v
|
||||
},
|
||||
queryMod: func(q string) string { return q },
|
||||
expectSize: 356,
|
||||
expectSize: 350,
|
||||
},
|
||||
{
|
||||
name: "with_additional_headers_in_variables",
|
||||
@@ -424,7 +424,7 @@ func TestPotentialRootCauses(t *testing.T) {
|
||||
|
||||
// The JSON should be the same regardless of Content-Type header
|
||||
assert.True(json.Valid(compiledQuery.JsonQuery))
|
||||
assert.Equal(356, len(compiledQuery.JsonQuery)) // Should be consistent
|
||||
assert.Equal(350, len(compiledQuery.JsonQuery)) // Updated for improved minification
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user