proposed solution to issue 1134

pkg/client/mediator/client.go

@@ -9,6 +9,7 @@ package mediator
 import (
 	"errors"
 	"fmt"
+	"time"
 
 	"github.com/hyperledger/aries-framework-go/pkg/didcomm/common/service"
 	"github.com/hyperledger/aries-framework-go/pkg/didcomm/protocol/mediator"
@@ -41,10 +42,41 @@ type protocolService interface {
 
 	// Config returns the router's configuration.
 	Config() (*mediator.Config, error)
+
+	// SetTimeout timeout value waiting for responses received from the router
+	SetTimeout(timeout time.Duration)
+}
+
+const (
+	updateTimeout = 5 * time.Second
+)
+
+// Option configures the route client and underlying service
+type Option func(opts *mediatorOpts)
+
+// mediatorOpts holds options for the router client
+type mediatorOpts struct {
+	timeout time.Duration
+}
+
+// WithTimeout option is for definition timeout value waiting for responses received from the router
+func WithTimeout(t time.Duration) Option {
+	return func(opts *mediatorOpts) {
+		opts.timeout = t
+	}
 }
 
 // New return new instance of route client.
-func New(ctx provider) (*Client, error) {
+func New(ctx provider, options ...Option) (*Client, error) {
+	opts := &mediatorOpts{}
+
+	defMediatorOpts(opts)
+
+	// generate router config from options
+	for _, option := range options {
+		option(opts)
+	}
+
 	svc, err := ctx.Service(mediator.Coordination)
 	if err != nil {
 		return nil, err
@@ -55,12 +87,19 @@ func New(ctx provider) (*Client, error) {
 		return nil, errors.New("cast service to route service failed")
 	}
 
+	routeSvc.SetTimeout(opts.timeout)
+
 	return &Client{
 		Event:    routeSvc,
 		routeSvc: routeSvc,
 	}, nil
 }
 
+// defMediatorOpts provides default router options
+func defMediatorOpts(opts *mediatorOpts) {
+	opts.timeout = updateTimeout
+}
+
 // Register the agent with the router(passed in connectionID). This function asks router's
 // permission to publish it's endpoint and routing keys.
 func (c *Client) Register(connectionID string) error {

pkg/client/mediator/client_test.go

@@ -30,6 +30,22 @@ func TestNew(t *testing.T) {
 		require.NotNil(t, svc)
 	})
 
+	t.Run("test new client with all options applied", func(t *testing.T) {
+		i := 0
+		svc, err := New(&mockprovider.Provider{
+			ServiceValue: &mockroute.MockMediatorSvc{}},
+			func(opts *mediatorOpts) {
+				i += 1 // nolint
+			},
+			func(opts *mediatorOpts) {
+				i += 2
+			},
+		)
+		require.NoError(t, err)
+		require.NotNil(t, svc)
+		require.Equal(t, 1+2, i)
+	})
+
 	t.Run("test error from get service from context", func(t *testing.T) {
 		_, err := New(&mockprovider.Provider{ServiceErr: fmt.Errorf("service error")})
 		require.Error(t, err)

pkg/didcomm/protocol/mediator/service.go

@@ -73,10 +73,6 @@ const (
 	routeConfigDataKey = "route-config"
 )
 
-const (
-	updateTimeout = 5 * time.Second
-)
-
 // ErrConnectionNotFound connection not found error
 var ErrConnectionNotFound = errors.New("connection not found")
 
@@ -128,6 +124,7 @@ type Service struct {
 	keylistUpdateMap         map[string]chan *KeylistUpdateResponse
 	keylistUpdateMapLock     sync.RWMutex
 	callbacks                chan *callback
+	updateTimeout            time.Duration
 }
 
 // New return route coordination service.
@@ -159,6 +156,11 @@ func New(prov provider) (*Service, error) {
 	return s, nil
 }
 
+// SetTimeout timeout value waiting for responses received from the router
+func (s *Service) SetTimeout(t time.Duration) {
+	s.updateTimeout = t
+}
+
 func (s *Service) listenForCallbacks() {
 	for c := range s.callbacks {
 		logger.Debugf("handling user callback %+v with options %+v", c, c.options)
@@ -527,8 +529,7 @@ func (s *Service) doRegistration(record *connection.Record, req *Request) error
 		if err := s.saveRouterConfig(conf); err != nil {
 			return fmt.Errorf("save route config : %w", err)
 		}
-	// TODO https://github.com/hyperledger/aries-framework-go/issues/1134 configure this timeout at decorator level
-	case <-time.After(updateTimeout):
+	case <-time.After(s.updateTimeout):
 		return errors.New("timeout waiting for grant from the router")
 	}
 
@@ -617,8 +618,7 @@ func (s *Service) AddKey(recKey string) error {
 		if err := processKeylistUpdateResp(recKey, keyUpdateResp); err != nil {
 			return err
 		}
-	// TODO https://github.com/hyperledger/aries-framework-go/issues/1134 configure this timeout at decorator level
-	case <-time.After(updateTimeout):
+	case <-time.After(s.updateTimeout):
 		return errors.New("timeout waiting for keylist update response from the router")
 	}
 

pkg/mock/didcomm/protocol/mediator/mock_mediator.go

@@ -7,6 +7,8 @@ SPDX-License-Identifier: Apache-2.0
 package mediator
 
 import (
+	"time"
+
 	"github.com/google/uuid"
 
 	"github.com/hyperledger/aries-framework-go/pkg/didcomm/common/service"
@@ -30,6 +32,7 @@ type MockMediatorSvc struct {
 	ConnectionID       string
 	GetConnectionIDErr error
 	AddKeyFunc         func(string) error
+	SetTimeoutFunc     func(t time.Duration)
 }
 
 // HandleInbound msg
@@ -117,3 +120,10 @@ func (m *MockMediatorSvc) GetConnection() (string, error) {
 
 	return m.ConnectionID, nil
 }
+
+// SetTimeout timeout value waiting for responses received from the router
+func (m *MockMediatorSvc) SetTimeout(t time.Duration) {
+	if m.SetTimeoutFunc != nil {
+		m.SetTimeoutFunc(t)
+	}
+}