tk: update to the new WIP branch

Author: cztomsik

build.zig

@@ -85,6 +85,7 @@ fn addLlama(b: *std.Build, exe: anytype) !void {
         .windows => ".",
         else => "bin",
     }));
+    // TODO: can we somehow favor a locally pulled llama.cpp over the one which is installed via brew?
     exe.linkSystemLibrary("llama");
 
     exe.root_module.addImport("llama_cpp", llama_cpp.createModule());

build.zig.zon

@@ -29,8 +29,8 @@
             .hash = "N-V-__8AAFXpCgDf9CFaoMSic23MgE7_O01X9Nz6JGTh2AY3",
         },
         .tokamak = .{
-            .url = "git+https://github.com/cztomsik/tokamak?ref=main#5a29143a0c1fabea38baf3613a4691979b6e09c0",
-            .hash = "tokamak-2.0.0-FbnSed8qAgCBLRx8zc19crztQ7tfnS0wvGAUnQJ55qql",
+            .url = "git+https://github.com/cztomsik/tokamak?ref=feat/ct2#7e404eb1de48e95f2ea417785bfbf0a1e05d4c32",
+            .hash = "tokamak-2.0.0-FbnSeUBSBAAbhtYy1ATTE4SibbbRv48L4NuyDk_81PrZ",
         },
         .fridge = .{
             .url = "git+https://github.com/cztomsik/fridge?ref=main#11305fd8c3ee58512494c2412e9a84ab92aa82a2",

src/app.zig

@@ -116,27 +116,34 @@ pub const App = struct {
 
     const CONFIG_FILE = "config.json";
 
-    pub fn initConfig(target: *std.json.Parsed(Config), home: *Home, ct: *tk.Container) !void {
-        target.* = try ct.injector.call(readConfig, .{});
-        target.value.db.dir = target.value.db.dir orelse home.path;
+    pub fn configure(bundle: *tk.Bundle) void {
+        // We can't use `routes: [] = ...` field default because we need to reference api again for swagger
+        bundle.addInstance([]const tk.Route, .value(routes));
 
-        try ct.register(&target.value);
-        inline for (std.meta.fields(Config)) |f| try ct.register(&@field(target.value, f.name));
+        // TODO: Maybe the default for fields should be .anyhow?
+        bundle.addOverride(std.json.Parsed(Config), .factory(readConfig));
+
+        // Make all config.xxx fields available for injection
+        bundle.addFieldRef(std.json.Parsed(Config), "value");
+        inline for (std.meta.fields(Config)) |f| bundle.addFieldRef(Config, f.name);
+
+        bundle.addInitHook(setDefaultDbPath);
+        bundle.addInitHook(migrateDb);
+        bundle.addInitHook(loadCerts);
     }
 
-    pub fn initServer(target: *tk.Server, allocator: std.mem.Allocator, cfg: @FieldType(Config, "server"), injector: *tk.Injector) !void {
-        target.* = try tk.Server.init(allocator, routes, .{
-            .listen = cfg,
-            .injector = injector,
-        });
+    fn setDefaultDbPath(db_opts: *fr.SQLite3.Options, home: *Home) !void {
+        db_opts.dir = db_opts.dir orelse home.path;
     }
 
-    pub fn afterAppInit(allocator: std.mem.Allocator, db_pool: *fr.Pool(fr.SQLite3), client: *std.http.Client) !void {
+    fn migrateDb(allocator: std.mem.Allocator, db_pool: *fr.Pool(fr.SQLite3)) !void {
         var db = try db_pool.getSession(allocator);
         defer db.deinit();
 
-        try fr.migrate(db, @embedFile("db_schema.sql"));
+        try fr.migrate(&db, @embedFile("db_schema.sql"));
+    }
 
+    fn loadCerts(allocator: std.mem.Allocator, client: *std.http.Client) !void {
         if (comptime builtin.target.os.tag == .windows) {
             try client.ca_bundle.rescan(allocator);
             const start = client.ca_bundle.bytes.items.len;