Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 mercury
|
ca7a9c955d | ||
|
mercury
|
852fbd55c6 | ||
|
mercury
|
3a8a843d8c | ||
|
mercury
|
90828d1117 | ||
|
mercury
|
37e8b96bcf | ||
|
mercury
|
306bc41813 | ||
|
mercury
|
f6e5da382b |
+194
-45
@@ -162,6 +162,9 @@ class Bot
|
||||
case preg_match('~^/switchBanIp$~', $this->input['callback'], $m):
|
||||
$this->switchBanIp();
|
||||
break;
|
||||
case preg_match('~^/switchMonthlyStats$~', $this->input['callback'], $m):
|
||||
$this->switchMonthlyStats();
|
||||
break;
|
||||
case preg_match('~^/setIpLimit$~', $this->input['callback'], $m):
|
||||
$this->setIpLimit();
|
||||
break;
|
||||
@@ -1337,6 +1340,7 @@ class Bot
|
||||
$this->checkVersion();
|
||||
$this->checkBackup($period);
|
||||
$this->checkLogs($period);
|
||||
$this->checkResetXrayStats($period);
|
||||
$this->checkCert();
|
||||
$this->autoAnalyzeLogs();
|
||||
$this->xrayStatsUser();
|
||||
@@ -1444,6 +1448,29 @@ class Bot
|
||||
}
|
||||
}
|
||||
|
||||
public function checkResetXrayStats($delta)
|
||||
{
|
||||
$pac = $this->getPacConf();
|
||||
if (!empty($pac['reset_monthly'])) {
|
||||
$now = strtotime(date('Y-m-d H:i:s'));
|
||||
$start = strtotime('first day of previous month midnight');
|
||||
$period = strtotime('1 month', 0);
|
||||
if (
|
||||
!empty($start)
|
||||
&& !empty($period)
|
||||
&& empty($this->backup)
|
||||
&& $now - $start >= 0
|
||||
&& (($now - $start) % $period < $delta)
|
||||
) {
|
||||
$this->resetXrStats(1);
|
||||
require __DIR__ . '/config.php';
|
||||
foreach ($c['admin'] as $admin) {
|
||||
$this->send($admin, "vless: reset stats");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public function checkLogs($delta)
|
||||
{
|
||||
$c = $this->getPacConf();
|
||||
@@ -3395,10 +3422,14 @@ DNS-over-HTTPS with IP:
|
||||
'text' => '<<',
|
||||
'callback_data' => "/subnet {$wgpage}_" . ($page - 1 >= 0 ? $page - 1 : $all - 1) . ($openconnect ? '_1' : ''),
|
||||
],
|
||||
[
|
||||
'text' => $page + 1,
|
||||
'callback_data' => "/subnet {$wgpage}_$page" . ($openconnect ? '_1' : ''),
|
||||
],
|
||||
[
|
||||
'text' => '>>',
|
||||
'callback_data' => "/subnet {$wgpage}_" . ($page < $all - 1 ? $page + 1 : 0) . ($openconnect ? '_1' : ''),
|
||||
]
|
||||
],
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -3634,10 +3665,10 @@ DNS-over-HTTPS with IP:
|
||||
'text' => '<<',
|
||||
'callback_data' => "/menu wg " . ($page - 1 >= 0 ? $page - 1 : $all - 1),
|
||||
],
|
||||
// [
|
||||
// 'text' => 'all',
|
||||
// 'callback_data' => "/menu wg -1",
|
||||
// ],
|
||||
[
|
||||
'text' => $page + 1,
|
||||
'callback_data' => "/menu wg $page",
|
||||
],
|
||||
[
|
||||
'text' => '>>',
|
||||
'callback_data' => "/menu wg " . ($page < $all - 1 ? $page + 1 : 0),
|
||||
@@ -4137,10 +4168,14 @@ DNS-over-HTTPS with IP:
|
||||
'text' => '<<',
|
||||
'callback_data' => "/$menu " . ($page - 1 >= 0 ? $page - 1 : $all - 1),
|
||||
],
|
||||
[
|
||||
'text' => $page + 1,
|
||||
'callback_data' => "/$menu $page",
|
||||
],
|
||||
[
|
||||
'text' => '>>',
|
||||
'callback_data' => "/$menu " . ($page < $all - 1 ? $page + 1 : 0),
|
||||
]
|
||||
],
|
||||
];
|
||||
}
|
||||
$data[] = [
|
||||
@@ -4276,6 +4311,43 @@ DNS-over-HTTPS with IP:
|
||||
$this->menu('wg', 0);
|
||||
}
|
||||
|
||||
public function alignColumns(array $columns): string
|
||||
{
|
||||
// Находим максимальную длину для каждого столбца
|
||||
$columnLengths = [];
|
||||
foreach ($columns as $column) {
|
||||
$maxLength = 0;
|
||||
foreach ($column as $cell) {
|
||||
$len = mb_strlen($cell, 'UTF-8');
|
||||
$maxLength = max($maxLength, $len);
|
||||
}
|
||||
$columnLengths[] = $maxLength;
|
||||
}
|
||||
|
||||
// Получаем количество строк из первого столбца
|
||||
$rowCount = count($columns[0]);
|
||||
$columnCount = count($columns);
|
||||
|
||||
// Формируем строки с выравниванием
|
||||
$result = [];
|
||||
for ($row = 0; $row < $rowCount; $row++) {
|
||||
$line = '';
|
||||
for ($col = 0; $col < $columnCount; $col++) {
|
||||
$cell = $columns[$col][$row];
|
||||
$padding = str_repeat(' ', $columnLengths[$col] - mb_strlen($cell, 'UTF-8'));
|
||||
$line .= $cell . $padding;
|
||||
|
||||
// Добавляем разделитель между столбцами, кроме последнего
|
||||
if ($col < $columnCount - 1) {
|
||||
$line .= ' '; // Два пробела между столбцами
|
||||
}
|
||||
}
|
||||
$result[] = $line;
|
||||
}
|
||||
|
||||
return implode("\n", $result);
|
||||
}
|
||||
|
||||
public function menu($type = false, $arg = false, $return = false)
|
||||
{
|
||||
$conf = $this->getPacConf();
|
||||
@@ -4296,26 +4368,70 @@ DNS-over-HTTPS with IP:
|
||||
$f = '/docker/compose';
|
||||
$c = yaml_parse_file($f)['services'];
|
||||
$main[] = 'v' . getenv('VER') . " $branch" . ($update ? ' (have updates)' : '');
|
||||
$main[] = '';
|
||||
$main[] = $cron;
|
||||
$main[] = $this->i18n($backup ? 'on' : 'off') . ' autobackup' . ($backup ? " $backup" : '');
|
||||
$main[] = $this->i18n($conf['autoupdate'] ? 'on' : 'off') . ' autoupdate';
|
||||
$main[] = $this->i18n($conf['autoscan'] ? 'on' : 'off') . ' autoscan';
|
||||
$main[] = $this->i18n($conf['autodeny'] ? 'on' : 'off') . ' autoblock' . ($conf['deny'] ? ': ' . count($conf['deny']) : '');
|
||||
$main[] = '';
|
||||
$main[] = $this->i18n($c['wg'] ? 'on' : 'off') . ' ' . getenv('WGPORT') . ' Wireguard';
|
||||
$main[] = $this->i18n($c['wg1'] ? 'on' : 'off') . ' ' . getenv('WG1PORT') . ' Wireguard 1';
|
||||
$main[] = $this->i18n($c['tg'] ? 'on' : 'off') . ' ' . getenv('TGPORT') . ' MTProto';
|
||||
$main[] = $this->i18n($c['ad'] ? 'on' : 'off') . ' 853 AdguardHome DoT';
|
||||
$main[] = $this->i18n($c['ss'] ? 'on' : 'off') . ' 8388 Shadowsocks';
|
||||
|
||||
if (!empty($conf['domain'])) {
|
||||
$main[] = '';
|
||||
$oc = $this->getHashSubdomain('oc');
|
||||
$np = $this->getHashSubdomain('np');
|
||||
$main[] = $conf['domain'] ? "Domains:\n{$conf['domain']}\n$np.{$conf['domain']} (for naiveproxy)\n$oc.{$conf['domain']} (for openconnect)" . ($conf['adguardkey'] ? "\n{$conf['adguardkey']}.{$conf['domain']} (for adguard DoT)" : '') : $this->i18n('domain explain');
|
||||
$ssl = $this->expireCert();
|
||||
$main[] = $conf['domain'] ? "\nSSL: " . ($ssl ? date('Y-m-d H:i:s', $this->expireCert()) . "\n" . $this->domainsCert() : 'none') : '';
|
||||
if (!empty($conf['domain'])) {
|
||||
$ssl_expiry = $this->expireCert();
|
||||
$certs = $this->domainsCert() ?: [];
|
||||
|
||||
$main[] = "<blockquote>";
|
||||
$main[] = "Domains:";
|
||||
$main[] = $conf['domain'] . (in_array($conf['domain'], $certs) ? ' (ssl: ' . date('Y-m-d H:i:s', $ssl_expiry) . ')' : '');
|
||||
$main[] = 'naive ' . "$np.{$conf['domain']}" . (in_array("$np.{$conf['domain']}", $certs) ? ' (ssl: ' . date('Y-m-d H:i:s', $ssl_expiry) . ')' : '');
|
||||
$main[] = 'openconnect ' . "$oc.{$conf['domain']}" . (in_array("$oc.{$conf['domain']}", $certs) ? ' (ssl: ' . date('Y-m-d H:i:s', $ssl_expiry) . ')' : '');
|
||||
if (!empty($conf['adguardkey'])) {
|
||||
$main[] = "{$conf['adguardkey']}.{$conf['domain']}" . (in_array("{$conf['adguardkey']}.{$conf['domain']}", $certs) ? ' (ssl: ' . date('Y-m-d H:i:s', $ssl_expiry) . ')' : '') . ' adguard DOT';;
|
||||
}
|
||||
$main[] = "</blockquote>";
|
||||
} else {
|
||||
$main[] = $this->i18n('domain explain');
|
||||
}
|
||||
}
|
||||
$main[] = '';
|
||||
|
||||
$main[] = '<code>';
|
||||
$main[] = $this->alignColumns([
|
||||
[
|
||||
$this->i18n($this->ssh($this->getPacConf()['amnezia'] ? 'awg' : 'wg', 'wg') ? 'on' : 'off') . ' ' . $this->i18n($this->getPacConf()['amnezia'] ? 'amnezia' : 'wg_title'),
|
||||
$this->i18n($this->ssh($this->getPacConf()['wg1_amnezia'] ? 'awg' : 'wg', 'wg1') ? 'on' : 'off') . ' ' . $this->i18n($this->getPacConf()['wg1_amnezia'] ? 'amnezia' : 'wg_title'),
|
||||
$this->i18n($this->ssh('pgrep xray', 'xr') ? 'on' : 'off') . ' ' . $this->i18n('xray'),
|
||||
$this->i18n($this->ssh('pgrep caddy', 'np') ? 'on' : 'off') . ' ' . $this->i18n('naive'),
|
||||
$this->i18n($this->ssh('pgrep ocserv', 'oc') ? 'on' : 'off') . ' ' . $this->i18n('ocserv'),
|
||||
$this->i18n($this->ssh('pgrep mtproto-proxy', 'tg') ? 'on' : 'off') . ' ' . $this->i18n('mtproto'),
|
||||
$this->i18n(exec("JSON=1 timeout 2 dnslookup google.com ad") ? 'on' : 'off') . ' ' . $this->i18n('ad_title'),
|
||||
$this->i18n($this->ssh('pgrep ssserver', 'ss') ? 'on' : 'off') . ' ' . $this->i18n('sh_title'),
|
||||
$this->i18n($this->warpStatus()) . ' ' . $this->i18n('warp'),
|
||||
],
|
||||
[
|
||||
$this->i18n($c['wg'] ? 'on' : 'off') . ' ' . getenv('WGPORT'),
|
||||
$this->i18n($c['wg1'] ? 'on' : 'off') . ' ' . getenv('WG1PORT'),
|
||||
$this->i18n('on') . ' 443',
|
||||
$this->i18n('on') . ' 443',
|
||||
$this->i18n('on') . ' 443',
|
||||
$this->i18n($c['tg'] ? 'on' : 'off') . ' ' . getenv('TGPORT'),
|
||||
$this->i18n($c['ad'] ? 'on' : 'off') . ' 853',
|
||||
$this->i18n($c['ss'] ? 'on' : 'off') . ' ' . getenv('SSPORT'),
|
||||
'',
|
||||
],
|
||||
]);
|
||||
$main[] = '';
|
||||
$main[] = $this->alignColumns([
|
||||
[
|
||||
$this->i18n($backup ? 'on' : 'off') . ' autobackup',
|
||||
$this->i18n($conf['autoupdate'] ? 'on' : 'off') . ' autoupdate',
|
||||
$this->i18n($conf['autoscan'] ? 'on' : 'off') . ' autoscan',
|
||||
],
|
||||
[
|
||||
$this->i18n($conf['autodeny'] ? 'on' : 'off') . ' autoblock' . ($conf['deny'] ? ': ' . count($conf['deny']) : ''),
|
||||
$this->i18n($conf['reset_monthly'] ? 'on' : 'off') . ' autoreset',
|
||||
$cron,
|
||||
],
|
||||
]);
|
||||
$main[] = '</code>';
|
||||
|
||||
}
|
||||
$menu = [
|
||||
'main' => [
|
||||
@@ -4323,47 +4439,47 @@ DNS-over-HTTPS with IP:
|
||||
'data' => [
|
||||
[
|
||||
[
|
||||
'text' => $this->i18n($this->getPacConf()['amnezia'] ? 'amnezia' : 'wg_title') . ' ' . $this->i18n($this->ssh($this->getPacConf()['amnezia'] ? 'awg' : 'wg', 'wg') ? 'on' : 'off'),
|
||||
'text' => $this->i18n($this->getPacConf()['amnezia'] ? 'amnezia' : 'wg_title'),
|
||||
'callback_data' => "/changeWG 0",
|
||||
],
|
||||
[
|
||||
'text' => $this->i18n($this->getPacConf()['wg1_amnezia'] ? 'amnezia' : 'wg_title') . ' ' . $this->i18n($this->ssh($this->getPacConf()['wg1_amnezia'] ? 'awg' : 'wg', 'wg1') ? 'on' : 'off'),
|
||||
'text' => $this->i18n($this->getPacConf()['wg1_amnezia'] ? 'amnezia' : 'wg_title'),
|
||||
'callback_data' => "/changeWG 1",
|
||||
],
|
||||
],
|
||||
[
|
||||
[
|
||||
'text' => $this->i18n('xray') . ' ' . $this->i18n($this->ssh('pgrep xray', 'xr') ? 'on' : 'off'),
|
||||
'text' => $this->i18n('xray'),
|
||||
'callback_data' => "/xray",
|
||||
],
|
||||
[
|
||||
'text' => $this->i18n('naive') . ' ' . $this->i18n($this->ssh('pgrep caddy', 'np') ? 'on' : 'off'),
|
||||
'text' => $this->i18n('naive'),
|
||||
'callback_data' => "/menu naive",
|
||||
],
|
||||
],
|
||||
[
|
||||
[
|
||||
'text' => $this->i18n('ocserv') . ' ' . $this->i18n($this->ssh('pgrep ocserv', 'oc') ? 'on' : 'off'),
|
||||
'text' => $this->i18n('ocserv'),
|
||||
'callback_data' => "/menu oc",
|
||||
],
|
||||
[
|
||||
'text' => $this->i18n('mtproto') . ' ' . $this->i18n($this->ssh('pgrep mtproto-proxy', 'tg') ? 'on' : 'off'),
|
||||
'text' => $this->i18n('mtproto'),
|
||||
'callback_data' => "/mtproto",
|
||||
],
|
||||
],
|
||||
[
|
||||
[
|
||||
'text' => $this->i18n('ad_title') . ' ' . $this->i18n(exec("JSON=1 timeout 2 dnslookup google.com ad") ? 'on' : 'off'),
|
||||
'text' => $this->i18n('ad_title'),
|
||||
'callback_data' => "/menu adguard",
|
||||
],
|
||||
[
|
||||
'text' => $this->i18n('warp') . ' ' . $this->i18n($this->warpStatus()),
|
||||
'text' => $this->i18n('warp'),
|
||||
'callback_data' => "/warp",
|
||||
],
|
||||
],
|
||||
[
|
||||
[
|
||||
'text' => $this->i18n('sh_title') . ' ' . $this->i18n($this->ssh('pgrep ssserver', 'ss') ? 'on' : 'off'),
|
||||
'text' => $this->i18n('sh_title'),
|
||||
'callback_data' => "/menu ss",
|
||||
],
|
||||
[
|
||||
@@ -4459,6 +4575,14 @@ DNS-over-HTTPS with IP:
|
||||
$this->ipMenu();
|
||||
}
|
||||
|
||||
public function switchMonthlyStats()
|
||||
{
|
||||
$c = $this->getPacConf();
|
||||
$c['reset_monthly'] = $c['reset_monthly'] ? 0 : 1;
|
||||
$this->setPacConf($c);
|
||||
$this->xray();
|
||||
}
|
||||
|
||||
public function switchIpLimit($limit)
|
||||
{
|
||||
$limit = explode(':', $limit);
|
||||
@@ -4679,10 +4803,14 @@ DNS-over-HTTPS with IP:
|
||||
'text' => '<<',
|
||||
'callback_data' => "/analysisIp " . ($page - 1 >= 0 ? $page - 1 : $all - 1),
|
||||
],
|
||||
[
|
||||
'text' => $page + 1,
|
||||
'callback_data' => "/analysisIp $page",
|
||||
],
|
||||
[
|
||||
'text' => '>>',
|
||||
'callback_data' => "/analysisIp " . ($page < $all - 1 ? $page + 1 : 0),
|
||||
]
|
||||
],
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -4888,10 +5016,14 @@ DNS-over-HTTPS with IP:
|
||||
'text' => '<<',
|
||||
'callback_data' => "/denyList " . ($page - 1 >= 0 ? $page - 1 : $all - 1) . ($white ? " 1" : ' 0'),
|
||||
],
|
||||
[
|
||||
'text' => $page + 1,
|
||||
'callback_data' => "/denyList $page" . ($white ? " 1" : ' 0'),
|
||||
],
|
||||
[
|
||||
'text' => '>>',
|
||||
'callback_data' => "/denyList " . ($page < $all - 1 ? $page + 1 : 0) . ($white ? " 1" : ' 0'),
|
||||
]
|
||||
],
|
||||
];
|
||||
}
|
||||
$data[] = [
|
||||
@@ -5440,11 +5572,13 @@ DNS-over-HTTPS with IP:
|
||||
$this->userXr($i);
|
||||
}
|
||||
|
||||
public function resetXrStats()
|
||||
public function resetXrStats($nomenu = false)
|
||||
{
|
||||
$this->restartXray($this->getXray());
|
||||
$this->setXrayStats([]);
|
||||
$this->xray();
|
||||
if (empty($nomenu)) {
|
||||
$this->xray();
|
||||
}
|
||||
}
|
||||
|
||||
public function listXr($i)
|
||||
@@ -5756,6 +5890,10 @@ DNS-over-HTTPS with IP:
|
||||
'text' => $this->i18n('reset stats') . ": ↓$td ↑$tu",
|
||||
'callback_data' => '/resetXrStats',
|
||||
],
|
||||
[
|
||||
'text' => $this->i18n('reset monthly') . ": " . $this->i18n($this->getPacConf()['reset_monthly'] ? 'on' : 'off'),
|
||||
'callback_data' => '/switchMonthlyStats',
|
||||
],
|
||||
];
|
||||
$data[] = [
|
||||
[
|
||||
@@ -5850,10 +5988,14 @@ DNS-over-HTTPS with IP:
|
||||
'text' => '<<',
|
||||
'callback_data' => "/xray " . ($page - 1 >= 0 ? $page - 1 : $all - 1),
|
||||
],
|
||||
[
|
||||
'text' => $page + 1,
|
||||
'callback_data' => "/xray $page",
|
||||
],
|
||||
[
|
||||
'text' => '>>',
|
||||
'callback_data' => "/xray " . ($page < $all - 1 ? $page + 1 : 0),
|
||||
]
|
||||
],
|
||||
];
|
||||
}
|
||||
$data[] = [
|
||||
@@ -7096,7 +7238,7 @@ DNS-over-HTTPS with IP:
|
||||
if (empty($domains)) {
|
||||
return false;
|
||||
}
|
||||
return implode("\n", array_map(fn($e) => trim($e), explode(',', str_replace('DNS:', '', $domains))));
|
||||
return array_map(fn($e) => trim($e), explode(',', str_replace('DNS:', '', $domains)));
|
||||
}
|
||||
|
||||
public function updatebot()
|
||||
@@ -7166,17 +7308,24 @@ DNS-over-HTTPS with IP:
|
||||
public function configMenu()
|
||||
{
|
||||
$conf = $this->getPacConf();
|
||||
if (!empty($conf['subdomain'])) {
|
||||
$custom = "\ncustom:\n";
|
||||
foreach ($conf['subdomain'] as $v) {
|
||||
$custom .= "$v\n";
|
||||
}
|
||||
}
|
||||
$oc = $this->getHashSubdomain('oc');
|
||||
$np = $this->getHashSubdomain('np');
|
||||
$text[] = $conf['domain'] ? "Domains:\n{$conf['domain']}\n$np.{$conf['domain']} (for naiveproxy)\n$oc.{$conf['domain']} (for openconnect)" . ($conf['adguardkey'] ? "\n{$conf['adguardkey']}.{$conf['domain']} (for adguard DoT)" : '') : $this->i18n('domain explain');
|
||||
$ssl = $this->expireCert();
|
||||
$text[] = $conf['domain'] ? "\nSSL: " . ($ssl ? date('Y-m-d H:i:s', $this->expireCert()) . "\n" . $this->domainsCert() : 'none') : '';
|
||||
if (!empty($conf['domain'])) {
|
||||
$ssl_expiry = $this->expireCert();
|
||||
$certs = $this->domainsCert() ?: [];
|
||||
|
||||
$text[] = "<blockquote>";
|
||||
$text[] = "Domains:";
|
||||
$text[] = $conf['domain'] . (in_array($conf['domain'], $certs) ? ' (ssl: ' . date('Y-m-d H:i:s', $ssl_expiry) . ')' : '');
|
||||
$text[] = 'naive ' . "$np.{$conf['domain']}" . (in_array("$np.{$conf['domain']}", $certs) ? ' (ssl: ' . date('Y-m-d H:i:s', $ssl_expiry) . ')' : '');
|
||||
$text[] = 'openconnect ' . "$oc.{$conf['domain']}" . (in_array("$oc.{$conf['domain']}", $certs) ? ' (ssl: ' . date('Y-m-d H:i:s', $ssl_expiry) . ')' : '');
|
||||
if (!empty($conf['adguardkey'])) {
|
||||
$text[] = "{$conf['adguardkey']}.{$conf['domain']}" . (in_array("{$conf['adguardkey']}.{$conf['domain']}", $certs) ? ' (ssl: ' . date('Y-m-d H:i:s', $ssl_expiry) . ')' : '') . ' adguard DOT';;
|
||||
}
|
||||
$text[] = "</blockquote>";
|
||||
} else {
|
||||
$text[] = $this->i18n('domain explain');
|
||||
}
|
||||
|
||||
$data = [
|
||||
[
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
11.06.2025 v2.21
|
||||
- пагинация в списках
|
||||
20.05.2025 v2.20
|
||||
- коррекция главного меню
|
||||
- vless: опция обнуления статы ежемесячно
|
||||
17.05.2025 v2.19
|
||||
- фикс падения vless при одинаковом имени пользователей
|
||||
- фикс падения vless при установке таймера для выключенного пользователя
|
||||
|
||||
Reference in New Issue
Block a user