mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-09-17 15:47:14 +00:00
feat(discord): add Discord notification bot service (#6486)
* feat(discord): add Discord notification bot service, settings UI, and event subscriber - internal/web/service/discord: implement lightweight Discord REST API v10 client and EventBus subscriber - internal/web/service/setting: add discordBotEnable, discordBotToken, discordChannelId, discordEnabledEvents, discordCpu, discordMemory settings and secret protection - internal/web/controller: register POST /panel/api/setting/testDiscord endpoint - frontend: add Discord settings tab, notifications configuration, sidebar navigation, and command palette integration - translation: add localization keys across all 13 locales - tests: add comprehensive unit tests with httptest server and verify route/i18n contracts * fix(discord): address PR review findings on concurrency, linting, i18n, and stories - subscriber: eliminate unbounded goroutines, sending inline per EventBus contract - discord: accept context.Context in SendMessage, SendEmbed, SendTest with http.NewRequestWithContext - format: apply gofumpt to controller and entity struct alignments - i18n: localize testDiscord controller responses across all 13 locales - storybook: add DiscordNotifications.stories.tsx component story * docs: add Discord bot setup and operations guide - add docs/content/docs/en/operations/discord-bot.mdx with setup steps, event indicators, settings, and troubleshooting - add docs/content/docs/ru/operations/discord-bot.mdx with localized instructions - update operations/meta.json across en, ru, zh, fa - link Discord bot from panel configuration overview * feat(discord): add discordLang, discordRunTime, discordBotBackup settings and update settings UI - internal/web/entity: add DiscordRunTime, DiscordBotBackup, DiscordLang fields to AllSetting - internal/web/service/setting: add defaultValueMap entries, getters, and setters - frontend: update AllSetting schema, model defaults, and generate OpenAPI / Zod contracts - frontend: extract shared NotifyTimeField component and update DiscordTab with General and Notifications tabs - translation: add localization keys across all 13 locales * feat(discord): implement scheduled status reports and database backup attachments - internal/web/service/discord: add SendMessageWithFiles supporting multipart uploads - internal/web/service/discord: implement BuildReport and SendReport generating rich status embeds - internal/web/service/discord: attach database backup (and config.json) when discordBotBackup is enabled - internal/web/job: implement DiscordNotifyJob scheduled via robfig/cron - internal/web/locale: add LocalizerFor and I18nForLang helpers - internal/web/controller: trigger reloadDiscordFunc to dynamically reschedule cron upon setting changes - internal/web/web: register and reschedule DiscordNotifyJob - tests: comprehensive unit tests for multipart uploads, status reporting, and job execution * feat(discord): add interactive bot commands via Gateway WebSocket and update documentation - internal/web/service/discord/gateway: connect to Discord Gateway v10 via WebSocket (gorilla/websocket) - internal/web/service/discord/gateway: handle heartbeat loop, reconnection, and command dispatch - commands: implement !status, !report, !backup, !usage <email>, !inbounds, !restart, !help (with ! and / prefixes) - internal/web/web: start/stop Gateway client with server and reload dynamically on setting updates - docs: update operations guide (en, ru) with scheduled reports, backups, commands, and privileged intents - tests: add end-to-end WebSocket Gateway test verifying command handling * style(discord): fix goimports formatting and add 3x-ui to gitignore * fix(discord): stop gateway panics, reconnect storms and proxy bypass The Gateway client wrote to its websocket from both the heartbeat ticker and the read loop answering server-requested op 1 heartbeats. gorilla panics on concurrent writes and neither goroutine recovers, so a colliding heartbeat took the whole panel process down; writes now share writeMu. It also reconnected every 5s forever after close codes Discord marks non-reconnectable (4004 bad token, 4010-4014, including 4014 when Message Content Intent is off), re-identifying and logging a warning each time. The loop now stops on those codes; the docs say to restart the panel. The gateway dialed with websocket.DefaultDialer, bypassing the panel egress proxy the REST client already uses, so where Discord is filtered notifications arrived but commands never connected. * fix(discord): deliver the scheduled report when the backup upload fails SendReport posted the report embed and the x-ui.db/config.json attachments in one multipart request. Once the database outgrows Discord's upload cap (20 MiB by default) the request is rejected and the report embed is lost with it on every run, leaving only a log warning. Send the embed first and the attachments as a second message. * chore(discord): delete tests that pass whether or not the code works TestDiscordNotifyJob_NilServiceNoPanic and TestHandleEvent_NilDiscordService feed a nil DiscordService that web.go never passes, and TestDiscordNotifyJob_DisabledNoPanic passes with or without the enable guard because Xray is not running under test. * fix(discord): require admin user IDs for bot commands and honor discordLang Any member who could post in the configured channel could run !backup (the whole x-ui.db and config.json, even with discordBotBackup off), !restart and !usage. Commands now run only for the Discord user IDs in the new discordAdminIds setting; an empty list turns commands off. discordLang was saved and offered in the UI, but nothing read it, so every embed stayed English. The test message, alerts, the scheduled report and command replies now render through I18nForLang in the chosen language, with a discord section in all 13 locales. InitLocalizer takes an fs.FS so tests load the real translation files. --------- Co-authored-by: Sanaei <ho3ein.sanaei@gmail.com>
This commit is contained in:
@@ -1587,8 +1587,31 @@
|
||||
"subHappGroupNetwork": "Network & TUN Engine",
|
||||
"subHappGroupThemes": "Appearance & Theme",
|
||||
"subHappGroupFailover": "Migration & App Management",
|
||||
"subHappGroupAndroid": "Android Per-App Proxy"
|
||||
|
||||
"subHappGroupAndroid": "Android Per-App Proxy",
|
||||
"discordSettings": "Discord Bot",
|
||||
"discordBotEnable": "Discord通知を有効化",
|
||||
"discordBotEnableDesc": "Botを介してDiscordチャンネルにシステムおよびイベント通知を送信します",
|
||||
"discordBotToken": "Discord Botトークン",
|
||||
"discordBotTokenDesc": "Discord Developer PortalからのBotトークン",
|
||||
"discordTokenConfigured": "トークンは設定されています。新しいトークンを入力して置き換えます。",
|
||||
"discordTokenPlaceholder": "Botトークンを入力",
|
||||
"discordChannelId": "チャンネルID",
|
||||
"discordChannelIdDesc": "通知が送信されるDiscordチャンネルID",
|
||||
"discordAdminIds": "管理者ユーザーID",
|
||||
"discordAdminIdsDesc": "ボットコマンドの実行を許可するDiscordユーザーID(カンマ区切り)。それ以外のユーザーのメッセージは無視され、空欄の場合はコマンドが無効になります。",
|
||||
"discordEventBusNotify": "Discord通知",
|
||||
"testDiscord": "テスト通知を送信",
|
||||
"testDiscordDesc": "BotトークンとチャンネルIDを確認するためのテスト通知を送信します",
|
||||
"discordNotInitialized": "Discord サービスが初期化されていません",
|
||||
"discordBotNotEnabled": "Discord ボットが有効になっていません",
|
||||
"discordTestFailed": "Discord テストに失敗しました",
|
||||
"discordTestSuccess": "テスト通知が正常に送信されました",
|
||||
"discordBotLanguage": "Discord Botの言語",
|
||||
"discordNotifyTime": "通知時間",
|
||||
"discordNotifyTimeDesc": "Discord ボットが定期レポートを送信する頻度です。プリセットの間隔を選ぶか、「カスタム」を選んで crontab 式を入力します。",
|
||||
"discordNotifyBackup": "データベースバックアップ",
|
||||
"discordNotifyBackupDesc": "レポート付きのデータベースバックアップファイルを送信",
|
||||
"discordEventBusNotifyDesc": "Discord通知をトリガーするイベントを選択してください"
|
||||
},
|
||||
"xray": {
|
||||
"importRules": "ルールをインポート",
|
||||
@@ -2390,6 +2413,81 @@
|
||||
"chooseInbound": "インバウンドを選択"
|
||||
}
|
||||
},
|
||||
"discord": {
|
||||
"test": {
|
||||
"title": "3x-ui Discord通知テスト",
|
||||
"body": "これはDiscord通知が正しく設定されていることを確認するためのテスト通知です。"
|
||||
},
|
||||
"footer": "3x-ui パネル",
|
||||
"fields": {
|
||||
"panelVersion": "パネルバージョン",
|
||||
"xrayCore": "Xray コア",
|
||||
"systemLoad": "システム負荷",
|
||||
"networkTraffic": "ネットワークトラフィック",
|
||||
"totalUsed": "合計使用量",
|
||||
"quota": "クォータ",
|
||||
"error": "エラー",
|
||||
"delay": "遅延",
|
||||
"outbound": "アウトバウンド",
|
||||
"node": "ノード",
|
||||
"threshold": "しきい値",
|
||||
"reason": "理由",
|
||||
"time": "時刻",
|
||||
"source": "送信元"
|
||||
},
|
||||
"values": {
|
||||
"uptime": "{{ .Days }}日 {{ .Hours }}時間",
|
||||
"traffic": "↑{{ .Up }} ↓{{ .Down }}(合計: {{ .Total }})",
|
||||
"counts": "合計: {{ .Total }} | 残りわずか: {{ .Depleting }} | 無効: {{ .Disabled }}",
|
||||
"inbound": "プロトコル: `{{ .Protocol }}` | ポート: `{{ .Port }}` | クライアント: `{{ .Clients }}` | トラフィック: `↑{{ .Up }} ↓{{ .Down }}` | 状態: `{{ .State }}`"
|
||||
},
|
||||
"alerts": {
|
||||
"outboundDown": "アウトバウンド停止",
|
||||
"outboundUp": "アウトバウンド復旧",
|
||||
"nodeDown": "ノード停止",
|
||||
"nodeUp": "ノード復旧",
|
||||
"xrayCrash": "Xray コアがクラッシュしました",
|
||||
"cpuHigh": "CPU しきい値超過",
|
||||
"memoryHigh": "メモリしきい値超過",
|
||||
"loginSuccess": "ログイン成功",
|
||||
"loginFailed": "ログイン失敗"
|
||||
},
|
||||
"report": {
|
||||
"title": "📊 3x-ui ステータスレポート",
|
||||
"summary": "**{{ .Host }}** のサーバーとプロキシの定期ステータスレポート",
|
||||
"footer": "3x-ui 定期レポート • スケジュール: {{ .RunTime }}"
|
||||
},
|
||||
"commands": {
|
||||
"helpTitle": "🤖 3x-ui Discord Bot コマンド",
|
||||
"helpDescription": "3x-ui サーバーの監視と管理に使えるコマンド:",
|
||||
"helpStatus": "システム負荷、RAM、CPU、接続数、オンラインユーザーを表示",
|
||||
"helpReport": "完全なステータスレポートを生成(設定されていればDBバックアップ付き)",
|
||||
"helpBackup": "データベースのバックアップファイルを今すぐ送信",
|
||||
"helpUsage": "クライアントのトラフィック使用量、クォータ、有効期限を照会",
|
||||
"helpInbounds": "設定済みのすべてのインバウンドをポートとクライアント統計付きで一覧表示",
|
||||
"helpRestart": "Xray コアを再起動",
|
||||
"helpHelp": "このコマンド一覧を表示",
|
||||
"statusTitle": "⚡ 3x-ui サーバーステータス",
|
||||
"statusDescription": "**{{ .Host }}** の現在の稼働メトリクス",
|
||||
"backupTitle": "🗄️ データベースバックアップ",
|
||||
"backupDescription": "`{{ .Time }}` に生成された 3x-ui のバックアップ",
|
||||
"backupUnavailable": "❌ バックアップサービスを利用できません",
|
||||
"backupFailed": "❌ データベースのバックアップを読み込めませんでした: {{ .Error }}",
|
||||
"usageHint": "⚠️ 使い方: `!usage <email>` または `/usage <email>`",
|
||||
"usageTitle": "👤 クライアント使用状況: {{ .Email }}",
|
||||
"usageDescription": "インバウンド: **{{ .Remark }}**(ポート {{ .Port }})",
|
||||
"clientNotFound": "⚠️ クライアント `{{ .Email }}` は設定済みのどのインバウンドにも見つかりませんでした。",
|
||||
"inboundsUnavailable": "❌ インバウンドサービスを利用できません",
|
||||
"inboundsFailed": "❌ インバウンドを読み込めませんでした: {{ .Error }}",
|
||||
"inboundsTitle": "🔌 設定済みインバウンド",
|
||||
"inboundsDescription": "インバウンド総数: **{{ .Count }}**",
|
||||
"noInbounds": "ℹ️ 設定済みのインバウンドはありません。",
|
||||
"xrayUnavailable": "❌ Xray サービスを利用できません",
|
||||
"restarting": "🔄 Xray コアを再起動しています...",
|
||||
"restartFailed": "❌ Xray を再起動できませんでした: {{ .Error }}",
|
||||
"restartSuccess": "✅ Xray コアを再起動しました。"
|
||||
}
|
||||
},
|
||||
"email": {
|
||||
"labelStatus": "ステータス",
|
||||
"labelOutbound": "アウトバウンド",
|
||||
|
||||
Reference in New Issue
Block a user