Skip to content

Upd. FW. Improve update flow. #711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
svfcode wants to merge 2 commits into
base: fix
Choose a base branch
from
Draft

Upd. FW. Improve update flow. #711

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21ea4d0
Upd. FW. Improve update flow.
svfcode Aug 12, 2026
66ee118
fix cp
svfcode Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 46 additions & 24 deletions lib/CleantalkSP/Common/RemoteCalls.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,17 @@ class RemoteCalls

const COOLDOWN = 10;

/**
* Timeout (seconds) for RC self-test requests.
* Keep low: expected response is immediate "OK".
*/
const TEST_REQUEST_TIMEOUT = 7;

/**
* How many times to attempt RC self-test before giving up.
*/
const TEST_REQUEST_ATTEMPTS = 3;

/**
* Checking if the current request is the Remote Call
*
Expand Down Expand Up @@ -211,40 +222,51 @@ public static function performTest($host, $params, $patterns = array())
{
// Delete async pattern to get the result in this process
$key = array_search('async', $patterns, true);
if ($key) {
if ($key !== false) {
unset($patterns[$key]);
}

// Adding test flag
$params = array_merge($params, array('test' => 'test'));

// Perform test request
$http = new \CleantalkSP\Common\HTTP\Request();
$result = $http
->setUrl($host)
->setData($params)
->setPresets($patterns)
->request();

$error_template = 'WRONG_SITE_RESPONSE TEST_ACTION FOR RC %s, ERROR: %s';
$error = null;

for ($attempt = 1; $attempt <= self::TEST_REQUEST_ATTEMPTS; $attempt++) {
$error = null;

$http = new \CleantalkSP\Common\HTTP\Request();
$options = defined('CURLOPT_TIMEOUT')
? array(CURLOPT_TIMEOUT => self::TEST_REQUEST_TIMEOUT)
: array('timeout' => self::TEST_REQUEST_TIMEOUT);
$result = $http
->setUrl($host)
->setData($params)
->setPresets($patterns)
// Prefer CURLOPT_* int keys: string 'timeout' is left in options by Request
// converter and breaks curl_setopt_array() on PHP 8+. Fallback to string
// name only when cURL constants are unavailable (no cURL extension).
->setOptions($options)
->request();

// Considering empty response as error
if ($result === '') {
$error = sprintf($error_template, $params['spbc_remote_call_action'], 'EMPTY RESPONSE');
// Wrap and pass error
} elseif (is_array($result) && ! empty($result['error'])) {
$error = sprintf($error_template, $params['spbc_remote_call_action'], $result['error']);
// Expects 'OK' string as good response otherwise - error
} elseif (is_string($result) && ! preg_match('@^.*?OK$@', $result)) {
$unexpected_response = 'UNEXPECTED RESPONSE: "' . json_encode(substr($result, 0, 400)) . '"';
$error = sprintf($error_template, $params['spbc_remote_call_action'], $unexpected_response);
Comment thread
svfcode marked this conversation as resolved.
}

// Considering empty response as error
if ($result === '') {
$error = sprintf($error_template, $params['spbc_remote_call_action'], 'EMPTY RESPONSE');
// Wrap and pass error
} elseif (! empty($result['error'])) {
$error = sprintf($error_template, $params['spbc_remote_call_action'], $result['error']);
// Expects 'OK' string as good response otherwise - error
} elseif (is_string($result) && ! preg_match('@^.*?OK$@', $result)) {
$unexpected_response = 'UNEXPECTED RESPONSE: "' . json_encode(substr($result, 0, 400)) . '"';
$error = sprintf($error_template, $params['spbc_remote_call_action'], $unexpected_response);
}

if (!empty($error)) {
$result = array('error' => $error);
if ($error === null) {
return $result;
}
}

return $result;
return array('error' => $error);
}

/**
Expand Down