yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-01-10 08:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Insert Matched Proxies While Preserving Array Order

Browse Source 
The matched proxies are now inserted in place of the search parameters, while maintaining the original order of the entire array. This ensures that the structure of the proxy list remains consistent and predictable.
This commit is contained in:
He-Peter-Huang 2024-08-29 23:53:53 +08:00
parent 0ca47622a5
commit 982ec97361
3 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/Client/Protocols/Clash.php Normal file → Executable file
View File

@ -62,20 +62,22 @@ class Clash
$config['proxies'] = array_merge($config['proxies'] ? $config['proxies'] : [], $proxy);
foreach ($config['proxy-groups'] as $k => $v) {
if (!is_array($config['proxy-groups'][$k]['proxies'])) $config['proxy-groups'][$k]['proxies'] = [];
$isFilter = false;
foreach ($config['proxy-groups'][$k]['proxies'] as $src) {
foreach ($proxies as $dst) {
if (!$this->isRegex($src)) continue;
$isFilter = true;
$config['proxy-groups'][$k]['proxies'] = array_values(array_diff($config['proxy-groups'][$k]['proxies'], [$src]));
if ($this->isMatch($src, $dst)) {
array_push($config['proxy-groups'][$k]['proxies'], $dst);
$updatedProxies = [];
foreach ($config['proxy-groups'][$k]['proxies'] as $index => $src) {
if ($this->isRegex($src)) {
foreach ($proxies as $dst) {
if ($this->isMatch($src, $dst)) {
$updatedProxies[] = $dst;
}
}
} else {
$updatedProxies[] = $src;
}
if ($isFilter) continue;
}
if ($isFilter) continue;
$config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
if (empty($updatedProxies) && !empty($config['proxy-groups'][$k]['proxies'])) {
$updatedProxies = array_merge($updatedProxies, $proxies);
}
$config['proxy-groups'][$k]['proxies'] = $updatedProxies;
}
$config['proxy-groups'] = array_filter($config['proxy-groups'], function($group) {

24
app/Http/Controllers/Client/Protocols/ClashMeta.php Normal file → Executable file
View File

@ -53,20 +53,22 @@ class ClashMeta
$config['proxies'] = array_merge($config['proxies'] ? $config['proxies'] : [], $proxy);
foreach ($config['proxy-groups'] as $k => $v) {
if (!is_array($config['proxy-groups'][$k]['proxies'])) $config['proxy-groups'][$k]['proxies'] = [];
$isFilter = false;
foreach ($config['proxy-groups'][$k]['proxies'] as $src) {
foreach ($proxies as $dst) {
if (!$this->isRegex($src)) continue;
$isFilter = true;
$config['proxy-groups'][$k]['proxies'] = array_values(array_diff($config['proxy-groups'][$k]['proxies'], [$src]));
if ($this->isMatch($src, $dst)) {
array_push($config['proxy-groups'][$k]['proxies'], $dst);
$updatedProxies = [];
foreach ($config['proxy-groups'][$k]['proxies'] as $index => $src) {
if ($this->isRegex($src)) {
foreach ($proxies as $dst) {
if ($this->isMatch($src, $dst)) {
$updatedProxies[] = $dst;
}
}
} else {
$updatedProxies[] = $src;
}
if ($isFilter) continue;
}
if ($isFilter) continue;
$config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
if (empty($updatedProxies) && !empty($config['proxy-groups'][$k]['proxies'])) {
$updatedProxies = array_merge($updatedProxies, $proxies);
}
$config['proxy-groups'][$k]['proxies'] = $updatedProxies;
}
$config['proxy-groups'] = array_filter($config['proxy-groups'], function($group) {
return $group['proxies'];

26
app/Http/Controllers/Client/Protocols/Stash.php Normal file → Executable file
View File

@ -59,21 +59,23 @@ class Stash
$config['proxies'] = array_merge($config['proxies'] ? $config['proxies'] : [], $proxy);
foreach ($config['proxy-groups'] as $k => $v) {
if (!is_array($config['proxy-groups'][$k]['proxies'])) continue;
$isFilter = false;
foreach ($config['proxy-groups'][$k]['proxies'] as $src) {
foreach ($proxies as $dst) {
if (!$this->isRegex($src)) continue;
$isFilter = true;
$config['proxy-groups'][$k]['proxies'] = array_values(array_diff($config['proxy-groups'][$k]['proxies'], [$src]));
if ($this->isMatch($src, $dst)) {
array_push($config['proxy-groups'][$k]['proxies'], $dst);
if (!is_array($config['proxy-groups'][$k]['proxies'])) $config['proxy-groups'][$k]['proxies'] = [];
$updatedProxies = [];
foreach ($config['proxy-groups'][$k]['proxies'] as $index => $src) {
if ($this->isRegex($src)) {
foreach ($proxies as $dst) {
if ($this->isMatch($src, $dst)) {
$updatedProxies[] = $dst;
}
}
} else {
$updatedProxies[] = $src;
}
if ($isFilter) continue;
}
if ($isFilter) continue;
$config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
if (empty($updatedProxies) && !empty($config['proxy-groups'][$k]['proxies'])) {
$updatedProxies = array_merge($updatedProxies, $proxies);
}
$config['proxy-groups'][$k]['proxies'] = $updatedProxies;
}
$config['proxy-groups'] = array_filter($config['proxy-groups'], function($group) {
return $group['proxies'];