Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-08-24 03:46:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1784 commits 4 branches 89 tags 58 MiB
Commit graph

241 commits

Author SHA1 Message Date
MHSanaei
513e8ebd53 WARP via wireguard 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2024-01-11 09:57:21 +03:30
Saeid
419493b71b socks5 proxy option added to telegram bot settings (#1500) 
* socks5 option added to telegram bot settings

* update socks5 proxy settings translations
 2024-01-03 16:29:29 +03:30
Ali Rahimi
9a6e9bd223 added Jalalian datepicker (shamsi) (#1460) 
* added datepicker option in setting page
jalalian datepicker component was added
translate files for datepicker updated

* dark mode bug fixed
 2024-01-02 12:02:21 +03:30
somebodywashere
071fd5d2ea Major changes to tgbot, also small changes for panel (#1463) 
* Reduce outage time on Xray errors

* Improved logs clearing, added previous logs
File name change: 3xipl-access-persistent.log -> 3xipl-ap.log
All previous logs have .prev suffix

* Preparations for tgbot additions

* [tgbot] Improvements, Additions and Fixes
* Changed interaction with Expire Date for Clients
* Added more info and interactions with Online Clients
* Added a way to get Ban Logs (also added them to backup)
* Few fixes and optimizations in code
* Fixed RU translation

* [tgbot] More updates and fixes

* [tgbot] Quick Fix

* [tgbot] Quick Fix 2

* [tgbot] Big Updates
Added Notifications for Clients throught Tgbot (when Expire)
Added compability for Usernames both w/wo @
Added more buttons overall for admins

* [tgbot] Fixes

* [tbot] Fixes 2

* [tgbot] Removed usernames support for Notifications to work

* [tgbot] Fix

* [tgbot] Fix Notify

* [tgbot] small fixes

* [tgbot] replyMarkup only for last message on big messages

* [tgbot] Fixed last message is empty

* [tgbot] Fix messages split
 2024-01-01 18:37:56 +03:30
Alireza Ahmadi
353fb7bde0 [xray] show xray errors #1300 2023-12-10 12:57:39 +01:00
Alireza Ahmadi
d647826eb7 remove xray embeded geo files #1300 2023-12-08 22:13:32 +01:00
Alireza Ahmadi
5cd8ce285c Update DB WAL before backup #1300 2023-12-08 20:35:10 +01:00
Alireza Ahmadi
18b2124f4f customizable remark #1300 2023-12-08 20:31:17 +01:00
Alireza Ahmadi
29de5a9cb9 import-export inbound #1300 2023-12-08 20:08:44 +01:00
Alireza Ahmadi
331b99a8cd small fixes #1300 2023-12-08 19:44:52 +01:00
Alireza Ahmadi
2e326f7e50 Expand multiDomain to externalProxy #1300 2023-12-08 18:45:21 +01:00
Alireza Ahmadi
509efebacb del x-ui settings in final tls/reality #1300 2023-12-08 17:21:43 +01:00
Alireza Ahmadi
8de5e4111f pagination and sub URI support #1300 2023-12-08 17:18:51 +01:00
Alireza Ahmadi
402e74c31d xray setting enhancements #1286 2023-12-05 18:20:44 +01:00
Alireza Ahmadi
6ba7f1198a separate xray page #1286 2023-12-04 19:20:46 +01:00
Alireza Ahmadi
ea66a1b23c auto renew feature #1286 2023-12-04 19:20:16 +01:00
Alireza Ahmadi
6dbc2fc3e3 online users backend #1286 2023-12-04 19:13:21 +01:00
Masoud Hidden
fd2c152a91 [bot] Some new features for telegram bot (#1241) 
* [bot] Some new features for telegram bot

+Ability to set traffic limit for client.
+Custom input for reset expire days.
+Custom input for reset IP limit.
+Added refresh time to the client ip log message.

* [bot] fix translations
 2023-11-20 17:47:59 +03:30
MHSanaei
a9ae95311f fixed telego 
after  github.com/mymmrac/telego from 0.26.3 to 0.27.0
 2023-10-25 23:03:17 +03:30
MHSanaei
d0fd8366f5 remove iran.dat 
so after this you need to click on "reset to default configuration"
 2023-10-18 13:22:07 +03:30
MHSanaei
fe2a0adb0a Add encrypt subscription ON/OFF switch 
Co-Authored-By: SudoSpace <79229394+sudospaes@users.noreply.github.com>
 2023-08-26 16:54:01 +03:30
MHSanaei
a4369085f0 some changes 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-08-26 16:07:02 +03:30
MHSanaei
e6a98904e1 [db] Enbancement add traffic fully transactional 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-08-26 15:19:51 +03:30
MHSanaei
951aaca621 [sub] improve usage info in Remark 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-08-26 15:11:12 +03:30
MHSanaei
00762ef282 add panel usage to main page 2023-08-09 00:37:05 +03:30
Hamidreza
3442b4a39a Add iran.dat when updating xray (#870) 
we can download iran.dat, because it's one of the required files in our settings
 2023-08-08 22:21:02 +03:30
MHSanaei
ed0dc2a7ee v1.7.5 2023-08-02 17:19:50 +03:30
MHSanaei
899536ef8f log level & syslog 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-07-31 20:11:47 +03:30
MHSanaei
05211b3170 fix logs in api 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-07-31 19:52:28 +03:30
MHSanaei
1094b3d2eb full multiuser shadowsocks 
full multiuser shadowsocks +
fix logs after api changes

Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-07-27 11:58:46 +03:30
MHSanaei
fc771dae3b because of #815 now we can use XTLS/Xray-core 
change MHSanaei/Xray-core to XTLS/Xray-core
 2023-07-27 11:06:27 +03:30
MHSanaei
63ce333037 [feature] using xray API for inbound 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-07-18 02:40:22 +03:30
Hamidreza
b0209fb0f9 🚀 Some improvements for x-ui.sh and ip job (#665) 2023-07-01 15:56:43 +03:30
MHSanaei
c8e3efe914 new - tg Login Notification #584 2023-06-17 19:11:16 +03:30
Ho3ein
eb92c3d14c new - loglevel (#612) 2023-06-16 18:25:33 +03:30
MHSanaei
f3a0142dbb fix and improve 2023-06-14 19:50:19 +03:30
MHSanaei
5a7d090347 removed - alterId 
https://github.com/XTLS/Xray-core/pull/2199
9112cfd39c
 2023-06-13 17:26:50 +03:30
MHSanaei
b531bf981f random sub Id 
optimize utils
trojan short id fix
index page better view
 2023-06-07 12:45:58 +03:30
MHSanaei
54da8ad9bd [feature] using xray api and more 
Improve DB performance
[api] backward compatibility: add client by update

Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-06-05 00:32:19 +03:30
somebodywashere
ff4f65083c [tgbot] - bugfix 2023-05-31 08:37:03 +00:00
Hamidreza
2bba2ec00c FIX tgbot adminIds 2023-05-31 05:01:20 +03:30
Hamidreza Ghavami
648494f555 add /id command to tgbot to get user id 2023-05-31 02:31:00 +04:30
Hamidreza Ghavami
b546d786eb add an option for webDomain 2023-05-31 01:21:14 +04:30
somebodywashere
1b41d3c964 [tgbot] - some fixes and improvments (#542) 2023-05-30 15:07:23 +03:30
MHSanaei
5e5a888357 New - CPU Speed 
logical Processors  removed
 2023-05-25 15:48:23 +03:30
MHSanaei
20bb72675c new - show cores, public ipv4 and ipv6 
logical Processors
you can see them on first page
 2023-05-25 03:11:09 +03:30
MHSanaei
f18dd8561d [feature] separate subscription service 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-05-22 18:06:34 +03:30
Hamidreza Ghavami
c0b3660c58 Update hashstorage functionality 2023-05-21 08:33:08 +04:30
Hamidreza Ghavami
15f101ed32 fix tgbot 2023-05-21 07:41:59 +04:30
Hamidreza Ghavami
e84132ea7c FIX ERROR 'msg and reply are same' in tgbot 2023-05-21 05:48:19 +04:30
Hamidreza Ghavami
e62305f16c FIX hashStorage remove expire job 2023-05-21 05:33:01 +04:30
Hamidreza Ghavami
9b7c8cad28 Update tgbot locale + add I18nBot 2023-05-21 03:30:26 +04:30
Hamidreza Ghavami
9bcef91cd7 FIX hashStorage 2023-05-20 21:46:42 +04:30
Hamidreza Ghavami
65ba44d423 FIX callback query and BUTTON_DATA_INVALID error with hashStorage 2023-05-20 20:29:28 +04:30
Hamidreza Ghavami
cc380b8c71 init i18n in tgbot 2023-05-20 20:08:01 +04:30
Hamidreza Ghavami
c95037f78f some fix and prune for tgbot 2023-05-20 19:39:01 +04:30
Hamidreza Ghavami
bf8251076e Add tgLang option 2023-05-20 19:15:20 +04:30
Hamidreza Ghavami
47edd393e6 update sub remark for shadowsocks 2023-05-20 18:44:18 +04:30
Mahdi Nemati
946d1bcc21 Api for backup Telegram (#468) 2023-05-19 00:31:05 +03:30
MHSanaei
f3feec2e0b update - config 2023-05-18 11:52:53 +03:30
MHSanaei
d274077066 [feature] SpiderX for Reality 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-05-17 16:10:11 +03:30
MHSanaei
3913128bbb [sub] add more headers 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-05-17 01:07:35 +03:30
Masoud Hidden
51aafb45f9 [tgbot] Fix reply keyboard height 2023-05-14 22:55:01 +03:30
Masoud Hidden
0693bd540e [tgbot] Ability to remove telegram user from the client in the bot 2023-05-14 22:43:23 +03:30
Masoud Hidden
58fda2f1ee [tgbot] Ability to select telegram user for client from bot 2023-05-14 22:07:49 +03:30
Masoud Hidden
fbb2ec1e39 [tgbot] Changed to telego 2023-05-14 18:50:01 +03:30
MHSanaei
a21fecf91e remove search Data files 2023-05-13 15:03:46 +03:30
MHSanaei
e2de4b1f74 [bug] fix login failure when tgbot is not active 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-05-13 13:31:46 +03:30
Hamidreza Ghavami
22e5978f6c Update README.md 2023-05-12 22:45:32 +04:30
Hamidreza Ghavami
4adc158012 add service function to search data files 2023-05-12 22:45:26 +04:30
Hamidreza Ghavami
1d9fd01bae only get enabled inbounds and clients 2023-05-12 22:45:24 +04:30
MHSanaei
066ea8ff41 sni for xtls 2023-05-07 19:59:06 +03:30
MHSanaei
e695047633 [feature] multi-user shadowsocks @alireza0 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-05-06 20:21:14 +03:30
Hamidreza Ghavami
06c8173595 update ImportDB and enhancement 2023-05-06 04:47:57 +04:30
Hamidreza
8a63170e2e Merge branch 'MHSanaei:main' into main 2023-05-06 03:37:04 +03:30
Masoud Hidden
5704975c42 Fix ability to use userId in tgId 2023-05-06 02:36:46 +03:30
Hamidreza Ghavami
7a26b0e93b fix import db and always restart xray 2023-05-06 02:22:45 +04:30
Hamidreza Ghavami
4e6a06fdbe add MigrateDB func for a single source of truth 2023-05-06 00:22:39 +04:30
Hamidreza Ghavami
aca73054b9 add import db api route 2023-05-05 22:49:42 +04:30
Masoud Hidden
0fa4b00ec4 Fix get client ips 2023-05-05 20:07:47 +03:30
Masoud Hidden
403e116cd6 Fix bot client enable button 2023-05-05 19:50:40 +03:30
Masoud Hidden
675cc3378c Added some new buttons to bot and ability to use userId in tgId 2023-05-05 18:20:56 +03:30
Masoud Hidden
1df50aa5ec Change some InlineKeyboard data length 2023-05-05 16:02:16 +03:30
Masoud Hidden
1bf7333359 fix ResetClientExpiryTimeByEmail 2023-05-05 04:34:39 +03:30
Masoud Hidden
57934bf6ea Fix restart service 2023-05-05 02:47:26 +03:30
Masoud Hidden
7c12b1be9f Fix typo 2023-05-05 02:14:56 +03:30
Masoud Hidden
40c8cf402f Refresh button for client report in telegram bot 
Added unlimited button for expire days.
 2023-05-05 01:48:37 +03:30
Masoud Hidden
d001e75a94 Client reset buttons for telegram bot 2023-05-05 01:16:43 +03:30
Hamidreza Ghavami
0f5c7c0abc updated sub remark to include inbound name 2023-05-04 20:58:16 +04:30
MHSanaei
3a85f1915f [bug] fix GetClientTrafficByEmail 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-28 18:40:33 +03:30
MHSanaei
1b7587d15d [feature] add grpc multiMode 2023-04-28 00:15:06 +03:30
MHSanaei
aa706f334d [migrate] remove orphaned traffics 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-27 19:05:36 +03:30
MHSanaei
f65ef3b9cb fix expiry time 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-26 12:57:49 +03:30
MHSanaei
d1c804837c [bug] vision-udp443 only for client + Translation 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-25 21:43:29 +03:30
MHSanaei
7503175330 [feature] delete depleted clients 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-25 18:43:37 +03:30
MHSanaei
44d43e5d96 [migration] add fix for omitted traffics 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-25 18:36:06 +03:30
MHSanaei
17cd239047 [feature] add login session timeout 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-25 15:00:21 +03:30
MHSanaei
23fb5ecbb6 fix bug in http link without host 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-25 14:39:09 +03:30
MHSanaei
ec9d53d8cb update by client id 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-25 14:38:35 +03:30
MHSanaei
955eeb65ea remove useless 2023-04-24 15:31:25 +03:30
MHSanaei
d6fa6ac87d Better client delete + api 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-24 15:07:11 +03:30
MHSanaei
a6f92366cd Add database migration 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-24 14:13:25 +03:30
MHSanaei
d56f02ef4d Optimize database 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-24 14:04:05 +03:30
MHSanaei
eef04f5b71 add getClientTraffics api 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-21 19:06:59 +03:30
MHSanaei
b45f7f1a30 secret token thanks to @HarlyquinForest 2023-04-21 19:00:14 +03:30
MHSanaei
3571b99766 Merge branch 'main' of https://github.com/MHSanaei/3x-ui 2023-04-21 15:34:19 +03:30
Hamidreza Ghavami
2a2b81d7eb update iran.dat from xray zip 2023-04-21 02:14:00 +04:30
MHSanaei
21e42ed4df fix userinfo header 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-20 15:51:38 +03:30
MHSanaei
edf41cdf9a bug fixed 2023-04-19 15:37:24 +03:30
MHSanaei
54f3bf7949 bug fix 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-19 11:55:38 +03:30
MHSanaei
b6db78a376 reality link bug fix 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-19 11:55:31 +03:30
MHSanaei
e8a017f9f8 improve reality setting 
split xtls from tls - remove iran warp - remove old setting reality from franzkafka (it was a messy code) -and other improvement

Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-18 21:34:06 +03:30
Hamidreza Ghavami
ecfbe7cc84 add func to setting service 2023-04-18 21:21:37 +04:30
Hamidreza Ghavami
2640089a31 update config.json 2023-04-18 10:22:04 +04:30
MHSanaei
59933b6272 syntax fix thanks to @lk29 
Co-Authored-By: lk29 <12291632+lk29@users.noreply.github.com>
 2023-04-14 01:28:08 +03:30
MHSanaei
ff109d0cc7 [migration] Remove Orphaned Traffics 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-13 18:45:18 +03:30
MHSanaei
208feabae4 remove traffics of edited emails 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-13 18:44:56 +03:30
Alireza Ahmadi
78e8050331 [sub] fix reality link 2023-04-12 10:44:07 +02:00
MHSanaei
02d1d48ea9 reality for trojan 2023-04-11 22:30:24 +03:30
MHSanaei
017e54c4f7 bug fix 2023-04-11 19:23:40 +03:30
MHSanaei
1e115f8914 bug fix 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-11 18:39:07 +03:30
MHSanaei
79799017a9 bug fix 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-11 15:41:04 +03:30
MHSanaei
9a9b06385c reality sub 2023-04-11 15:40:45 +03:30
MHSanaei
aaa35ab537 fixed 2023-04-10 00:55:47 +03:30
MHSanaei
e98a874ef1 alireza update pack 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-09 23:13:18 +03:30
MHSanaei
e3239fe4e6 IPIfNonMatch 2023-04-03 23:28:26 +03:30
MHSanaei
9c4c414e8e Revert "Add version and log" 
This reverts commit 21605a8e8b.
 2023-03-24 17:14:26 +03:30
MHSanaei
21605a8e8b Add version and log 
TGBOT: Add xray config to backup
[TGBOT] add seach inbound
 2023-03-24 17:13:31 +03:30
MHSanaei
7f9f0fd075 Add version and log 2023-03-24 17:08:30 +03:30
MHSanaei
1142038452 [tgbot] fix exhausted report 2023-03-24 16:50:10 +03:30
MHSanaei
1db859d7ac [tgbot] fix client search 2023-03-24 16:40:56 +03:30
Alireza Ahmadi
ca9d024f64 Fix delete bug 2023-03-17 19:29:08 +01:00
Alireza Ahmadi
f0cdddda28 Fix del/update affects on clientIPs 2023-03-17 19:02:56 +01:00
MHSanaei
2d477ae45b alireza 2023-03-17 19:37:49 +03:30
MHSanaei
d4b3a01b43 pack1 2023-03-17 01:31:14 +03:30
MHSanaei
692d5fb588 ip limit + export links 2023-02-28 23:24:29 +03:30
MHSanaei
733f0fcf1d update pack 3 
user pass will be generated randomly
upgrade all dependencies
move add client buttom
 2023-02-20 20:59:55 +03:30
MHSanaei
b86a09f436 update pack 2 2023-02-18 16:07:32 +03:30
MHSanaei
aca5dbf119 update pack 2023-02-16 19:28:20 +03:30
MHSanaei
1d0544af25 port change to 2053 2023-02-09 23:17:12 +03:30
MHSanaei
b73e4173a3 3x-ui 2023-02-09 22:48:06 +03:30