fix: OCM client configurability

Instead of creating a client each time a function is called, create client once

Signed-off-by: Mahdi Baghbani <mahdi-baghbani@azadehafzar.io>

Author: MahdiBaghbani

internal/http/services/sciencemesh/sciencemesh.go

@@ -60,13 +60,15 @@ func (s *svc) Close() error {
 }
 
 type config struct {
-	Prefix           string       `mapstructure:"prefix"`
-	GatewaySvc       string       `mapstructure:"gatewaysvc"         validate:"required"`
-	ProviderDomain   string       `mapstructure:"provider_domain"    validate:"required"`
-	MeshDirectoryURL string       `mapstructure:"mesh_directory_url"`
-	OCMMountPoint    string       `mapstructure:"ocm_mount_point"`
-	FederationsFile  string       `mapstructure:"federations_file"`
-	Events           EventOptions `mapstructure:"events"`
+	Prefix            string       `mapstructure:"prefix"`
+	GatewaySvc        string       `mapstructure:"gatewaysvc"         validate:"required"`
+	ProviderDomain    string       `mapstructure:"provider_domain"    validate:"required"`
+	MeshDirectoryURL  string       `mapstructure:"mesh_directory_url"`
+	OCMMountPoint     string       `mapstructure:"ocm_mount_point"`
+	FederationsFile   string       `mapstructure:"federations_file"`
+	OCMClientTimeout  int          `mapstructure:"ocm_client_timeout"`
+	OCMClientInsecure bool         `mapstructure:"ocm_client_insecure"`
+	Events            EventOptions `mapstructure:"events"`
 }
 
 // EventOptions are the configurable options for events
@@ -90,6 +92,9 @@ func (c *config) ApplyDefaults() {
 	if c.FederationsFile == "" {
 		c.FederationsFile = "/etc/revad/federations.json"
 	}
+	if c.OCMClientTimeout == 0 {
+		c.OCMClientTimeout = 10
+	}
 
 	c.GatewaySvc = sharedconf.GetGatewaySVC(c.GatewaySvc)
 }

internal/http/services/sciencemesh/wayf.go

@@ -35,6 +35,7 @@ import (
 
 type wayfHandler struct {
 	federations []Federation
+	ocmClient   *ocmd.OCMClient
 }
 
 type Federation struct {
@@ -71,6 +72,13 @@ type DiscoverResponse struct {
 func (h *wayfHandler) init(c *config) error {
 	log := appctx.GetLogger(context.Background())
 
+	// Create OCM client for discovery from config
+	h.ocmClient = ocmd.NewClient(time.Duration(c.OCMClientTimeout)*time.Second, c.OCMClientInsecure)
+	log.Debug().
+		Int("timeout_seconds", c.OCMClientTimeout).
+		Bool("insecure", c.OCMClientInsecure).
+		Msg("Created OCM client for discovery")
+
 	log.Debug().Str("file", c.FederationsFile).Msg("Initializing WAYF handler with federations file")
 
 	data, err := os.ReadFile(c.FederationsFile)
@@ -92,10 +100,6 @@ func (h *wayfHandler) init(c *config) error {
 
 	log.Debug().Int("federations_count", len(fileData)).Msg("Loaded federations from file")
 
-	// Create OCM client for discovery
-	ocmClient := ocmd.NewClient(10*time.Second, false)
-	log.Debug().Msg("Created OCM client for discovery")
-
 	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
 	defer cancel()
 
@@ -120,7 +124,7 @@ func (h *wayfHandler) init(c *config) error {
 			log.Debug().Str("federation", fed.Federation).Str("server", srv.DisplayName).Str("url", srv.URL).Msg("Discovering server")
 
 			// Discover inviteAcceptDialog from OCM endpoint
-			disco, err := ocmClient.Discover(ctx, srv.URL)
+			disco, err := h.ocmClient.Discover(ctx, srv.URL)
 			if err != nil {
 				log.Warn().Err(err).
 					Str("federation", fed.Federation).
@@ -219,11 +223,8 @@ func (h *wayfHandler) DiscoverProvider(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Create OCM client with timeout
-	ocmClient := ocmd.NewClient(10*time.Second, false)
-
 	log.Debug().Str("domain", domain).Msg("Attempting OCM discovery")
-	disco, err := ocmClient.Discover(ctx, domain)
+	disco, err := h.ocmClient.Discover(ctx, domain)
 	if err != nil {
 		log.Warn().Err(err).Str("domain", domain).Msg("Discovery failed")
 		reqres.WriteError(w, r, reqres.APIErrorNotFound,