Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 mercury
|
4a40a82d5b | ||
|
mercury
|
abe78182fe | ||
|
mercury
|
16fc468516 | ||
|
mercury
|
85d8bc4e6d | ||
|
mercury
|
5f8979a62d | ||
|
mercury
|
969e981874 | ||
|
mercury
|
99d27da162 | ||
|
mercury
|
a0f8b4df05 | ||
|
mercury
|
ed720406da | ||
|
mercury
|
43d68515db | ||
|
mercury
|
ac8aff2fb3 | ||
|
mercury
|
7a4583c036 | ||
|
mercury
|
7ffd9c10c5 |
+189
-242
@@ -6,6 +6,7 @@ class Bot
|
||||
public $adguard;
|
||||
public $update;
|
||||
public $ip;
|
||||
public $limit;
|
||||
|
||||
public function __construct($key, $i18n)
|
||||
{
|
||||
@@ -278,9 +279,18 @@ class Bot
|
||||
case preg_match('~^/userXr (\d+)$~', $this->input['callback'], $m):
|
||||
$this->userXr($m[1]);
|
||||
break;
|
||||
case preg_match('~^/timerXr (\d+)$~', $this->input['callback'], $m):
|
||||
$this->timerXr($m[1]);
|
||||
break;
|
||||
case preg_match('~^/switchXr (\d+)$~', $this->input['callback'], $m):
|
||||
$this->switchXr($m[1]);
|
||||
break;
|
||||
case preg_match('~^/delxr (\d+)$~', $this->input['callback'], $m):
|
||||
$this->delxr($m[1]);
|
||||
break;
|
||||
case preg_match('~^/listXr (\d+)$~', $this->input['callback'], $m):
|
||||
$this->listXr($m[1]);
|
||||
break;
|
||||
case preg_match('~^/switchTorrent (\d+)$~', $this->input['callback'], $m):
|
||||
$this->switchTorrent($m[1]);
|
||||
break;
|
||||
@@ -345,8 +355,8 @@ class Bot
|
||||
case preg_match('~^/domain$~', $this->input['callback'], $m):
|
||||
$this->domain();
|
||||
break;
|
||||
case preg_match('~^/xray$~', $this->input['callback'], $m):
|
||||
$this->xray();
|
||||
case preg_match('~^/xray(?: (\d+))?$~', $this->input['callback'], $m):
|
||||
$this->xray($m[1] ?: 0);
|
||||
break;
|
||||
case preg_match('~^/generateSecretXray$~', $this->input['callback'], $m):
|
||||
$this->generateSecretXray();
|
||||
@@ -890,6 +900,7 @@ class Bot
|
||||
{
|
||||
while (true) {
|
||||
$this->shutdownClient();
|
||||
$this->shutdownClientXr();
|
||||
$this->checkVersion();
|
||||
$this->checkBackup();
|
||||
$this->checkCert();
|
||||
@@ -1038,6 +1049,19 @@ class Bot
|
||||
}
|
||||
}
|
||||
|
||||
public function shutdownClientXr()
|
||||
{
|
||||
try {
|
||||
$c = $this->getXray();
|
||||
foreach ($c['inbounds'][0]['settings']['clients'] as $k => $v) {
|
||||
if (!empty($v['time']) && ($v['time'] < time())) {
|
||||
$this->switchXr($k, 1);
|
||||
}
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
}
|
||||
}
|
||||
|
||||
public function renameClient(string $name, int $client)
|
||||
{
|
||||
$clients = $this->readClients();
|
||||
@@ -1086,6 +1110,8 @@ class Bot
|
||||
'xray' => $this->getXray(),
|
||||
'oc' => file_get_contents('/config/ocserv.conf'),
|
||||
'ocu' => file_get_contents('/config/ocserv.passwd'),
|
||||
'v2ray' => file_get_contents('/config/v2ray.json'),
|
||||
'sing' => file_get_contents('/config/sing.json'),
|
||||
|
||||
];
|
||||
return json_encode($conf, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
||||
@@ -1219,6 +1245,18 @@ class Bot
|
||||
$this->setUpstreamDomainOcserv($json['pac']['domain']);
|
||||
$this->setUpstreamDomainNaive($json['pac']['domain']);
|
||||
}
|
||||
// v2ray
|
||||
if (!empty($json['v2ray'])) {
|
||||
$out[] = 'update v2ray';
|
||||
$this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
|
||||
file_put_contents('/config/v2ray.json', $json['v2ray']);
|
||||
}
|
||||
// sing
|
||||
if (!empty($json['sing'])) {
|
||||
$out[] = 'update sing-box';
|
||||
$this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
|
||||
file_put_contents('/config/sing.json', $json['sing']);
|
||||
}
|
||||
// nginx
|
||||
$out[] = 'reset nginx';
|
||||
$this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out));
|
||||
@@ -1860,6 +1898,21 @@ class Bot
|
||||
];
|
||||
}
|
||||
|
||||
public function timerXr($k)
|
||||
{
|
||||
$r = $this->send(
|
||||
$this->input['chat'],
|
||||
"@{$this->input['username']} enter time like https://www.php.net/manual/ru/function.strtotime.php:",
|
||||
$this->input['message_id'],
|
||||
reply: 'enter time like https://www.php.net/manual/ru/function.strtotime.php:',
|
||||
);
|
||||
$_SESSION['reply'][$r['result']['message_id']] = [
|
||||
'start_message' => $this->input['message_id'],
|
||||
'callback' => 'setTimerXr',
|
||||
'args' => [$k],
|
||||
];
|
||||
}
|
||||
|
||||
public function setAdKey($key)
|
||||
{
|
||||
$c = $this->getPacConf();
|
||||
@@ -3124,7 +3177,9 @@ DNS-over-HTTPS with IP:
|
||||
|
||||
public function menu($type = false, $arg = false, $return = false)
|
||||
{
|
||||
$menu = [
|
||||
$domain = $this->getPacConf()['domain'] ?: $this->ip;
|
||||
$scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
|
||||
$menu = [
|
||||
'main' => [
|
||||
'text' => 'v' . getenv('VER'),
|
||||
'data' => [
|
||||
@@ -3192,7 +3247,7 @@ DNS-over-HTTPS with IP:
|
||||
[
|
||||
'text' => $this->i18n('donate'),
|
||||
'web_app' => [
|
||||
'url' => "https://www.donationalerts.com/r/mercurykd",
|
||||
'url' => "$scheme://$domain/donate.html",
|
||||
]
|
||||
],
|
||||
],
|
||||
@@ -3448,7 +3503,45 @@ DNS-over-HTTPS with IP:
|
||||
'email' => $user,
|
||||
];
|
||||
$this->restartXray($c);
|
||||
$this->xray();
|
||||
$this->userXr(count($c['inbounds'][0]['settings']['clients']) - 1);
|
||||
}
|
||||
|
||||
public function setTimerXr($time, $i)
|
||||
{
|
||||
$time = strtotime($time);
|
||||
if ($time === false) {
|
||||
$this->send($this->input['chat'], 'wrong format');
|
||||
return;
|
||||
}
|
||||
$c = $this->getXray();
|
||||
if (empty($time)) {
|
||||
unset($c['inbounds'][0]['settings']['clients'][$i]['time']);
|
||||
} else {
|
||||
if (!empty($c['inbounds'][0]['settings']['clients'][$i]['off'])) {
|
||||
$this->switchXr($i, 1);
|
||||
$c = $this->getXray();
|
||||
}
|
||||
$c['inbounds'][0]['settings']['clients'][$i]['time'] = $time;
|
||||
}
|
||||
file_put_contents('/config/xray.json', json_encode($c, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
|
||||
$this->userXr($i);
|
||||
}
|
||||
|
||||
public function switchXr($i, $nm = 0)
|
||||
{
|
||||
$c = $this->getXray();
|
||||
unset($c['inbounds'][0]['settings']['clients'][$i]['time']);
|
||||
if (empty($c['inbounds'][0]['settings']['clients'][$i]['off'])) {
|
||||
$c['inbounds'][0]['settings']['clients'][$i]['off'] = $c['inbounds'][0]['settings']['clients'][$i]['id'];
|
||||
$c['inbounds'][0]['settings']['clients'][$i]['id'] = trim($this->ssh('xray uuid', 'xr'));
|
||||
} else {
|
||||
$c['inbounds'][0]['settings']['clients'][$i]['id'] = $c['inbounds'][0]['settings']['clients'][$i]['off'];
|
||||
unset($c['inbounds'][0]['settings']['clients'][$i]['off']);
|
||||
}
|
||||
$this->restartXray($c);
|
||||
if (empty($nm)) {
|
||||
$this->userXr($i);
|
||||
}
|
||||
}
|
||||
|
||||
public function renXrUs($name, $i)
|
||||
@@ -3459,7 +3552,15 @@ DNS-over-HTTPS with IP:
|
||||
$this->userXr($i);
|
||||
}
|
||||
|
||||
public function xray()
|
||||
public function listXr($i)
|
||||
{
|
||||
$c = $this->getPacConf();
|
||||
$c['xtlslist'] = $i;
|
||||
$this->setPacConf($c);
|
||||
$this->xray();
|
||||
}
|
||||
|
||||
public function xray($page = 0)
|
||||
{
|
||||
if (!$this->ssh('pgrep xray', 'xr')) {
|
||||
$this->generateSecretXray();
|
||||
@@ -3484,13 +3585,52 @@ DNS-over-HTTPS with IP:
|
||||
],
|
||||
];
|
||||
foreach ($c['inbounds'][0]['settings']['clients'] as $k => $v) {
|
||||
if (!empty($v['off'])) {
|
||||
$off++;
|
||||
} else {
|
||||
$on++;
|
||||
}
|
||||
}
|
||||
$type = $this->getPacConf()['xtlslist'];
|
||||
$data[] = [
|
||||
[
|
||||
'text' => $this->i18n('on') . " $on " . (!$type ? "✅" : ''),
|
||||
'callback_data' => "/listXr 0",
|
||||
],
|
||||
[
|
||||
'text' => $this->i18n('off') . " $off " . ($type ? "✅" : ''),
|
||||
'callback_data' => "/listXr 1",
|
||||
],
|
||||
];
|
||||
$clients = array_filter($c['inbounds'][0]['settings']['clients'], fn($e) => !$type ? empty($e['off']) : !empty($e['off']));
|
||||
uasort($clients, fn($a, $b) => ($a['time'] ?: PHP_INT_MAX) <=> ($b['time'] ?: PHP_INT_MAX));
|
||||
|
||||
$all = (int) ceil(count($clients) / $this->limit);
|
||||
$page = min($page, $all - 1);
|
||||
$page = $page == -2 ? $all - 1 : $page;
|
||||
$clients = $page != -1 ? array_slice($clients, $page * $this->limit, $this->limit, true) : $clients;
|
||||
foreach ($clients as $k => $v) {
|
||||
$time = $v['time'] ? $this->getTime($v['time']) : '';
|
||||
$data[] = [
|
||||
[
|
||||
'text' => "{$v['email']}",
|
||||
'text' => "{$v['email']}" . ($time ? ": $time" : ''),
|
||||
'callback_data' => "/userXr $k",
|
||||
],
|
||||
];
|
||||
}
|
||||
if ($page != -1 && $all > 1) {
|
||||
$data[] = [
|
||||
[
|
||||
'text' => '<<',
|
||||
'callback_data' => "/xray " . ($page - 1 >= 0 ? $page - 1 : $all - 1),
|
||||
],
|
||||
[
|
||||
'text' => '>>',
|
||||
'callback_data' => "/xray " . ($page < $all - 1 ? $page + 1 : 0),
|
||||
]
|
||||
];
|
||||
}
|
||||
|
||||
$data[] = [
|
||||
[
|
||||
'text' => $this->i18n('back'),
|
||||
@@ -3514,7 +3654,7 @@ DNS-over-HTTPS with IP:
|
||||
$v2ray = "$scheme://{$domain}/pac?h=$hash&t=s&b=1&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}";
|
||||
$sing = "$scheme://{$domain}/pac?h=$hash&t=si&b=1&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}";
|
||||
$fullsing = 'sing-box://import-remote-profile/?url=' . urlencode("$scheme://{$domain}/pac?h=$hash&t=si&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}") . "#vpnbot$i";
|
||||
$fullv2ray = 'v2rayng://install-config?url=' . urlencode("$scheme://{$domain}/pac?h=$hash&t=si&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}") . "#vpnbot$i";
|
||||
$fullv2ray = 'v2rayng://install-config?url=' . urlencode("$scheme://{$domain}/pac?h=$hash&t=s&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}") . "#vpnbot$i";
|
||||
if (!empty($fs)) {
|
||||
return $fullsing;
|
||||
}
|
||||
@@ -3527,6 +3667,16 @@ DNS-over-HTTPS with IP:
|
||||
$text[] = "v2ray: <a href='$v2ray'>$v2ray</a>\n";
|
||||
$text[] = "sing-box: <a href='$sing'>$sing</a>";
|
||||
|
||||
$data[] = [
|
||||
[
|
||||
'text' => $c['inbounds'][0]['settings']['clients'][$i]['time'] ? "timer: " . $this->getTime($c['inbounds'][0]['settings']['clients'][$i]['time']) : $this->i18n('timer'),
|
||||
'callback_data' => "/timerXr $i",
|
||||
],
|
||||
[
|
||||
'text' => $this->i18n($c['inbounds'][0]['settings']['clients'][$i]['off'] ? 'off' : 'on'),
|
||||
'callback_data' => "/switchXr $i",
|
||||
],
|
||||
];
|
||||
$data[] = [
|
||||
[
|
||||
'text' => $this->i18n('show QR'),
|
||||
@@ -3571,7 +3721,9 @@ DNS-over-HTTPS with IP:
|
||||
if (!empty($fs)) {
|
||||
return $this->userXr($k, 0, 1);
|
||||
}
|
||||
$flag = false;
|
||||
if (empty($v['off'])) {
|
||||
$flag = false;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -3579,117 +3731,15 @@ DNS-over-HTTPS with IP:
|
||||
return;
|
||||
}
|
||||
|
||||
$c = [
|
||||
"log" => [
|
||||
"access" => "",
|
||||
"error" => "",
|
||||
"loglevel" => "warning"
|
||||
],
|
||||
"inbounds" => [
|
||||
[
|
||||
"tag" => "socks",
|
||||
"port" => 10808,
|
||||
"listen" => "127.0.0.1",
|
||||
"protocol" => "socks",
|
||||
"sniffing" => [
|
||||
"enabled" => true,
|
||||
"destOverride" => [
|
||||
"http",
|
||||
"tls"
|
||||
],
|
||||
"routeOnly" => false
|
||||
],
|
||||
"settings" => [
|
||||
"auth" => "noauth",
|
||||
"udp" => true,
|
||||
"allowTransparent" => false
|
||||
]
|
||||
],
|
||||
[
|
||||
"tag" => "http",
|
||||
"port" => 10809,
|
||||
"listen" => "127.0.0.1",
|
||||
"protocol" => "http",
|
||||
"sniffing" => [
|
||||
"enabled" => true,
|
||||
"destOverride" => [
|
||||
"http",
|
||||
"tls"
|
||||
],
|
||||
"routeOnly" => false
|
||||
],
|
||||
"settings" => [
|
||||
"auth" => "noauth",
|
||||
"udp" => true,
|
||||
"allowTransparent" => false
|
||||
]
|
||||
]
|
||||
],
|
||||
"outbounds" => [
|
||||
[
|
||||
"tag" => "proxy",
|
||||
"protocol" => "vless",
|
||||
"settings" => [
|
||||
"vnext" => [[
|
||||
"address" => $domain,
|
||||
"port" => 443,
|
||||
"users" => [[
|
||||
"id" => $key,
|
||||
"alterId" => 0,
|
||||
"email" => "t@t.tt",
|
||||
"security" => "auto",
|
||||
"encryption" => "none",
|
||||
"flow" => "xtls-rprx-vision"
|
||||
]]
|
||||
]]
|
||||
],
|
||||
"streamSettings" => [
|
||||
"network" => "tcp",
|
||||
"security" => "reality",
|
||||
"realitySettings" => [
|
||||
"serverName" => $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0],
|
||||
"fingerprint" => "chrome",
|
||||
"show" => false,
|
||||
"publicKey" => $pac['xray'],
|
||||
"shortId" => $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0],
|
||||
"spiderX" => ""
|
||||
]
|
||||
],
|
||||
"mux" => [
|
||||
"enabled" => false,
|
||||
"concurrency" => -1
|
||||
]
|
||||
],
|
||||
[
|
||||
"tag" => "direct",
|
||||
"protocol" => "freedom",
|
||||
],
|
||||
[
|
||||
"tag" => "block",
|
||||
"protocol" => "blackhole",
|
||||
"settings" => [
|
||||
"response" => [
|
||||
"type" => "http"
|
||||
]
|
||||
]
|
||||
]
|
||||
],
|
||||
"routing" => [
|
||||
"domainStrategy" => "AsIs",
|
||||
"rules" => [
|
||||
[
|
||||
"type" => "field",
|
||||
"outboundTag" => "proxy",
|
||||
"domain" => array_keys(array_filter($pac['includelist']))
|
||||
],
|
||||
[
|
||||
"type" => "field",
|
||||
"port" => "0-65535",
|
||||
"outboundTag" => "direct"
|
||||
]
|
||||
]
|
||||
]
|
||||
];
|
||||
$c = json_decode(file_get_contents('/config/v2ray.json'), true);
|
||||
|
||||
$c['outbounds'][0]['settings']['vnext'][0]['address'] = $domain;
|
||||
$c['outbounds'][0]['settings']['vnext'][0]['users'][0]['id'] = $key;
|
||||
$c['outbounds'][0]['streamSettings']['realitySettings']['serverName'] = $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0];
|
||||
$c['outbounds'][0]['streamSettings']['realitySettings']['publicKey'] = $pac['xray'];
|
||||
$c['outbounds'][0]['streamSettings']['realitySettings']['shortId'] = $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0];
|
||||
$c['routing']['rules'][0]['domain'] = array_keys(array_filter($pac['includelist']));
|
||||
|
||||
if (empty($c['routing']['rules'][0]['domain'])) {
|
||||
unset($c['routing']['rules'][0]);
|
||||
$c['routing']['rules'] = array_values($c['routing']['rules']);
|
||||
@@ -3710,7 +3760,10 @@ DNS-over-HTTPS with IP:
|
||||
if (!empty($fs)) {
|
||||
return $this->userXr($k, 1);
|
||||
}
|
||||
$flag = false;
|
||||
if (empty($v['off'])) {
|
||||
$flag = false;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -3718,126 +3771,20 @@ DNS-over-HTTPS with IP:
|
||||
return false;
|
||||
}
|
||||
|
||||
$c = [
|
||||
"log" => [
|
||||
"level" => "error",
|
||||
"timestamp" => true
|
||||
],
|
||||
"inbounds" => [[
|
||||
"type" => "tun",
|
||||
"tag" => "tun-in",
|
||||
"domain_strategy" => "prefer_ipv4",
|
||||
"interface_name" => "sing-tun",
|
||||
"inet4_address" => "172.19.0.1/30",
|
||||
"mtu" => 1400,
|
||||
"gso" => true,
|
||||
"auto_route" => true,
|
||||
"strict_route" => true,
|
||||
"sniff" => true,
|
||||
"endpoint_independent_nat" => false,
|
||||
"stack" => "mixed",
|
||||
"platform" => [
|
||||
"http_proxy" => [
|
||||
"enabled" => false,
|
||||
"server" => "127.0.0.1",
|
||||
"server_port" => 2080
|
||||
]
|
||||
]
|
||||
],
|
||||
[
|
||||
"type" => "mixed",
|
||||
"tag" => "mixed-in",
|
||||
"domain_strategy" => "prefer_ipv4",
|
||||
"listen" => "127.0.0.1",
|
||||
"listen_port" => 2080,
|
||||
"tcp_fast_open" => true,
|
||||
"sniff" => true,
|
||||
"sniff_override_destination" => false,
|
||||
"users" => []
|
||||
]
|
||||
],
|
||||
"dns" => [
|
||||
"servers" => [[
|
||||
"tag" => "dns_direct",
|
||||
"address" => "tls://" . ($pac['adguardkey'] ? "{$pac['adguardkey']}." : '') . "$domain",
|
||||
"address_resolver" => "dns-remote",
|
||||
"strategy" => "prefer_ipv4",
|
||||
"detour" => "direct"
|
||||
],
|
||||
[
|
||||
"tag" => "dns-remote",
|
||||
"address" => "tcp://8.8.8.8",
|
||||
"address_strategy" => "prefer_ipv4",
|
||||
"strategy" => "prefer_ipv4",
|
||||
"detour" => "direct"
|
||||
]
|
||||
],
|
||||
"rules" => [[
|
||||
"outbound" => "any",
|
||||
"server" => "dns-direct",
|
||||
"disable_cache" => false
|
||||
]],
|
||||
"strategy" => "ipv4_only",
|
||||
"independent_cache" => true
|
||||
],
|
||||
"outbounds" => [[
|
||||
"flow" => "xtls-rprx-vision",
|
||||
"packet_encoding" => "",
|
||||
"server" => $domain,
|
||||
"server_port" => 443,
|
||||
"tls" => [
|
||||
"enabled" => true,
|
||||
"insecure" => false,
|
||||
"reality" => [
|
||||
"enabled" => true,
|
||||
"public_key" => $pac['xray'],
|
||||
"short_id" => $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0],
|
||||
],
|
||||
"server_name" => $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0],
|
||||
"utls" => [
|
||||
"enabled" => true,
|
||||
"fingerprint" => "chrome"
|
||||
]
|
||||
],
|
||||
"uuid" => $key,
|
||||
"type" => "vless",
|
||||
"domain_strategy" => "ipv4_only",
|
||||
"tag" => "proxy"
|
||||
],
|
||||
[
|
||||
"type" => "direct",
|
||||
"tag" => "direct"
|
||||
],
|
||||
[
|
||||
"type" => "block",
|
||||
"tag" => "block"
|
||||
],
|
||||
[
|
||||
"type" => "dns",
|
||||
"tag" => "dns-out"
|
||||
]
|
||||
],
|
||||
"route" => [
|
||||
"auto_detect_interface" => true,
|
||||
"override_android_vpn" => true,
|
||||
"rules" => [[
|
||||
"protocol" => "dns",
|
||||
"outbound" => "dns-out"
|
||||
],
|
||||
[
|
||||
"domain" => array_keys(array_filter($pac['includelist'])),
|
||||
"outbound" => "proxy"
|
||||
],
|
||||
[
|
||||
"ip_cidr" => [
|
||||
"0.0.0.0/0"
|
||||
],
|
||||
"outbound" => "direct"
|
||||
]
|
||||
]
|
||||
]
|
||||
];
|
||||
if (empty($c['route']['rules'][1]['domain'])) {
|
||||
$c = json_decode(file_get_contents('/config/sing.json'), true);
|
||||
|
||||
if ($c['dns']['servers'][0]['address'] == '~dns~') {
|
||||
$c['dns']['servers'][0]['address'] = "tls://" . ($pac['adguardkey'] ? "{$pac['adguardkey']}." : '') . "$domain";
|
||||
}
|
||||
|
||||
$c['outbounds'][0]['server'] = $domain;
|
||||
$c['outbounds'][0]['uuid'] = $key;
|
||||
$c['outbounds'][0]['tls']['reality']['public_key'] = $pac['xray'];
|
||||
$c['outbounds'][0]['tls']['server_name'] = $xr['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0];
|
||||
$c['outbounds'][0]['tls']['reality']['short_id'] = $xr['inbounds'][0]['streamSettings']['realitySettings']['shortIds'][0];
|
||||
$c['route']['rules'][1]['domain_suffix'] = array_keys(array_filter($pac['includelist']));
|
||||
|
||||
if (empty($c['route']['rules'][1]['domain_suffix'])) {
|
||||
unset($c['route']['rules'][1]);
|
||||
$c['route']['rules'] = array_values($c['route']['rules']);
|
||||
}
|
||||
@@ -4289,7 +4236,7 @@ DNS-over-HTTPS with IP:
|
||||
file_put_contents('/update/branch', trim(str_replace('origin/', '', $v)));
|
||||
}
|
||||
}
|
||||
$this->menu('config');
|
||||
$this->menu('update');
|
||||
}
|
||||
|
||||
public function logs()
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
<div style="position:relative;width:100%;height:100%">
|
||||
<img style="position:absolute;top:0;right:0;width:35%" src="toncoin.png" alt="">
|
||||
<iframe style="width:100%;height:100%" src="https://www.donationalerts.com/r/mercurykd" frameborder="0"></iframe>
|
||||
</div>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
@@ -0,0 +1,106 @@
|
||||
{
|
||||
"log": {
|
||||
"level": "error",
|
||||
"timestamp": true
|
||||
},
|
||||
"inbounds": [{
|
||||
"type": "tun",
|
||||
"tag": "tun-in",
|
||||
"domain_strategy": "prefer_ipv4",
|
||||
"interface_name": "sing-tun",
|
||||
"inet4_address": "172.19.0.1\/30",
|
||||
"mtu": 1400,
|
||||
"gso": true,
|
||||
"auto_route": true,
|
||||
"strict_route": true,
|
||||
"sniff": true,
|
||||
"endpoint_independent_nat": false,
|
||||
"stack": "mixed",
|
||||
"platform": {
|
||||
"http_proxy": {
|
||||
"enabled": false,
|
||||
"server": "127.0.0.1",
|
||||
"server_port": 2080
|
||||
}
|
||||
}
|
||||
}, {
|
||||
"type": "mixed",
|
||||
"tag": "mixed-in",
|
||||
"domain_strategy": "prefer_ipv4",
|
||||
"listen": "127.0.0.1",
|
||||
"listen_port": 2080,
|
||||
"tcp_fast_open": true,
|
||||
"sniff": true,
|
||||
"sniff_override_destination": false,
|
||||
"users": []
|
||||
}],
|
||||
"dns": {
|
||||
"servers": [{
|
||||
"tag": "dns_direct",
|
||||
"address": "~dns~",
|
||||
"address_resolver": "dns-remote",
|
||||
"strategy": "prefer_ipv4",
|
||||
"detour": "direct"
|
||||
}, {
|
||||
"tag": "dns-remote",
|
||||
"address": "tcp:\/\/8.8.8.8",
|
||||
"address_strategy": "prefer_ipv4",
|
||||
"strategy": "prefer_ipv4",
|
||||
"detour": "direct"
|
||||
}],
|
||||
"rules": [{
|
||||
"outbound": "any",
|
||||
"server": "dns-direct",
|
||||
"disable_cache": false
|
||||
}],
|
||||
"strategy": "ipv4_only",
|
||||
"independent_cache": true
|
||||
},
|
||||
"outbounds": [{
|
||||
"flow": "xtls-rprx-vision",
|
||||
"packet_encoding": "",
|
||||
"server": "",
|
||||
"server_port": 443,
|
||||
"tls": {
|
||||
"enabled": true,
|
||||
"insecure": false,
|
||||
"reality": {
|
||||
"enabled": true,
|
||||
"public_key": "",
|
||||
"short_id": ""
|
||||
},
|
||||
"server_name": "",
|
||||
"utls": {
|
||||
"enabled": true,
|
||||
"fingerprint": "chrome"
|
||||
}
|
||||
},
|
||||
"uuid": "",
|
||||
"type": "vless",
|
||||
"domain_strategy": "ipv4_only",
|
||||
"tag": "proxy"
|
||||
}, {
|
||||
"type": "direct",
|
||||
"tag": "direct"
|
||||
}, {
|
||||
"type": "block",
|
||||
"tag": "block"
|
||||
}, {
|
||||
"type": "dns",
|
||||
"tag": "dns-out"
|
||||
}],
|
||||
"route": {
|
||||
"auto_detect_interface": true,
|
||||
"override_android_vpn": true,
|
||||
"rules": [{
|
||||
"protocol": "dns",
|
||||
"outbound": "dns-out"
|
||||
}, {
|
||||
"domain_suffix": [],
|
||||
"outbound": "proxy"
|
||||
}, {
|
||||
"ip_cidr": ["0.0.0.0\/0"],
|
||||
"outbound": "direct"
|
||||
}]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
{
|
||||
"log": {
|
||||
"access": "",
|
||||
"error": "",
|
||||
"loglevel": "warning"
|
||||
},
|
||||
"inbounds": [{
|
||||
"tag": "socks",
|
||||
"port": 10808,
|
||||
"listen": "127.0.0.1",
|
||||
"protocol": "socks",
|
||||
"sniffing": {
|
||||
"enabled": true,
|
||||
"destOverride": ["http", "tls"],
|
||||
"routeOnly": false
|
||||
},
|
||||
"settings": {
|
||||
"auth": "noauth",
|
||||
"udp": true,
|
||||
"allowTransparent": false
|
||||
}
|
||||
}, {
|
||||
"tag": "http",
|
||||
"port": 10809,
|
||||
"listen": "127.0.0.1",
|
||||
"protocol": "http",
|
||||
"sniffing": {
|
||||
"enabled": true,
|
||||
"destOverride": ["http", "tls"],
|
||||
"routeOnly": false
|
||||
},
|
||||
"settings": {
|
||||
"auth": "noauth",
|
||||
"udp": true,
|
||||
"allowTransparent": false
|
||||
}
|
||||
}],
|
||||
"outbounds": [{
|
||||
"tag": "proxy",
|
||||
"protocol": "vless",
|
||||
"settings": {
|
||||
"vnext": [{
|
||||
"address": "",
|
||||
"port": 443,
|
||||
"users": [{
|
||||
"id": "",
|
||||
"alterId": 0,
|
||||
"email": "t@t.tt",
|
||||
"security": "auto",
|
||||
"encryption": "none",
|
||||
"flow": "xtls-rprx-vision"
|
||||
}]
|
||||
}]
|
||||
},
|
||||
"streamSettings": {
|
||||
"network": "tcp",
|
||||
"security": "reality",
|
||||
"realitySettings": {
|
||||
"serverName": "",
|
||||
"fingerprint": "chrome",
|
||||
"show": false,
|
||||
"publicKey": "",
|
||||
"shortId": "",
|
||||
"spiderX": ""
|
||||
}
|
||||
},
|
||||
"mux": {
|
||||
"enabled": false,
|
||||
"concurrency": -1
|
||||
}
|
||||
}, {
|
||||
"tag": "direct",
|
||||
"protocol": "freedom"
|
||||
}, {
|
||||
"tag": "block",
|
||||
"protocol": "blackhole",
|
||||
"settings": {
|
||||
"response": {
|
||||
"type": "http"
|
||||
}
|
||||
}
|
||||
}],
|
||||
"routing": {
|
||||
"domainStrategy": "AsIs",
|
||||
"rules": [{
|
||||
"type": "field",
|
||||
"outboundTag": "proxy",
|
||||
"domain": []
|
||||
}, {
|
||||
"type": "field",
|
||||
"port": "0-65535",
|
||||
"outboundTag": "direct"
|
||||
}]
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,13 @@
|
||||
10.04.2024 v1.18
|
||||
- включение/выключение xtls юзеров
|
||||
09.04.2024 v1.17
|
||||
- редактируемые конфиги v2ray/sing-box
|
||||
09.04.2024 v1.16
|
||||
- редактируемые конфиги v2ray/sing-box
|
||||
09.04.2024 v1.15.4
|
||||
- замена domain на domain_suffix
|
||||
09.04.2024 v1.15.2
|
||||
- фикс подписки v2ray
|
||||
09.04.2024 v1.15.2
|
||||
- редиректы вместо кнопки-подписки
|
||||
- фикс добавления подписки
|
||||
|
||||
Reference in New Issue
Block a user