Merge remote-tracking branch 'origin/master'

README.md

@@ -23,7 +23,7 @@ type ed struct {
 }
 
 func main() {
-	c := client.NewClient(os.Getenv("HYPRLAND_INSTANCE_SIGNATURE"))
+	c := client.MustClient(os.Getenv("HYPRLAND_INSTANCE_SIGNATURE"))
 	e := &ed{}
 	client.Subscribe(c, e, client.EventActiveLayout)
 }

ipc.go

@@ -4,7 +4,9 @@ import (
 	"encoding/json"
 	"errors"
 	"io"
+	"log"
 	"net"
+	"os"
 	"reflect"
 	"strings"
 )
@@ -25,15 +27,33 @@ type ReceivedData struct {
 type IPCClient struct {
 	conn  net.Conn
 	wconn *net.UnixAddr
-	sign  string
 }
 
-func NewClient(sign string) *IPCClient {
-	if sign == "" {
+func MustClient(sign string) *IPCClient {
+	readsock := "/tmp/hypr/" + sign + "/.socket2.sock"
+	writesock := "/tmp/hypr/" + sign + "/.socket.sock"
+
+	_, exist := os.Stat(readsock)
+	_, wexist := os.Stat(writesock)
+	if exist == nil && wexist == nil {
+		return NewClient(
+			readsock,
+			writesock,
+		)
+	}
+	xdg := os.Getenv("XDG_RUNTIME_DIR")
+	return NewClient(
+		xdg+"/hypr/"+sign+"/.socket2.sock",
+		xdg+"/hypr/"+sign+"/.socket.sock",
+	)
+}
+
+func NewClient(readSock, writeSock string) *IPCClient {
+	if readSock == "" || writeSock == "" {
 		panic("sign is empty")
 	}
 
-	conn, err := net.Dial("unix", "/tmp/hypr/"+sign+"/.socket2.sock")
+	conn, err := net.Dial("unix", readSock)
 	if err != nil {
 		panic(err)
 	}
@@ -42,9 +62,8 @@ func NewClient(sign string) *IPCClient {
 		conn: conn,
 		wconn: &net.UnixAddr{
 			Net:  "unix",
-			Name: "/tmp/hypr/" + sign + "/.socket.sock",
+			Name: writeSock,
 		},
-		sign: sign,
 	}
 }
 

ipc_test.go

@@ -1,11 +1,12 @@
 package client
 
 import (
+	"os"
 	"reflect"
 	"testing"
 )
 
-var ipctest = NewClient("fe7b748eb668136dd0558b7c8279bfcd7ab4d759_1714258749")
+var ipctest = MustClient(os.Getenv("HYPRLAND_INSTANCE_SIGNATURE"))
 
 func Test_ipc_Clients(t *testing.T) {
 	got, err := ipctest.Clients()

ipc_type.go

@@ -122,11 +122,14 @@ type Devices struct {
 }
 
 type Version struct {
-	Branch        string        `json:"branch"`
-	Commit        string        `json:"commit"`
-	Dirty         bool          `json:"dirty"`
-	CommitMessage string        `json:"commit_message"`
-	Flags         []interface{} `json:"flags"`
+	Branch        string   `json:"branch"`
+	Commit        string   `json:"commit"`
+	Dirty         bool     `json:"dirty"`
+	CommitMessage string   `json:"commit_message"`
+	CommitDate    string   `json:"commit_date"`
+	Tag           string   `json:"tag"`
+	Commits       string   `json:"commits"`
+	Flags         []string `json:"flags"`
 }
 
 type CursorPos struct {