diff --git a/docs/MULTI_PUBLIC_IPV4_POOLS.md b/docs/MULTI_PUBLIC_IPV4_POOLS.md index b11cf108..f1e0158f 100644 --- a/docs/MULTI_PUBLIC_IPV4_POOLS.md +++ b/docs/MULTI_PUBLIC_IPV4_POOLS.md @@ -43,7 +43,7 @@ 超级管理员可在“配置文件 → 云实例计费”设置单次更换公网 IP 的 USD 价格。默认值 `0.00` 表示关闭用户自助入口;修改价格只影响之后的新请求,浏览器必须回传刚刚确认的金额,价格已变化时服务端拒绝提交并要求刷新。 -用户只能为自己仍在服务期内的面板云镜像实例提交请求。候选列表来自实例当前宿主机、同一网络线路中状态为 `active` 且已经 `applied` 的地址池,并且只包含 IP 账本中状态为 `available`、没有 reservation、instance 或 operation 关联的地址;已禁用、已分配、正在更换或结果不确定的地址不会出现。 +用户只能为自己仍在服务期内的面板云镜像实例提交请求。用户页面只显示单次更换费用,不公开候选 IP、候选数量、当前余额或地址池标识,也不接受用户指定目标地址。提交后由服务端从实例当前宿主机、同一网络线路中状态为 `active` 且已经 `applied` 的地址池自动选择 IP;目标必须在账本中处于 `available`,且没有 reservation、instance 或 operation 关联,已禁用、已分配、正在更换或结果不确定的地址不会被选中。管理员虚拟机管理仍保留明确选择目标 IP 的能力。 提交必须带稳定的 `Idempotency-Key`。面板在同一个数据库事务中按“钱包 → 实例 → 网络账本”的顺序加锁,冻结目标 IP、创建单次派发任务与已支付账单,并从余额扣款;同一请求重试只返回原任务,不会再次扣费。Agent 明确证明操作未生效时,最终结算在同一锁序中释放目标 IP 并且只退款一次;成功时保留扣款;派发后超时、断线或其他结果不确定状态不退款、不释放地址,也不自动重放,继续按原 `operation_id` 核对。 diff --git a/web/app/Controllers/CloudApiController.php b/web/app/Controllers/CloudApiController.php index 61e67461..24d8a6e5 100644 --- a/web/app/Controllers/CloudApiController.php +++ b/web/app/Controllers/CloudApiController.php @@ -1307,7 +1307,7 @@ final class CloudApiController ], 202); } - /** Tenant-safe, balance-priced choices from the current host IP ledger. */ + /** Tenant-safe paid IP-change quote without exposing host IP inventory. */ public function networkOptions($request, $response, $args) { $actor = $this->actor($request); @@ -1342,20 +1342,11 @@ final class CloudApiController return $this->json($response, [ 'instance_id' => (string) $instance->id, - 'current_ip_cidr' => $options['current_ip_cidr'] ?? null, - 'available_ip_options' => array_values( - $options['available_ip_options'] ?? [] - ), - 'available_count' => max( - 0, - (int) ($options['available_count'] ?? 0) - ), 'active_job' => $options['active_job'] ?? null, 'configuration_state' => (string) ($options['configuration_state'] ?? 'invalid'), 'price' => $price, 'currency' => 'USD', - 'balance' => $balance, 'enabled' => $enabled, 'balance_sufficient' => $balanceSufficient, 'can_change' => $canChange, @@ -1375,17 +1366,10 @@ final class CloudApiController throw new CloudError('只能为自己持有的实例更换 IP', 403); } $body = CloudInput::object($request); - CloudInput::only($body, [ - 'public_ip_cidr', 'public_pool_key', 'expected_amount', - 'confirm_restart', - ]); + CloudInput::only($body, ['expected_amount', 'confirm_restart']); if (($body['confirm_restart'] ?? false) !== true) { throw new CloudError('更换公网 IP 前必须确认虚拟机会短暂重启'); } - $cidr = CloudInput::publicIpCidr($body['public_ip_cidr'] ?? null); - $publicPoolKey = CloudInput::publicPoolKey( - $body['public_pool_key'] ?? null - ); try { $expectedAmount = CloudIpChangeBillingService::normalizePrice( $body['expected_amount'] ?? null @@ -1408,11 +1392,7 @@ final class CloudApiController 'network_change', 'POST', '/network', - [ - 'public_ip_cidr' => $cidr, - 'public_pool_key' => $publicPoolKey, - 'confirm_restart' => true, - ], + ['confirm_restart' => true], null, $expectedAmount ); diff --git a/web/app/Services/Cloud/CloudJobService.php b/web/app/Services/Cloud/CloudJobService.php index f0053bc6..85049efc 100644 --- a/web/app/Services/Cloud/CloudJobService.php +++ b/web/app/Services/Cloud/CloudJobService.php @@ -2377,17 +2377,20 @@ final class CloudJobService unset($body['confirmation_name']); } if ($kind === 'network_change') { - CloudInput::only($body, - ['public_ip_cidr', 'public_pool_key', 'confirm_restart']); + CloudInput::only($body, $paidNetworkChange + ? ['confirm_restart'] + : ['public_ip_cidr', 'public_pool_key', 'confirm_restart']); if (($body['confirm_restart'] ?? false) !== true) { throw new CloudError('更换公网 IP 前必须确认虚拟机会短暂重启'); } - $body['public_ip_cidr'] = CloudInput::publicIpCidr( - $body['public_ip_cidr'] ?? null - ); - $body['public_pool_key'] = CloudInput::publicPoolKey( - $body['public_pool_key'] ?? null - ); + if (!$paidNetworkChange) { + $body['public_ip_cidr'] = CloudInput::publicIpCidr( + $body['public_ip_cidr'] ?? null + ); + $body['public_pool_key'] = CloudInput::publicPoolKey( + $body['public_pool_key'] ?? null + ); + } } if ($kind === 'instance_settings') { CloudInput::only($body, ['hostname', 'root_password', 'ssh_public_key', 'confirm_restart']); @@ -2554,6 +2557,28 @@ final class CloudJobService || (int) ($reservationRef->public_ip_pool_id ?? 0) < 1) { throw new CloudError('虚拟机缺少有效的公网 IP 资源预留', 409); } + if ($paidNetworkChange) { + // The host row serializes IP allocation on this host. Pick + // from the same validated ledger used by the availability + // quote, but never expose or accept the target in the + // tenant request. + $networkOptions = + CloudNetworkChangeOptionsService::forInstance($locked); + $automaticTarget = + $networkOptions['available_ip_options'][0] ?? null; + if (!is_array($automaticTarget)) { + throw new CloudError( + '当前公网地址池没有可用 IP', + 409 + ); + } + $body['public_ip_cidr'] = CloudInput::publicIpCidr( + $automaticTarget['public_ip_cidr'] ?? null + ); + $body['public_pool_key'] = CloudInput::publicPoolKey( + $automaticTarget['public_pool_key'] ?? null + ); + } $parts = explode('/', (string) $body['public_ip_cidr'], 2); $targetPoolRef = CloudPublicIpPool::where('host_id', (int) $host->id) ->where('pool_key', (string) $body['public_pool_key'])->first(); diff --git a/web/public/cloud/app.js b/web/public/cloud/app.js index 8bcb4ee1..bc721eaa 100644 --- a/web/public/cloud/app.js +++ b/web/public/cloud/app.js @@ -1,4 +1,4 @@ -import { initializeTaskCenter } from './task-center.js?v=2026102302'; +import { initializeTaskCenter } from './task-center.js?v=2026102303'; const pageModules = Object.freeze({ instances: '/cloud/instances.js', diff --git a/web/public/cloud/detail.js b/web/public/cloud/detail.js index 7a7b1380..111b4770 100644 --- a/web/public/cloud/detail.js +++ b/web/public/cloud/detail.js @@ -449,7 +449,7 @@ function activateInstanceSettingTab(vmId, tab, focus = false) { void loadVmSnapshots(vmId, true); } else if (tab === 'ip_change') { settingStatus(); - void loadIpChangeOptions(vmId); + void loadIpChangeQuote(vmId); } } @@ -1354,71 +1354,38 @@ function ipChangeMoney(value, currency = 'USD') { return `${String(currency).toUpperCase() === 'USD' ? '$' : ''}${amount.toFixed(2)}`; } -function ipChangeOptions(payload) { - if (!Array.isArray(payload?.available_ip_options)) return []; - return payload.available_ip_options.filter(option => option - && /^[a-f0-9]{32}$/.test(String(option.public_pool_key || '')) - && /^(?:\d{1,3}\.){3}\d{1,3}\/\d{1,2}$/.test(String(option.public_ip_cidr || ''))); -} - -function renderIpChangeOptions(payload) { - const select = byId('vm-ip-change-target'); +function renderIpChangeQuote(payload) { const checkbox = byId('vm-ip-change-form')?.elements.confirm_purchase; const submit = byId('vm-ip-change-submit'); - if (!select || !checkbox || !submit) return; - const selectedPoolKey = String( - select.selectedOptions[0]?.dataset.poolKey || '' - ); - const selectedIpCidr = String( - select.selectedOptions[0]?.dataset.publicIpCidr || '' - ); - const options = ipChangeOptions(payload); - select.replaceChildren(); - const placeholder = document.createElement('option'); - placeholder.value = ''; - placeholder.textContent = options.length ? '请选择新的公网 IP' : '当前没有可用公网 IP'; - select.append(placeholder); - options.forEach((option, index) => { - const item = document.createElement('option'); - item.value = String(index); - item.textContent = String(option.public_ip_cidr); - item.dataset.poolKey = String(option.public_pool_key); - item.dataset.publicIpCidr = String(option.public_ip_cidr); - item.selected = item.dataset.poolKey === selectedPoolKey - && item.dataset.publicIpCidr === selectedIpCidr; - select.append(item); - }); - byId('vm-ip-change-current').textContent = String(payload?.current_ip_cidr || '未记录'); + if (!checkbox || !submit) return; byId('vm-ip-change-price').textContent = ipChangeMoney(payload?.price, payload?.currency); - byId('vm-ip-change-balance').textContent = ipChangeMoney(payload?.balance, payload?.currency); - const allowed = payload?.can_change === true && options.length > 0 && !ipChangeSubmitting; - select.disabled = !allowed; + const allowed = payload?.can_change === true && !ipChangeSubmitting; checkbox.disabled = !allowed; - submit.disabled = !allowed || !select.value || checkbox.checked !== true; + submit.disabled = !allowed || checkbox.checked !== true; } -async function loadIpChangeOptions(vmId, force = false) { +async function loadIpChangeQuote(vmId, force = false) { if (!byId('vm-ip-change-form')) return null; if (!force && ipChangePayload && ipChangeLoadedVmId === String(vmId)) { - renderIpChangeOptions(ipChangePayload); + renderIpChangeQuote(ipChangePayload); return ipChangePayload; } if (ipChangeRequest) return ipChangeRequest; - ipChangeStatus('正在读取价格、余额和可用公网 IP…'); + ipChangeStatus('正在读取更换费用…'); ipChangeError(); ipChangeRequest = (async () => { try { const payload = await api(`/api/v1/vms/${encodeURIComponent(vmId)}/network-options`); if (!payload || typeof payload !== 'object' || Array.isArray(payload) - || typeof payload.price !== 'string' || typeof payload.balance !== 'string') { + || typeof payload.price !== 'string') { throw new Error('更换 IP 配置响应无效。'); } ipChangePayload = payload; ipChangeLoadedVmId = String(vmId); - renderIpChangeOptions(payload); + renderIpChangeQuote(payload); const message = String(payload.message || ''); if (payload.can_change === true) { - ipChangeStatus(`可选择 ${ipChangeOptions(payload).length} 个地址;提交时将扣除 ${ipChangeMoney(payload.price, payload.currency)}。`, 'success'); + ipChangeStatus(`本次更换费用为 ${ipChangeMoney(payload.price, payload.currency)}。`, 'success'); } else { ipChangeStatus(message || (payload.active_job ? '实例已有任务正在执行,请等待完成后刷新。' @@ -1428,7 +1395,7 @@ async function loadIpChangeOptions(vmId, force = false) { } catch (error) { ipChangePayload = null; ipChangeLoadedVmId = null; - renderIpChangeOptions({ available_ip_options: [], price: '0.00', balance: '0.00' }); + renderIpChangeQuote({ price: '0.00' }); ipChangeStatus(error.message || '更换 IP 配置加载失败,请稍后重试。', 'error'); throw error; } finally { @@ -1462,7 +1429,7 @@ function pollIpChangeJob(vmId, receipt) { onTerminal: task => { void (async () => { await refreshMetadataAndStatus(vmId, false, true, true); - await loadIpChangeOptions(vmId, true).catch(() => null); + await loadIpChangeQuote(vmId, true).catch(() => null); if (taskSucceededWithoutRecovery(task)) { ipChangeStatus('公网 IP 已更换,实例详情已刷新。', 'success'); toast('公网 IP 更换完成。', 'success'); @@ -1487,43 +1454,34 @@ function pollIpChangeJob(vmId, receipt) { function bindIpChange(vmId) { const form = byId('vm-ip-change-form'); - const select = byId('vm-ip-change-target'); const checkbox = form?.elements.confirm_purchase; const submit = byId('vm-ip-change-submit'); - if (!form || !select || !checkbox || !submit) return; + if (!form || !checkbox || !submit) return; const sync = () => { const allowed = ipChangePayload?.can_change === true && !ipChangeSubmitting; - submit.disabled = !allowed || !select.value || checkbox.checked !== true; + submit.disabled = !allowed || checkbox.checked !== true; }; - select.addEventListener('change', sync); checkbox.addEventListener('change', sync); form.addEventListener('submit', async event => { event.preventDefault(); if (ipChangeSubmitting || ipChangePayload?.can_change !== true) return; - const selected = select.selectedOptions[0]; - const publicIpCidr = String(selected?.dataset.publicIpCidr || ''); - const publicPoolKey = String(selected?.dataset.poolKey || ''); const expectedAmount = String(ipChangePayload.price || ''); - if (!publicIpCidr || !publicPoolKey) { - ipChangeError('请选择新的公网 IP。'); - return; - } if (!checkbox.checked) { ipChangeError('请确认扣费和短暂重启。'); return; } const confirmed = await requestUserConfirmation({ title: '确认付费更换公网 IP', - message: `将公网 IP 更换为 ${publicIpCidr},并从余额扣除 ${ipChangeMoney(expectedAmount, ipChangePayload.currency)}。实例可能短暂重启。`, + message: `系统将自动分配一个可用公网 IP,并从余额扣除 ${ipChangeMoney(expectedAmount, ipChangePayload.currency)}。实例可能短暂重启。`, confirmText: '确认扣费并更换', tone: 'danger', }); if (!confirmed) return; - const fingerprint = `${publicPoolKey}|${publicIpCidr}|${expectedAmount}`; + const fingerprint = `automatic|${expectedAmount}`; const idempotencyKey = pendingIpChangeKey(vmId, fingerprint); ipChangeSubmitting = true; ipChangeError(); - renderIpChangeOptions(ipChangePayload); + renderIpChangeQuote(ipChangePayload); submit.textContent = '正在提交…'; try { const receipt = await api(`/api/v1/vms/${encodeURIComponent(vmId)}/network`, { @@ -1532,26 +1490,17 @@ function bindIpChange(vmId) { expectedStatus: 202, requireTaskReceipt: true, body: { - public_ip_cidr: publicIpCidr, - public_pool_key: publicPoolKey, expected_amount: expectedAmount, confirm_restart: true, }, }); clearPendingIpChangeKey(vmId); checkbox.checked = false; - const priorBalance = Number(ipChangePayload.balance); - const chargedAmount = Number(expectedAmount); - const nextBalance = Number.isFinite(priorBalance) - && Number.isFinite(chargedAmount) && priorBalance >= chargedAmount - ? (priorBalance - chargedAmount).toFixed(2) - : ipChangePayload.balance; ipChangePayload = { ...ipChangePayload, can_change: false, - balance: nextBalance, }; - renderIpChangeOptions(ipChangePayload); + renderIpChangeQuote(ipChangePayload); ipChangeStatus(`任务已接收,已扣除 ${ipChangeMoney(expectedAmount, ipChangePayload.currency)};正在等待宿主机确认结果。`); toast('付费更换 IP 任务已接收。', 'success'); if (!pollIpChangeJob(vmId, receipt)) { @@ -1562,17 +1511,17 @@ function bindIpChange(vmId) { const message = error.message || '更换 IP 提交失败,请稍后重试。'; if (uncertain) { ipChangeError(message); - ipChangeStatus('请求结果暂时无法确认;页面已保留原目标和同一请求标识。请勿选择其他 IP,重新点击提交只会核对原请求。', 'warning'); + ipChangeStatus('请求结果暂时无法确认;页面已保留同一请求标识。请勿发起其他更换,重新点击提交只会核对原请求。', 'warning'); } else { clearPendingIpChangeKey(vmId); - await loadIpChangeOptions(vmId, true).catch(() => null); + await loadIpChangeQuote(vmId, true).catch(() => null); ipChangeError(message); ipChangeStatus('更换 IP 未提交,请按提示修正后重试。', 'error'); } } finally { ipChangeSubmitting = false; submit.textContent = '确认付费更换'; - if (ipChangePayload) renderIpChangeOptions(ipChangePayload); + if (ipChangePayload) renderIpChangeQuote(ipChangePayload); } }); } @@ -1787,7 +1736,7 @@ export async function initialize() { await refreshMetadataAndStatus(vmId, true, true, true); if (trafficDailyViewVisible()) await loadVmTrafficDaily(true); if (state.detailTab === 'operations-log') await loadOperationLogs(vmId, true); - if (!byId('vm-settings-section-ip-change')?.hidden) await loadIpChangeOptions(vmId, true); + if (!byId('vm-settings-section-ip-change')?.hidden) await loadIpChangeQuote(vmId, true); if (!byId('vm-settings-section-firewall')?.hidden) await loadVmFirewall(vmId, true); if (!byId('vm-settings-section-snapshots')?.hidden) await loadVmSnapshots(vmId, true); }); @@ -1864,7 +1813,7 @@ export async function initialize() { void loadVmSnapshots(vmId, true); } if (!byId('vm-settings-section-ip-change')?.hidden) { - void loadIpChangeOptions(vmId, true); + void loadIpChangeQuote(vmId, true); } startPolling(); }); diff --git a/web/public/cloud/styles.css b/web/public/cloud/styles.css index 5a1a3460..a428ec93 100644 --- a/web/public/cloud/styles.css +++ b/web/public/cloud/styles.css @@ -288,4 +288,4 @@ body.vu-body .ssh-key-picker-manage:hover { } @media(max-width:510px){.deployment-step{padding-bottom:23px;margin-bottom:22px}.deployment-step-heading{margin-bottom:16px}.region-picker,.line-picker{grid-template-columns:1fr}.region-option{min-height:66px}.line-option{min-height:54px}.offer-option{grid-template-columns:repeat(4,minmax(0,1fr));grid-template-rows:auto auto;gap:12px 8px;min-height:108px;padding:15px 14px 14px 16px}.offer-option::after{content:"";position:absolute;top:13px;right:14px;display:grid;place-items:center;width:22px;height:22px;border:1.5px solid #bdccd4;border-radius:50%;background:#fff;color:transparent;font-size:12px;font-weight:900}.offer-option[aria-pressed="true"]{box-shadow:none}.offer-option[aria-pressed="true"]::after{content:"✓";top:13px;right:14px;width:22px;height:22px;border:1.5px solid #18a6b0;background:#18a6b0;color:#fff}.offer-option.is-sold-out::after{display:none}.offer-option-name{grid-column:1/3;grid-row:1;align-self:center;font-size:14px}.offer-option-price{display:block;grid-column:3/5;grid-row:1;align-self:center;justify-self:end;padding-right:30px;font-size:14px;white-space:nowrap}.offer-option.is-sold-out .offer-option-price{padding-right:0}.offer-option-price::before{display:none;content:none}.offer-option-value{display:grid;grid-row:2;gap:4px;white-space:normal}.offer-option-value::before{color:#718599;font-size:9px;font-weight:800;white-space:nowrap}.offer-option>:nth-child(2){grid-column:1}.offer-option>:nth-child(3){grid-column:2}.offer-option>:nth-child(4){grid-column:3}.offer-option>:nth-child(5){grid-column:4}.template-family-card{height:140px;min-height:140px;border:1px solid #dce7ec;border-radius:12px;background:#fff;overflow:hidden;box-shadow:none}.template-family-summary{height:100%;min-height:100%;border:0;border-radius:inherit;background:transparent}.template-family-card[open]{z-index:70;border-color:#a8dadd;box-shadow:0 12px 28px rgba(30,66,82,.14)}.template-family-card.has-selection{border-color:#2eabb4;background:#f5fbfb}.template-versions{position:absolute;inset:0;z-index:80;width:auto;height:auto;max-height:none;margin:0;padding:6px 8px 40px;overflow-y:auto;border:0;border-radius:inherit;background:#fbfdfd;box-shadow:none;overscroll-behavior:contain;-webkit-overflow-scrolling:touch}.template-family-card[open] .template-family-footer{position:absolute;right:7px;bottom:7px;z-index:90;width:32px;min-height:32px;border-radius:999px;background:#eaf8f8}.template-family-card[open] .template-family-selection{display:none}.user-iso-row{align-items:flex-start;flex-direction:column}.user-iso-row .row-button{width:100%}} .vm-state-sync{display:block;margin-top:4px;color:#8b9aaa;font-size:10px;line-height:1.35;white-space:nowrap}.vm-state-sync.stale{color:#b98129}.vm-state-sync.offline{color:#bd5b63}.vm-detail-state-stack{display:flex;flex-direction:column;align-items:flex-end;gap:3px}.vm-detail-state-stack .vm-state-sync{margin-top:0} -.vm-ip-change-facts{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:1px;margin:0 0 24px;padding:1px;background:#e5ecef}.vm-ip-change-facts>div{min-width:0;padding:14px 16px;background:#fff}.vm-ip-change-facts dt{margin-bottom:5px;color:#8796a4;font-size:10px}.vm-ip-change-facts dd{margin:0;color:#294257;font:700 12px/1.5 ui-monospace,SFMono-Regular,Menlo,monospace;overflow-wrap:anywhere}@media screen and (max-width:510px){.vm-ip-change-facts{grid-template-columns:1fr}.vm-ip-change-facts>div{padding:11px 13px}} +.vm-ip-change-facts{display:grid;grid-template-columns:1fr;gap:1px;margin:0 0 24px;padding:1px;background:#e5ecef}.vm-ip-change-facts>div{min-width:0;padding:14px 16px;background:#fff}.vm-ip-change-facts dt{margin-bottom:5px;color:#8796a4;font-size:10px}.vm-ip-change-facts dd{margin:0;color:#294257;font:700 12px/1.5 ui-monospace,SFMono-Regular,Menlo,monospace;overflow-wrap:anywhere}@media screen and (max-width:510px){.vm-ip-change-facts>div{padding:11px 13px}} diff --git a/web/resources/views/venix/cloud/pages/detail.tpl b/web/resources/views/venix/cloud/pages/detail.tpl index 679f9bf5..19501d8e 100644 --- a/web/resources/views/venix/cloud/pages/detail.tpl +++ b/web/resources/views/venix/cloud/pages/detail.tpl @@ -85,16 +85,13 @@