anpleenko/iplist
1
0
Fork 0
mirror of https://github.com/rekryt/iplist.git synced 2025-10-13 08:59:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: optimize cidr processing

Browse Source
This commit is contained in:
Rekryt
2024-10-29 16:57:31 +03:00
parent 0dd2a3681b
commit 2367d4a1d0
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Domain/Helper/IP4Helper.php
View File

@@ -16,15 +16,18 @@ class IP4Helper {
continue; continue;
} }
async(function () use ($ip, $i, $count, &$results) { async(function () use ($ip, $i, $count, &$results) {
if (self::isInRange($ip, $results)) {
return;
}
if (CIDRStorage::getInstance()->has($ip)) { if (CIDRStorage::getInstance()->has($ip)) {
$searchArray = CIDRStorage::getInstance()->get($ip); $searchArray = CIDRStorage::getInstance()->get($ip);
$results = array_merge($results, self::trimCIDRs($searchArray)); $results = array_merge($results, self::trimCIDRs($searchArray));
App::getLogger()->debug($ip . ' -> ' . json_encode($searchArray), [$i + 1 . '/' . $count]); App::getLogger()->debug($ip . ' -> ' . json_encode($searchArray), [
return; $i + 1 . '/' . $count,
} 'from cache',
]);
if (self::isInRange($ip, $results)) {
return; return;
} }
@@ -72,7 +75,7 @@ class IP4Helper {
CIDRStorage::getInstance()->set($ip, $searchArray); CIDRStorage::getInstance()->set($ip, $searchArray);
$results = array_merge($results, self::trimCIDRs($searchArray)); $results = array_merge($results, self::trimCIDRs($searchArray));
App::getLogger()->debug($ip . ' -> ' . json_encode($searchArray), [$i + 1 . '/' . $count]); App::getLogger()->debug($ip . ' -> ' . json_encode($searchArray), [$i + 1 . '/' . $count, 'found']);
} else { } else {
App::getLogger()->error($ip . ' -> CIDR not found', [$i + 1 . '/' . $count]); App::getLogger()->error($ip . ' -> CIDR not found', [$i + 1 . '/' . $count]);
} }

15
src/Domain/Helper/IP6Helper.php
View File

@@ -16,15 +16,18 @@ class IP6Helper {
continue; continue;
} }
async(function () use ($ip, $i, $count, &$results) { async(function () use ($ip, $i, $count, &$results) {
if (self::isInRange($ip, $results)) {
return;
}
if (CIDRStorage::getInstance()->has($ip)) { if (CIDRStorage::getInstance()->has($ip)) {
$searchArray = CIDRStorage::getInstance()->get($ip); $searchArray = CIDRStorage::getInstance()->get($ip);
$results = array_merge($results, self::trimCIDRs($searchArray)); $results = array_merge($results, self::trimCIDRs($searchArray));
App::getLogger()->debug($ip . ' -> ' . json_encode($searchArray), [$i + 1 . '/' . $count]); App::getLogger()->debug($ip . ' -> ' . json_encode($searchArray), [
return; $i + 1 . '/' . $count,
} 'from cache',
]);
if (self::isInRange($ip, $results)) {
return; return;
} }
@@ -72,7 +75,7 @@ class IP6Helper {
CIDRStorage::getInstance()->set($ip, $searchArray); CIDRStorage::getInstance()->set($ip, $searchArray);
$results = array_merge($results, self::trimCIDRs($searchArray)); $results = array_merge($results, self::trimCIDRs($searchArray));
App::getLogger()->debug($ip . ' -> ' . json_encode($searchArray), [$i + 1 . '/' . $count]); App::getLogger()->debug($ip . ' -> ' . json_encode($searchArray), [$i + 1 . '/' . $count, 'found']);
} else { } else {
App::getLogger()->error($ip . ' -> CIDR not found', [$i + 1 . '/' . $count]); App::getLogger()->error($ip . ' -> CIDR not found', [$i + 1 . '/' . $count]);
} }