fix: simplify api

Author: ndyakov

internal/pool/conn.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/redis/go-redis/v9/internal/proto"
+	"github.com/redis/go-redis/v9/internal/pushnotif"
 )
 
 var noDeadline = time.Time{}
@@ -27,8 +28,8 @@ type Conn struct {
 	onClose func() error
 
 	// Push notification processor for handling push notifications on this connection
-	// Uses the same interface as defined in pool.go to avoid duplication
-	PushNotificationProcessor PushNotificationProcessorInterface
+	// This is set when the connection is created and is a reference to the processor
+	PushNotificationProcessor pushnotif.ProcessorInterface
 }
 
 func NewConn(netConn net.Conn) *Conn {

internal/pool/pool.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/redis/go-redis/v9/internal"
-	"github.com/redis/go-redis/v9/internal/proto"
+	"github.com/redis/go-redis/v9/internal/pushnotif"
 )
 
 var (
@@ -24,8 +24,6 @@ var (
 	ErrPoolTimeout = errors.New("redis: connection pool timeout")
 )
 
-
-
 var timers = sync.Pool{
 	New: func() interface{} {
 		t := time.NewTimer(time.Hour)
@@ -62,12 +60,6 @@ type Pooler interface {
 	Close() error
 }
 
-// PushNotificationProcessorInterface defines the interface for push notification processors.
-// This matches the main PushNotificationProcessorInterface to avoid duplication while preventing circular imports.
-type PushNotificationProcessorInterface interface {
-	ProcessPendingNotifications(ctx context.Context, rd *proto.Reader) error
-}
-
 type Options struct {
 	Dialer func(context.Context) (net.Conn, error)
 
@@ -82,9 +74,8 @@ type Options struct {
 	ConnMaxLifetime time.Duration
 
 	// Push notification processor for connections
-	// This interface matches PushNotificationProcessorInterface to avoid duplication
-	// while preventing circular imports
-	PushNotificationProcessor PushNotificationProcessorInterface
+	// This is an interface to avoid circular imports
+	PushNotificationProcessor pushnotif.ProcessorInterface
 
 	// Protocol version for optimization (3 = RESP3 with push notifications, 2 = RESP2 without)
 	Protocol int

internal/pushnotif/processor.go

@@ -38,11 +38,7 @@ func (p *Processor) UnregisterHandler(pushNotificationName string) error {
 	return p.registry.UnregisterHandler(pushNotificationName)
 }
 
-// GetRegistryForTesting returns the push notification registry for testing.
-// This method should only be used by tests.
-func (p *Processor) GetRegistryForTesting() *Registry {
-	return p.registry
-}
+
 
 // ProcessPendingNotifications checks for and processes any pending push notifications.
 func (p *Processor) ProcessPendingNotifications(ctx context.Context, rd *proto.Reader) error {
@@ -82,8 +78,17 @@ func (p *Processor) ProcessPendingNotifications(ctx context.Context, rd *proto.R
 			continue
 		}
 
-		// Handle the notification
-		p.registry.HandleNotification(ctx, notification)
+		// Handle the notification directly
+		if len(notification) > 0 {
+			// Extract the notification type (first element)
+			if notificationType, ok := notification[0].(string); ok {
+				// Get the handler for this notification type
+				if handler := p.registry.GetHandler(notificationType); handler != nil {
+					// Handle the notification
+					handler.HandlePushNotification(ctx, notification)
+				}
+			}
+		}
 	}
 
 	return nil
@@ -108,11 +113,7 @@ func (v *VoidProcessor) RegisterHandler(pushNotificationName string, handler Han
 	return fmt.Errorf("cannot register push notification handler '%s': push notifications are disabled (using void processor)", pushNotificationName)
 }
 
-// GetRegistryForTesting returns nil for void processor since it doesn't maintain handlers.
-// This method should only be used by tests.
-func (v *VoidProcessor) GetRegistryForTesting() *Registry {
-	return nil
-}
+
 
 // ProcessPendingNotifications for VoidProcessor does nothing since push notifications
 // are only available in RESP3 and this processor is used when they're disabled.

internal/pushnotif/registry.go

@@ -1,7 +1,6 @@
 package pushnotif
 
 import (
-	"context"
 	"fmt"
 	"sync"
 )
@@ -82,25 +81,4 @@ func (r *Registry) GetRegisteredPushNotificationNames() []string {
 	return names
 }
 
-// HandleNotification attempts to handle a push notification using registered handlers.
-// Returns true if a handler was found and successfully processed the notification.
-func (r *Registry) HandleNotification(ctx context.Context, notification []interface{}) bool {
-	if len(notification) == 0 {
-		return false
-	}
-
-	// Extract the notification type (first element)
-	notificationType, ok := notification[0].(string)
-	if !ok {
-		return false
-	}
 
-	// Get the handler for this notification type
-	handler := r.GetHandler(notificationType)
-	if handler == nil {
-		return false
-	}
-
-	// Handle the notification
-	return handler.HandlePushNotification(ctx, notification)
-}