daemon: download.add / download.list / download.get behind the store
VeloxDispatcher now takes a store::Db& and three handlers are real:
- download.list -> store::Tasks::list (filter / sort / paging in SQL) ->
to_summary per row. No more empty-table stub.
- download.add -> resolve saveDir (spec, else saveTo.defaultDir; ~ expanded)
and the leaf (spec.filename, else the URL's last segment percent-decoded,
else download.bin) -> fs::resolve_target against canonicalize_root'd
saveTo.allowedRoots. Any path-destination failure is -32011 with the
*original* saveDir in data.path. On success a TaskRow is inserted in
state `queued` (or `new` for startMode "manual") and {taskId, state}
returned. The scheduler that would then admit it is D4.
- download.get -> store::Tasks::get; a real -32010 + data.taskId for an
unknown id, else a TaskDetail (segmentDetail empty until the engine
segments the task, which the schema permits).
util/time.hpp: now_iso() factored out of ws_server.cpp.
main.cpp constructs the dispatcher with the opened db. The three
integration tests build an in-memory migrated db for it; velox.client
now drives the full slice through the CLI — add outside roots -> -32011
with data.path, add into an allowed root -> a task that download.list
shows and download.get details, unknown id -> -32010. Verified with the
real binaries: velox add persists, velox ls shows it, it survives a
daemon restart, /etc is refused.
ASan+UBSan and TSan clean; 34 daemon/cli tests green. deferrals.md:
D2 down to just download.probe; D3 down to categories/queues/rules/
settings/limiter/schedule.
Co-Authored-By: Claude Sonnet 5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01Upd9WhG9oppieig5nRDLig
This commit is contained in:
@@ -12,8 +12,13 @@
|
||||
#include "rpc/dispatcher.hpp"
|
||||
#include "rpc/event_loop.hpp"
|
||||
#include "rpc/uds_server.hpp"
|
||||
#include "store/migrations.hpp"
|
||||
#include "store/settings.hpp"
|
||||
#include "store/sqlite.hpp"
|
||||
|
||||
namespace rpc = velox::daemon::rpc;
|
||||
|
||||
static std::string g_allowed_root;
|
||||
using velox::cli::CallError;
|
||||
using velox::cli::Client;
|
||||
|
||||
@@ -39,7 +44,22 @@ void run() {
|
||||
const std::string server_sock = velox_dir + "/velox.sock";
|
||||
|
||||
rpc::EventLoop loop;
|
||||
rpc::VeloxDispatcher dispatcher;
|
||||
auto db = velox::daemon::store::Db::open(":memory:");
|
||||
CHECK(db.has_value());
|
||||
if (!db) return;
|
||||
CHECK(velox::daemon::store::migrate_to_head(*db).has_value());
|
||||
|
||||
char root_tmpl[] = "/tmp/velox-cli-root-XXXXXX";
|
||||
g_allowed_root = ::mkdtemp(root_tmpl);
|
||||
CHECK(!g_allowed_root.empty());
|
||||
{
|
||||
velox::daemon::store::Settings settings(*db);
|
||||
CHECK(settings.set_raw("saveTo.allowedRoots",
|
||||
"[\"" + g_allowed_root + "\"]").has_value());
|
||||
CHECK(settings.set_raw("saveTo.defaultDir",
|
||||
"\"" + g_allowed_root + "\"").has_value());
|
||||
}
|
||||
rpc::VeloxDispatcher dispatcher(*db);
|
||||
rpc::UdsServer server(loop, dispatcher, server_sock);
|
||||
const auto ec = server.start();
|
||||
CHECK(!ec);
|
||||
@@ -64,10 +84,42 @@ void run() {
|
||||
CHECK(ls->at("items").is_array());
|
||||
}
|
||||
|
||||
// A not-yet-implemented method surfaces the daemon's error, not a transport error.
|
||||
auto add = c.call("download.add", {{"url", "https://example.com/x"}});
|
||||
CHECK(!add.has_value());
|
||||
if (!add) CHECK_EQ(add.error().code, -32603);
|
||||
// download.add outside every allowed root -> -32011, original saveDir echoed.
|
||||
auto bad = c.call("download.add",
|
||||
{{"url", "https://example.com/x"}, {"saveDir", "/etc"}});
|
||||
CHECK(!bad.has_value());
|
||||
if (!bad) {
|
||||
CHECK_EQ(bad.error().code, -32011);
|
||||
CHECK_EQ(bad.error().data.value("path", ""), std::string("/etc"));
|
||||
}
|
||||
|
||||
// download.add into an allowed root -> a task id that then shows up in the list.
|
||||
auto ok = c.call(
|
||||
"download.add",
|
||||
{{"url", "https://example.com/movie.mp4"}, {"saveDir", g_allowed_root}});
|
||||
CHECK(ok.has_value());
|
||||
std::string task_id;
|
||||
if (ok) {
|
||||
task_id = ok->value("taskId", "");
|
||||
CHECK(!task_id.empty());
|
||||
CHECK_EQ(ok->value("state", ""), std::string("queued"));
|
||||
}
|
||||
|
||||
auto ls2 = c.call("download.list", nlohmann::json::object());
|
||||
CHECK(ls2.has_value());
|
||||
if (ls2) {
|
||||
CHECK_EQ(ls2->value("total", -1), 1);
|
||||
CHECK_EQ(ls2->at("items").at(0).value("filename", ""), std::string("movie.mp4"));
|
||||
}
|
||||
|
||||
auto detail = c.call("download.get", {{"taskId", task_id}});
|
||||
CHECK(detail.has_value());
|
||||
if (detail) CHECK_EQ(detail->at("summary").value("taskId", ""), task_id);
|
||||
|
||||
auto missing =
|
||||
c.call("download.get", {{"taskId", "00000000-0000-4000-8000-000000000000"}});
|
||||
CHECK(!missing.has_value());
|
||||
if (!missing) CHECK_EQ(missing.error().code, -32010);
|
||||
}
|
||||
|
||||
loop.stop();
|
||||
|
||||
Reference in New Issue
Block a user