Merge branch 'main' of https://github.com/Martian-Technologies/Connection-Machine

Author: ItchyTrack

cmake/dependencies.cmake

@@ -37,6 +37,21 @@ function(add_main_dependencies)
 	)
 	list(APPEND EXTERNAL_LINKS nlohmann_json)
 
+	# brotli
+	CPMAddPackage(
+		NAME brotli
+		GITHUB_REPOSITORY google/brotli
+		GIT_TAG v1.2.0
+		EXCLUDE_FROM_ALL YES
+		SOURCE_DIR "${EXTERNAL_DIR}/brotli"
+	)
+	if (brotli_ADDED)
+		add_library(Brotli::common ALIAS brotlicommon)
+		add_library(Brotli::encoder ALIAS brotlienc)
+		add_library(Brotli::decoder ALIAS brotlidec)
+	endif()
+	list(APPEND EXTERNAL_LINKS brotlienc)
+
 	# fmt
 	CPMAddPackage(
 		NAME fmt

src/app.cpp

@@ -8,6 +8,7 @@
 #include "gui/helper/saveCallback.h"
 #include "gui/mainWindow/circuitView/circuitViewWidget.h"
 #include "network/network.h"
+#include "util/version.h"
 // #include "computerAPI/directoryManager.h" // TEMPORARY
 
 #include <SDL3/SDL.h>
@@ -292,6 +293,7 @@ void App::stopTryingToQuit() { tryingToQuit = false; }
 nlohmann::json App::dumpState() const {
 	nlohmann::json stateJson;
 	stateJson["environment"] = environment.dumpState();
+	stateJson["version"] = getCurrentVersion().toString();
 	return stateJson;
 }
 

src/gui/mainWindow/popUps/popUpManager.cpp

@@ -7,6 +7,8 @@
 #include "gui/helper/saveCallback.h"
 #include "gui/mainWindow/mainWindow.h"
 #include "network/network.h"
+#include "util/compression.h"
+#include "util/version.h"
 
 #include <RmlUi/Debugger.h>
 
@@ -316,12 +318,35 @@ void PopUpManager::addFeedbackPopup() { // feature request, bug report, feature
 	submitButton->SetClass("popup-button", true);
 	submitButton->AddEventListener(
 		Rml::EventId::Click,
-		new EventPasser([popUpWindow, textarea, includeStateCheckbox](Rml::Event& event) {
+		new EventPasser([this, popUpWindow, textarea, includeStateCheckbox](Rml::Event& event) {
 			auto* textareaControl = dynamic_cast<Rml::ElementFormControlTextArea*>(textarea);
 			std::string textareaValue = textareaControl ? textareaControl->GetValue().c_str() : "";
 
-			logInfo("Feedback body: {}", "", textareaValue);
-			logInfo("Include app state: {}", "", includeStateCheckbox->HasAttribute("checked") ? "true" : "false");
+			// logInfo("Feedback body: {}", "", textareaValue);
+			// logInfo("Include app state: {}", "", includeStateCheckbox->HasAttribute("checked") ? "true" : "false");
+			std::vector<Network::Attachment> attachments;
+			if (includeStateCheckbox->HasAttribute("checked")) {
+				Network::Attachment appStateAttachment;
+				std::string appState = App::get().dumpState().dump(1, '\t');
+				std::optional<std::string> compressedAppState = compressString(appState);
+				if (compressedAppState){
+					appStateAttachment.data = compressedAppState.value();
+					appStateAttachment.context = "app_state.json.json.br";
+					appStateAttachment.contentType = "application/x-brotli";
+				} else {
+					appStateAttachment.data = appState;
+					appStateAttachment.context = "app_state.json";
+					appStateAttachment.contentType = "application/json";
+				}
+				attachments.push_back(appStateAttachment);
+			}
+
+			Network::get().sendFeedback(
+				*this,
+				"User Feedback from Connection Machine UI v" + getCurrentVersion().toString(),
+				textareaValue,
+				attachments
+			);
 
 			popUpWindow.destroy();
 		})

src/util/compression.cpp

@@ -0,0 +1,36 @@
+#include "compression.h"
+
+#include <brotli/encode.h>
+
+std::optional<std::string> compressString(const std::string& input) {
+	if (input.empty()) {
+		return {};
+	}
+
+	const size_t maxSize = BrotliEncoderMaxCompressedSize(input.size());
+	if (maxSize == 0) {
+		logError("BrotliEncoderMaxCompressedSize returned 0");
+		return std::nullopt;
+	}
+
+	std::string output(maxSize, '\0');
+	size_t encodedSize = maxSize;
+
+	const auto result = BrotliEncoderCompress(
+		BROTLI_DEFAULT_QUALITY,
+		BROTLI_DEFAULT_WINDOW,
+		BROTLI_DEFAULT_MODE,
+		input.size(),
+		reinterpret_cast<const uint8_t*>(input.data()),
+		&encodedSize,
+		reinterpret_cast<uint8_t*>(output.data())
+	);
+
+	if (result == BROTLI_FALSE) {
+		logError("BrotliEncoderCompress failed");
+		return std::nullopt;
+	}
+
+	output.resize(encodedSize);
+	return output;
+}

src/util/compression.h

@@ -0,0 +1,6 @@
+#ifndef compression_h
+#define compression_h
+
+std::optional<std::string> compressString(const std::string& input);
+
+#endif /* compression_h */