Compare commits

..

8 Commits

Author SHA1 Message Date
mercury ed720406da update version 2024-04-09 15:07:03 +04:00
mercury 43d68515db editable v2ray/sing-box conf 2024-04-09 15:05:39 +04:00
mercury ac8aff2fb3 donate button update 2024-04-09 13:23:43 +04:00
mercury 7a4583c036 singbox: domain -> domain_suffix 2024-04-09 02:54:49 +04:00
mercury 7ffd9c10c5 fix v2ray link 2024-04-09 02:24:50 +04:00
mercury 228b617bfc fix subscriptions + redirect link 2024-04-09 02:16:54 +04:00
mercury 9749677b86 update version 2024-04-09 01:21:46 +04:00
mercury 045a849be8 fix empty pac + singbox:// 2024-04-09 01:16:22 +04:00
7 changed files with 313 additions and 249 deletions
+77 -247
View File
@@ -1086,6 +1086,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 +1221,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));
@@ -3124,7 +3138,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 +3208,7 @@ DNS-over-HTTPS with IP:
[
'text' => $this->i18n('donate'),
'web_app' => [
'url' => "https://www.donationalerts.com/r/mercurykd",
'url' => "$scheme://$domain/donate.html",
]
],
],
@@ -3505,21 +3521,27 @@ DNS-over-HTTPS with IP:
);
}
public function userXr($i)
public function userXr($i, $fs = 0, $fv = 0)
{
$c = $this->getXray();
$domain = $this->getPacConf()['domain'] ?: $this->ip;
$scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
$hash = substr(md5($this->key), 0, 8);
$v2ray = "$scheme://{$domain}/pac?h=$hash&t=s&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}";
$sing = "$scheme://{$domain}/pac?h=$hash&t=si&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";
$c = $this->getXray();
$domain = $this->getPacConf()['domain'] ?: $this->ip;
$scheme = empty($this->nginxGetTypeCert()) ? 'http' : 'https';
$hash = substr(md5($this->key), 0, 8);
$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=s&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}") . "#vpnbot$i";
if (!empty($fs)) {
return $fullsing;
}
if (!empty($fv)) {
return $fullv2ray;
}
$text[] = "Menu -> " . $this->i18n('xray') . " -> {$c['inbounds'][0]['settings']['clients'][$i]['email']}\n";
$text[] = "<code>{$this->linkXray($i)}</code>\n";
$text[] = "v2ray subscription: <code>$v2ray</code>";
$text[] = "sing-box subscription: <code>$sing</code>";
$text[] = "v2ray: <a href='$v2ray'>$v2ray</a>\n";
$text[] = "sing-box: <a href='$sing'>$sing</a>";
$data[] = [
[
@@ -3553,7 +3575,7 @@ DNS-over-HTTPS with IP:
);
}
public function v2raySubscription($key)
public function v2raySubscription($key, $fs = 0)
{
$pac = $this->getPacConf();
$domain = $pac['domain'] ?: $this->ip;
@@ -3562,6 +3584,9 @@ DNS-over-HTTPS with IP:
$flag = true;
foreach ($xr['inbounds'][0]['settings']['clients'] as $k => $v) {
if ($v['id'] == $key) {
if (!empty($fs)) {
return $this->userXr($k, 0, 1);
}
$flag = false;
break;
}
@@ -3570,121 +3595,24 @@ 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']);
}
echo json_encode($c);
}
public function singboxSubscription($key)
public function singboxSubscription($key, $fs = 0)
{
$pac = $this->getPacConf();
$domain = $pac['domain'] ?: $this->ip;
@@ -3693,134 +3621,36 @@ DNS-over-HTTPS with IP:
$flag = true;
foreach ($xr['inbounds'][0]['settings']['clients'] as $k => $v) {
if ($v['id'] == $key) {
if (!empty($fs)) {
return $this->userXr($k, 1);
}
$flag = false;
break;
}
}
if ($flag) {
return;
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"
]
]
]
];
echo json_encode($c);
$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]['tls']['reality']['public_key'] = $key;
$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']);
}
return json_encode($c);
}
public function getXray()
+16 -2
View File
@@ -34,14 +34,28 @@ if ($hash == substr(md5($c['key']), 0, 8)) {
require __DIR__ . '/bot.php';
require __DIR__ . '/i18n.php';
$bot = new Bot($c['key'], $i);
$bot->v2raySubscription($_GET['s']);
if (!empty($_GET['b'])) {
$fs = $bot->v2raySubscription($_GET['s'], 1);
header("Location: $fs");
exit;
} else {
header('Content-Type: application/json');
echo $bot->v2raySubscription($_GET['s']);
}
exit;
case 'si':
require __DIR__ . '/bot.php';
require __DIR__ . '/i18n.php';
$bot = new Bot($c['key'], $i);
$bot->singboxSubscription($_GET['s']);
if (!empty($_GET['b'])) {
$fs = $bot->singboxSubscription($_GET['s'], 1);
header("Location: $fs");
exit;
} else {
header('Content-Type: application/json');
echo $bot->singboxSubscription($_GET['s']);
}
exit;
default:
+4
View File
@@ -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

+106
View File
@@ -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"
}]
}
}
+95
View File
@@ -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"
}]
}
}
+15
View File
@@ -1,3 +1,18 @@
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
- редиректы вместо кнопки-подписки
- фикс добавления подписки
09.04.2024 v1.15.1
- кнопка sing-box
- фикс пустого списка РАС для sing-box
09.04.2024 v1.15.1
- кнопка sing-box
- фикс пустого списка РАС для sing-box
08.04.2024 v1.15
- подписка с маршрутизацией для singbox
07.04.2024 v1.14