check reachability once at method call

check_reachable.go

@@ -21,6 +21,10 @@ func (c *Client) IsReachable() bool {
 // and returns true as soon as IsReachable returns true.
 // When ctx is closed before Hyprland is reachable, false is returned
 func (c *Client) WaitUntilReachable(ctx context.Context) bool {
+	if c.IsReachable() {
+		return true
+	}
+
 	ticker := time.NewTicker(100 * time.Millisecond)
 	defer ticker.Stop()
 

get_clients.go

@@ -70,11 +70,35 @@ func GetClients() ([]*Client, error) {
 	return clients, nil
 }
 
-func WaitForClient(ctx context.Context, signature string) {
+func WaitForDefaultClient(ctx context.Context) (*Client, error) {
+	signature, ok := os.LookupEnv("HYPRLAND_INSTANCE_SIGNATURE")
+	if !ok {
+		return nil, errors.New("default instance not found because HYPRLAND_INSTANCE_SIGNATURE is not set")
+	}
+
+	return WaitForClient(ctx, signature)
+}
+
+func WaitForClient(ctx context.Context, signature string) (*Client, error) {
 	lockFilePath := fmt.Sprintf("/run/user/1000/hypr/%s/hyprland.lock", signature)
 
-	waitFor(func() bool {
+	lockFileExists := waitFor(ctx, func() bool {
 		_, err := os.Stat(lockFilePath)
 		return !errors.Is(err, os.ErrNotExist)
 	})
+
+	if !lockFileExists {
+		return nil, errors.New("hyprland lock file not found")
+	}
+
+	client, err := GetClient(signature)
+	if err != nil {
+		return nil, err
+	}
+
+	if !client.WaitUntilReachable(context.Background()) {
+		return nil, errors.New("hyprland not reachable")
+	}
+
+	return client, nil
 }

utils.go

@@ -1,6 +1,7 @@
 package hypr
 
 import (
+	"context"
 	"encoding/json"
 	"io"
 	"net"
@@ -51,17 +52,22 @@ func readSocket[T any](socket string, body io.Reader) (T, error) {
 	return *value, nil
 }
 
-func waitFor(condition func() bool) {
+func waitFor(ctx context.Context, condition func() bool) bool {
 	if condition() {
-		return
+		return true
 	}
 
 	ticker := time.NewTicker(100 * time.Millisecond)
 	defer ticker.Stop()
 
-	for range ticker.C {
-		if condition() {
-			break
+	for {
+		select {
+		case <-ticker.C:
+			if condition() {
+				return true
+			}
+		case <-ctx.Done():
+			return false
 		}
 	}
 }