main.go

@@ -77,31 +77,16 @@ func (c *Client) Send(msgType MessageType, data *string, subType *string, metada
 	return err
 }
 
-func (c *Client) rawReceive(messageEnding string) (string, error) {
-	received := ""
-
-	for !strings.HasSuffix(received, messageEnding) {
+func (c *Client) ReceivePlain() ([]RawMessage, error) {
 	data := make([]byte, 20480)
 	_, err := c.Con.Read(data)
-		if err != nil {
-			return received, err
-		}
-
-		received = received + string(bytes.Trim(data, "\x00"))
-	}
-
-	return received, nil
-}
-
-func (c *Client) ReceivePlain() ([]RawMessage, error) {
-	received, err := c.rawReceive("}")
 	if err != nil {
 		return nil, err
 	}
 
 	messages := []RawMessage{}
 
-	for _, message := range strings.Split(received, "}") {
+	for _, message := range strings.Split(string(bytes.Trim(data, "\x00")), "}") {
 		if strings.TrimSpace(message) == "" {
 			continue
 		}
@@ -119,14 +104,15 @@ func (c *Client) ReceivePlain() ([]RawMessage, error) {
 }
 
 func (c *Client) Receive() ([]RawMessage, error) {
-	received, err := c.rawReceive("]")
+	data := make([]byte, 20480)
+	_, err := c.Con.Read(data)
 	if err != nil {
 		return nil, err
 	}
 
 	messages := []RawMessage{}
 
-	for _, message := range strings.Split(received, "]") {
+	for _, message := range strings.Split(string(bytes.Trim(data, "\x00")), "]") {
 		if strings.TrimSpace(message) == "" {
 			continue
 		}