Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-11-04 14:22:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1781 commits 3 branches 98 tags 81 MiB
Commit graph

241 commits

Author SHA1 Message Date
MHSanaei
bee690429f WARP via wireguard 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2024-01-11 09:57:21 +03:30
Saeid
5e3478f1c1 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
c76199514a
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
ceee1e4277
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
4cb67fd1c3 [xray] show xray errors #1300 2023-12-10 12:57:39 +01:00
Alireza Ahmadi
e69c224ad3 remove xray embeded geo files #1300 2023-12-08 22:13:32 +01:00
Alireza Ahmadi
6411facf6a Update DB WAL before backup #1300 2023-12-08 20:35:10 +01:00
Alireza Ahmadi
c980a06969 customizable remark #1300 2023-12-08 20:31:17 +01:00
Alireza Ahmadi
35feef650f import-export inbound #1300 2023-12-08 20:08:44 +01:00
Alireza Ahmadi
e5fc20b8ae small fixes #1300 2023-12-08 19:44:52 +01:00
Alireza Ahmadi
5fbf8f0d53 Expand multiDomain to externalProxy #1300 2023-12-08 18:45:21 +01:00
Alireza Ahmadi
bcc897640e del x-ui settings in final tls/reality #1300 2023-12-08 17:21:43 +01:00
Alireza Ahmadi
5e47b4e949 pagination and sub URI support #1300 2023-12-08 17:18:51 +01:00
Alireza Ahmadi
c419eadf15 xray setting enhancements #1286 2023-12-05 18:20:44 +01:00
Alireza Ahmadi
2a8da2ba3c separate xray page #1286 2023-12-04 19:20:46 +01:00
Alireza Ahmadi
a8b7063647 auto renew feature #1286 2023-12-04 19:20:16 +01:00
Alireza Ahmadi
f734c821d6 online users backend #1286 2023-12-04 19:13:21 +01:00
Masoud Hidden
abc590ae71
[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
cad6eeb9f5 fixed telego 
after  github.com/mymmrac/telego from 0.26.3 to 0.27.0
 2023-10-25 23:03:17 +03:30
MHSanaei
b0aaece6eb remove iran.dat 
so after this you need to click on "reset to default configuration"
 2023-10-18 13:22:07 +03:30
MHSanaei
1c1f53267a 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
8489f5f528 some changes 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-08-26 16:07:02 +03:30
MHSanaei
1277285d08 [db] Enbancement add traffic fully transactional 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-08-26 15:19:51 +03:30
MHSanaei
38e1d0f94e [sub] improve usage info in Remark 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-08-26 15:11:12 +03:30
MHSanaei
e00c3f1823 add panel usage to main page 2023-08-09 00:37:05 +03:30
Hamidreza
24eb36715a
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
329889ec00 v1.7.5 2023-08-02 17:19:50 +03:30
MHSanaei
bf971911d5 log level & syslog 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-07-31 20:11:47 +03:30
MHSanaei
c46ced0c4c fix logs in api 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-07-31 19:52:28 +03:30
MHSanaei
145ea1e6f1 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
c2b1fb4855 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
1f78842b70 [feature] using xray API for inbound 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-07-18 02:40:22 +03:30
Hamidreza
1028319386
🚀 Some improvements for x-ui.sh and ip job (#665) 2023-07-01 15:56:43 +03:30
MHSanaei
b833ed7992 new - tg Login Notification #584 2023-06-17 19:11:16 +03:30
Ho3ein
5188d516e3
new - loglevel (#612) 2023-06-16 18:25:33 +03:30
MHSanaei
d40e61fc45 fix and improve 2023-06-14 19:50:19 +03:30
MHSanaei
ad9134bc1a removed - alterId 
https://github.com/XTLS/Xray-core/pull/2199
9112cfd39c
 2023-06-13 17:26:50 +03:30
MHSanaei
594d682e20 random sub Id 
optimize utils
trojan short id fix
index page better view
 2023-06-07 12:45:58 +03:30
MHSanaei
70f250dfe1 [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
c182f48079 [tgbot] - bugfix 2023-05-31 08:37:03 +00:00
Hamidreza
d694e6eafc
FIX tgbot adminIds 2023-05-31 05:01:20 +03:30
Hamidreza Ghavami
6ae80fc992
add /id command to tgbot to get user id 2023-05-31 02:31:00 +04:30
Hamidreza Ghavami
8170b65db4
add an option for webDomain 2023-05-31 01:21:14 +04:30
somebodywashere
8442836512
[tgbot] - some fixes and improvments (#542) 2023-05-30 15:07:23 +03:30
MHSanaei
15211f81b1 New - CPU Speed 
logical Processors  removed
 2023-05-25 15:48:23 +03:30
MHSanaei
896cc5386c 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
769590d779 [feature] separate subscription service 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-05-22 18:06:34 +03:30
Hamidreza Ghavami
f82d0051b2
Update hashstorage functionality 2023-05-21 08:33:08 +04:30
Hamidreza Ghavami
76267b23a0
fix tgbot 2023-05-21 07:41:59 +04:30
Hamidreza Ghavami
3a835fbeb8
FIX ERROR 'msg and reply are same' in tgbot 2023-05-21 05:48:19 +04:30
Hamidreza Ghavami
f6461b8386
FIX hashStorage remove expire job 2023-05-21 05:33:01 +04:30
Hamidreza Ghavami
82ead05093
Update tgbot locale + add I18nBot 2023-05-21 03:30:26 +04:30
Hamidreza Ghavami
786a3ac992
FIX hashStorage 2023-05-20 21:46:42 +04:30
Hamidreza Ghavami
8c5648eb09
FIX callback query and BUTTON_DATA_INVALID error with hashStorage 2023-05-20 20:29:28 +04:30
Hamidreza Ghavami
4dfe527f20
init i18n in tgbot 2023-05-20 20:08:01 +04:30
Hamidreza Ghavami
678962d4ca
some fix and prune for tgbot 2023-05-20 19:39:01 +04:30
Hamidreza Ghavami
4831c2f1b2
Add tgLang option 2023-05-20 19:15:20 +04:30
Hamidreza Ghavami
ac9408c37f
update sub remark for shadowsocks 2023-05-20 18:44:18 +04:30
Mahdi Nemati
334b28cddc
Api for backup Telegram (#468) 2023-05-19 00:31:05 +03:30
MHSanaei
f781979d38 update - config 2023-05-18 11:52:53 +03:30
MHSanaei
f8eb548376 [feature] SpiderX for Reality 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-05-17 16:10:11 +03:30
MHSanaei
be50be75fe [sub] add more headers 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-05-17 01:07:35 +03:30
Masoud Hidden
a21bdc9396 [tgbot] Fix reply keyboard height 2023-05-14 22:55:01 +03:30
Masoud Hidden
4cf7f75749 [tgbot] Ability to remove telegram user from the client in the bot 2023-05-14 22:43:23 +03:30
Masoud Hidden
bcdac5aad6 [tgbot] Ability to select telegram user for client from bot 2023-05-14 22:07:49 +03:30
Masoud Hidden
3d5f851fce [tgbot] Changed to telego 2023-05-14 18:50:01 +03:30
MHSanaei
9e8ac8a087 remove search Data files 2023-05-13 15:03:46 +03:30
MHSanaei
2a182d8b9a [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
288374d5fa
Update README.md 2023-05-12 22:45:32 +04:30
Hamidreza Ghavami
cf7d50617b
add service function to search data files 2023-05-12 22:45:26 +04:30
Hamidreza Ghavami
d39c7e4ae3
only get enabled inbounds and clients 2023-05-12 22:45:24 +04:30
MHSanaei
9bbcb74db6 sni for xtls 2023-05-07 19:59:06 +03:30
MHSanaei
f22dd6b53d [feature] multi-user shadowsocks @alireza0 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-05-06 20:21:14 +03:30
Hamidreza Ghavami
83c853ffb6 update ImportDB and enhancement 2023-05-06 04:47:57 +04:30
Hamidreza
058ab5f901
Merge branch 'MHSanaei:main' into main 2023-05-06 03:37:04 +03:30
Masoud Hidden
7f8f0b0f2d Fix ability to use userId in tgId 2023-05-06 02:36:46 +03:30
Hamidreza Ghavami
6c087ceb1a fix import db and always restart xray 2023-05-06 02:22:45 +04:30
Hamidreza Ghavami
26f160fb89 add MigrateDB func for a single source of truth 2023-05-06 00:22:39 +04:30
Hamidreza Ghavami
55c1fe26fb add import db api route 2023-05-05 22:49:42 +04:30
Masoud Hidden
8d11f83ac7 Fix get client ips 2023-05-05 20:07:47 +03:30
Masoud Hidden
d349bffcd6 Fix bot client enable button 2023-05-05 19:50:40 +03:30
Masoud Hidden
5856160c30 Added some new buttons to bot and ability to use userId in tgId 2023-05-05 18:20:56 +03:30
Masoud Hidden
bc3003be54 Change some InlineKeyboard data length 2023-05-05 16:02:16 +03:30
Masoud Hidden
a53d2b927f fix ResetClientExpiryTimeByEmail 2023-05-05 04:34:39 +03:30
Masoud Hidden
c6295085fe Fix restart service 2023-05-05 02:47:26 +03:30
Masoud Hidden
4b3bdebfa5 Fix typo 2023-05-05 02:14:56 +03:30
Masoud Hidden
ff33539fba Refresh button for client report in telegram bot 
Added unlimited button for expire days.
 2023-05-05 01:48:37 +03:30
Masoud Hidden
961636b510 Client reset buttons for telegram bot 2023-05-05 01:16:43 +03:30
Hamidreza Ghavami
dbac48f05d updated sub remark to include inbound name 2023-05-04 20:58:16 +04:30
MHSanaei
177bd036a3 [bug] fix GetClientTrafficByEmail 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-28 18:40:33 +03:30
MHSanaei
607c5d3598 [feature] add grpc multiMode 2023-04-28 00:15:06 +03:30
MHSanaei
103a26edb6 [migrate] remove orphaned traffics 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-27 19:05:36 +03:30
MHSanaei
edabfad559 fix expiry time 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-26 12:57:49 +03:30
MHSanaei
9f5ba0cf93 [bug] vision-udp443 only for client + Translation 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-25 21:43:29 +03:30
MHSanaei
379451135d [feature] delete depleted clients 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-25 18:43:37 +03:30
MHSanaei
bc06dbab21 [migration] add fix for omitted traffics 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-25 18:36:06 +03:30
MHSanaei
942b9862d8 [feature] add login session timeout 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-25 15:00:21 +03:30
MHSanaei
ae55fdc38a fix bug in http link without host 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-25 14:39:09 +03:30
MHSanaei
cc3ff61ae2 update by client id 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-25 14:38:35 +03:30
MHSanaei
bf24838939 remove useless 2023-04-24 15:31:25 +03:30
MHSanaei
16e3107d23 Better client delete + api 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-24 15:07:11 +03:30
MHSanaei
262e3c0985 Add database migration 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-24 14:13:25 +03:30
MHSanaei
2b460bac1a Optimize database 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-24 14:04:05 +03:30
MHSanaei
f817f922fe add getClientTraffics api 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-21 19:06:59 +03:30
MHSanaei
b0f974a94d secret token thanks to @HarlyquinForest 2023-04-21 19:00:14 +03:30
MHSanaei
6bebde4105 Merge branch 'main' of https://github.com/MHSanaei/3x-ui 2023-04-21 15:34:19 +03:30
Hamidreza Ghavami
81838b504c update iran.dat from xray zip 2023-04-21 02:14:00 +04:30
MHSanaei
5ff6f4094e fix userinfo header 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-20 15:51:38 +03:30
MHSanaei
c627227893 bug fixed 2023-04-19 15:37:24 +03:30
MHSanaei
e1132a3f41 bug fix 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-19 11:55:38 +03:30
MHSanaei
4d479102ad reality link bug fix 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-19 11:55:31 +03:30
MHSanaei
3e0faecaae 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
dfdb77c491 add func to setting service 2023-04-18 21:21:37 +04:30
Hamidreza Ghavami
936f2e6ec2 update config.json 2023-04-18 10:22:04 +04:30
MHSanaei
1e72a22c96 syntax fix thanks to @lk29 
Co-Authored-By: lk29 <12291632+lk29@users.noreply.github.com>
 2023-04-14 01:28:08 +03:30
MHSanaei
c6b59f1ee3 [migration] Remove Orphaned Traffics 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-13 18:45:18 +03:30
MHSanaei
b40759fe18 remove traffics of edited emails 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-13 18:44:56 +03:30
Alireza Ahmadi
c4162e3eb4 [sub] fix reality link 2023-04-12 10:44:07 +02:00
MHSanaei
c38d75f3d9 reality for trojan 2023-04-11 22:30:24 +03:30
MHSanaei
4e7ad9e6de bug fix 2023-04-11 19:23:40 +03:30
MHSanaei
8c40e7281f bug fix 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-11 18:39:07 +03:30
MHSanaei
7412bf17a9 bug fix 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-11 15:41:04 +03:30
MHSanaei
519f2b462e reality sub 2023-04-11 15:40:45 +03:30
MHSanaei
de26dbbc96 fixed 2023-04-10 00:55:47 +03:30
MHSanaei
e1da43053d alireza update pack 
Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>
 2023-04-09 23:13:18 +03:30
MHSanaei
72f868506d IPIfNonMatch 2023-04-03 23:28:26 +03:30
MHSanaei
9c0718bc44 Revert "Add version and log" 
This reverts commit 826c7264b5.
 2023-03-24 17:14:26 +03:30
MHSanaei
826c7264b5 Add version and log 
TGBOT: Add xray config to backup
[TGBOT] add seach inbound
 2023-03-24 17:13:31 +03:30
MHSanaei
a6dfdcdd31 Add version and log 2023-03-24 17:08:30 +03:30
MHSanaei
f0d4dbf838 [tgbot] fix exhausted report 2023-03-24 16:50:10 +03:30
MHSanaei
bbec13c0da [tgbot] fix client search 2023-03-24 16:40:56 +03:30
Alireza Ahmadi
738a771b87 Fix delete bug 2023-03-17 19:29:08 +01:00
Alireza Ahmadi
baaa814a51 Fix del/update affects on clientIPs 2023-03-17 19:02:56 +01:00
MHSanaei
96786c9418 alireza 2023-03-17 19:37:49 +03:30
MHSanaei
bc56e63737 pack1 2023-03-17 01:31:14 +03:30
MHSanaei
5317df21f3 ip limit + export links 2023-02-28 23:24:29 +03:30
MHSanaei
add853fada 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
b412df70f1 update pack 2 2023-02-18 16:07:32 +03:30
MHSanaei
fe9844b51b update pack 2023-02-16 19:28:20 +03:30
MHSanaei
d7ca8ee69d port change to 2053 2023-02-09 23:17:12 +03:30
MHSanaei
b73e4173a3 3x-ui 2023-02-09 22:48:06 +03:30