rawalcher/short-link-backend
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

integrate files with serving (even though ugly)

Browse source
This commit is contained in:
= 2024-12-16 20:17:09 +01:00
parent 63fd2b7cca
commit 897310fe28
7 changed files with 83 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -15,6 +15,10 @@ add_executable(Application src/main.cpp
src/request_handler.cpp
)
add_custom_target(copy_frontend ALL
COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/frontend ${CMAKE_BINARY_DIR}/frontend
)
find_package(Boost REQUIRED filesystem system)
if(Boost_FOUND)

2
frontend/index.html
View file

@ -24,6 +24,7 @@
flex-direction: column;
align-items: center;
justify-content: center;
background-color: transparent;
}
</style>
</head>
@ -38,6 +39,7 @@
<input type="button" id="shortenButton" value="Submit">
</div>
<div id="output-container"></div>
<div id="error-container"></div>
</div>
<script src="index.js"></script>
</body>

12
frontend/index.js
View file

@ -17,18 +17,26 @@ document.getElementById("urlInput").addEventListener("input", function() {
document.getElementById("shortenButton").addEventListener("click", async function() {
const urlInput = document.getElementById("urlInput").value;
const outputContainer = document.getElementById("output-container");
const errorContainer = document.getElementById("error-container");
if (urlInput) {
// const shortenedUrl = urlInput + "-short"; // only for testing
const shortenedUrl = await fetch("0.0.0.0:8080/", {
const response = await fetch("/", {
method: "POST",
headers: {
"Content-Type": "text/plain",
},
body: urlInput,
});
if (response.ok){
const shortenedUrl = await response.text();
outputContainer.innerHTML = `<p>Shortened URL: <a href="${shortenedUrl}" target="_blank">${shortenedUrl}</a></p>`;
errorContainer.innerHTML = "";
}else{
const error = await response.text();
errorContainer.innerHTML = `<p>Something went wrong: ${error}</p>`;
outputContainer.innerHTML = "";
}
}
});

3
includes/http_connection.hpp
View file

@ -8,6 +8,7 @@
#include <boost/beast/http/string_body.hpp>
#include <boost/beast/http.hpp>
#include <boost/beast/core.hpp>
#include <variant>
using namespace std;
using namespace boost::asio;
@ -25,7 +26,7 @@ private:
ip::tcp::socket socket_;
boost::beast::flat_buffer buffer_;
http::request<http::string_body> request_;
http::response<http::string_body> response_;
variant<http::response<http::string_body>, http::response<http::file_body>> response_;
RequestHandler request_handler_;
void read();

8
includes/request_handler.hpp
View file

@ -4,14 +4,20 @@
#include <boost/beast/http.hpp>
#include <boost/beast/http/message.hpp>
#include <boost/beast/http/string_body.hpp>
#include <variant>
using namespace boost::beast;
class RequestHandler {
public:
http::response<http::string_body> handle(const http::request<http::string_body>& request);
std::variant<
http::response<http::string_body>,
http::response<http::file_body>
> handle(const http::request<http::string_body>& request);
private:
http::response<http::string_body> BadRequest(const std::string& why);
http::response<http::file_body> handle_file_request(const std::string& filename, boost::system::error_code& ec);
};
#endif

7
src/http_connection.cpp
View file

@ -36,9 +36,10 @@ void HttpConnection::read() {
void HttpConnection::write() {
auto self = shared_from_this();
http::async_write(socket_, response_,
std::visit(
[this, self](auto& response) {
http::async_write(socket_, response,
[self](boost::beast::error_code error_code, size_t bytes_transferred) {
cout << "Sending response:\n" << self->response_ << endl;
if (!error_code) {
auto error_code_socket = self->socket_.shutdown(ip::tcp::socket::shutdown_send, error_code);
if (error_code_socket) {
@ -52,4 +53,6 @@ void HttpConnection::write() {
}
}
});
}, response_);
}

73
src/request_handler.cpp
View file

@ -5,36 +5,31 @@
#include <boost/beast/http/status.hpp>
#include <boost/beast/http/string_body.hpp>
#include <regex>
#include "request_handler.hpp"
http::response<http::string_body> BadRequest(const std::string& why) {
http::response<http::string_body> RequestHandler::BadRequest(const std::string& why) {
http::response<http::string_body> response;
response.result(http::status::bad_request);
response.set(http::field::server, "Beast");
response.set(http::field::content_type, "text/html");
response.body() = why;
response.keep_alive(false);
response.prepare_payload();
return response;
}
http::response<http::string_body> RequestHandler::handle(const http::request<http::string_body>& request) {
string_view target = request.target();
std::variant<
http::response<http::string_body>,
http::response<http::file_body>
>
RequestHandler::handle(const http::request<http::string_body>& request) {
std::string target = request.target();
http::verb method = request.method();
if (target == "/") {
if(method == http::verb::get) {
//case 1: "/" -> serve angular frontend or static frontend what ever
http::response<http::string_body> response;
response.result(http::status::ok);
response.version(request.version());
response.set(http::field::server, "Beast");
response.set(http::field::content_type, "text/html");
//todo: load angular application / plain html & js
response.body() = "<html><h1>TEST</h1></html>";
response.prepare_payload();
return response;
if(method == http::verb::post){
if(target != "/") {
return BadRequest("Cannot post to anything other than /");
}
else if (method == http::verb::post) {
if(request.find(http::field::content_type) == request.end()) {
return BadRequest("Content-Type header is required for POST requests");
}
@ -53,11 +48,27 @@ http::response<http::string_body> RequestHandler::handle(const http::request<htt
}
//todo: save url to database and return short url
return BadRequest("Request is actually not bad. processing " + url);
http::response<http::string_body> response;
response.result(http::status::created);
response.set(http::field::server, "Beast");
response.set(http::field::content_type, "text/plain");
response.body() = "127.0.0.1:8080/asdf";
response.keep_alive(false);
response.prepare_payload();
return response;
} else if (method == http::verb::get) {
if(target == "/"){
target = "/index.html";
}
if(target == "/index.html" || target == "/index.js") {
error_code ec;
http::response<http::file_body> response = handle_file_request("frontend" + target, ec);
if(ec) {
return BadRequest("Error reading file");
}else {
if(method == http::verb::get){
return response;
}
} else {
http::response<http::string_body> response;
std::string short_url = target.substr(1);
@ -68,15 +79,27 @@ http::response<http::string_body> RequestHandler::handle(const http::request<htt
response.version(request.version());
response.set(http::field::server, "Beast");
response.body() = "Redirecting to " + expanded_url;
response.keep_alive(false);
response.prepare_payload();
return response;
} else {
return BadRequest("Method not allowed");
}
}
//case 2: "/url" -> redirect to expanded url
//case 3: neither -> redirect to 404
}
return BadRequest("No rule matched.");
}
http::response<http::file_body> RequestHandler::handle_file_request(const std::string& path, error_code &ec) {
http::file_body::value_type file;
file.open(path.c_str(), file_mode::read, ec);
http::response<http::file_body> response;
if(!ec){
response.result(http::status::ok);
response.set(http::field::server, "Beast");
response.set(http::field::content_type, "text/html");
response.body() = std::move(file);
response.keep_alive(false);
response.prepare_payload();
};
return response;
}