dexbot 1.6.10 → 1.6.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +50 -3
- package/README.md +3 -1
- package/analysis/README.md +51 -11
- package/analysis/bot_fitting/README.md +12 -0
- package/analysis/tradingview/README.md +3 -3
- package/analysis/trend_detection/DYNAMIC_WEIGHT_RESEARCH.md +11 -37
- package/analysis/trend_detection/README.md +31 -0
- package/claw/docs/DEXBOT2_TUNING_CHEAT_SHEET.md +4 -3
- package/claw/modules/chain_broadcast.ts +7 -1
- package/claw/modules/claw_launcher.ts +1 -1
- package/claw/modules/launcher_mode_detector.ts +9 -2
- package/claw/package.json +1 -1
- package/claw/runtimes/openclaw-plugin/openclaw.plugin.json +1 -1
- package/claw/runtimes/openclaw-plugin/package.json +1 -1
- package/dist/analysis/account_resolver.d.ts +1 -1
- package/dist/analysis/account_resolver.js +15 -2
- package/dist/analysis/ama_fitting/analyze_ama_price_changes.js +3 -4
- package/dist/analysis/ama_fitting/analyze_lambda_vs_slow.js +2 -7
- package/dist/analysis/ama_fitting/calibrate_convergence_er.js +0 -1
- package/dist/analysis/ama_fitting/fetch_lp_candles.js +4 -4
- package/dist/analysis/ama_fitting/generate_unified_comparison_chart.d.ts +20 -4
- package/dist/analysis/ama_fitting/generate_unified_comparison_chart.js +9 -6
- package/dist/analysis/ama_fitting/optimizer_high_resolution.js +16 -12
- package/dist/analysis/analyze_args.d.ts +31 -0
- package/dist/analysis/analyze_args.js +41 -0
- package/dist/analysis/analyze_dynamic_weight.js +7 -20
- package/dist/analysis/analyze_kalman.js +7 -17
- package/dist/analysis/analyze_regime.js +7 -17
- package/dist/analysis/analyze_regime_windows.js +8 -18
- package/dist/analysis/analyze_risk_profile.js +8 -18
- package/dist/analysis/analyze_trade_heatmap.js +7 -17
- package/dist/analysis/analyze_volatility.js +7 -17
- package/dist/analysis/bot_fitting/backtest_ama_sweep.d.ts +220 -12
- package/dist/analysis/bot_fitting/backtest_ama_sweep.js +55 -10
- package/dist/analysis/bot_fitting/backtest_bot_fitting.d.ts +34 -4
- package/dist/analysis/bot_fitting/backtest_bot_fitting.js +72 -66
- package/dist/analysis/bot_fitting/backtest_lookback_drawdown.d.ts +21 -0
- package/dist/analysis/bot_fitting/backtest_lookback_drawdown.js +315 -0
- package/dist/analysis/bot_fitting/shared_utils.d.ts +7 -7
- package/dist/analysis/bot_fitting/shared_utils.js +2 -2
- package/dist/analysis/bot_key_utils.d.ts +18 -10
- package/dist/analysis/bot_key_utils.js +10 -17
- package/dist/analysis/bot_usage/discover_bot_accounts.js +44 -47
- package/dist/analysis/bot_usage/kibana_bot_queries.d.ts +1 -21
- package/dist/analysis/chain_pool.d.ts +3 -1
- package/dist/analysis/chart_ui.d.ts +5 -2
- package/dist/analysis/chart_ui.js +6 -3
- package/dist/analysis/chart_utils.d.ts +5 -5
- package/dist/analysis/chart_utils.js +9 -0
- package/dist/analysis/fills_cache.d.ts +64 -0
- package/dist/analysis/fills_cache.js +254 -0
- package/dist/analysis/fills_source.d.ts +2 -2
- package/dist/analysis/fills_source.js +19 -14
- package/dist/analysis/grid_correction_check.d.ts +1 -1
- package/dist/analysis/grid_correction_check.js +12 -11
- package/dist/analysis/math_utils.d.ts +7 -6
- package/dist/analysis/math_utils.js +5 -8
- package/dist/analysis/pnl_report.d.ts +39 -0
- package/dist/analysis/pnl_report.js +325 -0
- package/dist/analysis/price_sources.d.ts +8 -8
- package/dist/analysis/price_sources.js +5 -4
- package/dist/analysis/resolve_bot_accounts.js +2 -2
- package/dist/analysis/resolve_source.d.ts +1 -2
- package/dist/analysis/trade_profitability.d.ts +32 -2
- package/dist/analysis/trade_profitability.js +232 -106
- package/dist/analysis/tradingview/analyze_tradingview.d.ts +17 -6
- package/dist/analysis/tradingview/analyze_tradingview.js +9 -10
- package/dist/analysis/tradingview/grid_reset_config.d.ts +42 -31
- package/dist/analysis/tradingview/grid_reset_config.js +35 -6
- package/dist/analysis/tradingview/grid_reset_sim.d.ts +75 -8
- package/dist/analysis/tradingview/grid_reset_sim.js +42 -5
- package/dist/analysis/tradingview/tradingview_uplot_chart_generator.d.ts +69 -4
- package/dist/analysis/tradingview/tradingview_uplot_chart_generator.js +20 -20
- package/dist/analysis/trend_detection/backtest_ama_slope_huber.d.ts +102 -0
- package/dist/analysis/trend_detection/backtest_ama_slope_huber.js +725 -0
- package/dist/analysis/trend_detection/dynamic_weight_chart_generator.d.ts +63 -1
- package/dist/analysis/trend_detection/dynamic_weight_chart_generator.js +27 -112
- package/dist/analysis/trend_detection/huber_scale_variants.d.ts +40 -0
- package/dist/analysis/trend_detection/huber_scale_variants.js +176 -0
- package/dist/analysis/trend_detection/kalman_chart_generator.d.ts +30 -1
- package/dist/analysis/trend_detection/kalman_chart_generator.js +3 -3
- package/dist/analysis/trend_detection/regime_chart_generator.d.ts +31 -1
- package/dist/analysis/trend_detection/regime_chart_generator.js +2 -2
- package/dist/analysis/trend_detection/volatility_chart_generator.d.ts +33 -1
- package/dist/credential-daemon.js +34 -20
- package/dist/dexbot.js +17 -14
- package/dist/market_adapter/candle_utils.d.ts +22 -18
- package/dist/market_adapter/candle_utils.js +24 -20
- package/dist/market_adapter/core/asymmetric_bounds.d.ts +13 -4
- package/dist/market_adapter/core/config_normalizers.d.ts +3 -3
- package/dist/market_adapter/core/kibana_candles.d.ts +53 -18
- package/dist/market_adapter/core/kibana_candles.js +9 -7
- package/dist/market_adapter/core/kibana_client.d.ts +9 -1
- package/dist/market_adapter/core/kibana_client.js +8 -7
- package/dist/market_adapter/core/kibana_market_candles.d.ts +3 -2
- package/dist/market_adapter/core/market_adapter_service.d.ts +297 -115
- package/dist/market_adapter/core/market_adapter_service.js +184 -101
- package/dist/market_adapter/core/strategies/ama.d.ts +10 -2
- package/dist/market_adapter/core/strategies/ama.js +7 -32
- package/dist/market_adapter/core/strategies/ama_slope_model.d.ts +14 -1
- package/dist/market_adapter/core/strategies/ama_slope_model.js +12 -34
- package/dist/market_adapter/core/strategies/atr/calculator.d.ts +7 -2
- package/dist/market_adapter/core/strategies/atr/calculator.js +2 -34
- package/dist/market_adapter/core/strategies/collateral_manager.d.ts +7 -1
- package/dist/market_adapter/core/strategies/collateral_manager.js +0 -22
- package/dist/market_adapter/core/strategies/dynamic_weight_series.d.ts +36 -8
- package/dist/market_adapter/core/strategies/dynamic_weight_series.js +9 -9
- package/dist/market_adapter/core/strategies/regime_gate.d.ts +24 -15
- package/dist/market_adapter/core/strategies/regime_gate.js +4 -31
- package/dist/market_adapter/core/strategies/regime_interp.d.ts +7 -1
- package/dist/market_adapter/core/strategies/regime_interp.js +14 -22
- package/dist/market_adapter/core/strategies/volatility_shift.d.ts +11 -1
- package/dist/market_adapter/core/strategies/volatility_shift.js +0 -13
- package/dist/market_adapter/inputs/cex_candle_parsing.d.ts +29 -0
- package/dist/market_adapter/inputs/cex_candle_parsing.js +52 -0
- package/dist/market_adapter/inputs/fetch_book_data.d.ts +20 -4
- package/dist/market_adapter/inputs/fetch_book_data.js +3 -1
- package/dist/market_adapter/inputs/fetch_cex_synthetic_data.js +97 -226
- package/dist/market_adapter/inputs/fetch_lp_data.d.ts +42 -7
- package/dist/market_adapter/inputs/fetch_lp_data.js +22 -15
- package/dist/market_adapter/inputs/kibana_feed_source.d.ts +74 -15
- package/dist/market_adapter/inputs/kibana_feed_source.js +29 -22
- package/dist/market_adapter/inputs/kibana_source.d.ts +25 -3
- package/dist/market_adapter/inputs/kibana_source.js +2 -2
- package/dist/market_adapter/inputs/window_cache.d.ts +99 -94
- package/dist/market_adapter/inputs/window_cache.js +8 -8
- package/dist/market_adapter/interval_utils.d.ts +4 -4
- package/dist/market_adapter/log_format.d.ts +6 -6
- package/dist/market_adapter/log_format.js +28 -22
- package/dist/market_adapter/lp_chart_core.d.ts +22 -1
- package/dist/market_adapter/lp_chart_core.js +26 -192
- package/dist/market_adapter/lp_chart_runner.d.ts +7 -7
- package/dist/market_adapter/lp_chart_strategy_loader.d.ts +41 -6
- package/dist/market_adapter/lp_chart_strategy_loader.js +8 -7
- package/dist/market_adapter/market_adapter.d.ts +94 -33
- package/dist/market_adapter/market_adapter.js +69 -75
- package/dist/market_adapter/utils/adapter_client.d.ts +3 -3
- package/dist/market_adapter/utils/adapter_client.js +2 -2
- package/dist/market_adapter/utils/atomic_write.d.ts +8 -1
- package/dist/market_adapter/utils/chain.d.ts +50 -41
- package/dist/market_adapter/utils/chain.js +40 -46
- package/dist/market_adapter/utils/data_discovery.d.ts +4 -1
- package/dist/market_adapter/utils/dynamic_grid_snapshot.d.ts +12 -3
- package/dist/market_adapter/utils/file_json_cache.d.ts +2 -2
- package/dist/market_adapter/utils/file_lock.d.ts +28 -14
- package/dist/market_adapter/utils/file_lock.js +36 -32
- package/dist/market_adapter/utils/native_history.d.ts +9 -2
- package/dist/market_adapter/utils/native_history.js +35 -28
- package/dist/modules/account_bots.d.ts +577 -21
- package/dist/modules/account_bots.js +182 -158
- package/dist/modules/account_orders.d.ts +66 -30
- package/dist/modules/account_orders.js +22 -20
- package/dist/modules/authority_resolver.d.ts +12 -2
- package/dist/modules/authority_resolver.js +15 -8
- package/dist/modules/bitshares-native/chain_client.d.ts +38 -3
- package/dist/modules/bitshares-native/chain_client.js +45 -46
- package/dist/modules/bitshares-native/crypto/ecc.browser.js +11 -171
- package/dist/modules/bitshares-native/crypto/ecc.js +13 -176
- package/dist/modules/bitshares-native/crypto/ecc_core.d.ts +33 -0
- package/dist/modules/bitshares-native/crypto/ecc_core.js +213 -0
- package/dist/modules/bitshares-native/crypto/ecc_selector.d.ts +2 -1
- package/dist/modules/bitshares-native/crypto/ecc_selector.js +1 -13
- package/dist/modules/bitshares-native/index.d.ts +1 -1
- package/dist/modules/bitshares-native/lru_cache.d.ts +7 -7
- package/dist/modules/bitshares-native/resolvers.d.ts +18 -6
- package/dist/modules/bitshares-native/serial/lazy_buffer.d.ts +4 -0
- package/dist/modules/bitshares-native/serial/lazy_buffer.js +21 -0
- package/dist/modules/bitshares-native/serial/operations.d.ts +1 -1
- package/dist/modules/bitshares-native/serial/serializer.d.ts +16 -12
- package/dist/modules/bitshares-native/serial/serializer.js +7 -13
- package/dist/modules/bitshares-native/serial/types.d.ts +25 -16
- package/dist/modules/bitshares-native/serial/types.js +55 -62
- package/dist/modules/bitshares-native/signing_client.d.ts +32 -2
- package/dist/modules/bitshares-native/signing_client.js +19 -14
- package/dist/modules/bitshares-native/subscriptions.d.ts +81 -1
- package/dist/modules/bitshares-native/subscriptions.js +12 -12
- package/dist/modules/bitshares-native/transport.d.ts +5 -4
- package/dist/modules/bitshares-native/transport.js +5 -4
- package/dist/modules/bitshares-native/tx/builder.d.ts +40 -5
- package/dist/modules/bitshares-native/tx/builder.js +4 -3
- package/dist/modules/bitshares-native/tx/tx_cache.d.ts +4 -4
- package/dist/modules/bitshares_client.d.ts +45 -13
- package/dist/modules/bitshares_client.js +28 -19
- package/dist/modules/bot_defaults.d.ts +6 -15
- package/dist/modules/bot_defaults.js +1 -5
- package/dist/modules/bot_settings.d.ts +44 -10
- package/dist/modules/bot_settings.js +11 -8
- package/dist/modules/bots_file_lock.d.ts +6 -6
- package/dist/modules/bots_file_lock.js +16 -12
- package/dist/modules/broadcast_failure.d.ts +2 -2
- package/dist/modules/broadcast_failure.js +5 -4
- package/dist/modules/chain_keys.d.ts +42 -40
- package/dist/modules/chain_keys.js +53 -45
- package/dist/modules/chain_orders.d.ts +93 -59
- package/dist/modules/chain_orders.js +31 -23
- package/dist/modules/constants.d.ts +530 -32
- package/dist/modules/constants.js +52 -60
- package/dist/modules/cr_planner.d.ts +40 -2
- package/dist/modules/credential_policy.d.ts +68 -8
- package/dist/modules/credential_policy.js +37 -31
- package/dist/modules/credential_session_cache.d.ts +2 -2
- package/dist/modules/credit_pricing.d.ts +42 -6
- package/dist/modules/credit_pricing.js +44 -30
- package/dist/modules/credit_runtime.d.ts +276 -118
- package/dist/modules/credit_runtime.js +462 -165
- package/dist/modules/crypto/browser_provider.js +6 -4
- package/dist/modules/crypto/node_provider.js +1 -1
- package/dist/modules/crypto/pure_scrypt.js +35 -4
- package/dist/modules/crypto/pure_secp256k1.js +72 -26
- package/dist/modules/crypto/sync.d.ts +9 -9
- package/dist/modules/crypto/sync.js +16 -9
- package/dist/modules/dexbot_class.d.ts +195 -139
- package/dist/modules/dexbot_class.js +78 -28
- package/dist/modules/dexbot_cow_runtime.d.ts +167 -87
- package/dist/modules/dexbot_cow_runtime.js +248 -206
- package/dist/modules/dexbot_credential_client.d.ts +19 -11
- package/dist/modules/dexbot_fill_runtime.d.ts +63 -48
- package/dist/modules/dexbot_fill_runtime.js +48 -41
- package/dist/modules/dexbot_maintenance_runtime.d.ts +109 -70
- package/dist/modules/dexbot_maintenance_runtime.js +117 -80
- package/dist/modules/dexbot_startup_runtime.d.ts +11 -10
- package/dist/modules/dexbot_startup_runtime.js +43 -43
- package/dist/modules/dexbot_state_recovery.d.ts +13 -12
- package/dist/modules/dexbot_state_recovery.js +18 -13
- package/dist/modules/fund_registry.d.ts +4 -2
- package/dist/modules/fund_registry.js +10 -10
- package/dist/modules/general_settings.d.ts +30 -4
- package/dist/modules/graceful_shutdown.d.ts +3 -3
- package/dist/modules/graceful_shutdown.js +2 -2
- package/dist/modules/grid_price_source.d.ts +1 -1
- package/dist/modules/key_store.d.ts +14 -8
- package/dist/modules/key_store.js +7 -6
- package/dist/modules/launcher/adapter_requirement.d.ts +11 -5
- package/dist/modules/launcher/adapter_requirement.js +5 -5
- package/dist/modules/launcher/bot_supervisor.d.ts +106 -24
- package/dist/modules/launcher/bot_supervisor.js +12 -11
- package/dist/modules/launcher/credential_bootstrap.d.ts +1 -1
- package/dist/modules/launcher/credential_bootstrap.js +1 -1
- package/dist/modules/launcher/credential_daemon.d.ts +4 -4
- package/dist/modules/launcher/credential_daemon.js +2 -2
- package/dist/modules/launcher/credential_secret.d.ts +1 -1
- package/dist/modules/launcher/foreign_cred_daemon.d.ts +2 -2
- package/dist/modules/launcher/market_adapter_runtime.d.ts +61 -6
- package/dist/modules/launcher/market_adapter_watchdog.d.ts +10 -2
- package/dist/modules/launcher/market_adapter_watchdog.js +4 -0
- package/dist/modules/launcher/monolithic_runtime.d.ts +18 -16
- package/dist/modules/launcher/status_reporting.d.ts +22 -14
- package/dist/modules/launcher/supervisor_control.d.ts +8 -1
- package/dist/modules/launcher/supervisor_control.js +4 -2
- package/dist/modules/market_adapter_whitelist.d.ts +9 -3
- package/dist/modules/market_adapter_whitelist.js +15 -3
- package/dist/modules/node_manager.d.ts +41 -11
- package/dist/modules/node_manager.js +5 -4
- package/dist/modules/order/accounting.d.ts +53 -24
- package/dist/modules/order/accounting.js +40 -14
- package/dist/modules/order/async_lock.d.ts +5 -2
- package/dist/modules/order/async_lock.js +1 -1
- package/dist/modules/order/export.d.ts +7 -6
- package/dist/modules/order/export.js +1 -7
- package/dist/modules/order/format.d.ts +39 -19
- package/dist/modules/order/format.js +62 -16
- package/dist/modules/order/genesis_policy.d.ts +21 -18
- package/dist/modules/order/genesis_policy.js +12 -8
- package/dist/modules/order/grid.d.ts +142 -36
- package/dist/modules/order/grid.js +148 -123
- package/dist/modules/order/grid_reconcile.d.ts +21 -20
- package/dist/modules/order/grid_reconcile.js +13 -12
- package/dist/modules/order/grid_reconcile_internal.d.ts +85 -72
- package/dist/modules/order/grid_reconcile_internal.js +28 -19
- package/dist/modules/order/index.d.ts +263 -1
- package/dist/modules/order/logger.d.ts +45 -11
- package/dist/modules/order/logger.js +38 -40
- package/dist/modules/order/logger_state.d.ts +4 -4
- package/dist/modules/order/manager.d.ts +226 -180
- package/dist/modules/order/manager.js +101 -83
- package/dist/modules/order/processed_fill_store.d.ts +18 -3
- package/dist/modules/order/processed_fill_store.js +16 -27
- package/dist/modules/order/strategy.d.ts +21 -13
- package/dist/modules/order/strategy.js +5 -6
- package/dist/modules/order/sync_engine.d.ts +91 -33
- package/dist/modules/order/sync_engine.js +99 -54
- package/dist/modules/order/utils/math.d.ts +157 -102
- package/dist/modules/order/utils/math.js +77 -38
- package/dist/modules/order/utils/order.d.ts +326 -106
- package/dist/modules/order/utils/order.js +200 -99
- package/dist/modules/order/utils/slot.d.ts +1 -1
- package/dist/modules/order/utils/system.d.ts +176 -26
- package/dist/modules/order/utils/system.js +86 -69
- package/dist/modules/order/utils/validate.d.ts +89 -41
- package/dist/modules/order/utils/validate.js +24 -22
- package/dist/modules/order/utils/withPoolRef.d.ts +4 -3
- package/dist/modules/order/utils/withPoolRef.js +18 -12
- package/dist/modules/order/working_grid.d.ts +14 -13
- package/dist/modules/paths.d.ts +3 -4
- package/dist/modules/paths.js +3 -27
- package/dist/modules/process_discovery.d.ts +1 -1
- package/dist/modules/process_discovery.js +2 -1
- package/dist/modules/runtime.d.ts +7 -3
- package/dist/modules/runtime.js +4 -3
- package/dist/modules/runtime_settings.d.ts +15 -10
- package/dist/modules/runtime_settings.js +30 -24
- package/dist/modules/settings_merge.d.ts +29 -3
- package/dist/modules/settings_merge.js +56 -78
- package/dist/modules/socket_json_client.d.ts +7 -4
- package/dist/modules/storage/browser_adapter.d.ts +38 -53
- package/dist/modules/storage/browser_adapter.js +7 -30
- package/dist/modules/storage/index.d.ts +1 -1
- package/dist/modules/storage/node_adapter.d.ts +45 -27
- package/dist/modules/storage/node_adapter.js +9 -9
- package/dist/modules/storage/types.d.ts +5 -4
- package/dist/modules/types.d.ts +1071 -2
- package/dist/modules/types.js +4 -1
- package/dist/modules/utils/asset_symbols.d.ts +2 -1
- package/dist/modules/utils/asset_symbols.js +2 -1
- package/dist/modules/utils/errors.d.ts +9 -0
- package/dist/modules/utils/errors.js +23 -1
- package/dist/modules/utils/time_range.d.ts +4 -0
- package/dist/modules/utils/time_range.js +18 -0
- package/dist/modules/validate_profiles.js +53 -43
- package/dist/modules/version_notice.d.ts +14 -3
- package/dist/modules/version_notice.js +6 -4
- package/dist/pm2.d.ts +29 -27
- package/dist/pm2.js +5 -5
- package/dist/scripts/analyze-credit.d.ts +2 -1
- package/dist/scripts/analyze-credit.js +23 -24
- package/dist/scripts/analyze-orders.d.ts +77 -9
- package/dist/scripts/analyze-orders.js +66 -84
- package/dist/scripts/chart_command.d.ts +27 -18
- package/dist/scripts/chart_command.js +16 -15
- package/dist/scripts/check_any.d.ts +18 -0
- package/dist/scripts/check_any.js +126 -0
- package/dist/scripts/diagnose-pool-history.js +12 -7
- package/dist/scripts/pnl.d.ts +3 -0
- package/dist/scripts/pnl.js +40 -0
- package/dist/scripts/print_grid.js +0 -1
- package/dist/scripts/run-tests.js +39 -7
- package/dist/scripts/runner.js +1 -1
- package/dist/scripts/test-credit-renewal.js +30 -21
- package/dist/scripts/update.d.ts +10 -5
- package/dist/scripts/update.js +168 -103
- package/dist/scripts/update_dist_freshness.js +1 -0
- package/dist/scripts/update_layout.d.ts +61 -0
- package/dist/scripts/update_layout.js +180 -0
- package/dist/scripts/validate_bots.js +2 -1
- package/dist/scripts/verify-browser-bundle.js +8 -0
- package/dist/unlock.d.ts +28 -3
- package/dist/unlock.js +72 -10
- package/docs/BITSHARES_ONBOARDING.md +2 -0
- package/docs/COPY_ON_WRITE_MASTER_PLAN.md +1 -1
- package/docs/COW_INVARIANTS.md +13 -6
- package/docs/DEXBOT_COMPARISON.md +8 -8
- package/docs/EVOLUTION.md +12 -10
- package/docs/FUND_MOVEMENT_AND_ACCOUNTING.md +5 -5
- package/docs/GRID_RECALCULATION.md +15 -16
- package/docs/GRID_RECONCILE.md +14 -3
- package/docs/LIFECYCLE.md +11 -11
- package/docs/MPA_CREDIT_USAGE.md +22 -3
- package/docs/README.md +15 -4
- package/docs/WORKFLOW.md +1 -0
- package/docs/architecture.md +12 -9
- package/docs/developer_guide.md +6 -6
- package/market_adapter/README.md +9 -26
- package/modules/README.md +4 -1
- package/package.json +4 -1
- package/scripts/README.md +14 -0
|
@@ -424,7 +424,10 @@ function getStoredBotAccountId(botKey, expectedRef, filePath = PATHS.PROFILES.BO
|
|
|
424
424
|
catch (_) {
|
|
425
425
|
return null;
|
|
426
426
|
}
|
|
427
|
-
|
|
427
|
+
if (!meta)
|
|
428
|
+
return null;
|
|
429
|
+
const accountIdRaw = String(meta.accountId ?? '');
|
|
430
|
+
const stored = /^1\.2\.\d+$/.test(accountIdRaw) ? accountIdRaw : null;
|
|
428
431
|
if (!stored)
|
|
429
432
|
return null;
|
|
430
433
|
if (expectedRef != null && String(meta.preferredAccount ?? '').toLowerCase() !== String(expectedRef).toLowerCase())
|
|
@@ -459,20 +462,11 @@ function findBotKeyByAccountRef(ref, filePath = PATHS.PROFILES.BOTS_JSON) {
|
|
|
459
462
|
}
|
|
460
463
|
function resolveAmaConfig(botKey) {
|
|
461
464
|
const botMeta = loadBotMeta(botKey);
|
|
462
|
-
// Unknown bot key: fall back to the global erSmoothPeriod default (same
|
|
463
|
-
// resolution path production uses) instead of forcing 0 — a typo'd
|
|
464
|
-
// --bot-key must not silently research with different ER smoothing.
|
|
465
465
|
if (!botMeta)
|
|
466
|
-
return { ...MARKET_ADAPTER.AMAS.AMA3
|
|
466
|
+
return { ...MARKET_ADAPTER.AMAS.AMA3 };
|
|
467
467
|
const rawGridPrice = String(botMeta?.gridPrice || '').trim().toLowerCase();
|
|
468
468
|
const isAmaKeyword = AMA_KEYWORDS.has(rawGridPrice);
|
|
469
|
-
|
|
470
|
-
const botAmaInline = (botMeta?.ama && typeof botMeta.ama === 'object') ? botMeta.ama : null;
|
|
471
|
-
const rawErSmooth = botAmaInline && Object.prototype.hasOwnProperty.call(botAmaInline, 'erSmoothPeriod')
|
|
472
|
-
? Number(botAmaInline.erSmoothPeriod)
|
|
473
|
-
: Number(MARKET_ADAPTER.AMA_ER_SMOOTH_FAST_PERIOD);
|
|
474
|
-
const erSmoothPeriod = rawErSmooth === 0 ? 0
|
|
475
|
-
: (Number.isFinite(rawErSmooth) && rawErSmooth >= 1 ? rawErSmooth : 0);
|
|
469
|
+
const botAmaInline = (botMeta.ama && typeof botMeta.ama === 'object') ? botMeta.ama : null;
|
|
476
470
|
// Priority: inline bot.ama overrides market profile for analysis visibility.
|
|
477
471
|
// Production inverts this (profiles first, inline as fallback — market_adapter.ts:694-730).
|
|
478
472
|
if (botAmaInline) {
|
|
@@ -480,7 +474,6 @@ function resolveAmaConfig(botKey) {
|
|
|
480
474
|
erPeriod: Number(botAmaInline.erPeriod),
|
|
481
475
|
fastPeriod: Number(botAmaInline.fastPeriod),
|
|
482
476
|
slowPeriod: Number(botAmaInline.slowPeriod),
|
|
483
|
-
erSmoothPeriod,
|
|
484
477
|
};
|
|
485
478
|
if (isAmaKeyword) {
|
|
486
479
|
const key = rawGridPrice === 'ama' ? DEFAULT_AMA_KEY : rawGridPrice.toUpperCase();
|
|
@@ -511,11 +504,11 @@ function resolveAmaConfig(botKey) {
|
|
|
511
504
|
// Pair match is case-insensitive: market_profiles.json and bots.json are
|
|
512
505
|
// hand-edited, and a case-only difference must not silently drop the
|
|
513
506
|
// profile (a strict === here made the AMA/grid config vanish).
|
|
514
|
-
const selectedProfile = marketProfiles?.profiles
|
|
507
|
+
const selectedProfile = (marketProfiles?.profiles
|
|
515
508
|
? marketProfiles.profiles.find((entry) => isSameAssetSymbol(entry.assetA, botMeta.assetA) &&
|
|
516
509
|
isSameAssetSymbol(entry.assetB, botMeta.assetB) &&
|
|
517
510
|
Number(entry.intervalSeconds) === 3600)
|
|
518
|
-
: null;
|
|
511
|
+
: null);
|
|
519
512
|
if (selectedProfile?.amas) {
|
|
520
513
|
const fallbackKey = selectedProfile.defaultAma || DEFAULT_AMA_KEY;
|
|
521
514
|
const requestedKey = isAmaKeyword
|
|
@@ -525,14 +518,14 @@ function resolveAmaConfig(botKey) {
|
|
|
525
518
|
const fromBuiltin = BUILTIN_AMAS[requestedKey] || BUILTIN_AMAS[fallbackKey];
|
|
526
519
|
const base = fromProfile || fromBuiltin;
|
|
527
520
|
if (base) {
|
|
528
|
-
return { erPeriod: base.erPeriod, fastPeriod: base.fastPeriod, slowPeriod: base.slowPeriod
|
|
521
|
+
return { erPeriod: base.erPeriod, fastPeriod: base.fastPeriod, slowPeriod: base.slowPeriod };
|
|
529
522
|
}
|
|
530
523
|
}
|
|
531
524
|
const key = isAmaKeyword
|
|
532
525
|
? (rawGridPrice === 'ama' ? DEFAULT_AMA_KEY : rawGridPrice.toUpperCase())
|
|
533
526
|
: DEFAULT_AMA_KEY;
|
|
534
527
|
const builtin = BUILTIN_AMAS[key] || MARKET_ADAPTER.AMAS.AMA3;
|
|
535
|
-
return { erPeriod: builtin.erPeriod, fastPeriod: builtin.fastPeriod, slowPeriod: builtin.slowPeriod
|
|
528
|
+
return { erPeriod: builtin.erPeriod, fastPeriod: builtin.fastPeriod, slowPeriod: builtin.slowPeriod };
|
|
536
529
|
}
|
|
537
530
|
function resolveAmaKey(botKey) {
|
|
538
531
|
const botMeta = loadBotMeta(botKey);
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
'use strict';
|
|
3
|
+
import { getErrorMessage } from '../../modules/utils/errors.js';
|
|
3
4
|
import { getStorage } from '../../modules/storage/index.js';
|
|
4
5
|
import { withReadOnlyClient } from '../chain_pool.js';
|
|
5
6
|
const { writeJSON } = getStorage();
|
|
@@ -126,23 +127,22 @@ async function withRetry(fn, label, maxRetries = 3, baseDelayMs = 1000) {
|
|
|
126
127
|
catch (e) {
|
|
127
128
|
if (attempt < maxRetries) {
|
|
128
129
|
const delay = baseDelayMs * Math.pow(2, attempt - 1);
|
|
129
|
-
console.warn(` [warn] ${label} attempt ${attempt}/${maxRetries} failed: ${e
|
|
130
|
+
console.warn(` [warn] ${label} attempt ${attempt}/${maxRetries} failed: ${getErrorMessage(e)}`);
|
|
130
131
|
console.warn(` retrying in ${delay}ms...`);
|
|
131
132
|
await new Promise(r => setTimeout(r, delay));
|
|
132
133
|
}
|
|
133
134
|
else {
|
|
134
|
-
throw new Error(`${label} failed after ${maxRetries} attempts: ${e
|
|
135
|
+
throw new Error(`${label} failed after ${maxRetries} attempts: ${getErrorMessage(e)}`);
|
|
135
136
|
}
|
|
136
137
|
}
|
|
137
138
|
}
|
|
138
139
|
throw new Error('Unreachable');
|
|
139
140
|
}
|
|
140
|
-
// ─── Grid analysis helpers (self-contained, no external import) ───────────────
|
|
141
141
|
function hitPrice(hit, sellPrec, recvPrec) {
|
|
142
142
|
const op = hit._source?.operation_history?.op_object;
|
|
143
|
-
const sell = op?.amount_to_sell?.amount;
|
|
144
|
-
const recv = op?.min_to_receive?.amount;
|
|
145
|
-
if (!sell || !recv || sell <= 0 || recv <= 0)
|
|
143
|
+
const sell = Number(op?.amount_to_sell?.amount);
|
|
144
|
+
const recv = Number(op?.min_to_receive?.amount);
|
|
145
|
+
if (!Number.isFinite(sell) || !Number.isFinite(recv) || sell <= 0 || recv <= 0)
|
|
146
146
|
return null;
|
|
147
147
|
return (recv / Math.pow(10, recvPrec)) / (sell / Math.pow(10, sellPrec));
|
|
148
148
|
}
|
|
@@ -184,7 +184,7 @@ function analyzeGrid(hits, sellPrec, recvPrec, cvThreshold = 0.35) {
|
|
|
184
184
|
const entries = hits.map(h => {
|
|
185
185
|
const p = hitPrice(h, sellPrec, recvPrec);
|
|
186
186
|
const t = h._source?.block_data?.block_time
|
|
187
|
-
? new Date(h._source.block_data.block_time).getTime() : null;
|
|
187
|
+
? new Date(String(h._source.block_data.block_time)).getTime() : null;
|
|
188
188
|
return p && t ? { p, t } : null;
|
|
189
189
|
}).filter((x) => x !== null).sort((a, b) => a.t - b.t);
|
|
190
190
|
if (entries.length < 3)
|
|
@@ -200,7 +200,7 @@ function analyzeGrid(hits, sellPrec, recvPrec, cvThreshold = 0.35) {
|
|
|
200
200
|
if (sess.length < 4)
|
|
201
201
|
continue;
|
|
202
202
|
const stats = spacingStats(sess.map(e => e.p), cvThreshold);
|
|
203
|
-
if (!best || stats.score > best.score || (stats.score === best.score && stats.cv < best.cv)) {
|
|
203
|
+
if (!best || stats.score > best.score || (stats.score === best.score && (stats.cv ?? Infinity) < (best.cv ?? Infinity))) {
|
|
204
204
|
best = stats;
|
|
205
205
|
}
|
|
206
206
|
}
|
|
@@ -215,7 +215,7 @@ function analyzeBatching(hits) {
|
|
|
215
215
|
for (const h of hits) {
|
|
216
216
|
const t = h._source?.block_data?.block_time;
|
|
217
217
|
if (t)
|
|
218
|
-
counts[t] = (counts[t] ?? 0) + 1;
|
|
218
|
+
counts[String(t)] = (counts[String(t)] ?? 0) + 1;
|
|
219
219
|
}
|
|
220
220
|
const vals = Object.values(counts);
|
|
221
221
|
return {
|
|
@@ -224,7 +224,7 @@ function analyzeBatching(hits) {
|
|
|
224
224
|
};
|
|
225
225
|
}
|
|
226
226
|
// ─── DEXBot score ─────────────────────────────────────────────────────────────
|
|
227
|
-
function dexScore(creates, fills,
|
|
227
|
+
function dexScore(creates, fills, gridScore, maxBatch) {
|
|
228
228
|
let s = 0;
|
|
229
229
|
s += Math.round(gridScore * 0.4); // grid quality (0–40)
|
|
230
230
|
if (maxBatch >= 4)
|
|
@@ -249,8 +249,9 @@ async function resolveNames(ids) {
|
|
|
249
249
|
// BitShares db.get_objects accepts an array of IDs
|
|
250
250
|
const objects = await client.db('get_objects', [ids]);
|
|
251
251
|
for (const obj of (objects ?? [])) {
|
|
252
|
-
|
|
253
|
-
|
|
252
|
+
const o = obj;
|
|
253
|
+
if (o?.id && o?.name)
|
|
254
|
+
map[o.id] = o.name;
|
|
254
255
|
}
|
|
255
256
|
// Resolve extra asset precisions while connected
|
|
256
257
|
const toCheck = ['IOB.XRP', 'HONEST.MONEY', 'XBTSX.XRP', 'XBTSX.USDT', 'USD', 'CNY'];
|
|
@@ -258,8 +259,8 @@ async function resolveNames(ids) {
|
|
|
258
259
|
try {
|
|
259
260
|
const assets = await client.db('lookup_asset_symbols', [[sym]]);
|
|
260
261
|
const a = Array.isArray(assets) ? assets[0] : null;
|
|
261
|
-
if (a?.id && !(a.id in ASSET_PRECISION)) {
|
|
262
|
-
ASSET_PRECISION[a.id] = a.precision;
|
|
262
|
+
if (a?.id && !(String(a.id) in ASSET_PRECISION)) {
|
|
263
|
+
ASSET_PRECISION[String(a.id)] = a.precision;
|
|
263
264
|
}
|
|
264
265
|
}
|
|
265
266
|
catch (_) { }
|
|
@@ -267,7 +268,7 @@ async function resolveNames(ids) {
|
|
|
267
268
|
});
|
|
268
269
|
}
|
|
269
270
|
catch (e) {
|
|
270
|
-
console.warn(` [warn] Name resolution failed: ${e
|
|
271
|
+
console.warn(` [warn] Name resolution failed: ${getErrorMessage(e)}`);
|
|
271
272
|
}
|
|
272
273
|
return map;
|
|
273
274
|
}
|
|
@@ -377,7 +378,7 @@ async function run() {
|
|
|
377
378
|
?._source?.operation_history?.op_object?.amount_to_sell?.asset_id
|
|
378
379
|
?? buyHits[0]?._source?.operation_history?.op_object?.min_to_receive?.asset_id;
|
|
379
380
|
const btsPrc = getPrec('1.3.0');
|
|
380
|
-
const aPrc = getPrec(sellAssetId ?? '');
|
|
381
|
+
const aPrc = getPrec(String(sellAssetId ?? ''));
|
|
381
382
|
const primaryHits = buyHits.length >= sellHits.length ? buyHits : sellHits;
|
|
382
383
|
const [pSell, pRecv] = buyHits.length >= sellHits.length
|
|
383
384
|
? [btsPrc, aPrc] : [aPrc, btsPrc];
|
|
@@ -392,7 +393,7 @@ async function run() {
|
|
|
392
393
|
r.impliedInc = grid.impliedIncrementPct ?? null;
|
|
393
394
|
r.cv = grid.cv ?? null;
|
|
394
395
|
r.maxBatch = batch.maxBatch;
|
|
395
|
-
r.dexScore = dexScore(r.creates, r.fills,
|
|
396
|
+
r.dexScore = dexScore(r.creates, r.fills, grid.score, batch.maxBatch);
|
|
396
397
|
r.ordersFetched = hits.length;
|
|
397
398
|
r.buyCount = buyHits.length;
|
|
398
399
|
r.sellCount = sellHits.length;
|
|
@@ -437,6 +438,24 @@ async function run() {
|
|
|
437
438
|
// DEXBot1-style — cancel-only, no op 77 (cancel + recreate)
|
|
438
439
|
const highV2 = results.filter(r => r.dexScore >= 80 && r.updates >= 1);
|
|
439
440
|
const highV1 = results.filter(r => r.dexScore >= 80 && r.updates < 1);
|
|
441
|
+
// Fixed-width cells for one candidate row, shared by the HIGH groups and
|
|
442
|
+
// the tier tables so the two print paths can never drift apart.
|
|
443
|
+
function formatCandidateCells(r, rank) {
|
|
444
|
+
return {
|
|
445
|
+
rank: String(rank).padStart(2),
|
|
446
|
+
name: r.name.padEnd(22).slice(0, 22),
|
|
447
|
+
id: r.id.padEnd(14),
|
|
448
|
+
creates: String(r.creates).padStart(7),
|
|
449
|
+
fills: String(r.fills).padStart(6),
|
|
450
|
+
cancels: String(r.cancels).padStart(7),
|
|
451
|
+
fr: (r.fillRate.toFixed(1) + '%').padStart(5),
|
|
452
|
+
cr: r.cancelRatio.toFixed(2).padStart(4),
|
|
453
|
+
batch: String(r.maxBatch || '-').padStart(9),
|
|
454
|
+
inc: (r.impliedInc != null ? r.impliedInc.toFixed(2) + '%' : 'n/a').padStart(6),
|
|
455
|
+
grid: String(r.gridScore).padStart(5),
|
|
456
|
+
dex: String(r.dexScore).padStart(4),
|
|
457
|
+
};
|
|
458
|
+
}
|
|
440
459
|
const hdrHigh = ' # Name ID Creates Fills Cancel Fill% C/C MaxBatch Incr% Grid DEX Updates';
|
|
441
460
|
function printHighGroup(label, rows) {
|
|
442
461
|
if (!rows.length)
|
|
@@ -446,20 +465,8 @@ async function run() {
|
|
|
446
465
|
console.log(hdrHigh);
|
|
447
466
|
console.log(' ' + '─'.repeat(hdrHigh.length - 1));
|
|
448
467
|
for (const r of rows) {
|
|
449
|
-
const
|
|
450
|
-
|
|
451
|
-
const id = r.id.padEnd(14);
|
|
452
|
-
const creates = String(r.creates).padStart(7);
|
|
453
|
-
const fills = String(r.fills).padStart(6);
|
|
454
|
-
const cancels = String(r.cancels).padStart(7);
|
|
455
|
-
const fr = (r.fillRate.toFixed(1) + '%').padStart(5);
|
|
456
|
-
const cr = r.cancelRatio.toFixed(2).padStart(4);
|
|
457
|
-
const batch = String(r.maxBatch || '-').padStart(9);
|
|
458
|
-
const inc = (r.impliedInc != null ? r.impliedInc.toFixed(2) + '%' : 'n/a').padStart(6);
|
|
459
|
-
const grid = String(r.gridScore).padStart(5);
|
|
460
|
-
const dex = String(r.dexScore).padStart(4);
|
|
461
|
-
const upd = String(r.updates).padStart(7);
|
|
462
|
-
console.log(` ${rank} ${name} ${id} ${creates} ${fills} ${cancels} ${fr} ${cr} ${batch} ${inc} ${grid} ${dex} ${upd}`);
|
|
468
|
+
const c = formatCandidateCells(r, results.indexOf(r) + 1);
|
|
469
|
+
console.log(` ${c.rank} ${c.name} ${c.id} ${c.creates} ${c.fills} ${c.cancels} ${c.fr} ${c.cr} ${c.batch} ${c.inc} ${c.grid} ${c.dex} ${String(r.updates).padStart(7)}`);
|
|
463
470
|
}
|
|
464
471
|
console.log('');
|
|
465
472
|
}
|
|
@@ -479,20 +486,9 @@ async function run() {
|
|
|
479
486
|
const hdr = ' # Name ID Creates Fills Cancel Fill% C/C MaxBatch Incr% Grid DEX';
|
|
480
487
|
console.log(hdr);
|
|
481
488
|
console.log(' ' + '─'.repeat(hdr.length - 1));
|
|
482
|
-
group.forEach((r
|
|
483
|
-
const
|
|
484
|
-
|
|
485
|
-
const id = r.id.padEnd(14);
|
|
486
|
-
const creates = String(r.creates).padStart(7);
|
|
487
|
-
const fills = String(r.fills).padStart(6);
|
|
488
|
-
const cancels = String(r.cancels).padStart(7);
|
|
489
|
-
const fr = (r.fillRate.toFixed(1) + '%').padStart(5);
|
|
490
|
-
const cr = r.cancelRatio.toFixed(2).padStart(4);
|
|
491
|
-
const batch = String(r.maxBatch || '-').padStart(9);
|
|
492
|
-
const inc = (r.impliedInc != null ? r.impliedInc.toFixed(2) + '%' : 'n/a').padStart(6);
|
|
493
|
-
const grid = String(r.gridScore).padStart(5);
|
|
494
|
-
const dex = String(r.dexScore).padStart(4);
|
|
495
|
-
console.log(` ${rank} ${name} ${id} ${creates} ${fills} ${cancels} ${fr} ${cr} ${batch} ${inc} ${grid} ${dex}`);
|
|
489
|
+
group.forEach((r) => {
|
|
490
|
+
const c = formatCandidateCells(r, results.indexOf(r) + 1);
|
|
491
|
+
console.log(` ${c.rank} ${c.name} ${c.id} ${c.creates} ${c.fills} ${c.cancels} ${c.fr} ${c.cr} ${c.batch} ${c.inc} ${c.grid} ${c.dex}`);
|
|
496
492
|
});
|
|
497
493
|
console.log('');
|
|
498
494
|
}
|
|
@@ -540,9 +536,10 @@ async function run() {
|
|
|
540
536
|
}
|
|
541
537
|
}
|
|
542
538
|
run().then(() => process.exit(0)).catch((e) => {
|
|
543
|
-
|
|
539
|
+
const err = e;
|
|
540
|
+
console.error('\n[fatal]', err.message);
|
|
544
541
|
if (process.env.DEBUG)
|
|
545
|
-
console.error(
|
|
542
|
+
console.error(err.stack);
|
|
546
543
|
process.exit(1);
|
|
547
544
|
});
|
|
548
545
|
//# sourceMappingURL=discover_bot_accounts.js.map
|
|
@@ -59,27 +59,7 @@ declare function buildOrderPriceQuery(accountId: string, lookbackHours: number,
|
|
|
59
59
|
_source: string[];
|
|
60
60
|
query: {
|
|
61
61
|
bool: {
|
|
62
|
-
filter:
|
|
63
|
-
term: {
|
|
64
|
-
operation_type: number;
|
|
65
|
-
'operation_history.op_object.seller.keyword'?: undefined;
|
|
66
|
-
};
|
|
67
|
-
range?: undefined;
|
|
68
|
-
} | {
|
|
69
|
-
term: {
|
|
70
|
-
'operation_history.op_object.seller.keyword': string;
|
|
71
|
-
operation_type?: undefined;
|
|
72
|
-
};
|
|
73
|
-
range?: undefined;
|
|
74
|
-
} | {
|
|
75
|
-
range: {
|
|
76
|
-
'block_data.block_time': {
|
|
77
|
-
gte: string;
|
|
78
|
-
lte: string;
|
|
79
|
-
};
|
|
80
|
-
};
|
|
81
|
-
term?: undefined;
|
|
82
|
-
})[];
|
|
62
|
+
filter: Record<string, unknown>[];
|
|
83
63
|
};
|
|
84
64
|
};
|
|
85
65
|
sort: {
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import type { createReadOnlyClient } from '../modules/bitshares-native/index.js';
|
|
2
|
+
type ReadOnlyClient = Awaited<ReturnType<typeof createReadOnlyClient>>;
|
|
1
3
|
/**
|
|
2
4
|
* Run `fn` against a fresh read-only client connected over the built-in pool.
|
|
3
5
|
* Transport INFO logging is silenced for the duration of the short-lived
|
|
4
6
|
* connection and the client is always disconnected afterwards.
|
|
5
7
|
*/
|
|
6
|
-
declare function withReadOnlyClient<T>(fn: (client:
|
|
8
|
+
declare function withReadOnlyClient<T>(fn: (client: ReadOnlyClient) => Promise<T>): Promise<T>;
|
|
7
9
|
export { withReadOnlyClient };
|
|
8
10
|
//# sourceMappingURL=chain_pool.d.ts.map
|
|
@@ -8,9 +8,12 @@
|
|
|
8
8
|
declare const Y_AXIS_SIZE = 58;
|
|
9
9
|
/**
|
|
10
10
|
* Return the uPlot cursor config object literal.
|
|
11
|
-
*
|
|
11
|
+
*
|
|
12
|
+
* @param syncKey JS expression for the sync key. Defaults to the `SYNC_KEY`
|
|
13
|
+
* variable that callers define; pass a literal/variable name
|
|
14
|
+
* (e.g. `'chartGroupId'`) when the page uses another name.
|
|
12
15
|
*/
|
|
13
|
-
declare function makeCursorConfig(): string;
|
|
16
|
+
declare function makeCursorConfig(syncKey?: string): string;
|
|
14
17
|
/**
|
|
15
18
|
* Return the `bindHoverState(chart)` function definition.
|
|
16
19
|
*/
|
|
@@ -9,16 +9,19 @@
|
|
|
9
9
|
const Y_AXIS_SIZE = 58;
|
|
10
10
|
/**
|
|
11
11
|
* Return the uPlot cursor config object literal.
|
|
12
|
-
*
|
|
12
|
+
*
|
|
13
|
+
* @param syncKey JS expression for the sync key. Defaults to the `SYNC_KEY`
|
|
14
|
+
* variable that callers define; pass a literal/variable name
|
|
15
|
+
* (e.g. `'chartGroupId'`) when the page uses another name.
|
|
13
16
|
*/
|
|
14
|
-
function makeCursorConfig() {
|
|
17
|
+
function makeCursorConfig(syncKey = 'SYNC_KEY') {
|
|
15
18
|
return `{
|
|
16
19
|
show: true,
|
|
17
20
|
x: true,
|
|
18
21
|
y: true,
|
|
19
22
|
points: { show: false },
|
|
20
23
|
drag: { x: false, y: false, setScale: false },
|
|
21
|
-
sync: { key:
|
|
24
|
+
sync: { key: ${syncKey}, setSeries: false, scales: ['x', null] },
|
|
22
25
|
focus: { prox: -1 },
|
|
23
26
|
}`;
|
|
24
27
|
}
|
|
@@ -12,10 +12,10 @@ declare function uplotInlineTags({ css, js }?: {
|
|
|
12
12
|
js?: boolean | undefined;
|
|
13
13
|
}): string;
|
|
14
14
|
declare function escapeHtml(str: string): string;
|
|
15
|
-
declare function serializeJsonForScript(value:
|
|
16
|
-
declare function toEpochSeconds(ts:
|
|
17
|
-
declare function toFileUrl(filePath:
|
|
18
|
-
declare function writeChartFile(filePath:
|
|
15
|
+
declare function serializeJsonForScript(value: unknown): string;
|
|
16
|
+
declare function toEpochSeconds(ts: unknown, fallbackIdx: number): number;
|
|
17
|
+
declare function toFileUrl(filePath: string): string;
|
|
18
|
+
declare function writeChartFile(filePath: string, html: string): void;
|
|
19
19
|
/**
|
|
20
20
|
* Serialize the exact source of the given pure functions for injection into a
|
|
21
21
|
* generated HTML <script> block. Each function is emitted as a top-level
|
|
@@ -33,6 +33,6 @@ declare function embedFunctionSources(fns: Array<Function>): string;
|
|
|
33
33
|
* Consumers must define `xMin`, `xMax`, `charts`, `pendingRange`, and `pendingRangeRaf`
|
|
34
34
|
* before embedding this script block.
|
|
35
35
|
*/
|
|
36
|
-
declare const UPLOT_SHARED_SCRIPT = "\nfunction clampXRange(min, max) {\n let nextMin = min, nextMax = max;\n if (!Number.isFinite(nextMin) || !Number.isFinite(nextMax) || nextMax <= nextMin) {\n return { min: xMin, max: xMax };\n }\n if (nextMin < xMin) { nextMax += xMin - nextMin; nextMin = xMin; }\n if (nextMax > xMax) { nextMin -= nextMax - xMax; nextMax = xMax; }\n if (nextMin < xMin) nextMin = xMin;\n if (nextMax > xMax) nextMax = xMax;\n if (nextMax <= nextMin) return { min: xMin, max: xMax };\n return { min: nextMin, max: nextMax };\n}\n\nfunction syncXRange(min, max) {\n pendingRange = clampXRange(min, max);\n if (pendingRangeRaf) return;\n const raf = typeof requestAnimationFrame !== 'undefined' ? requestAnimationFrame.bind(window) : (fn) => setTimeout(fn, 0);\n pendingRangeRaf = raf(() => {\n const next = pendingRange;\n pendingRange = null;\n pendingRangeRaf = 0;\n if (!next) return;\n charts.forEach(c => c && c.batch(() => c.setScale('x', next)));\n });\n}\n\nfunction bindWheelZoom(chart) {\n chart.root.addEventListener('wheel', (e) => {\n if (e.ctrlKey || e.metaKey || e.altKey) return;\n e.preventDefault();\n e.stopPropagation();\n const rect = chart.root.getBoundingClientRect();\n \n // Correctly calculate plot-relative 'left' for accurate centering\n const left = e.clientX - rect.left - (chart.bbox.left / (chart.pxRatio || 1));\n const center = chart.posToVal(left, 'x');\n \n const s = chart.scales.x || {};\n const currMin = Number.isFinite(s.min) ? s.min : xMin;\n const currMax = Number.isFinite(s.max) ? s.max : xMax;\n const span = currMax - currMin;\n if (!Number.isFinite(span) || span <= 0) return;\n const factor = e.deltaY < 0 ? 0.85 : 1.15;\n const nextSpan = Math.max(1, Math.min(xMax - xMin, span * factor));\n const ratio = (center - currMin) / span;\n syncXRange(center - nextSpan * ratio, center - nextSpan * ratio + nextSpan);\n }, { passive: false });\n}\n\nfunction bindPan(chart) {\n let dragging = false, startClientX = 0, startClientY = 0, startMin = xMin, startMax = xMax, xUnitsPerPx = 0;\n const getScale = () => {\n const s = chart.scales.x || {};\n return { currMin: Number.isFinite(s.min) ? s.min : xMin, currMax: Number.isFinite(s.max) ? s.max : xMax };\n };\n const onMouseMove = (e) => {\n if (!dragging) return;\n \n // Ignore if vertical movement is dominant (likely scrolling)\n if (Math.abs(e.clientY - startClientY) > 20) return;\n \n e.preventDefault();\n const deltaPx = e.clientX - startClientX;\n const deltaVal = deltaPx * xUnitsPerPx;\n syncXRange(startMin - deltaVal, startMax - deltaVal);\n };\n const endDrag = () => {\n if (!dragging) return;\n dragging = false;\n document.body.style.cursor = '';\n window.removeEventListener('mousemove', onMouseMove);\n window.removeEventListener('mouseup', endDrag);\n };\n chart.root.addEventListener('mousedown', (e) => {\n if (!e || e.button !== 0 || e.ctrlKey || e.metaKey || e.altKey) return;\n const rect = chart.root.getBoundingClientRect();\n if (e.clientX < rect.left || e.clientX > rect.right || e.clientY < rect.top || e.clientY > rect.bottom) return;\n \n e.preventDefault();\n e.stopPropagation();\n \n dragging = true;\n startClientX = e.clientX;\n startClientY = e.clientY;\n const cur = getScale();\n startMin = cur.currMin; startMax = cur.currMax;\n \n // Calculate units per pixel once at start of drag to avoid sliding bug\n // chart.bbox.width is in device pixels; divide by pxRatio for CSS pixels\n xUnitsPerPx = (cur.currMax - cur.currMin) / (chart.bbox.width / (chart.pxRatio || 1));\n \n document.body.style.cursor = 'grabbing';\n window.addEventListener('mousemove', onMouseMove);\n window.addEventListener('mouseup', endDrag, { once: true });\n });\n}\n";
|
|
36
|
+
declare const UPLOT_SHARED_SCRIPT = "\nfunction clampXRange(min, max) {\n let nextMin = min, nextMax = max;\n if (!Number.isFinite(nextMin) || !Number.isFinite(nextMax) || nextMax <= nextMin) {\n return { min: xMin, max: xMax };\n }\n if (nextMin < xMin) { nextMax += xMin - nextMin; nextMin = xMin; }\n if (nextMax > xMax) { nextMin -= nextMax - xMax; nextMax = xMax; }\n if (nextMin < xMin) nextMin = xMin;\n if (nextMax > xMax) nextMax = xMax;\n if (nextMax <= nextMin) return { min: xMin, max: xMax };\n return { min: nextMin, max: nextMax };\n}\n\nfunction syncXRange(min, max) {\n pendingRange = clampXRange(min, max);\n if (pendingRangeRaf) return;\n const raf = typeof requestAnimationFrame !== 'undefined' ? requestAnimationFrame.bind(window) : (fn) => setTimeout(fn, 0);\n pendingRangeRaf = raf(() => {\n const next = pendingRange;\n pendingRange = null;\n pendingRangeRaf = 0;\n if (!next) return;\n charts.forEach(c => c && c.batch(() => c.setScale('x', next)));\n });\n}\n\nfunction bindWheelZoom(chart) {\n chart.root.addEventListener('wheel', (e) => {\n if (e.ctrlKey || e.metaKey || e.altKey) return;\n e.preventDefault();\n e.stopPropagation();\n const rect = chart.root.getBoundingClientRect();\n \n // Correctly calculate plot-relative 'left' for accurate centering\n const left = e.clientX - rect.left - (chart.bbox.left / (chart.pxRatio || 1));\n const center = chart.posToVal(left, 'x');\n \n const s = chart.scales.x || {};\n const currMin = Number.isFinite(s.min) ? s.min : xMin;\n const currMax = Number.isFinite(s.max) ? s.max : xMax;\n const span = currMax - currMin;\n if (!Number.isFinite(span) || span <= 0) return;\n const factor = e.deltaY < 0 ? 0.85 : 1.15;\n const nextSpan = Math.max(1, Math.min(xMax - xMin, span * factor));\n const ratio = (center - currMin) / span;\n syncXRange(center - nextSpan * ratio, center - nextSpan * ratio + nextSpan);\n }, { passive: false });\n}\n\nfunction bindPan(chart) {\n let dragging = false, startClientX = 0, startClientY = 0, startMin = xMin, startMax = xMax, xUnitsPerPx = 0;\n const getScale = () => {\n const s = chart.scales.x || {};\n return { currMin: Number.isFinite(s.min) ? s.min : xMin, currMax: Number.isFinite(s.max) ? s.max : xMax };\n };\n const onMouseMove = (e) => {\n if (!dragging) return;\n \n // Ignore if vertical movement is dominant (likely scrolling)\n if (Math.abs(e.clientY - startClientY) > 20) return;\n \n e.preventDefault();\n const deltaPx = e.clientX - startClientX;\n const deltaVal = deltaPx * xUnitsPerPx;\n syncXRange(startMin - deltaVal, startMax - deltaVal);\n };\n const endDrag = () => {\n if (!dragging) return;\n dragging = false;\n document.body.style.cursor = '';\n window.removeEventListener('mousemove', onMouseMove);\n window.removeEventListener('mouseup', endDrag);\n };\n chart.root.addEventListener('mousedown', (e) => {\n if (!e || e.button !== 0 || e.ctrlKey || e.metaKey || e.altKey) return;\n const rect = chart.root.getBoundingClientRect();\n if (e.clientX < rect.left || e.clientX > rect.right || e.clientY < rect.top || e.clientY > rect.bottom) return;\n \n e.preventDefault();\n e.stopPropagation();\n \n dragging = true;\n startClientX = e.clientX;\n startClientY = e.clientY;\n const cur = getScale();\n startMin = cur.currMin; startMax = cur.currMax;\n \n // Calculate units per pixel once at start of drag to avoid sliding bug\n // chart.bbox.width is in device pixels; divide by pxRatio for CSS pixels\n xUnitsPerPx = (cur.currMax - cur.currMin) / (chart.bbox.width / (chart.pxRatio || 1));\n \n document.body.style.cursor = 'grabbing';\n window.addEventListener('mousemove', onMouseMove);\n window.addEventListener('mouseup', endDrag, { once: true });\n });\n\n // Keep the grab cursor while dragging even as the pointer leaves the plot,\n // and end the drag if the window loses focus mid-drag (otherwise the chart\n // keeps panning on the next mousemove after refocus).\n chart.root.addEventListener('mouseleave', () => {\n if (!dragging) return;\n document.body.style.cursor = 'grabbing';\n });\n window.addEventListener('blur', endDrag);\n}\n";
|
|
37
37
|
export { escapeHtml, serializeJsonForScript, toEpochSeconds, writeChartFile, toFileUrl, embedFunctionSources, UPLOT_SHARED_SCRIPT, uplotInlineTags };
|
|
38
38
|
//# sourceMappingURL=chart_utils.d.ts.map
|
|
@@ -198,6 +198,15 @@ function bindPan(chart) {
|
|
|
198
198
|
window.addEventListener('mousemove', onMouseMove);
|
|
199
199
|
window.addEventListener('mouseup', endDrag, { once: true });
|
|
200
200
|
});
|
|
201
|
+
|
|
202
|
+
// Keep the grab cursor while dragging even as the pointer leaves the plot,
|
|
203
|
+
// and end the drag if the window loses focus mid-drag (otherwise the chart
|
|
204
|
+
// keeps panning on the next mousemove after refocus).
|
|
205
|
+
chart.root.addEventListener('mouseleave', () => {
|
|
206
|
+
if (!dragging) return;
|
|
207
|
+
document.body.style.cursor = 'grabbing';
|
|
208
|
+
});
|
|
209
|
+
window.addEventListener('blur', endDrag);
|
|
201
210
|
}
|
|
202
211
|
`;
|
|
203
212
|
export { escapeHtml, serializeJsonForScript, toEpochSeconds, writeChartFile, toFileUrl, embedFunctionSources, UPLOT_SHARED_SCRIPT, uplotInlineTags };
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { FillRecord } from './fills_source.js';
|
|
2
|
+
/** How long after a query its trailing fills may still be late-indexed. */
|
|
3
|
+
declare const TAIL_SETTLE_LAG_MS: number;
|
|
4
|
+
/** Upper bound on spans persisted per shard (keeps coverage bookkeeping small). */
|
|
5
|
+
declare const MAX_COVERAGE_SPANS = 64;
|
|
6
|
+
interface QueriedRange {
|
|
7
|
+
gte: number;
|
|
8
|
+
lte: number;
|
|
9
|
+
at: number | null;
|
|
10
|
+
}
|
|
11
|
+
interface Span {
|
|
12
|
+
gte: number;
|
|
13
|
+
lte: number;
|
|
14
|
+
}
|
|
15
|
+
interface FillsShard {
|
|
16
|
+
meta: {
|
|
17
|
+
accountId: string;
|
|
18
|
+
fetchedAt: string;
|
|
19
|
+
queriedRanges: QueriedRange[];
|
|
20
|
+
};
|
|
21
|
+
fills: FillRecord[];
|
|
22
|
+
}
|
|
23
|
+
interface FetchFillsOptions {
|
|
24
|
+
/** Override the cache root (tests). */
|
|
25
|
+
cacheDir?: string;
|
|
26
|
+
/** Ignore coverage and re-query the requested range (still merges results). */
|
|
27
|
+
refresh?: boolean;
|
|
28
|
+
/** Fixed "now" for deterministic settle math (tests). */
|
|
29
|
+
nowMs?: number;
|
|
30
|
+
/** Injected range fetcher (tests); defaults to the real Kibana query. */
|
|
31
|
+
fetchRange?: (gteIso: string, lteIso: string) => Promise<FillRecord[]>;
|
|
32
|
+
quiet?: boolean;
|
|
33
|
+
}
|
|
34
|
+
declare function shardKeyForTimestamp(tsMs: number): string;
|
|
35
|
+
declare function shardBoundsForKey(key: string): {
|
|
36
|
+
start: number;
|
|
37
|
+
end: number;
|
|
38
|
+
};
|
|
39
|
+
declare function shardKeysForRange(gteMs: number, lteMs: number): string[];
|
|
40
|
+
declare function basePathFor(cacheDir: string, accountId: string): string;
|
|
41
|
+
declare function shardPathFor(basePath: string, shardKey: string): string;
|
|
42
|
+
/** Sort, merge overlapping/adjacent same-`at` spans, cap the list length. */
|
|
43
|
+
declare function normalizeQueried(ranges: QueriedRange[]): QueriedRange[];
|
|
44
|
+
/** Record a freshly queried span, dropping older spans it fully supersedes. */
|
|
45
|
+
declare function addCoverage(queried: QueriedRange[], span: Span, atMs: number): QueriedRange[];
|
|
46
|
+
/**
|
|
47
|
+
* Portions of queried spans that are safe to reuse: the part up to
|
|
48
|
+
* `at - TAIL_SETTLE_LAG_MS`. A span with an unknown `at` certifies nothing.
|
|
49
|
+
*/
|
|
50
|
+
declare function trustedSegments(queried: QueriedRange[], nowMs: number): Span[];
|
|
51
|
+
/** `span` minus the union of `covered` (both as inclusive ms ranges). */
|
|
52
|
+
declare function subtractRanges(span: Span, covered: Span[]): Span[];
|
|
53
|
+
declare function fillKey(f: FillRecord): string;
|
|
54
|
+
/** Union two fill lists, deduped by the unique operation identity. */
|
|
55
|
+
declare function mergeFills(existing: FillRecord[], incoming: FillRecord[]): FillRecord[];
|
|
56
|
+
/**
|
|
57
|
+
* Fetch every fill_order for an account over [gteIso, lteIso], reusing cached
|
|
58
|
+
* month shards and querying only their missing spans. Falls back to a direct
|
|
59
|
+
* fetch when the range is malformed.
|
|
60
|
+
*/
|
|
61
|
+
declare function fetchFillsCached(config: Record<string, unknown>, accountId: string, gteIso: string, lteIso: string, options?: FetchFillsOptions): Promise<FillRecord[]>;
|
|
62
|
+
export { fetchFillsCached, shardKeyForTimestamp, shardBoundsForKey, shardKeysForRange, basePathFor, shardPathFor, normalizeQueried, addCoverage, trustedSegments, subtractRanges, mergeFills, fillKey, TAIL_SETTLE_LAG_MS, MAX_COVERAGE_SPANS, };
|
|
63
|
+
export type { QueriedRange, FillsShard, FetchFillsOptions };
|
|
64
|
+
//# sourceMappingURL=fills_cache.d.ts.map
|