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

Enhance RPC client logging and error handling for server information retrieval
Some checks failed
CI / check-phpdoc (push) Has been cancelled
Details
CI / release (push) Has been cancelled
Details
CI / debug (push) Has been cancelled
Details
CI / release_executable (push) Has been cancelled
Details
CI / debug_executable (push) Has been cancelled
Details
CI / check-phpunit (push) Has been cancelled
Details
CI / generate-phpdoc (push) Has been cancelled
Details
CI / test (push) Has been cancelled
Details
CI / release-documentation (push) Has been cancelled
Details
CI / release-artifacts (push) Has been cancelled
Details

Browse source
This commit is contained in:
netkas 2025-04-03 17:48:03 -04:00
parent 7ba33f215c
commit 48778c4dbc
Signed by: netkas
GPG key ID: 4D8629441B76E4CC
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/Socialbox/Classes/RpcClient.php
View file

@ -414,10 +414,12 @@
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
curl_setopt($ch, CURLOPT_POSTFIELDS, $encryptedData); curl_setopt($ch, CURLOPT_POSTFIELDS, $encryptedData);
$this->logger->debug(sprintf('Sending RPC request to %s', $this->rpcEndpoint)); $this->logger->debug(sprintf('Request Endpoint: %s', $this->rpcEndpoint));
$this->logger->debug(sprintf('Headers: %s', json_encode($headers))); $this->logger->debug(sprintf('Request Headers: %s', json_encode($headers)));
$this->logger->debug(sprintf('Encrypted Data Size: %d', strlen($encryptedData))); $this->logger->debug(sprintf('Request Size: %d bytes', strlen($encryptedData)));
$this->logger->debug(sprintf('Request Signature: %s', $signature)); $this->logger->debug(sprintf('Request Signature: %s', $signature));
$this->logger->debug(sprintf('Request Data: %s', $jsonData));
$response = curl_exec($ch); $response = curl_exec($ch);
@ -454,7 +456,7 @@
} }
curl_close($ch); curl_close($ch);
$this->logger->debug(sprintf('Encrypted Response Size: %d', strlen($responseString))); $this->logger->debug(sprintf('Response Size: %d bytes', strlen($responseString)));
try try
{ {
@ -463,7 +465,7 @@
encryptionKey: $this->clientTransportEncryptionKey, encryptionKey: $this->clientTransportEncryptionKey,
algorithm: $this->serverInformation->getTransportEncryptionAlgorithm() algorithm: $this->serverInformation->getTransportEncryptionAlgorithm()
); );
$this->logger->debug(sprintf('Decrypted Response: %s', $decryptedResponse)); $this->logger->debug(sprintf('Response Data: %s', $decryptedResponse));
} }
catch (CryptographyException $e) catch (CryptographyException $e)
{ {
@ -532,14 +534,14 @@
$this->logger->debug(sprintf('Getting server information from %s', $this->rpcEndpoint)); $this->logger->debug(sprintf('Getting server information from %s', $this->rpcEndpoint));
$this->logger->debug(sprintf('Headers: %s', json_encode($headers))); $this->logger->debug(sprintf('Headers: %s', json_encode($headers)));
$response = curl_exec($ch); $response = curl_exec($ch);
$responseCode = curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
if($response === false) if($response === false)
{ {
curl_close($ch); curl_close($ch);
throw new RpcException(sprintf('Failed to get server information at %s, no response received', $this->rpcEndpoint)); throw new RpcException(sprintf('Failed to get server information at %s with response code %d, no response received', $this->rpcEndpoint, $responseCodet));
} }
$responseCode = curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
if($responseCode !== 200) if($responseCode !== 200)
{ {
curl_close($ch); curl_close($ch);
@ -551,7 +553,18 @@
} }
curl_close($ch); curl_close($ch);
return ServerInformation::fromArray(json_decode($response, true)); if(empty($response))
{
throw new RpcException(sprintf('Failed to get server information at %s with response code %d, server returned an empty response', $this->rpcEndpoint, $responseCode));
}
$decodedResponse = json_decode($response, true);
if(!is_array($decodedResponse))
{
throw new RpcException(sprintf('Failed to get server information at %s with response code %d, server did not return a valid response', $this->rpcEndpoint, $responseCode));
}
return ServerInformation::fromArray($decodedResponse);
} }
/** /**