From 8c4068986ff26fe12e46d6ba3208e279678ce524 Mon Sep 17 00:00:00 2001 From: patrick-scho Date: Sun, 16 Feb 2025 16:31:10 +0100 Subject: [PATCH] get things working again --- build.zig | 16 +- src/main.zig | 687 +++++++++++++++++++++------------------------------ todo.md | 19 +- 3 files changed, 288 insertions(+), 434 deletions(-) diff --git a/build.zig b/build.zig index c49960c..824c10f 100644 --- a/build.zig +++ b/build.zig @@ -15,20 +15,14 @@ pub fn build(b: *std.Build) void { // other modules exe.root_module.omit_frame_pointer = false; - const epoll = b.addExecutable(.{ - .name = "epoll", - .root_source_file = .{ .cwd_relative = "src/epoll.zig" }, - .target = target, - .optimize = optimize, - }); - const lmdb = b.dependency("lmdb", .{ .target = target, .optimize = optimize }); var lmdb_mod = lmdb.module("lmdb"); lmdb_mod.omit_frame_pointer = false; exe.root_module.addImport("lmdb", lmdb_mod); + var db_mod = lmdb.module("db"); + db_mod.omit_frame_pointer = false; + exe.root_module.addImport("db", db_mod); exe.linkLibC(); - epoll.root_module.addImport("lmdb", lmdb_mod); - epoll.linkLibC(); const http = b.dependency("http", .{ .target = target, .optimize = optimize }); const http_mod = http.module("http"); @@ -41,8 +35,4 @@ pub fn build(b: *std.Build) void { run_cmd.step.dependOn(b.getInstallStep()); const run_step = b.step("run", "Run the app"); run_step.dependOn(&run_cmd.step); - - const run_epoll_cmd = b.addRunArtifact(epoll); - const run_epoll_step = b.step("runepoll", "run epoll"); - run_epoll_step.dependOn(&run_epoll_cmd.step); } diff --git a/src/main.zig b/src/main.zig index f5e66ea..65dab07 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1,189 +1,22 @@ const std = @import("std"); const lmdb = @import("lmdb"); +const db = @import("db"); const http = @import("http"); // db {{{ -const Prng = struct { - var prng: std.Random.DefaultPrng = std.Random.DefaultPrng.init(0); - - fn IdType(comptime T: type) type { - const ti = @typeInfo(@TypeOf(T.get)); - return ti.Fn.params[1].type.?; - } - - pub fn gen_id(dbi: anytype) IdType(@TypeOf(dbi)) { - var id: IdType(@TypeOf(dbi)) = @enumFromInt(Prng.prng.next()); - - while (dbi.has(id)) { - id = @enumFromInt(Prng.prng.next()); - } - - return id; - } - - pub fn gen_str(dbi: anytype, comptime len: usize) [len]u8 { - var buf: [len / 2]u8 = undefined; - var res: [len]u8 = undefined; - Prng.prng.fill(&buf); - for (0..len / 2) |i| { - res[i * 2 + 0] = 'a' + (buf[i] % 16); - res[i * 2 + 1] = 'a' + (buf[i] >> 4 % 16); - } - - while (dbi.has(res)) { - Prng.prng.fill(&buf); - for (0..len / 2) |i| { - res[i * 2 + 0] = 'a' + (buf[i] % 16); - res[i * 2 + 1] = 'a' + (buf[i] >> 4 % 16); - } - } - - return res; - } -}; - const Db = struct { - fn Key(types: anytype) type { - return std.meta.Tuple(&types); - } - fn users(txn: *const lmdb.Txn) !lmdb.Dbi(UserId, User) { - return try txn.dbi("users", UserId, User); - } - fn user_ids(txn: *const lmdb.Txn) !lmdb.Dbi(Username, UserId) { - return try txn.dbi("user_ids", Username, UserId); + fn users(txn: lmdb.Txn) !db.Db(UserId, User) { + return try db.Db(UserId, User).init(txn, "users"); } - fn sessions(txn: *const lmdb.Txn) !lmdb.Dbi(SessionToken, UserId) { - return try txn.dbi("sessions", SessionToken, UserId); + fn user_ids(txn: lmdb.Txn) !db.Db(Username, UserId) { + return try db.Db(Username, UserId).init(txn, "user_ids"); } - fn posts(txn: *const lmdb.Txn) !lmdb.Dbi(PostId, Post) { - return try txn.dbi("posts", PostId, Post); + fn sessions(txn: lmdb.Txn) !db.Db(SessionToken, UserId) { + return try db.Db(SessionToken, UserId).init(txn, "sessions"); } - fn lists(txn: *const lmdb.Txn, comptime T: type) !lmdb.Dbi(ListId, ListNode(T)) { - return try txn.dbi("lists", ListId, ListNode(T)); - } - fn sets(txn: *const lmdb.Txn, comptime T: type) !lmdb.Dbi(Key(.{ SetId, T }), u0) { - return try txn.dbi("sets", Key(.{ SetId, T }), u0); - } - - const ListId = enum(u64) { _ }; - - pub fn ListNode(comptime T: type) type { - return struct { - next: ?ListId, - prev: ?ListId, - data: T, - }; - } - - pub fn List(comptime T: type) type { - return struct { - const Self = @This(); - - first: ListId = undefined, - last: ListId = undefined, - len: usize = 0, - - pub const Iterator = struct { - dbi: lmdb.Dbi(ListId, ListNode(T)), - id_maybe: ?ListId, - - pub fn next(self: *Iterator) ?T { - const id = self.id_maybe orelse return null; - - // TODO: how to handle this? - const ln = self.dbi.get(id) orelse return null; - self.id_maybe = ln.next; - return ln.data; - } - }; - pub fn it(self: *const Self, txn: *const lmdb.Txn) !Iterator { - const list = try Db.lists(txn, T); - return .{ .dbi = list, .id_maybe = if (self.len > 0) self.first else null }; - } - pub fn append(self: *Self, txn: *const lmdb.Txn, t: T) !void { - const list = try Db.lists(txn, T); - const new_id = Prng.gen_id(list); - - if (self.len == 0) { - self.first = new_id; - self.last = new_id; - self.len = 1; - list.put(new_id, .{ - .next = null, - .prev = null, - .data = t, - }); - } else { - const prev_id = self.last; - var last = list.get(prev_id).?; - last.next = new_id; - list.put(prev_id, last); - - list.put(new_id, .{ - .next = null, - .prev = prev_id, - .data = t, - }); - - self.last = new_id; - self.len += 1; - } - } - }; - } - - const SetId = enum(u64) { _ }; - - pub fn Set(comptime T: type) type { - return struct { - const Self = @This(); - const SetKey = Key(.{ SetId, T }); - - len: usize = 0, - set_id: ?SetId = null, - - pub fn init(self: *Self) void { - self.set_id = @enumFromInt(Prng.prng.next()); - } - - pub fn has(self: Self, txn: *const lmdb.Txn, t: T) !bool { - if (self.set_id == null) return false; - - const set = try Db.sets(txn, T); - const key = SetKey{ self.set_id.?, t }; - - return set.has(key); - } - - pub fn add(self: *Self, txn: *const lmdb.Txn, t: T) !void { - if (self.set_id == null) self.init(); - - const set = try Db.sets(txn, T); - const key = SetKey{ self.set_id.?, t }; - - if (!set.has(key)) { - set.put(key, 0); - if (set.has(key)) { - self.len += 1; - } - } - } - - pub fn del(self: *Self, txn: *const lmdb.Txn, t: T) !void { - if (self.set_id == null) self.init(); - - const set = try Db.sets(txn, T); - const key = SetKey{ self.set_id.?, t }; - - if (set.has(key)) { - set.del(key); - if (!set.has(key)) { - self.len -= 1; - } - } - } - }; + fn posts(txn: lmdb.Txn) !db.Db(PostId, Post) { + return try db.Db(PostId, Post).init(txn, "posts"); } }; @@ -194,9 +27,9 @@ const Db = struct { const User = struct { // TODO: choose sizes id: UserId, - username: Username, + name: Username, password_hash: PasswordHash, - posts: PostList = PostList{}, + posts: PostList, }; const Post = struct { @@ -205,15 +38,21 @@ const Post = struct { user_id: UserId, time: Timestamp, - upvotes: UserList = UserList{}, - downvotes: UserList = UserList{}, - comments: PostList = PostList{}, - // reposts + upvotes: u64 = 0, + downvotes: u64 = 0, + votes: VoteList, + comments: PostList, + // quote posts text: PostText, }; -const SessionTokenLen = 16; +const Vote = struct { + const Kind = enum { Up, Down }; + + kind: Kind, + time: Timestamp, +}; const Id = u64; const Login = struct { @@ -226,198 +65,228 @@ const PostId = enum(u64) { _ }; const Timestamp = i64; const Username = std.BoundedArray(u8, 16); const PasswordHash = std.BoundedArray(u8, 128); -const SessionToken = [SessionTokenLen]u8; +const SessionToken = u64; const CookieValue = std.BoundedArray(u8, 128); const PostText = std.BoundedArray(u8, 1024); -const PostList = Db.List(PostId); -const UserList = Db.Set(UserId); +const PostList = db.SetList(PostId, void); +const UserList = db.SetList(UserId, User); +const VoteList = db.SetList(UserId, Vote); -pub fn hash_password(password: []const u8) !PasswordHash { - var hash_buffer = try PasswordHash.init(128); +const Chirp = struct { + pub fn hash_password(password: []const u8) !PasswordHash { + var hash_buffer = try PasswordHash.init(128); - // TODO: choose buffer size - // TODO: dont allocate on stack, maybe zero memory? - var buffer: [1024 * 10]u8 = undefined; - var alloc = std.heap.FixedBufferAllocator.init(&buffer); + // TODO: choose buffer size + // TODO: dont allocate on stack, maybe zero memory? + var buffer: [1024 * 10]u8 = undefined; + var alloc = std.heap.FixedBufferAllocator.init(&buffer); - // TODO: choose limits - const result = try std.crypto.pwhash.argon2.strHash(password, .{ - .allocator = alloc.allocator(), - .params = std.crypto.pwhash.argon2.Params.fromLimits(1000, 1024), - }, hash_buffer.slice()); + // TODO: choose limits + const result = try std.crypto.pwhash.argon2.strHash(password, .{ + .allocator = alloc.allocator(), + .params = std.crypto.pwhash.argon2.Params.fromLimits(1000, 1024), + }, hash_buffer.slice()); - try hash_buffer.resize(result.len); + try hash_buffer.resize(result.len); - return hash_buffer; -} - -pub fn verify_password(password: []const u8, hash: PasswordHash) bool { - var buffer: [1024 * 10]u8 = undefined; - var alloc = std.heap.FixedBufferAllocator.init(&buffer); - - if (std.crypto.pwhash.argon2.strVerify(hash.constSlice(), password, .{ - .allocator = alloc.allocator(), - })) { - return true; - } else |err| { - std.debug.print("verify error: {}\n", .{err}); - return false; + return hash_buffer; } -} -pub fn register_user(env: *lmdb.Env, username: []const u8, password: []const u8) !bool { - const username_array = try Username.fromSlice(username); + pub fn verify_password(password: []const u8, hash: PasswordHash) bool { + var buffer: [1024 * 10]u8 = undefined; + var alloc = std.heap.FixedBufferAllocator.init(&buffer); - const txn = try env.txn(); - defer { - txn.commit(); - env.sync(); + if (std.crypto.pwhash.argon2.strVerify(hash.constSlice(), password, .{ + .allocator = alloc.allocator(), + })) { + return true; + } else |err| { + std.debug.print("verify error: {}\n", .{err}); + return false; + } } - const users = try Db.users(&txn); - const user_ids = try Db.user_ids(&txn); + pub fn register_user(env: *lmdb.Env, username: []const u8, password: []const u8) !bool { + const username_array = try Username.fromSlice(username); - if (user_ids.has(username_array)) { - return false; - } else { - const user_id = Prng.gen_id(users); - users.put(user_id, User{ - .id = user_id, - .username = username_array, - .password_hash = try hash_password(password), - }); + const txn = try env.txn(); + defer txn.commit() catch {}; - user_ids.put(username_array, user_id); + const users = try Db.users(txn); + const user_ids = try Db.user_ids(txn); - return true; - } -} + if (try user_ids.has(username_array)) { + return false; + } else { + const user_id = try db.Prng.gen(users.dbi, UserId); + const posts = try Db.posts(txn); + + try users.put(user_id, User{ + .id = user_id, + .name = username_array, + .password_hash = try hash_password(password), + .posts = try PostList.init(posts.dbi), + }); -pub fn login_user(env: *lmdb.Env, username: []const u8, password: []const u8) !SessionToken { - const username_array = try Username.fromSlice(username); + try user_ids.put(username_array, user_id); - const txn = try env.txn(); - defer { - txn.commit(); - env.sync(); + return true; + } } - const user_ids = try Db.user_ids(&txn); - const user_id = user_ids.get(username_array) orelse return error.UnknownUsername; - std.debug.print("id: {}\n", .{user_id}); + pub fn login_user( + env: *lmdb.Env, + username: []const u8, + password: []const u8, + ) !SessionToken { + const username_array = try Username.fromSlice(username); + + const txn = try env.txn(); + defer txn.commit() catch {}; + + const user_ids = try Db.user_ids(txn); + const user_id = try user_ids.get(username_array); + std.debug.print("user logging in, id: {}\n", .{user_id}); + + const users = try Db.users(txn); + const user = try users.get(user_id); - const users = try Db.users(&txn); - if (users.get(user_id)) |user| { if (verify_password(password, user.password_hash)) { - const sessions = try Db.sessions(&txn); - const session_token = Prng.gen_str(sessions, SessionTokenLen); - sessions.put(session_token, user_id); + const sessions = try Db.sessions(txn); + const session_token = try db.Prng.gen(sessions.dbi, SessionToken); + try sessions.put(session_token, user_id); return session_token; } else { return error.IncorrectPassword; } - } else { - return error.UserNotFound; } -} -fn logout_user(env: *lmdb.Env, session_token: SessionToken) !void { - const txn = try env.txn(); - defer { - txn.commit(); - env.sync(); + fn logout_user(env: *lmdb.Env, session_token: SessionToken) !void { + const txn = try env.txn(); + defer txn.commit() catch {}; + + const sessions = try Db.sessions(txn); + try sessions.del(session_token); } - const sessions = try Db.sessions(&txn); - sessions.del(session_token); -} + fn post(env: *lmdb.Env, user_id: UserId, text: []const u8) !void { + var post_id: PostId = undefined; -fn post(env: *lmdb.Env, user_id: UserId, text: []const u8) !void { - var post_id: PostId = undefined; + // TODO: do this in one commit - var txn = try env.txn(); - { - const posts = try Db.posts(&txn); - post_id = Prng.gen_id(posts); - posts.put(post_id, Post{ - .id = post_id, - .user_id = user_id, - .time = std.time.timestamp(), - .text = try PostText.fromSlice(text), - }); + var txn: lmdb.Txn = undefined; + { + // create post + txn = try env.txn(); + defer txn.commit() catch {}; - txn.commit(); - env.sync(); - } + const posts = try Db.posts(txn); + post_id = try db.Prng.gen(posts.dbi, PostId); + const votes = try txn.dbi("votes"); + try posts.put(post_id, Post{ + .id = post_id, + .user_id = user_id, + .time = std.time.timestamp(), + .votes = try VoteList.init(votes), + .comments = try PostList.init(posts.dbi), + .text = try PostText.fromSlice(text), + }); + } - txn = try env.txn(); - { - const users = try Db.users(&txn); - var user = users.get(user_id) orelse return error.UserNotFound; - try user.posts.append(&txn, post_id); - users.put(user_id, user); + { + // append to user's posts + txn = try env.txn(); + defer txn.commit() catch {}; - txn.commit(); - env.sync(); - } -} + const users = try Db.users(txn); + var user = try users.get(user_id); -fn vote(env: *lmdb.Env, post_id: PostId, user_id: UserId, dir: enum { Up, Down }) !void { - const txn = try env.txn(); - defer { - txn.commit(); - env.sync(); + const posts = try Db.posts(txn); + var posts_view = try user.posts.open(posts.dbi); + try posts_view.append(post_id, {}); + } } - const posts = try Db.posts(&txn); + fn vote(env: *lmdb.Env, post_id: PostId, user_id: UserId, kind: Vote.Kind) !void { + const txn = try env.txn(); + defer txn.commit() catch {}; - var p = posts.get(post_id) orelse return error.PostNotFound; - if (dir == .Up) { - try p.upvotes.add(&txn, user_id); - } else { - try p.downvotes.add(&txn, user_id); - } - posts.put(post_id, p); -} + const posts = try Db.posts(txn); + const votes = try txn.dbi("votes"); -fn unvote(env: *lmdb.Env, post_id: PostId, user_id: UserId, dir: enum { Up, Down }) !void { - const txn = try env.txn(); - defer { - txn.commit(); - env.sync(); + var p = try posts.get(post_id); + var votes_view = try p.votes.open(votes); + + if (try votes_view.has(user_id)) { + const old_vote = try votes_view.get(user_id); + + if (old_vote.kind == kind) { + return; + } else { + try votes_view.del(user_id); + + if (old_vote.kind == .Up) { + p.upvotes -= 1; + } else { + p.downvotes -= 1; + } + try posts.put(post_id, p); + } + } + try votes_view.append(user_id, Vote{ + .kind = kind, + .time = std.time.timestamp(), + }); + + if (kind == .Up) { + p.upvotes += 1; + } else { + p.downvotes += 1; + } + try posts.put(post_id, p); } - const posts = try Db.posts(&txn); + fn unvote(env: *lmdb.Env, post_id: PostId, user_id: UserId) !void { + const txn = try env.txn(); + defer txn.commit() catch {}; - var p = posts.get(post_id) orelse return error.PostNotFound; - if (dir == .Up) { - try p.upvotes.del(&txn, user_id); - } else { - try p.downvotes.del(&txn, user_id); + const posts = try Db.posts(txn); + const votes = try txn.dbi("votes"); + + var p = try posts.get(post_id); + var votes_view = try p.votes.open(votes); + + if (try votes_view.has(user_id)) { + const v = try votes_view.get(user_id); + + if (v.kind == .Up) { + p.upvotes -= 1; + } else { + p.downvotes -= 1; + } + try posts.put(post_id, p); + + try votes_view.del(user_id); + } } - posts.put(post_id, p); -} -fn get_session_user_id(env: *lmdb.Env, session_token: SessionToken) !UserId { - const txn = try env.txn(); - defer txn.abort(); + fn get_session_user_id(env: *lmdb.Env, session_token: SessionToken) !UserId { + const txn = try env.txn(); + defer txn.abort(); - const sessions = try Db.sessions(&txn); + const sessions = try Db.sessions(txn); - if (sessions.get(session_token)) |user_id| { - return user_id; - } else { - return error.SessionNotFound; + return try sessions.get(session_token); } -} -fn get_user(env: *lmdb.Env, user_id: UserId) !?User { - const txn = try env.txn(); - defer txn.abort(); + fn get_user(env: *lmdb.Env, user_id: UserId) !User { + const txn = try env.txn(); + defer txn.abort(); - const users = try Db.users(&txn); - return users.get(user_id); -} + const users = try Db.users(txn); + return try users.get(user_id); + } +}; // }}} @@ -451,7 +320,7 @@ fn write_header(res: *http.Response, logged_in: ?Login) !void { if (logged_in) |login| { try res.write( \\Home
- , .{login.user.username.constSlice()}); + , .{login.user.name.constSlice()}); try html_form(res, "/logout", .{}, .{ \\type="submit" value="Logout" }); @@ -475,37 +344,54 @@ fn write_header(res: *http.Response, logged_in: ?Login) !void { }); } } -fn write_posts(res: *http.Response, txn: *const lmdb.Txn, user: User, login: ?Login) !void { +fn write_posts(res: *http.Response, txn: lmdb.Txn, user: User, login: ?Login) !void { + const votes_dbi = try txn.dbi("votes"); const posts = try Db.posts(txn); - var it = try user.posts.it(txn); - while (it.next()) |post_id| { - const p = posts.get(post_id) orelse break; + const posts_view = try user.posts.open(posts.dbi); + + var it = posts_view.iterator(); + while (it.next()) |kv| { + const post_id = kv.key; + const post = try posts.get(post_id); + try res.write( \\
\\

{s}

- , .{p.text.constSlice()}); - if (login != null and try p.upvotes.has(txn, login.?.user_id)) { + , .{post.text.constSlice()}); + + const votes_view = try post.votes.open(votes_dbi); + const comments_view = try post.comments.open(posts.dbi); + + var has_voted: ?Vote.Kind = null; + + if (login != null and try votes_view.has(login.?.user_id)) { + const vote = try votes_view.get(login.?.user_id); + + has_voted = vote.kind; + } + + if (has_voted != null and has_voted.? == .Up) { try html_form(res, "/unupvote/{}", .{@intFromEnum(post_id)}, .{ - .{ "type=\"submit\" value=\"⬆ {}\"", .{p.upvotes.len} }, + .{ "type=\"submit\" value=\"⬆ {}\"", .{post.upvotes} }, }); } else { try html_form(res, "/upvote/{}", .{@intFromEnum(post_id)}, .{ - .{ "type=\"submit\" value=\"⬆ {}\"", .{p.upvotes.len} }, + .{ "type=\"submit\" value=\"⬆ {}\"", .{post.upvotes} }, }); } - if (login != null and try p.downvotes.has(txn, login.?.user_id)) { + if (has_voted != null and has_voted.? == .Down) { try html_form(res, "/undownvote/{}", .{@intFromEnum(post_id)}, .{ - .{ "type=\"submit\" value=\"⬇ {}\"", .{p.downvotes.len} }, + .{ "type=\"submit\" value=\"⬇ {}\"", .{post.downvotes} }, }); } else { try html_form(res, "/downvote/{}", .{@intFromEnum(post_id)}, .{ - .{ "type=\"submit\" value=\"⬇ {}\"", .{p.downvotes.len} }, + .{ "type=\"submit\" value=\"⬇ {}\"", .{post.downvotes} }, }); } try res.write( \\💭 {} \\
- , .{p.comments.len}); + , .{comments_view.len()}); } } // }}} @@ -514,33 +400,26 @@ fn list_users(env: lmdb.Env) !void { const txn = try env.txn(); defer txn.abort(); - // const users = try Db.users(&txn); - const users = try txn.dbi("users", UserId, User); - var cursor = try users.cursor(); - - var key: UserId = undefined; - var user_maybe = cursor.get(&key, .First); + const users = try Db.users(txn); + var it = try users.iterator(); - while (user_maybe) |*user| { - std.debug.print("[{}] {s}\n", .{ key, user.username.constSlice() }); - - user_maybe = cursor.get(&key, .Next); + while (it.next()) |kv| { + const key = kv.key; + const user = kv.val; + std.debug.print("[{}] {s}\n", .{ key, user.name.constSlice() }); } } fn list_user_ids(env: lmdb.Env) !void { const txn = try env.txn(); defer txn.abort(); - const user_ids = try Db.user_ids(&txn); - var cursor = try user_ids.cursor(); - - var key: Username = undefined; - var user_id_maybe = cursor.get(&key, .First); + const user_ids = try Db.user_ids(txn); + var it = try user_ids.iterator(); - while (user_id_maybe) |user_id| { + while (it.next()) |kv| { + const key = kv.key; + const user_id = kv.val; std.debug.print("[{s}] {}\n", .{ key.constSlice(), user_id }); - - user_id_maybe = cursor.get(&key, .Next); } } @@ -548,16 +427,13 @@ fn list_sessions(env: lmdb.Env) !void { const txn = try env.txn(); defer txn.abort(); - const sessions = try Db.sessions(&txn); - var cursor = try sessions.cursor(); - - var key: SessionToken = undefined; - var user_id_maybe = cursor.get(&key, .First); + const sessions = try Db.sessions(txn); + var it = try sessions.iterator(); - while (user_id_maybe) |user_id| { - std.debug.print("[{s}] {}\n", .{ key, user_id }); - - user_id_maybe = cursor.get(&key, .Next); + while (it.next()) |kv| { + const key = kv.key; + const user_id = kv.val; + std.debug.print("[{x}] {}\n", .{ key, user_id }); } } @@ -565,16 +441,13 @@ fn list_posts(env: lmdb.Env) !void { const txn = try env.txn(); defer txn.abort(); - const posts = try Db.posts(&txn); - var cursor = try posts.cursor(); - - var key: PostId = undefined; - var post_maybe = cursor.get(&key, .First); - - while (post_maybe) |p| { - std.debug.print("[{}] {s}\n", .{ key, p.text.constSlice() }); + const posts = try Db.posts(txn); + var it = try posts.iterator(); - post_maybe = cursor.get(&key, .Next); + while (it.next()) |kv| { + const key = kv.key; + const post = kv.val; + std.debug.print("[{}] {s}\n", .{ key, post.text.constSlice() }); } } @@ -591,14 +464,14 @@ pub fn main() !void { var env = try lmdb.Env.open("db", 1024 * 1024 * 10); defer env.close(); - std.debug.print("Users:\n", .{}); - try list_users(env); - std.debug.print("User IDs:\n", .{}); - try list_user_ids(env); - std.debug.print("Sessions:\n", .{}); - try list_sessions(env); - std.debug.print("Posts:\n", .{}); - try list_posts(env); + // std.debug.print("Users:\n", .{}); + // try list_users(env); + // std.debug.print("User IDs:\n", .{}); + // try list_user_ids(env); + // std.debug.print("Sessions:\n", .{}); + // try list_sessions(env); + // std.debug.print("Posts:\n", .{}); + // try list_posts(env); try handle_connection(&server, &env); // const ThreadCount = 1; @@ -633,17 +506,16 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void { var logged_in: ?Login = null; if (req.get_cookie("session_token")) |session_token_str| { - var session_token: SessionToken = undefined; - std.mem.copyForwards(u8, &session_token, session_token_str); + const session_token = try std.fmt.parseUnsigned(SessionToken, session_token_str, 16); // const session_token = try std.fmt.parseUnsigned(SessionToken, session_token_str, 10); // const session_token = std.mem.bytesToValue(SessionToken, session_token_str); - if (get_session_user_id(env, session_token)) |user_id| { + if (Chirp.get_session_user_id(env, session_token)) |user_id| { const txn = try env.txn(); defer txn.abort(); - const users = try Db.users(&txn); + const users = try Db.users(txn); logged_in = .{ - .user = users.get(user_id) orelse return error.UserNotFound, + .user = try users.get(user_id), .user_id = user_id, .session_token = session_token, }; @@ -685,25 +557,25 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void { const txn = try env.txn(); defer txn.abort(); - const user_ids = try Db.user_ids(&txn); + const user_ids = try Db.user_ids(txn); if (user_ids.get(try Username.fromSlice(username))) |user_id| { - const users = try Db.users(&txn); - const user = users.get(user_id).?; - try write_posts(&res, &txn, user, logged_in); - } else { + const users = try Db.users(txn); + const user = try users.get(user_id); + try write_posts(&res, txn, user, logged_in); + } else |err| { try res.write( - \\

User not found - , .{}); + \\

User not found [{}]

+ , .{err}); } try res.send(); } else { if (logged_in) |login| { - const user = (try get_user(env, login.user_id)).?; + const user = try Chirp.get_user(env, login.user_id); const txn = try env.txn(); defer txn.abort(); - try write_posts(&res, &txn, user, logged_in); + try write_posts(&res, txn, user, logged_in); try res.send(); } else { @@ -720,7 +592,7 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void { const password = req.get_value("password").?; std.debug.print("New user: {s} {s}\n", .{ username, password }); - if (try register_user(env, username, password)) { + if (try Chirp.register_user(env, username, password)) { try res.redirect("/login"); } else { try res.redirect("/register"); @@ -732,7 +604,7 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void { const password = req.get_value("password").?; std.debug.print("New login: {s} {s}\n", .{ username, password }); - if (login_user(env, username, password)) |session_token| { + if (Chirp.login_user(env, username, password)) |session_token| { res.status = .see_other; try res.add_header( "Location", @@ -740,7 +612,7 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void { ); try res.add_header( "Set-Cookie", - .{ "session_token={s}; Secure; HttpOnly", .{session_token} }, + .{ "session_token={x}; Secure; HttpOnly", .{session_token} }, ); try res.send(); @@ -751,7 +623,7 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void { } } else if (std.mem.eql(u8, req.target, "/logout")) { if (logged_in) |login| { - try logout_user(env, login.session_token); + try Chirp.logout_user(env, login.session_token); try res.add_header( "Set-Cookie", @@ -764,7 +636,7 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void { } else if (std.mem.eql(u8, req.target, "/post")) { if (logged_in) |login| { const text = req.get_value("text").?; - try post(env, login.user_id, text); + try Chirp.post(env, login.user_id, text); try res.redirect("/"); try res.send(); @@ -779,8 +651,7 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void { const post_id_str = req.target[8..req.target.len]; const post_id: PostId = @enumFromInt(try std.fmt.parseUnsigned(u64, post_id_str, 10)); - try vote(env, post_id, login.user_id, .Up); - try unvote(env, post_id, login.user_id, .Down); + try Chirp.vote(env, post_id, login.user_id, .Up); if (req.get_header("Referer")) |ref| { try res.redirect(ref); @@ -792,20 +663,20 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void { const post_id_str = req.target[10..req.target.len]; const post_id: PostId = @enumFromInt(try std.fmt.parseUnsigned(u64, post_id_str, 10)); - try vote(env, post_id, login.user_id, .Down); - try unvote(env, post_id, login.user_id, .Up); + try Chirp.vote(env, post_id, login.user_id, .Down); if (req.get_header("Referer")) |ref| { try res.redirect(ref); } try res.send(); } else if (std.mem.startsWith(u8, req.target, "/unupvote/")) { + // TODO: maybe move to one /unvote? const login = logged_in orelse return error.NotLoggedIn; const post_id_str = req.target[10..req.target.len]; const post_id: PostId = @enumFromInt(try std.fmt.parseUnsigned(u64, post_id_str, 10)); - try unvote(env, post_id, login.user_id, .Up); + try Chirp.unvote(env, post_id, login.user_id); if (req.get_header("Referer")) |ref| { try res.redirect(ref); @@ -817,7 +688,7 @@ fn handle_connection(server: *http.Server, env: *lmdb.Env) !void { const post_id_str = req.target[12..req.target.len]; const post_id: PostId = @enumFromInt(try std.fmt.parseUnsigned(u64, post_id_str, 10)); - try unvote(env, post_id, login.user_id, .Down); + try Chirp.unvote(env, post_id, login.user_id); if (req.get_header("Referer")) |ref| { try res.redirect(ref); diff --git a/todo.md b/todo.md index 18f49fe..1ec237a 100644 --- a/todo.md +++ b/todo.md @@ -1,22 +1,14 @@ ## Todo - lmdb - - check - - del - - interface: dbi - - change optionals to errors - - self: *const Self -> self: Self - - SessionToken: []u8 - get maybe !? weil nicht vorhanden und fehler unterschiedlich behandelt werden sollten - - lists (refactor) - - sets (refactor) - - maps -- generate ids + - Listen in eigene dbi weil dbi's sonst nicht sinnvoll iteriert werden können +- Anstatt Posts in posts dbi, vielleicht ownen die PostList's der User die Posts? + - aber dann können wir wieder nicht iterieren... + - anhand der Key Länge unterscheiden zw. SetList und Item und Post? + - alternativ eigene dbi's für SetList, item und dann posts, users usw. - Change respond (respondoptions -> request, fmt+args) - Rewrite get_value - Account - - Register - - Login - - Logout - Change username - Change password - Public-Key-Crypto @@ -26,4 +18,5 @@ - Like - Repost - Timeline + - Follow - TUI -- 2.50.1