From c08660d837f9896a538e1b6dce541eccc2b1feb7 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 28 Jun 2024 13:11:50 -0500
Subject: [PATCH] modules/hyprland/backend: handle empty json responses

Fixes https://github.com/Alexays/Waybar/issues/3388
---
 src/modules/hyprland/backend.cpp          |  8 +++++++-
 test/hyprland/backend.cpp                 | 10 ++++++++--
 test/hyprland/fixtures/IPCTestFixture.hpp |  6 ++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/modules/hyprland/backend.cpp b/src/modules/hyprland/backend.cpp
index b3fb36d4..8ec6edda 100644
--- a/src/modules/hyprland/backend.cpp
+++ b/src/modules/hyprland/backend.cpp
@@ -218,7 +218,13 @@ std::string IPC::getSocket1Reply(const std::string& rq) {
 }
 
 Json::Value IPC::getSocket1JsonReply(const std::string& rq) {
-  return parser_.parse(getSocket1Reply("j/" + rq));
+  std::string reply = getSocket1Reply("j/" + rq);
+
+  if (reply.empty()) {
+    return {};
+  }
+
+  return parser_.parse(reply);
 }
 
 }  // namespace waybar::modules::hyprland
diff --git a/test/hyprland/backend.cpp b/test/hyprland/backend.cpp
index e6b209da..dcae0509 100644
--- a/test/hyprland/backend.cpp
+++ b/test/hyprland/backend.cpp
@@ -1,4 +1,3 @@
-#include <cstdlib>
 #if __has_include(<catch2/catch_test_macros.hpp>)
 #include <catch2/catch_test_macros.hpp>
 #else
@@ -6,7 +5,6 @@
 #endif
 
 #include "fixtures/IPCTestFixture.hpp"
-#include "modules/hyprland/backend.hpp"
 
 namespace fs = std::filesystem;
 namespace hyprland = waybar::modules::hyprland;
@@ -53,3 +51,11 @@ TEST_CASE_METHOD(IPCTestFixture, "XDGRuntimeDirExistsNoHyprDir", "[getSocketFold
   // Assert expected result
   REQUIRE(actualPath == expectedPath);
 }
+
+TEST_CASE_METHOD(IPCMock, "getSocket1JsonReply handles empty response", "[getSocket1JsonReply]") {
+  std::string request = "test_request";
+
+  Json::Value jsonResponse = getSocket1JsonReply(request);
+
+  REQUIRE(jsonResponse.isNull());
+}
diff --git a/test/hyprland/fixtures/IPCTestFixture.hpp b/test/hyprland/fixtures/IPCTestFixture.hpp
index 3b04b3b0..f6fa335f 100644
--- a/test/hyprland/fixtures/IPCTestFixture.hpp
+++ b/test/hyprland/fixtures/IPCTestFixture.hpp
@@ -14,3 +14,9 @@ class IPCTestFixture : public hyprland::IPC {
 
  private:
 };
+
+class IPCMock : public IPCTestFixture {
+ public:
+  // Mock getSocket1Reply to return an empty string
+  static std::string getSocket1Reply(const std::string& rq) { return ""; }
+};