Claude/gracious lewin#80
Open
MaximPyatin wants to merge 40 commits intoGozargah:masterfrom
Open
Conversation
Updated build workflow to trigger on branches 'dev' and 'test'. Switched to using docker/build-push-action@v5 and modified image tags.
Updated Docker actions to use version 2 and 5.
Made-with: Cursor
…ir, writes override, starts services) Made-with: Cursor
…gistration via API Made-with: Cursor
…n not available on all systems) Made-with: Cursor
… password safety Made-with: Cursor
…ue injection Made-with: Cursor
…duce timeout: no recent network activity Made-with: Cursor
…ria2; always restart hysteria2 after up -d Made-with: Cursor
- Fix shell injection in ask() via eval (m4) - Fix bash precedence bug: HTTP 200 check now correctly prints ok msg (m5) - Abort with err() if node SSL certs still missing after 15s wait (m6) - Change default TRAFFIC_LISTEN to 0.0.0.0:9999 so main panel can collect traffic stats from nodes (required by B2 fix in main repo) Made-with: Cursor
Made-with: Cursor
…s mobile ISP filtering) Made-with: Cursor
… on all hosters) Made-with: Cursor
…tability Made-with: Cursor
…ONFIG mode Made-with: Cursor
…IENT_CERT and REST protocol Made-with: Cursor
…idle 90s) Made-with: Cursor
Made-with: Cursor
… 10s startup timeout) Made-with: Cursor
Made-with: Cursor
…ents Made-with: Cursor
Made-with: Cursor
…etection Made-with: Cursor
Made-with: Cursor
Add the Telemt config writer, REST sync endpoints, sidecar files, and setup script needed to run MTProto on one selected Marzban node. Made-with: Cursor
Made-with: Cursor
Apply a local telemt patch so tg_connect actually controls upstream Telegram DC connection attempts, and raise setup defaults to reduce premature node-to-Telegram handshake failures. Made-with: Cursor
Made-with: Cursor
- MTPROTO_NODE_SETUP: ee steps, panel/node env, verification - .env.example: ee and TLS domain notes - setup-mtproto-node.sh: remind users to reissue tg:// links for ee Made-with: Cursor
- node_metrics: psutil CPU, hysteria traffic API (bracketed IPv6 listen), 2-5s sampler - rest_service: GET /metrics (mTLS); NODE_METRICS_INTERVAL in config - requirements: psutil; .env.example note Made-with: Cursor
…/marzban-node/.env; warn if secret missing Made-with: Cursor
Critical bugs fixed:
1. setup-hysteria-node.sh: ENV_FILE was writing HYSTERIA2_ENABLED=true and
HYSTERIA2_TRAFFIC_SECRET to ${NODE_COMPOSE_DIR}/.env, but docker-compose
loads /var/lib/marzban-node/.env (env_file: directive). The container
never saw HYSTERIA2_ENABLED, so node_metrics.py never polled Hysteria
traffic API → always 0 connections / 0 bandwidth.
Fix: ENV_FILE now correctly points to ${NODE_DATA_DIR}/.env.
2. Marzban/config.py: record_hysteria_usage.py imported HYSTERIA2_TRAFFIC_SECRET,
HYSTERIA2_TRAFFIC_LISTEN, HYSTERIA2_NODE_TRAFFIC_PORT which were missing from
the panel config excerpt → ImportError at panel startup.
Fix: added the three missing variables with defaults.
3. deploy-marzban-node.sh: node exits on startup (exit 0) when ssl_client_cert.pem
is missing (main.py hard-exits for REST mode). Script now detects the missing
cert, shows step-by-step instructions, supports PANEL_CERT_URL env var for
auto-download, and offers interactive paste. Also checks Hysteria2 config
after start and shows actionable warnings.
4. node_metrics.py: when Marzban panel calls /traffic?clear=true it resets
counters, causing a negative delta that was clamped to 0. Bandwidth then
remained 0 until the next sample cycle. Fix: on negative delta reset
_last_total_bytes baseline so the very next interval is accurate.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.