diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..b551c5b --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,26 @@ +name: Verify source release +on: [push, pull_request] +jobs: + verify: + runs-on: ubuntu-latest + container: ubuntu:26.04 + steps: + - uses: actions/checkout@v4 + - name: Install build and isolated-test dependencies + run: | + apt-get update + DEBIAN_FRONTEND=noninteractive apt-get install -y cmake ninja-build g++ pkg-config libpq-dev libcurl4-openssl-dev libssl-dev libxml2-dev nlohmann-json3-dev libcpp-httplib-dev python3 postgresql openssl nodejs + - name: Build and numerical checks + run: | + cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release + cmake --build build -j2 + ctest --test-dir build --output-on-failure + node --check frontend/app.js + node --check frontend/release.js + node --check frontend/gateway-session.js + node tests/gateway_session_test.mjs + - name: Private database and synthetic Gateway integration + run: | + useradd -m reachtest + chown -R reachtest:reachtest "$GITHUB_WORKSPACE" + runuser -u reachtest -- python3 scripts/test-isolated.py diff --git a/CMakeLists.txt b/CMakeLists.txt index c7a798c..c99b692 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,14 @@ find_package(nlohmann_json 3.11 REQUIRED) find_package(Threads REQUIRED) find_package(PkgConfig REQUIRED) pkg_check_modules(HTTPLIB REQUIRED IMPORTED_TARGET cpp-httplib>=0.18) -add_executable(reachterminal backend/main.cpp) +find_package(Python3 REQUIRED COMPONENTS Interpreter) +set(REACH_ASSET_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") +set(REACH_ASSETS frontend/index.html frontend/app.js frontend/release.js frontend/gateway-session.js frontend/style.css db/001_initial.sql) +add_custom_command(OUTPUT "${REACH_ASSET_DIR}/embedded_assets.cpp" "${REACH_ASSET_DIR}/embedded_assets.hpp" + COMMAND Python3::Interpreter "${CMAKE_CURRENT_SOURCE_DIR}/scripts/embed_assets.py" --root "${CMAKE_CURRENT_SOURCE_DIR}" --output "${REACH_ASSET_DIR}" + DEPENDS scripts/embed_assets.py ${REACH_ASSETS} VERBATIM) +add_executable(reachterminal backend/main.cpp "${REACH_ASSET_DIR}/embedded_assets.cpp") +target_include_directories(reachterminal PRIVATE "${REACH_ASSET_DIR}") target_compile_definitions(reachterminal PRIVATE REACH_ROOT="${CMAKE_SOURCE_DIR}") target_link_libraries(reachterminal PRIVATE PostgreSQL::PostgreSQL CURL::libcurl OpenSSL::Crypto LibXml2::LibXml2 nlohmann_json::nlohmann_json PkgConfig::HTTPLIB Threads::Threads) target_compile_options(reachterminal PRIVATE -Wall -Wextra -Wconversion) @@ -18,3 +25,6 @@ enable_testing() add_executable(core_tests tests/core_tests.cpp) target_link_libraries(core_tests PRIVATE nlohmann_json::nlohmann_json OpenSSL::Crypto LibXml2::LibXml2 CURL::libcurl) add_test(NAME core COMMAND core_tests) +add_executable(release_tests tests/release_tests.cpp) +target_link_libraries(release_tests PRIVATE nlohmann_json::nlohmann_json OpenSSL::Crypto LibXml2::LibXml2 CURL::libcurl) +add_test(NAME release COMMAND release_tests) diff --git a/README.md b/README.md index bf06c9d..b7978a8 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,13 @@ C++20 backend, PostgreSQL database. No broker order submission code. 第一版将基本面研究、策略核算、估值与风险放在同一个本地工作区。 软件不收取订阅费;第三方数据的费用、覆盖和使用权限仍由对应来源决定。 +## IBKR read-only data queries + +Client Portal Gateway connection settings, symbol/company search, contract details, +market snapshots and historical daily previews are available in Data Center. +Run `./scripts/gateway.sh`, sign in yourself, then use `./scripts/live.sh`. +See [IBKR setup, scope and verification](docs/ibkr.md). No generic API key is required. + ## Real public data Run `./scripts/live.sh` for the separate real-data workspace on **http://127.0.0.1:8788**. @@ -98,6 +105,7 @@ its connection only inside the launched process; another terminal must set it ex From the repository root, with the development database running: ```sh +export REACH_ENV=demo export REACH_DATABASE_URL="host='$PWD/.local/socket' port=55433 dbname=reachterminal" ./build/reachterminal export > /private/location/workspace.json ``` @@ -118,7 +126,7 @@ See [data contract](docs/data-contract.md) and [architecture](docs/architecture. **A working first release, not a replacement for a complete institutional data feed.** -- No TWS/Gateway live connection, real-time quote stream, broker margin engine, +- No TWS account stream, continuous real-time quote stream, broker margin engine, derivatives accounting, options Greeks, automatic global filings parser, full-text news feed or bundled global analyst-consensus history in this release. - SEC mapping covers an explicit US-GAAP/DEI subset, not custom tags, segments or IFRS @@ -141,14 +149,23 @@ See [data contract](docs/data-contract.md) and [architecture](docs/architecture. ```sh ctest --test-dir build --output-on-failure -python3 tests/integration.py --url http://127.0.0.1:8787 --root . +python3 scripts/test-isolated.py ``` -Run integration tests against a **fresh disposable database**; they intentionally import -synthetic records. See [verification](docs/verification.md) for measured coverage. +The isolated runner creates a fresh private PostgreSQL cluster, mock HTTPS Gateway and +configuration directory. Mutating tests refuse user/demo instances before any write. +Test runtimes cannot connect to real Gateway ports or external SEC/Alpha services. See [verification](docs/verification.md) for measured coverage. Financial changes need independently computed expected values and regression cases. Contributions for additional markets should include source terms, reproducible fixtures, unit/period mapping and missing-data behavior. Keep provider adapters separate from accounting. MIT applies to ReachTerminal code. Dependencies and external data retain their own licenses. See [third-party notices](docs/third-party.md) and [roadmap](docs/roadmap.md). + +## v0.1.0 扩展 + +新增衍生品假设对冲、IBKR 券商保证金监控、世界银行年度宏观和美联储官方新闻工作区。详见 [发布范围与验收](docs/release-0.1.0.md)。这些工作区保留数据来源和未知状态;欧式期权模型、券商保证金和现金股票账本各自计算。 + +## 本地内嵌发行版 + +前端和迁移 SQL 已内嵌到 C++ 可执行程序;不依赖运行目录里的前端资源。二进制打包与网关登录反馈见 [本地内嵌说明](docs/embedded-local.md)。 diff --git a/backend/core.hpp b/backend/core.hpp index 8c7e877..462c767 100644 --- a/backend/core.hpp +++ b/backend/core.hpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -96,9 +97,20 @@ inline void source(const json &v) { u.starts_with("demo:"), "Source URL must use http(s), manual: or demo:"); } +inline std::string retrieval_date(int64_t ms) { + require(ms > 0 && ms <= 4102444800000LL, "Invalid retrieval epoch"); + std::time_t t = ms / 1000; + std::tm tm{}; + require(gmtime_r(&t, &tm) != nullptr, "Invalid retrieval timestamp"); + std::ostringstream out; + out << std::put_time(&tm, "%Y-%m-%d"); + return out.str(); +} inline const std::vector collections = { - "instruments", "trades", "cashflows", "quotes", "fx", "facts", "bars", - "news", "notes", "reconciliations", "estimates", "raw_sources", "splits", "valuations"}; + "instruments", "trades", "cashflows", "quotes", "fx", + "facts", "bars", "news", "notes", "reconciliations", + "estimates", "raw_sources", "splits", "valuations", "macro_observations", + "hedge_models"}; inline json empty_data() { json j = json::object(); for (auto &k : collections) @@ -106,6 +118,7 @@ inline json empty_data() { return j; } inline json dcf(const json &v); +inline json hedge_book(const json &v); inline void validate(const std::string &kind, const json &v) { require(v.is_object(), "Record must be object"); id(str(v, "id")); @@ -243,6 +256,37 @@ inline void validate(const std::string &kind, const json &v) { source(v); date(str(v, "date")); require(v.contains("document"), "Raw document required"); + } else if (kind == "macro_observations") { + date(str(v, "date")); + date(str(v, "period_end")); + source(v); + require(str(v, "period_end") <= str(v, "date"), "Macro period is in future"); + require(std::regex_match(str(v, "country"), std::regex("[A-Z]{3}")), + "Invalid macro country"); + auto indicator = str(v, "indicator"); + require(indicator == "gdp" || indicator == "growth" || indicator == "inflation", + "Invalid macro indicator"); + require(str(v, "frequency") == "annual" && + str(v, "unit") == (indicator == "gdp" ? "current USD" : "percent"), + "Invalid macro unit/frequency"); + require(v.contains("known_at") && v["known_at"].is_null(), + "Historical release date unavailable"); + require(v.contains("retrieved_at_ms") && v["retrieved_at_ms"].is_number_integer() && + v["retrieved_at_ms"].get() > 0, + "Invalid macro retrieval timestamp"); + require(str(v, "date") == retrieval_date(v["retrieved_at_ms"].get()) && + str(v, "date") <= today(), + "Macro visibility must match actual retrieval date"); + require(v.contains("value") && + (v["value"].is_null() || + (v["value"].is_number() && std::isfinite(v["value"].get()) && + std::abs(v["value"].get()) <= 1e18)), + "Invalid macro value"); + } else if (kind == "hedge_models") { + date(str(v, "date")); + str(v, "title"); + require(v.at("result") == hedge_book(v.at("assumptions")), + "Hedge result differs from assumptions"); } else if (kind == "valuations") { id(str(v, "instrument")); date(str(v, "date")); @@ -783,3 +827,5 @@ inline json stress(const json &p, const json &input) { {"model", p["scenario_model"]}}; } } // namespace reach + +#include "derivatives.hpp" diff --git a/backend/derivatives.hpp b/backend/derivatives.hpp new file mode 100644 index 0000000..c3a602e --- /dev/null +++ b/backend/derivatives.hpp @@ -0,0 +1,133 @@ +#pragma once +#include "core.hpp" +namespace reach { +inline double model_number(const json &v, const char *k, double low, double high) { + require(v.contains(k) && v[k].is_number(), std::string("Required model number: ") + k); + double n = v[k]; + require(std::isfinite(n) && n >= low && n <= high, std::string("Model domain: ") + k); + return n; +} +inline double normal_cdf(double x) { + return .5 * std::erfc(-x / std::sqrt(2.)); +} +inline json european_option(const json &v) { + double s = model_number(v, "spot", .000001, 1e9), k = model_number(v, "strike", .000001, 1e9), + t = model_number(v, "years", 0, 20), r = model_number(v, "rate", -.5, 1), + q = model_number(v, "yield", -.5, 1), vol = model_number(v, "volatility", .0001, 5); + auto right = str(v, "right"); + require(right == "call" || right == "put", "European call/put only"); + require(v.value("style", std::string("European")) == "European", + "American/exotic option pricing not supported"); + if (t == 0) + return {{"price", std::max(0., right == "call" ? s - k : k - s)}, + {"delta", nullptr}, + {"gamma", nullptr}, + {"vega_1pp", nullptr}, + {"theta_day", nullptr}, + {"rho_1pp", nullptr}, + {"expired", true}}; + double rt = std::sqrt(t), d1 = (std::log(s / k) + (r - q + vol * vol / 2) * t) / (vol * rt), + d2 = d1 - vol * rt, dq = std::exp(-q * t), dr = std::exp(-r * t), + pdf = std::exp(-d1 * d1 / 2) / std::sqrt(2 * std::acos(-1.)), + common = -s * dq * pdf * vol / (2 * rt); + bool call = right == "call"; + double price = call ? s * dq * normal_cdf(d1) - k * dr * normal_cdf(d2) + : k * dr * normal_cdf(-d2) - s * dq * normal_cdf(-d1); + double theta = call ? common - r * k * dr * normal_cdf(d2) + q * s * dq * normal_cdf(d1) + : common + r * k * dr * normal_cdf(-d2) - q * s * dq * normal_cdf(-d1); + return {{"price", std::max(0., price)}, + {"delta", call ? dq * normal_cdf(d1) : dq * (normal_cdf(d1) - 1)}, + {"gamma", dq * pdf / (s * vol * rt)}, + {"vega_1pp", s * dq * pdf * rt * .01}, + {"theta_day", theta / 365.}, + {"rho_1pp", (call ? k * t * dr * normal_cdf(d2) : -k * t * dr * normal_cdf(-d2)) * .01}, + {"expired", false}}; +} +inline json hedge_book(const json &v) { + currency(str(v, "currency")); + require(v.contains("positions") && v["positions"].is_array() && !v["positions"].empty() && + v["positions"].size() <= 100, + "Hedge book needs 1-100 modeled positions"); + json rows = json::array(), groups = json::object(); + double value = 0, vega = 0, theta = 0; + std::set ids; + for (auto &p : v["positions"]) { + id(str(p, "id")); + require(ids.insert(str(p, "id")).second, "Duplicate hedge position ID"); + auto type = str(p, "type"), u = str(p, "underlying"); + id(u); + require(!p.contains("currency") || p["currency"] == v["currency"], + "Cross-currency hedge book prohibited"); + double s = model_number(p, "spot", .000001, 1e9), + qty = model_number(p, "quantity", -1e7, 1e7), + mult = model_number(p, "multiplier", .000001, 1e6); + require(qty != 0, "Zero hedge quantity"); + require(type == "STK" || type == "OPT" || type == "FUT", "Unsupported hedge asset"); + require(type != "STK" || mult == 1, "Stock multiplier must be one"); + json m = type == "OPT" ? european_option(p) + : json{{"price", s}, {"delta", 1.}, {"gamma", 0.}, + {"vega_1pp", 0.}, {"theta_day", 0.}, {"expired", false}}; + require(!m["expired"].get(), "Initial options must have positive time to expiry"); + double n = qty * mult, d = m["delta"].get() * n, g = m["gamma"].get() * n; + // Futures have zero funded market value at the scenario origin; P&L is price change. + double mv = type == "FUT" ? 0 : m["price"].get() * n; + value += mv; + vega += m["vega_1pp"].get() * n; + theta += m["theta_day"].get() * n; + if (!groups.contains(u)) + groups[u] = {{"delta_units", 0.}, {"delta_notional", 0.}, {"gamma_half_notional", 0.}}; + groups[u]["delta_units"] = groups[u]["delta_units"].get() + d; + groups[u]["delta_notional"] = groups[u]["delta_notional"].get() + d * s; + groups[u]["gamma_half_notional"] = + groups[u]["gamma_half_notional"].get() + .5 * g * s * s; + rows.push_back({{"id", p["id"]}, + {"type", type}, + {"underlying", u}, + {"unit_model", m}, + {"market_value", mv}, + {"delta_units", d}, + {"gamma_units", g}, + {"vega_1pp", m["vega_1pp"].get() * n}}); + } + auto shocks = v.value("scenario", json{{"spot", -.1}, {"volatility", .05}, {"days", 7}}); + double ds = model_number(shocks, "spot", -.99, 2), + dv = model_number(shocks, "volatility", -4.9, 4.9), + dd = model_number(shocks, "days", 0, 3650); + double pnl = 0; + json scenario_rows = json::array(); + for (size_t i = 0; i < v["positions"].size(); ++i) { + auto p = v["positions"][i]; + double n = p["quantity"].get() * p["multiplier"].get(), + s = p["spot"].get(); + double change = s * ds; + if (p["type"] == "OPT") { + p["spot"] = s * (1 + ds); + p["years"] = std::max(0., p["years"].get() - dd / 365.); + p["volatility"] = p["volatility"].get() + dv; + require(p["volatility"].get() >= .0001 && p["volatility"].get() <= 5, + "Scenario volatility outside model domain"); + auto repriced = european_option(p); + change = repriced["price"].get() - rows[i]["unit_model"]["price"].get(); + } + pnl += change * n; + scenario_rows.push_back({{"id", p["id"]}, {"pnl", change * n}}); + } + for (auto &[u, g] : groups.items()) + g["delta_neutral_stock_units"] = -g["delta_units"].get(); + require(std::isfinite(value) && std::isfinite(pnl) && std::isfinite(vega) && + std::isfinite(theta), + "Hedge model overflow"); + return {{"currency", v["currency"]}, + {"market_value", value}, + {"vega_1pp", vega}, + {"theta_day", theta}, + {"underlyings", groups}, + {"positions", rows}, + {"scenario_pnl", pnl}, + {"scenario_rows", scenario_rows}, + {"scenario", shocks}, + {"basis", "Modeled single-currency hedge book; European Black-Scholes continuous " + "yield; futures are linear contract-price shocks with no basis/carry model. " + "Not a trade ledger, margin rule, or executable recommendation."}}; +} +} // namespace reach diff --git a/backend/environment.hpp b/backend/environment.hpp new file mode 100644 index 0000000..af3cab8 --- /dev/null +++ b/backend/environment.hpp @@ -0,0 +1,30 @@ +#pragma once +#include "core.hpp" +namespace reach { +inline void workspace_environment(const std::string &mode, const std::string &database) { + require(mode == "user" || mode == "test" || mode == "demo", "Invalid REACH_ENV"); + require(mode != "demo" || database == "reachterminal" || + database.starts_with("reachterminal_demo_"), + "Demo runtime requires a demo database"); + require(mode != "user" || (database != "reachterminal" && !database.starts_with("reachterminal_demo_")), + "User runtime cannot use the default demo database"); + require((mode == "test") == database.starts_with("reachterminal_test_"), + "Test runtime requires a dedicated reachterminal_test_* database; user/demo cannot use " + "test databases"); +} +inline void gateway_environment(const std::string &mode, int port) { + require(mode == "user" || mode == "test", "Gateway disabled in demo workspace"); + require(mode == "test" ? port == 5001 : port != 5001, + "Mock Gateway is reserved on localhost:5001; real and test Gateways cannot be mixed"); +} +inline void user_batch(const std::string &mode, const json &batch) { + if (mode != "user") + return; + for (auto it = batch.begin(); it != batch.end(); ++it) + if (it.value().is_array()) + for (auto &r : it.value()) + require(r.value("source", std::string()) != "Synthetic demo" && + !r.value("id", std::string()).starts_with("demo:"), + "Synthetic demo data prohibited in user workspace"); +} +} // namespace reach diff --git a/backend/ibkr.hpp b/backend/ibkr.hpp new file mode 100644 index 0000000..5b886bd --- /dev/null +++ b/backend/ibkr.hpp @@ -0,0 +1,490 @@ +#pragma once +#include "environment.hpp" +#include "imports.hpp" +#include "margin.hpp" +#include +#include +#include +#include +#include + +namespace reach { +inline std::string ibkr_conid(const json &v) { + auto s = v.is_string() ? v.get() : v.is_number_integer() ? v.dump() : ""; + require(std::regex_match(s, std::regex("[1-9][0-9]{0,11}")), "Invalid IBKR conid"); + return s; +} +inline json ibkr_settings(const json &v) { + require(v.is_object(), "Settings must be object"); + for (auto it = v.begin(); it != v.end(); ++it) + require(it.key() == "port" || it.key() == "ca_pem", + "Only port and certificate are accepted; Gateway uses browser login, not API keys"); + require(v.contains("port") && v["port"].is_number_integer(), "Gateway port required"); + int port = v["port"].get(); + require(port >= 1024 && port <= 65535, "Invalid Gateway port"); + auto pem = v.value("ca_pem", std::string()); + require(pem.size() <= 65536 && + (pem.empty() || (pem.starts_with("-----BEGIN CERTIFICATE-----") && + pem.find("PRIVATE KEY") == std::string::npos)), + "Paste public CA certificate PEM only"); + return {{"port", port}, {"ca_pem", pem}}; +} +inline json ibkr_search_rows(const json &raw) { + require(raw.is_array() && raw.size() <= 1000, "Unexpected IBKR search response"); + json rows = json::array(); + for (auto &v : raw) { + if (!v.is_object() || !v.contains("conid")) + continue; + if ((v["conid"] == "-1" || v["conid"] == -1) && v.value("secType", std::string()) == "BOND") + continue; // Issuer group, not an addressable contract. + json r = {{"conid", ibkr_conid(v["conid"])}}; + for (auto k : {"symbol", "companyName", "companyHeader", "description", "secType"}) + if (v.contains(k) && v[k].is_string()) + r[k] = v[k]; + r["sections"] = json::array(); + if (v.contains("sections") && v["sections"].is_array()) + for (auto &s : v["sections"]) + if (s.is_object() && s.contains("secType") && s["secType"].is_string()) + r["sections"].push_back(s["secType"]); + rows.push_back(r); + } + return rows; +} +inline json ibkr_snapshot(const json &raw, const std::string &conid) { + require(raw.is_array(), "Unexpected IBKR snapshot response"); + const std::map fields = {{"31", "最新成交价"}, + {"84", "买价"}, + {"86", "卖价"}, + {"82", "价格变动"}, + {"83", "变动百分比"}, + {"7293", "52周最高价"}, + {"7294", "52周最低价"}, + {"7282", "90日平均成交量"}, + {"7087", "30日历史波动率 · %"}, + {"7671", "未来12月预期每股股息"}, + {"7672", "过去12月股息字段(供应商口径)"}}; + json out = {{"conid", conid}, + {"availability", "unknown"}, + {"updated_ms", nullptr}, + {"fields", json::array()}, + {"pending", true}}; + for (auto &v : raw) { + if (!v.is_object() || !v.contains("conid") || ibkr_conid(v["conid"]) != conid) + continue; + std::string a = v.value("6509", std::string()); + const std::map types = { + {'R', "实时"}, {'D', "延迟"}, {'Z', "冻结"}, {'Y', "延迟冻结"}, + {'N', "未订阅"}, {'i', "不完整"}, {'v', "VDR exempt"}}; + if (!a.empty() && types.contains(a[0])) + out["availability"] = types.at(a[0]); + if (v.contains("_updated") && v["_updated"].is_number_integer()) + out["updated_ms"] = v["_updated"]; + for (auto &[key, label] : fields) { + json value = nullptr; + if (v.contains(key) && (v[key].is_string() || v[key].is_number())) + value = v[key]; + out["fields"].push_back({{"id", key}, {"label", label}, {"value", value}}); + if (!value.is_null()) + out["pending"] = false; + } + break; + } + return out; +} +inline std::string ibkr_device_id() { + std::ifstream f("/etc/machine-id"); + std::string machine; + std::getline(f, machine); + require(std::regex_match(machine, std::regex("[0-9a-fA-F]{32}")), + "Local machine identity unavailable; IBKR connection disabled"); + return hash("ReachTerminal/IBKR/device/v1:" + machine); +} +inline json ibkr_bound_settings(const json &stored, const std::string &device) { + require(stored.is_object() && stored.value("device_id", std::string()) == device, + "IBKR settings belong to another device; configure and log in on this device"); + auto v = stored; + v.erase("device_id"); + return ibkr_settings(v); +} +inline std::string ibkr_http_error(const std::string &path, long status, const std::string &body) { + auto endpoint = path.substr(0, path.find('?')); + endpoint = std::regex_replace(endpoint, std::regex("/portfolio/[^/]+/summary"), + "/portfolio/{account}/summary"); + endpoint = std::regex_replace(endpoint, std::regex("/iserver/contract/[^/]+/info"), + "/iserver/contract/{conid}/info"); + std::string reason = "请核对请求参数、数据权限和网关状态"; + auto lower = body; + std::transform(lower.begin(), lower.end(), lower.begin(), + [](unsigned char c) { return static_cast(std::tolower(c)); }); + if (status == 401 || status == 403 || lower.find("not authenticated") != std::string::npos || + lower.find("no bridge") != std::string::npos || + lower.find("init session") != std::string::npos) + reason = "行情会话尚未就绪或已失效;账户网页登录可仍有效。请连接行情会话,等认证完成后再准" + "备行情"; + else if (lower.find("competing") != std::string::npos) + reason = "存在其他行情会话,请在 IBKR 核对其他设备或 TWS 登录"; + else if (status == 400 && endpoint == "/iserver/accounts") + reason = "行情会话可能仍在初始化。请等待登录状态更新为已认证后,再准备行情"; + else if (status == 400 && endpoint == "/iserver/auth/ssodh/init") + reason = "网关未接受行情认证请求。请核对官方网关页面,完成登录和双重验证后重新连接"; + else if (status == 429) + reason = "IBKR 请求频率超限,请稍后重试"; + return "IBKR " + endpoint + "(HTTP " + std::to_string(status) + "):" + reason; +} +class Ibkr { + json config = {{"port", 5000}, {"ca_pem", ""}}; + std::string file, device, mode; + bool configured = false; + std::unique_ptr handle{nullptr, curl_easy_cleanup}; + std::chrono::steady_clock::time_point last{}; + bool prepared = false, market_accounts_ready = false; + std::chrono::steady_clock::time_point last_bootstrap{}; + std::chrono::steady_clock::time_point market_init_until{}; + json sso_valid = nullptr; + std::string sso_error; + int64_t sso_checked = 0; + std::chrono::steady_clock::time_point last_sso{}; + json account_cache = json::object(); + std::map margin_times; + void reset() { + market_init_until = {}; + market_accounts_ready = false; + last_bootstrap = {}; + sso_valid = nullptr; + sso_error.clear(); + sso_checked = 0; + prepared = false; + account_cache = json::object(); + margin_times.clear(); + handle.reset(curl_easy_init()); + require(bool(handle), "curl init failed"); + curl_easy_setopt(handle.get(), CURLOPT_COOKIEFILE, ""); + } + + public: + explicit Ibkr(const std::string &root, const std::string &runtime = "user") + : device(ibkr_device_id()), mode(runtime) { + file = root + (mode == "user" ? "/.local/devices/" : "/.local/" + mode + "/devices/") + + device + "/ibkr.json"; + if (std::filesystem::exists(file)) { + std::ifstream f(file); + config = ibkr_bound_settings(json::parse(f), device); + configured = true; + } + reset(); + } + json accounts() { + auto raw = request("/portfolio/accounts"); + require(raw.is_array() && raw.size() <= 100, "Invalid account list"); + account_cache = json::object(); + json rows = json::array(); + for (auto &r : raw) { + auto a = r.value("accountId", r.value("id", std::string())); + require(std::regex_match(a, std::regex("[A-Za-z0-9_-]{1,40}")), + "Invalid broker account ID"); + json row = {{"id", a}, + {"currency", r.value("currency", json(nullptr))}, + {"tradingType", r.value("tradingType", json(nullptr))}}; + account_cache[a] = row; + rows.push_back(row); + } + return rows; + } + json margin(const std::string &a) { + require(account_cache.contains(a), + "Load this device's account list before querying margin"); + auto now = std::chrono::steady_clock::now(); + require(!margin_times.contains(a) || now - margin_times[a] > std::chrono::seconds(10), + "Margin refresh interval is ten seconds"); + margin_times[a] = now; + auto raw = request("/portfolio/" + a + "/summary"); + auto result = broker_margin(raw, a, epoch_ms()); + result["account_info"] = account_cache[a]; + return result; + } + json settings() const { + return {{"device", device.substr(0, 12)}, + {"configured", configured}, + {"environment", mode}, + {"login_url", + mode == "user" + ? json("https://localhost:" + std::to_string(config["port"].get()) + "/") + : json(nullptr)}, + {"scope", mode == "test" ? "test-device-only" : "this-device-only"}, + {"port", config["port"]}, + {"base_url", + "https://localhost:" + std::to_string(config["port"].get()) + "/v1/api"}, + {"custom_ca", !config["ca_pem"].get().empty()}, + {"authentication", "Client Portal Gateway browser login"}}; + } + void save(const json &v) { + auto next = ibkr_settings(v); + gateway_environment(mode, next["port"].get()); + std::filesystem::create_directories(std::filesystem::path(file).parent_path()); + auto temp = file + ".tmp"; + { + std::ofstream f(temp); + require(bool(f), "Cannot save Gateway settings"); + auto stored = next; + stored["device_id"] = device; + f << stored.dump(); + f.flush(); + require(bool(f), "Cannot write Gateway settings"); + } + require(chmod(temp.c_str(), 0600) == 0, "Cannot protect settings"); + std::filesystem::rename(temp, file); + config = next; + configured = true; + prepared = false; + reset(); + } + json request(const std::string &path, bool post = false) { + require(configured, + "IBKR is not configured on this device; configure a local Gateway and log in here"); + gateway_environment(mode, config["port"].get()); + if (path.starts_with("/portfolio/") && path.ends_with("/summary")) { + auto account = path.substr(11, path.size() - 11 - 8); + require(account_cache.contains(account), + "Margin endpoint requires discovered local account"); + } + // This adapter is deliberately not a general-purpose broker proxy. + require( + (post && (path == "/iserver/auth/status" || path == "/iserver/auth/ssodh/init" || + path == "/logout")) || + (!post && + (path == "/iserver/accounts" || path == "/portfolio/accounts" || + path == "/sso/validate" || + std::regex_match(path, std::regex("/portfolio/[A-Za-z0-9_-]{1,40}/summary")) || + path.starts_with("/iserver/secdef/search?symbol=") || + std::regex_match(path, std::regex("/iserver/contract/[1-9][0-9]{0,11}/info")) || + path.starts_with("/iserver/marketdata/snapshot?conids=") || + path.starts_with("/iserver/marketdata/history?conid="))), + "IBKR endpoint prohibited"); + require(std::chrono::steady_clock::now() - last > std::chrono::milliseconds(250), + "IBKR pacing: wait briefly before retrying"); + last = std::chrono::steady_clock::now(); + std::string url = "https://localhost:" + std::to_string(config["port"].get()) + + "/v1/api" + path, + body; + auto c = handle.get(); + curl_easy_setopt(c, CURLOPT_URL, url.c_str()); + curl_easy_setopt(c, CURLOPT_PROXY, ""); + auto resolveText = "localhost:" + std::to_string(config["port"].get()) + ":127.0.0.1"; + auto resolve = std::unique_ptr( + curl_slist_append(nullptr, resolveText.c_str()), curl_slist_free_all); + require(bool(resolve), "Cannot pin loopback address"); + curl_easy_setopt(c, CURLOPT_RESOLVE, resolve.get()); + curl_easy_setopt(c, CURLOPT_PROTOCOLS_STR, "https"); + curl_easy_setopt(c, CURLOPT_FOLLOWLOCATION, 0L); + curl_easy_setopt(c, CURLOPT_SSL_VERIFYPEER, 1L); + curl_easy_setopt(c, CURLOPT_SSL_VERIFYHOST, 2L); + std::string pem = config["ca_pem"]; + curl_blob ca = {pem.data(), pem.size(), CURL_BLOB_COPY}; + curl_easy_setopt(c, CURLOPT_CAINFO_BLOB, pem.empty() ? nullptr : &ca); + curl_easy_setopt(c, CURLOPT_CONNECTTIMEOUT, 3L); + curl_easy_setopt(c, CURLOPT_TIMEOUT, 15L); + curl_easy_setopt(c, CURLOPT_USERAGENT, "ReachTerminal/IBKR-read-only"); + curl_easy_setopt(c, CURLOPT_POST, post ? 1L : 0L); + if (post) { + const char *payload = + path == "/iserver/auth/ssodh/init" ? "{\"publish\":true,\"compete\":false}" : ""; + curl_easy_setopt(c, CURLOPT_POSTFIELDS, payload); + curl_easy_setopt(c, CURLOPT_POSTFIELDSIZE, static_cast(std::strlen(payload))); + } else + curl_easy_setopt(c, CURLOPT_HTTPGET, 1L); + curl_easy_setopt( + c, CURLOPT_WRITEFUNCTION, +[](char *p, size_t a, size_t b, void *u) -> size_t { + auto &s = *static_cast(u); + if (b && a > (2 * 1024 * 1024 - s.size()) / b) + return 0; + s.append(p, a * b); + return a * b; + }); + curl_easy_setopt(c, CURLOPT_WRITEDATA, &body); + auto headers = std::unique_ptr( + path == "/iserver/auth/ssodh/init" + ? curl_slist_append(nullptr, "Content-Type: application/json") + : nullptr, + curl_slist_free_all); + curl_easy_setopt(c, CURLOPT_HTTPHEADER, headers.get()); + auto code = curl_easy_perform(c); + curl_easy_setopt(c, CURLOPT_HTTPHEADER, nullptr); + curl_easy_setopt(c, CURLOPT_RESOLVE, nullptr); + long status = 0; + curl_easy_getinfo(c, CURLINFO_RESPONSE_CODE, &status); + require(code != CURLE_PEER_FAILED_VERIFICATION, + "Gateway certificate is not trusted; configure its public CA certificate with " + "localhost SAN"); + require(code == CURLE_OK, + "Gateway unavailable; start Client Portal Gateway and check port/certificate"); + if (status == 401 || status == 403) { + prepared = false; + account_cache = json::object(); + margin_times.clear(); + } + require(status >= 200 && status < 300, ibkr_http_error(path, status, body)); + auto raw = json::parse(body); + require(!raw.is_object() || !raw.contains("error"), + "IBKR returned an error or data entitlement is missing"); + return raw; + } + bool bootstrap_market() { + market_accounts_ready = false; + last_bootstrap = std::chrono::steady_clock::now(); + auto raw = request("/iserver/accounts"); + market_accounts_ready = raw.is_object() && raw.contains("accounts") && + raw["accounts"].is_array() && !raw["accounts"].empty(); + return market_accounts_ready; + } + void prepare() { + prepared = false; + require(bootstrap_market(), + "行情尚未就绪:网关没有返回可用的行情账户;请等待认证完成后重试"); + prepared = true; + } + json snapshot(const std::string &conid) { + ibkr_conid(conid); + require(prepared, "Click prepare market data first"); + return ibkr_snapshot(request("/iserver/marketdata/snapshot?conids=" + conid + + "&fields=31,84,86,82,83,6509,7293,7294,7282,7087,7671,7672"), + conid); + } + json history(const std::string &conid) { + ibkr_conid(conid); + auto raw = request("/iserver/marketdata/history?conid=" + conid + + "&period=1m&bar=1d&outsideRth=false"); + require(raw.is_object() && raw.contains("data") && raw["data"].is_array() && + raw["data"].size() <= 1000, + "Invalid historical response"); + require(raw.value("barLength", 0) == 86400, "IBKR did not return daily bars"); + json out = {{"conid", conid}, + {"symbol", raw.value("symbol", std::string())}, + {"bar_seconds", 86400}, + {"bars", json::array()}, + {"availability", raw.value("mdAvailability", std::string("unknown"))}}; + for (auto &v : raw["data"]) { + require(v.is_object() && v.contains("t") && v["t"].is_number_integer(), + "Invalid historical timestamp"); + json row = {{"timestamp", v["t"]}}; + for (auto k : {"o", "h", "l", "c", "v"}) { + require(v.contains(k) && v[k].is_number(), "Missing history value"); + row[k] = v[k]; + } + require(row["l"].get() <= + std::min(row["o"].get(), row["c"].get()) && + row["h"].get() >= + std::max(row["o"].get(), row["c"].get()) && + row["l"].get() > 0 && row["v"].get() >= 0, + "Invalid historical OHLCV"); + out["bars"].push_back(row); + } + return out; + } + json logout() { + try { + auto raw = request("/logout", true); + require(raw.is_object() && raw.value("status", false), + "Gateway did not confirm logout; remote session state unknown"); + } catch (...) { + prepared = false; + reset(); + throw; + } + prepared = false; + reset(); + return {{"logged_out", true}}; + } + json status() { + auto raw = request("/iserver/auth/status", true); + if (!raw.value("authenticated", false)) + prepared = false; + return {{"authenticated", raw.value("authenticated", false)}, + {"connected", raw.value("connected", false)}, + {"competing", raw.value("competing", false)}}; + } + json connect_market() { + prepared = false; + auto raw = request("/iserver/auth/ssodh/init", true); + market_init_until = std::chrono::steady_clock::now() + std::chrono::minutes(3); + std::this_thread::sleep_for(std::chrono::seconds(2)); + // Gateway completes the brokerage handshake through the account bootstrap. + try { + bootstrap_market(); + } catch (const std::exception &) { + market_accounts_ready = false; + } + std::this_thread::sleep_for(std::chrono::milliseconds(260)); + require(raw.is_object(), "Invalid market session response"); + return {{"requested", true}, + {"authenticated", raw.value("authenticated", false)}, + {"competing", raw.value("competing", false)}}; + } + json connection() { + auto out = status(); + auto now = std::chrono::steady_clock::now(); + bool initiating = now < market_init_until; + if (initiating && !out["competing"].get() && + (!out["authenticated"].get() || !market_accounts_ready) && + now - last_bootstrap >= std::chrono::seconds(5)) { + std::this_thread::sleep_for(std::chrono::milliseconds(260)); + try { + bootstrap_market(); + } catch (const std::exception &) { + market_accounts_ready = false; + } + std::this_thread::sleep_for(std::chrono::milliseconds(260)); + out = status(); + } + out["market_ready"] = out["authenticated"].get() && out["connected"].get() && + (!initiating || market_accounts_ready); + out["initializing"] = + initiating && !out["market_ready"].get() && !out["competing"].get(); + if (now - last_sso >= std::chrono::seconds(60)) { + last_sso = now; + sso_checked = epoch_ms(); + sso_valid = nullptr; + sso_error.clear(); + std::this_thread::sleep_for(std::chrono::milliseconds(260)); + try { + auto raw = request("/sso/validate"); + require(raw.is_object() && raw.contains("RESULT") && raw["RESULT"].is_boolean(), + "Invalid SSO validation response"); + sso_valid = raw["RESULT"]; + if (sso_valid == false) + account_cache = json::object(); + } catch (const std::exception &e) { + sso_error = e.what(); + } + } + out["sso_valid"] = sso_valid; + out["sso_error"] = sso_error; + out["sso_checked_at_ms"] = sso_checked ? json(sso_checked) : json(nullptr); + out["checked_at_ms"] = epoch_ms(); + out["sso_min_interval_seconds"] = 60; + return out; + } + json search(const std::string &q, bool name) { + require(!q.empty() && q.size() <= 80, "Search needs 1-80 characters"); + auto encoded = curl_easy_escape(handle.get(), q.c_str(), static_cast(q.size())); + require(encoded, "Cannot encode query"); + std::string query(encoded); + curl_free(encoded); + return ibkr_search_rows(request("/iserver/secdef/search?symbol=" + query + + "&name=" + (name ? "true" : "false"))); + } + json detail(const std::string &conid) { + ibkr_conid(conid); + auto raw = request("/iserver/contract/" + conid + "/info"); + require(raw.is_object(), "Invalid contract details"); + auto actual = raw.contains("conid") ? raw["conid"] : raw.value("con_id", json(nullptr)); + require(ibkr_conid(actual) == conid, "IBKR contract identity mismatch"); + json out = {{"conid", conid}}; + for (auto k : {"symbol", "ticker", "companyName", "company_name", "secType", + "instrument_type", "currency", "exchange", "listingExchange", "industry", + "category", "validExchanges", "valid_exchanges"}) + if (raw.contains(k) && (raw[k].is_string() || raw[k].is_null())) + out[k] = raw[k]; + return out; + } +}; +} // namespace reach diff --git a/backend/main.cpp b/backend/main.cpp index 50aa584..b19a33b 100644 --- a/backend/main.cpp +++ b/backend/main.cpp @@ -1,6 +1,9 @@ #include "core.hpp" +#include "environment.hpp" +#include "ibkr.hpp" #include "imports.hpp" #include "market.hpp" +#include "public_data.hpp" #include "store.hpp" #include #include @@ -98,9 +101,15 @@ int main(int argc, char **argv) { try { curl_global_init(CURL_GLOBAL_DEFAULT); std::string root = env("REACH_ROOT", REACH_ROOT), - dsn = env("REACH_DATABASE_URL", "dbname=reachterminal"); + dsn = env("REACH_DATABASE_URL", "dbname=reachterminal_live"); Store store(dsn); + auto mode = env("REACH_ENV", "user"); + workspace_environment(mode, store.database_name()); store.migrate(root); + auto import_batch = [&](const json &batch) { + user_batch(mode, batch); + return store.import(batch); + }; std::string command = argc > 1 ? argv[1] : "serve"; if (command == "init") { std::cout << "Database ready\n"; @@ -118,7 +127,7 @@ int main(int argc, char **argv) { batch = sec_import(json::parse(body), argv[3]); } else batch = json::parse(body); - std::cout << store.import(batch).dump(2) << '\n'; + std::cout << import_batch(batch).dump(2) << '\n'; return 0; } if (command == "export") { @@ -196,10 +205,16 @@ int main(int argc, char **argv) { return d; }; route("/api/session", false, [&](const auto &) { - return json{{"token", token}, {"version", "0.1.0"}, {"mode", "local-read-only-broker"}}; + return json{{"token", token}, + {"version", "0.1.0"}, + {"mode", "local-read-only-broker"}, + {"environment", mode}}; }); route("/api/health", false, [&](const auto &) { - return json{{"ok", true}, {"database", "PostgreSQL"}, {"trading_enabled", false}}; + return json{{"ok", true}, + {"database", "PostgreSQL"}, + {"environment", mode}, + {"trading_enabled", false}}; }); route("/api/instruments", false, [&](const auto &) { return store.load()["instruments"]; }); route("/api/portfolio", false, @@ -238,7 +253,8 @@ int main(int argc, char **argv) { if (r.value("source", "") == "Synthetic demo") demo = true; } - return json{{"counts", counts}, + return json{{"environment", mode}, + {"counts", counts}, {"demo_present", demo}, {"imports", store.runs()}, {"consensus", "User-supplied licensed records only; no " @@ -247,23 +263,25 @@ int main(int argc, char **argv) { }); route("/api/export", false, [&](const auto &) { return store.load(); }); route("/api/import", true, - [&](const auto &req) { return store.import(json::parse(req.body)); }); + [&](const auto &req) { return import_batch(json::parse(req.body)); }); route("/api/demo", true, [&](const auto &) { + require(mode != "user", "Demo import disabled in user workspace"); auto data = store.load(); for (auto &k : collections) require(data[k].empty(), "Demo can only load into an empty database; keep real and " "synthetic data separate"); - return store.import(json::parse(read_file(root + "/examples/demo.json"))); + return import_batch(json::parse(read_file(root + "/examples/demo.json"))); }); route("/api/import/flex", true, - [&](const auto &req) { return store.import(flex_import(req.body)); }); + [&](const auto &req) { return import_batch(flex_import(req.body)); }); route("/api/import/sec", true, [&](const auto &req) { require(req.has_param("instrument"), "Instrument required"); - return store.import( + return import_batch( sec_import(json::parse(req.body), req.get_param_value("instrument"))); }); std::chrono::steady_clock::time_point lastfetch{}; route("/api/sec/fetch", true, [&](const auto &req) { + require(mode == "user", "External SEC requests disabled outside user workspace"); auto v = json::parse(req.body); require(std::chrono::steady_clock::now() - lastfetch > std::chrono::seconds(2), "Wait two seconds between SEC fetches"); @@ -277,7 +295,7 @@ int main(int argc, char **argv) { } require(bound, "Registered SEC CIK must match requested CIK"); auto raw = json::parse(fetch_sec(str(v, "cik"), env("REACH_SEC_USER_AGENT"))); - return store.import(sec_import(raw, str(v, "instrument"))); + return import_batch(sec_import(raw, str(v, "instrument"))); }); route("/api/providers", false, [&](const auto &) { return json{{"sec_configured", !env("REACH_SEC_USER_AGENT").empty()}, @@ -287,6 +305,7 @@ int main(int argc, char **argv) { }); std::chrono::steady_clock::time_point last_daily{}; route("/api/market/daily", true, [&](const auto &req) { + require(mode == "user", "External daily requests disabled outside user workspace"); auto v = json::parse(req.body); auto data = store.load(); for (auto &r : data["instruments"]) @@ -304,10 +323,81 @@ int main(int argc, char **argv) { auto raw = json::parse( fetch_alpha_daily(str(ins, "symbol"), env("REACH_ALPHA_API_KEY", "demo"))); auto batch = alpha_daily_import(raw, ins); - auto result = store.import(batch); + auto result = import_batch(batch); result["latest"] = batch["raw_sources"][0]["date"]; return result; }); + Ibkr ibkr(root, mode); + route("/api/ibkr/settings", false, [&](const auto &) { return ibkr.settings(); }); + route("/api/ibkr/settings", true, [&](const auto &req) { + ibkr.save(json::parse(req.body)); + return ibkr.settings(); + }); + route("/api/ibkr/accounts", true, [&](const auto &) { return ibkr.accounts(); }); + route("/api/ibkr/margin", true, + [&](const auto &req) { return ibkr.margin(str(json::parse(req.body), "account")); }); + route("/api/ibkr/logout", true, [&](const auto &) { return ibkr.logout(); }); + route("/api/ibkr/connect-market", true, + [&](const auto &) { return ibkr.connect_market(); }); + route("/api/ibkr/connection", true, [&](const auto &) { return ibkr.connection(); }); + route("/api/ibkr/status", true, [&](const auto &) { return ibkr.status(); }); + route("/api/ibkr/prepare", true, [&](const auto &) { + ibkr.prepare(); + return json{{"ok", true}}; + }); + route("/api/ibkr/search", true, [&](const auto &req) { + auto v = json::parse(req.body); + return ibkr.search(str(v, "query"), v.value("by_name", false)); + }); + route("/api/ibkr/detail", true, [&](const auto &req) { + return ibkr.detail(ibkr_conid(json::parse(req.body).at("conid"))); + }); + route("/api/ibkr/snapshot", true, [&](const auto &req) { + return ibkr.snapshot(ibkr_conid(json::parse(req.body).at("conid"))); + }); + route("/api/ibkr/history", true, [&](const auto &req) { + return ibkr.history(ibkr_conid(json::parse(req.body).at("conid"))); + }); + route("/api/hedge/analyze", true, + [&](const auto &req) { return hedge_book(json::parse(req.body)); }); + route("/api/hedge/models", false, [&](const auto &req) { + json rows = json::array(); + auto data = store.load(); + for (auto &v : data["hedge_models"]) + if (str(v, "date") <= asof(req)) + rows.push_back(v); + return rows; + }); + route("/api/hedge/models", true, [&](const auto &req) { + auto v = json::parse(req.body); + v["result"] = hedge_book(v.at("assumptions")); + v["id"] = "hedge-" + hash(v.dump() + std::to_string(epoch_ms())); + return import_batch(json{{"hedge_models", json::array({v})}}); + }); + route("/api/macro", false, + [&](const auto &req) { return macro_view(store.load(), asof(req)); }); + auto last_public = std::chrono::steady_clock::time_point{}; + auto public_pacing = [&]() { + auto now = std::chrono::steady_clock::now(); + require(now - last_public > std::chrono::seconds(2), + "Public source pacing: wait two seconds"); + last_public = now; + }; + route("/api/macro/fetch", true, [&](const auto &req) { + auto v = json::parse(req.body); + auto c = str(v, "country"), i = str(v, "indicator"); + auto url = worldbank_url(c, i); + require(mode == "user", "Public fetch disabled outside user workspace"); + public_pacing(); + auto raw = json::parse(public_fetch(mode, url)); + return import_batch(worldbank_import(raw, c, i, epoch_ms())); + }); + route("/api/news/fetch", true, [&](const auto &) { + require(mode == "user", "Public fetch disabled outside user workspace"); + public_pacing(); + return import_batch(fed_news_import( + public_fetch(mode, "https://www.federalreserve.gov/feeds/press_all.xml"))); + }); route("/api/dcf", true, [&](const auto &req) { return dcf(json::parse(req.body)); }); route("/api/stress", true, [&](const auto &req) { auto v = json::parse(req.body); @@ -319,7 +409,7 @@ int main(int argc, char **argv) { "note-" + hash(v.dump() + std::to_string(std::chrono::system_clock::now().time_since_epoch().count())); - return store.import(json{{"notes", json::array({v})}}); + return import_batch(json{{"notes", json::array({v})}}); }); route("/api/valuations", true, [&](const auto &req) { auto v = json::parse(req.body); @@ -329,9 +419,14 @@ int main(int argc, char **argv) { "valuation-" + hash(v.dump() + std::to_string(std::chrono::system_clock::now().time_since_epoch().count())); - return store.import(json{{"valuations", json::array({v})}}); + return import_batch(json{{"valuations", json::array({v})}}); }); - require(server.set_mount_point("/", root + "/frontend"), "Frontend directory missing"); + for (auto path : + {"/", "/index.html", "/app.js", "/release.js", "/gateway-session.js", "/style.css"}) + server.Get(path, [path](const httplib::Request &, httplib::Response &res) { + auto asset = assets::find(path); + res.set_content(asset->body.data(), asset->body.size(), std::string(asset->mime)); + }); std::cout << "ReachTerminal 0.1.0 · http://127.0.0.1:" << port << " · PostgreSQL · no broker order endpoints" << std::endl; require(server.listen("127.0.0.1", std::stoi(port)), "Cannot bind local port"); diff --git a/backend/margin.hpp b/backend/margin.hpp new file mode 100644 index 0000000..633f9f6 --- /dev/null +++ b/backend/margin.hpp @@ -0,0 +1,63 @@ +#pragma once +#include "public_data.hpp" +namespace reach { +inline json broker_margin(const json &raw, const std::string &account, int64_t fetched) { + require(raw.is_object(), "Invalid broker summary"); + json rows = json::array(); + std::map values; + const std::map keys = { + {"netliquidation", "净清算值"}, {"initmarginreq", "初始保证金"}, + {"maintmarginreq", "维持保证金"}, {"excessliquidity", "剩余流动性"}, + {"availablefunds", "可用资金"}, {"buyingpower", "购买力"}, + {"equitywithloanvalue", "含借贷权益"}, {"lookaheadexcessliquidity", "前瞻剩余流动性"}}; + for (auto &[key, label] : keys) { + json row = {{"key", key}, + {"label", label}, + {"value", nullptr}, + {"currency", nullptr}, + {"broker_timestamp", nullptr}, + {"stale", true}}; + if (raw.contains(key) && raw[key].is_object()) { + auto &r = raw[key]; + if (r.contains("isNull") && r["isNull"] == false && r.contains("amount") && + r["amount"].is_number() && std::isfinite(r["amount"].get())) + row["value"] = r["amount"]; + if (r.contains("currency") && r["currency"].is_string() && + std::regex_match(r["currency"].get(), std::regex("[A-Z]{3}"))) + row["currency"] = r["currency"]; + if (r.contains("timestamp") && r["timestamp"].is_number_integer()) { + auto t = r["timestamp"].get(); + row["broker_timestamp"] = t; + row["stale"] = t <= 0 || t > fetched + 60000 || fetched - t > 120000; + } + } + rows.push_back(row); + values[key] = row; + } + std::string status = "unknown"; + json ratio = nullptr; + auto &e = values["excessliquidity"]; + auto &n = values["netliquidation"]; + if (!e["value"].is_null() && !e["currency"].is_null() && !e["stale"].get()) { + status = e["value"].get() <= 0 ? "critical" : "reported"; + if (!n["value"].is_null() && n["value"].get() > 0 && !n["stale"].get() && + n["currency"] == e["currency"] && + std::abs(n["broker_timestamp"].get() - e["broker_timestamp"].get()) <= + 60000) { + ratio = e["value"].get() / n["value"].get(); + if (status != "critical" && ratio.get() < .1) + status = "low-buffer"; + } + } + return {{"account", account}, + {"source", "IBKR broker-reported account totals"}, + {"retrieved_at_ms", fetched}, + {"fields", rows}, + {"liquidity_ratio", ratio}, + {"status", status}, + {"basis", + "Broker reported totals only, no segment sums. Ratio is excess liquidity / net " + "liquidation when currencies and timestamps align; 10% is a local warning " + "threshold, not a liquidation rule. Missing or old data stays unknown."}}; +} +} // namespace reach diff --git a/backend/public_data.hpp b/backend/public_data.hpp new file mode 100644 index 0000000..5ad2fe3 --- /dev/null +++ b/backend/public_data.hpp @@ -0,0 +1,194 @@ +#pragma once +#include "imports.hpp" +#include +namespace reach { +inline int64_t epoch_ms() { + return std::chrono::duration_cast( + std::chrono::system_clock::now().time_since_epoch()) + .count(); +} +inline std::string epoch_date(int64_t ms) { + std::time_t t = ms / 1000; + std::tm tm{}; + require(gmtime_r(&t, &tm) != nullptr, "Invalid epoch"); + std::ostringstream s; + s << std::put_time(&tm, "%Y-%m-%d"); + date(s.str()); + return s.str(); +} +inline const std::map macro_indicators = { + {"gdp", "NY.GDP.MKTP.CD"}, {"growth", "NY.GDP.MKTP.KD.ZG"}, {"inflation", "FP.CPI.TOTL.ZG"}}; +inline std::string worldbank_url(const std::string &country, const std::string &indicator) { + require( + std::set{"USA", "CHN", "DEU", "JPN", "GBR", "HKG", "FRA", "IND", "BRA", "AUS"} + .contains(country), + "Unsupported macro country"); + require(macro_indicators.contains(indicator), "Unsupported macro indicator"); + return "https://api.worldbank.org/v2/country/" + country + "/indicator/" + + macro_indicators.at(indicator) + "?format=json&date=2010:2025&per_page=100"; +} +inline std::string public_fetch(const std::string &mode, const std::string &url) { + require(mode == "user", "External public data fetch disabled outside user workspace"); + require(url == "https://www.federalreserve.gov/feeds/press_all.xml" || + std::regex_match( + url, std::regex("https://api\\.worldbank\\.org/v2/country/" + "(USA|CHN|DEU|JPN|GBR|HKG|FRA|IND|BRA|AUS)/indicator/" + "(NY\\.GDP\\.MKTP\\.CD|NY\\.GDP\\.MKTP\\.KD\\.ZG|FP\\.CPI\\." + "TOTL\\.ZG)\\?format=json&date=2010:2025&per_page=100")), + "Public endpoint prohibited"); + auto c = + std::unique_ptr(curl_easy_init(), curl_easy_cleanup); + require(bool(c), "curl init"); + std::string body; + curl_easy_setopt(c.get(), CURLOPT_URL, url.c_str()); + curl_easy_setopt(c.get(), CURLOPT_PROXY, ""); + curl_easy_setopt(c.get(), CURLOPT_PROTOCOLS_STR, "https"); + curl_easy_setopt(c.get(), CURLOPT_FOLLOWLOCATION, 0L); + curl_easy_setopt(c.get(), CURLOPT_CONNECTTIMEOUT, 5L); + curl_easy_setopt(c.get(), CURLOPT_TIMEOUT, 20L); + curl_easy_setopt(c.get(), CURLOPT_USERAGENT, "ReachTerminal/0.1.0 public research"); + curl_easy_setopt( + c.get(), CURLOPT_WRITEFUNCTION, +[](char *p, size_t a, size_t b, void *u) -> size_t { + auto &s = *static_cast(u); + if (b && a > (4 * 1024 * 1024 - s.size()) / b) + return 0; + s.append(p, a * b); + return a * b; + }); + curl_easy_setopt(c.get(), CURLOPT_WRITEDATA, &body); + auto code = curl_easy_perform(c.get()); + long status = 0; + curl_easy_getinfo(c.get(), CURLINFO_RESPONSE_CODE, &status); + require(code == CURLE_OK && status == 200, "Official public source unavailable (HTTP " + + std::to_string(status) + + "); no substitute data generated"); + return body; +} +inline json worldbank_import(const json &raw, const std::string &country, + const std::string &indicator, int64_t retrieved) { + auto url = worldbank_url(country, indicator); + require(raw.is_array() && raw.size() == 2 && raw[0].is_object() && raw[1].is_array() && + raw[1].size() <= 100, + "Invalid World Bank response"); + require(raw[0].value("pages", 0) == 1, "Paginated World Bank response not fully loaded"); + json out = empty_data(); + auto seen = epoch_date(retrieved); + date(seen); + require(seen <= today(), "Future retrieval date"); + for (auto &r : raw[1]) { + require(str(r, "countryiso3code") == country && + str(r.at("indicator"), "id") == macro_indicators.at(indicator), + "World Bank country/indicator mismatch"); + auto year = str(r, "date"); + require(std::regex_match(year, std::regex("20[0-9]{2}")), "Invalid macro reporting year"); + require(year + "-12-31" <= seen, "Future macro reporting period"); + require(r.contains("value") && (r["value"].is_null() || r["value"].is_number()), + "Invalid macro value"); + if (!r["value"].is_null()) + require(std::isfinite(r["value"].get()) && + std::abs(r["value"].get()) <= 1e18, + "Macro value outside range"); + json o = {{"country", country}, + {"indicator", indicator}, + {"period_end", year + "-12-31"}, + {"frequency", "annual"}, + {"value", r["value"]}, + {"unit", indicator == "gdp" ? "current USD" : "percent"}, + {"known_at", nullptr}, + {"retrieved_at_ms", retrieved}, + {"date", seen}, + {"source", "World Bank WDI"}, + {"source_url", url}}; + o["id"] = "macro-" + hash(o.dump()); + out["macro_observations"].push_back(o); + } + out["raw_sources"].push_back({{"id", "wb-raw-" + hash(raw.dump() + std::to_string(retrieved))}, + {"date", seen}, + {"source", "World Bank WDI"}, + {"source_url", url}, + {"document", raw.is_array() ? json{{"response", raw}} : raw}}); + return out; +} +inline json macro_view(const json &data, const std::string &asof) { + date(asof); + json selected = json::object(), history = json::array(); + for (auto &o : data["macro_observations"]) + if (str(o, "date") <= asof) { + history.push_back(o); + auto key = str(o, "country") + "/" + str(o, "indicator") + "/" + str(o, "period_end"); + if (!selected.contains(key) || + std::make_pair(o["retrieved_at_ms"].get(), str(o, "id")) > + std::make_pair(selected[key]["retrieved_at_ms"].get(), + str(selected[key], "id"))) + selected[key] = o; + } + json rows = json::array(); + for (auto &[k, o] : selected.items()) + rows.push_back(o); + return {{"as_of", asof}, + {"observations", rows}, + {"history", history}, + {"basis", + "Annual WDI observation periods are not publication dates. Historical release " + "dates unknown; as-of visibility starts at actual retrieval, never backfilled."}}; +} +inline json fed_news_import(const std::string &xml) { + require(xml.size() <= 4 * 1024 * 1024, "Feed too large"); + auto doc = std::unique_ptr( + xmlReadMemory(xml.data(), static_cast(xml.size()), "fed.xml", nullptr, + XML_PARSE_NONET | XML_PARSE_NOERROR | XML_PARSE_NOWARNING), + xmlFreeDoc); + require(doc && !doc->intSubset && !doc->extSubset, "Invalid RSS or prohibited DTD"); + auto root = xmlDocGetRootElement(doc.get()); + require(root && std::string(reinterpret_cast(root->name)) == "rss", + "RSS required"); + auto text = [](xmlNode *n, const char *name) { + for (auto *c = n->children; c; c = c->next) + if (c->type == XML_ELEMENT_NODE && xmlStrEqual(c->name, BAD_CAST name)) { + auto p = xmlNodeGetContent(c); + std::string s = p ? reinterpret_cast(p) : ""; + xmlFree(p); + return s; + } + return std::string(); + }; + json out = empty_data(); + int count = 0; + std::string latest = "1900-01-01"; + for (auto *channel = root->children; channel; channel = channel->next) + if (xmlStrEqual(channel->name, BAD_CAST "channel")) + for (auto *n = channel->children; n; n = n->next) + if (xmlStrEqual(n->name, BAD_CAST "item")) { + require(++count <= 200, "Feed item limit"); + auto title = text(n, "title"), url = text(n, "link"), + published = text(n, "pubDate"), summary = text(n, "description"); + require(url.starts_with("https://www.federalreserve.gov/") && + title.size() > 0 && title.size() <= 2000, + "Invalid official news link/title"); + require(std::regex_search(published, std::regex("(GMT|[+-][0-9]{4})$")), + "RSS date needs explicit timezone"); + auto epoch = curl_getdate(published.c_str(), nullptr); + require(epoch >= 0 && static_cast(epoch) * 1000 <= epoch_ms() + 60000, + "Invalid or future RSS publication date"); + auto d = epoch_date(static_cast(epoch) * 1000); + require(d <= today(), "Future RSS publication"); + latest = std::max(latest, d); + json news = {{"title", title}, + {"date", d}, + {"published_raw", published}, + {"source", "Federal Reserve"}, + {"source_url", url}, + {"summary", summary.substr(0, 2000)}}; + news["id"] = "fed-" + hash(news.dump()); + out["news"].push_back(news); + } + require(count > 0, "Feed contains no items"); + out["raw_sources"].push_back( + {{"id", "fed-raw-" + hash(xml)}, + {"date", latest}, + {"source", "Federal Reserve"}, + {"source_url", "https://www.federalreserve.gov/feeds/press_all.xml"}, + {"document", xml}}); + return out; +} +} // namespace reach diff --git a/backend/store.hpp b/backend/store.hpp index e7cdda3..1839402 100644 --- a/backend/store.hpp +++ b/backend/store.hpp @@ -1,5 +1,6 @@ #pragma once #include "core.hpp" +#include "embedded_assets.hpp" #include #include #include @@ -28,11 +29,11 @@ class Store { require(conn && PQstatus(conn.get()) == CONNECTION_OK, "PostgreSQL connection failed; check REACH_DATABASE_URL"); } - void migrate(const std::string &root) { - std::ifstream f(root + "/db/001_initial.sql"); - require(bool(f), "Missing database migration"); - std::string sql((std::istreambuf_iterator(f)), {}); - query(sql); + std::string database_name() const { + return PQdb(conn.get()); + } + void migrate(const std::string &) { + query(std::string(assets::schema())); } json load() { bool own_transaction = PQtransactionStatus(conn.get()) == PQTRANS_IDLE; diff --git a/db/001_initial.sql b/db/001_initial.sql index c162a64..27f649a 100644 --- a/db/001_initial.sql +++ b/db/001_initial.sql @@ -87,4 +87,7 @@ CREATE TABLE IF NOT EXISTS import_runs( CREATE OR REPLACE VIEW ledger_trades AS SELECT id,payload->>'account' AS account,payload->>'instrument' AS instrument,payload->>'strategy' AS strategy,(payload->>'date')::date AS trade_date,(payload->>'quantity')::numeric AS quantity,(payload->>'price')::numeric AS price,(payload->>'fee')::numeric AS fee,payload->>'currency' AS currency FROM trades; CREATE OR REPLACE VIEW financial_history AS SELECT id,payload->>'instrument' AS instrument,payload->>'concept' AS concept,payload->>'unit' AS unit,(payload->>'value')::numeric AS value,(payload->>'period_end')::date AS period_end,(payload->>'filed')::date AS filed,payload->>'accession' AS accession FROM facts; INSERT INTO schema_versions(version) VALUES (1) ON CONFLICT DO NOTHING; +CREATE TABLE IF NOT EXISTS macro_observations (id text PRIMARY KEY CHECK(length(id) BETWEEN 1 AND 180),payload jsonb NOT NULL CHECK(jsonb_typeof(payload)='object' AND payload->>'id'=id),created_at timestamptz NOT NULL DEFAULT now()); +CREATE TABLE IF NOT EXISTS hedge_models (id text PRIMARY KEY CHECK(length(id) BETWEEN 1 AND 180),payload jsonb NOT NULL CHECK(jsonb_typeof(payload)='object' AND payload->>'id'=id),created_at timestamptz NOT NULL DEFAULT now()); +INSERT INTO schema_versions(version) VALUES (2) ON CONFLICT DO NOTHING; COMMIT; diff --git a/docs/embedded-local.md b/docs/embedded-local.md new file mode 100644 index 0000000..8ba2d67 --- /dev/null +++ b/docs/embedded-local.md @@ -0,0 +1,25 @@ +# C++ 本地内嵌版与网关登录反馈 + +前端资源和数据库初始化 SQL 在构建时由明确白名单生成 C++ 资源,随 `reachterminal` 可执行程序发布。运行时不读取 `frontend/` 或 `db/`,资源修改后需要重新编译。浏览器仍是交互界面,PostgreSQL、操作系统动态库和本设备 IBKR Gateway 单独安装。 + +构建需要 Python 3,浏览器状态测试需要 Node.js;运行用户终端不需要两者。源码包包含资源生成器及原始可编辑前端。创建本地二进制包: + +```sh +python3 scripts/package-binary.py --output .local/releases +``` + +二进制包仅含程序、启动脚本、许可证和说明。`start.sh` 要求显式配置本机 PostgreSQL 的 `REACH_DATABASE_URL`,状态目录默认为包内 `workspace/`,可通过 `REACH_ROOT` 修改。当前开发安装继续使用 `scripts/live.sh`,保留原本设备配置。包不会搬运数据库、网关或登录状态,也不会复制系统动态库。 + +## 登录流程 + +1. 数据中心首次打开自动检测登录状态。 +2. 点击“打开网关登录”后,终端开始三分钟的等待确认;登录、双重验证由用户在官方页面完成。 +3. 返回终端会自动复查,分别显示账户会话验证与行情认证。SSO 验证遵守官方每分钟一次的限额,界面显示该验证的时间。 +4. 账户验证成功且行情未认证,显示部分连接成功,而非“登录失败”。用户可主动点击“连接行情会话(不抢占)”,使用固定 `publish:true, compete:false` 请求认证;不会自动抢占 TWS 或其他设备的行情会话。认证后再点击“准备行情”。 +5. 显示具体连接错误、竞争会话或超时未确认。超时不等同于登录失败;手动检测可重新核对。 + +隐藏页面暂停轮询;导航、设置变更与登出中止当前监控。异步响应受代次检查,过期响应不会覆盖新页面或退出状态。返回原始 SSO 用户名、用户 ID、凭证、IP 等均被禁止,仅投影验证布尔值与检测时间。 + +官方依据:[两层会话](https://www.interactivebrokers.com/docs/web-api/authentication/sessions)、[SSO 验证](https://www.interactivebrokers.com/docs/web-api/api-reference/trading/trading-session/get-session-validation)、[会话初始化与两秒等待](https://www.interactivebrokers.com/docs/web-api/authentication/trading)、[API 速率限制](https://www.interactivebrokers.com/campus/ibkr-api-page/webapi-doc/)。 + +行情初始化的账户握手和 HTTP 400 故障说明见 [本次修复](ibkr-400-fix.md)。 diff --git a/docs/embedded-verification.json b/docs/embedded-verification.json new file mode 100644 index 0000000..4aa6ad2 --- /dev/null +++ b/docs/embedded-verification.json @@ -0,0 +1,22 @@ +{ + "date": "2026-10-16", + "frontend": "Embedded in C++ binary, no frontend/db directories in isolated runtime", + "core_assertions": 88, + "release_assertions": 39, + "gateway_checks": 46, + "http_regression_checks": 42, + "release_mutation_checks": 7, + "embedded_asset_comparisons": 5, + "ui_state_checks": 22, + "real_gateway": { + "sso_valid": true, + "brokerage_authenticated": true, + "browser_message_verified": true, + "manual_market_connection": "Non-competing init exercised during diagnosis; subsequent real authentication/search/history verified; no trading", + "market_ready": true + }, + "binary_sha256": "f302bcffe91e5428a6cedd828f1e5ea002e017f165dd97b68de92dd9b94d22f5", + "binary_archive_sha256": "a915cf0b69238c5b08df9701da152da6f583379c78e42ff4ace84617fa20517d", + "limits": "Linux dynamically linked binary, external PostgreSQL and device-local Gateway required", + "latest_debug_report": "ibkr-400-verification.json" +} diff --git a/docs/ibkr-400-fix.md b/docs/ibkr-400-fix.md new file mode 100644 index 0000000..67f0f40 --- /dev/null +++ b/docs/ibkr-400-fix.md @@ -0,0 +1,17 @@ +# IBKR 行情会话 HTTP 400 排查与修复 + +2026-10-16,本机复现:账户 SSO 有效,但行情 `authenticated=false`。行情初始化返回 HTTP 200、`authenticated=false`,随后账户准备曾返回 HTTP 400;标的搜索在终端返回 400,其上游实际为认证拒绝。不能仅凭网页登录成功或初始化接口 HTTP 200 判定行情就绪。 + +诊断时执行了固定不抢占的初始化请求,以及一次旧版 Gateway 会话恢复探测;随后只读账户握手和状态复查确认恢复。`reauthenticate` 已被官方弃用,本修复不将其加入运行时路由、不设置自动回退。不能据这次顺序探测证明单个探测请求是恢复的唯一原因。 + +恢复后的实际验收:行情已认证且已连接;IBM 搜索返回 22 条合约;行情准备成功;近月历史日线返回 21 根。未进行交易,未导入账户余额、持仓或交易流水。 + +代码修复: + +- 初始化后等待至少两秒,读取 `/iserver/accounts` 完成 Gateway 的账户握手确认。 +- 初始化未就绪时保留初始化状态,在三分钟窗口内按至少五秒间隔检查账户握手;不重复抢占或自动重新发起行情初始化。 +- 空账户结果不能标记行情准备成功;认证与账户就绪尚未确认时不启用“准备行情”。 +- 错误显示接口路径、上游 HTTP 状态和处理建议;账户 ID、查询参数及上游原始响应均不回显。 +- 保留 SSO 每分钟最多一次、设备绑定和合成网关 5001 隔离。 + +官方依据:[初始化后的账户读取](https://www.interactivebrokers.com/docs/web-api/authentication/trading)、[弃用旧恢复接口](https://www.interactivebrokers.com/docs/web-api/changelog/2024/2/5)。 diff --git a/docs/ibkr-400-verification.json b/docs/ibkr-400-verification.json new file mode 100644 index 0000000..94554bb --- /dev/null +++ b/docs/ibkr-400-verification.json @@ -0,0 +1,29 @@ +{ + "date": "2026-10-16", + "gateway_isolated_checks": 46, + "core_assertions": 88, + "release_assertions": 39, + "ui_state_checks": 22, + "http_regression_checks": 42, + "release_mutation_checks": 7, + "actual_after_fix": { + "connection": { + "authenticated": true, + "connected": true, + "competing": false, + "market_ready": true, + "sso_valid": true + }, + "search_contracts": 22, + "prepared": true, + "daily_bars": 21 + }, + "privacy": "No account identifiers, amounts, credentials or raw gateway response recorded", + "fixed": [ + "post-init account bootstrap", + "bounded readiness polling", + "empty account preparation rejection", + "initialization status", + "endpoint-specific sanitized HTTP errors" + ] +} diff --git a/docs/ibkr-verification.json b/docs/ibkr-verification.json new file mode 100644 index 0000000..4f11a19 --- /dev/null +++ b/docs/ibkr-verification.json @@ -0,0 +1,91 @@ +{ + "ok": true, + "checks": 46, + "passed": [ + "public settings omit certificate", + "test runtime cannot open real login", + "test runtime blocks real Gateway port", + "API keys rejected for Gateway", + "external targets rejected", + "write token enforced", + "untrusted TLS rejected", + "status projection excludes hardware/account details", + "dual session verification", + "SSO identity excluded", + "read-only login distinct from brokerage authentication", + "manual market initialization uses fixed non-competing payload", + "incomplete init is pending rather than success", + "missing account bootstrap cannot report market ready", + "bounded account bootstrap completes asynchronous initialization", + "encoded search with public projection", + "official snake_case detail shape supported", + "path injection rejected", + "market data preparation required", + "warming error explains session state without leaking broker body", + "empty market accounts cannot mark session prepared", + "failed preparation keeps snapshots blocked", + "account prerequisite executed without returning accounts", + "snapshot prefixes and delay preserved", + "position data excluded", + "historical daily preview", + "margin account must be locally discovered", + "account list projects only required fields", + "broker margin totals normalized", + "margin pacing enforced", + "margin account path injection rejected", + "preflight empty values explicitly pending", + "logged-out auth state", + "expired session handled", + "quota error handled", + "unconfirmed remote logout reports failure", + "failed logout still clears local preparation", + "remote logout confirmed", + "session no longer authenticated after logout", + "logout invalidates discovered margin accounts", + "logout clears market preparation", + "logout invalidates SSO cache without breaking upstream pacing", + "IBKR previews never mutate existing ledger or daily quotes", + "query URL encoding verified by server", + "SSO validation limited to once per minute", + "no trading or regulatory snapshot requests" + ], + "scope": "Isolated synthetic HTTPS gateway with trusted test certificate; no real IBKR session", + "core_assertions": 88, + "real_gateway": { + "date": "2026-10-16", + "authenticated": true, + "search_contracts": 22, + "contract": "IBM / NYSE / 8314", + "availability": "delayed", + "history_daily_bars": 21, + "browser": "Search, contract, snapshot and history exercised", + "limits": "No account trading, no normalized ledger import, no complete financial statements or macro calendar" + }, + "existing_http_regression_checks": 42, + "device_isolation": [ + "owner settings accepted", + "foreign settings rejected", + "unbound legacy settings rejected", + "foreign Gateway startup rejected", + "unprovisioned Gateway startup rejected", + "owner settings loaded after restart; existing local authentication preserved" + ], + "session_and_isolation": { + "gateway_checks": 28, + "ledger_checks": 42, + "private_test_cluster": true, + "user_export_and_config_hashes_unchanged": true, + "mutating_test_scripts_refuse_user_instance": true, + "logout_tested_on": "synthetic TLS Gateway only", + "login_browser_link": "verified opens local official login page" + }, + "margin_real_verification": { + "authenticated": false, + "margin_success": true, + "field_count": 8, + "numeric_fields": 8, + "fresh_fields": 8, + "error": null + }, + "latest_debug_report": "ibkr-400-verification.json" +} diff --git a/docs/ibkr.md b/docs/ibkr.md new file mode 100644 index 0000000..3538212 --- /dev/null +++ b/docs/ibkr.md @@ -0,0 +1,77 @@ +# IBKR Client Portal Gateway 接入 + +个人账户使用 Client Portal Gateway 浏览器登录与双重验证,不使用通用 API Key。 + +## 当前机器 + +官方网关已解包至 `.local/clientportal/`,本地 Java 至 `.local/java-runtime-21/`;均被 Git 忽略。 +默认端口 5000,独立 localhost 证书的公钥信任已配置到 `.local/devices//ibkr.json`,文件权限 600。 +不修改系统 Java 或系统证书信任。不要提交 `.local/` 或网关日志。 + +```sh +./scripts/gateway.sh # 独立终端窗口,保持运行 +./scripts/live.sh # 独立终端窗口,http://127.0.0.1:8788 +``` + +本人在 https://localhost:5000/ 登录并完成双重验证。浏览器的本机证书提示由本人核对处理。 +在 ReachTerminal 的数据中心: + +1. 检测登录状态;未认证时回到官方网关登录。 +2. 按证券代码或公司名搜索,核对市场和 conid,选择合约。 +3. 点击“准备行情”,满足 IBKR 的账户初始化前置要求(账户列表不会返回到前端)。 +4. 获取行情与研究指标。首次请求可能只是预热,稍后手动刷新;显示实时/延迟/冻结/未订阅状态及更新时间。 +5. 获取近月日线预览。保留供应商时间戳、成交量及可用性代码。 + +## 在其他机器安装 + +从 [IBKR 官方链接](https://download2.interactivebrokers.com/portal/clientportal.gw.zip) 下载并解包到 `.local/clientportal/`,安装 Java(官方包说明最低 8u192,建议现代受支持版本)。也可用 `REACH_GATEWAY_DIR` 指定已安装目录。 +按官方网关说明配置自己的 HTTPS 证书。数据中心填写本机端口以及可信证书 PEM;证书应覆盖 localhost。留空表示系统信任,保存空值会清除已有自定义证书。 +本仓库不分发官方网关、Java、私钥或第三方数据。 + +## 已实现范围 + +- 网关连接设置保存/重新加载、登录与竞争会话状态。 +- 证券代码/公司名搜索,conid 绑定的合约详情(兼容 IBKR 文档中 camelCase 和 snake_case 公共字段)。 +- 买卖价、最新价、价格变化、52 周区间、平均成交量、历史波动率、股息字段;保留原始单位及 C/H 前缀,缺失值不会补零。 +- 一个月、1 日 bar 的历史数据预览。 + +这些字段不是完整公司财报或宏观经济数据库。完整 US-GAAP 财报使用已有 SEC 接口;宏观指标、经济日历、其他基本面供应商尚未实现。数据覆盖取决于账户与订阅权限,不自动购买行情。 + +## 数据与安全边界 + +连接固定 localhost 并固定解析到 127.0.0.1,禁用代理和重定向,严格验证 TLS。没有“忽略证书”开关。只允许明确列出的查询路径及认证状态 POST;不暴露任意代理、下单或收费 regulatory snapshot 接口。 + +凭据由官方网关管理。连接表单拒绝 API Key、账户密码和私钥;会话 Cookie 只保存在后端内存。前端状态不返回 MAC/硬件详情或账户列表。 + +快照与日线是手动查询预览,不写入账本和现有日终报价。日线交易日时区、volumeFactor 和复权尚未标准化,因此不用于账户估值。最小请求间隔 250ms,单次网络超时 15s,无自动登录、自动接管会话或无限重试。网络请求仍占用现有单实例串行处理锁。 + +## 验证与当前限制 + +核心断言 81 项、原有 HTTP 回归 42 项通过;隔离的 HTTPS 模拟网关 21 项检查通过,覆盖证书、认证、编码、权限缺失和账本不变性。 +2026-10-16,用户本人完成官方网关登录后,已验证真实认证、IBM 跨市场合约搜索、纽约合约详情、延迟快照(含股息、波动率字段)及 21 根近月日线。浏览器已验收搜索、选定合约、快照与日线入口。真实搜索发现 conid=-1 的债券发行人分组,已省略这类非具体合约分组并新增回归断言。模拟结果只用于测试,不能作为市场数据。 + +官方接口参考:[认证状态](https://www.interactivebrokers.com/docs/web-api/v1/endpoints/session/authentication-status)、[合约搜索](https://www.interactivebrokers.com/docs/web-api/v1/endpoints/contract/search-contract-by-symbol)、[行情字段](https://www.interactivebrokers.com/docs/web-api/v1/endpoints/market-data/market-data-fields)、[历史行情](https://www.interactivebrokers.com/docs/web-api/v1/endpoints/market-data/historical-market-data)。 + +隔离 HTTPS 回归脚本为 `tests/ibkr_mock.py` 和 `tests/ibkr_gateway_test.py`。必须使用空的临时数据库、独立 REACH_ROOT 配置目录,避免覆盖正常网关设置。准备 fixture 目录并用 openssl 生成覆盖 localhost 的 mock-cert.pem / mock-key.pem,启动模拟网关 `python3 tests/ibkr_mock.py --fixture-dir DIR`(端口5001),再对临时终端运行 `python3 tests/ibkr_gateway_test.py --url http://127.0.0.1:8790 --fixture-dir DIR`。脚本会保存测试证书配置,不能对正常工作区运行。 + +## 不同设备隔离 + +网关不可迁移。每台设备独立安装、生成本机证书并本人登录;禁止同步或搬运整个 `.local/`、网关目录、会话 Cookie、证书私钥及 Java 信任配置。Git 仅共享代码,工作区导出仅包含研究数据,不包含网关状态。 + +后端根据 Linux `/etc/machine-id` 的带用途前缀哈希使用 `.local/devices//ibkr.json`;配置还校验所属设备。旧的无归属配置不会自动加载。本机网关目录有 `.reach-device.json`,启动脚本拒绝其他设备或没有归属标记的目录。当前机器进行了明确的一次性配置归属,其他设备必须重新安装和配置。 + +机器身份依赖操作系统 machine-id;克隆系统镜像必须确保各机器有独立 machine-id。这是设备归属检查,不是硬件防篡改证明。新设备禁止直接给搬运来的旧目录重新打标。 + +在新设备安装时先从上述官方链接下载全新 ZIP,再运行 `python3 scripts/provision_gateway.py --archive /path/clientportal.gw.zip --destination .local/clientportal`。目标目录必须不存在;包含设备归属标记的搬运归档会被拒绝,不能给旧目录重新绑定。随后配置独立的本机证书及 Java,保存本设备连接设置并本人登录。 + +## 登录、登出和测试隔离 + +数据中心的“打开网关登录”会在新标签页打开本设备配置端口的官方网关页面。网关进程需已启动;账户登录及双重验证仍由本人完成。 + +“登出网关”调用 `POST /logout`,仅在 IBKR 返回 `status: true` 时显示成功。登出成功或失败都会清除本地行情准备状态及前端查询缓存;登出期间阻止新查询,较早的未完成查询不能重新填回缓存。网络错误时明确提示远端登出未确认。连接配置和研究数据不会被删除。 + +运行环境分为 `user`、`demo`、`test`。`scripts/live.sh` 固定 user,默认 `scripts/dev.sh` 为 demo。实际连接的数据库名由 PostgreSQL/libpq 核对:test 必须为 `reachterminal_test_*`,user/demo 禁止使用测试库,user 与默认/命名演示库也互斥。测试与演示网关配置不读取 user 的设备配置;demo 禁止访问网关,test 仅允许 localhost:5001 模拟网关,user 禁止使用该端口。test/demo 不能执行外部 SEC/Alpha 抓取。user 禁止导入带合成演示标识的记录。 + +所有会写数据的测试统一运行 `python3 scripts/test-isolated.py`。启动器清除真实数据源环境变量,创建独立私有 PostgreSQL 集群、独立 socket/数据库、临时应用根目录、测试证书和模拟网关;结束后停止全部测试进程。测试报告留在忽略的 `.local/test-runs/`。测试脚本即使误填用户地址,也会在只读环境预检后拒绝,不会修改用户配置或登出真实会话。旧的手工测试步骤由此启动器替代。 + +本次验证:88 项核心断言、28 项网关 HTTPS 检查、42 项核算与导入回归通过。登出只在模拟网关验收,未对用户真实会话执行登出。测试前后用户工作区导出及设备连接配置 SHA-256 完全一致。浏览器已验证登录入口打开正确的本机官方登录页。 diff --git a/docs/live-data.md b/docs/live-data.md index 78eef43..6d2b626 100644 --- a/docs/live-data.md +++ b/docs/live-data.md @@ -39,7 +39,9 @@ IBM 1,744 条财务版本、100 根日线,最新日期 2026-10-14,原始收 浏览器核对研究页财务披露日期、日线、来源和过期提示;可重复运行只读检查: ```sh -python3 tests/live_smoke.py --url http://127.0.0.1:8788 +python3 scripts/check-live-data.py --url http://127.0.0.1:8788 ``` 没有连接真实 IBKR 账户,没有声称免费全球市场全覆盖。当前接口在单进程数据库锁内执行网络请求,抓取期间其他读取可能等待(单次超时 45 秒);任务队列和增量缓存属后续优化。 + +`check-live-data.py` 是用户手动发起的只读诊断,不参与自动化测试。自动化测试统一使用 `scripts/test-isolated.py`;tests/ 下的接口脚本均拒绝用户实例。 diff --git a/docs/release-0.1.0.md b/docs/release-0.1.0.md new file mode 100644 index 0000000..cc91075 --- /dev/null +++ b/docs/release-0.1.0.md @@ -0,0 +1,40 @@ +# ReachTerminal v0.1.0 发布验收 + +本地浏览器前端 + C++20 + PostgreSQL。只读券商连接;没有下单、修改订单或付费监管快照入口。源代码使用仓库 LICENSE,外部数据仍受各来源授权条件约束。 + +## 本版范围 + +| 工作区 | 功能与实际边界 | +|---|---| +| 组合与策略 | 现金股票流水、策略 FIFO、多币种历史汇率、现金事件与拆股、对账;金额使用六位定点数 | +| 公司研究 | SEC 财务事实、历史披露日期、基本面与估值、来源链接;目前正式自动财报覆盖 SEC 发行人 | +| 图表与估值 | 日线、组合历史曲线、DCF、现金股票压力情景;收益曲线采用日末外部现金流近似 | +| 衍生品对冲 | 独立的单币种假设组合,股票、欧式期权、线性期货,Delta/Gamma/Vega/Theta,价格/波动率/时间全量重估,方案版本保存 | +| 保证金 | 从当前设备 IBKR 会话读取账户汇总,逐项保留币种、券商时间戳、未知与过期状态;剩余流动性 / 净清算值仅在币种、时间一致时计算 | +| 宏观 | 世界银行 WDI:10 个国家/地区的年度名义 GDP、实际增长、CPI 通胀;2010–2025,保存抓取版本 | +| 新闻与研究 | 美联储官方 RSS、手动导入新闻、公司研究笔记 | +| 数据中心 | SEC/日线/IBKR 查询、导入与导出、设备绑定的网关设置、浏览器登录入口与登出 | + +“全球市场”表示 IBKR 可搜索市场和目前列出的宏观国家,不表示免费数据覆盖所有交易所实时行情、所有公司的标准化全球财报。券商权限、行情订阅和登录要求仍适用。 + +## 必须正确理解的模型边界 + +衍生品是假设情景工作台,未将期权/期货交易混入现金股票 FIFO 账本。模型期权仅接受欧式、正波动率和正初始剩余期限;到期情景取内在价值。数量是股票股数或衍生品合约张数,乘数须由用户根据真实合约填写。期货冲击作用于合约价格,不估算基差、展期、资金成本或交割。 + +保证金显示券商报告值,不能替代完整组合保证金引擎,也不推断强平价格。过期阈值 120 秒,最低手动刷新间隔 10 秒;10% 比例只是本地提醒阈值。未知数据保持未知,`isNull=true` 不能当作零;不叠加证券和商品分项。 + +WDI 报告期并非发布日期。历史发布日期未知,分析日期只能看到实际抓取日期之前已获取的版本。年度数据不适合作为日内宏观日历。官方新闻按发布日期筛选,历史 RSS 更新并不构成完整逐时新闻档案。 + +## 数据与设备隔离 + +- user/demo/test 使用独立数据库;所有自动修改测试先核对 test 环境。 +- 测试使用新建的私有 PostgreSQL 集群、独立应用根目录、合成 HTTPS 网关 5001。测试不连接真实网关 5000,不抓取外部公开来源。 +- 用户网关配置按本机身份保存;安装和状态不可迁移。账户列表和保证金结果仅作当前页面预览,不写入研究数据库。 +- 退出登录会清理本地会话准备状态与账户缓存,即使券商未确认远端退出也不保留本地可查询状态。 +- 源码发布包采用文件白名单,不包含 `.local`、数据库、网关、配置、密钥、测试运行报告或用户导出。 + +## 本地验收 + +先构建,再运行 CTest 和 `python3 scripts/test-isolated.py`。后者自行创建和销毁隔离服务,不得把集成测试指向真实用户服务。真实网关验收须由用户本人完成登录与双重验证;没有真实会话通过的项目,必须记录为未验收。 + +发布源码包:`python3 scripts/package-release.py --output /tmp/reachterminal-release`。该操作仅创建本地归档与 SHA256,不创建 Git 标签、推送仓库或公开发布。 diff --git a/docs/release-verification.json b/docs/release-verification.json new file mode 100644 index 0000000..9d60012 --- /dev/null +++ b/docs/release-verification.json @@ -0,0 +1,37 @@ +{ + "version": "0.1.0", + "date": "2026-10-16", + "core_assertions": 88, + "release_assertions": 39, + "official_payload_assertions": 40, + "gateway_https_checks": 34, + "existing_http_checks": 42, + "release_mutation_checks": 7, + "real_margin": { + "authenticated": false, + "margin_success": true, + "field_count": 8, + "numeric_fields": 8, + "fresh_fields": 8, + "error": null + }, + "real_public_data": { + "world_bank_browser_rows": 16, + "fed_payload_rows": 20, + "user_ledger_preserved_before_public_import": true, + "fed_browser_items": 20 + }, + "known_limits": [ + "European modeled derivatives separate from cash ledger", + "Broker margin totals; no internal portfolio-margin replication", + "Annual WDI retrieval vintages, no historical publication dates", + "CI configured but not remotely executed", + "No Git tag, push or public release performed" + ], + "source_archive": { + "fresh_build": true, + "ctest_passed": true, + "private_cluster_integration_passed": true, + "no_runtime_data": true + } +} diff --git a/docs/roadmap.md b/docs/roadmap.md index 33841f8..48f072e 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -1,20 +1,17 @@ # Roadmap -0.1 establishes the cash-equity research workflow and explicit data boundaries. +0.1 includes cash-equity research/accounting, device-bound Client Portal reads, European modeled hedges, broker margin totals, annual WDI macro vintages and official Fed RSS. See release-0.1.0.md for exact coverage. Next stages, in dependency order: 1. Reviewed IBKR statement fixtures from volunteers, settlement/tax-lot reconciliation, transaction corrections with supersession audit, fuller corporate actions and FX executions. 2. European ESEF and other market adapters, entity/listing identifiers, financial-company models, currencies and units, reliable point-in-time historical datasets. -3. Read-only TWS/IB Gateway connector with user-owned entitlements, connection state, - daily snapshots, alerts and event-driven refresh. Verify API/SDK licensing separately. +3. Extend the existing Client Portal connector with optional TWS/IB Gateway, user-owned entitlements, persisted market snapshots and event-driven refresh. Verify API/SDK licensing separately. 4. Suitable benchmark datasets, precise flow-timed returns, factor attribution, covariance and VaR/ES with model diagnostics, rather than metrics on arbitrary missing histories. -5. Derivative contract model, QuantLib evaluation, option-chain data adapters, Greeks, - scenario full repricing, hedge comparison and financing cost accounting. -6. Broker-reported margin monitoring, separately labeled internal estimates, model/version - validation and stress liquidity analysis. No claim to replicate broker house rules. +5. Extend the European hedge scenario model with contract reference data, option chains, American/exotic pricing, derivatives transaction accounting and financing costs. +6. Extend broker margin monitoring with threshold alerts, stress liquidity analysis and separately validated internal estimates. No claim to replicate broker house rules. Free default operation remains mandatory. Paid providers may only be optional user-configured adapters; core features must not require a paid shared key or hosted service. No trading routes. diff --git a/docs/third-party.md b/docs/third-party.md index 5ed7ee3..32afb8a 100644 --- a/docs/third-party.md +++ b/docs/third-party.md @@ -23,3 +23,9 @@ Returned claims and numeric examples were independently checked; incorrect claim rejected. Core implementation, integration, fixtures and verification were authored and performed by the primary agent. Private management journals and API responses are not included in the repository. No user account data was sent to DeepSeek. + +- World Bank WDI API: https://datahelpdesk.worldbank.org/knowledgebase/articles/898581-api-basic-call-structures +- Federal Reserve RSS: https://www.federalreserve.gov/feeds/feeds.htm +- IBKR portfolio summary: https://www.interactivebrokers.com/docs/web-api/api-reference/trading/trading-portfolio/get-portfolio-summary + +Release archives include source and synthetic fixtures only; fetched public observations and account summaries remain outside the source package. diff --git a/frontend/app.js b/frontend/app.js index 7df575e..a006d21 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -1,3 +1,5 @@ +import { createGatewayMonitor } from "./gateway-session.js"; +import { releasePage } from "./release.js"; const $ = (s, root = document) => root.querySelector(s); const $$ = (s, root = document) => [...root.querySelectorAll(s)]; const escape = (v) => @@ -37,6 +39,9 @@ const names = { risk: "风险与策略", news: "新闻与研究", data: "数据中心", + hedge: "衍生品对冲", + margin: "保证金监控", + macro: "宏观数据", }; let state = { page: "overview", @@ -77,7 +82,13 @@ async function api(path, options = {}) { return data; } const post = (path, data) => - api(path, { method: "POST", body: JSON.stringify(data) }); + api(path, { + method: "POST", + body: JSON.stringify(data), + ...(path === "/api/ibkr/connection" + ? { signal: AbortSignal.timeout(55000) } + : {}), + }); const qs = () => `as_of=${encodeURIComponent(state.asof)}`; function heading(eyebrow, title, sub, actions = "") { return `
${eyebrow}

${title}

${sub}

${actions}
`; @@ -150,6 +161,7 @@ function emptyWorkspace() { ); } async function render() { + gatewayMonitor.stop(); const g = ++generation; $("#page-name").textContent = names[state.page]; $$("#nav button").forEach((b) => @@ -159,9 +171,44 @@ async function render() { try { if (state.page === "data") { const data = await api("/api/data"); + data.ibkr = await api("/api/ibkr/settings"); if (g !== generation) return; state.data = data; renderData(data); + gatewayMonitor.check(); + return; + } + if (["hedge", "margin", "macro"].includes(state.page)) { + await releasePage({ + state, + api, + post, + escape, + fmt, + panel, + heading, + toast, + chart, + drawLine, + generationValid: () => g === generation, + reload: render, + }); + return; + } + if (state.page === "news" && !state.instruments.length) { + const news = await api(`/api/news?${qs()}`); + if (g !== generation) return; + $("#content").innerHTML = + heading( + "INTELLIGENCE / OFFICIAL FEEDS", + "新闻与研究", + "官方新闻 · 按发布日期筛选", + ) + + panel( + "Federal Reserve", + '
' + + newsCards(news), + ); return; } if (!state.instruments.length) { @@ -384,7 +431,7 @@ function renderNews(news, r) { "新闻与研究", "让信息连接到持仓,让投资论点留下可复盘的记录。", ) + - `
${panel("市场与公司事件", newsCards(news), "已导入来源 · 非实时新闻流")}${panel( + `
${panel("市场与公司事件", newsCards(news), "已导入来源 · 非实时新闻流")}${panel( "投资论点 · " + escape(r.instrument_info.symbol), `
${[ ...r.notes, @@ -417,7 +464,7 @@ function renderData(d) { ([k, n]) => `
${d.counts[k]}${n}
`, ) - .join("")}
${panel( + .join("")}
${ibkrPanel(d.ibkr)}
${panel( "导入文件", `

相同编号与内容可重复导入;相同编号但内容改变会拒绝。需从完整历史或明确的期初账本开始。Flex 不会自动推算缺失入金或换汇。

标准格式、字段和样例

参考仓库 docs/data-contract.md 和 examples/。金额与数量用字符串,最多 6 位小数。每条财务记录须注明披露日期、期间、单位和来源。

{ "instruments": [...], "trades": [...],
   "cashflows": [...], "facts": [...],
@@ -431,8 +478,165 @@ function renderData(d) {
             `${escape(r.created_at)}${r.inserted}${r.duplicates}`,
         ),
       ),
-    )}${panel("能力与数据覆盖", `

● 已实现:本地账本、策略内 FIFO、拆股、汇率估值、对账、财务版本、用户 FCFF 估值、线性股票压力测试。

○ 全球一致预期:支持带来源的导入,无内置完整免费数据源。

○ IBKR 实时账户与行情:当前通过 Flex 文件接入;未连接 TWS / Gateway。

○ 衍生品、经纪商保证金、自动全球财报标准化:后续阶段。

代码开源不自动授权第三方数据再分发。演示数据为合成资料。

${Object.values(d.counts).every((n) => !n) ? '' : ""}
`)}
`; + )}${panel("能力与数据覆盖", `

● 已实现:本地账本、策略内 FIFO、拆股、汇率估值、对账、财务版本、用户 FCFF 估值、线性股票压力测试。

○ 全球一致预期:支持带来源的导入,无内置完整免费数据源。

● IBKR 数据查询:已接入 Client Portal Gateway 的搜索、行情与日线预览;账户账本仍通过 Flex 导入。

○ 衍生品、经纪商保证金、自动全球财报标准化:后续阶段。

代码开源不自动授权第三方数据再分发。演示数据为合成资料。

${Object.values(d.counts).every((n) => !n) ? '' : ""}
`)}
`; +} +function ibkrPanel(settings) { + ibkrEpoch++; + ibkrSelected = null; + return panel( + "IBKR 数据连接", + `

本设备独立网关 · ${escape(settings.device)} · ${settings.configured ? "已配置" : "尚未配置,需在本机重新设置并登录"}。网关不可迁移或跨设备复用。个人账户使用 Client Portal Gateway 浏览器登录与双重验证,无通用 API Key。仅查询标的与数据。${link("https://www.interactivebrokers.com/docs/web-api/v1/endpoints/introduction", "官方连接说明 ↗")}

连接固定为 https://localhost。留空使用系统信任;当前${settings.custom_ca ? "已配置自定义证书,留空重新保存将清除" : "使用系统证书"}。不关闭 TLS 校验,不填写账户密码或私钥。

${settings.login_url ? `` : `隔离环境:禁止打开真实登录`}

尚未检测。请先启动网关,并在其浏览器页面登录。

确认 conid 和市场后选择标的。债券发行人分组(conid=-1)暂不支持,已从可选合约省略。查询预览独立于现有账本,不会写入持仓或覆盖日终估值。权限缺失时显示空值。

`, + ); } +const gatewayMonitor = createGatewayMonitor({ + post, + isCurrent: () => + state.page === "data" && !ibkrLoggingOut && !!$("#ibkr-status-result"), + display: (m) => { + const el = $("#ibkr-status-result"); + if (!el) return; + if (m.market_authenticated !== undefined) { + for (const id of ["ibkr-prepare", "ibkr-snapshot", "ibkr-history"]) { + const button = $("#" + id); + if (button) button.disabled = !m.market_authenticated || ibkrLoggingOut; + } + } + el.dataset.state = m.kind; + el.textContent = + m.text + + (m.checked_at + ? " 检测时间 " + new Date(m.checked_at).toLocaleTimeString() + : "") + + (m.sso_checked_at + ? ";账户会话验证时间 " + + new Date(m.sso_checked_at).toLocaleTimeString() + + "(最多每60秒验证一次)" + : ""); + }, +}); +document.addEventListener("click", (e) => { + if (e.target.closest("#ibkr-login")) gatewayMonitor.start(); +}); +window.addEventListener("focus", () => gatewayMonitor.focus()); +document.addEventListener("visibilitychange", () => { + if (document.visibilityState === "visible") gatewayMonitor.focus(); +}); +let ibkrSelected = null, + ibkrEpoch = 0, + ibkrLoggingOut = false; +function showIbkrSnapshot(r) { + const update = + r.updated_ms == null ? "未提供时间" : new Date(r.updated_ms).toISOString(); + $("#ibkr-data-result").innerHTML = + panel( + "行情与研究指标", + table( + ["指标", "IBKR 原始值"], + r.fields.map( + (f) => + `${escape(f.label)}${escape(f.value ?? "—")}`, + ), + ), + escape(`${r.availability} · ${update}`), + ) + + `

${r.pending ? "数据正在预热或未获权限,请稍后手动刷新。" : "C 前缀表示前日收盘,H 表示暂停交易;保留供应商原始单位。"} 股息/波动率不等于完整财报;未订阅字段可能缺失。

`; +} +$("#content").addEventListener("click", async (e) => { + const button = e.target.closest("button"); + if (!button) return; + if (!button.id.startsWith("ibkr-") && !button.dataset.ibkrConid) return; + if (ibkrLoggingOut) return; + const epoch = ibkrEpoch; + button.disabled = true; + try { + if (button.id === "ibkr-logout") { + gatewayMonitor.stop(); + ibkrLoggingOut = true; + ibkrEpoch++; + ibkrSelected = null; + for (const id of [ + "ibkr-search-result", + "ibkr-selected", + "ibkr-data-result", + ]) + $("#" + id).innerHTML = ""; + try { + await post("/api/ibkr/logout", {}); + $("#ibkr-status-result").textContent = + "网关已确认登出。连接配置和研究数据保留,需要重新登录。"; + toast("已登出 IBKR 网关"); + } catch (err) { + $("#ibkr-status-result").textContent = + "本地查询缓存已清除,但网关登出未确认,请在官方网关核对会话。"; + throw err; + } + } + if (button.id === "ibkr-status") { + await gatewayMonitor.check(); + } + if (button.id === "ibkr-connect-market") { + gatewayMonitor.stop(); + await post("/api/ibkr/connect-market", {}); + if (epoch === ibkrEpoch && button.isConnected) + gatewayMonitor.start( + "已请求连接行情会话,正在等待 IBKR 确认;不会抢占其他会话。", + ); + } + if (button.id === "ibkr-prepare") { + await post("/api/ibkr/prepare", {}); + $("#ibkr-status-result").textContent = + "行情准备完成。首次快照可能只返回预热信息,请稍后手动刷新。"; + } + if (button.dataset.ibkrConid) { + const chosen = button.dataset.ibkrConid; + const r = await post("/api/ibkr/detail", { conid: chosen }); + if (epoch !== ibkrEpoch) return; + ibkrSelected = chosen; + $("#ibkr-selected").innerHTML = panel( + "已选合约", + `
${escape(r.companyName || r.company_name || r.symbol || r.ticker || ibkrSelected)}

${escape(ibkrSelected)} · ${escape(r.symbol || r.ticker)} · ${escape(r.currency)} · ${escape(r.listingExchange || r.exchange)} · ${escape(r.secType || r.instrument_type)} · ${escape(r.industry || r.category)}

`, + ); + $("#ibkr-data-result").innerHTML = ""; + } + if (button.id === "ibkr-snapshot") { + const r = await post("/api/ibkr/snapshot", { conid: ibkrSelected }); + if (epoch !== ibkrEpoch) return; + showIbkrSnapshot(r); + } + if (button.id === "ibkr-history") { + const r = await post("/api/ibkr/history", { conid: ibkrSelected }); + if (epoch !== ibkrEpoch) return; + $("#ibkr-data-result").innerHTML = + panel( + "近月历史日线", + table( + ["原始时间戳", "开盘", "最高", "最低", "收盘", "供应商成交量"], + r.bars.map( + (b) => + `${[b.timestamp, b.o, b.h, b.l, b.c, b.v].map((v) => `${escape(v)}`).join("")}`, + ), + ), + escape(r.availability), + ) + + `

${escape(r.symbol)} · ${r.bars.length} 根日线。保留 IBKR 时间戳及成交量口径;跨市场交易日、成交量因子和复权尚未标准化,此预览不会写入账本。

`; + } + } catch (err) { + toast(err.message, true); + } finally { + if (button.id === "ibkr-logout") { + ibkrLoggingOut = false; + for (const id of [ + "ibkr-search-result", + "ibkr-selected", + "ibkr-data-result", + ]) { + const el = $("#" + id); + if (el) el.innerHTML = ""; + } + } + if (button.isConnected) button.disabled = false; + } +}); function drawLine(id, points, currency = false) { const canvas = $("#" + id); if (!canvas) return; @@ -602,13 +806,23 @@ async function refresh() { state.instruments = ins; state.data = d; if (!ins.some((i) => i.id === state.selected)) state.selected = ins[0]?.id; - $("#mode").textContent = d.demo_present - ? "SYNTHETIC DEMO" - : "LOCAL / PRIVATE"; + $("#mode").textContent = + d.environment === "test" + ? "ISOLATED TEST" + : d.environment === "demo" + ? "DEMO WORKSPACE" + : d.demo_present + ? "SYNTHETIC DEMO" + : "LOCAL / PRIVATE"; $("#mode").classList.toggle("demo", d.demo_present); - $("#notice").classList.toggle("hidden", !d.demo_present); + $("#notice").classList.toggle( + "hidden", + !d.demo_present && d.environment !== "test", + ); $("#notice").textContent = - "合成演示工作区 · 公司、行情、财报与新闻均为虚构,不可用于投资判断。真实数据请使用独立数据库。"; + d.environment === "test" + ? "隔离测试环境 · 仅连接模拟网关与测试数据库,禁止使用真实账户资料。" + : "合成演示工作区 · 公司、行情、财报与新闻均为虚构,不可用于投资判断。真实数据请使用独立数据库。"; universe(); await render(); } @@ -680,6 +894,31 @@ document.addEventListener("submit", async (e) => { if (button) button.disabled = true; try { const v = Object.fromEntries(new FormData(f)); + if (f.id === "ibkr-settings-form") { + gatewayMonitor.stop(); + await post("/api/ibkr/settings", { + port: Number(v.port), + ca_pem: v.ca_pem.trim(), + }); + toast("IBKR 连接设置已保存,请重新检测登录状态"); + await render(); + } + if (f.id === "ibkr-search-form") { + if (ibkrLoggingOut) throw new Error("正在登出,请稍候"); + const epoch = ibkrEpoch; + const rows = await post("/api/ibkr/search", { + query: v.query, + by_name: v.mode === "name", + }); + if (epoch !== ibkrEpoch) return; + $("#ibkr-search-result").innerHTML = table( + ["标的 / 市场", "类型", "Conid", ""], + rows.map( + (r) => + `${escape(r.symbol)}${escape(r.companyHeader || r.companyName || r.description)}${escape(r.secType || r.sections.join(" / "))}${escape(r.conid)}`, + ), + ); + } if (f.id === "stress-form") { const r = await post("/api/stress", { as_of: state.asof, @@ -817,7 +1056,7 @@ document.addEventListener("keydown", (e) => { e.preventDefault(); $("#search").focus(); } - if (/^[1-6]$/.test(e.key)) { + if (/^[1-9]$/.test(e.key)) { state.page = Object.keys(names)[Number(e.key) - 1]; render(); } @@ -832,3 +1071,16 @@ try { `

${escape(e.message)}

请启动本地 C++ 服务与 PostgreSQL。

`, ); } + +document.addEventListener("click", async (e) => { + if (e.target.id !== "fetch-fed") return; + const b = e.target; + b.disabled = true; + try { + await post("/api/news/fetch", {}); + if (state.page === "news") render(); + } catch (e) { + toast(e.message, true); + b.disabled = false; + } +}); diff --git a/frontend/gateway-session.js b/frontend/gateway-session.js new file mode 100644 index 0000000..9b0f31f --- /dev/null +++ b/frontend/gateway-session.js @@ -0,0 +1,163 @@ +export function sessionMessage(r) { + if (r.competing) + return { + kind: "warning", + text: "检测到竞争行情会话。请在 IBKR 核对其他设备或 TWS 登录;本终端不会自动抢占。", + }; + if ( + r.initializing && + r.sso_valid === true && + (r.market_ready === false || !r.authenticated) + ) + return { + kind: "initializing", + text: "账户登录有效,行情会话正在初始化。请等待认证完成后,再准备行情或查询标的;初始化请求返回不代表行情已可用。", + }; + if (r.authenticated) + return { + kind: "success", + text: "登录成功:行情会话已认证。可以搜索标的并准备行情。", + }; + if (r.sso_valid === true) + return { + kind: "partial", + text: "账户登录验证成功;行情会话尚未认证。账户与保证金可单独尝试读取,行情查询仍需 IBKR 完成行情认证。", + }; + if (r.sso_valid === false) + return { + kind: "pending", + text: "尚未确认登录成功。请在网关完成登录和双重验证,然后返回终端。", + }; + return { + kind: "error", + text: + "登录状态无法确认:" + (r.sso_error || "网关未返回有效会话验证结果。"), + }; +} +export function createGatewayMonitor({ + post, + display, + isCurrent, + now = () => Date.now(), + schedule = setTimeout, + cancel = clearTimeout, + visible = () => document.visibilityState !== "hidden", +}) { + let revision = 0, + timer = null, + inFlight = false, + watching = false, + deadline = 0, + requested = false, + flightRevision = -1, + lastChecked = 0, + lastMessage = null; + const commit = (m) => { + lastMessage = m; + display(m); + }; + const clear = () => { + if (timer !== null) cancel(timer); + timer = null; + }; + function stop() { + revision++; + watching = false; + requested = false; + lastMessage = null; + clear(); + } + async function check() { + if (!isCurrent()) return; + if (inFlight) { + requested = revision !== flightRevision; + return; + } + if (watching && now() >= deadline) { + watching = false; + commit({ + kind: "warning", + text: "等待登录确认已超时,不能据此判断登录失败。可点击“检测登录状态”重新核对。", + }); + return; + } + if (!visible()) return; + const rev = revision; + flightRevision = rev; + inFlight = true; + display( + lastMessage + ? { ...lastMessage, text: lastMessage.text + "(正在复查…)" } + : { kind: "checking", text: "正在检查本机网关登录与行情认证…" }, + ); + try { + const r = await post("/api/ibkr/connection", {}); + if (rev !== revision || !isCurrent()) return; + if (watching && now() >= deadline) { + watching = false; + revision++; + commit({ + kind: "warning", + text: "等待登录确认已超时,不能据此判断登录失败。可点击“检测登录状态”重新核对。", + }); + return; + } + lastChecked = now(); + const m = sessionMessage(r); + lastMessage = { + ...m, + market_authenticated: + r.authenticated === true && r.market_ready !== false, + checked_at: r.checked_at_ms, + sso_checked_at: r.sso_checked_at_ms, + }; + display(lastMessage); + if (r.authenticated || r.competing) watching = false; + } catch (e) { + if (rev === revision && isCurrent()) + commit({ + kind: "error", + text: "检测失败:" + e.message + "。完成登录后可再次检测。", + }); + } finally { + inFlight = false; + if (requested && isCurrent()) { + requested = false; + clear(); + timer = schedule(() => { + timer = null; + check(); + }, 0); + } else if (watching && isCurrent()) { + clear(); + timer = schedule(() => { + timer = null; + check(); + }, 5000); + } + } + } + function start( + message = "已打开网关登录页,等待你完成登录与双重验证;返回此页将自动检测。", + ) { + stop(); + watching = true; + deadline = now() + 180000; + commit({ + kind: "pending", + text: message, + }); + check(); + } + function focus() { + if ( + isCurrent() && + !inFlight && + (!lastChecked || now() - lastChecked >= 5000) + ) { + clear(); + check(); + } + } + return { start, stop, check, focus }; +} diff --git a/frontend/index.html b/frontend/index.html index 1fe50ca..ab52f85 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -33,6 +33,13 @@ > +
RESEARCH UNIVERSE 0 diff --git a/frontend/release.js b/frontend/release.js new file mode 100644 index 0000000..1557f93 --- /dev/null +++ b/frontend/release.js @@ -0,0 +1,309 @@ +export async function releasePage(ctx) { + const { + state, + api, + post, + escape: E, + fmt: F, + panel, + heading, + toast, + generationValid, + } = ctx; + const content = document.querySelector("#content"); + const $ = (s) => content.querySelector(s); + const label = (name, title, value, type = "number", extra = "") => + ``; + if (state.page === "hedge") { + const models = await api(`/api/hedge/models?as_of=${state.asof}`); + if (!generationValid()) return; + content.innerHTML = + heading( + "DERIVATIVES / SCENARIO LAB", + "衍生品对冲", + "独立假设组合 · 股票、欧式期权、线性期货 · 与现金账本分开核算", + ) + + panel( + "组合假设", + `

以下为可编辑的假设案例,未读取账户持仓。期权采用 Black–Scholes 连续收益率模型;美式期权、提前行权、波动率曲面和期货基差尚未建模。

${label("title", "方案名称", "保护性看跌示例", "text", 'required maxlength="200"')}${label("shock", "价格冲击 %", -10)}${label("volshock", "波动率变化(百分点)", 5)}${label("days", "时间流逝(天)", 7)}
`, + ) + + `
`; + let counter = 0; + const add = ( + p = { + type: "STK", + underlying: "MODEL", + spot: 100, + quantity: 100, + multiplier: 1, + }, + ) => { + const box = document.createElement("div"); + box.className = "hedge-row section-gap"; + box.dataset.id = p.id || `model-${Date.now()}-${++counter}`; + box.innerHTML = `
${label("underlying", "同一标的标识", p.underlying, "text", "required")}${label("spot", "现价 / 期货合约价格", p.spot)}${label("quantity", "数量(空头为负)", p.quantity)}${label("multiplier", "合约乘数", p.multiplier)}${label("strike", "行权价", p.strike ?? 100)}${label("years", "剩余期限(年)", p.years ?? 0.5)}${label("volatility", "年化波动率 %", (p.volatility ?? 0.25) * 100)}${label("rate", "无风险利率 %", (p.rate ?? 0.04) * 100)}${label("yield", "连续收益率 %", (p.yield ?? 0) * 100)}
`; + const update = () => { + const option = box.querySelector("[name=type]").value === "OPT"; + for (const n of [ + "right", + "strike", + "years", + "volatility", + "rate", + "yield", + ]) + box.querySelector(`[name=${n}]`).disabled = !option; + }; + box.querySelector("[name=type]").onchange = update; + update(); + box.querySelector(".remove-hedge").onclick = () => box.remove(); + $("#hedge-rows").append(box); + }; + add(); + add({ + type: "OPT", + underlying: "MODEL", + spot: 100, + quantity: 1, + multiplier: 100, + right: "put", + }); + $("#add-hedge").onclick = () => add(); + const book = () => { + const form = $("#hedge-form"); + const val = (n) => Number(form.elements[n].value); + return { + currency: form.elements.currency.value, + scenario: { + spot: val("shock") / 100, + volatility: val("volshock") / 100, + days: val("days"), + }, + positions: [...content.querySelectorAll(".hedge-row")].map((row) => { + const get = (n) => row.querySelector(`[name=${n}]`).value; + const p = { + id: row.dataset.id, + type: get("type"), + underlying: get("underlying"), + spot: Number(get("spot")), + quantity: Number(get("quantity")), + multiplier: Number(get("multiplier")), + }; + if (p.type === "OPT") { + for (const n of ["strike", "years", "volatility", "rate", "yield"]) + p[n] = + Number(get(n)) / + (["volatility", "rate", "yield"].includes(n) ? 100 : 1); + p.right = get("right"); + p.style = "European"; + } + return p; + }), + }; + }; + const show = (r) => { + $("#hedge-result").innerHTML = panel( + "模型结果", + `
模型市值 · ${E(r.currency)}

${F(r.market_value)}

情景损益 · ${E(r.currency)}

${F(r.scenario_pnl)}

Vega / +1百分点

${F(r.vega_1pp)}

Theta / 日

${F(r.theta_day)}

${Object.entries( + r.underlyings, + ) + .map( + ([u, g]) => + ``, + ) + .join( + "", + )}
标的Delta 单位Delta 名义敞口Gamma × S² / 2理论股票对冲数量
${E(u)}${F(g.delta_units, 4)}${F(g.delta_notional)}${F(g.gamma_half_notional)}${F(g.delta_neutral_stock_units, 4)}

对冲数量仅中和当前模型 Delta;并非交易建议或保证金估计。情景采用全量重新定价,正负号按持仓方向计算。

`, + ); + }; + $("#hedge-form").onsubmit = async (e) => { + e.preventDefault(); + try { + const r = await post("/api/hedge/analyze", book()); + if (generationValid()) show(r); + } catch (e) { + if (generationValid()) toast(e.message, true); + } + }; + $("#save-hedge").onclick = async () => { + try { + await post("/api/hedge/models", { + date: state.asof, + title: $("#hedge-form").elements.title.value, + assumptions: book(), + }); + if (generationValid()) toast("方案版本已保存;刷新可加载"); + } catch (e) { + toast(e.message, true); + } + }; + $("#saved-hedge").onchange = (e) => { + if (e.target.value === "") return; + const m = models[Number(e.target.value)], + f = $("#hedge-form"); + f.elements.title.value = m.title; + f.elements.currency.value = m.assumptions.currency; + f.elements.shock.value = m.assumptions.scenario.spot * 100; + f.elements.volshock.value = m.assumptions.scenario.volatility * 100; + f.elements.days.value = m.assumptions.scenario.days; + $("#hedge-rows").replaceChildren(); + m.assumptions.positions.forEach(add); + show(m.result); + }; + } else if (state.page === "macro") { + const r = await api(`/api/macro?as_of=${state.asof}`); + if (!generationValid()) return; + const titles = { + gdp: "名义 GDP", + growth: "实际 GDP 增速", + inflation: "居民消费价格通胀", + }; + content.innerHTML = + heading( + "GLOBAL / MACRO OBSERVATORY", + "宏观数据", + "世界银行 WDI · 免费官方年度数据 · 保留抓取版本", + ) + + panel( + "获取官方数据", + `

报告期与发布日期不同。WDI 未提供每笔历史发布日期,本平台从实际抓取日起允许历史分析使用;缺失值保持为空。抓取范围 2010–2025,可在分析日期中检查可见版本。

`, + ) + + panel( + "年度观测", + `
${ + r.observations + .slice() + .reverse() + .map( + (o) => + ``, + ) + .join("") || + '' + }
国家指标报告期值单位抓取日期来源
${E(o.country)}${E(titles[o.indicator])}${E(o.period_end)}${F(o.value)}${E(o.unit)}${E(o.date)}WDI ↗
当前分析日期没有已抓取数据
`, + `${r.history.length} 个历史版本`, + ); + const series = [ + ...new Set(r.observations.map((o) => `${o.country}/${o.indicator}`)), + ]; + if (series.length) { + const block = document.createElement("div"); + block.className = "section-gap"; + block.innerHTML = panel( + "年度趋势", + `
${ctx.chart("macro-chart", "GDP 以万亿美元显示;增速和通胀以百分比显示。缺失年度不连线。")}`, + ); + content.append(block); + const draw = () => { + const key = $("#macro-series").value; + ctx.drawLine( + "macro-chart", + r.observations + .filter((o) => `${o.country}/${o.indicator}` === key) + .sort((a, b) => a.period_end.localeCompare(b.period_end)) + .map((o) => ({ + date: o.period_end, + value: + o.value == null + ? null + : o.value / (o.indicator === "gdp" ? 1e12 : 1), + })), + ); + }; + $("#macro-series").onchange = draw; + draw(); + } + $("#macro-form").onsubmit = async (e) => { + e.preventDefault(); + const f = e.target, + b = f.querySelector("button"); + b.disabled = true; + try { + await post("/api/macro/fetch", { + country: f.elements.country.value, + indicator: f.elements.indicator.value, + }); + if (generationValid()) ctx.reload(); + } catch (e) { + if (generationValid()) { + toast(e.message, true); + b.disabled = false; + } + } + }; + } else if (state.page === "margin") { + content.innerHTML = + heading( + "BROKER / MARGIN MONITOR", + "保证金监控", + "本设备 IBKR 会话 · 手动读取券商账户汇总", + ) + + panel( + "账户连接", + `

先在数据中心登录本机网关。账户与保证金只在当前页面读取,不存入研究数据库,不参与内部模型估算。

最短刷新间隔 10 秒;券商时间戳超过 120 秒会标记为过期。10% 剩余流动性比例仅为本地提醒阈值。

`, + ) + + `
`; + $("#margin-accounts").onclick = async () => { + try { + const rows = await post("/api/ibkr/accounts", {}); + if (!generationValid()) return; + $("#margin-form").elements.account.innerHTML = rows + .map( + (a) => + ``, + ) + .join(""); + } catch (e) { + if (generationValid()) toast(e.message, true); + } + }; + $("#margin-form").onsubmit = async (e) => { + e.preventDefault(); + $("#margin-result").textContent = "正在读取券商保证金…"; + try { + const r = await post("/api/ibkr/margin", { + account: e.target.elements.account.value, + }); + if (!generationValid()) return; + const status = { + unknown: "数据不足 / 状态未知", + critical: "剩余流动性不足", + reported: "券商已报告", + "low-buffer": "流动性缓冲偏低", + }; + $("#margin-result").innerHTML = panel( + status[r.status] || "未知状态", + `

剩余流动性 / 净清算值:${r.liquidity_ratio == null ? "—" : F(r.liquidity_ratio * 100) + "%"} · 读取时间 ${E(new Date(r.retrieved_at_ms).toLocaleString())}

${r.fields.map((v) => ``).join("")}
券商字段值币种券商更新时间时效
${E(v.label)}${F(v.value)}${E(v.currency || "未知")}${v.broker_timestamp ? E(new Date(v.broker_timestamp).toLocaleString()) : "未知"}${v.stale ? "过期 / 未知" : "近期"}

使用券商汇总值,不叠加证券及商品分项。账户购买力不等于现金;本页不能推导强平价格。

`, + ); + } catch (e) { + if (generationValid()) { + $("#margin-result").textContent = "本次读取失败;保证金状态未知。"; + toast(e.message, true); + } + } + }; + } +} diff --git a/frontend/style.css b/frontend/style.css index 7d10f30..648cd83 100644 --- a/frontend/style.css +++ b/frontend/style.css @@ -917,3 +917,56 @@ pre { height: 230px; } } + +#ibkr-search-result { + max-height: 320px; + overflow: auto; +} + +.gateway-login { + display: inline-block; + padding: 9px 12px; + border: 1px solid #355450; + border-radius: 6px; + background: #173e38; + color: #a9e8d8; + text-decoration: none; +} + +.hedge-row { + border: 1px solid var(--border, #293541); + border-radius: 8px; + padding: 18px; +} +.hedge-row input { + width: 100%; + min-width: 0; +} +.hedge-row input:disabled, +.hedge-row select:disabled { + opacity: 0.35; +} +.hedge-row .form-grid { + grid-template-columns: repeat(auto-fit, minmax(140px, 1fr)); +} +.rail nav button { + padding-top: 9px; + padding-bottom: 9px; +} + +#ibkr-status-result { + border-left: 3px solid currentColor; + padding: 10px 12px; + line-height: 1.8; +} +#ibkr-status-result[data-state="success"], +#ibkr-status-result[data-state="partial"] { + color: var(--accent, #49cbbb); +} +#ibkr-status-result[data-state="warning"], +#ibkr-status-result[data-state="pending"] { + color: #e0b66b; +} +#ibkr-status-result[data-state="error"] { + color: #f18484; +} diff --git a/scripts/check-live-data.py b/scripts/check-live-data.py new file mode 100644 index 0000000..b73bc58 --- /dev/null +++ b/scripts/check-live-data.py @@ -0,0 +1,15 @@ +"""Manual read-only user market-data diagnostic; never used by the isolated test suite.""" +import argparse,json,urllib.request +p=argparse.ArgumentParser();p.add_argument('--url',required=True);p.add_argument('--instrument',default='us:ibm');a=p.parse_args() +def get(path):return json.load(urllib.request.urlopen(a.url+path,timeout=60)) +from urllib.parse import urlencode +r=get('/api/research?'+urlencode({'instrument':a.instrument})) +d=get('/api/data') +assert not d['demo_present'],'Use real data workspace' +assert r['quote'] and r['quote']['status']=='eod' +assert r['quote']['source']=='Alpha Vantage' +assert len(r['bars'])>0 and len(r['history'])>0 +assert r['quote']['price']==r['bars'][-1]['close'] +assert r['quote']['date']==r['bars'][-1]['date'] +assert all(f['source']=='SEC CompanyFacts' for f in r['history']) +print(json.dumps({'ok':True,'bars':len(r['bars']),'facts':len(r['history']),'quote_date':r['quote']['date'],'checks':7},indent=2)) diff --git a/scripts/dev.sh b/scripts/dev.sh index 718f0b3..199e719 100755 --- a/scripts/dev.sh +++ b/scripts/dev.sh @@ -3,6 +3,7 @@ set -euo pipefail repo_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" cd "$repo_dir" deps="$repo_dir/.local/deps" +export REACH_ENV="${REACH_ENV:-demo}" cmake_args=() if [[ -d "$deps/usr" ]]; then export PATH="$deps/usr/bin:$PATH" diff --git a/scripts/device_guard.py b/scripts/device_guard.py new file mode 100644 index 0000000..18413ce --- /dev/null +++ b/scripts/device_guard.py @@ -0,0 +1,10 @@ +"""Verify a previously provisioned Gateway belongs to this Linux device.""" +import hashlib,json,re,sys +from pathlib import Path +machine=Path('/etc/machine-id').read_text().strip() +if not re.fullmatch('[0-9a-fA-F]{32}',machine):raise SystemExit('Machine identity unavailable; Gateway startup denied.') +device=hashlib.sha256(('ReachTerminal/IBKR/device/v1:'+machine).encode()).hexdigest() +marker=Path(sys.argv[1])/'.reach-device.json' +if not marker.is_file():raise SystemExit('Gateway is not provisioned for this device. Install a fresh local Gateway; do not copy runtime directories.') +if json.loads(marker.read_text()).get('device_id')!=device:raise SystemExit('Gateway belongs to another device. Migration is prohibited; install and log in locally.') +print('Gateway device binding verified.') diff --git a/scripts/embed_assets.py b/scripts/embed_assets.py new file mode 100644 index 0000000..8d5f378 --- /dev/null +++ b/scripts/embed_assets.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python3 +"""Generate C++ read-only resources from an explicit public asset allowlist.""" +import argparse,hashlib +from pathlib import Path +p=argparse.ArgumentParser();p.add_argument('--root',required=True);p.add_argument('--output',required=True);a=p.parse_args();root=Path(a.root);out=Path(a.output);out.mkdir(parents=True,exist_ok=True) +assets=[('/', 'index.html','text/html; charset=utf-8'),('/index.html','index.html','text/html; charset=utf-8'),('/app.js','app.js','text/javascript; charset=utf-8'),('/release.js','release.js','text/javascript; charset=utf-8'),('/gateway-session.js','gateway-session.js','text/javascript; charset=utf-8'),('/style.css','style.css','text/css; charset=utf-8')] +def literal(b): + text=b.decode('utf-8');tag='r'+hashlib.sha256(b).hexdigest()[:12];assert ')'+tag+'"' not in text and '\0' not in text;return f'R"{tag}({text}){tag}"' +def write(path,text): + if not path.exists() or path.read_text()!=text:path.write_text(text) +header='''#pragma once +#include +namespace reach::assets { +struct Asset {std::string_view path, mime, body;}; +const Asset* find(std::string_view path); +std::string_view schema(); +} +''' +cpp='#include "embedded_assets.hpp"\nnamespace reach::assets {\nstatic const Asset resources[]={\n' +for url,file,mime in assets:cpp+='{"'+url+'","'+mime+'",'+literal((root/'frontend'/file).read_bytes())+'},\n' +cpp+='};\nconst Asset* find(std::string_view path){for(auto &a:resources)if(a.path==path)return &a;return nullptr;}\nstd::string_view schema(){return '+literal((root/'db/001_initial.sql').read_bytes())+';}\n}\n' +write(out/'embedded_assets.hpp',header);write(out/'embedded_assets.cpp',cpp) diff --git a/scripts/gateway.sh b/scripts/gateway.sh new file mode 100755 index 0000000..e546dce --- /dev/null +++ b/scripts/gateway.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +set -euo pipefail +repo_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" +[[ "${REACH_ENV:-user}" == "user" ]] || { echo "Real Gateway cannot start from a test/demo runtime." >&2; exit 1; } +gateway_dir="${REACH_GATEWAY_DIR:-$repo_dir/.local/clientportal}" +if [[ -x "$repo_dir/.local/java-runtime-21/usr/lib/jvm/java-21-openjdk-amd64/bin/java" ]]; then + export PATH="$repo_dir/.local/java-runtime-21/usr/lib/jvm/java-21-openjdk-amd64/bin:$PATH" +fi +command -v java >/dev/null || { echo 'Install Java (JRE 11 or newer) first.' >&2; exit 1; } +[[ -f "$gateway_dir/root/conf.yaml" ]] || { echo 'Download and extract the official Client Portal Gateway; see docs/ibkr.md.' >&2; exit 1; } +python3 "$repo_dir/scripts/device_guard.py" "$gateway_dir" +cd "$gateway_dir" +exec bash bin/run.sh root/conf.yaml diff --git a/scripts/live.sh b/scripts/live.sh index 9866889..cc8731f 100755 --- a/scripts/live.sh +++ b/scripts/live.sh @@ -11,6 +11,7 @@ if [[ -n "${REACH_DATABASE_URL:-}" ]]; then echo "Unset REACH_DATABASE_URL before live.sh to keep the real-data workspace isolated." >&2 exit 1 fi +export REACH_ENV=user export REACH_DB_NAME=reachterminal_live export REACH_PORT="${REACH_PORT:-8788}" exec "$repo_dir/scripts/dev.sh" diff --git a/scripts/package-binary.py b/scripts/package-binary.py new file mode 100644 index 0000000..d0fafbe --- /dev/null +++ b/scripts/package-binary.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python3 +"""Package the Linux executable with embedded frontend; no runtime state copied.""" +import argparse,hashlib,shutil,tarfile,platform +from pathlib import Path +root=Path(__file__).resolve().parents[1] +p=argparse.ArgumentParser();p.add_argument('--output',required=True);a=p.parse_args();out=Path(a.output).resolve();out.mkdir(parents=True,exist_ok=True) +name='ReachTerminal-0.1.0-linux-'+platform.machine();folder=out/name;folder.mkdir(exist_ok=True) +shutil.copy2(root/'build/reachterminal',folder/'reachterminal');shutil.copy2(root/'LICENSE',folder/'LICENSE') +(folder/'start.sh').write_text('''#!/usr/bin/env bash +set -euo pipefail +base="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +: "${REACH_DATABASE_URL:?请设置本机 PostgreSQL 连接 REACH_DATABASE_URL;不会打包或迁移原设备数据库和网关。}" +export REACH_ENV=user +export REACH_ROOT="${REACH_ROOT:-$base/workspace}" +export REACH_PORT="${REACH_PORT:-8788}" +mkdir -p "$REACH_ROOT" +exec "$base/reachterminal" serve +''');(folder/'start.sh').chmod(0o755) +(folder/'README.txt').write_text('''ReachTerminal 0.1.0 · Linux 本地内嵌版 + +HTML、JavaScript、CSS 和数据库初始化 SQL 已内嵌到 C++ 可执行程序。 +使用浏览器访问程序提供的本机地址(默认 http://127.0.0.1:8788/)。 +启动前设置 REACH_DATABASE_URL 指向用户自己的 PostgreSQL 数据库,运行 ./start.sh。 +数据库名称不能是 reachterminal、reachterminal_demo_* 或 reachterminal_test_*。 +依赖兼容的 libpq、libcurl、libssl/libcrypto、libxml2、libcpp-httplib 及其系统依赖;本包不是静态跨发行版二进制。 +不需要 Node.js、Python、frontend/ 或 db/ 目录运行用户终端。 +本机已安装仓库可继续用 scripts/live.sh;该脚本负责本地数据库与开发依赖配置。 + +程序包没有账户、密钥、CA 配置、网关、会话、用户导出或数据库。 +IBKR Gateway 在每台设备独立安装、设置和登录,不能迁移或复用设备状态。 +登录页关闭不会代表失败:返回数据中心,查看账户验证及行情会话两种状态。 +登录监控持续三分钟,SSO 账户验证按官方限额最多每60秒一次。 +行情未认证时可点击“连接行情会话(不抢占)”;终端不会自动执行或抢占其他会话。 +''') +archive=out/(name+'.tar.gz') +with tarfile.open(archive,'w:gz') as t: + for file in ['reachterminal','LICENSE','start.sh','README.txt']:t.add(folder/file,arcname=name+'/'+file,recursive=False) +(out/(archive.name+'.sha256')).write_text(hashlib.sha256(archive.read_bytes()).hexdigest()+' '+archive.name+'\n') +print(archive) diff --git a/scripts/package-release.py b/scripts/package-release.py new file mode 100644 index 0000000..d4469a5 --- /dev/null +++ b/scripts/package-release.py @@ -0,0 +1,18 @@ +#!/usr/bin/env python3 +"""Create a source-only release archive. Never include runtime data or credentials.""" +import argparse,hashlib,tarfile,re +from pathlib import Path +root=Path(__file__).resolve().parents[1] +p=argparse.ArgumentParser();p.add_argument('--output',required=True);a=p.parse_args();out=Path(a.output).resolve();out.mkdir(parents=True,exist_ok=True) +version=re.search(r'project\(ReachTerminal VERSION ([0-9.]+)',(root/'CMakeLists.txt').read_text())[1] +name=f'ReachTerminal-{version}';target=out/(name+'.tar.gz') +allowed={'backend':{'.hpp','.cpp'},'frontend':{'.html','.js','.css'},'db':{'.sql'},'scripts':{'.py','.sh'},'tests':{'.cpp','.py','.mjs'},'docs':{'.md','.json','.png'},'examples':{'.json','.csv','.xml'},'.github':{'.yml','.yaml'}} +files=[root/f for f in ['CMakeLists.txt','README.md','LICENSE','.gitignore','.clang-format']] +for directory,extensions in allowed.items(): + for f in (root/directory).rglob('*'): + if f.is_file() and not f.is_symlink() and f.suffix in extensions and '__pycache__' not in f.parts:files.append(f) +with tarfile.open(target,'w:gz') as tar: + for f in sorted(files): + if f.exists():tar.add(f,arcname=name+'/'+str(f.relative_to(root)),recursive=False) +digest=hashlib.sha256(target.read_bytes()).hexdigest();(out/(target.name+'.sha256')).write_text(digest+' '+target.name+'\n') +print(f'Source release: {target}; {len(files)} allowlisted files; SHA256 {digest}') diff --git a/scripts/provision_gateway.py b/scripts/provision_gateway.py new file mode 100644 index 0000000..34027b6 --- /dev/null +++ b/scripts/provision_gateway.py @@ -0,0 +1,18 @@ +"""Provision a fresh official Gateway archive on this device; never rebind old runtimes.""" +import argparse,hashlib,json,re,zipfile +from pathlib import Path +p=argparse.ArgumentParser();p.add_argument('--archive',required=True);p.add_argument('--destination',required=True);a=p.parse_args() +identity=Path('/etc/machine-id').read_text().strip() +if not re.fullmatch('[0-9a-fA-F]{32}',identity):raise SystemExit('Machine identity unavailable.') +device=hashlib.sha256(('ReachTerminal/IBKR/device/v1:'+identity).encode()).hexdigest() +dest=Path(a.destination).resolve() +if dest.exists():raise SystemExit('Destination must not exist. Existing or migrated Gateways cannot be rebound.') +with zipfile.ZipFile(a.archive) as z: + if not {'root/conf.yaml','bin/run.sh'}.issubset(z.namelist()):raise SystemExit('Expected official Client Portal Gateway archive.') + if any(Path(x).name=='.reach-device.json' for x in z.namelist()):raise SystemExit('Archive contains device state; migration prohibited.') + for info in z.infolist(): + if not (dest/info.filename).resolve().is_relative_to(dest):raise SystemExit('Unsafe archive path.') + if (info.external_attr>>16)&0o170000==0o120000:raise SystemExit('Archive symlinks are not accepted.') + dest.mkdir(parents=True,mode=0o700);z.extractall(dest) +marker=dest/'.reach-device.json';marker.write_text(json.dumps({'device_id':device}));marker.chmod(0o600) +print('Fresh Gateway provisioned on this device. Configure a unique local HTTPS certificate, then sign in locally.') diff --git a/scripts/test-isolated.py b/scripts/test-isolated.py new file mode 100755 index 0000000..03ec395 --- /dev/null +++ b/scripts/test-isolated.py @@ -0,0 +1,51 @@ +#!/usr/bin/env python3 +"""Run all mutating integration tests in a fresh private cluster and state directory.""" +import json,os,socket,subprocess,sys,tempfile,time,urllib.request +from pathlib import Path +root=Path(__file__).resolve().parents[1] +def executable(name): + p=root/'.local/deps/usr/lib/postgresql/18/bin'/name + if p.exists():return str(p) + import shutil + q=shutil.which(name) + if q:return q + return str(Path(subprocess.check_output(['pg_config','--bindir'],text=True).strip())/name) +state=root/'.local/test-runs';state.mkdir(parents=True,exist_ok=True) +run=Path(tempfile.mkdtemp(prefix='isolated-',dir=state));run.chmod(0o700) +env={k:v for k,v in os.environ.items() if not k.startswith('PG') and k not in ['REACH_DATABASE_URL','REACH_SEC_USER_AGENT','REACH_ALPHA_API_KEY','REACH_ROOT']} +env['LD_LIBRARY_PATH']=str(root/'.local/deps/usr/lib/x86_64-linux-gnu')+(':'+env['LD_LIBRARY_PATH'] if env.get('LD_LIBRARY_PATH') else '') +def command(args,**kw):return subprocess.run([str(x) for x in args],env=env,check=True,**kw) +def free_port(): + with socket.socket() as s:s.bind(('127.0.0.1',0));return s.getsockname()[1] +pg_port=free_port();http_port=free_port();url=f'http://127.0.0.1:{http_port}' +with socket.socket() as s:s.bind(('127.0.0.1',5001)) # Refuse an existing mock or real process. +socket_dir=Path(tempfile.mkdtemp(prefix='reach-test-socket-'));socket_dir.chmod(0o700);(run/'app').mkdir() +for name in ['examples']:(run/'app'/name).symlink_to(root/name,target_is_directory=True) +command(['openssl','req','-x509','-newkey','rsa:2048','-nodes','-keyout',run/'mock-key.pem','-out',run/'mock-cert.pem','-days','2','-subj','/CN=localhost','-addext','subjectAltName=DNS:localhost','-addext','basicConstraints=critical,CA:TRUE'],stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL) +command([executable('initdb'),'-D',run/'pgdata','-A','trust','--no-locale','--encoding=UTF8'],stdout=subprocess.DEVNULL) +processes=[];started=False +try: + command([executable('pg_ctl'),'-D',run/'pgdata','-l',run/'postgres.log','-o',f"-k '{socket_dir}' -p {pg_port} -h ''",'start'],stdout=subprocess.DEVNULL);started=True + name='reachterminal_test_isolated' + command([executable('createdb'),'-h',socket_dir,'-p',pg_port,name]) + env.update(REACH_ENV='test',REACH_ROOT=str(run/'app'),REACH_PORT=str(http_port),REACH_DATABASE_URL=f"host='{socket_dir}' port={pg_port} dbname={name}") + for args,log in [([sys.executable,root/'tests/ibkr_mock.py','--fixture-dir',run],'mock.log'),([root/'build/reachterminal','serve'],'app.log')]: + output=open(run/log,'w');processes.append(subprocess.Popen([str(x) for x in args],env=env,stdout=output,stderr=subprocess.STDOUT)) + for _ in range(60): + if any(p.poll() is not None for p in processes):raise RuntimeError('Isolated process failed; inspect test logs') + try: + data=json.load(urllib.request.urlopen(url+'/api/health',timeout=1)) + if data.get('environment')=='test':break + except OSError:pass + time.sleep(.1) + else:raise RuntimeError('Isolated server did not start') + command([sys.executable,root/'tests/ibkr_gateway_test.py','--url',url,'--fixture-dir',run]) + command([sys.executable,root/'tests/integration.py','--url',url,'--root',root,'--report',run/'integration-report.json']) + command([sys.executable,root/'tests/release_integration.py','--url',url]) + print('ISOLATED_TEST_REPORTS='+str(run)) +finally: + for p in reversed(processes): + p.terminate() + try:p.wait(timeout=5) + except subprocess.TimeoutExpired:p.kill();p.wait() + if started:command([executable('pg_ctl'),'-D',run/'pgdata','stop','-m','fast'],stdout=subprocess.DEVNULL) diff --git a/tests/core_tests.cpp b/tests/core_tests.cpp index 667f602..c51f69a 100644 --- a/tests/core_tests.cpp +++ b/tests/core_tests.cpp @@ -1,4 +1,5 @@ #include "../backend/core.hpp" +#include "../backend/ibkr.hpp" #include "../backend/imports.hpp" #include "../backend/market.hpp" #include @@ -306,6 +307,72 @@ int main() { rejects([&] { alpha_daily_import(future, instrument()); }, "future market data rejected"); } + { + check(ibkr_conid(265598) == "265598", "IBKR integer conid normalized"); + rejects([] { ibkr_conid("../orders"); }, "IBKR conid cannot inject paths"); + rejects([] { ibkr_settings({{"port", 5000}, {"api_key", "secret"}}); }, + "Gateway rejects API key config"); + rejects([] { ibkr_settings({{"port", 5000}, {"url", "https://external.test"}}); }, + "Gateway cannot target external hosts"); + rejects([] { ibkr_settings({{"port", 80}}); }, "Gateway privileged ports rejected"); + rejects( + [] { ibkr_settings({{"port", 5000}, {"ca_pem", "-----BEGIN PRIVATE KEY-----"}}); }, + "Private keys rejected"); + auto rows = ibkr_search_rows( + json::array({{{"conid", "265598"}, + {"symbol", "AAPL"}, + {"accountId", "private"}, + {"sections", json::array({{{"secType", "STK"}}})}}})); + check(rows[0]["sections"][0] == "STK" && !rows[0].contains("accountId"), + "IBKR search projects public fields only"); + check(ibkr_search_rows(json::array({{{"conid", "-1"}, {"secType", "BOND"}}, + {{"conid", "8314"}, {"symbol", "IBM"}}})) + .size() == 1, + "IBKR bond issuer sentinel does not discard valid contracts"); + auto snap = ibkr_snapshot(json::array({{{"conid", 265598}, + {"31", "C193.18"}, + {"6509", "DpB"}, + {"73", "private position"}}}), + "265598"); + check(snap["availability"] == "延迟" && !snap["pending"].get(), + "IBKR delayed availability preserved"); + check(snap["fields"][0]["value"] == "C193.18" && + snap.dump().find("private position") == std::string::npos, + "IBKR prefix retained, position fields excluded"); + check(ibkr_snapshot(json::array({{{"conid", 265598}}}), "265598")["pending"] == true, + "IBKR preflight missingness retained"); + check(ibkr_snapshot(json::array({{{"conid", 999}, {"31", "100"}}}), + "265598")["pending"] == true, + "wrong snapshot conid not consumed"); + } + { + json bound = {{"port", 5000}, {"ca_pem", ""}, {"device_id", "device-a"}}; + check(ibkr_bound_settings(bound, "device-a")["port"] == 5000, + "IBKR settings accepted on owner device"); + rejects([&] { ibkr_bound_settings(bound, "device-b"); }, + "IBKR cross-device settings rejected"); + bound.erase("device_id"); + rejects([&] { ibkr_bound_settings(bound, "device-a"); }, + "unbound legacy IBKR settings not inherited"); + } + { + workspace_environment("user", "reachterminal_live"); + workspace_environment("test", "reachterminal_test_unit"); + rejects([] { workspace_environment("test", "reachterminal_live"); }, + "test runtime cannot open user database"); + rejects([] { workspace_environment("user", "reachterminal_test_unit"); }, + "user runtime cannot open test database"); + rejects([]{workspace_environment("user","reachterminal_demo_fixture");},"user runtime cannot open demo database"); + rejects([] { gateway_environment("test", 5000); }, + "test runtime cannot reach real Gateway"); + rejects([] { gateway_environment("user", 5001); }, + "user runtime cannot reach mock Gateway"); + rejects([] { gateway_environment("demo", 5000); }, + "demo runtime cannot reach any Gateway"); + rejects( + [] { user_batch("user", {{"instruments", json::array({{{"id", "demo:fake"}}})}}); }, + "user workspace rejects synthetic demo batch"); + } std::cout << json({{"ok", true}, {"checks", checks}}).dump() << '\n'; return 0; } catch (const std::exception &e) { diff --git a/tests/gateway_session_test.mjs b/tests/gateway_session_test.mjs new file mode 100644 index 0000000..4886fc0 --- /dev/null +++ b/tests/gateway_session_test.mjs @@ -0,0 +1,132 @@ +import assert from "node:assert/strict"; +import { + sessionMessage, + createGatewayMonitor, +} from "../frontend/gateway-session.js"; +let checks = 0; +const check = (x) => { + assert.ok(x); + checks++; +}; +check(sessionMessage({ authenticated: true }).kind === "success"); +check( + sessionMessage({ sso_valid: true, authenticated: false }).kind === "partial", +); +check(sessionMessage({ sso_valid: false }).kind === "pending"); +check(sessionMessage({}).kind === "error"); +check( + sessionMessage({ authenticated: true, competing: true }).kind === "warning", +); +let resolve, + calls = 0, + display = [], + clock = 0, + current = true, + tasks = []; +const monitor = createGatewayMonitor({ + post: () => { + calls++; + return new Promise((r) => (resolve = r)); + }, + display: (m) => display.push(m), + isCurrent: () => current, + now: () => clock, + schedule: (f, ms) => { + tasks.push({ f, ms }); + return tasks.length; + }, + cancel: () => {}, + visible: () => true, +}); +const flush = () => new Promise((r) => setImmediate(r)); +monitor.start(); +monitor.focus(); +check(calls === 1); +monitor.stop(); +resolve({ authenticated: true }); +await flush(); +check(!display.some((m) => m.kind === "success")); +check(tasks.length === 0); +monitor.start(); +resolve({ sso_valid: true, authenticated: false }); +await flush(); +check(display.at(-1).kind === "partial"); +clock = 180001; +await tasks.at(-1).f(); +check(display.at(-1).text.includes("超时")); +check(calls === 2); +current = false; +await monitor.check(); +check(calls === 2); +let hiddenCalls = 0; +const hidden = createGatewayMonitor({ + post: async () => { + hiddenCalls++; + return { authenticated: true }; + }, + display: () => {}, + isCurrent: () => true, + visible: () => false, +}); +hidden.start(); +check(hiddenCalls === 0); +hidden.stop(); +console.log(`${checks} gateway UI state checks passed`); + +clock = 200000; +current = true; +display = []; +monitor.start(); +clock = 380001; +resolve({ authenticated: true }); +await flush(); +check(display.at(-1).text.includes("超时")); +check(!display.some((m) => m.kind === "success")); +console.log("2 delayed-response deadline checks passed"); +let done, + failed, + observed = []; +const stable = createGatewayMonitor({ + post: () => + new Promise((r, j) => { + done = r; + failed = j; + }), + display: (m) => observed.push(m), + isCurrent: () => true, + visible: () => true, +}); +let result = stable.check(); +done({ sso_valid: true, authenticated: false }); +await result; +result = stable.check(); +check(observed.at(-1).kind === "partial"); +check(observed.at(-1).text.includes("复查")); +failed(new Error("synthetic offline")); +await result; +check(observed.at(-1).kind === "error"); +result = stable.check(); +check(observed.at(-1).kind === "error"); +stable.stop(); +done({ authenticated: true }); +await result; +console.log("4 retained-status/error refresh checks passed"); + +check( + sessionMessage({ initializing: true, sso_valid: true, authenticated: false }) + .kind === "initializing", +); +check( + sessionMessage({ initializing: true, authenticated: true }).kind === + "success", +); +console.log("2 warm-up state checks passed"); +check( + sessionMessage({ + sso_valid: true, + authenticated: true, + initializing: true, + market_ready: false, + }).kind === "initializing", +); +console.log("1 account-bootstrap readiness check passed"); diff --git a/tests/ibkr_gateway_test.py b/tests/ibkr_gateway_test.py new file mode 100644 index 0000000..957176b --- /dev/null +++ b/tests/ibkr_gateway_test.py @@ -0,0 +1,69 @@ +import json,time,urllib.request,urllib.error +from pathlib import Path +import argparse +p=argparse.ArgumentParser();p.add_argument('--url',required=True);p.add_argument('--fixture-dir',required=True);a=p.parse_args();fixture=Path(a.fixture_dir) +base=a.url;session=json.load(urllib.request.urlopen(base+'/api/session')) +assert session.get('environment')=='test','Refusing to modify real user Gateway settings' +token=session['token'];checks=[] +def call(path,body=None,expected=200,token_value=token): + time.sleep(.3) + req=urllib.request.Request(base+path,data=json.dumps(body).encode() if body is not None else None,headers={'X-Reach-Token':token_value,'Content-Type':'application/json'}) + try: + with urllib.request.urlopen(req,timeout=30) as r:status=r.status;data=json.load(r) + except urllib.error.HTTPError as e:status=e.code;data=json.loads(e.read()) if e.code!=403 else {} + assert status==expected,(path,status,data) + return data +def check(ok,label):assert ok,label;checks.append(label) +check('ca_pem' not in call('/api/ibkr/settings'),'public settings omit certificate') +check(call('/api/ibkr/settings')['login_url'] is None,'test runtime cannot open real login') +call('/api/ibkr/settings',{'port':5000},400);checks.append('test runtime blocks real Gateway port') +call('/api/ibkr/settings',{'port':5001,'api_key':'fake'},400);checks.append('API keys rejected for Gateway') +call('/api/ibkr/settings',{'port':5001,'url':'https://external.test'},400);checks.append('external targets rejected') +call('/api/ibkr/settings',{'port':5001},403,token_value='bad');checks.append('write token enforced') +call('/api/ibkr/settings',{'port':5001});call('/api/ibkr/status',{},400);checks.append('untrusted TLS rejected') +cert=Path(fixture/'mock-cert.pem').read_text();call('/api/ibkr/settings',{'port':5001,'ca_pem':cert}) +s=call('/api/ibkr/status',{});check(s=={'authenticated':True,'competing':False,'connected':True},'status projection excludes hardware/account details') +conn=call('/api/ibkr/connection',{});check(conn['sso_valid'] and conn['authenticated'],'dual session verification') +check('PRIVATE-SSO' not in json.dumps(conn) and 'USER_ID' not in conn,'SSO identity excluded') +Path(fixture/'mock-mode').write_text('readonly');conn=call('/api/ibkr/connection',{});check(conn['sso_valid'] and not conn['authenticated'],'read-only login distinct from brokerage authentication') +check(call('/api/ibkr/connect-market',{})=={'requested':True,'authenticated':True,'competing':False},'manual market initialization uses fixed non-competing payload') +Path(fixture/'mock-mode').write_text('initializing');pending=call('/api/ibkr/connect-market',{});check(pending['requested'] and not pending['authenticated'],'incomplete init is pending rather than success') +conn=call('/api/ibkr/connection',{});check(not conn['market_ready'],'missing account bootstrap cannot report market ready') +Path(fixture/'mock-mode').write_text('ok');time.sleep(5.1);conn=call('/api/ibkr/connection',{});check(conn['market_ready'] and not conn['initializing'],'bounded account bootstrap completes asynchronous initialization') +rows=call('/api/ibkr/search',{'query':'Apple & AAPL','by_name':True});check(rows[0]['conid']=='265598' and 'secret' not in rows[0],'encoded search with public projection') +detail=call('/api/ibkr/detail',{'conid':'265598'});check(detail['currency']=='USD' and detail['instrument_type']=='STK','official snake_case detail shape supported') +call('/api/ibkr/detail',{'conid':'../orders'},400);checks.append('path injection rejected') +call('/api/ibkr/snapshot',{'conid':'265598'},400);checks.append('market data preparation required') +Path(fixture/'mock-mode').write_text('warming');failure=call('/api/ibkr/prepare',{},400);check('行情会话' in failure['error'] and 'PRIVATE-ERROR-IDENTITY' not in failure['error'],'warming error explains session state without leaking broker body') +Path(fixture/'mock-mode').write_text('emptyaccounts');call('/api/ibkr/prepare',{},400);checks.append('empty market accounts cannot mark session prepared') +call('/api/ibkr/snapshot',{'conid':'265598'},400);checks.append('failed preparation keeps snapshots blocked') +Path(fixture/'mock-mode').write_text('ok') +check(call('/api/ibkr/prepare',{})=={'ok':True},'account prerequisite executed without returning accounts') +snap=call('/api/ibkr/snapshot',{'conid':'265598'});check(snap['availability']=='延迟' and snap['fields'][0]['value']=='C193.18','snapshot prefixes and delay preserved') +check('PRIVATE-POSITION' not in json.dumps(snap),'position data excluded') +h=call('/api/ibkr/history',{'conid':'265598'});check(len(h['bars'])==1 and h['bars'][0]['c']==193,'historical daily preview') +call('/api/ibkr/margin',{'account':'TEST_ONLY'},400);checks.append('margin account must be locally discovered') +accounts=call('/api/ibkr/accounts',{});check(accounts==[{'id':'TEST_ONLY','currency':'USD','tradingType':'PM'}],'account list projects only required fields') +margin=call('/api/ibkr/margin',{'account':'TEST_ONLY'});check(margin['status']=='low-buffer' and margin['liquidity_ratio']==.05,'broker margin totals normalized') +call('/api/ibkr/margin',{'account':'TEST_ONLY'},400);checks.append('margin pacing enforced') +call('/api/ibkr/margin',{'account':'../orders'},400);checks.append('margin account path injection rejected') +Path(fixture/'mock-mode').write_text('pending');check(call('/api/ibkr/snapshot',{'conid':'265598'})['pending'],'preflight empty values explicitly pending') +Path(fixture/'mock-mode').write_text('loggedout');check(not call('/api/ibkr/status',{})['authenticated'],'logged-out auth state') +Path(fixture/'mock-mode').write_text('unauthorized');call('/api/ibkr/search',{'query':'AAPL'},400);checks.append('expired session handled') +Path(fixture/'mock-mode').write_text('quota');call('/api/ibkr/search',{'query':'AAPL'},400);checks.append('quota error handled') +Path(fixture/'mock-mode').write_text('logoutfail') +call('/api/ibkr/logout',{},400);checks.append('unconfirmed remote logout reports failure') +call('/api/ibkr/snapshot',{'conid':'265598'},400);checks.append('failed logout still clears local preparation') +Path(fixture/'mock-mode').write_text('ok') +check(call('/api/ibkr/logout',{})['logged_out'],'remote logout confirmed') +check(not call('/api/ibkr/status',{})['authenticated'],'session no longer authenticated after logout') +call('/api/ibkr/margin',{'account':'TEST_ONLY'},400);checks.append('logout invalidates discovered margin accounts') +call('/api/ibkr/snapshot',{'conid':'265598'},400);checks.append('logout clears market preparation') +conn=call('/api/ibkr/connection',{});check(conn['sso_valid'] is None,'logout invalidates SSO cache without breaking upstream pacing') +check(all(not values for values in call('/api/export').values()),'IBKR previews never mutate existing ledger or daily quotes') +requests=[json.loads(x) for x in Path(fixture/'mock-requests.jsonl').read_text().splitlines()] +check(any('Apple%20%26%20AAPL' in r['path'] for r in requests),'query URL encoding verified by server') +check(sum('/sso/validate' in r['path'] for r in requests)==1,'SSO validation limited to once per minute') +check(not any('/orders' in r['path'] or '/regsnapshot' in r['path'] for r in requests),'no trading or regulatory snapshot requests') +report={'ok':True,'checks':len(checks),'passed':checks,'scope':'Isolated synthetic HTTPS gateway with trusted test certificate; no real IBKR session'} +Path(fixture/'test-report.json').write_text(json.dumps(report,ensure_ascii=False,indent=2));print(json.dumps(report,ensure_ascii=False,indent=2)) diff --git a/tests/ibkr_mock.py b/tests/ibkr_mock.py new file mode 100644 index 0000000..1609666 --- /dev/null +++ b/tests/ibkr_mock.py @@ -0,0 +1,37 @@ +import http.server,ssl,json,urllib.parse,argparse,time +p=argparse.ArgumentParser();p.add_argument("--fixture-dir",required=True);a=p.parse_args() +from pathlib import Path +fixture=Path(a.fixture_dir) +class Mock(http.server.BaseHTTPRequestHandler): + def log_message(self,*args):pass + def do_POST(self):self.respond() + def do_GET(self):self.respond() + def respond(self): + path=urllib.parse.urlparse(self.path).path + mode=Path(fixture/'mock-mode').read_text().strip() if Path(fixture/'mock-mode').exists() else 'ok' + with open(fixture/'mock-requests.jsonl','a') as f:f.write(json.dumps({'method':self.command,'path':self.path})+'\n') + code=200 + payload=json.loads(self.rfile.read(int(self.headers.get('Content-Length',0))) or b'{}') if self.command=='POST' else {} + if path.endswith('/ssodh/init'):assert payload=={'publish':True,'compete':False} + if mode=='unauthorized':code=401;out={'error':'login'} + elif mode=='warming' and path.endswith('/iserver/accounts'):code=400;out={'error':'init session first PRIVATE-ERROR-IDENTITY'} + elif mode=='emptyaccounts' and path.endswith('/iserver/accounts'):out={'accounts':[]} + elif mode=='quota':code=429;out={'error':'quota'} + elif path.endswith('/logout'):Path(fixture/'mock-mode').write_text('logoutfail' if mode=='logoutfail' else 'loggedout');out={'status':mode!='logoutfail'} + elif mode=='initializing' and path.endswith('/iserver/accounts'):code=400;out={'error':'init session first'} + elif mode=='initializing' and path.endswith('/ssodh/init'):out={'passed':False,'authenticated':False,'connected':True,'competing':False} + elif path.endswith('/ssodh/init'):out={'authenticated':True,'competing':False,'MAC':'PRIVATE-MAC'} + elif path.endswith('/sso/validate'):out={'RESULT':mode!='loggedout','USER_NAME':'PRIVATE-SSO','USER_ID':123456} + elif path.endswith('/auth/status'):out={'authenticated':mode not in ['loggedout','readonly'],'connected':True,'competing':False,'MAC':'PRIVATE-MAC'} + elif path.endswith('/portfolio/accounts'):out=[{'accountId':'TEST_ONLY','currency':'USD','tradingType':'PM','accountAlias':'PRIVATE-ALIAS'}] + elif path.endswith('/TEST_ONLY/summary'):out={k:{'amount':v,'currency':'USD','isNull':False,'timestamp':int(time.time()*1000)} for k,v in {'netliquidation':100000,'excessliquidity':5000,'maintmarginreq':20000}.items()} + elif path.endswith('/accounts'):out={'accounts':['PRIVATE-ACCOUNT']} + elif path.endswith('/secdef/search'):out=[{'conid':'265598','symbol':'AAPL','companyName':'Apple · SYNTHETIC TEST','companyHeader':'SYNTHETIC TEST / NASDAQ','sections':[{'secType':'STK'}],'secret':'PRIVATE-ACCOUNT'}] + elif path.endswith('/info'):out={'con_id':265598,'symbol':'AAPL','company_name':'Apple · SYNTHETIC TEST','currency':'USD','exchange':'SMART','instrument_type':'STK','industry':'Technology'} + elif path.endswith('/snapshot'):out=[{'conid':265598,'31':'C193.18','84':'193.06','86':'193.14','6509':'DpB','_updated':1729000000000,'7671':'1.00','73':'PRIVATE-POSITION'}] if mode!='pending' else [{'conid':265598}] + elif path.endswith('/history'):out={'symbol':'AAPL','barLength':86400,'mdAvailability':'D','data':[{'o':190,'h':195,'l':189,'c':193,'v':1000,'t':1728864000000}]} + else:code=404;out={'error':'not whitelisted'} + body=json.dumps(out).encode();self.send_response(code);self.send_header('Content-Type','application/json');self.send_header('Content-Length',str(len(body)));self.end_headers();self.wfile.write(body) +server=http.server.HTTPServer(('127.0.0.1',5001),Mock) +c=ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER);c.load_cert_chain(str(fixture/'mock-cert.pem'),str(fixture/'mock-key.pem'));server.socket=c.wrap_socket(server.socket,server_side=True) +print('Synthetic HTTPS Gateway on 5001',flush=True);server.serve_forever() diff --git a/tests/integration.py b/tests/integration.py index 02efae9..c26a2da 100644 --- a/tests/integration.py +++ b/tests/integration.py @@ -43,7 +43,9 @@ def check(ok, label): def near(a, b, label): check(abs(D(str(a))-D(str(b))) < D('0.00001'), label) -token = request('/api/session')['token'] +session = request('/api/session') +assert session.get('environment') == 'test', 'Refusing mutating tests outside isolated test runtime' +token = session['token'] check(request('/api/health')['trading_enabled'] is False, 'no trading enabled') counts = request('/api/data')['counts'] check(not any(counts.values()), 'fresh disposable database precondition') @@ -156,3 +158,9 @@ def near(a, b, label): report={'ok':True,'checks':len(checks),'passed':checks,'scope':'Disposable synthetic DB; no real IBKR account or external data fetched'} if args.report:Path(args.report).write_text(json.dumps(report,indent=2)+'\n') print(json.dumps(report,indent=2)) + +for asset in ['index.html','app.js','release.js','gateway-session.js','style.css']: + with urllib.request.urlopen(args.url+'/'+asset) as response: + assert response.read()==(root/'frontend'/asset).read_bytes(),asset + assert response.headers['Cache-Control']=='no-store' +print('5 embedded frontend assets served byte-for-byte with no frontend directory') diff --git a/tests/live_smoke.py b/tests/live_smoke.py index a87659b..abded4f 100644 --- a/tests/live_smoke.py +++ b/tests/live_smoke.py @@ -1,8 +1,9 @@ -"""Read-only verification of an already populated real research workspace.""" +"""Read-only fixture verification, restricted to an isolated test runtime.""" import argparse,json,urllib.request -p=argparse.ArgumentParser();p.add_argument('--url',default='http://127.0.0.1:8788');p.add_argument('--instrument',default='us:ibm');a=p.parse_args() +p=argparse.ArgumentParser();p.add_argument('--url',required=True);p.add_argument('--instrument',default='us:ibm');a=p.parse_args() def get(path):return json.load(urllib.request.urlopen(a.url+path,timeout=60)) from urllib.parse import urlencode +assert get('/api/session').get('environment')=='test','Refusing fixture tests against user data' r=get('/api/research?'+urlencode({'instrument':a.instrument})) d=get('/api/data') assert not d['demo_present'],'Use real data workspace' diff --git a/tests/release_integration.py b/tests/release_integration.py new file mode 100644 index 0000000..2e0a9a4 --- /dev/null +++ b/tests/release_integration.py @@ -0,0 +1,23 @@ +import argparse,json,urllib.request,urllib.error,time +p=argparse.ArgumentParser();p.add_argument('--url',required=True);a=p.parse_args() +def get(path):return json.load(urllib.request.urlopen(a.url+path,timeout=30)) +session=get('/api/session');assert session['environment']=='test','Refusing real user workspace';token=session['token'];checks=0 +def post(path,v,status=200): + global checks + req=urllib.request.Request(a.url+path,data=json.dumps(v).encode(),headers={'X-Reach-Token':token,'Content-Type':'application/json'}) + try:r=urllib.request.urlopen(req,timeout=30) + except urllib.error.HTTPError as e:r=e + data=json.load(r);assert r.status==status,(path,r.status,data);checks+=1;return data +book={'currency':'USD','positions':[{'id':'release-stock','type':'STK','underlying':'TEST','spot':100,'quantity':10,'multiplier':1}],'scenario':{'spot':-.1,'volatility':0,'days':0}} +assert post('/api/hedge/analyze',book)['scenario_pnl']==-100 +post('/api/hedge/models',{'date':'2026-01-01','title':'SYNTHETIC TEST','assumptions':book}) +rows=get('/api/hedge/models?as_of=2026-01-01');assert len(rows)==1 and rows[0]['result']['scenario_pnl']==-100 +assert get('/api/hedge/models?as_of=2025-12-31')==[] +post('/api/macro/fetch',{'country':'USA','indicator':'gdp'},400);post('/api/news/fetch',{},400) +o={'id':'test-macro-release','country':'USA','indicator':'gdp','period_end':'2024-12-31','frequency':'annual','value':30000000000000,'unit':'current USD','known_at':None,'retrieved_at_ms':1767225600000,'date':'2026-01-01','source':'Synthetic test','source_url':'manual:test'} +post('/api/import',{'macro_observations':[o]});assert get('/api/macro?as_of=2025-12-31')['observations']==[] +assert get('/api/macro?as_of=2026-01-01')['observations'][0]['value']==30000000000000 +o['id']='test-bad-retrieval';o['date']='2025-12-31';post('/api/import',{'macro_observations':[o]},400) +book['positions'][0]['currency']='EUR';post('/api/hedge/analyze',book,400) +assert all(k in get('/api/export') for k in ['hedge_models','macro_observations']) +print(json.dumps({'ok':True,'mutating_checks':checks,'scope':'Synthetic isolated release endpoints, retrieval chronology, persistence and blocked external fetch'})) diff --git a/tests/release_tests.cpp b/tests/release_tests.cpp new file mode 100644 index 0000000..ac9b97f --- /dev/null +++ b/tests/release_tests.cpp @@ -0,0 +1,167 @@ +#include "../backend/derivatives.hpp" +#include "../backend/margin.hpp" +#include +#include +using namespace reach; +int main(int argc,char**argv) { + int count = 0; + auto check = [&](bool b, const char *m) { + ++count; + if (!b) + throw std::runtime_error(m); + }; + auto near = [&](double a, double b, double tol, const char *m) { + check(std::abs(a - b) < tol, m); + }; + auto rejects = [&](auto f, const char *m) { + bool bad = false; + try { + f(); + } catch (const std::exception &) { + bad = true; + } + check(bad, m); + }; + json o = {{"spot", 100.}, {"strike", 100.}, {"years", 1.}, {"rate", .05}, + {"yield", 0.}, {"volatility", .2}, {"right", "call"}}; + auto c = european_option(o); + near(c["price"], 10.450583572185565, 1e-10, "Call benchmark"); + o["right"] = "put"; + auto p = european_option(o); + near(p["price"], 5.573526022256971, 1e-10, "Put benchmark"); + near(c["price"].get() - p["price"].get(), 100 - 100 * std::exp(-.05), 1e-10, + "Put-call parity"); + o["right"] = "call"; + auto price = [&](json x) { return european_option(x)["price"].get(); }; + auto up = o, dn = o; + up["spot"] = 100.001; + dn["spot"] = 99.999; + near((price(up) - price(dn)) / .002, c["delta"], 1e-8, "Delta finite difference"); + near((price(up) - 2 * price(o) + price(dn)) / 1e-6, c["gamma"], 1e-7, + "Gamma finite difference"); + up = o; + dn = o; + up["volatility"] = .20001; + dn["volatility"] = .19999; + near((price(up) - price(dn)) / .00002 * .01, c["vega_1pp"], 1e-8, "Vega units"); + up = o; + dn = o; + up["years"] = 1.00001; + dn["years"] = .99999; + near(-(price(up) - price(dn)) / .00002 / 365, c["theta_day"], 1e-9, "Theta calendar sign"); + o["style"] = "American"; + rejects([&] { european_option(o); }, "Reject American"); + o.erase("style"); + o["years"] = 0; + o["spot"] = 110; + near(price(o), 10, 1e-12, "Expiry intrinsic"); + check(european_option(o)["delta"].is_null(), "Expiry undefined Greek"); + json stock = {{"id", "s"}, {"type", "STK"}, {"underlying", "X"}, + {"spot", 100.}, {"quantity", 100.}, {"multiplier", 1.}}; + json book = {{"currency", "USD"}, + {"positions", json::array({stock})}, + {"scenario", {{"spot", -.1}, {"volatility", 0.}, {"days", 0}}}}; + auto b = hedge_book(book); + near(b["scenario_pnl"], -1000, 1e-10, "Stock scenario"); + near(b["underlyings"]["X"]["delta_neutral_stock_units"], -100, 1e-10, "Hedge sign"); + book["positions"][0]["type"] = "FUT"; + book["positions"][0]["quantity"] = -2; + book["positions"][0]["multiplier"] = 50; + b = hedge_book(book); + near(b["market_value"], 0, 1e-12, "Futures funded value"); + near(b["scenario_pnl"], 1000, 1e-10, "Short futures pnl"); + book["positions"][0]["currency"] = "EUR"; + rejects([&] { hedge_book(book); }, "Cross-currency prohibited"); + json raw = json::array({{{"pages", 1}}, + json::array({{{"countryiso3code", "USA"}, + {"indicator", {{"id", "NY.GDP.MKTP.CD"}}}, + {"date", "2024"}, + {"value", 30000000000000.}}})}); + int64_t time = 1767225600000; + auto data = worldbank_import(raw, "USA", "gdp", time); + check(macro_view(data, "2025-12-31")["observations"].empty(), "No macro lookahead"); + check(macro_view(data, "2026-01-01")["observations"].size() == 1, "Macro retrieval visibility"); + check(data["macro_observations"][0]["known_at"].is_null(), "No invented release date"); + raw[1][0]["value"] = nullptr; + check(worldbank_import(raw, "USA", "gdp", time)["macro_observations"][0]["value"].is_null(), + "Missing macro value"); + raw[1][0]["value"] = 0; + check(worldbank_import(raw, "USA", "gdp", time)["macro_observations"][0]["value"] == 0, + "Zero macro value"); + rejects([&] { worldbank_import(raw, "CHN", "gdp", time); }, "Country binding"); + rejects([&] { public_fetch("test", "https://www.federalreserve.gov/feeds/press_all.xml"); }, + "Test external fetch blocked"); + std::string rss = + "Test & " + "verificationhttps://www.federalreserve.gov/test.htmThu, 01 " + "Jan 2026 12:00:00 GMTTest"; + auto news = fed_news_import(rss); + check(news["news"].size() == 1, "RSS parse"); + check(news["news"][0]["title"] == "Test & verification", "RSS escaped content"); + rejects( + [&] { fed_news_import("]>" + rss); }, + "Reject XML DTD"); + json summary; + auto field = [&](double n) { + return json{{"amount", n}, {"currency", "USD"}, {"isNull", false}, {"timestamp", time}}; + }; + summary["netliquidation"] = field(100000); + summary["excessliquidity"] = field(5000); + auto m = broker_margin(summary, "TEST", time); + check(m["status"] == "low-buffer", "Margin local warning"); + near(m["liquidity_ratio"], .05, 1e-12, "Margin ratio"); + summary["excessliquidity"]["currency"] = "EUR"; + check(broker_margin(summary, "TEST", time)["liquidity_ratio"].is_null(), + "No mixed currency ratio"); + summary["excessliquidity"] = field(0); + check(broker_margin(summary, "TEST", time)["status"] == "critical", "Explicit zero critical"); + summary["excessliquidity"]["isNull"] = true; + check(broker_margin(summary, "TEST", time)["status"] == "unknown", "Null is not zero"); + summary["excessliquidity"] = field(5000); + check(broker_margin(summary, "TEST", time + 120001)["status"] == "unknown", + "Stale margin unknown"); + summary["excessliquidity"]["currency"] = 1.1; + check(broker_margin(summary, "TEST", time)["status"] == "unknown", + "Malformed currency unknown"); + summary = json{{"excessliquidity-s", field(100)}}; + check(broker_margin(summary, "TEST", time)["status"] == "unknown", "No segment sum"); + auto dividend = o; + dividend["years"] = 1.; + dividend["spot"] = 100.; + dividend["yield"] = .03; + dividend["right"] = "call"; + auto dc = european_option(dividend); + dividend["right"] = "put"; + auto dp = european_option(dividend); + near(dc["price"].get() - dp["price"].get(), + 100 * std::exp(-.03) - 100 * std::exp(-.05), 1e-10, "Dividend parity"); + near(dc["delta"].get() - dp["delta"].get(), std::exp(-.03), 1e-12, + "Dividend delta parity"); + dividend["id"] = "option"; + dividend["type"] = "OPT"; + dividend["underlying"] = "X"; + dividend["quantity"] = -1.; + dividend["multiplier"] = 100.; + json options = {{"currency", "USD"}, + {"positions", json::array({dividend})}, + {"scenario", {{"spot", .1}, {"volatility", 0.}, {"days", 365}}}}; + auto expiry = hedge_book(options); + near(expiry["scenario_pnl"], dp["price"].get() * 100, 1e-8, + "Short put expiry full repricing"); + options["scenario"]["days"] = 0; + options["scenario"]["volatility"] = -.3; + rejects([&] { hedge_book(options); }, "Invalid shocked volatility rejected"); + auto revision = worldbank_import(raw, "USA", "gdp", time + 86400000); + auto merged = merge_data(data, revision); + check(macro_view(merged, "2026-01-02")["history"].size() == 2, "Revision history retained"); + check(macro_view(merged, "2026-01-02")["observations"][0]["value"] == 0, + "Latest retrieval selected"); + if(argc==3) { + auto read=[](const char*path){std::ifstream f(path);require(bool(f),"Fixture missing");return std::string(std::istreambuf_iterator(f),{});}; + auto wb=worldbank_import(json::parse(read(argv[1])),"USA","gdp",epoch_ms());auto feed=fed_news_import(read(argv[2])); + auto verified=merge_data(merge_data(empty_data(),wb),feed); + check(!verified["macro_observations"].empty()&&!verified["news"].empty(),"Actual official source payloads validated"); + std::cout<<"Official payload rows: macro="<