Skip to content

End send at a NIP-77 reply and flush each line #18

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

Merged
kwsantiago merged 1 commit into from
Oct 6, 2026
Merged

End send at a NIP-77 reply and flush each line #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions src/main.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const usage =
\\ relay <url> Print the NIP-11 relay information document
\\ sync <src> <dst> [filters..] NIP-77 reconcile src's events into dst
\\ send <url> <json> [--sec <k> --auth] Send one raw client message, print replies
\\ until EOSE/CLOSED/COUNT/OK/NOTICE (--auth answers NIP-42)
\\ until EOSE/CLOSED/COUNT/OK/NOTICE/NEG-MSG/NEG-ERR (--auth answers NIP-42)
\\ decode <bech32|hex> Decode a NIP-19 entity (npub/nsec/note/nevent/naddr/nprofile)
\\ verify [event-json] Verify an event's id and signature (reads stdin if no arg)
\\
Expand Down Expand Up @@ -536,9 +536,10 @@ fn cmdReq(io: Io, arena: Allocator, out: *Io.Writer, args: []const [:0]const u8)
}

// Sends one raw client message and prints every relay reply verbatim until the
// reply that ends it (EOSE, CLOSED, COUNT, OK, or NOTICE). With --auth, a NIP-42
// challenge is answered and the message re-sent once authenticated, and the
// auth-required rejection that preceded it is not printed.
// reply that ends it (EOSE, CLOSED, COUNT, OK, NOTICE, NEG-MSG or NEG-ERR).
// With --auth, a NIP-42 challenge is answered and the message re-sent once
// authenticated, and the auth-required rejection that preceded it is not
// printed.
fn cmdSend(env_sec: ?[]const u8, io: Io, arena: Allocator, out: *Io.Writer, args: []const [:0]const u8) !void {
var url: ?[]const u8 = null;
var json: ?[]const u8 = null;
Expand Down Expand Up @@ -622,9 +623,12 @@ fn cmdSend(env_sec: ?[]const u8, io: Io, arena: Allocator, out: *Io.Writer, args
if (auth_rejection) continue;
}
try printSanitized(io, out, msg.raw);
try out.flush();
switch (msg.msg_type) {
.eose, .closed, .count, .ok => break,
.notice => if (!waiting) break,
// NIP-77 replies, which the relay client does not classify.
.unknown => if (std.mem.startsWith(u8, msg.raw, "[\"NEG-MSG\"") or std.mem.startsWith(u8, msg.raw, "[\"NEG-ERR\"")) break,
else => {},
}
}
Expand Down
2 changes: 2 additions & 0 deletions tests/integration_relay.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ chk "send prints the matching EVENT" 1 "$(echo "$SENT" | grep -c "^\[\"EVENT\",\
chk "send stops at EOSE" '["EOSE","raw"]' "$(echo "$SENT" | tail -1)"
chk "send prints a COUNT reply" 1 "$(timeout 10 $NOZ send "$R" "[\"COUNT\",\"c\",{\"ids\":[\"$ID\"]}]" 2>/dev/null | grep -c '"count":1')"

chk "send ends at a NIP-77 reply" 1 "$(timeout 10 $NOZ send "$R" '["NEG-OPEN","n",{},"6100"]' 2>/dev/null | grep -cE '^\["NEG-(MSG|ERR)","n"')"

# --- A fetched event survives verify end to end ---
EV=$(timeout 10 $NOZ req -i "$ID" "$R" 2>/dev/null | head -1)
chk "fetched event passes verify" valid "$(echo "$EV" | $NOZ verify)"
Expand Down
Loading