5 Commits

Author SHA1 Message Date
3e02c6f2d5 improved error messages 2026-01-16 02:19:24 +03:00
9513c373aa some more tls magic 2026-01-16 02:17:39 +03:00
961b90626f set TLS to version 1.2 2026-01-16 02:14:31 +03:00
81fb8c7e7e changed fiscal endpoint 2026-01-14 18:00:15 +03:00
08c7556960 added device support 2026-01-10 04:47:04 +03:00
4 changed files with 38 additions and 23 deletions

View File

@@ -1,11 +1,16 @@
package api package api
import "resty.dev/v3" import (
"crypto/tls"
"resty.dev/v3"
)
type Client struct { type Client struct {
token string token string
resty *resty.Client device string
apiBaseURL string resty *resty.Client
apiBaseURL string
fiscalEndpoint string fiscalEndpoint string
} }
@@ -18,10 +23,22 @@ func NewClient(token string) *Client {
} }
} }
func NewDMClient(token string, dmURL string) *Client { func NewDMClient(token, dmURL, device string) *Client {
restyClient := resty.New()
restyClient.SetTLSClientConfig(&tls.Config{
MinVersion: tls.VersionTLS12,
CipherSuites: []uint16{
tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
},
})
return &Client{ return &Client{
token: token, token: token,
resty: resty.New(), device: device,
resty: restyClient,
apiBaseURL: dmURL, apiBaseURL: dmURL,
fiscalEndpoint: "/dm/fiscal", fiscalEndpoint: "/dm/fiscal",
} }

View File

@@ -8,7 +8,8 @@ import (
) )
func (c *Client) executeRequest(ctx context.Context, request FiscalRequest, response interface{}) error { func (c *Client) executeRequest(ctx context.Context, request FiscalRequest, response interface{}) error {
//execute request with json body in request request.Device = c.device
reqJson, err := json.Marshal(request) reqJson, err := json.Marshal(request)
if err != nil { if err != nil {
return fmt.Errorf("failed to marshal request: %w", err) return fmt.Errorf("failed to marshal request: %w", err)
@@ -17,6 +18,7 @@ func (c *Client) executeRequest(ctx context.Context, request FiscalRequest, resp
resp, err := c.resty.R(). resp, err := c.resty.R().
SetContext(ctx). SetContext(ctx).
SetHeader("Authorization", c.token). SetHeader("Authorization", c.token).
SetHeader("Content-Type", "application/json").
SetBody(reqJson). SetBody(reqJson).
Post(c.apiBaseURL + c.fiscalEndpoint) Post(c.apiBaseURL + c.fiscalEndpoint)
@@ -24,21 +26,17 @@ func (c *Client) executeRequest(ctx context.Context, request FiscalRequest, resp
return fmt.Errorf("request failed: %w", err) return fmt.Errorf("request failed: %w", err)
} }
if resp.IsError() {
return fmt.Errorf("api error: %v", resp.Error())
}
if resp.StatusCode() != 200 {
return fmt.Errorf("unexpected status code: %d", resp.StatusCode())
}
body, err := io.ReadAll(resp.Body) body, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return fmt.Errorf("failed to read response: %w", err) return fmt.Errorf("failed to read response: %w", err)
} }
if resp.StatusCode() != 200 {
return fmt.Errorf("api error (status %d): %s", resp.StatusCode(), string(body))
}
if err := json.Unmarshal(body, response); err != nil { if err := json.Unmarshal(body, response); err != nil {
return fmt.Errorf("failed to unmarshal response: %w", err) return fmt.Errorf("failed to unmarshal response: %w, body: %s", err, string(body))
} }
return nil return nil

View File

@@ -7,9 +7,10 @@ import (
func ExampleBasicUsage() { func ExampleBasicUsage() {
client := NewClient(Config{ client := NewClient(Config{
Token: "your-token", Token: "your-token",
Cashier: "Иванов", Cashier: "Иванов",
Source: "parking", Source: "parking",
CustomURL: "DM URL/",
}) })
ctx := context.Background() ctx := context.Background()

View File

@@ -25,13 +25,13 @@ type Client struct {
defaults *DefaultParams defaults *DefaultParams
} }
// !! If you are using Device Manager, set the CustomURL to "http(s)://HOST/api/v3".
type Config struct { type Config struct {
Token string Token string
Cashier string Cashier string
Source string Source string
Defaults *DefaultParams Defaults *DefaultParams
CustomURL string CustomURL string
Device string
} }
type DefaultParams struct { type DefaultParams struct {
@@ -67,12 +67,11 @@ func NewClient(config Config) *Client {
defaults.DefaultTimeout = 30 * time.Second defaults.DefaultTimeout = 30 * time.Second
} }
apicfg := &api.Client{} var apicfg *api.Client
if config.CustomURL == "" { if config.CustomURL == "" {
apicfg = api.NewClient(config.Token) apicfg = api.NewClient(config.Token)
} else { } else {
apicfg = api.NewDMClient(config.Token, config.CustomURL) apicfg = api.NewDMClient(config.Token, config.CustomURL, config.Device)
} }
return &Client{ return &Client{