From 579be14f1a4e01c3517a73363281659cd88b634c Mon Sep 17 00:00:00 2001 From: codex Date: Sat, 31 Oct 2026 18:46:36 +0800 Subject: [PATCH] refactor(admin): consolidate instance action lifecycle --- web/public/cloud/admin-instance-actions.js | 77 +++++++++++++++++++ web/public/cloud/admin-instance-backups.js | 42 ++++------ .../cloud/admin-instance-configuration.js | 35 ++++----- web/public/cloud/admin-instance-transport.js | 35 --------- web/public/cloud/admin-instances.js | 63 ++------------- web/resources/views/venix/layout_assets.tpl | 2 +- web/tests/AdminActionRuntimeContractTest.php | 4 +- .../AdminInstanceActionsBehaviorTest.mjs | 58 ++++++++++++++ web/tests/AdminInstanceViewTest.php | 3 +- web/tests/CloudAssetVersionContractTest.php | 2 +- ...CloudPortableBackupAdminUiContractTest.php | 6 +- web/tests/CloudTaskObserverBehaviorTest.mjs | 8 +- 12 files changed, 182 insertions(+), 153 deletions(-) create mode 100644 web/public/cloud/admin-instance-actions.js delete mode 100644 web/public/cloud/admin-instance-transport.js create mode 100644 web/tests/AdminInstanceActionsBehaviorTest.mjs diff --git a/web/public/cloud/admin-instance-actions.js b/web/public/cloud/admin-instance-actions.js new file mode 100644 index 00000000..5c4077d8 --- /dev/null +++ b/web/public/cloud/admin-instance-actions.js @@ -0,0 +1,77 @@ +const assetVersion = new URL(import.meta.url).searchParams.get('v'); +function versionedModuleUrl(path) { + const url = new URL(path, import.meta.url); + if (assetVersion) url.searchParams.set('v', assetVersion); + return url.href; +} +const taskRuntime = await import(versionedModuleUrl('./task-observer.js')); + +// Own the instance action contract: safe transport, receipt announcement, +// terminal interpretation and fence messages. Polling remains in task-observer. +export function createAdminInstanceActions({ + runtimeFactory = globalThis.VenixAdminRequestRuntime?.create, + tasks = taskRuntime, + ...transportOptions +} = {}) { + if (typeof runtimeFactory !== 'function') { + throw new TypeError('administrator request runtime is unavailable'); + } + const runtime = runtimeFactory({ ...transportOptions, taskReceiptValidator: tasks.taskUrl }); + + function failureMessage(task, fallback) { + const recoveryNotice = tasks.recoveryTaskFailureNotice(task); + if (recoveryNotice) return recoveryNotice; + const message = task?.error || fallback; + if (task?.effect_may_have_applied) { + return `${message} 任务已失败,操作效果可能已经发生,相关资源已锁定。请勿再次提交,并将任务编号交由管理员核查。`; + } + return task?.safe_to_resubmit === false + ? `${message} 任务已失败且相关资源已锁定,请勿再次提交,并联系管理员核查。` : message; + } + + function blockMessage(task, action) { + if (task?.blocks_mutation !== true) return ''; + const id = task?.id || '—'; + if (task.completed === false && task.status === 'active') { + return `实例已有任务 #${id}(执行中),完成前不能${action}。`; + } + if (task.completed === true && task.recovery?.pending === true) { + const code = String(task.recovery?.code || task.finalization_error_code || ''); + if (code === 'recovery_dispatch_ledger_conflict' || task.dispatch_state === 'invalid') { + return `任务 #${id} 的派发账本异常,资源保持安全锁定;修复账本并完成核验前不能${action}。`; + } + if (task.dispatch_state === 'not_dispatched') { + return `任务 #${id} 已确认未派发到宿主机,但 PHP 本地账本收尾尚未完成;收尾成功前不能${action}。`; + } + return `任务 #${id} 尚在持续恢复,资源保持安全锁定;恢复收敛前不能${action}。`; + } + if (task.completed === true && task.status === 'failed') { + return `任务 #${id} 已失败,资源安全锁定,需管理员人工处理后才能${action}。`; + } + return `任务 #${id} 状态协议无效,资源安全锁定,需管理员人工处理后才能${action}。`; + } + + function watch(receipt, { title, onResult, ...options }) { + tasks.announceTaskAccepted(receipt, { title }); + return tasks.observeTask(receipt, { + ...options, + onTerminal(task) { + const succeeded = tasks.taskSucceededWithoutRecovery(task); + const label = `${title}任务 #${receipt.task_id || '—'}`; + onResult?.({ task, succeeded, message: succeeded ? `${label} 已成功。` + : failureMessage(task, `${label} 执行失败。`) }); + }, + }); + } + + return Object.freeze({ + read: (path, controller) => runtime.read(path, { signal: controller?.signal, timeoutMs: 30000 }), + commit: (path, body, controller, method = 'POST') => runtime.mutate(path, { + method, body, signal: controller?.signal, response: 'json', + }), + enqueue: (path, body, controller, method = 'PATCH') => runtime.mutate(path, { + method, body, signal: controller?.signal, response: 'task', + }), + watch, blockMessage, + }); +} diff --git a/web/public/cloud/admin-instance-backups.js b/web/public/cloud/admin-instance-backups.js index 95ba27ae..393e11e3 100644 --- a/web/public/cloud/admin-instance-backups.js +++ b/web/public/cloud/admin-instance-backups.js @@ -60,23 +60,13 @@ function backupTargets(payload, backup) { } export function createAdminInstanceBackups({ - byId, - read, - mutate, - mutateJson, - createMigration, - announceTaskAccepted, - observeTask, - taskSucceededWithoutRecovery, - taskFailureMessage, - mutationBlockMessage, - onNotice, + byId, actions, createMigration, onNotice, } = {}) { - if (typeof byId !== 'function' || typeof read !== 'function' - || typeof mutate !== 'function' || typeof mutateJson !== 'function' + if (typeof byId !== 'function' || typeof actions?.enqueue !== 'function' || typeof createMigration !== 'function') { throw new TypeError('Instance backup dependencies are incomplete'); } + const { read, enqueue, commit, blockMessage } = actions; const state = { currentId: null, request: null, mutationRequest: null, observer: null, serial: 0, loadedFor: null, @@ -114,14 +104,12 @@ export function createAdminInstanceBackups({ function watchInstanceTask(vmId, receipt, title) { const serial = state.serial; const taskId = receipt?.task_id || '—'; - announceTaskAccepted(receipt, { title }); - const handle = observeTask(receipt, { - onTerminal: task => { + const handle = actions.watch(receipt, { + title, + onResult: ({ succeeded, message }) => { if (serial !== state.serial || state.currentId !== String(vmId)) return; state.observer = null; - const succeeded = taskSucceededWithoutRecovery(task); - onNotice?.(succeeded ? `${title}任务 #${taskId} 已成功。` - : taskFailureMessage(task, `${title}任务 #${taskId} 执行失败。`), !succeeded); + onNotice?.(message, !succeeded); load(vmId, true); }, onStop: reason => { @@ -141,14 +129,12 @@ export function createAdminInstanceBackups({ function watchLibraryTask(receipt, title) { const serial = state.librarySerial; const taskId = receipt?.task_id || '—'; - announceTaskAccepted(receipt, { title }); - const handle = observeTask(receipt, { - onTerminal: task => { + const handle = actions.watch(receipt, { + title, + onResult: ({ succeeded, message }) => { if (serial !== state.librarySerial || !byId('backup-library')?.open) return; state.libraryObserver = null; - const succeeded = taskSucceededWithoutRecovery(task); - libraryNotice(succeeded ? `${title}任务 #${taskId} 已成功。` - : taskFailureMessage(task, `${title}任务 #${taskId} 执行失败。`), !succeeded); + libraryNotice(message, !succeeded); loadLibrary(state.libraryPage, true); }, onStop: reason => { @@ -170,7 +156,7 @@ export function createAdminInstanceBackups({ if (state.mutationRequest) throw new Error('已有备份或迁移操作正在提交,请稍后重试。'); const controller = new AbortController(); state.mutationRequest = controller; try { - const receipt = await mutate(path, body, controller, 'POST'); + const receipt = await enqueue(path, body, controller, 'POST'); if (library) watchLibraryTask(receipt, title); else watchInstanceTask(vmId, receipt, title); return receipt; } finally { @@ -186,7 +172,7 @@ export function createAdminInstanceBackups({ }); async function deleteObject(vmId, backup, controller, library = false) { - const payload = await mutateJson( + const payload = await commit( mutationUrl(vmId, backup.id, '', library), undefined, controller, 'DELETE', ); if (payload?.deleted !== true && payload?.requires_reconciliation !== true @@ -364,7 +350,7 @@ export function createAdminInstanceBackups({ if (mutationBlocked) { for (const control of form.querySelectorAll('input, select, button')) control.disabled = true; const reason = payload?.active_job?.blocks_mutation === true - ? mutationBlockMessage(payload.active_job, '创建备份') + ? blockMessage(payload.active_job, '创建备份') : text(payload?.create_block_reason, payload?.message, '当前实例或对象存储尚未满足备份条件。'); feedback(createBody, reason, 'warning'); } diff --git a/web/public/cloud/admin-instance-configuration.js b/web/public/cloud/admin-instance-configuration.js index e23a060b..f8333d07 100644 --- a/web/public/cloud/admin-instance-configuration.js +++ b/web/public/cloud/admin-instance-configuration.js @@ -139,13 +139,12 @@ function networkOptionSummary(options, selectedPool = null) { } export function createAdminInstanceConfiguration({ - byId, read, mutate, announceTaskAccepted, observeTask, - taskSucceededWithoutRecovery, taskFailureMessage, mutationBlockMessage, - onNotice, onRefresh, + byId, actions, onNotice, onRefresh, } = {}) { - if (typeof byId !== 'function' || typeof read !== 'function' || typeof mutate !== 'function') { + if (typeof byId !== 'function' || typeof actions?.enqueue !== 'function') { throw new TypeError('Instance configuration dependencies are incomplete'); } + const { read, enqueue, blockMessage } = actions; const state = { currentId: null, networkRequest: null, networkOptionsRequest: null, networkObserver: null, networkSerial: 0, @@ -225,20 +224,17 @@ export function createAdminInstanceConfiguration({ function pollSettingsJob(vm, section, result) { const serial = state.settingsSerial; const jobId = result?.task_id ?? ''; - announceTaskAccepted(result, { title: '修改实例设置' }); - const handle = observeTask(result, { + const handle = actions.watch(result, { + title: '修改实例设置', onUpdate: () => { if (serial === state.settingsSerial && state.currentId === String(vm.id)) { setSettingsFeedback(section, `任务 #${jobId} 正在后台执行。`, 'muted'); } }, - onTerminal: task => { + onResult: ({ succeeded, message }) => { if (serial !== state.settingsSerial || state.currentId !== String(vm.id)) return; state.settingsObserver = null; void (async () => { - const succeeded = taskSucceededWithoutRecovery(task); - const message = succeeded ? `实例设置任务 #${jobId} 已成功。` - : taskFailureMessage(task, `任务 #${jobId} 执行失败。`); await onRefresh?.(vm.id); onNotice?.(message, !succeeded); })(); }, @@ -281,7 +277,7 @@ export function createAdminInstanceConfiguration({ const mutationBlocked = vm.active_job?.blocks_mutation === true; if (mutationBlocked) { unlockSettingsForm(form, true); - setSettingsFeedback(section, mutationBlockMessage(vm.active_job, '修改实例设置'), 'warning'); + setSettingsFeedback(section, blockMessage(vm.active_job, '修改实例设置'), 'warning'); } form.addEventListener('submit', async event => { event.preventDefault(); @@ -295,7 +291,7 @@ export function createAdminInstanceConfiguration({ settingsSetBusy(form, true); setSettingsFeedback(section, '正在创建实例设置任务,请勿重复提交…', 'muted'); try { - const result = await mutate(`/api/v1/admin/instances/${encodeURIComponent(vm.id)}/settings`, body, controller); + const result = await enqueue(`/api/v1/admin/instances/${encodeURIComponent(vm.id)}/settings`, body, controller); const jobId = result?.task_id; form.elements.namedItem('root_password').value = ''; form.elements.namedItem('root_password_confirmation').value = ''; @@ -361,7 +357,7 @@ export function createAdminInstanceConfiguration({ if (empty) { empty.id = 'network-options-empty'; const blockingJob = options.active_job?.blocks_mutation === true ? options.active_job : null; - empty.textContent = blockingJob ? mutationBlockMessage(blockingJob, '更换公网 IP') + empty.textContent = blockingJob ? blockMessage(blockingJob, '更换公网 IP') : (!hasAvailable ? '当前没有可用地址,无法提交更换;请先检查地址池和占用记录。' : (!canChange ? ({ invalid: '宿主机公网地址池配置无效,暂不能更换;请先修正宿主机配置。', @@ -451,20 +447,17 @@ export function createAdminInstanceConfiguration({ function pollNetworkJob(vm, section, result) { const serial = state.networkSerial; const jobId = result?.task_id ?? ''; - announceTaskAccepted(result, { title: '更换实例网络' }); - const handle = observeTask(result, { + const handle = actions.watch(result, { + title: '更换实例网络', onUpdate: () => { if (serial === state.networkSerial && state.currentId === String(vm.id)) { setNetworkFeedback(section, `任务 #${jobId} 正在后台执行。`, 'muted'); } }, - onTerminal: task => { + onResult: ({ succeeded, message }) => { if (serial !== state.networkSerial || state.currentId !== String(vm.id)) return; state.networkObserver = null; void (async () => { - const succeeded = taskSucceededWithoutRecovery(task); - const message = succeeded ? `网络变更任务 #${jobId} 已成功。` - : taskFailureMessage(task, `任务 #${jobId} 执行失败。`); await onRefresh?.(vm.id); onNotice?.(message, !succeeded); })(); }, @@ -542,7 +535,7 @@ export function createAdminInstanceConfiguration({ confirmActions.append(back, confirmSubmit); confirmation.append(confirmActions); section.append(confirmation); const mutationBlocked = vm.active_job?.blocks_mutation === true; if (mutationBlocked) { - edit.disabled = true; edit.title = mutationBlockMessage(vm.active_job, '更换公网 IP'); + edit.disabled = true; edit.title = blockMessage(vm.active_job, '更换公网 IP'); setNetworkFeedback(section, edit.title, 'warning'); } edit.addEventListener('click', () => { @@ -578,7 +571,7 @@ export function createAdminInstanceConfiguration({ check.disabled = true; confirmSubmit.disabled = true; back.disabled = true; setNetworkFeedback(section, '正在创建网络变更任务,请勿重复提交…', 'muted'); try { - const result = await mutate(`/api/v1/admin/instances/${encodeURIComponent(vm.id)}/network`, { + const result = await enqueue(`/api/v1/admin/instances/${encodeURIComponent(vm.id)}/network`, { public_ip_cidr: target.public_ip_cidr, public_pool_key: target.public_pool_key, confirm_restart: true, diff --git a/web/public/cloud/admin-instance-transport.js b/web/public/cloud/admin-instance-transport.js deleted file mode 100644 index a47dade2..00000000 --- a/web/public/cloud/admin-instance-transport.js +++ /dev/null @@ -1,35 +0,0 @@ -export function createAdminInstanceTransport({ - taskUrl, - fetchImpl = globalThis.fetch?.bind(globalThis), - locationImpl = globalThis.location, - csrfToken = () => globalThis.ADMIN_CSRF_TOKEN || '', - timeoutMs = 30000, - runtimeFactory = globalThis.VenixAdminRequestRuntime?.create, -} = {}) { - if (typeof taskUrl !== 'function') throw new TypeError('taskUrl is required'); - if (typeof runtimeFactory !== 'function') { - throw new TypeError('administrator request runtime is unavailable'); - } - - const runtime = runtimeFactory({ - fetchImpl, locationImpl, csrfToken, taskReceiptValidator: taskUrl, - }); - - function read(path, controller) { - return runtime.read(path, { signal: controller.signal, timeoutMs }); - } - - function mutate(path, body, controller, method = 'PATCH') { - return runtime.mutate(path, { - method, body, signal: controller.signal, timeoutMs, response: 'task', - }); - } - - function mutateJson(path, body, controller, method = 'POST') { - return runtime.mutate(path, { - method, body, signal: controller.signal, timeoutMs, response: 'json', - }); - } - - return Object.freeze({ read, mutate, mutateJson }); -} diff --git a/web/public/cloud/admin-instances.js b/web/public/cloud/admin-instances.js index 86b38b85..2db7e35e 100644 --- a/web/public/cloud/admin-instances.js +++ b/web/public/cloud/admin-instances.js @@ -7,14 +7,10 @@ function versionedModuleUrl(path) { return url.href; } -const [{ - announceTaskAccepted, observeTask, recoveryTaskFailureNotice, taskUrl, - taskSucceededWithoutRecovery, -}, { createAdminInstanceTransport }, { createAdminInstanceDirectory }, +const [{ createAdminInstanceActions }, { createAdminInstanceDirectory }, { createAdminInstanceDetail }, { createAdminInstanceConfiguration }, { createAdminInstanceMigration }, { createAdminInstanceBackups }] = await Promise.all([ - import(versionedModuleUrl('./task-observer.js')), - import(versionedModuleUrl('./admin-instance-transport.js')), + import(versionedModuleUrl('./admin-instance-actions.js')), import(versionedModuleUrl('./admin-instance-directory.js')), import(versionedModuleUrl('./admin-instance-detail.js')), import(versionedModuleUrl('./admin-instance-configuration.js')), @@ -24,40 +20,8 @@ const [{ const root = document.querySelector('[data-admin-instances]'); const byId = id => document.getElementById(id); -const { read, mutate, mutateJson } = createAdminInstanceTransport({ taskUrl }); - -function mutationBlockMessage(task, action) { - if (task?.blocks_mutation !== true) return ''; - const id = task?.id || '—'; - if (task.completed === false && task.status === 'active') { - return `实例已有任务 #${id}(执行中),完成前不能${action}。`; - } - if (task.completed === true && task.recovery?.pending === true) { - const code = String(task.recovery?.code || task.finalization_error_code || ''); - if (code === 'recovery_dispatch_ledger_conflict' || task.dispatch_state === 'invalid') { - return `任务 #${id} 的派发账本异常,资源保持安全锁定;修复账本并完成核验前不能${action}。`; - } - if (task.dispatch_state === 'not_dispatched') { - return `任务 #${id} 已确认未派发到宿主机,但 PHP 本地账本收尾尚未完成;收尾成功前不能${action}。`; - } - return `任务 #${id} 尚在持续恢复,资源保持安全锁定;恢复收敛前不能${action}。`; - } - if (task.completed === true && task.status === 'failed') { - return `任务 #${id} 已失败,资源安全锁定,需管理员人工处理后才能${action}。`; - } - return `任务 #${id} 状态协议无效,资源安全锁定,需管理员人工处理后才能${action}。`; -} - -function taskFailureMessage(task, fallback) { - const message = task?.error || fallback; - const recoveryNotice = recoveryTaskFailureNotice(task); - if (recoveryNotice) return recoveryNotice; - if (task?.effect_may_have_applied) { - return `${message} 任务已失败,操作效果可能已经发生,相关资源已锁定。请勿再次提交,并将任务编号交由管理员核查。`; - } - return task?.safe_to_resubmit === false - ? `${message} 任务已失败且相关资源已锁定,请勿再次提交,并联系管理员核查。` : message; -} +const actions = createAdminInstanceActions(); +const { read } = actions; function listNotice(message, error = false) { const node = byId('instances-notice'); @@ -100,29 +64,14 @@ if (root) { }); configuration = createAdminInstanceConfiguration({ - byId, - read, - mutate, - announceTaskAccepted, - observeTask, - taskSucceededWithoutRecovery, - taskFailureMessage, - mutationBlockMessage, + byId, actions, onNotice: (message, error = false) => detail?.notice(message, error), onRefresh: id => detail?.refresh(id), }); backups = createAdminInstanceBackups({ - byId, - read, - mutate, - mutateJson, + byId, actions, createMigration: createAdminInstanceMigration, - announceTaskAccepted, - observeTask, - taskSucceededWithoutRecovery, - taskFailureMessage, - mutationBlockMessage, onNotice: (message, error = false) => detail?.notice(message, error), }); diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 903a6ab3..f73ca4dc 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='2026103125' scope='global'} +{assign var=venix_asset_version value='2026103126' scope='global'} diff --git a/web/tests/AdminActionRuntimeContractTest.php b/web/tests/AdminActionRuntimeContractTest.php index faffcd56..1ebaf892 100644 --- a/web/tests/AdminActionRuntimeContractTest.php +++ b/web/tests/AdminActionRuntimeContractTest.php @@ -51,7 +51,7 @@ $assert(str_contains($dialogRuntime, 'textContent = value(config.title') $consumers = [ 'public/cloud/admin-operations.js', 'public/cloud/admin-operations-recovery.js', - 'public/cloud/admin-instance-transport.js', + 'public/cloud/admin-instance-actions.js', 'public/cloud/admin-instance-migration.js', 'public/cloud/admin-instance-backups.js', 'public/cloud/admin-hosts.js', @@ -81,7 +81,7 @@ $assert(str_contains($combined, "request.open('PUT', parsed.href, true)") "'/api/v1/admin/cloud-template-imports'") && !str_contains($combined, '/admin/cloud-templates/upload?'), 'The cloud-template file upload must use credential-free direct multipart PUT.'); -$assert(preg_match("/venix_asset_version value='2026103125'/", $assets) === 1, +$assert(preg_match("/venix_asset_version value='[0-9]{10,}'/", $assets) === 1, 'Shared administrator assets must use the current cache version.'); echo "Administrator shared action runtime contract passed.\n"; diff --git a/web/tests/AdminInstanceActionsBehaviorTest.mjs b/web/tests/AdminInstanceActionsBehaviorTest.mjs new file mode 100644 index 00000000..7234e173 --- /dev/null +++ b/web/tests/AdminInstanceActionsBehaviorTest.mjs @@ -0,0 +1,58 @@ +import assert from 'node:assert/strict'; +import { readFile } from 'node:fs/promises'; +import vm from 'node:vm'; + +globalThis.location = new URL('https://panel.test/admin/instances'); +const tasks = await import('../public/cloud/task-observer.js'); +const { createAdminInstanceActions } = await import('../public/cloud/admin-instance-actions.js'); +const context = { Headers, AbortController, setTimeout, clearTimeout }; +vm.runInNewContext(await readFile(new URL('../public/cloud/admin-request-runtime.js', import.meta.url), 'utf8'), context); + +const calls = []; +let response = { status: 202, ok: true, json: async () => ({ task_id: '42', status_url: '/api/v1/tasks/42' }) }; +let observation; +let announced = 0; +const actions = createAdminInstanceActions({ + runtimeFactory: context.VenixAdminRequestRuntime.create, + fetchImpl: async (path, options) => { calls.push({ path, options }); return response; }, + locationImpl: globalThis.location, + csrfToken: () => 'a'.repeat(64), + tasks: { ...tasks, announceTaskAccepted() { announced += 1; }, + observeTask(receipt, options) { observation = options; return { url: receipt.status_url, stop() {} }; } }, +}); +const controller = new AbortController(); +const receipt = await actions.enqueue('/api/v1/admin/instances/1/settings', { confirm_restart: true }, controller); +assert.equal(calls.length, 1); +assert.equal(calls[0].options.method, 'PATCH'); +assert.equal(calls[0].options.headers.get('X-Admin-CSRF-Token'), 'a'.repeat(64)); +assert.ok(calls[0].options.headers.get('Idempotency-Key')); + +let result; +actions.watch(receipt, { title: '修改设置', onResult(value) { result = value; } }); +assert.equal(announced, 1); +observation.onTerminal(tasks.normalizeTask({ id: '42', completed: true, status: 'succeeded' })); +assert.equal(result.succeeded, true); +observation.onTerminal(tasks.normalizeTask({ id: '42', completed: true, status: 'failed', + effect_may_have_applied: true, safe_to_resubmit: false, error: '网络中断' })); +assert.equal(result.succeeded, false); +assert.match(result.message, /请勿再次提交/); +observation.onTerminal(tasks.normalizeTask({ id: '42', completed: true, status: 'succeeded', + recovery: { pending: true, message: '本地账本收尾中', + last_checked_at: 1600000000, next_check_at: 1600000300 } })); +assert.equal(result.succeeded, false, 'A successful host receipt with pending recovery must not unlock the UI.'); + +response = { status: 200, ok: true, json: async () => ({ task_id: '42', status_url: '/api/v1/tasks/42' }) }; +await assert.rejects(actions.enqueue('/api/task', {}, controller, 'POST'), error => + error.code === 'invalid_task_receipt' && error.mutationMayHaveApplied && !error.safeToRetry); +assert.equal(calls.length, 2, 'A malformed receipt must not replay the mutation.'); +response = { status: 200, ok: true, json: async () => ({ deleted: true }) }; +assert.equal((await actions.commit('/api/backup/1', undefined, controller, 'DELETE')).deleted, true); +assert.equal(calls[2].options.method, 'DELETE'); +await actions.read('/api/backup', controller); +assert.equal(calls[3].options.method, 'GET'); +assert.equal(calls[3].options.headers.get('Idempotency-Key'), null); +assert.equal(actions.blockMessage({ blocks_mutation: false }, '恢复'), ''); +assert.match(actions.blockMessage({ id: '42', blocks_mutation: true, completed: true, + recovery: { pending: true }, dispatch_state: 'not_dispatched' }, '恢复'), /PHP 本地账本收尾尚未完成/); +assert.match(actions.blockMessage({ id: '42', blocks_mutation: true, completed: false, status: 'active' }, '恢复'), /执行中/); +console.log('Administrator instance action submission, observation and fence behavior passed.'); diff --git a/web/tests/AdminInstanceViewTest.php b/web/tests/AdminInstanceViewTest.php index 3a6e8d7d..e77ae6c1 100644 --- a/web/tests/AdminInstanceViewTest.php +++ b/web/tests/AdminInstanceViewTest.php @@ -107,6 +107,7 @@ $detailScript = file_get_contents(dirname(__DIR__) . '/public/cloud/admin-instan $configurationScript = file_get_contents(dirname(__DIR__) . '/public/cloud/admin-instance-configuration.js'); $backupScript = file_get_contents(dirname(__DIR__) . '/public/cloud/admin-instance-backups.js'); $runtimeScript = implode("\n", [ + file_get_contents(dirname(__DIR__) . '/public/cloud/admin-instance-actions.js'), $clientScript, $directoryScript, $detailScript, $configurationScript, $backupScript, ]); @@ -201,7 +202,7 @@ $assert(str_contains($dom->textContent, '192.0.2.101') && str_contains($dom->textContent, '资源安全锁定,仍会继续自动核对'), 'Useful instance data or terminal safety-lock state is missing before scripts run.'); $assert(str_contains($runtimeScript, - "task?.completed === false && task.status === 'active'") + "task.completed === false && task.status === 'active'") && str_contains($runtimeScript, "({ succeeded: '已成功', failed: '已失败' })") && str_contains($runtimeScript, 'task?.blocks_mutation !== true') diff --git a/web/tests/CloudAssetVersionContractTest.php b/web/tests/CloudAssetVersionContractTest.php index f13d33c1..d5d7f0ad 100644 --- a/web/tests/CloudAssetVersionContractTest.php +++ b/web/tests/CloudAssetVersionContractTest.php @@ -45,7 +45,7 @@ sort($dependencyFiles); $assert($dependencyFiles === [ 'public/cloud/admin-catalog-runtime.js', 'public/cloud/admin-hosts.js', - 'public/cloud/admin-instances.js', + 'public/cloud/admin-instance-actions.js', 'public/cloud/admin-operations.js', 'public/cloud/app.js', 'public/cloud/detail.js', diff --git a/web/tests/CloudPortableBackupAdminUiContractTest.php b/web/tests/CloudPortableBackupAdminUiContractTest.php index de31093b..dc66403a 100644 --- a/web/tests/CloudPortableBackupAdminUiContractTest.php +++ b/web/tests/CloudPortableBackupAdminUiContractTest.php @@ -14,7 +14,7 @@ $controller = $read('app/Controllers/CloudAdminInstanceController.php'); $routes = $read('config/routes_cloud.php'); $template = $read('resources/views/venix/admin/cloud/instances.tpl'); $runtime = $read('public/cloud/admin-instances.js') - . "\n" . $read('public/cloud/admin-instance-transport.js') + . "\n" . $read('public/cloud/admin-instance-actions.js') . "\n" . $read('public/cloud/admin-instance-detail.js') . "\n" . $read('public/cloud/admin-instance-migration.js') . "\n" . $read('public/cloud/admin-instance-backups.js'); @@ -149,11 +149,11 @@ $assert(str_contains($runtime, "consistency_mode: consistency.value === 'crash' ? 'crash' : 'filesystem'") && str_contains($peerArtifacts, "\$root->consistency = 'crash'") && str_contains($runtime, "method = 'PATCH'") - && str_contains($runtime, "mutate(path, body, controller, 'POST')") + && str_contains($runtime, "enqueue(path, body, controller, 'POST')") && str_contains($runtime, 'confirm_new_instance: true'), 'Ordinary backup creation must default to automatic filesystem consistency while maintenance migration remains crash-consistent.'); -$assert(str_contains($runtime, "mutateJson") +$assert(str_contains($runtime, "await commit(") && str_contains($runtime, "controller, 'DELETE'") && str_contains($runtime, '核对删除状态') && str_contains($runtime, '两次间隔证据一致') diff --git a/web/tests/CloudTaskObserverBehaviorTest.mjs b/web/tests/CloudTaskObserverBehaviorTest.mjs index 22293a52..9f17e5d6 100644 --- a/web/tests/CloudTaskObserverBehaviorTest.mjs +++ b/web/tests/CloudTaskObserverBehaviorTest.mjs @@ -11,7 +11,7 @@ const layoutAssetsUrl = new URL('../resources/views/venix/layout_assets.tpl', im const adminUrl = new URL('../public/cloud/admin-hosts.js', import.meta.url); const detailUrl = new URL('../public/cloud/detail.js', import.meta.url); const adminInstancesUrl = new URL('../public/cloud/admin-instances.js', import.meta.url); -const adminInstanceTransportUrl = new URL('../public/cloud/admin-instance-transport.js', import.meta.url); +const adminInstanceTransportUrl = new URL('../public/cloud/admin-instance-actions.js', import.meta.url); const adminInstanceConfigurationUrl = new URL('../public/cloud/admin-instance-configuration.js', import.meta.url); const adminInstanceBackupsUrl = new URL('../public/cloud/admin-instance-backups.js', import.meta.url); const runtimeUrl = new URL('../public/cloud/runtime.js', import.meta.url); @@ -515,14 +515,14 @@ const protocolFailure = task => { new URL('../public/cloud/admin-request-runtime.js', import.meta.url), 'utf8'); const adminInstancesSource = `${await readFile(adminInstancesUrl, 'utf8')}\n${adminInstanceTransportSource}\n${await readFile(adminInstanceConfigurationUrl, 'utf8')}\n${await readFile(adminInstanceBackupsUrl, 'utf8')}`; assert.doesNotMatch(adminInstancesSource, /state\.networkRequest \|\| activeJob/); - assert.match(adminInstanceTransportSource, /taskReceiptValidator: taskUrl/); + assert.match(adminInstanceTransportSource, /taskReceiptValidator: tasks.taskUrl/); assert.match(adminInstanceTransportSource, /response: 'task'/); assert.match(adminRequestRuntimeSource, /response\.status !== 202 \|\| !taskReceiptValidator \|\| !taskReceiptValidator\(payload\)/); assert.match(adminInstancesSource, /await onRefresh\?\.\(vm\.id\)/); - assert.match(adminInstancesSource, /recoveryTaskFailureNotice\(task\)/); + assert.match(adminInstancesSource, /tasks.recoveryTaskFailureNotice\(task\)/); assert.match(adminInstancesSource, /PHP 本地账本收尾尚未完成/); - assert.match(adminInstancesSource, /taskSucceededWithoutRecovery\(task\)/); + assert.match(adminInstancesSource, /tasks.taskSucceededWithoutRecovery\(task\)/); assert.doesNotMatch(adminInstancesSource, /task\.status === 'succeeded'/); const runtimeSource = await readFile(runtimeUrl, 'utf8');