Nosial/socialbox-php
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Refactor peer resolution logic and add sync interval setting

Browse source
This commit is contained in:
netkas 2025-01-15 15:49:53 -05:00
parent ab03439e04
commit 9dd8c39ce1
4 changed files with 88 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Socialbox/Classes/Configuration.php
View file

@ -153,6 +153,10 @@
// answer within the time-frame that the captcha was generated
// If expired; client is expected to request for a new captcha which will generate a new random answer.
$config->setDefault('policies.image_captcha_expires', 300);
// The amount of time in seconds it takes before a peer's external address is resolved again
// When a peer's external address is resolved, it is cached for this amount of time before resolving again.
// This reduces the amount of times a resolution request is made to the external server.
$config->setDefault('policies.peer_sync_interval', 3600);
// Storage configuration
$config->setDefault('storage.path', '/etc/socialbox'); // The main path for file storage

12
src/Socialbox/Classes/Configuration/PoliciesConfiguration.php
View file

@ -7,12 +7,14 @@
private int $maxSigningKeys;
private int $sessionInactivityExpires;
private int $imageCaptchaExpires;
private int $peerSyncInterval;
public function __construct(array $data)
{
$this->maxSigningKeys = $data['max_signing_keys'];
$this->sessionInactivityExpires = $data['session_inactivity_expires'];
$this->imageCaptchaExpires = $data['image_captcha_expires'];
$this->peerSyncInterval = $data['peer_sync_interval'];
}
/**
@ -46,4 +48,14 @@
{
return $this->imageCaptchaExpires;
}
/**
* Returns the maximum amount of seconds before the external peer resolve cache is considered expired
*
* @return int
*/
public function getPeerSyncInterval(): int
{
return $this->peerSyncInterval;
}
}

26
src/Socialbox/Classes/StandardMethods/ResolvePeer.php
View file

@ -41,32 +41,10 @@
throw new StandardException('Peer Address Error: ' . $e->getMessage(), StandardError::RPC_INVALID_ARGUMENTS, $e);
}
// If the requested peer resides in the server, resolve the peer internally.
if($peerAddress->getDomain() === Configuration::getInstanceConfiguration()->getDomain())
{
try
{
$registeredPeer = RegisteredPeerManager::getPeerByAddress($peerAddress);
}
catch (DatabaseOperationException $e)
{
throw new StandardException('There was an unexpected error while trying to resolve the peer internally', StandardError::INTERNAL_SERVER_ERROR, $e);
}
// Return not found if the returned record is null or if the registered peer isn't enabled
if($registeredPeer === null || !$registeredPeer->isEnabled())
{
return $rpcRequest->produceError(StandardError::PEER_NOT_FOUND, sprintf('Peer %s not found', $peerAddress->getAddress()));
}
// Return standard peer representation
return $rpcRequest->produceResponse($registeredPeer->toStandardPeer());
}
// Otherwise, resolve the peer from the remote server
// Resolve the peer using the server's peer resolver, this will resolve both internal peers and external peers
try
{
return $rpcRequest->produceResponse(Socialbox::resolveExternalPeer($peerAddress));
return $rpcRequest->produceResponse(Socialbox::resolvePeer($peerAddress));
}
catch(Exception $e)
{

77
src/Socialbox/Socialbox.php
View file

@ -762,19 +762,82 @@
/**
* Resolves an external peer based on the given peer address or string identifier.
*
* @param PeerAddress|string $externalPeer The external peer address or string identifier to be resolved.
* @param PeerAddress|string $peer The external peer address or string identifier to be resolved.
* @return Peer The resolved external peer after synchronization.
*/
public static function resolveExternalPeer(PeerAddress|string $externalPeer): Peer
public static function resolvePeer(PeerAddress|string $peer): Peer
{
if($externalPeer instanceof PeerAddress)
if($peer instanceof PeerAddress)
{
$externalPeer = $externalPeer->getAddress();
$peer = $peer->getAddress();
}
$resolvedPeer = self::getExternalSession($externalPeer->getDomain())->resolvePeer($externalPeer);
self::synchronizeExternalPeer($resolvedPeer);
return $resolvedPeer;
try
{
$registeredPeer = RegisteredPeerManager::getPeerByAddress($peer);
}
catch (DatabaseOperationException $e)
{
throw new StandardException('There was an unexpected error while trying to resolve the peer internally', StandardError::INTERNAL_SERVER_ERROR, $e);
}
// Return not found if the peer was found but is disabled
if($registeredPeer !== null && !$registeredPeer->isEnabled())
{
throw new StandardException('The requested peer is disabled', StandardError::PEER_NOT_FOUND);
}
// If the peer was not found but the peer resides in an external server, resolve it
try
{
if($registeredPeer === null && $peer->getDomain() !== Configuration::getInstanceConfiguration()->getDomain())
{
try
{
$registeredPeer = self::getExternalSession($peer->getDomain())->resolvePeer($peer);
}
catch (DatabaseOperationException $e)
{
throw new StandardException('There was an unexpected error while trying to resolve the peer externally: ' . $e->getMessage(), StandardError::RESOLUTION_FAILED, $e);
}
// Synchronize the peer for future use
self::synchronizeExternalPeer($registeredPeer);
}
// If the peer was found and the peer does reside in an external server, re-resolve it if necessary
elseif($registeredPeer !== null && $peer->getDomain() !== Configuration::getInstanceConfiguration()->getDomain())
{
if($registeredPeer->getUpdated()->getTimestamp() < time() - Configuration::getPoliciesConfiguration()->getPeerSyncInterval())
{
try
{
$registeredPeer = self::getExternalSession($peer->getDomain())->resolvePeer($peer);
}
catch (DatabaseOperationException $e)
{
throw new StandardException('There was an unexpected error while trying to resolve the peer externally: ' . $e->getMessage(), StandardError::RESOLUTION_FAILED, $e);
}
// Synchronize the peer for future use
self::synchronizeExternalPeer($registeredPeer);
}
}
}
catch(StandardException $e)
{
throw $e;
}
catch(Exception $e)
{
throw new StandardException('Failed to resolve the peer: ' . $e->getMessage(), StandardError::RESOLUTION_FAILED, $e);
}
if($registeredPeer === null)
{
throw new StandardException('The requested peer was not found', StandardError::PEER_NOT_FOUND);
}
return $registeredPeer;
}
/**