diff --git a/README.md b/README.md index 97d902e..f9b7b15 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,11 @@ It’s a toolkit you can adopt incrementally. ## Current Focus - Messaging abstractions +- Network abstractions (HTTP & gRPC) - RabbitMQ adapter (v0.1) - Kafka adapter (v0.1) +- HTTP adapter (v0.1) +- gRPC adapter (v0.1) --- @@ -51,3 +54,29 @@ producer := kafka.NewProducer(conn, "orders") producer.Publish(ctx, []byte("key"), []byte(`{"id":"123"}`)) ``` + +### HTTP Client with Retry + +```go +client := http.NewClient(10 * time.Second) +defer client.Close() + +resp, _ := client.Get(ctx, "https://api.example.com/users", + network.WithHeader("Authorization", "Bearer token"), + network.WithRetry(3, 100*time.Millisecond, 2*time.Second, 2.0), +) +``` + +### gRPC Client with Retry + +```go +client, _ := grpc.NewClient("localhost:50051", 10*time.Second) +defer client.Close() + +req := &HelloRequest{Name: "microkit"} +resp := &HelloResponse{} + +client.Call(ctx, "/hello.HelloService/SayHello", req, resp, + network.WithRetry(3, 100*time.Millisecond, 2*time.Second, 2.0), +) +``` diff --git a/adapters/grpc/client.go b/adapters/grpc/client.go new file mode 100644 index 0000000..b8b53cc --- /dev/null +++ b/adapters/grpc/client.go @@ -0,0 +1,74 @@ +package grpc + +import ( + "context" + "time" + + "github.com/festech-cloud/microkit/network" + "github.com/festech-cloud/microkit/internal/retry" + "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" +) + +type Client struct { + conn *grpc.ClientConn +} + +func NewClient(target string, timeout time.Duration) (*Client, error) { + _, cancel := context.WithTimeout(context.Background(), timeout) + defer cancel() + + conn, err := grpc.NewClient(target, + grpc.WithTransportCredentials(insecure.NewCredentials()), + ) + if err != nil { + return nil, err + } + + return &Client{conn: conn}, nil +} + +func (c *Client) Get(ctx context.Context, url string, opts ...network.Option) (*network.Response, error) { + panic("HTTP methods not supported by gRPC client") +} + +func (c *Client) Post(ctx context.Context, url string, body []byte, opts ...network.Option) (*network.Response, error) { + panic("HTTP methods not supported by gRPC client") +} + +func (c *Client) Put(ctx context.Context, url string, body []byte, opts ...network.Option) (*network.Response, error) { + panic("HTTP methods not supported by gRPC client") +} + +func (c *Client) Delete(ctx context.Context, url string, opts ...network.Option) (*network.Response, error) { + panic("HTTP methods not supported by gRPC client") +} + +func (c *Client) Patch(ctx context.Context, url string, body []byte, opts ...network.Option) (*network.Response, error) { + panic("HTTP methods not supported by gRPC client") +} + +func (c *Client) Call(ctx context.Context, method string, req any, resp any, opts ...network.Option) error { + config := &network.Config{} + for _, opt := range opts { + opt(config) + } + + if config.Timeout > 0 { + var cancel context.CancelFunc + ctx, cancel = context.WithTimeout(ctx, config.Timeout) + defer cancel() + } + + if config.RetryConfig != nil { + return retry.Execute(ctx, *config.RetryConfig, func() error { + return c.conn.Invoke(ctx, method, req, resp) + }) + } + + return c.conn.Invoke(ctx, method, req, resp) +} + +func (c *Client) Close() error { + return c.conn.Close() +} diff --git a/adapters/http/client.go b/adapters/http/client.go new file mode 100644 index 0000000..fd445d4 --- /dev/null +++ b/adapters/http/client.go @@ -0,0 +1,112 @@ +package http + +import ( + "bytes" + "context" + "io" + "net/http" + "time" + + "github.com/festech-cloud/microkit/network" + "github.com/festech-cloud/microkit/internal/retry" +) + +type Client struct { + client *http.Client +} + +func NewClient(timeout time.Duration) *Client { + return &Client{ + client: &http.Client{ + Timeout: timeout, + }, + } +} + +func (c *Client) Get(ctx context.Context, url string, opts ...network.Option) (*network.Response, error) { + return c.do(ctx, "GET", url, nil, opts...) +} + +func (c *Client) Post(ctx context.Context, url string, body []byte, opts ...network.Option) (*network.Response, error) { + return c.do(ctx, "POST", url, body, opts...) +} + +func (c *Client) Put(ctx context.Context, url string, body []byte, opts ...network.Option) (*network.Response, error) { + return c.do(ctx, "PUT", url, body, opts...) +} + +func (c *Client) Patch(ctx context.Context, url string, body []byte, opts ...network.Option) (*network.Response, error) { + return c.do(ctx, "PATCH", url, body, opts...) +} + +func (c *Client) Delete(ctx context.Context, url string, opts ...network.Option) (*network.Response, error) { + return c.do(ctx, "DELETE", url, nil, opts...) +} + +func (c *Client) Call(ctx context.Context, method string, req interface{}, resp interface{}, opts ...network.Option) error { + panic("gRPC not supported by HTTP client") +} + +func (c *Client) do(ctx context.Context, method, url string, body []byte, opts ...network.Option) (*network.Response, error) { + config := &network.Config{} + for _, opt := range opts { + opt(config) + } + + if config.RetryConfig != nil { + var resp *network.Response + err := retry.Execute(ctx, *config.RetryConfig, func() error { + var err error + resp, err = c.doRequest(ctx, method, url, body, config) + return err + }) + return resp, err + } + + return c.doRequest(ctx, method, url, body, config) +} + +func (c *Client) doRequest(ctx context.Context, method, url string, body []byte, config *network.Config) (*network.Response, error) { + var bodyReader io.Reader + if body != nil { + bodyReader = bytes.NewReader(body) + } + + req, err := http.NewRequestWithContext(ctx, method, url, bodyReader) + if err != nil { + return nil, err + } + + for k, v := range config.Headers { + req.Header.Set(k, v) + } + + resp, err := c.client.Do(req) + if err != nil { + return nil, err + } + defer resp.Body.Close() + + respBody, err := io.ReadAll(resp.Body) + if err != nil { + return nil, err + } + + headers := make(map[string]string) + for k, v := range resp.Header { + if len(v) > 0 { + headers[k] = v[0] + } + } + + return &network.Response{ + StatusCode: resp.StatusCode, + Headers: headers, + Body: respBody, + }, nil +} + +func (c *Client) Close() error { + c.client.CloseIdleConnections() + return nil +} diff --git a/adapters/kafka/consumer.go b/adapters/kafka/consumer.go index ad88512..78c1f48 100644 --- a/adapters/kafka/consumer.go +++ b/adapters/kafka/consumer.go @@ -6,13 +6,21 @@ import ( "log" kafka "github.com/segmentio/kafka-go" + "github.com/festech-cloud/microkit/internal/retry" ) +type ConsumerConfig struct { + RetryConfig retry.Config + EnableDLQ bool + DLQTopic string +} + type Consumer struct { conn *Connection topic string groupID string r *kafka.Reader + config ConsumerConfig } func NewConsumer(conn *Connection, topic, groupID string) *Consumer { @@ -24,6 +32,16 @@ func NewConsumer(conn *Connection, topic, groupID string) *Consumer { } } +func NewConsumerWithConfig(conn *Connection, topic, groupID string, config ConsumerConfig) *Consumer { + return &Consumer{ + conn: conn, + topic: topic, + groupID: groupID, + r: conn.Reader(topic, groupID), + config: config, + } +} + func (c *Consumer) Subscribe(ctx context.Context, handler func([]byte) error) { go func() { for { @@ -33,13 +51,30 @@ func (c *Consumer) Subscribe(ctx context.Context, handler func([]byte) error) { continue } - if err := handler(m.Value); err != nil { + if c.config.RetryConfig.MaxAttempts > 0 { + err = retry.Execute(ctx, c.config.RetryConfig, func() error { + return handler(m.Value) + }) + } else { + err = handler(m.Value) + } + + if err != nil { log.Printf("Handler error, message: %s, err: %v\n", string(m.Value), err) + if c.config.EnableDLQ { + c.sendToDLQ(ctx, m.Value) + } } } }() } +func (c *Consumer) sendToDLQ(ctx context.Context, message []byte) { + producer := NewProducer(c.conn, c.config.DLQTopic) + defer producer.Close() + producer.Publish(ctx, nil, message) +} + func (c *Consumer) Close() error { return c.r.Close() -} +} \ No newline at end of file diff --git a/examples/network/grpc/main.go b/examples/network/grpc/main.go new file mode 100644 index 0000000..94f8a8c --- /dev/null +++ b/examples/network/grpc/main.go @@ -0,0 +1,27 @@ +package main + +import ( + "fmt" + "log" + "time" + + "github.com/festech-cloud/microkit/adapters/grpc" +) + +func main() { + client, err := grpc.NewClient("localhost:50051", 10*time.Second) + if err != nil { + log.Fatal(err) + } + defer client.Close() + + // Example with proper protobuf messages (requires .proto files) + // req := &pb.HelloRequest{Name: "microkit"} + // resp := &pb.HelloResponse{} + // + // err = client.Call(ctx, "/hello.HelloService/SayHello", req, resp, + // network.WithRetry(3, 100*time.Millisecond, 2*time.Second, 2.0), + // ) + + fmt.Println("gRPC client ready - add your protobuf messages") +} \ No newline at end of file diff --git a/examples/network/http/main.go b/examples/network/http/main.go new file mode 100644 index 0000000..f8a8321 --- /dev/null +++ b/examples/network/http/main.go @@ -0,0 +1,29 @@ +package main + +import ( + "context" + "fmt" + "log" + "time" + + "github.com/festech-cloud/microkit/adapters/http" + "github.com/festech-cloud/microkit/network" +) + +func main() { + client := http.NewClient(10 * time.Second) + defer client.Close() + + ctx := context.Background() + + // HTTP GET with retry + resp, err := client.Get(ctx, "https://httpbin.org/get", + network.WithHeader("User-Agent", "microkit/1.0"), + network.WithRetry(3, 100*time.Millisecond, 2*time.Second, 2.0), + ) + if err != nil { + log.Fatal(err) + } + + fmt.Printf("Response: %d\n", resp.StatusCode) +} \ No newline at end of file diff --git a/go.mod b/go.mod index 400bdfe..c095e5e 100644 --- a/go.mod +++ b/go.mod @@ -3,14 +3,16 @@ module github.com/festech-cloud/microkit go 1.24.9 require ( + github.com/IBM/sarama v1.46.3 github.com/rabbitmq/amqp091-go v1.10.0 + github.com/segmentio/kafka-go v0.4.50 github.com/testcontainers/testcontainers-go v0.40.0 + google.golang.org/grpc v1.78.0 ) require ( dario.cat/mergo v1.0.2 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect - github.com/IBM/sarama v1.46.3 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect @@ -58,11 +60,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect - github.com/segmentio/kafka-go v0.4.50 // indirect github.com/shirou/gopsutil/v4 v4.25.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/testify v1.11.1 // indirect - github.com/testcontainers/testcontainers-go/modules/kafka v0.40.0 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect @@ -71,13 +71,14 @@ require ( go.opentelemetry.io/otel v1.40.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect go.opentelemetry.io/otel/metric v1.40.0 // indirect - go.opentelemetry.io/otel/sdk v1.40.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect go.opentelemetry.io/otel/trace v1.40.0 // indirect go.opentelemetry.io/proto/otlp v1.9.0 // indirect - golang.org/x/crypto v0.43.0 // indirect - golang.org/x/mod v0.16.0 // indirect - golang.org/x/net v0.46.0 // indirect + golang.org/x/crypto v0.44.0 // indirect + golang.org/x/net v0.47.0 // indirect golang.org/x/sys v0.40.0 // indirect + golang.org/x/text v0.31.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 6baf2ba..ac0bb61 100644 --- a/go.sum +++ b/go.sum @@ -45,6 +45,8 @@ github.com/ebitengine/purego v0.8.4 h1:CF7LEKg5FFOsASUj0+QwaXf8Ht6TlFxg09+S9wz0o github.com/ebitengine/purego v0.8.4/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= +github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -52,6 +54,8 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -72,13 +76,12 @@ github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8 github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg= github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= +github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8= github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= -github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= -github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3JH2co= github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -111,8 +114,6 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040= github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M= -github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0= -github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU= github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -147,12 +148,16 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/testcontainers/testcontainers-go v0.40.0 h1:pSdJYLOVgLE8YdUY2FHQ1Fxu+aMnb6JfVz1mxk7OeMU= github.com/testcontainers/testcontainers-go v0.40.0/go.mod h1:FSXV5KQtX2HAMlm7U3APNyLkkap35zNLxukw9oBi/MY= -github.com/testcontainers/testcontainers-go/modules/kafka v0.40.0 h1:BW4CMO6rYLvJRC7UF4l0rudnwm7IX/kJPvGd9MCJM6I= -github.com/testcontainers/testcontainers-go/modules/kafka v0.40.0/go.mod h1:O4U0SUR8blhkRLLfIFHQqNRKzee7fOxzya2H+rnl4OY= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= +github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= +github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= +github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= +github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= +github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= +github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= @@ -170,6 +175,8 @@ go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc= go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8= go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE= +go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw= +go.opentelemetry.io/otel/sdk/metric v1.40.0/go.mod h1:4Z2bGMf0KSK3uRjlczMOeMhKU2rhUqdWNoKcYrtcBPg= go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw= go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA= go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A= @@ -179,23 +186,21 @@ go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04= -golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0= +golang.org/x/crypto v0.44.0 h1:A97SsFvM3AIwEEmTBiaxPPTYpDC47w720rdiiUvgoAU= +golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= -golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM= -golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= -golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4= -golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210= +golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= +golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I= +golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -213,14 +218,14 @@ golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q= -golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss= +golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU= +golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= -golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= +golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= +golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -228,12 +233,14 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 h1:BIRfGDEjiHRrk0QKZe3Xv2ieMhtgRGeLcZQ0mIVn4EY= -google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5/go.mod h1:j3QtIyytwqGr1JUDtYXwtMXWPKsEa5LtzIFN1Wn5WvE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 h1:eaY8u2EuxbRv7c3NiGK0/NedzVsCcV6hDuU5qPX5EGE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5/go.mod h1:M4/wBTSeyLxupu3W3tJtOgB14jILAS/XWPSSa3TAlJc= -google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI= -google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ= +gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= +gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= +google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda h1:+2XxjfsAu6vqFxwGBRcHiMaDCuZiqXGDUDVWVtrFAnE= +google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda/go.mod h1:fDMmzKV90WSg1NbozdqrE64fkuTv6mlq2zxo9ad+3yo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda h1:i/Q+bfisr7gq6feoJnS/DlpdwEL4ihp41fvRiM3Ork0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= +google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc= +google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/internal/retry/retry.go b/internal/retry/retry.go index 8bc36c9..4644e9d 100644 --- a/internal/retry/retry.go +++ b/internal/retry/retry.go @@ -1 +1,40 @@ package retry + +import ( + "context" + "time" +) + +type Config struct { + MaxAttempts int + InitialDelay time.Duration + MaxDelay time.Duration + Multiplier float64 +} + +func Execute(ctx context.Context, config Config, fn func() error) error { + var err error + delay := config.InitialDelay + + for attempt := 0; attempt < config.MaxAttempts; attempt++ { + err = fn() + if err == nil { + return nil + } + + if attempt < config.MaxAttempts-1 { + select { + case <-ctx.Done(): + return ctx.Err() + case <-time.After(delay): + } + + delay = time.Duration(float64(delay) * config.Multiplier) + if delay > config.MaxDelay { + delay = config.MaxDelay + } + } + } + + return err +} diff --git a/network/client.go b/network/client.go new file mode 100644 index 0000000..102ecaa --- /dev/null +++ b/network/client.go @@ -0,0 +1,17 @@ +package network + +import "context" + +// Client defines the interface for making network calls (HTTP/gRPC). +type Client interface { + // HTTP methods + Get(ctx context.Context, url string, opts ...Option) (*Response, error) + Post(ctx context.Context, url string, body []byte, opts ...Option) (*Response, error) + Put(ctx context.Context, url string, body []byte, opts ...Option) (*Response, error) + Delete(ctx context.Context, url string, opts ...Option) (*Response, error) + + // gRPC method + Call(ctx context.Context, method string, req interface{}, resp interface{}, opts ...Option) error + + Close() error +} \ No newline at end of file diff --git a/network/options.go b/network/options.go new file mode 100644 index 0000000..2d9462b --- /dev/null +++ b/network/options.go @@ -0,0 +1,46 @@ +package network + +import ( + "time" + + "github.com/festech-cloud/microkit/internal/retry" +) + +// Option configures network requests. +type Option func(*Config) + +// Config holds configuration for network requests. +type Config struct { + Headers map[string]string + Timeout time.Duration + RetryConfig *retry.Config +} + +// WithHeader adds a header to the request. +func WithHeader(key, value string) Option { + return func(c *Config) { + if c.Headers == nil { + c.Headers = make(map[string]string) + } + c.Headers[key] = value + } +} + +// WithTimeout sets the request timeout. +func WithTimeout(timeout time.Duration) Option { + return func(c *Config) { + c.Timeout = timeout + } +} + +// WithRetry enables retry logic for network calls. +func WithRetry(maxAttempts int, initialDelay, maxDelay time.Duration, multiplier float64) Option { + return func(c *Config) { + c.RetryConfig = &retry.Config{ + MaxAttempts: maxAttempts, + InitialDelay: initialDelay, + MaxDelay: maxDelay, + Multiplier: multiplier, + } + } +} \ No newline at end of file diff --git a/network/types.go b/network/types.go new file mode 100644 index 0000000..e020abd --- /dev/null +++ b/network/types.go @@ -0,0 +1,16 @@ +package network + +// Response represents a network response. +type Response struct { + StatusCode int + Headers map[string]string + Body []byte +} + +// Request represents a network request. +type Request struct { + Method string + URL string + Headers map[string]string + Body []byte +} \ No newline at end of file