mixandClaude Opus 5.5
6db3704711
Owner, 2026-10-18: "Фиаско, что очередь не была сделана. Как мы это допустили? Исправляем!" The mockups out-queue and in-queue (design629de5e, guards8525e8e). - postfix: postqueue -j gives each message's size and each recipient's delay_reason (src/postqueue/showq_json.c, format_json(): "delay_reason" only when LEN(why) > 0); QueueListing reads it with the page's 5 s, QueueMessages keeps the notifier's 30 s. - view: one Queue page type for both directions (queue.go), one polled box (queue_body.html): a row per recipient, oldest first, cut at 200 with a foot; the head "N messages · size", "Refreshes on its own" while empty; Last reply is the delay reason, or where the message is (active, hold, incoming) before there was one. Inbound has no Details: an inbound message has no page of its own. - handlers: one read of the queue, split by the recipient's domain against the inbound domains; an outbound recipient is linked to its send-log row (store.SendLogRefsByQueueID, through idx_send_log_queue_id, plan pinned in TestSendLogQueriesUseTheirIndexes), matched without regard to case, else the message's first row. Both pages are the global role's; the inbound one 404s with the relay off. Routes /inbound/queue (+ /fragment), menu, touch menu and sibling strip. - Overview: Queues · Both empty · outbound and inbound with the relay on. - Help: the queue topic rewritten, an Inbound queue topic (word for word with the mockup; domain administrators do not see it, as with the lists). - TestUnbuiltScreensAreOnTheRoadmap and its rule in development.md: an exempted screen must be named in roadmap.md; queue-table leaves the roadmap; guide, architecture, panel-redesign.md updated. Tests: go vet; go test ./internal/web/... ./internal/store ./internal/postfix ./internal/notify pass. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
67 lines
2.9 KiB
Go
67 lines
2.9 KiB
Go
package postfix
|
|
|
|
import (
|
|
"errors"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
// The listing is composed by hand: its first line in the field order of
|
|
// Postfix 3.10.13's src/postqueue/showq_json.c, format_json(); the others
|
|
// short of fields or broken on purpose.
|
|
func TestParseQueueJSON(t *testing.T) {
|
|
out := []byte(`{"queue_name": "deferred", "queue_id": "41E862C00D9E", "arrival_time": 1791000000, "message_size": 446, "forced_expire": false, "sender": "app@example.com", "recipients": [{"address": "a@example.net", "delay_reason": "connect to mx.example.net[203.0.113.9]:25: Connection timed out"}]}
|
|
{"queue_name": "active", "queue_id": "5F00AA12", "arrival_time": 1791250000, "message_size": 900, "sender": "", "recipients": [{"address": "b@example.net"}]}
|
|
|
|
not json at all
|
|
{"queue_name": "deferred", "queue_id": "", "arrival_time": 1791250000}
|
|
{"queue_name": "deferred", "queue_id": "6C00BB34", "arrival_time": 17912`)
|
|
|
|
got, err := parseQueueJSON(out)
|
|
if err != nil {
|
|
t.Fatalf("parse: %v", err)
|
|
}
|
|
if len(got) != 2 {
|
|
t.Fatalf("parsed %d messages, want 2: %+v", len(got), got)
|
|
}
|
|
if got[0].ID != "41E862C00D9E" || got[0].Queue != "deferred" || got[0].Sender != "app@example.com" ||
|
|
!got[0].Arrival.Equal(time.Unix(1791000000, 0)) {
|
|
t.Errorf("first message = %+v", got[0])
|
|
}
|
|
if len(got[0].Recipients) != 1 || got[0].Recipients[0] != (QueuedRecipient{"a@example.net", "connect to mx.example.net[203.0.113.9]:25: Connection timed out"}) {
|
|
t.Errorf("first message's recipients = %v", got[0].Recipients)
|
|
}
|
|
if got[0].Size != 446 {
|
|
t.Errorf("first message's size = %d, want 446", got[0].Size)
|
|
}
|
|
// A recipient not tried yet has no delay_reason (showq_json.c writes it
|
|
// only when there is one).
|
|
if got[1].ID != "5F00AA12" || got[1].Queue != "active" || got[1].Recipients[0] != (QueuedRecipient{Address: "b@example.net"}) {
|
|
t.Errorf("second message = %+v", got[1])
|
|
}
|
|
if empty, err := parseQueueJSON(nil); err != nil || len(empty) != 0 {
|
|
t.Errorf("an empty queue: %v, %v", empty, err)
|
|
}
|
|
// A line the reader cannot hold ends the listing with an error: what
|
|
// follows it is unknown, and "nothing old is left" must not be concluded.
|
|
long := append([]byte(`{"queue_id": "A", "arrival_time": 1, "sender": "`), make([]byte, 2<<20)...)
|
|
if _, err := parseQueueJSON(long); err == nil {
|
|
t.Error("a line longer than the reader's limit was not an error")
|
|
}
|
|
}
|
|
|
|
// A queue that cannot be listed is an error, not an empty queue: the caller
|
|
// must not conclude that nothing is waiting.
|
|
func TestQueueMessagesReportsAFailedListing(t *testing.T) {
|
|
old := readQueueJSON
|
|
t.Cleanup(func() { readQueueJSON = old })
|
|
readQueueJSON = func(time.Duration) ([]byte, error) { return nil, errors.New("postqueue: Permission denied") }
|
|
|
|
if msgs, err := QueueMessages(); err == nil {
|
|
t.Fatalf("no error for a failed listing (got %v)", msgs)
|
|
}
|
|
if msgs, err := QueueListing(); err == nil {
|
|
t.Fatalf("no error for a failed listing on a page (got %v)", msgs)
|
|
}
|
|
}
|