use swayipc 0.3.0

go.mod

@@ -3,13 +3,16 @@ module swaycycle
 go 1.23
 
 require (
-	github.com/alecthomas/repr v0.5.1 // indirect
+	github.com/lmittmann/tint v1.1.2
+	github.com/mattn/go-isatty v0.0.20
+	github.com/spf13/pflag v1.0.7
+	github.com/tlinden/swayipc v0.3.0
+	github.com/tlinden/yadu v0.1.3
+)
+
+require (
 	github.com/fatih/color v1.16.0 // indirect
-	github.com/lmittmann/tint v1.1.2 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/spf13/pflag v1.0.7 // indirect
-	github.com/tlinden/yadu v0.1.3 // indirect
 	golang.org/x/sys v0.14.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,5 +1,3 @@
-github.com/alecthomas/repr v0.5.1 h1:E3G4t2QbHTSNpPKBgMTln5KLkZHLOcU7r37J4pXBuIg=
-github.com/alecthomas/repr v0.5.1/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/lmittmann/tint v1.1.2 h1:2CQzrL6rslrsyjqLDwD11bZ5OpLBPU+g3G/r5LSfS8w=
@@ -11,13 +9,17 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
 github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/tlinden/swayipc v0.0.0-20250816175030-177eecd4757f h1:SP/fEurr6crxQI+j85L61rMppsHmOlJwxVzXnCvYJ40=
+github.com/tlinden/swayipc v0.0.0-20250816175030-177eecd4757f/go.mod h1:JwlMIC7eBwV8soCt2UDqlAyBudobLo07ZvepIA0irY8=
+github.com/tlinden/swayipc v0.3.0 h1:hGNWeEZUZIHfeP+MxpAKsUzPf3YSJ0FYX2XEu/yqNXA=
+github.com/tlinden/swayipc v0.3.0/go.mod h1:JwlMIC7eBwV8soCt2UDqlAyBudobLo07ZvepIA0irY8=
 github.com/tlinden/yadu v0.1.3 h1:5cRCUmj+l5yvlM2irtpFBIJwVV2DPEgYSaWvF19FtcY=
 github.com/tlinden/yadu v0.1.3/go.mod h1:l3bRmHKL9zGAR6pnBHY2HRPxBecf7L74BoBgOOpTcUA=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
 golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -18,41 +18,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-	"encoding/binary"
-	"encoding/json"
 	"fmt"
 	"io"
 	"log"
 	"log/slog"
-	"net"
 	"os"
 	"runtime/debug"
 
 	"github.com/lmittmann/tint"
 	"github.com/mattn/go-isatty"
+	"github.com/tlinden/swayipc"
 	"github.com/tlinden/yadu"
 
 	flag "github.com/spf13/pflag"
 )
 
-type Node struct {
-	Id                int    `json:"id"`
-	Nodetype          string `json:"type"` // output, workspace or container
-	Name              string `json:"name"` // workspace number or app name
-	Nodes             []Node `json:"nodes"`
-	FloatingNodes     []Node `json:"floating_nodes"`
-	Focused           bool   `json:"focused"`
-	Window            int    `json:"window"` // wayland native
-	X11Window         string `json:"app_id"` // x11 compat
-	Current_workspace string `json:"current_workspace"`
-}
-
-type Response struct {
-	Success    bool   `json:"success"`
-	ParseError bool   `json:"parse_error"`
-	Error      string `json:"error"`
-}
-
 const (
 	root = iota + 1
 	output
@@ -62,18 +42,11 @@ const (
 
 	LevelNotice = slog.Level(2)
 
-	VERSION = "v0.2.0"
-
-	IPC_HEADER_SIZE = 14
-	IPC_MAGIC       = "i3-ipc"
-
-	// message types
-	IPC_GET_TREE    = 4
-	IPC_RUN_COMMAND = 0
+	VERSION = "v0.4.0"
 )
 
 var (
-	Visibles         = []Node{}
+	Visibles         = []*swayipc.Node{}
 	CurrentWorkspace = ""
 	Debug            = false
 	Dumptree         = false
@@ -132,19 +105,21 @@ func main() {
 	}
 
 	// connect to sway unix socket
-	unixsock, err := setupIPC()
-	if err != nil {
-		log.Fatalf("Failed to connect to sway unix socket: %s", err)
-	}
+	ipc := swayipc.NewSwayIPC()
 
-	// retrieve the raw json tree
-	rawjson, err := getTree(unixsock)
+	err := ipc.Connect()
 	if err != nil {
-		log.Fatalf("Failed to retrieve raw json tree: %s", err)
+		log.Fatal(err)
+	}
+	defer ipc.Close()
+
+	sway, err := ipc.GetTree()
+	if err != nil {
+		log.Fatal(err)
 	}
 
 	// traverse the tree and find visible windows
-	if err := processJSON(rawjson); err != nil {
+	if err := processJSON(sway); err != nil {
 		log.Fatalf("%s", err)
 	}
 
@@ -156,110 +131,13 @@ func main() {
 	slog.Debug("findNextWindow", "nextid", id)
 
 	if id > 0 && !Notswitch {
-		switchFocus(id, unixsock)
+		switchFocus(id, ipc)
 	}
 }
 
-// connect to unix socket
-func setupIPC() (net.Conn, error) {
-	sockfile := os.Getenv("SWAYSOCK")
-
-	if sockfile == "" {
-		return nil, fmt.Errorf("Environment variable SWAYSOCK does not exist or is empty")
-	}
-
-	conn, err := net.Dial("unix", sockfile)
-	if err != nil {
-		return nil, err
-	}
-
-	return conn, nil
-}
-
-// send a sway message header
-func sendHeaderIPC(sock net.Conn, messageType uint32, len uint32) error {
-	sendPayload := make([]byte, IPC_HEADER_SIZE)
-	copy(sendPayload, []byte(IPC_MAGIC))
-	binary.LittleEndian.PutUint32(sendPayload[6:], len)
-	binary.LittleEndian.PutUint32(sendPayload[10:], messageType)
-
-	_, err := sock.Write(sendPayload)
-
-	if err != nil {
-		return fmt.Errorf("failed to send header to IPC %w", err)
-	}
-
-	return nil
-}
-
-// send a payload, header had to be sent before
-func sendPayloadIPC(sock net.Conn, payload []byte) error {
-	_, err := sock.Write(payload)
-
-	if err != nil {
-		return fmt.Errorf("failed to send payload to IPC %w", err)
-	}
-
-	return nil
-}
-
-// read a response, reads response header and returns payload only
-func readResponseIPC(sock net.Conn) ([]byte, error) {
-	// read header
-	buf := make([]byte, IPC_HEADER_SIZE)
-
-	_, err := sock.Read(buf)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read header from socket: %s", err)
-	}
-
-	// slog.Debug("got IPC header", "header", hex.EncodeToString(buf))
-
-	if string(buf[:6]) != IPC_MAGIC {
-		return nil, fmt.Errorf("got invalid IPC response from sway socket")
-	}
-
-	payloadLen := binary.LittleEndian.Uint32(buf[6:10])
-
-	if payloadLen == 0 {
-		return nil, fmt.Errorf("got empty payload IPC response from sway socket")
-	}
-
-	// read payload
-	payload := make([]byte, payloadLen)
-
-	_, err = sock.Read(payload)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read payload from socket: %s", err)
-	}
-
-	return payload, nil
-}
-
-// get raw JSON tree via sway IPC
-func getTree(sock net.Conn) ([]byte, error) {
-	err := sendHeaderIPC(sock, IPC_GET_TREE, 0)
-	if err != nil {
-		return nil, err
-	}
-
-	payload, err := readResponseIPC(sock)
-	if err != nil {
-		return nil, err
-	}
-
-	return payload, nil
-}
-
 // get into the sway tree, determine current workspace and extract all
 // its visible windows, store them in the global var Visibles
-func processJSON(jsoncode []byte) error {
-	sway := Node{}
-
-	if err := json.Unmarshal(jsoncode, &sway); err != nil {
-		return fmt.Errorf("Failed to unmarshal json: %w", err)
-	}
-
+func processJSON(sway *swayipc.Node) error {
 	if !istype(sway, root) && len(sway.Nodes) == 0 {
 		return fmt.Errorf("Invalid or empty JSON structure")
 	}
@@ -310,41 +188,11 @@ func findNextWindow() int {
 }
 
 // actually switch focus using a swaymsg command
-func switchFocus(id int, sock net.Conn) error {
-	command := fmt.Sprintf("[con_id=%d] focus", id)
-
-	slog.Debug("sending ipc", "command", command)
-
-	// send switch focus command
-	err := sendHeaderIPC(sock, IPC_RUN_COMMAND, uint32(len(command)))
+func switchFocus(id int, ipc *swayipc.SwayIPC) error {
+	responses, err := ipc.RunContainerCommand(id, "focus")
 	if err != nil {
-		return fmt.Errorf("failed to send run_command to IPC %w", err)
-	}
-
-	err = sendPayloadIPC(sock, []byte(command))
-	if err != nil {
-		return fmt.Errorf("failed to send switch focus command: %w", err)
-	}
-
-	// check response from sway
-	payload, err := readResponseIPC(sock)
-	if err != nil {
-		return err
-	}
-
-	responses := []Response{}
-
-	if err := json.Unmarshal(payload, &responses); err != nil {
-		return fmt.Errorf("Failed to unmarshal json response: %w", err)
-	}
-
-	if len(responses) == 0 {
-		return fmt.Errorf("Got invalid IPC zero response")
-	}
-
-	if !responses[0].Success {
-		slog.Debug("IPC response to switch focus command", "response", responses)
-		return fmt.Errorf("Failed to switch focus: %s", responses[0].Error)
+		log.Fatalf("failed to send focus command to container %d: %w (%s)",
+			id, responses[0].Error, err)
 	}
 
 	slog.Info("switched focus", "con_id", id)
@@ -353,7 +201,7 @@ func switchFocus(id int, sock net.Conn) error {
 }
 
 // iterate recursively over given node list extracting visible windows
-func recurseNodes(nodes []Node) {
+func recurseNodes(nodes []*swayipc.Node) {
 	for _, node := range nodes {
 		// we handle nodes and floating_nodes identical
 		node.Nodes = append(node.Nodes, node.FloatingNodes...)
@@ -420,8 +268,8 @@ func setupLogging(output io.Writer) {
 }
 
 // little helper to distinguish sway tree node types
-func istype(nd Node, which int) bool {
-	switch nd.Nodetype {
+func istype(nd *swayipc.Node, which int) bool {
+	switch nd.Type {
 	case "root":
 		return which == root
 	case "output":