Skip to content

Refactor the json response #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
JPRauwolf wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Refactor the json response #1

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4513c86
refactor: insertServerData() now uses structs to write json files
JPRauwolf Aug 13, 2025
9af6cd2
added test step to build file
JPRauwolf Aug 15, 2025
3c8aae8
added test test
JPRauwolf Aug 15, 2025
b834d74
Merge branch 'nutone-tf:main' into tests
JPRauwolf Aug 15, 2025
7248fb2
Merge branch 'nutone-tf:main' into main
JPRauwolf Aug 15, 2025
0222992
Merge pull request #1 from JPRauwolf/main
JPRauwolf Aug 15, 2025
3a08218
Merge pull request #2 from JPRauwolf/tests
JPRauwolf Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 30 additions & 55 deletions src/main.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ const dbFlags = zqlite.OpenFlags.Create | zqlite.OpenFlags.EXResCode;
var connPtr: *const zqlite.Conn = undefined;
var gpa = std.heap.GeneralPurposeAllocator(.{}){};

//maybe a better name
const responseInfo = struct {
info: responseStatus = .{},
};

const responseStatus = struct {
status: u16 = 0,
description: []const u8 = "",
};

pub fn main() !void {
var conn = try zqlite.open("./nutone.db", dbFlags);
connPtr = &conn;
Expand Down Expand Up @@ -56,37 +66,26 @@ fn insertServerData(req: *httpz.Request, res: *httpz.Response) !void {
var conn = connPtr.*;
var serverToken: ?[]const u8 = null;
const allocator = gpa.allocator();
var writeStream = std.json.writeStream(res.writer(), .{});
// var writeStream = std.json.writeStream(res.writer(), .{});
var responseBody: responseInfo = .{};
var parsedData: ?std.json.Parsed(KillData) = null;
defer if (parsedData) |pD| pD.deinit();

if (try utility.isValidToken(conn, req)) {
serverToken = req.header("token").?;
if (req.body()) |kill| {
parsedData = utility.readKillData(allocator, kill) catch {
try writeStream.beginObject();
try writeStream.objectField("info");
try writeStream.beginObject();
try writeStream.objectField("status");
try writeStream.write(400);
try writeStream.objectField("description");
try writeStream.write("BAD REQUEST");
try writeStream.endObject();
try writeStream.endObject();
responseBody.info.description = "BAD REQUEST";
responseBody.info.status = 400;
try std.json.stringify(responseBody, .{}, res.writer());
res.status = 400;
res.content_type = httpz.ContentType.JSON;
return;
};
} else {
try writeStream.beginObject();
try writeStream.objectField("info");
try writeStream.beginObject();
try writeStream.objectField("status");
try writeStream.write(418);
try writeStream.objectField("description");
try writeStream.write("I'M A TEAPOT");
try writeStream.endObject();
try writeStream.endObject();
responseBody.info.description = "I'M A TEAPOT";
responseBody.info.status = 418;
try std.json.stringify(responseBody, .{}, res.writer());
res.status = 418;
res.content_type = httpz.ContentType.JSON;
return;
Expand All @@ -96,15 +95,9 @@ fn insertServerData(req: *httpz.Request, res: *httpz.Response) !void {
data.attacker_name = utility.processPlayerName(data.attacker_name);
data.victim_name = utility.processPlayerName(data.victim_name);
if (!try utility.isValidServer(conn, serverToken.?, data.server_id)) {
try writeStream.beginObject();
try writeStream.objectField("info");
try writeStream.beginObject();
try writeStream.objectField("status");
try writeStream.write(403);
try writeStream.objectField("description");
try writeStream.write("FORBIDDEN");
try writeStream.endObject();
try writeStream.endObject();
responseBody.info.description = "FORBIDDEN";
responseBody.info.status = 403;
try std.json.stringify(responseBody, .{}, res.writer());
res.status = 403;
res.content_type = httpz.ContentType.JSON;
return;
Expand All @@ -126,41 +119,23 @@ fn insertServerData(req: *httpz.Request, res: *httpz.Response) !void {
.{ data.match_id, data.server_id, data.game_time, data.attacker_uid, data.attacker_weapon, data.attacker_titan, data.attacker_x, data.attacker_y, data.attacker_z, data.victim_uid, data.victim_weapon, data.victim_x, data.victim_y, data.victim_z, data.cause_of_death, data.distance },
);
} else {
try writeStream.beginObject();
try writeStream.objectField("info");
try writeStream.beginObject();
try writeStream.objectField("status");
try writeStream.write(418);
try writeStream.objectField("description");
try writeStream.write("I'M A TEAPOT");
try writeStream.endObject();
try writeStream.endObject();
responseBody.info.description = "I'M A TEAPOT";
responseBody.info.status = 418;
try std.json.stringify(responseBody, .{}, res.writer());
res.status = 418;
res.content_type = httpz.ContentType.JSON;
return;
}
try writeStream.beginObject();
try writeStream.objectField("info");
try writeStream.beginObject();
try writeStream.objectField("status");
try writeStream.write(200);
try writeStream.objectField("description");
try writeStream.write("OK");
try writeStream.endObject();
try writeStream.endObject();
responseBody.info.description = "OK";
responseBody.info.status = 200;
try std.json.stringify(responseBody, .{}, res.writer());
res.status = 200;
res.content_type = httpz.ContentType.JSON;
return;
} else {
try writeStream.beginObject();
try writeStream.objectField("info");
try writeStream.beginObject();
try writeStream.objectField("status");
try writeStream.write(401);
try writeStream.objectField("description");
try writeStream.write("UNAUTHORIZED");
try writeStream.endObject();
try writeStream.endObject();
responseBody.info.description = "UNAUTHORIZED";
responseBody.info.status = 401;
try std.json.stringify(responseBody, .{}, res.writer());
res.status = 401;
res.content_type = httpz.ContentType.JSON;
return;
Expand Down