Added errors in ipc.Send

client/client.go

@@ -4,15 +4,15 @@ import (
 	"crypto/rand"
 	"encoding/json"
 	"fmt"
+	"github.com/dikey0ficial/rich-go/ipc"
 	"os"
-
-	"github.com/hugolgst/rich-go/ipc"
 )
 
 var logged bool
 
-// Login sends a handshake in the socket and returns an error or nil
+// Login sends a handshake in socket and returns an error or nil
 func Login(clientid string) error {
+	var gerr error
 	if !logged {
 		payload, err := json.Marshal(Handshake{"1", clientid})
 		if err != nil {
@@ -25,11 +25,11 @@ func Login(clientid string) error {
 		}
 
 		// TODO: Response should be parsed
-		ipc.Send(0, string(payload))
+		_, gerr = ipc.Send(0, string(payload))
 	}
 	logged = true
 
-	return nil
+	return gerr
 }
 
 func Logout() {
@@ -60,11 +60,11 @@ func SetActivity(activity Activity) error {
 	}
 
 	// TODO: Response should be parsed
-	ipc.Send(1, string(payload))
-	return nil
+	_, err = ipc.Send(1, string(payload))
+	return err
 }
 
-func getNonce() string {
+func getNonce() (string, error) {
 	buf := make([]byte, 16)
 	_, err := rand.Read(buf)
 	if err != nil {

client/go.mod

@@ -0,0 +1,7 @@
+module github.com/dikey0ficial/rich-go/client
+
+go 1.17
+
+require github.com/hugolgst/rich-go v0.0.0-20210925091458-d59fb695d9c0
+
+require gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect

go.mod

@@ -1,4 +1,4 @@
-module github.com/hugolgst/rich-go
+module github.com/dikey0ficial/rich-go
 
 go 1.17
 

ipc/ipc.go

@@ -3,7 +3,6 @@ package ipc
 import (
 	"bytes"
 	"encoding/binary"
-	"fmt"
 	"net"
 	"os"
 )
@@ -34,39 +33,42 @@ func CloseSocket() error {
 }
 
 // Read the socket response
-func Read() string {
+func Read() (string, error) {
 	buf := make([]byte, 512)
 	payloadlength, err := socket.Read(buf)
 	if err != nil {
-		//fmt.Println("Nothing to read")
+		return "", err
 	}
 
 	buffer := new(bytes.Buffer)
 	for i := 8; i < payloadlength; i++ {
-		buffer.WriteByte(buf[i])
+		err := buffer.WriteByte(buf[i])
+		if err != nil {
+			return "", err
+		}
 	}
 
-	return buffer.String()
+	return buffer.String(), nil
 }
 
 // Send opcode and payload to the unix socket
-func Send(opcode int, payload string) string {
+func Send(opcode int, payload string) (string, error) {
 	buf := new(bytes.Buffer)
 
 	err := binary.Write(buf, binary.LittleEndian, int32(opcode))
 	if err != nil {
-		fmt.Println(err)
+		return "", err
 	}
 
 	err = binary.Write(buf, binary.LittleEndian, int32(len(payload)))
 	if err != nil {
-		fmt.Println(err)
+		return "", err
 	}
 
 	buf.Write([]byte(payload))
 	_, err = socket.Write(buf.Bytes())
 	if err != nil {
-		fmt.Println(err)
+		return "", err
 	}
 
 	return Read()