gracefull stop + features tag commented

Author: StringNick

cdk-mintd.sqlite

@@ -355,7 +355,11 @@ pub const LNBitsClient = struct {
 
         std.log.debug("create invoice, response : {s}", .{res});
 
-        const parsed = std.json.parseFromSlice(std.json.Value, allocator, res, .{ .allocate = .alloc_always }) catch return error.WrongJson;
+        const parsed = std.json.parseFromSlice(std.json.Value, allocator, res, .{ .allocate = .alloc_always }) catch |err| {
+            errdefer std.log.debug("{any}", .{err});
+
+            return error.WrongJson;
+        };
 
         const payment_request = parsed.value.object.get("payment_request") orelse unreachable;
         const payment_hash = parsed.value.object.get("payment_hash") orelse unreachable;

src/core/mint/lightning/lnbits.zig

@@ -347,26 +347,31 @@ pub fn deinit(self: *Features) void {
 }
 
 pub fn fromBase32(gpa: std.mem.Allocator, data: []const u5) !Features {
-    const field_data = try bech32.arrayListFromBase32(gpa, data);
-    defer field_data.deinit();
+    _ = data; // autofix
+    // const field_data = try bech32.arrayListFromBase32(gpa, data);
+    // defer field_data.deinit();
 
-    const width: usize = 5;
+    // const width: usize = 5;
 
-    var flags = std.AutoHashMap(FeatureBit, void).init(gpa);
-    errdefer flags.deinit();
+    // var flags = std.AutoHashMap(FeatureBit, void).init(gpa);
+    // errdefer flags.deinit();
 
-    // Set feature bits from parsed data.
-    const bits_number = data.len * width;
-    for (0..bits_number) |i| {
-        const byte_index = i / width;
-        const bit_index = i % width;
+    // // Set feature bits from parsed data.
+    // const bits_number = data.len * width;
+    // for (0..bits_number) |i| {
+    //     const byte_index = i / width;
+    //     const bit_index = i % width;
 
-        if ((std.math.shl(u8, data[data.len - byte_index - 1], bit_index)) & 1 == 1) {
-            try flags.put(@truncate(i), {});
-        }
-    }
+    //     if ((std.math.shl(u8, data[data.len - byte_index - 1], bit_index)) & 1 == 1) {
+    //         try flags.put(@truncate(i), {});
+    //     }
+    // }
+
+    // return .{
+    //     .flags = flags,
+    // };
 
     return .{
-        .flags = flags,
+        .flags = std.AutoHashMap(FeatureBit, void).init(gpa),
     };
 }

src/lightning_invoices/features.zig

@@ -1299,6 +1299,15 @@ test "full serialize" {
     }
 }
 
+test "ln invoice" {
+    const str =
+        \\lnbc550n1pn04xe4sp53aqjsrd2wg58e7ve4erj8kklssaqg929uzzsdc6tzxg04jcvpa3qpp59sd92rxj89he4uzqg2d4xjcr3lvwa2pfhq3e2xxcwny6wkm024fqdpqf38xy6t5wvszs3z9f48jq5692fty253fxqrpcgcqpjrzjqdm9ng9v36em3598yqg5alyxr5afgquzmnapgqm5dd8c76ew3qgt5rpgrgqq3hcqqqqqqqlgqqqqqqqqvs9qxpqysgqjumakl745mg5djjxvtjz5n3upkz4gtsedd0vyf3a359crdcwvm7rlzkvpe87tnhphjjfp8mly79j0wz4hrrst68mfaz96lhj385q2dgpr42g8l
+    ;
+
+    var inv = try Bolt11Invoice.fromStr(std.testing.allocator, str);
+    defer inv.deinit();
+}
+
 test {
     _ = @import("builder.zig");
 }

src/lightning_invoices/invoice.zig

@@ -381,7 +381,7 @@ pub fn main() !void {
     var wg = std.Thread.WaitGroup{};
     // Spawn task to wait for invoces to be paid and update mint quotes
     // handle invoices
-    {
+    const channels: std.ArrayList(ref.Arc(mpmc.UnboundedChannel(std.ArrayList(u8)))) = v: {
         const thread_fn = (struct {
             fn handleLnInvoice(m: *Mint, wait_ch: ref.Arc(mpmc.UnboundedChannel(std.ArrayList(u8)))) void {
                 defer wait_ch.releaseWithFn((struct {
@@ -393,7 +393,8 @@ pub fn main() !void {
                 var receiver = wait_ch.value.receiver() catch return;
 
                 while (true) {
-                    var request_lookup_id = receiver.recv() orelse unreachable;
+                    // receive lookup id, otherwise channel is closed (application is terminated)
+                    var request_lookup_id = receiver.recv() orelse return;
                     defer request_lookup_id.releaseWithFn((struct {
                         fn deinit(_self: std.ArrayList(u8)) void {
                             _self.deinit();
@@ -409,21 +410,38 @@ pub fn main() !void {
         }).handleLnInvoice;
 
         var it = ln_backends.iterator();
+
+        var channels = try std.ArrayList(ref.Arc(mpmc.UnboundedChannel(std.ArrayList(u8)))).initCapacity(gpa.allocator(), ln_backends.count());
+        errdefer channels.deinit();
+
         while (it.next()) |ln_entry| {
+            // hack to stop channels
+            const ch =
+                ln_entry.value_ptr.waitAnyInvoice();
+            channels.appendAssumeCapacity(ch);
+
             wg.spawnManager(thread_fn, .{
                 &mint,
-                ln_entry.value_ptr.waitAnyInvoice(),
+                ch,
             });
         }
-    }
+
+        break :v channels;
+    };
+    defer channels.deinit();
 
     std.log.info("Listening server on {s}:{d}", .{
         parsed_settings.value.info.listen_host, parsed_settings.value.info.listen_port,
     });
     try srv.listen();
 
+    // hack to stop channels (and threads with handle invoice)
+    for (channels.items) |ch| {
+        ch.value.close();
+    }
+
     std.log.warn("Stopped server", .{});
-    wg.wait();
+    // defer wg.wait();
 }
 
 pub fn handleInterrupt(srv: *httpz.Server(*http_router.GlobalRouter)) !void {

src/mint.zig

@@ -94,6 +94,8 @@ pub fn getMintBolt11Quote(
     req: *httpz.Request,
     res: *httpz.Response,
 ) !void {
+    errdefer std.log.debug("{any}", .{@errorReturnTrace()});
+
     std.log.debug("get mint bolt11 quote req", .{});
 
     const payload = (try req.json(core.nuts.nut04.MintQuoteBolt11Request)) orelse return error.WrongRequest;