Merge pull request #84 from sev-2/feature/enhance-client-folder

Feature/enhance client folder
sev-2 · Jan 22, 2025 · 1aa2fe3 · 1aa2fe3
2 parents fba0298 + 9e9417b
commit 1aa2fe3
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 11 deletions.
diff --git a/pkg/supabase/client/client.go → pkg/client/client.go b/pkg/supabase/client/client.go → pkg/client/client.go
@@ -45,7 +45,8 @@ type DefaultResponse struct {
 
 func getClient() Client {
 	maxIdleConnDuration := time.Hour * 1
-	return &fasthttp.Client{
+
+	httpClientInstance = &fasthttp.Client{
 		ReadTimeout:                   DefaultTimeout,
 		WriteTimeout:                  DefaultTimeout,
 		MaxIdleConnDuration:           maxIdleConnDuration,
@@ -58,6 +59,8 @@ func getClient() Client {
 			DNSCacheDuration: time.Hour,
 		}).Dial,
 	}
+
+	return httpClientInstance
 }
 
 func SetClient(c Client) {

diff --git a/pkg/supabase/client/client_test.go → pkg/client/client_test.go b/pkg/supabase/client/client_test.go → pkg/client/client_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/sev-2/raiden/pkg/supabase/client"
+	"github.com/sev-2/raiden/pkg/client"
 	"github.com/stretchr/testify/assert"
 	"github.com/valyala/fasthttp"
 )

diff --git a/pkg/supabase/client/net/client.go → pkg/client/net/client.go b/pkg/supabase/client/net/client.go → pkg/client/net/client.go
diff --git a/pkg/supabase/drivers/cloud/admin/user.go b/pkg/supabase/drivers/cloud/admin/user.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/sev-2/raiden"
-	"github.com/sev-2/raiden/pkg/supabase/client/net"
+	"github.com/sev-2/raiden/pkg/client/net"
 	"github.com/sev-2/raiden/pkg/supabase/objects"
 )
 

diff --git a/pkg/supabase/drivers/cloud/cloud.go b/pkg/supabase/drivers/cloud/cloud.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/sev-2/raiden"
+	"github.com/sev-2/raiden/pkg/client/net"
 	"github.com/sev-2/raiden/pkg/logger"
-	"github.com/sev-2/raiden/pkg/supabase/client/net"
 	"github.com/sev-2/raiden/pkg/supabase/objects"
 )
 

diff --git a/pkg/supabase/drivers/local/meta/function.go b/pkg/supabase/drivers/local/meta/function.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/sev-2/raiden"
-	"github.com/sev-2/raiden/pkg/supabase/client/net"
+	"github.com/sev-2/raiden/pkg/client/net"
 	"github.com/sev-2/raiden/pkg/supabase/objects"
 	"github.com/sev-2/raiden/pkg/supabase/query"
 	"github.com/sev-2/raiden/pkg/supabase/query/sql"

diff --git a/pkg/supabase/drivers/local/meta/meta.go b/pkg/supabase/drivers/local/meta/meta.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/sev-2/raiden"
+	"github.com/sev-2/raiden/pkg/client/net"
 	"github.com/sev-2/raiden/pkg/logger"
-	"github.com/sev-2/raiden/pkg/supabase/client/net"
 )
 
 var MetaLogger = logger.HcLog().Named("supabase.meta")

diff --git a/pkg/supabase/drivers/local/meta/policy.go b/pkg/supabase/drivers/local/meta/policy.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/lib/pq"
 	"github.com/sev-2/raiden"
-	"github.com/sev-2/raiden/pkg/supabase/client/net"
+	"github.com/sev-2/raiden/pkg/client/net"
 	"github.com/sev-2/raiden/pkg/supabase/objects"
 	"github.com/sev-2/raiden/pkg/supabase/query"
 	"github.com/sev-2/raiden/pkg/supabase/query/sql"

diff --git a/pkg/supabase/drivers/local/meta/role.go b/pkg/supabase/drivers/local/meta/role.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/lib/pq"
 	"github.com/sev-2/raiden"
-	"github.com/sev-2/raiden/pkg/supabase/client/net"
+	"github.com/sev-2/raiden/pkg/client/net"
 	"github.com/sev-2/raiden/pkg/supabase/objects"
 	"github.com/sev-2/raiden/pkg/supabase/query"
 	"github.com/sev-2/raiden/pkg/supabase/query/sql"

diff --git a/pkg/supabase/drivers/local/meta/table.go b/pkg/supabase/drivers/local/meta/table.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 
 	"github.com/sev-2/raiden"
-	"github.com/sev-2/raiden/pkg/supabase/client/net"
+	"github.com/sev-2/raiden/pkg/client/net"
 	"github.com/sev-2/raiden/pkg/supabase/objects"
 	"github.com/sev-2/raiden/pkg/supabase/query"
 	"github.com/sev-2/raiden/pkg/supabase/query/sql"

diff --git a/pkg/supabase/supabase.go b/pkg/supabase/supabase.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/hashicorp/go-hclog"
 	"github.com/sev-2/raiden"
+	"github.com/sev-2/raiden/pkg/client/net"
 	"github.com/sev-2/raiden/pkg/logger"
-	"github.com/sev-2/raiden/pkg/supabase/client/net"
 	"github.com/sev-2/raiden/pkg/supabase/drivers/cloud"
 	"github.com/sev-2/raiden/pkg/supabase/drivers/cloud/admin"
 	"github.com/sev-2/raiden/pkg/supabase/drivers/local/meta"

diff --git a/rpc.go b/rpc.go
@@ -11,8 +11,8 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/sev-2/raiden/pkg/client/net"
 	"github.com/sev-2/raiden/pkg/logger"
-	"github.com/sev-2/raiden/pkg/supabase/client/net"
 	"github.com/sev-2/raiden/pkg/utils"
 	"github.com/valyala/fasthttp"
 )