diff --git a/web/app/Controllers/CloudAdminPublicIpPoolReplacementController.php b/web/app/Controllers/CloudAdminPublicIpPoolReplacementController.php index 93f64e79..74f80d0a 100644 --- a/web/app/Controllers/CloudAdminPublicIpPoolReplacementController.php +++ b/web/app/Controllers/CloudAdminPublicIpPoolReplacementController.php @@ -54,9 +54,6 @@ final class CloudAdminPublicIpPoolReplacementController return $response->withJson([ 'task_id' => (string) $job->id, 'status_url' => '/api/v1/tasks/' . (int) $job->id, - 'batch_key' => (string) ($result['batch']['batch_key'] ?? ''), - 'batch' => $result['batch'], - 'unchanged' => ($result['unchanged'] ?? false) === true, ], 202)->withHeader('Cache-Control', 'no-store'); } diff --git a/web/public/cloud/admin-hosts.js b/web/public/cloud/admin-hosts.js index b4c757ea..1eee5aec 100644 --- a/web/public/cloud/admin-hosts.js +++ b/web/public/cloud/admin-hosts.js @@ -1233,20 +1233,14 @@ function observeNetworkPoolReplacement(receipt, hostId, source, pool, panel, bat } async function startNetworkPoolReplacement(hostId, source, pool, payload, panel, target, confirm, submit, feedback) { if (!canManage || state.networkPoolReplacementBusy.has(source.pool_key)) return; + let receipt = null; let body; try { body = networkPoolReplacementRequest(payload, target, confirm.checked, panel); } catch (error) { feedback.textContent = error.message; feedback.className = 'text-danger fs-13 mb-0'; return; } state.networkPoolReplacementBusy.add(source.pool_key); submit.disabled = true; target.disabled = true; confirm.disabled = true; feedback.textContent = '正在冻结源、目标地址池并创建批量任务,请勿重复提交…'; feedback.className = 'text-muted fs-13 mb-0'; try { - const receipt = await acceptedTask(networkPoolReplacementPath(hostId, source.pool_key), { method: 'POST', body }); - announceTaskAccepted(receipt, { title: '受控迁移公网地址池' }); - feedback.textContent = `换池任务 #${receipt.task_id} 已接收。`; - const batch = receipt?.batch && typeof receipt.batch === 'object' ? receipt.batch : null; - const batchKey = String(batch?.batch_key || receipt?.batch_key || ''); - if (batch) renderNetworkPoolReplacementPanel(panel, { source_pool: source, target_options: [], active_batch: batch, history: [] }, hostId, pool); - observeNetworkPoolReplacement(receipt, hostId, source, pool, panel, batchKey); - hostNetworkPoolNotice(`换池任务 #${receipt.task_id} 已接收;实例会由独立子任务并行处理。`); + receipt = await acceptedTask(networkPoolReplacementPath(hostId, source.pool_key), { method: 'POST', body }); } catch (error) { feedback.textContent = error.message; feedback.className = 'text-danger fs-13 mb-0'; if (error.keepMutationLocked === true || error.mutationMayHaveApplied === true) { @@ -1255,7 +1249,16 @@ async function startNetworkPoolReplacement(hostId, source, pool, payload, panel, return; } submit.disabled = false; target.disabled = false; confirm.disabled = false; - } finally { state.networkPoolReplacementBusy.delete(source.pool_key); } + } finally { + state.networkPoolReplacementBusy.delete(source.pool_key); + } + if (!receipt) return; + announceTaskAccepted(receipt, { title: '受控迁移公网地址池' }); + feedback.textContent = `换池任务 #${receipt.task_id} 已接收。`; + hostNetworkPoolNotice(`换池任务 #${receipt.task_id} 已接收;实例会由独立子任务并行处理。`); + delete panel.dataset.loaded; + await loadNetworkPoolReplacement(hostId, pool, panel); + observeNetworkPoolReplacement(receipt, hostId, source, pool, panel, ''); } function networkPoolContextCurrent(hostId, epoch) { const dialog = byId('host-network-pools-drawer'); diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 83077330..868a8080 100644 --- a/web/resources/views/venix/layout_assets.tpl +++ b/web/resources/views/venix/layout_assets.tpl @@ -1,2 +1,2 @@ {* Shared Venix CSS/JS cache key. Increment whenever a shared browser asset changes. *} -{assign var=venix_asset_version value='2026110402' scope='global'} +{assign var=venix_asset_version value='2026110403' scope='global'} diff --git a/web/tests/AdminBillingApiContractTest.php b/web/tests/AdminBillingApiContractTest.php index 3fadee91..06f40e7a 100644 --- a/web/tests/AdminBillingApiContractTest.php +++ b/web/tests/AdminBillingApiContractTest.php @@ -329,7 +329,7 @@ $assert(str_contains($invoicePresentation, && !str_contains($invoicePresentation, 'match (strtolower($status))'), 'User invoice statuses must translate catalog tones, not rebuild semantics.'); $assert(str_contains($layoutAssets, - "venix_asset_version value='2026110402'") + "venix_asset_version value='2026110403'") && str_contains($template, '/cloud/admin-billing.js?v={$venix_asset_version}'), 'Administrator billing asset changes must advance the shared cache key.'); diff --git a/web/tests/AdminHostNetworkPoolsContractTest.php b/web/tests/AdminHostNetworkPoolsContractTest.php index 476940b5..28b40ad0 100644 --- a/web/tests/AdminHostNetworkPoolsContractTest.php +++ b/web/tests/AdminHostNetworkPoolsContractTest.php @@ -240,7 +240,11 @@ $assert(str_contains($template, '受控迁移占用地址') && str_contains($client, 'function renderNetworkPoolReplacementPanel(') && str_contains($client, - 'const receipt = await acceptedTask(networkPoolReplacementPath(') + 'receipt = await acceptedTask(networkPoolReplacementPath(') + && str_contains($client, + 'await loadNetworkPoolReplacement(hostId, pool, panel);') + && !str_contains($client, 'receipt?.batch') + && !str_contains($client, 'receipt?.batch_key') && str_contains($client, "response: 'task'") && str_contains($client, 'observeNetworkPoolReplacement(') && str_contains($client, 'expected_source_revision: sourceRevision') diff --git a/web/tests/CloudAdminTrafficPoolUiContractTest.php b/web/tests/CloudAdminTrafficPoolUiContractTest.php index 7a01464c..c2cd622e 100644 --- a/web/tests/CloudAdminTrafficPoolUiContractTest.php +++ b/web/tests/CloudAdminTrafficPoolUiContractTest.php @@ -102,7 +102,7 @@ $assert(str_contains($styles, && str_contains($styles, '.admin-traffic-line-options > h3') && str_contains($styles, '@media (max-width: 767.98px)') - && preg_match("/venix_asset_version value='2026110402'/", $assets) === 1, + && preg_match("/venix_asset_version value='2026110403'/", $assets) === 1, 'Traffic-pool administration must remain responsive and use a new shared asset version.'); echo "Administrator shared traffic-pool UI contracts passed.\n"; diff --git a/web/tests/CloudAssetVersionContractTest.php b/web/tests/CloudAssetVersionContractTest.php index c2bdbf23..957573ae 100644 --- a/web/tests/CloudAssetVersionContractTest.php +++ b/web/tests/CloudAssetVersionContractTest.php @@ -15,7 +15,7 @@ $assert = static function (bool $condition, string $message): void { }; $assert(is_string($assets) - && str_contains($assets, "venix_asset_version value='2026110402'") + && str_contains($assets, "venix_asset_version value='2026110403'") && is_string($cloudShell) && str_contains($cloudShell, '/cloud/app.js?v={$venix_asset_version}'), 'The cloud application entry must use the shared Venix asset version.'); diff --git a/web/tests/CloudPublicIpPoolReplacementHttpContractTest.php b/web/tests/CloudPublicIpPoolReplacementHttpContractTest.php index 3835d9b1..88302189 100644 --- a/web/tests/CloudPublicIpPoolReplacementHttpContractTest.php +++ b/web/tests/CloudPublicIpPoolReplacementHttpContractTest.php @@ -24,12 +24,28 @@ $assert(str_contains( $routes, '/replacement-batches/{batch_key:[0-9a-f]{32}}' ), 'Public-pool replacement detail route is missing.'); +$receiptMatch = []; +$receiptMatched = preg_match( + '/return \\$response->withJson\(\[\s*(.*?)\s*\],\s*202\)/s', + (string) $controller, + $receiptMatch +) === 1; +$receiptKeys = []; +if ($receiptMatched) { + preg_match_all( + "/'([a-z_]+)'\\s*=>/", + (string) ($receiptMatch[1] ?? ''), + $receiptKeys + ); +} +$receiptKeys = array_values(array_unique($receiptKeys[1] ?? [])); +sort($receiptKeys); $assert(is_string($controller) && str_contains($controller, "'confirm_replacement'") && str_contains($controller, "'expected_source_revision'") && str_contains($controller, "'expected_target_revision'") - && str_contains($controller, '], 202)') - && str_contains($controller, "'status_url'"), + && $receiptMatched + && $receiptKeys === ['status_url', 'task_id'], 'Replacement controller lost its strict input or 202 task receipt.'); $assert(is_string($service) && str_contains($service, "'target_pool_key'") diff --git a/web/tests/CloudTrafficPoolUserUiContractTest.php b/web/tests/CloudTrafficPoolUserUiContractTest.php index e69c44b2..4004e334 100644 --- a/web/tests/CloudTrafficPoolUserUiContractTest.php +++ b/web/tests/CloudTrafficPoolUserUiContractTest.php @@ -193,7 +193,7 @@ $assert(str_contains($view, 'function trafficPools(') '@media(max-width:1100px){.cloud-traffic-instance dl{grid-template-columns:repeat(2,minmax(0,1fr))') && str_contains($styles, '@media(max-width:510px)') && preg_match( - "/venix_asset_version value='2026110402'/", + "/venix_asset_version value='2026110403'/", $assets ) === 1, 'Traffic-pool formatting, detail semantics, responsive layout or asset revision is incomplete.'); diff --git a/web/tests/TicketFrontendAssetsContractTest.php b/web/tests/TicketFrontendAssetsContractTest.php index fac3fc91..1ab2b6f0 100644 --- a/web/tests/TicketFrontendAssetsContractTest.php +++ b/web/tests/TicketFrontendAssetsContractTest.php @@ -94,7 +94,7 @@ $assert(!str_contains($adminHomeCss, '.admin-ticket-thread') && str_contains($adminTicketCss, '.admin-ticket-thread') && str_contains($adminTicketCss, '.admin-ticket-preview-remove'), 'Administrator ticket-only styles are not isolated, or shared legacy primitives were removed.'); -$assert(preg_match("/venix_asset_version value='2026110402'/", $assets) === 1, +$assert(preg_match("/venix_asset_version value='2026110403'/", $assets) === 1, 'Ticket asset extraction must advance the shared browser cache key.'); echo "Ticket frontend asset contract passed.\n"; diff --git a/web/tests/TicketWorkflowPolishContractTest.php b/web/tests/TicketWorkflowPolishContractTest.php index 0d1bf9c5..344bbb65 100644 --- a/web/tests/TicketWorkflowPolishContractTest.php +++ b/web/tests/TicketWorkflowPolishContractTest.php @@ -52,7 +52,7 @@ $assert(str_contains($adminCss, '.admin-ticket-table td[data-label]::before') && str_contains($adminCss, ':focus-visible') && str_contains($adminCss, 'prefers-reduced-motion: reduce'), 'Administrator ticket cards, focus treatment or reduced-motion support is missing.'); -$assert(preg_match("/venix_asset_version value='2026110402'/", $assets) === 1, +$assert(preg_match("/venix_asset_version value='2026110403'/", $assets) === 1, 'Ticket workflow polish must advance the shared browser cache key.'); echo "Ticket workflow polish contract passed.\n";