Nosial/ncc
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases 11 Packages Wiki Activity Actions

Updated PackagistRepository.php to use RuntimeCache for http requests

Browse source
This commit is contained in:
Netkas 2023-10-03 19:25:13 -04:00
parent 63411d7d65
commit d5e28d1f45
No known key found for this signature in database
GPG key ID: 5DAF58535614062B
1 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/ncc/Classes/PackagistExtension/PackagistRepository.php
View file

@ -38,6 +38,7 @@
use ncc\ThirdParty\composer\Semver\Comparator; use ncc\ThirdParty\composer\Semver\Comparator;
use ncc\ThirdParty\composer\Semver\Semver; use ncc\ThirdParty\composer\Semver\Semver;
use ncc\Utilities\Console; use ncc\Utilities\Console;
use ncc\Utilities\RuntimeCache;
use RuntimeException; use RuntimeException;
class PackagistRepository implements RepositoryInterface class PackagistRepository implements RepositoryInterface
@ -54,6 +55,12 @@
$version = self::resolveVersion($repository, $vendor, $project, $version); $version = self::resolveVersion($repository, $vendor, $project, $version);
$endpoint = sprintf('%s://%s/packages/%s/%s.json', ($repository->isSsl() ? 'https' : 'http'), $repository->getHost(), rawurlencode($vendor), rawurlencode($project)); $endpoint = sprintf('%s://%s/packages/%s/%s.json', ($repository->isSsl() ? 'https' : 'http'), $repository->getHost(), rawurlencode($vendor), rawurlencode($project));
if(RuntimeCache::exists($endpoint))
{
return RuntimeCache::get($endpoint);
}
Console::outDebug(sprintf('Fetching archive %s/%s version %s from %s', $vendor, $project, $version, $endpoint)); Console::outDebug(sprintf('Fetching archive %s/%s version %s from %s', $vendor, $project, $version, $endpoint));
$curl = curl_init($endpoint); $curl = curl_init($endpoint);
@ -62,9 +69,11 @@
'User-Agent: ncc' 'User-Agent: ncc'
]; ];
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt_array($curl, [
curl_setopt($curl, CURLOPT_CUSTOMREQUEST, HttpRequestType::GET); CURLOPT_RETURNTRANSFER => true,
curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); CURLOPT_CUSTOMREQUEST => HttpRequestType::GET,
CURLOPT_HTTPHEADER => $headers
]);
$response = self::processHttpResponse($curl, $vendor, $project); $response = self::processHttpResponse($curl, $vendor, $project);
@ -78,7 +87,10 @@
throw new NetworkException(sprintf('Invalid response from %s/%s, version %s does not have a dist URL', $vendor, $project, $version)); throw new NetworkException(sprintf('Invalid response from %s/%s, version %s does not have a dist URL', $vendor, $project, $version));
} }
return new RepositoryResult($response['package']['versions'][$version]['dist']['url'], RepositoryResultType::SOURCE, $version); $result = new RepositoryResult($response['package']['versions'][$version]['dist']['url'], RepositoryResultType::SOURCE, $version);
RuntimeCache::set($endpoint, $result);
return $result;
} }
/** /**
@ -104,6 +116,12 @@
private static function getVersions(RepositoryConfiguration $repository, string $vendor, string $project): array private static function getVersions(RepositoryConfiguration $repository, string $vendor, string $project): array
{ {
$endpoint = sprintf('%s://%s/packages/%s/%s.json', ($repository->isSsl() ? 'https' : 'http'), $repository->getHost(), rawurlencode($vendor), rawurlencode($project)); $endpoint = sprintf('%s://%s/packages/%s/%s.json', ($repository->isSsl() ? 'https' : 'http'), $repository->getHost(), rawurlencode($vendor), rawurlencode($project));
if(RuntimeCache::exists($endpoint))
{
return RuntimeCache::get($endpoint);
}
$curl = curl_init($endpoint); $curl = curl_init($endpoint);
$headers = [ $headers = [
'Accept: application/json', 'Accept: application/json',
@ -112,9 +130,11 @@
Console::outDebug(sprintf('Fetching %s/%s versions from %s', $vendor, $project, $endpoint)); Console::outDebug(sprintf('Fetching %s/%s versions from %s', $vendor, $project, $endpoint));
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt_array($curl, [
curl_setopt($curl, CURLOPT_CUSTOMREQUEST, HttpRequestType::GET); CURLOPT_RETURNTRANSFER => true,
curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); CURLOPT_CUSTOMREQUEST => HttpRequestType::GET,
CURLOPT_HTTPHEADER => $headers
]);
$response = self::processHttpResponse($curl, $vendor, $project); $response = self::processHttpResponse($curl, $vendor, $project);
@ -123,7 +143,10 @@
throw new NetworkException(sprintf('Invalid response from %s/%s, missing "package.versions" key', $vendor, $project)); throw new NetworkException(sprintf('Invalid response from %s/%s, missing "package.versions" key', $vendor, $project));
} }
return array_keys($response['package']['versions']); $result = array_keys($response['package']['versions']);
RuntimeCache::set($endpoint, $result);
return $result;
} }
/** /**