dexbot 1.6.11 → 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 +35 -4
- package/README.md +2 -1
- package/analysis/README.md +2 -0
- package/analysis/tradingview/README.md +1 -1
- package/analysis/trend_detection/DYNAMIC_WEIGHT_RESEARCH.md +3 -3
- 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 +2 -1
- 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 -17
- 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 +6 -5
- package/dist/analysis/bot_fitting/backtest_bot_fitting.d.ts +34 -4
- package/dist/analysis/bot_fitting/backtest_bot_fitting.js +11 -63
- 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 +7 -4
- 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 +1 -1
- package/dist/analysis/fills_source.d.ts +2 -2
- package/dist/analysis/fills_source.js +14 -12
- 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.js +29 -29
- 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 -1
- package/dist/analysis/trade_profitability.d.ts +23 -2
- package/dist/analysis/trade_profitability.js +50 -50
- package/dist/analysis/tradingview/analyze_tradingview.d.ts +17 -6
- package/dist/analysis/tradingview/analyze_tradingview.js +6 -5
- package/dist/analysis/tradingview/grid_reset_config.d.ts +41 -32
- package/dist/analysis/tradingview/grid_reset_config.js +23 -11
- package/dist/analysis/tradingview/grid_reset_sim.d.ts +75 -9
- package/dist/analysis/tradingview/grid_reset_sim.js +4 -3
- package/dist/analysis/tradingview/tradingview_uplot_chart_generator.d.ts +69 -4
- package/dist/analysis/tradingview/tradingview_uplot_chart_generator.js +18 -19
- package/dist/analysis/trend_detection/backtest_ama_slope_huber.d.ts +1 -1
- package/dist/analysis/trend_detection/backtest_ama_slope_huber.js +5 -5
- package/dist/analysis/trend_detection/dynamic_weight_chart_generator.d.ts +63 -1
- package/dist/analysis/trend_detection/dynamic_weight_chart_generator.js +5 -4
- package/dist/analysis/trend_detection/huber_scale_variants.d.ts +9 -3
- package/dist/analysis/trend_detection/huber_scale_variants.js +4 -4
- 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 +11 -11
- 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 +284 -117
- package/dist/market_adapter/core/market_adapter_service.js +137 -113
- package/dist/market_adapter/core/strategies/ama.d.ts +10 -2
- package/dist/market_adapter/core/strategies/ama.js +2 -4
- 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 +34 -6
- package/dist/market_adapter/core/strategies/dynamic_weight_series.js +7 -7
- 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 +96 -224
- 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 -21
- 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 -32
- package/dist/market_adapter/market_adapter.js +67 -48
- 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 +527 -31
- package/dist/modules/constants.js +15 -47
- 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 +108 -83
- 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 +16 -15
- 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 +4 -4
- 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 +225 -180
- package/dist/modules/order/manager.js +80 -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 +84 -53
- 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 +310 -110
- package/dist/modules/order/utils/order.js +122 -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 +1 -4
- package/dist/modules/paths.js +1 -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 +1 -12
- package/dist/modules/utils/time_range.js +1 -1
- 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 +65 -40
- package/dist/scripts/chart_command.d.ts +27 -18
- package/dist/scripts/chart_command.js +13 -11
- 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/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 +63 -35
- 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 +10 -9
- package/docs/FUND_MOVEMENT_AND_ACCOUNTING.md +5 -5
- package/docs/GRID_RECALCULATION.md +4 -2
- 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 +14 -3
- package/docs/architecture.md +12 -9
- package/docs/developer_guide.md +6 -6
- package/market_adapter/README.md +6 -1
- package/modules/README.md +4 -1
- package/package.json +4 -1
|
@@ -23,6 +23,7 @@
|
|
|
23
23
|
* - raw.NODES → maps into NODE_MANAGEMENT constants
|
|
24
24
|
*/
|
|
25
25
|
type MergeStrategy = 'replace' | 'shallow' | 'deep';
|
|
26
|
+
import type { UnknownRecord } from './types.js';
|
|
26
27
|
declare const MERGE_STRATEGIES: Record<string, MergeStrategy>;
|
|
27
28
|
/**
|
|
28
29
|
* Deep recursive merge: source values override target values at any depth.
|
|
@@ -31,7 +32,32 @@ declare const MERGE_STRATEGIES: Record<string, MergeStrategy>;
|
|
|
31
32
|
* Prototype-dangerous own keys from JSON-parsed sources ('__proto__' et al) are
|
|
32
33
|
* skipped so crafted config files cannot pollute Object.prototype.
|
|
33
34
|
*/
|
|
34
|
-
declare function deepMerge(target:
|
|
35
|
+
declare function deepMerge(target: UnknownRecord, source: UnknownRecord): UnknownRecord;
|
|
36
|
+
/**
|
|
37
|
+
* The NODES view built from a NODE_MANAGEMENT-style section. `healthCheck` and
|
|
38
|
+
* `selection` are typed because callers read/write those sub-fields directly;
|
|
39
|
+
* the index signature keeps unmapped passthrough keys reachable.
|
|
40
|
+
*/
|
|
41
|
+
export interface NodesHealthCheckView {
|
|
42
|
+
enabled?: boolean;
|
|
43
|
+
intervalMs?: number;
|
|
44
|
+
timeoutMs?: number;
|
|
45
|
+
maxPingMs?: number;
|
|
46
|
+
blacklistThreshold?: number;
|
|
47
|
+
[key: string]: unknown;
|
|
48
|
+
}
|
|
49
|
+
export interface NodesSelectionView {
|
|
50
|
+
strategy?: string;
|
|
51
|
+
preferredNode?: string | null;
|
|
52
|
+
[key: string]: unknown;
|
|
53
|
+
}
|
|
54
|
+
export interface NodesView {
|
|
55
|
+
enabled?: boolean;
|
|
56
|
+
list?: string[];
|
|
57
|
+
healthCheck: NodesHealthCheckView;
|
|
58
|
+
selection: NodesSelectionView;
|
|
59
|
+
[key: string]: unknown;
|
|
60
|
+
}
|
|
35
61
|
/**
|
|
36
62
|
* Build the NODES view object from a NODE_MANAGEMENT-style section — the ONE
|
|
37
63
|
* place that maps NODE_MANAGEMENT constants to the NODES consumer shape.
|
|
@@ -40,7 +66,7 @@ declare function deepMerge(target: any, source: any): any;
|
|
|
40
66
|
* document can never drift. Passthrough of unmapped raw.NODES sub-keys stays
|
|
41
67
|
* with the merge below; this only builds the base view.
|
|
42
68
|
*/
|
|
43
|
-
declare function buildNodesView(nm:
|
|
69
|
+
declare function buildNodesView(nm: UnknownRecord): NodesView;
|
|
44
70
|
/**
|
|
45
71
|
* Merge user settings with code defaults using per-section strategies.
|
|
46
72
|
*
|
|
@@ -49,6 +75,6 @@ declare function buildNodesView(nm: Record<string, any>): Record<string, any>;
|
|
|
49
75
|
* @returns Merged result with same shape as defaults (new objects where overridden,
|
|
50
76
|
* same references where not)
|
|
51
77
|
*/
|
|
52
|
-
declare function mergeSettings(
|
|
78
|
+
declare function mergeSettings<T extends UnknownRecord>(rawInput: unknown, defaults: T): T;
|
|
53
79
|
export { deepMerge, mergeSettings, buildNodesView, MERGE_STRATEGIES };
|
|
54
80
|
//# sourceMappingURL=settings_merge.d.ts.map
|
|
@@ -22,6 +22,7 @@
|
|
|
22
22
|
* - GRID_LIMITS.GRID_COMPARISON → sub-object deep merge
|
|
23
23
|
* - raw.NODES → maps into NODE_MANAGEMENT constants
|
|
24
24
|
*/
|
|
25
|
+
import { isUnknownRecord } from './types.js';
|
|
25
26
|
const MERGE_STRATEGIES = {
|
|
26
27
|
LOG_LEVEL: 'replace',
|
|
27
28
|
TIMING: 'shallow',
|
|
@@ -65,13 +66,9 @@ function deepMerge(target, source) {
|
|
|
65
66
|
const sv = source[key];
|
|
66
67
|
if (sv === undefined)
|
|
67
68
|
continue;
|
|
68
|
-
if (
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
}
|
|
72
|
-
else {
|
|
73
|
-
result[key] = { ...sv };
|
|
74
|
-
}
|
|
69
|
+
if (isUnknownRecord(sv)) {
|
|
70
|
+
const targetValue = result[key];
|
|
71
|
+
result[key] = isUnknownRecord(targetValue) ? deepMerge(targetValue, sv) : { ...sv };
|
|
75
72
|
}
|
|
76
73
|
else {
|
|
77
74
|
result[key] = sv;
|
|
@@ -102,15 +99,17 @@ function applyNodesToNodeManagement(nodes, nm) {
|
|
|
102
99
|
nm.DEFAULT_ENABLED = nodes.enabled;
|
|
103
100
|
if (Array.isArray(nodes.list))
|
|
104
101
|
nm.DEFAULT_NODES = nodes.list;
|
|
105
|
-
|
|
106
|
-
|
|
102
|
+
const healthCheck = nodes.healthCheck;
|
|
103
|
+
if (isUnknownRecord(healthCheck)) {
|
|
104
|
+
const hc = filterCommentKeys(healthCheck);
|
|
107
105
|
for (const [subKey, constantName] of Object.entries(NODES_SUBKEY_MAP.healthCheck)) {
|
|
108
106
|
if (hc[subKey] !== undefined)
|
|
109
107
|
nm[constantName] = hc[subKey];
|
|
110
108
|
}
|
|
111
109
|
}
|
|
112
|
-
|
|
113
|
-
|
|
110
|
+
const selection = nodes.selection;
|
|
111
|
+
if (isUnknownRecord(selection)) {
|
|
112
|
+
const sel = filterCommentKeys(selection);
|
|
114
113
|
for (const [subKey, constantName] of Object.entries(NODES_SUBKEY_MAP.selection)) {
|
|
115
114
|
if (sel[subKey] !== undefined)
|
|
116
115
|
nm[constantName] = sel[subKey];
|
|
@@ -150,9 +149,8 @@ function buildNodesView(nm) {
|
|
|
150
149
|
* @returns Merged result with same shape as defaults (new objects where overridden,
|
|
151
150
|
* same references where not)
|
|
152
151
|
*/
|
|
153
|
-
function mergeSettings(
|
|
154
|
-
|
|
155
|
-
raw = {};
|
|
152
|
+
function mergeSettings(rawInput, defaults) {
|
|
153
|
+
const raw = isUnknownRecord(rawInput) ? rawInput : {};
|
|
156
154
|
const result = {};
|
|
157
155
|
for (const key of Object.keys(defaults)) {
|
|
158
156
|
const rawVal = raw[key];
|
|
@@ -167,105 +165,85 @@ function mergeSettings(raw, defaults) {
|
|
|
167
165
|
result[key] = rawVal;
|
|
168
166
|
break;
|
|
169
167
|
case 'shallow': {
|
|
170
|
-
const cleanRaw =
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
? { ...defaultVal }
|
|
175
|
-
: defaultVal;
|
|
176
|
-
result[key] = typeof base === 'object' && base !== null && !Array.isArray(base)
|
|
177
|
-
? (typeof cleanRaw === 'object' && cleanRaw !== null && !Array.isArray(cleanRaw)
|
|
178
|
-
? { ...base, ...cleanRaw }
|
|
179
|
-
: base)
|
|
168
|
+
const cleanRaw = isUnknownRecord(rawVal) ? filterCommentKeys(rawVal) : rawVal;
|
|
169
|
+
const base = isUnknownRecord(defaultVal) ? { ...defaultVal } : defaultVal;
|
|
170
|
+
result[key] = isUnknownRecord(base)
|
|
171
|
+
? (isUnknownRecord(cleanRaw) ? { ...base, ...cleanRaw } : base)
|
|
180
172
|
: cleanRaw;
|
|
181
173
|
break;
|
|
182
174
|
}
|
|
183
175
|
case 'deep': {
|
|
184
|
-
const cleanRaw =
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
result[key] = deepMerge(defaultVal, cleanRaw);
|
|
189
|
-
}
|
|
190
|
-
else {
|
|
191
|
-
result[key] = cleanRaw;
|
|
192
|
-
}
|
|
176
|
+
const cleanRaw = isUnknownRecord(rawVal) ? filterCommentKeys(rawVal) : rawVal;
|
|
177
|
+
result[key] = isUnknownRecord(defaultVal) && isUnknownRecord(cleanRaw)
|
|
178
|
+
? deepMerge(defaultVal, cleanRaw)
|
|
179
|
+
: cleanRaw;
|
|
193
180
|
break;
|
|
194
181
|
}
|
|
195
182
|
}
|
|
196
183
|
}
|
|
197
184
|
// Post-processing: GRID_COMPARISON sub-object deep merge for GRID_LIMITS
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
const
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
...
|
|
206
|
-
|
|
207
|
-
|
|
185
|
+
const rawGridLimits = raw.GRID_LIMITS;
|
|
186
|
+
if (isUnknownRecord(rawGridLimits)) {
|
|
187
|
+
const rawComparisonRaw = rawGridLimits.GRID_COMPARISON;
|
|
188
|
+
if (isUnknownRecord(rawComparisonRaw)) {
|
|
189
|
+
const rawComparison = filterCommentKeys(rawComparisonRaw);
|
|
190
|
+
const defaultGridLimits = defaults.GRID_LIMITS;
|
|
191
|
+
const defaultComparisonRaw = isUnknownRecord(defaultGridLimits) ? defaultGridLimits.GRID_COMPARISON : undefined;
|
|
192
|
+
const defaultComparison = isUnknownRecord(defaultComparisonRaw) ? { ...defaultComparisonRaw } : {};
|
|
193
|
+
const resultGridLimits = isUnknownRecord(result.GRID_LIMITS) ? result.GRID_LIMITS : {};
|
|
194
|
+
result.GRID_LIMITS = {
|
|
195
|
+
...resultGridLimits,
|
|
196
|
+
GRID_COMPARISON: { ...defaultComparison, ...rawComparison },
|
|
197
|
+
};
|
|
198
|
+
}
|
|
208
199
|
}
|
|
209
|
-
// Post-processing: NODES
|
|
210
|
-
|
|
200
|
+
// Post-processing: NODES -> NODE_MANAGEMENT mapping, then build NODES output
|
|
201
|
+
const resultNodeManagement = result.NODE_MANAGEMENT;
|
|
202
|
+
if (isUnknownRecord(resultNodeManagement)) {
|
|
203
|
+
const rawNodes = raw.NODES;
|
|
211
204
|
// Step 1: Map raw.NODES sub-keys to NODE_MANAGEMENT constants
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
205
|
+
let mergedNodeManagement = resultNodeManagement;
|
|
206
|
+
if (isUnknownRecord(rawNodes)) {
|
|
207
|
+
const nm = { ...resultNodeManagement };
|
|
208
|
+
applyNodesToNodeManagement(rawNodes, nm);
|
|
209
|
+
mergedNodeManagement = nm;
|
|
216
210
|
}
|
|
211
|
+
result.NODE_MANAGEMENT = mergedNodeManagement;
|
|
217
212
|
// Step 2: Build NODES output object from merged NODE_MANAGEMENT
|
|
218
|
-
const nodesConfig = buildNodesView(
|
|
213
|
+
const nodesConfig = buildNodesView(mergedNodeManagement);
|
|
219
214
|
// Step 3: Passthrough unmapped top-level keys from raw.NODES
|
|
220
|
-
if (
|
|
221
|
-
const rawNodes = raw.NODES;
|
|
215
|
+
if (isUnknownRecord(rawNodes)) {
|
|
222
216
|
if (rawNodes.enabled !== undefined)
|
|
223
217
|
nodesConfig.enabled = rawNodes.enabled;
|
|
224
218
|
if (Array.isArray(rawNodes.list))
|
|
225
219
|
nodesConfig.list = rawNodes.list;
|
|
226
220
|
// HealthCheck: keep mapped values, add any unmapped sub-keys
|
|
227
|
-
|
|
228
|
-
|
|
221
|
+
const rawHealthCheck = rawNodes.healthCheck;
|
|
222
|
+
if (isUnknownRecord(rawHealthCheck)) {
|
|
223
|
+
const nodeHealth = nodesConfig.healthCheck;
|
|
224
|
+
for (const k of Object.keys(rawHealthCheck)) {
|
|
229
225
|
if (k.startsWith('_'))
|
|
230
226
|
continue;
|
|
231
227
|
if (!(k in NODES_SUBKEY_MAP.healthCheck)) {
|
|
232
|
-
|
|
228
|
+
nodeHealth[k] = rawHealthCheck[k];
|
|
233
229
|
}
|
|
234
230
|
}
|
|
235
231
|
}
|
|
236
232
|
// Selection: keep mapped values, add any unmapped sub-keys
|
|
237
|
-
|
|
238
|
-
|
|
233
|
+
const rawSelection = rawNodes.selection;
|
|
234
|
+
if (isUnknownRecord(rawSelection)) {
|
|
235
|
+
const nodeSelection = nodesConfig.selection;
|
|
236
|
+
for (const k of Object.keys(rawSelection)) {
|
|
239
237
|
if (k.startsWith('_'))
|
|
240
238
|
continue;
|
|
241
239
|
if (!(k in NODES_SUBKEY_MAP.selection)) {
|
|
242
|
-
|
|
240
|
+
nodeSelection[k] = rawSelection[k];
|
|
243
241
|
}
|
|
244
242
|
}
|
|
245
243
|
}
|
|
246
244
|
}
|
|
247
245
|
result.NODES = nodesConfig;
|
|
248
246
|
}
|
|
249
|
-
// Backward-compatible EXPERT second-pass overrides (GRID_LIMITS and TIMING only).
|
|
250
|
-
// These WIN over any top-level setting from the main merge above.
|
|
251
|
-
if (raw.EXPERT && typeof raw.EXPERT === 'object') {
|
|
252
|
-
if (raw.EXPERT.GRID_LIMITS && typeof raw.EXPERT.GRID_LIMITS === 'object') {
|
|
253
|
-
const expertGrid = filterCommentKeys(raw.EXPERT.GRID_LIMITS);
|
|
254
|
-
const priorComparison = result.GRID_LIMITS && result.GRID_LIMITS.GRID_COMPARISON;
|
|
255
|
-
const { GRID_COMPARISON: expertComparison, ...expertRest } = expertGrid;
|
|
256
|
-
result.GRID_LIMITS = { ...result.GRID_LIMITS, ...expertRest };
|
|
257
|
-
if (expertComparison && typeof expertComparison === 'object') {
|
|
258
|
-
result.GRID_LIMITS.GRID_COMPARISON = { ...(priorComparison || {}), ...expertComparison };
|
|
259
|
-
}
|
|
260
|
-
else if (expertComparison !== undefined && priorComparison) {
|
|
261
|
-
result.GRID_LIMITS.GRID_COMPARISON = priorComparison;
|
|
262
|
-
}
|
|
263
|
-
}
|
|
264
|
-
if (raw.EXPERT.TIMING && typeof raw.EXPERT.TIMING === 'object') {
|
|
265
|
-
const expertTiming = filterCommentKeys(raw.EXPERT.TIMING);
|
|
266
|
-
result.TIMING = { ...result.TIMING, ...expertTiming };
|
|
267
|
-
}
|
|
268
|
-
}
|
|
269
247
|
return result;
|
|
270
248
|
}
|
|
271
249
|
export { deepMerge, mergeSettings, buildNodesView, MERGE_STRATEGIES };
|
|
@@ -3,11 +3,14 @@ export interface SocketJsonRequestOptions {
|
|
|
3
3
|
socketPath: string;
|
|
4
4
|
timeoutMs: number;
|
|
5
5
|
/** Write the request to the connected socket (one JSON line). */
|
|
6
|
-
writePayload: (socket:
|
|
6
|
+
writePayload: (socket: {
|
|
7
|
+
write(data: string): unknown;
|
|
8
|
+
destroy(): void;
|
|
9
|
+
}) => void;
|
|
7
10
|
/** Build the failure error for timeout / connection / truncated-stream / invalid-response cases. */
|
|
8
|
-
buildError: (kind: SocketJsonFailureKind, detail?:
|
|
11
|
+
buildError: (kind: SocketJsonFailureKind, detail?: unknown) => Error;
|
|
9
12
|
/** Handle a fully parsed response line: resolve or reject the request. */
|
|
10
|
-
handleResponse: (parsed:
|
|
13
|
+
handleResponse: (parsed: unknown, resolve: (value: unknown) => void, reject: (err: unknown) => void) => void;
|
|
11
14
|
}
|
|
12
|
-
export declare function sendSocketJsonRequest(options: SocketJsonRequestOptions): Promise<
|
|
15
|
+
export declare function sendSocketJsonRequest(options: SocketJsonRequestOptions): Promise<unknown>;
|
|
13
16
|
//# sourceMappingURL=socket_json_client.d.ts.map
|
|
@@ -1,62 +1,47 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
* - Mutations schedule a debounced flush; call `await adapter.flush()`
|
|
9
|
-
* to persist to IndexedDB immediately. This matches the browser's
|
|
10
|
-
* single-tab / single-process concurrency model — no cross-process
|
|
11
|
-
* atomicity needed.
|
|
12
|
-
* - Deletions are tracked as tombstones and replayed as IndexedDB deletes
|
|
13
|
-
* on flush so removed files cannot resurrect on the next load.
|
|
14
|
-
* - Ingest never overwrites locally newer state: records mutated before
|
|
15
|
-
* the load cursor reaches them (writes or deletes) keep their value.
|
|
16
|
-
*
|
|
17
|
-
* IndexedDB schema:
|
|
18
|
-
* DB name: "DEXBotStorage"
|
|
19
|
-
* Store name: "files"
|
|
20
|
-
* Key: file path (string)
|
|
21
|
-
* Value: { content: string, type: 'json' | 'text', mtime: number }
|
|
22
|
-
*
|
|
23
|
-
* If IndexedDB is unavailable (private browsing, SSR), falls back to a
|
|
24
|
-
* MemoryMap adapter that logs a warning.
|
|
25
|
-
*/
|
|
1
|
+
import type { FileStat } from './types.js';
|
|
2
|
+
type WriteOptions = {
|
|
3
|
+
mode?: number;
|
|
4
|
+
fsync?: boolean;
|
|
5
|
+
tmpPrefix?: string;
|
|
6
|
+
flag?: 'w' | 'wx';
|
|
7
|
+
};
|
|
26
8
|
declare function createBrowserStorageAdapter(): {
|
|
27
|
-
readJSON(path:
|
|
28
|
-
writeJSON(path:
|
|
29
|
-
exists(path:
|
|
30
|
-
ensureDir(_path:
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
readdir(dirPath:
|
|
41
|
-
open(_path:
|
|
9
|
+
readJSON<T = unknown>(path: string): T;
|
|
10
|
+
writeJSON(path: string, data: unknown, options?: WriteOptions): void;
|
|
11
|
+
exists(path: string): boolean;
|
|
12
|
+
ensureDir(_path: string, _options?: {
|
|
13
|
+
mode?: number;
|
|
14
|
+
}): void;
|
|
15
|
+
unlink(path: string): void;
|
|
16
|
+
readFile(path: string, encoding?: string): string;
|
|
17
|
+
writeFile(path: string, data: string, options?: {
|
|
18
|
+
mode?: number;
|
|
19
|
+
} | string): void;
|
|
20
|
+
rename(oldPath: string, newPath: string): void;
|
|
21
|
+
stat(path: string): FileStat;
|
|
22
|
+
readdir(dirPath: string): string[];
|
|
23
|
+
open(_path: string, _flags: string | number, _mode?: number): never;
|
|
42
24
|
close(): never;
|
|
43
25
|
write(): never;
|
|
44
26
|
fsync(): never;
|
|
45
27
|
chmod(): void;
|
|
46
|
-
realpath(path:
|
|
28
|
+
realpath(path: string): string;
|
|
47
29
|
access(): void;
|
|
48
|
-
utimes(_path:
|
|
49
|
-
lstat(path:
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
30
|
+
utimes(_path: string, _atime: Date | number, _mtime: Date | number): void;
|
|
31
|
+
lstat(path: string): FileStat;
|
|
32
|
+
rmdir(_path: string): void;
|
|
33
|
+
rm(_path: string, _options?: {
|
|
34
|
+
recursive?: boolean;
|
|
35
|
+
force?: boolean;
|
|
36
|
+
}): void;
|
|
37
|
+
mkdtemp(prefix: string): string;
|
|
38
|
+
readlink(path: string): string;
|
|
39
|
+
appendFile(path: string, data: string, options?: {
|
|
40
|
+
mode?: number;
|
|
41
|
+
} | string): void;
|
|
42
|
+
appendFileAsync(path: string, data: string, options?: {
|
|
43
|
+
mode?: number;
|
|
44
|
+
} | string): Promise<void>;
|
|
60
45
|
createReadStream(): never;
|
|
61
46
|
createWriteStream(): never;
|
|
62
47
|
flush: () => Promise<void>;
|
|
@@ -1,28 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
* BrowserStorageAdapter — in-memory Map backed by IndexedDB.
|
|
3
|
-
*
|
|
4
|
-
* Architecture:
|
|
5
|
-
* - On construction, schedules an async IndexedDB load into an in-memory Map.
|
|
6
|
-
* Until the load completes, synchronous reads return undefined/defaults.
|
|
7
|
-
* - All sync operations (readJSON, writeJSON, exists, etc.) hit the Map.
|
|
8
|
-
* - Mutations schedule a debounced flush; call `await adapter.flush()`
|
|
9
|
-
* to persist to IndexedDB immediately. This matches the browser's
|
|
10
|
-
* single-tab / single-process concurrency model — no cross-process
|
|
11
|
-
* atomicity needed.
|
|
12
|
-
* - Deletions are tracked as tombstones and replayed as IndexedDB deletes
|
|
13
|
-
* on flush so removed files cannot resurrect on the next load.
|
|
14
|
-
* - Ingest never overwrites locally newer state: records mutated before
|
|
15
|
-
* the load cursor reaches them (writes or deletes) keep their value.
|
|
16
|
-
*
|
|
17
|
-
* IndexedDB schema:
|
|
18
|
-
* DB name: "DEXBotStorage"
|
|
19
|
-
* Store name: "files"
|
|
20
|
-
* Key: file path (string)
|
|
21
|
-
* Value: { content: string, type: 'json' | 'text', mtime: number }
|
|
22
|
-
*
|
|
23
|
-
* If IndexedDB is unavailable (private browsing, SSR), falls back to a
|
|
24
|
-
* MemoryMap adapter that logs a warning.
|
|
25
|
-
*/
|
|
1
|
+
import { getErrorMessage } from '../utils/errors.js';
|
|
26
2
|
function createBrowserStorageAdapter() {
|
|
27
3
|
const store = new Map();
|
|
28
4
|
const tombstones = new Set();
|
|
@@ -61,7 +37,7 @@ function createBrowserStorageAdapter() {
|
|
|
61
37
|
}
|
|
62
38
|
catch (err) {
|
|
63
39
|
// IndexedDB unavailable — memory-only mode
|
|
64
|
-
console.warn(`BrowserStorageAdapter: IndexedDB load failed (${err
|
|
40
|
+
console.warn(`BrowserStorageAdapter: IndexedDB load failed (${getErrorMessage(err)}); falling back to memory-only mode`);
|
|
65
41
|
}
|
|
66
42
|
finally {
|
|
67
43
|
if (db)
|
|
@@ -91,7 +67,7 @@ function createBrowserStorageAdapter() {
|
|
|
91
67
|
}
|
|
92
68
|
catch (err) {
|
|
93
69
|
// MemoryMap mode — nothing to flush
|
|
94
|
-
console.warn(`BrowserStorageAdapter: IndexedDB flush failed (${err
|
|
70
|
+
console.warn(`BrowserStorageAdapter: IndexedDB flush failed (${getErrorMessage(err)}); changes remain memory-only`);
|
|
95
71
|
}
|
|
96
72
|
finally {
|
|
97
73
|
if (db)
|
|
@@ -108,6 +84,8 @@ function createBrowserStorageAdapter() {
|
|
|
108
84
|
}
|
|
109
85
|
function openDB() {
|
|
110
86
|
const idb = globalThis.indexedDB;
|
|
87
|
+
if (!idb)
|
|
88
|
+
return Promise.reject(new Error('IndexedDB is unavailable'));
|
|
111
89
|
return new Promise((resolve, reject) => {
|
|
112
90
|
const request = idb.open('DEXBotStorage', 1);
|
|
113
91
|
request.onupgradeneeded = (event) => {
|
|
@@ -129,10 +107,9 @@ function createBrowserStorageAdapter() {
|
|
|
129
107
|
throw Object.assign(new Error(`ENOENT: ${path}`), { code: 'ENOENT' });
|
|
130
108
|
return JSON.parse(entry.content);
|
|
131
109
|
},
|
|
132
|
-
writeJSON(path, data, options) {
|
|
110
|
+
writeJSON(path, data, options = {}) {
|
|
133
111
|
if (options?.flag === 'wx' && store.has(path)) {
|
|
134
|
-
const err = new Error(`EEXIST: ${path}`);
|
|
135
|
-
err.code = 'EEXIST';
|
|
112
|
+
const err = Object.assign(new Error(`EEXIST: ${path}`), { code: 'EEXIST' });
|
|
136
113
|
throw err;
|
|
137
114
|
}
|
|
138
115
|
const content = JSON.stringify(data, null, 2) + '\n';
|
|
@@ -23,7 +23,7 @@ declare function getStorage(): IStorageAdapter;
|
|
|
23
23
|
* Override the storage adapter (for DI, testing, or explicit choice).
|
|
24
24
|
* Pass `null` to reset to auto-detection on next `getStorage()` call.
|
|
25
25
|
*/
|
|
26
|
-
declare function setAdapter(adapter:
|
|
26
|
+
declare function setAdapter(adapter: IStorageAdapter | null): void;
|
|
27
27
|
export { getStorage, setAdapter };
|
|
28
28
|
export type { IStorageAdapter };
|
|
29
29
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -15,34 +15,52 @@
|
|
|
15
15
|
* 5. credential_policy inline (openSync 0o600 + writeSync + fsyncSync + renameSync)
|
|
16
16
|
* 6. account_orders._persist (writeFileSync + read-fsync + renameSync)
|
|
17
17
|
*/
|
|
18
|
+
import type * as NodeFs from 'node:fs';
|
|
19
|
+
import type { FileStat } from './types.js';
|
|
18
20
|
declare class NodeStorageAdapter {
|
|
19
|
-
readJSON(filePath:
|
|
20
|
-
writeJSON: (filePath: string, data:
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
21
|
+
readJSON<T = unknown>(filePath: string): T;
|
|
22
|
+
writeJSON: (filePath: string, data: unknown, options?: {
|
|
23
|
+
mode?: number;
|
|
24
|
+
fsync?: boolean;
|
|
25
|
+
tmpPrefix?: string;
|
|
26
|
+
flag?: "w" | "wx";
|
|
27
|
+
}) => void;
|
|
28
|
+
exists(path: string): boolean;
|
|
29
|
+
ensureDir(path: string, options?: {
|
|
30
|
+
mode?: number;
|
|
31
|
+
}): void;
|
|
32
|
+
unlink(path: string): void;
|
|
33
|
+
readFile(path: string, encoding?: string): string;
|
|
34
|
+
writeFile(path: string, data: string, options?: {
|
|
35
|
+
mode?: number;
|
|
36
|
+
} | string): void;
|
|
37
|
+
rename(oldPath: string, newPath: string): void;
|
|
38
|
+
stat(path: string): FileStat;
|
|
39
|
+
readdir(path: string): string[];
|
|
40
|
+
open(path: string, flags: string | number, mode?: number): number;
|
|
41
|
+
close(fd: number): void;
|
|
42
|
+
write(fd: number, buffer: string, position?: number | null, encoding?: string): void;
|
|
43
|
+
fsync(fd: number): void;
|
|
44
|
+
chmod(path: string, mode: number): void;
|
|
45
|
+
realpath(path: string): string;
|
|
46
|
+
access(path: string, mode?: number): void;
|
|
47
|
+
utimes(path: string, atime: Date | number, mtime: Date | number): void;
|
|
48
|
+
lstat(path: string): FileStat;
|
|
49
|
+
rmdir(path: string): void;
|
|
50
|
+
rm(path: string, options?: {
|
|
51
|
+
recursive?: boolean;
|
|
52
|
+
force?: boolean;
|
|
53
|
+
}): void;
|
|
54
|
+
mkdtemp(prefix: string): string;
|
|
55
|
+
readlink(path: string): string;
|
|
56
|
+
appendFile(path: string, data: string, options?: {
|
|
57
|
+
mode?: number;
|
|
58
|
+
} | string): void;
|
|
59
|
+
appendFileAsync(path: string, data: string, options?: {
|
|
60
|
+
mode?: number;
|
|
61
|
+
} | string): Promise<void>;
|
|
62
|
+
createReadStream(path: string): NodeFs.ReadStream;
|
|
63
|
+
createWriteStream(path: string): NodeFs.WriteStream;
|
|
46
64
|
}
|
|
47
65
|
export default NodeStorageAdapter;
|
|
48
66
|
//# sourceMappingURL=node_adapter.d.ts.map
|
|
@@ -20,12 +20,12 @@ import { path } from '../path_api.js';
|
|
|
20
20
|
import { randomBytes } from '../crypto/sync.js';
|
|
21
21
|
import { runtime } from '../runtime.js';
|
|
22
22
|
const _require = createRequire(import.meta.url);
|
|
23
|
-
let _fs;
|
|
23
|
+
let _fs = null;
|
|
24
24
|
const fs = new Proxy({}, {
|
|
25
|
-
get(
|
|
25
|
+
get(_target, prop) {
|
|
26
26
|
if (!_fs && _require)
|
|
27
27
|
_fs = _require('fs');
|
|
28
|
-
return _fs ? _fs
|
|
28
|
+
return _fs ? Reflect.get(_fs, prop) : undefined;
|
|
29
29
|
}
|
|
30
30
|
});
|
|
31
31
|
class NodeStorageAdapter {
|
|
@@ -98,7 +98,7 @@ class NodeStorageAdapter {
|
|
|
98
98
|
return fs.readFileSync(path, encoding);
|
|
99
99
|
}
|
|
100
100
|
writeFile(path, data, options) {
|
|
101
|
-
fs.writeFileSync(path, data, options ?? 'utf8');
|
|
101
|
+
fs.writeFileSync(path, data, (options ?? 'utf8'));
|
|
102
102
|
}
|
|
103
103
|
rename(oldPath, newPath) {
|
|
104
104
|
fs.renameSync(oldPath, newPath);
|
|
@@ -116,7 +116,7 @@ class NodeStorageAdapter {
|
|
|
116
116
|
fs.closeSync(fd);
|
|
117
117
|
}
|
|
118
118
|
write(fd, buffer, position, encoding) {
|
|
119
|
-
fs.writeSync(fd, buffer, position, encoding);
|
|
119
|
+
fs.writeSync(fd, buffer, position ?? null, (encoding ?? 'utf8'));
|
|
120
120
|
}
|
|
121
121
|
fsync(fd) {
|
|
122
122
|
fs.fsyncSync(fd);
|
|
@@ -128,7 +128,7 @@ class NodeStorageAdapter {
|
|
|
128
128
|
return fs.realpathSync(path);
|
|
129
129
|
}
|
|
130
130
|
access(path, mode) {
|
|
131
|
-
|
|
131
|
+
fs.accessSync(path, mode);
|
|
132
132
|
}
|
|
133
133
|
utimes(path, atime, mtime) {
|
|
134
134
|
fs.utimesSync(path, atime, mtime);
|
|
@@ -139,7 +139,7 @@ class NodeStorageAdapter {
|
|
|
139
139
|
rmdir(path) {
|
|
140
140
|
fs.rmdirSync(path);
|
|
141
141
|
}
|
|
142
|
-
rm(path, options
|
|
142
|
+
rm(path, options) {
|
|
143
143
|
fs.rmSync(path, options);
|
|
144
144
|
}
|
|
145
145
|
mkdtemp(prefix) {
|
|
@@ -149,10 +149,10 @@ class NodeStorageAdapter {
|
|
|
149
149
|
return fs.readlinkSync(path);
|
|
150
150
|
}
|
|
151
151
|
appendFile(path, data, options) {
|
|
152
|
-
fs.appendFileSync(path, data, options ?? 'utf8');
|
|
152
|
+
fs.appendFileSync(path, data, (options ?? 'utf8'));
|
|
153
153
|
}
|
|
154
154
|
async appendFileAsync(path, data, options) {
|
|
155
|
-
await fs.promises.appendFile(path, data, options ?? 'utf8');
|
|
155
|
+
await fs.promises.appendFile(path, data, (options ?? 'utf8'));
|
|
156
156
|
}
|
|
157
157
|
createReadStream(path) {
|
|
158
158
|
return fs.createReadStream(path);
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { ReadStream, WriteStream } from 'node:fs';
|
|
1
2
|
export interface FileStat {
|
|
2
3
|
mtimeMs: number;
|
|
3
4
|
isFile(): boolean;
|
|
@@ -11,7 +12,7 @@ export interface FileStat {
|
|
|
11
12
|
}
|
|
12
13
|
export interface IStorageAdapter {
|
|
13
14
|
/** Read and parse a JSON file */
|
|
14
|
-
readJSON<T =
|
|
15
|
+
readJSON<T = Record<string, unknown>>(path: string): T;
|
|
15
16
|
/**
|
|
16
17
|
* Atomically write a JSON file using tmp-file + rename.
|
|
17
18
|
* Unified implementation — replaces all 5 prior atomic-write variants.
|
|
@@ -24,7 +25,7 @@ export interface IStorageAdapter {
|
|
|
24
25
|
* exclusive-create directly on the target — caller must handle EEXIST.
|
|
25
26
|
* Use 'wx' when the file should be created only if it does not exist.
|
|
26
27
|
*/
|
|
27
|
-
writeJSON(path: string, data:
|
|
28
|
+
writeJSON(path: string, data: unknown, options?: {
|
|
28
29
|
mode?: number;
|
|
29
30
|
fsync?: boolean;
|
|
30
31
|
tmpPrefix?: string;
|
|
@@ -88,8 +89,8 @@ export interface IStorageAdapter {
|
|
|
88
89
|
mode?: number;
|
|
89
90
|
} | string): Promise<void>;
|
|
90
91
|
/** Create a readable stream for a file (Node-only; throws in browser adapter) */
|
|
91
|
-
createReadStream(path: string):
|
|
92
|
+
createReadStream(path: string): ReadStream;
|
|
92
93
|
/** Create a writable stream for a file (Node-only; throws in browser adapter) */
|
|
93
|
-
createWriteStream(path: string):
|
|
94
|
+
createWriteStream(path: string): WriteStream;
|
|
94
95
|
}
|
|
95
96
|
//# sourceMappingURL=types.d.ts.map
|