Skip to content

Udp.Code.Synchronize with cloud #735

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

Open
alexander-b-clean wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Udp.Code.Synchronize with cloud #735

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e6e124
Udp.Code.Synchronize with cloud
datorik Sep 11, 2026
d8e756a
Udp.Code.Synchronize with cloud
datorik Sep 13, 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
89 changes: 51 additions & 38 deletions lib/CleantalkSP/SpbctWP/Sync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,22 @@ class Sync
'finalize' => 'Sync end...',
);

private const MODE_SYNC = 'sync';
private const MODE_BACKGROUND = 'background';

/**
* Seconds without step progress after which a synchronous sync is considered dead.
*/
private const SYNC_MODE_STALE_TIMEOUT = 300;

/**
* @return array<string, mixed>
*/
private static function getDefaultProgress()
{
return array(
'in_progress' => false,
'mode' => '',
'step_index' => 0,
'account_is_ok' => false,
'message' => '',
Expand Down Expand Up @@ -91,32 +100,18 @@ public static function formatStatus($progress)
*/
public static function run()
{
global $spbc;
// Sync mode turns queued background continuations and status polling into no-ops.
self::initializeProgress(self::MODE_SYNC);

$progress = self::getProgress();
if ( ! empty($progress['in_progress']) ) {
self::saveProgress(self::getDefaultProgress());
}

$account_is_ok = false;
do {
self::runCurrentStep();
$progress = self::getProgress();
} while ( ! empty($progress['in_progress']) );

self::stepAccessKeyCheck($account_is_ok);
self::stepSecfwUpdate($account_is_ok);
self::stepSignaturesUpdate();
self::stepSettingsExclusions();
self::stepAdjustEnv();
self::stepVulnerabilityCheck();
self::stepAnalysisLogUpdate($account_is_ok);
self::stepPscCacheWarm();

$out = array(
'success' => true,
'reload' => self::needsReloadPage($spbc),
return array(
'success' => ! empty($progress['success']),
'reload' => ! empty($progress['reload']),
);

self::stepFinalize();

return $out;
}

/**
Expand Down Expand Up @@ -193,12 +188,13 @@ public static function runCurrentStep()
self::stepPscCacheWarm();
break;
case 'finalize':
$reload = self::needsReloadPage($spbc);
self::stepFinalize();

$progress = self::getProgress();
$progress['in_progress'] = false;
$progress['success'] = true;
$progress['reload'] = self::needsReloadPage($spbc);
$progress['reload'] = $reload;
$progress['percent'] = 100;
$progress['message'] = self::STEPS['finalize'];
$progress['last_step_at'] = time();
Expand Down Expand Up @@ -241,6 +237,16 @@ public static function maybeResume()
return;
}

if ( $progress['mode'] === self::MODE_SYNC ) {
// Synchronous sync is running in another process. Take it over only if that process has died.
if ( time() - (int) $progress['last_step_at'] < self::SYNC_MODE_STALE_TIMEOUT ) {
return;
}

$progress['mode'] = self::MODE_BACKGROUND;
self::saveProgress($progress);
}

$steps = array_keys(self::STEPS);
if ( (int) $progress['step_index'] >= count($steps) ) {
return;
Expand Down Expand Up @@ -276,20 +282,7 @@ public static function startBackground()
return self::formatStatus(self::getProgress());
}

$steps = array_keys(self::STEPS);
$labels = self::STEPS;

$progress = array(
'in_progress' => true,
'step_index' => 0,
'account_is_ok' => false,
'message' => $labels[ $steps[0] ],
'percent' => 0,
'reload' => false,
'success' => false,
'last_step_at' => time(),
);
self::saveProgress($progress);
self::initializeProgress(self::MODE_BACKGROUND);

self::runCurrentStep();

Expand All @@ -301,11 +294,31 @@ public static function startBackground()
return self::formatStatus(self::getProgress());
}

/**
* Initialize progress for synchronous and background sync.
*
* @param string $mode self::MODE_SYNC or self::MODE_BACKGROUND
*/
private static function initializeProgress($mode)
{
$progress = self::getDefaultProgress();
$progress['in_progress'] = true;
$progress['mode'] = $mode;
$progress['message'] = self::STEPS['access_key_check'];
$progress['last_step_at'] = time();
self::saveProgress($progress);
}

/**
* Remote call handler: run the next sync step.
*/
public static function continueSync()
{
$progress = self::getProgress();
if ( $progress['mode'] === self::MODE_SYNC ) {
return;
}

self::runCurrentStep();

$progress = self::getProgress();
Expand Down
Loading