anpleenko/iplist
1
0
Fork 0
mirror of https://github.com/rekryt/iplist.git synced 2026-02-26 01:08:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: optimize AbstractIPListController - method getSites()

Browse Source
This commit is contained in:
Rekryt
2026-01-18 16:22:29 +03:00
parent bbbc2b9701
commit 6616bee53d
6 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/App/Controller/AbstractIPListController.php
View File

@@ -45,7 +45,9 @@ abstract class AbstractIPListController extends AbstractController {
*/
protected function getSites(): array {
$wildcard = !!($this->request->getQueryParameter('wildcard') ?? '');
$exclude = [
$group = $this->request->getQueryParameterArray('group') ?? [];
$exclude = array_map(fn($arr) => array_fill_keys($arr, true), [
'group' => $this->request->getQueryParameterArray('exclude[group]') ?? [],
'site' => $this->request->getQueryParameterArray('exclude[site]') ?? [],
'domain' => $this->request->getQueryParameterArray('exclude[domain]') ?? [],
@@ -53,34 +55,36 @@ abstract class AbstractIPListController extends AbstractController {
'cidr4' => $this->request->getQueryParameterArray('exclude[cidr4]') ?? [],
'ip6' => $this->request->getQueryParameterArray('exclude[ip6]') ?? [],
'cidr6' => $this->request->getQueryParameterArray('exclude[cidr6]') ?? [],
];
$group = $this->request->getQueryParameterArray('group') ?? [];
return array_map(static function (Site $siteEntity) use ($wildcard, $exclude) {
]);
$sites = [];
foreach ($this->service->sites as $siteEntity) {
if (isset($exclude['site'][$siteEntity->name])) {
continue;
}
if (isset($exclude['group'][$siteEntity->group])) {
continue;
}
if ($group && !in_array($siteEntity->group, $group, true)) {
continue;
}
$site = clone $siteEntity;
$site->domains = array_values(
array_filter(
$siteEntity->getDomains($wildcard),
fn(string $domain) => !in_array($domain, $exclude['domain'])
fn(string $domain) => !isset($exclude['domain'][$domain])
)
);
$site->ip4 = array_values(array_filter($site->ip4, fn(string $ip) => !in_array($ip, $exclude['ip4'])));
$site->cidr4 = array_values(
array_filter($site->cidr4, fn(string $ip) => !in_array($ip, $exclude['cidr4']))
);
$site->ip6 = array_values(array_filter($site->ip6, fn(string $ip) => !in_array($ip, $exclude['ip6'])));
$site->cidr6 = array_values(
array_filter($site->cidr6, fn(string $ip) => !in_array($ip, $exclude['cidr6']))
);
$site->ip4 = array_values(array_filter($site->ip4, fn(string $ip) => !isset($exclude['ip4'][$ip])));
$site->cidr4 = array_values(array_filter($site->cidr4, fn(string $ip) => !isset($exclude['cidr4'][$ip])));
$site->ip6 = array_values(array_filter($site->ip6, fn(string $ip) => !isset($exclude['ip6'][$ip])));
$site->cidr6 = array_values(array_filter($site->cidr6, fn(string $ip) => !isset($exclude['cidr6'][$ip])));
return $site;
}, array_filter(
array_filter(
$this->service->sites,
fn(Site $siteEntity) => !in_array($siteEntity->name, $exclude['site']) &&
!in_array($siteEntity->group, $exclude['group'])
),
fn(Site $siteEntity) => count($group) === 0 || in_array($siteEntity->group, $group)
));
$sites[] = $site;
}
return $sites;
}
/**

5
src/App/Controller/AmneziaController.php
View File

@@ -18,12 +18,13 @@ class AmneziaController extends AbstractIPListController {
}
$response = [];
$sitesEntities = $this->getSites();
if (count($sites)) {
foreach ($sites as $site) {
$response = array_merge($response, $this->getSites()[$site]->$data);
$response = array_merge($response, $sitesEntities[$site]->$data ?? []);
}
} else {
foreach ($this->getSites() as $siteEntity) {
foreach ($sitesEntities as $siteEntity) {
$response = array_merge($response, $siteEntity->$data);
}
}

5
src/App/Controller/BatController.php
View File

@@ -25,12 +25,13 @@ class BatController extends AbstractIPListController {
}
$response = [];
$sitesEntities = $this->getSites();
if (count($sites)) {
foreach ($sites as $site) {
$response = array_merge($response, $this->getSites()[$site]->$data);
$response = array_merge($response, $sitesEntities[$site]->$data ?? []);
}
} else {
foreach ($this->getSites() as $siteEntity) {
foreach ($sitesEntities as $siteEntity) {
$response = array_merge($response, $siteEntity->$data);
}
}

5
src/App/Controller/PacController.php
View File

@@ -20,12 +20,13 @@ class PacController extends AbstractIPListController {
}
$items = [];
$sitesEntities = $this->getSites();
if (count($sites)) {
foreach ($sites as $site) {
$items = array_merge($items, $this->getSites()[$site]->$data);
$items = array_merge($items, $sitesEntities[$site]->$data);
}
} else {
foreach ($this->getSites() as $siteEntity) {
foreach ($sitesEntities as $siteEntity) {
$items = array_merge($items, $siteEntity->$data);
}
}

5
src/App/Controller/SwitchyController.php
View File

@@ -33,15 +33,16 @@ class SwitchyController extends AbstractIPListController {
];
$domains = [];
$sitesEntities = $this->getSites();
if (count($sites)) {
foreach ($sites as $site) {
$domains = array_merge(
$domains,
array_map($this->wildcardFormat(...), $this->getSites()[$site]->$data)
array_map($this->wildcardFormat(...), $sitesEntities[$site]->$data)
);
}
} else {
foreach ($this->getSites() as $siteEntity) {
foreach ($sitesEntities as $siteEntity) {
$domains = array_merge($domains, array_map($this->wildcardFormat(...), $siteEntity->$data));
}
}

5
src/App/Controller/TextController.php
View File

@@ -19,12 +19,13 @@ class TextController extends AbstractIPListController {
}
$response = [];
$sitesEntities = $this->getSites();
if (count($sites)) {
foreach ($sites as $site) {
$response = array_merge($response, $this->getSites()[$site]->$data ?? []);
$response = array_merge($response, $sitesEntities[$site]->$data ?? []);
}
} else {
foreach ($this->getSites() as $siteEntity) {
foreach ($sitesEntities as $siteEntity) {
$response = array_merge($response, $siteEntity->$data ?? []);
}
}