feat: build commonly used headers

hsp/client/client.go

@@ -1,6 +1,8 @@
 package client
 
 import (
+	"encoding/json"
+	"maps"
 	"net"
 
 	"github.com/LandaMm/hsp-go/hsp"
@@ -16,26 +18,20 @@ func NewClient() *Client {
 	}
 }
 
-func (c *Client) SendText(address, text string) (*hsp.Response, error) {
+func (c *Client) BuildHeaders(address *hsp.Adddress, df *hsp.DataFormat, mergeHeaders *map[string]string) map[string]string {
-	addr, err := hsp.ParseAddress(address)
-
-	if err != nil {
-		return nil, err
-	}
-
-	df := hsp.DataFormat{
-		Format: hsp.DF_TEXT,
-		Encoding: hsp.E_UTF8,
-	}
-
 	headers := make(map[string]string)
-	headers[hsp.H_ROUTE] = addr.Route
+
+	if mergeHeaders != nil {
+		maps.Copy(headers, *mergeHeaders)
+	}
+
+	headers[hsp.H_ROUTE] = address.Route
 	headers[hsp.H_DATA_FORMAT] = df.String()
 
-	payload := []byte(text)
+	return headers
-
+}
-	pkt := hsp.BuildPacket(headers, payload)
 
+func (c *Client) SingleHit(addr *hsp.Adddress, pkt *hsp.Packet) (*hsp.Packet, error) {
 	conn, err := net.Dial("tcp", addr.String())
 	if err != nil {
 		return nil, err
@@ -46,11 +42,69 @@ func (c *Client) SendText(address, text string) (*hsp.Response, error) {
 		return nil, err
 	}
 
-	pkt, err = c.Duplex.ReadPacket()
+	return c.Duplex.ReadPacket()
+}
+
+func (c *Client) SendText(address, text string) (*hsp.Response, error) {
+	addr, err := hsp.ParseAddress(address)
+
 	if err != nil {
 		return nil, err
 	}
 
-	return hsp.NewPacketResponse(pkt), nil
+	payload := []byte(text)
+
+	hdrs := c.BuildHeaders(addr, hsp.TextDataFormat(), nil)
+
+	pkt := hsp.BuildPacket(hdrs, payload)
+
+	rpkt, err := c.SingleHit(addr, pkt)
+	if err != nil {
+		return nil, err
+	}
+
+	return hsp.NewPacketResponse(rpkt), nil
 }
 
+func (c *Client) SendJson(address string, data any) (*hsp.Response, error) {
+	addr, err := hsp.ParseAddress(address)
+
+	if err != nil {
+		return nil, err
+	}
+
+	payload, err := json.Marshal(data)
+	if err != nil {
+		return nil, err
+	}
+
+	hdrs := c.BuildHeaders(addr, hsp.JsonDataFormat(), nil)
+
+	pkt := hsp.BuildPacket(hdrs, payload)
+
+	rpkt, err := c.SingleHit(addr, pkt)
+	if err != nil {
+		return nil, err
+	}
+
+	return hsp.NewPacketResponse(rpkt), nil
+}
+
+func (c *Client) SendBytes(address string, data []byte) (*hsp.Response, error) {
+	addr, err := hsp.ParseAddress(address)
+
+	if err != nil {
+		return nil, err
+	}
+
+	hdrs := c.BuildHeaders(addr, hsp.BytesDataFormat(), nil)
+
+	pkt := hsp.BuildPacket(hdrs, data)
+
+	rpkt, err := c.SingleHit(addr, pkt)
+	if err != nil {
+		return nil, err
+	}
+
+	return hsp.NewPacketResponse(rpkt), nil
+}