samiandClaude Sonnet 5
824fa481bb
The two items aimed at pointing GUI at a real veloxd instead of mockd.
rpc/event_hub — per-subscription fan-out shared by both transports.
subscribe() registers a connection with no interest; set_filter()
(session.subscribe, replaces not adds) turns on event kinds and an
optional per-task id filter; publish() delivers a pre-built
notification to every matching subscriber. session.subscribe on both
UdsServer and WsServer now does the real thing — registers/updates a
subscription, tears it down in close_conn.
sched/scheduler — the on_engine_state hook now actually publishes:
- transition() is the one place a task's row changes state; it reads
the store's own prior row for previousState (authoritative
regardless of engine/scheduler timing), writes the error columns,
and — when a hub is supplied — publishes event.task.state with
{taskId, state, previousState, summary, error}. Wired into every
transition: scheduler-driven (admission -> probing, resume ->
connecting, pause) and engine-reported (on_engine_state).
- progress_snapshot(): one row per task the engine is tracking
(EnginePort::progress(), a new interface method backed by
DownloadHandle::progress()), plus a store side-effect
(Tasks::update_progress) so download.list/get stay current between
state transitions. Returns rows; does NOT publish itself — batching
into one array message is the caller's job, per the schema's
x-maxRateHz: 4 and AGENT-DAEMON.md item 5 ("one message per task per
tick burns a core"). main.cpp's 250 ms timerfd is that caller: one
event.task.progress per tick, only when there's something to say.
dispatcher::on_download_add now publishes event.task.added (schema:
"summary is always present so a client can insert the row without a
follow-up download.get").
store/categories, store/queues — the two D3 handlers GUI's panels
call. category.list projects the six seeded built-ins; queue.list
derives taskIds from tasks.queue_id/queue_position (Queue's own schema
note: a queue's stored row never carries membership, download.update
/ queue.reorder do).
Verified live end to end against tools/testserver: a subscribed client
sees event.task.added on add, then the full event.task.state sequence
(queued -> probing -> connecting -> downloading -> assembling ->
verifying -> complete) with correct previousState at every step, and
real category.list / queue.list results.
Tests: event_hub (filter-by-kind, filter-by-task-id, replace-not-add,
unsubscribe), store_categories_queues, plus new sched_scheduler cases
for event.task.state publishing and progress_snapshot's store
side-effect. 38 daemon/cli tests green; sched_scheduler / event_hub /
ws_server / uds_roundtrip TSan-clean.
deferrals.md: D5 mostly closed (event.task.removed and the
still-unpublished events wait on their owning D3 handlers); D3 down to
the remaining download.* verbs, rules/settings/limiter/schedule,
queue mutation, category mutation, grabber, media.
Co-Authored-By: Claude Sonnet 5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01Upd9WhG9oppieig5nRDLig
64 lines
2.2 KiB
C++
64 lines
2.2 KiB
C++
#pragma once
|
|
|
|
// Per-subscription event fan-out, shared by both transports. A connection subscribes once
|
|
// (session.subscribe) with the event kinds and optional task-id filter it wants; publish()
|
|
// delivers a pre-built notification to every subscription that asked for that kind and
|
|
// passes the per-task filter.
|
|
//
|
|
// event.task.progress is the one call site that matters for load: it is batched by the
|
|
// caller (Scheduler::progress_snapshot + one publish) into a single array message at
|
|
// <=4 Hz, never one publish per task — that batching happens before this class ever sees
|
|
// it (AGENT-DAEMON.md item 5, event.task.progress.schema.json x-maxRateHz).
|
|
|
|
#include <cstdint>
|
|
#include <functional>
|
|
#include <mutex>
|
|
#include <optional>
|
|
#include <string>
|
|
#include <string_view>
|
|
#include <unordered_map>
|
|
#include <vector>
|
|
|
|
#include <nlohmann/json_fwd.hpp>
|
|
|
|
#include "velox_proto.hpp"
|
|
|
|
namespace velox::daemon::rpc {
|
|
|
|
class EventHub {
|
|
public:
|
|
using SubId = std::uint64_t;
|
|
using Sink = std::function<void(const nlohmann::json&)>;
|
|
|
|
// Register a connection with no interest yet; session.subscribe calls set_filter to
|
|
// actually turn events on. Returns the id to unsubscribe with on disconnect.
|
|
SubId subscribe(Sink sink);
|
|
|
|
// Replaces the subscription's event set and task filter (session.subscribe replaces,
|
|
// never adds — matches the method's own description).
|
|
void set_filter(SubId id, std::vector<velox::proto::Event> events,
|
|
std::optional<std::vector<std::string>> task_ids);
|
|
|
|
void unsubscribe(SubId id);
|
|
|
|
// `notification` is a complete {jsonrpc, method, params} object
|
|
// (velox::proto::make_notification). `task_id` is matched against each subscription's
|
|
// filter when set; empty means "not task-scoped" and reaches every subscriber of
|
|
// `kind` regardless of their filter.
|
|
void publish(velox::proto::Event kind, const nlohmann::json& notification,
|
|
std::string_view task_id = {});
|
|
|
|
private:
|
|
struct Sub {
|
|
Sink sink;
|
|
std::vector<velox::proto::Event> events;
|
|
std::optional<std::vector<std::string>> task_ids;
|
|
};
|
|
|
|
std::mutex mu_;
|
|
std::unordered_map<SubId, Sub> subs_;
|
|
SubId next_ = 1;
|
|
};
|
|
|
|
} // namespace velox::daemon::rpc
|