first commit
This commit is contained in:
@@ -24,20 +24,20 @@ namespace WapplerSystems\Meilisearch;
|
||||
* This copyright notice MUST APPEAR in all copies of the script!
|
||||
***************************************************************/
|
||||
|
||||
use MeiliSearch\Client;
|
||||
use TYPO3\CMS\Core\Utility\DebugUtility;
|
||||
use WapplerSystems\Meilisearch\Domain\Site\Site;
|
||||
use WapplerSystems\Meilisearch\Domain\Site\SiteRepository;
|
||||
use WapplerSystems\Meilisearch\System\Records\Pages\PagesRepository as PagesRepositoryAtExtSolr;
|
||||
use WapplerSystems\Meilisearch\System\Records\Pages\PagesRepository as PagesRepositoryAtExtMeilisearch;
|
||||
use WapplerSystems\Meilisearch\System\Records\SystemLanguage\SystemLanguageRepository;
|
||||
use WapplerSystems\Meilisearch\System\Solr\Node;
|
||||
use WapplerSystems\Meilisearch\System\Solr\SolrConnection;
|
||||
use WapplerSystems\Meilisearch\System\Meilisearch\MeilisearchConnection;
|
||||
use InvalidArgumentException;
|
||||
use TYPO3\CMS\Core\Registry;
|
||||
use TYPO3\CMS\Core\SingletonInterface;
|
||||
use TYPO3\CMS\Core\Utility\GeneralUtility;
|
||||
use function json_encode;
|
||||
|
||||
/**
|
||||
* ConnectionManager is responsible to create SolrConnection objects.
|
||||
* ConnectionManager is responsible to create MeilisearchConnection objects.
|
||||
*
|
||||
* @author Ingo Renner <ingo@typo3.org>
|
||||
*/
|
||||
@@ -55,9 +55,9 @@ class ConnectionManager implements SingletonInterface
|
||||
protected $systemLanguageRepository;
|
||||
|
||||
/**
|
||||
* @var PagesRepositoryAtExtSolr
|
||||
* @var PagesRepositoryAtExtMeilisearch
|
||||
*/
|
||||
protected $pagesRepositoryAtExtSolr;
|
||||
protected $pagesRepositoryAtExtMeilisearch;
|
||||
|
||||
/**
|
||||
* @var SiteRepository
|
||||
@@ -67,130 +67,130 @@ class ConnectionManager implements SingletonInterface
|
||||
|
||||
/**
|
||||
* @param SystemLanguageRepository $systemLanguageRepository
|
||||
* @param PagesRepositoryAtExtSolr|null $pagesRepositoryAtExtSolr
|
||||
* @param PagesRepositoryAtExtMeilisearch|null $pagesRepositoryAtExtMeilisearch
|
||||
* @param SiteRepository $siteRepository
|
||||
*/
|
||||
public function __construct(
|
||||
SystemLanguageRepository $systemLanguageRepository = null,
|
||||
PagesRepositoryAtExtSolr $pagesRepositoryAtExtSolr = null,
|
||||
PagesRepositoryAtExtMeilisearch $pagesRepositoryAtExtMeilisearch = null,
|
||||
SiteRepository $siteRepository = null
|
||||
)
|
||||
{
|
||||
$this->systemLanguageRepository = $systemLanguageRepository ?? GeneralUtility::makeInstance(SystemLanguageRepository::class);
|
||||
$this->siteRepository = $siteRepository ?? GeneralUtility::makeInstance(SiteRepository::class);
|
||||
$this->pagesRepositoryAtExtSolr = $pagesRepositoryAtExtSolr ?? GeneralUtility::makeInstance(PagesRepositoryAtExtSolr::class);
|
||||
$this->pagesRepositoryAtExtMeilisearch = $pagesRepositoryAtExtMeilisearch ?? GeneralUtility::makeInstance(PagesRepositoryAtExtMeilisearch::class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a solr connection for read and write endpoints
|
||||
* Creates a meilisearch connection for read and write endpoints
|
||||
*
|
||||
* @param array $readNodeConfiguration
|
||||
* @param array $writeNodeConfiguration
|
||||
* @return SolrConnection|object
|
||||
* @return MeilisearchConnection|object
|
||||
*/
|
||||
public function getSolrConnectionForNodes(array $readNodeConfiguration, array $writeNodeConfiguration)
|
||||
public function getMeilisearchConnectionForNodes(array $readNodeConfiguration, array $writeNodeConfiguration)
|
||||
{
|
||||
$connectionHash = md5(json_encode($readNodeConfiguration) . json_encode($writeNodeConfiguration));
|
||||
if (!isset(self::$connections[$connectionHash])) {
|
||||
$readNode = Node::fromArray($readNodeConfiguration);
|
||||
$writeNode = Node::fromArray($writeNodeConfiguration);
|
||||
self::$connections[$connectionHash] = GeneralUtility::makeInstance(SolrConnection::class, $readNode, $writeNode);
|
||||
$readNode = $this->createClientFromArray($readNodeConfiguration);
|
||||
$writeNode = $this->createClientFromArray($writeNodeConfiguration);
|
||||
self::$connections[$connectionHash] = GeneralUtility::makeInstance(MeilisearchConnection::class, $readNode, $writeNode);
|
||||
}
|
||||
return self::$connections[$connectionHash];
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a solr configuration from the configuration array and returns it.
|
||||
* Creates a meilisearch configuration from the configuration array and returns it.
|
||||
*
|
||||
* @param array $config The solr configuration array
|
||||
* @return SolrConnection
|
||||
* @param array $config The meilisearch configuration array
|
||||
* @return MeilisearchConnection
|
||||
*/
|
||||
public function getConnectionFromConfiguration(array $config)
|
||||
{
|
||||
if(empty($config['read']) && !empty($config['solrHost'])) {
|
||||
throw new InvalidArgumentException('Invalid registry data please re-initialize your solr connections');
|
||||
if(empty($config['read']) && !empty($config['meilisearchHost'])) {
|
||||
throw new InvalidArgumentException('Invalid registry data please re-initialize your meilisearch connections');
|
||||
}
|
||||
|
||||
return $this->getSolrConnectionForNodes($config['read'], $config['write']);
|
||||
return $this->getMeilisearchConnectionForNodes($config['read'], $config['write']);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a Solr connection for a page ID.
|
||||
* Gets a Meilisearch connection for a page ID.
|
||||
*
|
||||
* @param int $pageId A page ID.
|
||||
* @param int $language The language ID to get the connection for as the path may differ. Optional, defaults to 0.
|
||||
* @param string $mount Comma list of MountPoint parameters
|
||||
* @return SolrConnection A solr connection.
|
||||
* @throws NoSolrConnectionFoundException
|
||||
* @return MeilisearchConnection A meilisearch connection.
|
||||
* @throws NoMeilisearchConnectionFoundException
|
||||
*/
|
||||
public function getConnectionByPageId($pageId, $language = 0, $mount = '')
|
||||
{
|
||||
try {
|
||||
$site = $this->siteRepository->getSiteByPageId($pageId, $mount);
|
||||
$this->throwExceptionOnInvalidSite($site, 'No site for pageId ' . $pageId);
|
||||
$config = $site->getSolrConnectionConfiguration($language);
|
||||
$solrConnection = $this->getConnectionFromConfiguration($config);
|
||||
return $solrConnection;
|
||||
$config = $site->getMeilisearchConnectionConfiguration($language);
|
||||
$meilisearchConnection = $this->getConnectionFromConfiguration($config);
|
||||
return $meilisearchConnection;
|
||||
} catch(InvalidArgumentException $e) {
|
||||
$noSolrConnectionException = $this->buildNoConnectionExceptionForPageAndLanguage($pageId, $language);
|
||||
throw $noSolrConnectionException;
|
||||
$noMeilisearchConnectionException = $this->buildNoConnectionExceptionForPageAndLanguage($pageId, $language);
|
||||
throw $noMeilisearchConnectionException;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a Solr connection for a root page ID.
|
||||
* Gets a Meilisearch connection for a root page ID.
|
||||
*
|
||||
* @param int $pageId A root page ID.
|
||||
* @param int $language The language ID to get the connection for as the path may differ. Optional, defaults to 0.
|
||||
* @return SolrConnection A solr connection.
|
||||
* @throws NoSolrConnectionFoundException
|
||||
* @return MeilisearchConnection A meilisearch connection.
|
||||
* @throws NoMeilisearchConnectionFoundException
|
||||
*/
|
||||
public function getConnectionByRootPageId($pageId, $language = 0)
|
||||
{
|
||||
try {
|
||||
$site = $this->siteRepository->getSiteByRootPageId($pageId);
|
||||
$this->throwExceptionOnInvalidSite($site, 'No site for pageId ' . $pageId);
|
||||
$config = $site->getSolrConnectionConfiguration($language);
|
||||
$solrConnection = $this->getConnectionFromConfiguration($config);
|
||||
return $solrConnection;
|
||||
$config = $site->getMeilisearchConnectionConfiguration($language);
|
||||
$meilisearchConnection = $this->getConnectionFromConfiguration($config);
|
||||
return $meilisearchConnection;
|
||||
} catch (InvalidArgumentException $e) {
|
||||
/* @var NoSolrConnectionFoundException $noSolrConnectionException */
|
||||
$noSolrConnectionException = $this->buildNoConnectionExceptionForPageAndLanguage($pageId, $language);
|
||||
throw $noSolrConnectionException;
|
||||
/* @var NoMeilisearchConnectionFoundException $noMeilisearchConnectionException */
|
||||
$noMeilisearchConnectionException = $this->buildNoConnectionExceptionForPageAndLanguage($pageId, $language);
|
||||
throw $noMeilisearchConnectionException;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets all connections found.
|
||||
*
|
||||
* @return SolrConnection[] An array of initialized WapplerSystems\Meilisearch\System\Solr\SolrConnection connections
|
||||
* @throws NoSolrConnectionFoundException
|
||||
* @return MeilisearchConnection[] An array of initialized WapplerSystems\Meilisearch\System\Meilisearch\MeilisearchConnection connections
|
||||
* @throws NoMeilisearchConnectionFoundException
|
||||
*/
|
||||
public function getAllConnections()
|
||||
{
|
||||
$solrConnections = [];
|
||||
$meilisearchConnections = [];
|
||||
foreach ($this->siteRepository->getAvailableSites() as $site) {
|
||||
foreach ($site->getAllSolrConnectionConfigurations() as $solrConfiguration) {
|
||||
$solrConnections[] = $this->getConnectionFromConfiguration($solrConfiguration);
|
||||
foreach ($site->getAllMeilisearchConnectionConfigurations() as $meilisearchConfiguration) {
|
||||
$meilisearchConnections[] = $this->getConnectionFromConfiguration($meilisearchConfiguration);
|
||||
}
|
||||
}
|
||||
|
||||
return $solrConnections;
|
||||
return $meilisearchConnections;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets all connections configured for a given site.
|
||||
*
|
||||
* @param Site $site A TYPO3 site
|
||||
* @return SolrConnection[] An array of Solr connection objects (WapplerSystems\Meilisearch\System\Solr\SolrConnection)
|
||||
* @throws NoSolrConnectionFoundException
|
||||
* @return MeilisearchConnection[] An array of Meilisearch connection objects (WapplerSystems\Meilisearch\System\Meilisearch\MeilisearchConnection)
|
||||
* @throws NoMeilisearchConnectionFoundException
|
||||
*/
|
||||
public function getConnectionsBySite(Site $site)
|
||||
{
|
||||
$connections = [];
|
||||
|
||||
foreach ($site->getAllSolrConnectionConfigurations() as $languageId => $solrConnectionConfiguration) {
|
||||
$connections[$languageId] = $this->getConnectionFromConfiguration($solrConnectionConfiguration);
|
||||
foreach ($site->getAllMeilisearchConnectionConfigurations() as $languageId => $meilisearchConnectionConfiguration) {
|
||||
$connections[$languageId] = $this->getConnectionFromConfiguration($meilisearchConnectionConfiguration);
|
||||
}
|
||||
|
||||
return $connections;
|
||||
@@ -220,15 +220,15 @@ class ConnectionManager implements SingletonInterface
|
||||
/**
|
||||
* @param $pageId
|
||||
* @param $language
|
||||
* @return NoSolrConnectionFoundException
|
||||
* @return NoMeilisearchConnectionFoundException
|
||||
*/
|
||||
protected function buildNoConnectionExceptionForPageAndLanguage($pageId, $language): NoSolrConnectionFoundException
|
||||
protected function buildNoConnectionExceptionForPageAndLanguage($pageId, $language): NoMeilisearchConnectionFoundException
|
||||
{
|
||||
$message = 'Could not find a Solr connection for page [' . $pageId . '] and language [' . $language . '].';
|
||||
$noSolrConnectionException = $this->buildNoConnectionException($message);
|
||||
$message = 'Could not find a Meilisearch connection for page [' . $pageId . '] and language [' . $language . '].';
|
||||
$noMeilisearchConnectionException = $this->buildNoConnectionException($message);
|
||||
|
||||
$noSolrConnectionException->setLanguageId($language);
|
||||
return $noSolrConnectionException;
|
||||
$noMeilisearchConnectionException->setLanguageId($language);
|
||||
return $noMeilisearchConnectionException;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -236,7 +236,7 @@ class ConnectionManager implements SingletonInterface
|
||||
*
|
||||
* @param Site|null $site
|
||||
* @param $message
|
||||
* @throws NoSolrConnectionFoundException
|
||||
* @throws NoMeilisearchConnectionFoundException
|
||||
*/
|
||||
protected function throwExceptionOnInvalidSite(?Site $site, string $message)
|
||||
{
|
||||
@@ -248,20 +248,27 @@ class ConnectionManager implements SingletonInterface
|
||||
}
|
||||
|
||||
/**
|
||||
* Build a NoSolrConnectionFoundException with the passed message.
|
||||
* Build a NoMeilisearchConnectionFoundException with the passed message.
|
||||
* @param string $message
|
||||
* @return NoSolrConnectionFoundException
|
||||
* @return NoMeilisearchConnectionFoundException
|
||||
*/
|
||||
protected function buildNoConnectionException(string $message): NoSolrConnectionFoundException
|
||||
protected function buildNoConnectionException(string $message): NoMeilisearchConnectionFoundException
|
||||
{
|
||||
/* @var NoSolrConnectionFoundException $noSolrConnectionException */
|
||||
$noSolrConnectionException = GeneralUtility::makeInstance(
|
||||
NoSolrConnectionFoundException::class,
|
||||
/* @var NoMeilisearchConnectionFoundException $noMeilisearchConnectionException */
|
||||
$noMeilisearchConnectionException = GeneralUtility::makeInstance(
|
||||
NoMeilisearchConnectionFoundException::class,
|
||||
/** @scrutinizer ignore-type */
|
||||
$message,
|
||||
/** @scrutinizer ignore-type */
|
||||
1575396474
|
||||
);
|
||||
return $noSolrConnectionException;
|
||||
return $noMeilisearchConnectionException;
|
||||
}
|
||||
|
||||
|
||||
private function createClientFromArray(array $configuration) {
|
||||
return new Client(($configuration['scheme'] ?? 'http') . '://'.$configuration['host'].':'.$configuration['port'], $configuration['apiKey'] ?? null, new \TYPO3\CMS\Core\Http\Client(\TYPO3\CMS\Core\Http\Client\GuzzleClientFactory::getClient()));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user