feat(admin): Prüfroute je Profil und Reiter „Compatibility“
Die generische CheckRoute (POST lit-mcp/v1/<id>-check, für Divi weiter /divi-check) ersetzt DiviCheckRoute: Lock je Profil mit Besitzer-Token, Bericht je Profil, Rücksprung auf den neuen Reiter und Hook lit_mcp_compat_changed (Divi lädt darauf seinen Freigabe-Status neu). Der Reiter „Compatibility“ zeigt je Plugin Zustand (Wort und Icon), Hinweis zur Stufe, Fähigkeiten, getestete und freigegebene Versionen und den letzten Bericht, mit Prüfen, Freigeben und Zurückziehen (Recht manage_options, Allowlist der Profil-ID, Nonce je Profil). Freigeben serverseitig nur mit frischem grünem Bericht. Der Load-Hook lit_mcp_compat_profile_load bereitet den Abbau des DiviTab vor, der bis dahin parallel läuft. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Jan-Niclas Loosen
co-authored by
Claude Opus 5.5
Claude Opus 5.5
parent
7d6a97a54e
commit
85f4138b36
@@ -32,10 +32,14 @@ final class AdminPostAction
|
||||
}
|
||||
}
|
||||
|
||||
/** Redirects to settings tab $slug with "lit_mcp_notice" = $notice and ends the request. */
|
||||
public function redirect(string $slug, string $notice): void
|
||||
/**
|
||||
* Redirects to settings tab $slug with "lit_mcp_notice" = $notice (and further query $args) and ends the request.
|
||||
*
|
||||
* @param array<string, string> $args
|
||||
*/
|
||||
public function redirect(string $slug, string $notice, array $args = []): void
|
||||
{
|
||||
wp_safe_redirect(SettingsPage::url($slug, ['lit_mcp_notice' => $notice]));
|
||||
wp_safe_redirect(SettingsPage::url($slug, ['lit_mcp_notice' => $notice] + $args));
|
||||
($this->terminate)();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,184 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace LIT\MCP\Admin;
|
||||
|
||||
use Closure;
|
||||
use LIT\MCP\Compatibility\CheckReport;
|
||||
use LIT\MCP\Compatibility\CheckReportStore;
|
||||
use LIT\MCP\Compatibility\Compatibility;
|
||||
use LIT\MCP\Compatibility\Profile;
|
||||
use LIT\MCP\Log;
|
||||
use Throwable;
|
||||
use WP_REST_Response;
|
||||
|
||||
defined('ABSPATH') || exit;
|
||||
|
||||
/**
|
||||
* "Prüfung starten" of the tab "Compatibility" (spec §6.1): POST /wp-json/lit-mcp/v1/<profile>-check, one route per
|
||||
* profile. A REST request on purpose – not admin-post – so the check runs in the same context as MCP calls (Divi
|
||||
* renders its blocks in REST requests, lit-page-render-summary). The form sends the wp_rest nonce as _wpnonce
|
||||
* (cookie authentication); only manage_options. The profile comes from the route, which exists only for the
|
||||
* profiles of Compatibility; handle() looks the ID up again, so an ID never reaches an option name unchecked.
|
||||
* One check per profile at a time: an atomic "INSERT IGNORE" on the options table (lit_mcp_<id>_check_lock) is the
|
||||
* lock – add_option() reads then writes (wp-includes/option.php) and is not atomic, so two simultaneous requests
|
||||
* could both "acquire" it. The value is "<time>:<token>". A lock older than LOCK_TTL is a dead
|
||||
* check's, taken over with a conditional UPDATE (compare-and-swap on the value just read) so only one of several
|
||||
* concurrent takers wins; the end of a check deletes the row only while it still holds its own token, so a check
|
||||
* that outlived its lock does not free the taker's. A check that throws still releases the lock (finally) and
|
||||
* redirects with compat_check_failed (logged, not an unhandled 500).
|
||||
* Always answers 303 back to the tab "Compatibility" – every check, whatever the profile, lands there – and
|
||||
* announces a stored report with the action lit_mcp_compat_changed($id); a listener that throws is logged and does
|
||||
* not change the answer.
|
||||
*/
|
||||
final class CheckRoute
|
||||
{
|
||||
public const NAMESPACE = 'lit-mcp/v1';
|
||||
public const CHANGED_ACTION = 'lit_mcp_compat_changed';
|
||||
|
||||
private const LOCK_TTL = 600;
|
||||
|
||||
/** @var Closure(Profile, int): CheckReport */
|
||||
private Closure $check;
|
||||
/** @var Closure(Profile): CheckReportStore */
|
||||
private Closure $reports;
|
||||
|
||||
/**
|
||||
* @param (Closure(Profile, int): CheckReport)|null $check Default: Compatibility::check().
|
||||
* @param (Closure(Profile): CheckReportStore)|null $reports Default: CheckReportStore::forProfile().
|
||||
*/
|
||||
public function __construct(private Compatibility $compatibility, ?Closure $check = null, ?Closure $reports = null)
|
||||
{
|
||||
$this->check = $check ?? $compatibility->check(...);
|
||||
$this->reports = $reports ?? CheckReportStore::forProfile(...);
|
||||
}
|
||||
|
||||
public function register(): void
|
||||
{
|
||||
add_action('rest_api_init', [$this, 'registerRoutes']);
|
||||
}
|
||||
|
||||
public function registerRoutes(): void
|
||||
{
|
||||
foreach ($this->compatibility->profiles() as $profile) {
|
||||
register_rest_route(self::NAMESPACE, self::route($profile->id), [
|
||||
'methods' => 'POST',
|
||||
'callback' => fn (): WP_REST_Response => $this->handle($profile->id),
|
||||
'permission_callback' => static fn (): bool => current_user_can('manage_options'),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
/** The URL of the profile's route; the caller passes an ID of a known profile. */
|
||||
public static function url(string $profileId): string
|
||||
{
|
||||
return rest_url(self::NAMESPACE . self::route($profileId));
|
||||
}
|
||||
|
||||
public function handle(string $profileId): WP_REST_Response
|
||||
{
|
||||
$profile = $this->compatibility->profile($profileId);
|
||||
if ($profile === null) {
|
||||
return new WP_REST_Response(null, 404);
|
||||
}
|
||||
|
||||
$notice = 'compat_check_running';
|
||||
$token = self::lock($profile->id);
|
||||
if ($token !== null) {
|
||||
try {
|
||||
($this->reports)($profile)->save(($this->check)($profile, get_current_user_id()));
|
||||
$notice = 'compat_checked';
|
||||
} catch (Throwable $e) {
|
||||
Log::failure($profile->id . ' check', $e);
|
||||
$notice = 'compat_check_failed';
|
||||
} finally {
|
||||
self::release($profile->id, $token);
|
||||
}
|
||||
if ($notice === 'compat_checked') {
|
||||
// The report is stored: a listener that throws is logged, it does not turn the success into a 500.
|
||||
try {
|
||||
do_action(self::CHANGED_ACTION, $profile->id);
|
||||
} catch (Throwable $e) {
|
||||
Log::failure($profile->id . ' ' . self::CHANGED_ACTION, $e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return new WP_REST_Response(
|
||||
null,
|
||||
303,
|
||||
['Location' => SettingsPage::url(
|
||||
CompatibilityTab::SLUG,
|
||||
['lit_mcp_notice' => $notice, 'lit_mcp_profile' => $profile->id]
|
||||
)]
|
||||
);
|
||||
}
|
||||
|
||||
private static function route(string $profileId): string
|
||||
{
|
||||
return '/' . $profileId . '-check';
|
||||
}
|
||||
|
||||
private static function lockOption(string $profileId): string
|
||||
{
|
||||
return 'lit_mcp_' . $profileId . '_check_lock';
|
||||
}
|
||||
|
||||
/** @return string|null The lock value "<time>:<token>" now held by this request (its owner token), null = busy. */
|
||||
private static function lock(string $profileId): ?string
|
||||
{
|
||||
global $wpdb;
|
||||
|
||||
$value = time() . ':' . bin2hex(random_bytes(4));
|
||||
if (self::insertLock($wpdb, $profileId, $value)) {
|
||||
return $value;
|
||||
}
|
||||
|
||||
// get_var(), not get_option(): the row was written with raw SQL, bypassing the options cache.
|
||||
$since = $wpdb->get_var($wpdb->prepare(
|
||||
"SELECT option_value FROM {$wpdb->options} WHERE option_name = %s",
|
||||
self::lockOption($profileId)
|
||||
));
|
||||
if ($since === null) {
|
||||
// The lock was released between our failed insert and this read; try once more.
|
||||
return self::insertLock($wpdb, $profileId, $value) ? $value : null;
|
||||
}
|
||||
if (time() - (int) $since < self::LOCK_TTL) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$taken = $wpdb->query($wpdb->prepare(
|
||||
"UPDATE {$wpdb->options} SET option_value = %s WHERE option_name = %s AND option_value = %s",
|
||||
$value,
|
||||
self::lockOption($profileId),
|
||||
$since
|
||||
));
|
||||
|
||||
return (int) $taken === 1 ? $value : null;
|
||||
}
|
||||
|
||||
/** Compare-and-delete: a check that outlived its lock (taken over meanwhile) must not free the taker's. */
|
||||
private static function release(string $profileId, string $token): void
|
||||
{
|
||||
global $wpdb;
|
||||
|
||||
$wpdb->query($wpdb->prepare(
|
||||
"DELETE FROM {$wpdb->options} WHERE option_name = %s AND option_value = %s",
|
||||
self::lockOption($profileId),
|
||||
$token
|
||||
));
|
||||
}
|
||||
|
||||
/** INSERT IGNORE: 1 row affected = the lock did not exist and is now ours; 0 = someone else holds it. */
|
||||
private static function insertLock(\wpdb $wpdb, string $profileId, string $value): bool
|
||||
{
|
||||
$inserted = $wpdb->query($wpdb->prepare(
|
||||
"INSERT IGNORE INTO {$wpdb->options} (option_name, option_value, autoload) VALUES (%s, %s, 'no')",
|
||||
self::lockOption($profileId),
|
||||
$value
|
||||
));
|
||||
|
||||
return (int) $inserted === 1;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,474 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace LIT\MCP\Admin;
|
||||
|
||||
use Closure;
|
||||
use LIT\MCP\ChangeLog\ChangeLog;
|
||||
use LIT\MCP\Compatibility\CheckReport;
|
||||
use LIT\MCP\Compatibility\CheckReportStore;
|
||||
use LIT\MCP\Compatibility\Compatibility;
|
||||
use LIT\MCP\Compatibility\CompatibilityMatrix;
|
||||
use LIT\MCP\Compatibility\Profile;
|
||||
use LIT\MCP\Compatibility\ReleaseState;
|
||||
use LIT\MCP\Compatibility\ReleaseStore;
|
||||
use LIT\MCP\Compatibility\Tier;
|
||||
use LIT\MCP\Plugin;
|
||||
|
||||
defined('ABSPATH') || exit;
|
||||
|
||||
/**
|
||||
* Tab "Compatibility": one section per third-party plugin of Compatibility::profiles() – its version, overall state
|
||||
* (word and icon, never colour alone), what the tier means for a release, the capabilities, tested and released
|
||||
* versions, the latest check report and "Prüfung starten" (Admin\CheckRoute). A profile that is not active is one
|
||||
* line and never asks for its matrix. Everything that comes from a third-party plugin (version, problem texts, step
|
||||
* labels) is escaped on output. The action lit_mcp_compat_profile_extra($id) closes a section: profiles add their
|
||||
* own notes there; the action lit_mcp_compat_profile_load($id) (see loadProfiles()) runs before any output.
|
||||
*/
|
||||
final class CompatibilityTab implements AdminTab
|
||||
{
|
||||
public const SLUG = 'compatibility';
|
||||
public const EXTRA_ACTION = 'lit_mcp_compat_profile_extra';
|
||||
public const LOAD_ACTION = 'lit_mcp_compat_profile_load';
|
||||
/** admin-post actions; the nonce action of a request is the action plus "_<profile ID>". */
|
||||
public const RELEASE_ACTION = 'lit_mcp_compat_release';
|
||||
public const WITHDRAW_ACTION = 'lit_mcp_compat_withdraw';
|
||||
|
||||
/** @var Closure(Profile): CheckReportStore */
|
||||
private Closure $reports;
|
||||
/** @var Closure(Profile): ReleaseStore */
|
||||
private Closure $releases;
|
||||
|
||||
/**
|
||||
* @param (Closure(Profile): CheckReportStore)|null $reports Default: CheckReportStore::forProfile().
|
||||
* @param (Closure(Profile): ReleaseStore)|null $releases Default: ReleaseStore::forProfile().
|
||||
*/
|
||||
public function __construct(
|
||||
private Compatibility $compatibility,
|
||||
private ?ChangeLog $log = null,
|
||||
private ?AdminPostAction $action = null,
|
||||
?Closure $reports = null,
|
||||
?Closure $releases = null
|
||||
) {
|
||||
$this->reports = $reports ?? CheckReportStore::forProfile(...);
|
||||
$this->releases = $releases ?? ReleaseStore::forProfile(...);
|
||||
}
|
||||
|
||||
public function slug(): string
|
||||
{
|
||||
return self::SLUG;
|
||||
}
|
||||
|
||||
public function label(): string
|
||||
{
|
||||
return __('Compatibility', 'wp-lit-mcp');
|
||||
}
|
||||
|
||||
public function registerSettings(): void
|
||||
{
|
||||
}
|
||||
|
||||
public function registerActions(): void
|
||||
{
|
||||
add_action('admin_post_' . self::RELEASE_ACTION, [$this, 'release']);
|
||||
add_action('admin_post_' . self::WITHDRAW_ACTION, [$this, 'withdraw']);
|
||||
add_action('load-' . SettingsPage::SCREEN_HOOK, [$this, 'loadProfiles']);
|
||||
}
|
||||
|
||||
/**
|
||||
* load-<page> of the settings page, before any output: on this tab and for manage_options announces each profile
|
||||
* with lit_mcp_compat_profile_load($id), so a profile can do its housekeeping (and prepare a notice for
|
||||
* its extra section) before render(). Nothing else is needed from the AdminTab contract: a tab hooks load-<page>
|
||||
* itself in registerActions(), which SettingsPage already calls for every tab.
|
||||
*/
|
||||
public function loadProfiles(): void
|
||||
{
|
||||
// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- read-only tab switch.
|
||||
$tab = is_string($_GET['tab'] ?? null) ? sanitize_key(wp_unslash($_GET['tab'])) : '';
|
||||
if ($tab !== self::SLUG || ! current_user_can('manage_options')) {
|
||||
return;
|
||||
}
|
||||
|
||||
foreach ($this->compatibility->profiles() as $profile) {
|
||||
do_action(self::LOAD_ACTION, $profile->id);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Releases the installed version of the posted profile: only as offered by the tab (see releasable()) and only
|
||||
* after a fresh green report. The profile ID is looked up in Compatibility first (nothing else reaches option
|
||||
* names, ability names or the redirect); the nonce belongs to that profile.
|
||||
*/
|
||||
public function release(): void
|
||||
{
|
||||
$action = $this->action ?? new AdminPostAction();
|
||||
$action->guard();
|
||||
$profile = $this->postedProfile();
|
||||
check_admin_referer(self::RELEASE_ACTION . '_' . $profile->id);
|
||||
|
||||
$version = $this->compatibility->version($profile) ?? '';
|
||||
$report = ($this->reports)($profile)->latest();
|
||||
if (
|
||||
$report === null
|
||||
|| ! $this->releasable($profile, $version)
|
||||
|| ! $report->freshFor($version, Plugin::VERSION, $this->stateKey($profile, $version))
|
||||
) {
|
||||
$action->redirect(self::SLUG, 'compat_release_refused', ['lit_mcp_profile' => $profile->id]);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
($this->releases)($profile)->add($version, Plugin::VERSION, get_current_user_id(), $report->id);
|
||||
$this->log?->record(
|
||||
'lit/' . $profile->id . '-release',
|
||||
$profile->id,
|
||||
$version,
|
||||
sprintf(
|
||||
'%s %s für LIT MCP %s freigegeben (Prüfbericht %s).',
|
||||
$profile->label,
|
||||
$version,
|
||||
Plugin::VERSION,
|
||||
$report->id
|
||||
)
|
||||
);
|
||||
do_action(CheckRoute::CHANGED_ACTION, $profile->id);
|
||||
$action->redirect(self::SLUG, 'compat_released', ['lit_mcp_profile' => $profile->id]);
|
||||
}
|
||||
|
||||
public function withdraw(): void
|
||||
{
|
||||
$action = $this->action ?? new AdminPostAction();
|
||||
$action->guard();
|
||||
$profile = $this->postedProfile();
|
||||
check_admin_referer(self::WITHDRAW_ACTION . '_' . $profile->id);
|
||||
|
||||
$version = $this->compatibility->version($profile) ?? '';
|
||||
if (! ($this->releases)($profile)->withdraw($version, Plugin::VERSION)) {
|
||||
$action->redirect(self::SLUG, 'compat_withdraw_failed', ['lit_mcp_profile' => $profile->id]);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$this->log?->record(
|
||||
'lit/' . $profile->id . '-release',
|
||||
$profile->id,
|
||||
$version,
|
||||
sprintf('Freigabe von %s %s zurückgezogen.', $profile->label, $version)
|
||||
);
|
||||
do_action(CheckRoute::CHANGED_ACTION, $profile->id);
|
||||
$action->redirect(self::SLUG, 'compat_withdrawn', ['lit_mcp_profile' => $profile->id]);
|
||||
}
|
||||
|
||||
/** The profile named by the POST field "profile"; anything Compatibility does not know ends the request (400). */
|
||||
private function postedProfile(): Profile
|
||||
{
|
||||
// phpcs:ignore WordPress.Security.NonceVerification.Missing -- only a lookup key; the nonce is checked with it.
|
||||
$id = is_string($_POST['profile'] ?? null) ? sanitize_key(wp_unslash($_POST['profile'])) : '';
|
||||
$profile = $this->compatibility->profile($id);
|
||||
if ($profile === null) {
|
||||
wp_die(esc_html__('Unbekanntes Profil.', 'wp-lit-mcp'), '', ['response' => 400]);
|
||||
}
|
||||
|
||||
return $profile;
|
||||
}
|
||||
|
||||
/**
|
||||
* What the tab offers: an active, versioned profile that releases at all (not ReportOnly), whose version the
|
||||
* plugin does not list as tested, that has no release yet and – ReleasePerVersion – is still untested.
|
||||
*/
|
||||
private function releasable(Profile $profile, string $version): bool
|
||||
{
|
||||
return $version !== ''
|
||||
&& $profile->tier !== Tier::ReportOnly
|
||||
&& $this->compatibility->active($profile)
|
||||
&& ! in_array($version, $profile->testedVersions, true)
|
||||
&& ($this->releases)($profile)->find($version, Plugin::VERSION) === null
|
||||
&& ($profile->tier !== Tier::ReleasePerVersion
|
||||
|| $this->compatibility->matrix($profile)->state() === ReleaseState::Untested);
|
||||
}
|
||||
|
||||
private function stateKey(Profile $profile, string $version): string
|
||||
{
|
||||
return $profile->stateKey === null ? '' : ($profile->stateKey)($version);
|
||||
}
|
||||
|
||||
public function render(): void
|
||||
{
|
||||
foreach ($this->compatibility->profiles() as $profile) {
|
||||
$this->renderProfile($profile);
|
||||
}
|
||||
}
|
||||
|
||||
private function renderProfile(Profile $profile): void
|
||||
{
|
||||
printf('<section class="lit-mcp-compat" id="lit-mcp-compat-%s">', esc_attr($profile->id));
|
||||
printf('<h2>%s</h2>', esc_html($profile->label));
|
||||
if (! $this->compatibility->active($profile)) {
|
||||
echo '<p>' . esc_html__('nicht installiert oder nicht aktiv', 'wp-lit-mcp') . '</p></section>';
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$matrix = $this->compatibility->matrix($profile);
|
||||
$problems = $this->compatibility->problems($profile);
|
||||
$state = $matrix->state();
|
||||
|
||||
echo '<table class="form-table" role="presentation"><tbody>';
|
||||
printf(
|
||||
'<tr><th scope="row">%s</th><td>%s</td></tr>',
|
||||
esc_html__('Version', 'wp-lit-mcp'),
|
||||
esc_html($this->compatibility->version($profile) ?? __('nicht erkannt', 'wp-lit-mcp'))
|
||||
);
|
||||
printf(
|
||||
'<tr><th scope="row">%s</th><td>%s – %s</td></tr>',
|
||||
esc_html__('Gesamtzustand', 'wp-lit-mcp'),
|
||||
// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- escaped in stateBadge().
|
||||
self::stateBadge($state),
|
||||
esc_html(self::explanation($state))
|
||||
);
|
||||
if ($problems !== []) {
|
||||
echo '<tr><th scope="row">' . esc_html__('Probleme', 'wp-lit-mcp') . '</th><td>';
|
||||
self::renderList($problems);
|
||||
echo '</td></tr>';
|
||||
}
|
||||
printf(
|
||||
'<tr><th scope="row">%s</th><td>%s</td></tr>',
|
||||
esc_html__('Freigabe', 'wp-lit-mcp'),
|
||||
esc_html(self::tierHint($profile->tier))
|
||||
);
|
||||
printf(
|
||||
'<tr><th scope="row">%s</th><td>%s</td></tr>',
|
||||
esc_html__('Getestete Versionen', 'wp-lit-mcp'),
|
||||
$profile->testedVersions === [] ? '–' : esc_html(implode(', ', $profile->testedVersions))
|
||||
);
|
||||
printf(
|
||||
'<tr><th scope="row">%s</th><td>%s</td></tr>',
|
||||
esc_html__('Freigegebene Versionen', 'wp-lit-mcp'),
|
||||
esc_html($this->releasedVersions($profile)) ?: '–'
|
||||
);
|
||||
echo '</tbody></table>';
|
||||
|
||||
$this->renderCapabilities($profile, $matrix);
|
||||
$report = ($this->reports)($profile)->latest();
|
||||
$this->renderForms($profile, $report);
|
||||
if ($report !== null) {
|
||||
$this->renderReport($profile, $report);
|
||||
}
|
||||
do_action(self::EXTRA_ACTION, $profile->id);
|
||||
echo '</section>';
|
||||
}
|
||||
|
||||
private function renderCapabilities(Profile $profile, CompatibilityMatrix $matrix): void
|
||||
{
|
||||
$headings = [__('Fähigkeit', 'wp-lit-mcp'), __('Zustand', 'wp-lit-mcp')];
|
||||
echo '<table class="widefat striped lit-mcp-divi-features"><caption class="screen-reader-text">'
|
||||
. esc_html(sprintf(
|
||||
/* translators: %s: plugin name */
|
||||
__('Fähigkeiten von %s', 'wp-lit-mcp'),
|
||||
$profile->label
|
||||
))
|
||||
. '</caption><thead><tr>';
|
||||
foreach ($headings as $heading) {
|
||||
echo '<th scope="col">' . esc_html($heading) . '</th>';
|
||||
}
|
||||
echo '</tr></thead><tbody>';
|
||||
foreach ($profile->capabilities as $capability) {
|
||||
// data-label: on phones each row becomes a card and the cell names itself.
|
||||
printf(
|
||||
'<tr><td data-label="%s">%s</td><td data-label="%s">%s</td></tr>',
|
||||
esc_attr($headings[0]),
|
||||
esc_html($capability->label()),
|
||||
esc_attr($headings[1]),
|
||||
// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- escaped in stateBadge().
|
||||
self::stateBadge($matrix->of($capability)->state)
|
||||
);
|
||||
}
|
||||
echo '</tbody></table>';
|
||||
}
|
||||
|
||||
private function renderForms(Profile $profile, ?CheckReport $report): void
|
||||
{
|
||||
$version = $this->compatibility->version($profile) ?? '';
|
||||
$fresh = $report !== null && $report->freshFor($version, Plugin::VERSION, $this->stateKey($profile, $version));
|
||||
$releasable = $this->releasable($profile, $version);
|
||||
|
||||
printf('<form method="post" action="%s">', esc_url(CheckRoute::url($profile->id)));
|
||||
printf('<input type="hidden" name="_wpnonce" value="%s">', esc_attr(wp_create_nonce('wp_rest')));
|
||||
// The check is the one thing to do while a release is due without a usable report.
|
||||
submit_button(
|
||||
__('Prüfung starten', 'wp-lit-mcp'),
|
||||
$releasable && ! $fresh ? 'primary' : 'secondary',
|
||||
'lit-mcp-compat-check-' . $profile->id,
|
||||
false,
|
||||
['aria-label' => self::namedFor($profile, __('Prüfung starten', 'wp-lit-mcp'))]
|
||||
);
|
||||
echo '<p class="description">' . esc_html__('Die Prüfung dauert einige Sekunden.', 'wp-lit-mcp') . '</p>';
|
||||
echo '</form>';
|
||||
|
||||
if ($releasable && $fresh) {
|
||||
$this->actionForm(
|
||||
$profile,
|
||||
self::RELEASE_ACTION,
|
||||
'release',
|
||||
/* translators: 1: plugin name, 2: version */
|
||||
sprintf(__('%1$s %2$s freigeben', 'wp-lit-mcp'), $profile->label, $version),
|
||||
'primary'
|
||||
);
|
||||
} elseif ($releasable) {
|
||||
echo '<p>' . esc_html__(
|
||||
'Freigeben geht erst nach einer vollständig grünen Prüfung dieser Version – Prüfung erneut ausführen.',
|
||||
'wp-lit-mcp'
|
||||
) . '</p>';
|
||||
}
|
||||
|
||||
// A release applies whatever the overall state: one incompatible capability must not hide the way back.
|
||||
if ($version !== '' && ($this->releases)($profile)->find($version, Plugin::VERSION) !== null) {
|
||||
$this->actionForm(
|
||||
$profile,
|
||||
self::WITHDRAW_ACTION,
|
||||
'withdraw',
|
||||
__('Freigabe zurückziehen', 'wp-lit-mcp'),
|
||||
'secondary',
|
||||
true
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/** "<visible text>: <profile>" – the accessible name starts with the visible text (WCAG 2.5.3). */
|
||||
private static function namedFor(Profile $profile, string $label): string
|
||||
{
|
||||
return $label . ': ' . $profile->label;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $kind Short name of the action; with the profile ID it makes the button's name/id unique
|
||||
* on a page that shows several profiles.
|
||||
* @param bool $nameIt The label does not name the profile: add it to the accessible name.
|
||||
*/
|
||||
private function actionForm(
|
||||
Profile $profile,
|
||||
string $action,
|
||||
string $kind,
|
||||
string $label,
|
||||
string $type,
|
||||
bool $nameIt = false
|
||||
): void {
|
||||
printf('<form method="post" action="%s">', esc_url(admin_url('admin-post.php')));
|
||||
printf('<input type="hidden" name="action" value="%s">', esc_attr($action));
|
||||
printf('<input type="hidden" name="profile" value="%s">', esc_attr($profile->id));
|
||||
wp_nonce_field($action . '_' . $profile->id);
|
||||
submit_button(
|
||||
$label,
|
||||
$type,
|
||||
'lit-mcp-compat-' . $kind . '-' . $profile->id,
|
||||
false,
|
||||
$nameIt ? ['aria-label' => self::namedFor($profile, $label)] : []
|
||||
);
|
||||
echo '</form>';
|
||||
}
|
||||
|
||||
private function renderReport(Profile $profile, CheckReport $report): void
|
||||
{
|
||||
printf(
|
||||
'<h3>%s</h3><p>%s</p><ul class="lit-mcp-divi-report">',
|
||||
esc_html__('Letzte Prüfung', 'wp-lit-mcp'),
|
||||
esc_html(sprintf(
|
||||
/* translators: 1: plugin version, 2: LIT MCP version, 3: date */
|
||||
__('Version %1$s mit LIT MCP %2$s, %3$s', 'wp-lit-mcp'),
|
||||
$report->version,
|
||||
$report->pluginVersion,
|
||||
date_i18n((string) get_option('date_format'), (int) strtotime($report->createdAt))
|
||||
))
|
||||
);
|
||||
foreach ($report->steps as $step) {
|
||||
[$icon, $word] = match (true) {
|
||||
$step->skipped => ['minus', __('übersprungen', 'wp-lit-mcp')],
|
||||
$step->green() => ['yes-alt', __('bestanden', 'wp-lit-mcp')],
|
||||
default => ['dismiss', __('fehlgeschlagen', 'wp-lit-mcp')],
|
||||
};
|
||||
printf(
|
||||
'<li class="lit-mcp-state lit-mcp-status-%1$s"><span class="dashicons dashicons-%1$s"'
|
||||
. ' aria-hidden="true"></span> <strong>%2$s</strong>: %3$s',
|
||||
esc_attr($icon),
|
||||
esc_html($word),
|
||||
esc_html($profile->stepLabel === null ? $step->label() : ($profile->stepLabel)($step))
|
||||
);
|
||||
if ($step->skipped) {
|
||||
echo ' (' . esc_html__('nicht ausgeführt', 'wp-lit-mcp') . ')';
|
||||
}
|
||||
if ($step->problems !== []) {
|
||||
self::renderList($step->problems);
|
||||
}
|
||||
echo '</li>';
|
||||
}
|
||||
echo '</ul>';
|
||||
}
|
||||
|
||||
/** @param list<string> $items */
|
||||
private static function renderList(array $items): void
|
||||
{
|
||||
echo '<ul>';
|
||||
foreach ($items as $item) {
|
||||
echo '<li>' . esc_html($item) . '</li>';
|
||||
}
|
||||
echo '</ul>';
|
||||
}
|
||||
|
||||
private function releasedVersions(Profile $profile): string
|
||||
{
|
||||
return implode(', ', array_map(
|
||||
static fn (array $entry): string => sprintf(
|
||||
/* translators: 1: plugin version, 2: LIT MCP version */
|
||||
__('%1$s (LIT MCP %2$s)', 'wp-lit-mcp'),
|
||||
$entry[$profile->reportVersionKey],
|
||||
$entry['plugin_version']
|
||||
),
|
||||
($this->releases)($profile)->entries()
|
||||
));
|
||||
}
|
||||
|
||||
/** Same coloured icons as the status list on the tab "Verbindung"; the word stays, colour is never alone. */
|
||||
private static function stateBadge(ReleaseState $state): string
|
||||
{
|
||||
[$icon, $word] = match ($state) {
|
||||
ReleaseState::Released => ['yes-alt', __('freigegeben', 'wp-lit-mcp')],
|
||||
ReleaseState::Untested => ['warning', __('ungetestet', 'wp-lit-mcp')],
|
||||
ReleaseState::Incompatible => ['dismiss', __('inkompatibel', 'wp-lit-mcp')],
|
||||
};
|
||||
|
||||
return sprintf(
|
||||
'<span class="lit-mcp-state lit-mcp-status-%1$s"><span class="dashicons dashicons-%1$s"'
|
||||
. ' aria-hidden="true"></span> <strong>%2$s</strong></span>',
|
||||
$icon,
|
||||
esc_html($word)
|
||||
);
|
||||
}
|
||||
|
||||
private static function explanation(ReleaseState $state): string
|
||||
{
|
||||
return match ($state) {
|
||||
ReleaseState::Released => __('Alle Fähigkeiten sind nutzbar.', 'wp-lit-mcp'),
|
||||
ReleaseState::Untested => __(
|
||||
'Diese Version ist nicht geprüft. Die ungetesteten Fähigkeiten sind gesperrt, bis sie freigegeben ist.',
|
||||
'wp-lit-mcp'
|
||||
),
|
||||
ReleaseState::Incompatible => __(
|
||||
'Die betroffenen Fähigkeiten bleiben gesperrt, bis die Ursache behoben ist; die anderen laufen weiter.',
|
||||
'wp-lit-mcp'
|
||||
),
|
||||
};
|
||||
}
|
||||
|
||||
private static function tierHint(Tier $tier): string
|
||||
{
|
||||
return match ($tier) {
|
||||
Tier::ReleasePerVersion => __('Freigabe pro Version nötig', 'wp-lit-mcp'),
|
||||
Tier::LockOnFailure => __(
|
||||
'Freigabe wird dokumentiert, Nutzung automatisch, solange die Prüfung grün ist',
|
||||
'wp-lit-mcp'
|
||||
),
|
||||
Tier::ReportOnly => __('nur Anzeige', 'wp-lit-mcp'),
|
||||
};
|
||||
}
|
||||
}
|
||||
+49
-13
@@ -4,6 +4,8 @@ declare(strict_types=1);
|
||||
|
||||
namespace LIT\MCP\Admin;
|
||||
|
||||
use Closure;
|
||||
|
||||
defined('ABSPATH') || exit;
|
||||
|
||||
/**
|
||||
@@ -30,12 +32,15 @@ final class SettingsPage
|
||||
* @param string $logoUrl Loosen-IT logo shown top right of the page ('' = none).
|
||||
* @param string $assetsUrl URL of the plugin's assets/ directory ('' = no own CSS/JS).
|
||||
* @param string $version Asset version for cache busting.
|
||||
* @param (Closure(string): ?string)|null $profileLabel Label of a compatibility profile by ID, null = unknown;
|
||||
* names the profile in the compat_* notices.
|
||||
*/
|
||||
public function __construct(
|
||||
private array $baseTabs,
|
||||
private string $logoUrl = '',
|
||||
private string $assetsUrl = '',
|
||||
private string $version = ''
|
||||
private string $version = '',
|
||||
private ?Closure $profileLabel = null
|
||||
) {
|
||||
}
|
||||
|
||||
@@ -74,6 +79,7 @@ final class SettingsPage
|
||||
public function removableQueryArgs(array $args): array
|
||||
{
|
||||
$args[] = 'lit_mcp_notice';
|
||||
$args[] = 'lit_mcp_profile';
|
||||
|
||||
return $args;
|
||||
}
|
||||
@@ -107,6 +113,10 @@ final class SettingsPage
|
||||
'Tab „Protokoll“: jede Änderung des Assistenten mit Benutzer, Ergebnis und Zeitpunkt.',
|
||||
'wp-lit-mcp'
|
||||
),
|
||||
__('Passt es zu Divi, Pods & Co.?', 'wp-lit-mcp') => __(
|
||||
'Tab „Compatibility“: Fremd-Plugins prüfen, Versionen freigeben und sehen, was gesperrt ist.',
|
||||
'wp-lit-mcp'
|
||||
),
|
||||
];
|
||||
$content = '';
|
||||
foreach ($items as $title => $text) {
|
||||
@@ -163,7 +173,7 @@ final class SettingsPage
|
||||
public function currentTab(): string
|
||||
{
|
||||
// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- read-only tab switch.
|
||||
$requested = isset($_GET['tab']) ? sanitize_key(wp_unslash((string) $_GET['tab'])) : '';
|
||||
$requested = is_string($_GET['tab'] ?? null) ? sanitize_key(wp_unslash($_GET['tab'])) : '';
|
||||
|
||||
$tabs = $this->tabs();
|
||||
|
||||
@@ -236,23 +246,26 @@ final class SettingsPage
|
||||
);
|
||||
}
|
||||
|
||||
/** "<Label>: " for a compat_* notice naming a known profile; the ID from the address bar only looks the label up. */
|
||||
private function noticeProfile(string $key): string
|
||||
{
|
||||
// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- display only.
|
||||
$id = is_string($_GET['lit_mcp_profile'] ?? null) ? sanitize_key(wp_unslash($_GET['lit_mcp_profile'])) : '';
|
||||
$label = str_starts_with($key, 'compat_') && $id !== '' && $this->profileLabel !== null
|
||||
? ($this->profileLabel)($id)
|
||||
: null;
|
||||
|
||||
return $label === null ? '' : $label . ': ';
|
||||
}
|
||||
|
||||
private function renderNotice(): void
|
||||
{
|
||||
// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- display only.
|
||||
$key = isset($_GET['lit_mcp_notice']) ? sanitize_key(wp_unslash((string) $_GET['lit_mcp_notice'])) : '';
|
||||
$key = is_string($_GET['lit_mcp_notice'] ?? null) ? sanitize_key(wp_unslash($_GET['lit_mcp_notice'])) : '';
|
||||
$notice = match ($key) {
|
||||
'revoked' => ['success', __('Verbindung widerrufen.', 'wp-lit-mcp')],
|
||||
'revoke_failed' => ['error', __('Die Verbindung konnte nicht widerrufen werden.', 'wp-lit-mcp')],
|
||||
'cleared' => ['success', __('Protokoll geleert.', 'wp-lit-mcp')],
|
||||
'divi_checked' => ['success', __('Divi-Prüfung abgeschlossen; das Ergebnis steht unten.', 'wp-lit-mcp')],
|
||||
'divi_check_running' => [
|
||||
'warning',
|
||||
__('Es läuft bereits eine Divi-Prüfung; bitte in ein paar Minuten erneut versuchen.', 'wp-lit-mcp'),
|
||||
],
|
||||
'divi_check_failed' => [
|
||||
'error',
|
||||
__('Die Divi-Prüfung ist abgebrochen; Details stehen im PHP-Error-Log.', 'wp-lit-mcp'),
|
||||
],
|
||||
'divi_released' => ['success', __('Die Divi-Version ist für LIT MCP freigegeben.', 'wp-lit-mcp')],
|
||||
'divi_release_refused' => [
|
||||
'error',
|
||||
@@ -270,6 +283,29 @@ final class SettingsPage
|
||||
'error',
|
||||
__('Für die installierte Divi-Version gibt es auf dieser Website keine Freigabe.', 'wp-lit-mcp'),
|
||||
],
|
||||
'compat_checked' => ['success', __('Prüfung abgeschlossen; das Ergebnis steht unten.', 'wp-lit-mcp')],
|
||||
'compat_check_running' => [
|
||||
'warning',
|
||||
__('Es läuft bereits eine Prüfung; bitte in ein paar Minuten erneut versuchen.', 'wp-lit-mcp'),
|
||||
],
|
||||
'compat_check_failed' => [
|
||||
'error',
|
||||
__('Die Prüfung ist abgebrochen; Details stehen im PHP-Error-Log.', 'wp-lit-mcp'),
|
||||
],
|
||||
'compat_released' => ['success', __('Die Version ist für LIT MCP freigegeben.', 'wp-lit-mcp')],
|
||||
'compat_release_refused' => [
|
||||
'error',
|
||||
__(
|
||||
// phpcs:ignore Generic.Files.LineLength.TooLong -- WordPress.WP.I18n forbids splitting the text argument.
|
||||
'Freigabe nicht möglich: Der letzte Prüfbericht ist nicht grün oder passt nicht mehr zur installierten Version oder zur Plugin-Version. Bitte die Prüfung erneut ausführen.',
|
||||
'wp-lit-mcp'
|
||||
),
|
||||
],
|
||||
'compat_withdrawn' => ['success', __('Freigabe zurückgezogen.', 'wp-lit-mcp')],
|
||||
'compat_withdraw_failed' => [
|
||||
'error',
|
||||
__('Für die installierte Version gibt es auf dieser Website keine Freigabe.', 'wp-lit-mcp'),
|
||||
],
|
||||
default => null,
|
||||
};
|
||||
|
||||
@@ -277,7 +313,7 @@ final class SettingsPage
|
||||
printf(
|
||||
'<div class="notice notice-%s is-dismissible"><p>%s</p></div>',
|
||||
esc_attr($notice[0]),
|
||||
esc_html($notice[1])
|
||||
esc_html($this->noticeProfile($key) . $notice[1])
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,6 +29,8 @@ final class Profile
|
||||
* whether the manifest step was clean.
|
||||
* @param (Closure(): ManifestCheck)|null $manifestCheck The check of this profile; null = its manifests
|
||||
* without signature checks.
|
||||
* @param (Closure(CheckStep): string)|null $stepLabel Label of a stored step that has none (reports from
|
||||
* before labels were stored); null = the step's own.
|
||||
* @param string $reportVersionKey Array key of the version in stored reports and
|
||||
* release rows (Divi: 'divi_version').
|
||||
* @throws LogicException For a ReleasePerVersion profile without matrix or a capability ID given twice.
|
||||
@@ -47,6 +49,7 @@ final class Profile
|
||||
public readonly ?Closure $stateKey = null,
|
||||
public readonly ?Closure $extraSteps = null,
|
||||
public readonly ?Closure $manifestCheck = null,
|
||||
public readonly ?Closure $stepLabel = null,
|
||||
public readonly string $reportVersionKey = 'version'
|
||||
) {
|
||||
if ($tier === Tier::ReleasePerVersion && $matrix === null) {
|
||||
|
||||
@@ -7,12 +7,12 @@ namespace LIT\MCP\Integrations\Divi\Admin;
|
||||
use Closure;
|
||||
use LIT\MCP\Admin\AdminPostAction;
|
||||
use LIT\MCP\Admin\AdminTab;
|
||||
use LIT\MCP\Admin\CheckRoute;
|
||||
use LIT\MCP\Admin\SettingsPage;
|
||||
use LIT\MCP\ChangeLog\ChangeLog;
|
||||
use LIT\MCP\Compatibility\ReleaseState;
|
||||
use LIT\MCP\Compatibility\CheckReport;
|
||||
use LIT\MCP\Compatibility\CheckReportStore;
|
||||
use LIT\MCP\Integrations\Divi\Release\DiviCheckRoute;
|
||||
use LIT\MCP\Integrations\Divi\Release\DiviCheckSteps;
|
||||
use LIT\MCP\Integrations\Divi\Release\DiviProfile;
|
||||
use LIT\MCP\Integrations\Divi\Release\DiviEnvironment;
|
||||
@@ -29,7 +29,7 @@ defined('ABSPATH') || exit;
|
||||
|
||||
/**
|
||||
* Tab "Divi" (spec §6): release status of the installed Divi, the table of its features (state, source, problems,
|
||||
* affected tools – E3), the latest check report, "Prüfung starten" (REST, DiviCheckRoute), "Divi <Version>
|
||||
* affected tools – E3), the latest check report, "Prüfung starten" (REST, Admin\CheckRoute), "Divi <Version>
|
||||
* freigeben" (only after a fresh green report) and "Freigabe zurückziehen" (whenever a database release applies,
|
||||
* whatever the overall state). Loading the tab removes check pages a dead check left behind – in the page's load
|
||||
* hook (removeOrphans()), not while rendering. renderNotice() is the admin notice on every admin page while a
|
||||
@@ -460,7 +460,7 @@ final class DiviTab implements AdminTab
|
||||
&& $report->freshFor($status->version, Plugin::VERSION, $this->stateKey($status->version));
|
||||
$untested = $status->state === ReleaseState::Untested && $status->version !== '';
|
||||
|
||||
printf('<form method="post" action="%s">', esc_url(DiviCheckRoute::url()));
|
||||
printf('<form method="post" action="%s">', esc_url(CheckRoute::url(DiviProfile::ID)));
|
||||
printf('<input type="hidden" name="_wpnonce" value="%s">', esc_attr(wp_create_nonce('wp_rest')));
|
||||
// The check is the one thing to do while untested without a usable report; otherwise the release leads.
|
||||
submit_button(
|
||||
|
||||
@@ -12,7 +12,7 @@ defined('ABSPATH') || exit;
|
||||
* One confirmed change per lock at a time (final review I-5). Colors and theme options share ONE lock (audit L5):
|
||||
* both rewrite the whole et_divi array through et_update_option(). The lock is a row lit_mcp_lock_<name> (never
|
||||
* autoloaded) in the options table holding "<time>:<token>" – taken with an atomic INSERT IGNORE like
|
||||
* DiviCheckRoute (add_option() reads first and writes after, so two requests could both win; audit L6). A lock
|
||||
* Admin\CheckRoute (add_option() reads first and writes after, so two requests could both win; audit L6). A lock
|
||||
* older than STALE_AFTER seconds (a request that died) is taken over with a conditional UPDATE on the value just
|
||||
* read, so only one taker wins; release() deletes the row only while it still holds this instance's token, so a
|
||||
* holder that lost a stale lock cannot free the new holder's. A taken lock drops the options cache, so the
|
||||
|
||||
@@ -7,6 +7,7 @@ namespace LIT\MCP\Integrations\Divi;
|
||||
use Closure;
|
||||
use LIT\MCP\Abilities\Ability;
|
||||
use LIT\MCP\Abilities\ToolAvailability;
|
||||
use LIT\MCP\Admin\CheckRoute;
|
||||
use LIT\MCP\Admin\SettingsPage;
|
||||
use LIT\MCP\ChangeLog\ChangeLog;
|
||||
use LIT\MCP\Compatibility\CompatibilityCheck;
|
||||
@@ -75,7 +76,6 @@ use LIT\MCP\Integrations\Divi\Pages\DiviSaver;
|
||||
use LIT\MCP\Integrations\Divi\Pages\DiviUpdateAbility;
|
||||
use LIT\MCP\Integrations\Divi\Pages\DiviWriter;
|
||||
use LIT\MCP\Integrations\Divi\Pages\DynamicContentMap;
|
||||
use LIT\MCP\Integrations\Divi\Release\DiviCheckRoute;
|
||||
use LIT\MCP\Integrations\Divi\Release\FeatureOverview;
|
||||
use LIT\MCP\Integrations\Divi\Release\DiviProfile;
|
||||
use LIT\MCP\Integrations\Divi\Release\ReleaseGate;
|
||||
@@ -260,12 +260,18 @@ final class DiviIntegration implements Integration, Bootable, ProvidesCompatibil
|
||||
ReleaseGate::invalidate(mirrors: true);
|
||||
});
|
||||
|
||||
// Spec §6: the admin check runs as a REST request (same context as MCP calls). Its short form has no
|
||||
// Tools-tab gate: the check tests Divi, not this site's tool switches.
|
||||
// The admin check runs as a generic REST route (Admin\CheckRoute, registered by Plugin); a stored check or a
|
||||
// release changes the state, so the gate forgets its status of this request.
|
||||
add_action(CheckRoute::CHANGED_ACTION, static function (string $profileId): void {
|
||||
if ($profileId === DiviProfile::ID) {
|
||||
ReleaseGate::invalidate();
|
||||
}
|
||||
});
|
||||
|
||||
// Spec §7: the same check as WP-CLI command. Its short form has no Tools-tab gate: the check tests Divi,
|
||||
// not this site's tool switches.
|
||||
$profile = $this->profile();
|
||||
$check = static fn (): CompatibilityCheck => CompatibilityCheck::forProfile($profile);
|
||||
(new DiviCheckRoute($check))->register();
|
||||
DiviCheckCommand::register($check);
|
||||
DiviCheckCommand::register(static fn (): CompatibilityCheck => CompatibilityCheck::forProfile($profile));
|
||||
|
||||
add_filter(
|
||||
SettingsPage::TABS_FILTER,
|
||||
|
||||
@@ -1,128 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace LIT\MCP\Integrations\Divi\Release;
|
||||
|
||||
use Closure;
|
||||
use LIT\MCP\Admin\SettingsPage;
|
||||
use LIT\MCP\Compatibility\CheckReportStore;
|
||||
use LIT\MCP\Compatibility\CompatibilityCheck;
|
||||
use LIT\MCP\Integrations\Divi\Admin\DiviTab;
|
||||
use LIT\MCP\Log;
|
||||
use Throwable;
|
||||
use WP_REST_Response;
|
||||
|
||||
defined('ABSPATH') || exit;
|
||||
|
||||
/**
|
||||
* "Prüfung starten" of the Divi tab (spec §6.1): POST /wp-json/lit-mcp/v1/divi-check. A REST request on purpose –
|
||||
* not admin-post – so the check runs in the same context as MCP calls (Divi renders its blocks in REST requests,
|
||||
* lit-page-render-summary). The form sends the wp_rest nonce as _wpnonce (cookie authentication); only manage_options.
|
||||
* One check at a time: an atomic "INSERT IGNORE" on the options table (self::LOCK) is the lock – add_option() reads
|
||||
* then writes (wp-includes/option.php) and is not atomic, so two simultaneous requests could both "acquire" it. A
|
||||
* lock older than LOCK_TTL is a dead check's, taken over with a conditional UPDATE (compare-and-swap on the value
|
||||
* just read) so only one of several concurrent takers wins. A check that throws still releases the lock (finally)
|
||||
* and redirects with divi_check_failed (logged, never shown to the browser as an unhandled 500). Answers 303 back
|
||||
* to the tab.
|
||||
*/
|
||||
final class DiviCheckRoute
|
||||
{
|
||||
public const NAMESPACE = 'lit-mcp/v1';
|
||||
public const ROUTE = '/divi-check';
|
||||
public const LOCK = 'lit_mcp_divi_check_lock';
|
||||
|
||||
private const LOCK_TTL = 600;
|
||||
|
||||
/** @param Closure(): CompatibilityCheck $check */
|
||||
public function __construct(private Closure $check, private ?CheckReportStore $reports = null)
|
||||
{
|
||||
}
|
||||
|
||||
public function register(): void
|
||||
{
|
||||
add_action('rest_api_init', [$this, 'registerRoute']);
|
||||
}
|
||||
|
||||
public function registerRoute(): void
|
||||
{
|
||||
register_rest_route(self::NAMESPACE, self::ROUTE, [
|
||||
'methods' => 'POST',
|
||||
'callback' => [$this, 'handle'],
|
||||
'permission_callback' => static fn (): bool => current_user_can('manage_options'),
|
||||
]);
|
||||
}
|
||||
|
||||
public static function url(): string
|
||||
{
|
||||
return rest_url(self::NAMESPACE . self::ROUTE);
|
||||
}
|
||||
|
||||
public function handle(): WP_REST_Response
|
||||
{
|
||||
$notice = 'divi_check_running';
|
||||
if (self::lock()) {
|
||||
try {
|
||||
$report = ($this->check)()->run(get_current_user_id());
|
||||
$reports = $this->reports ?? new CheckReportStore(DiviProfile::ID, DiviProfile::REPORT_VERSION_KEY);
|
||||
$reports->save($report);
|
||||
ReleaseGate::invalidate();
|
||||
$notice = 'divi_checked';
|
||||
} catch (Throwable $e) {
|
||||
Log::failure('divi check', $e);
|
||||
$notice = 'divi_check_failed';
|
||||
} finally {
|
||||
delete_option(self::LOCK);
|
||||
}
|
||||
}
|
||||
|
||||
return new WP_REST_Response(
|
||||
null,
|
||||
303,
|
||||
['Location' => SettingsPage::url(DiviTab::SLUG, ['lit_mcp_notice' => $notice])]
|
||||
);
|
||||
}
|
||||
|
||||
private static function lock(): bool
|
||||
{
|
||||
global $wpdb;
|
||||
|
||||
if (self::insertLock($wpdb, time())) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// get_var(), not get_option(): the row was written with raw SQL, bypassing the options cache.
|
||||
$since = $wpdb->get_var($wpdb->prepare(
|
||||
"SELECT option_value FROM {$wpdb->options} WHERE option_name = %s",
|
||||
self::LOCK
|
||||
));
|
||||
if ($since === null) {
|
||||
// The lock was released between our failed insert and this read; try once more.
|
||||
return self::insertLock($wpdb, time());
|
||||
}
|
||||
if (time() - (int) $since < self::LOCK_TTL) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$taken = $wpdb->query($wpdb->prepare(
|
||||
"UPDATE {$wpdb->options} SET option_value = %s WHERE option_name = %s AND option_value = %s",
|
||||
(string) time(),
|
||||
self::LOCK,
|
||||
$since
|
||||
));
|
||||
|
||||
return (int) $taken === 1;
|
||||
}
|
||||
|
||||
/** INSERT IGNORE: 1 row affected = the lock did not exist and is now ours; 0 = someone else holds it. */
|
||||
private static function insertLock(\wpdb $wpdb, int $now): bool
|
||||
{
|
||||
$inserted = $wpdb->query($wpdb->prepare(
|
||||
"INSERT IGNORE INTO {$wpdb->options} (option_name, option_value, autoload) VALUES (%s, %s, 'no')",
|
||||
self::LOCK,
|
||||
(string) $now
|
||||
));
|
||||
|
||||
return (int) $inserted === 1;
|
||||
}
|
||||
}
|
||||
@@ -46,6 +46,7 @@ final class DiviProfile
|
||||
))->run()
|
||||
),
|
||||
manifestCheck: DiviManifestCheck::create(...),
|
||||
stepLabel: DiviCheckSteps::label(...),
|
||||
reportVersionKey: self::REPORT_VERSION_KEY
|
||||
);
|
||||
}
|
||||
|
||||
+17
-1
@@ -14,6 +14,8 @@ use LIT\MCP\Admin\ConnectionRepository;
|
||||
use LIT\MCP\Admin\ConnectionStatus;
|
||||
use LIT\MCP\Admin\ConnectionTab;
|
||||
use LIT\MCP\Admin\ConnectionUsage;
|
||||
use LIT\MCP\Admin\CheckRoute;
|
||||
use LIT\MCP\Admin\CompatibilityTab;
|
||||
use LIT\MCP\Admin\LimitsTab;
|
||||
use LIT\MCP\Admin\LogTab;
|
||||
use LIT\MCP\Admin\SettingsPage;
|
||||
@@ -94,6 +96,8 @@ final class Plugin
|
||||
// Integration-owned hooks (Divi: upgrader hook, check route, CLI command, tab "Divi") – before the settings
|
||||
// page reads its tabs.
|
||||
$registry->boot();
|
||||
// The admin check of every compatibility profile (POST lit-mcp/v1/<id>-check), REST like the MCP calls.
|
||||
(new CheckRoute($registry->compatibility()))->register();
|
||||
|
||||
(new AbilityRegistrar($registry, $policy, self::guards($registry, $changeLog)))->register();
|
||||
(new ServerRegistrar(
|
||||
@@ -113,12 +117,14 @@ final class Plugin
|
||||
new ToolsTab($registry, $policy),
|
||||
new LogTab($changeLog, $limits, $registry),
|
||||
new LimitsTab(),
|
||||
self::compatibilityTab($registry, $changeLog),
|
||||
];
|
||||
self::$settingsPage = new SettingsPage(
|
||||
$tabs,
|
||||
plugins_url('assets/img/loosen-it-logo.svg', self::$pluginFile),
|
||||
plugins_url('assets', self::$pluginFile),
|
||||
self::VERSION
|
||||
self::VERSION,
|
||||
static fn (string $id): ?string => $registry->compatibility()->profile($id)?->label
|
||||
);
|
||||
(new ConnectionUsage())->register();
|
||||
if (is_admin()) {
|
||||
@@ -129,6 +135,16 @@ final class Plugin
|
||||
\WPMedia\MCP\OAuth\Bootstrap::instance();
|
||||
}
|
||||
|
||||
/**
|
||||
* The tab "Compatibility" over the registry's profiles: check, release and withdraw for all of them.
|
||||
*
|
||||
* @internal Public for PluginTest only.
|
||||
*/
|
||||
public static function compatibilityTab(IntegrationRegistry $registry, ChangeLog $changeLog): CompatibilityTab
|
||||
{
|
||||
return new CompatibilityTab($registry->compatibility(), $changeLog);
|
||||
}
|
||||
|
||||
/**
|
||||
* The guards of every tool call. DiviFeatureGate judges the Divi IDs; CapabilityGate the IDs of all other profiles
|
||||
* and locks the unknown ones – without it a tool with an unknown ID would run unlocked.
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ defined('ABSPATH') || exit;
|
||||
* names below are therefore duplicated from Access::OPTION, Abilities\ExposurePolicy::OPTION,
|
||||
* Limits::OPTION, ChangeLog\ChangeLogInstaller::VERSION_OPTION, Integrations\Divi\Release\
|
||||
* lit_mcp_<profile>_releases (Compatibility\ReleaseStore), lit_mcp_<profile>_check_report
|
||||
* (Compatibility\CheckReportStore) and lit_mcp_<profile>_check_lock (Divi\Release\DiviCheckRoute::LOCK) for the
|
||||
* (Compatibility\CheckReportStore) and lit_mcp_<profile>_check_lock (Admin\CheckRoute) for the
|
||||
* profiles divi and pods (an explicit list: a LIKE pattern could hit foreign options),
|
||||
* Integrations\Divi\Design\DesignLock::option(), Admin\ConnectionStatus::ENDPOINT_TRANSIENT,
|
||||
* Integrations\Divi\Release\ReleaseResolver::CACHE,
|
||||
|
||||
Reference in New Issue
Block a user