Compare commits

...

14 Commits

Author SHA1 Message Date
mercury 5f8979a62d update version 2024-04-09 18:14:04 +04:00
mercury 969e981874 timer for xray users 2024-04-09 18:13:19 +04:00
mercury 99d27da162 fix back in branches 2024-04-09 15:18:12 +04:00
mercury a0f8b4df05 fix sing-box sub 2024-04-09 15:16:34 +04:00
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
mercury d50f7e07ac xtls-reality sing-box subscription 2024-04-08 23:21:22 +04:00
mercury 687c36cab2 i18n update 2024-04-08 12:03:47 +04:00
8 changed files with 409 additions and 142 deletions
+159 -137
View File
@@ -278,6 +278,9 @@ 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('~^/delxr (\d+)$~', $this->input['callback'], $m):
$this->delxr($m[1]);
break;
@@ -890,6 +893,7 @@ class Bot
{
while (true) {
$this->shutdownClient();
$this->shutdownClientXr();
$this->checkVersion();
$this->checkBackup();
$this->checkCert();
@@ -1038,6 +1042,24 @@ class Bot
}
}
public function shutdownClientXr()
{
try {
$c = $this->getXray();
$f = 0;
foreach ($c['inbounds'][0]['settings']['clients'] as $k => $v) {
if (!empty($v['time']) && $v['time'] < time()) {
unset($c['inbounds'][0]['settings']['clients'][$k]);
$f = 1;
}
}
if (!empty($f)) {
$this->restartXray($c);
}
} catch (Exception $e) {
}
}
public function renameClient(string $name, int $client)
{
$clients = $this->readClients();
@@ -1086,6 +1108,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 +1243,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 +1896,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 +3175,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 +3245,7 @@ DNS-over-HTTPS with IP:
[
'text' => $this->i18n('donate'),
'web_app' => [
'url' => "https://www.donationalerts.com/r/mercurykd",
'url' => "$scheme://$domain/donate.html",
]
],
],
@@ -3451,6 +3504,18 @@ DNS-over-HTTPS with IP:
$this->xray();
}
public function setTimerXr($time, $i)
{
$c = $this->getXray();
if (empty($time)) {
unset($c['inbounds'][0]['settings']['clients'][$i]['time']);
} else {
$c['inbounds'][0]['settings']['clients'][$i]['time'] = strtotime($time);
}
file_put_contents('/config/xray.json', json_encode($c, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
$this->userXr($i);
}
public function renXrUs($name, $i)
{
$c = $this->getXray();
@@ -3467,17 +3532,6 @@ DNS-over-HTTPS with IP:
$c = $this->getXray();
$text[] = "Menu -> " . $this->i18n('xray');
$text[] = "fake domain: <code>{$c['inbounds'][0]['streamSettings']['realitySettings']['serverNames'][0]}</code>";
$data[] = [
[
'text' => 'android',
'web_app' => ['url' => 'https://github.com/2dust/v2rayNG/releases'],
],
[
'text' => 'windows',
'web_app' => ['url' => 'https://github.com/2dust/v2rayN/releases'],
],
];
$data[] = [
[
'text' => $this->i18n('changeFakeDomain'),
@@ -3495,9 +3549,10 @@ DNS-over-HTTPS with IP:
],
];
foreach ($c['inbounds'][0]['settings']['clients'] as $k => $v) {
$time = $v['time'] ? $this->getTime($v['time']) : '';
$data[] = [
[
'text' => "{$v['email']}",
'text' => "{$v['email']}" . ($time ? ": $time" : ''),
'callback_data' => "/userXr $k",
],
];
@@ -3516,19 +3571,38 @@ 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);
$link = "$scheme://{$domain}/pac?h=$hash&t=s&s={$c['inbounds'][0]['settings']['clients'][$i]['id']}";
$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>$link</code>";
$text[] = "v2ray: <a href='$v2ray'>$v2ray</a>\n";
$text[] = "sing-box: <a href='$sing'>$sing</a>";
if ($time = $c['inbounds'][0]['settings']['clients'][$i]['time']) {
$text[] = "\ntimer: " . $this->getTime($time);
}
$data[] = [
[
'text' => $this->i18n('timer'),
'callback_data' => "/timerXr $i",
],
];
$data[] = [
[
'text' => $this->i18n('show QR'),
@@ -3561,15 +3635,18 @@ DNS-over-HTTPS with IP:
);
}
public function v2raySubscription($key)
public function v2raySubscription($key, $fs = 0)
{
$domain = $this->getPacConf()['domain'] ?: $this->ip;
$xr = $this->getXray();
$pac = $this->getPacConf();
$domain = $pac['domain'] ?: $this->ip;
$xr = $this->getXray();
$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;
}
@@ -3578,120 +3655,65 @@ 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" => $domain,
"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, $fs = 0)
{
$pac = $this->getPacConf();
$domain = $pac['domain'] ?: $this->ip;
$xr = $this->getXray();
$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 false;
}
$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']);
}
return json_encode($c);
}
public function getXray()
{
return json_decode(file_get_contents('/config/xray.json'), true);
@@ -4137,7 +4159,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()
+4 -4
View File
@@ -266,8 +266,8 @@ $i = [
'ru' => 'фейковый домен',
],
'selfFakeDomain' => [
'en' => 'selfFakeDomain',
'ru' => 'домен бота',
'en' => 'steal from yourself',
'ru' => 'steal from yourself',
],
'page' => [
'en' => 'pagination',
@@ -326,7 +326,7 @@ $i = [
'ru' => 'нет обновлений',
],
'have updates' => [
'en' => 'have updates',
'ru' => 'есть обновления',
'en' => '🟢 have updates',
'ru' => '🟢 есть обновления',
],
];
+22 -1
View File
@@ -34,7 +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);
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"
}]
}
}
+19
View File
@@ -1,3 +1,22 @@
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
- редиректы вместо кнопки-подписки
- фикс добавления подписки
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
- раздельные пользователи для XTLS-Reality
- подписка с маршрутизацией для v2rayN/nginx