diff --git a/web/public/cloud/admin-instance-transport.js b/web/public/cloud/admin-instance-transport.js new file mode 100644 index 00000000..0947919e --- /dev/null +++ b/web/public/cloud/admin-instance-transport.js @@ -0,0 +1,95 @@ +function mutationId() { + return globalThis.crypto?.randomUUID?.() + || `admin-${Date.now()}-${Math.random().toString(36).slice(2)}-${Math.random().toString(36).slice(2)}`; +} + +function messageFromPayload(payload, status) { + const detail = Array.isArray(payload?.detail) + ? payload.detail.map(item => item?.msg || '输入错误').join(';') + : payload?.detail; + return typeof detail === 'string' + ? detail : (payload?.message || `请求失败 (${status})`); +} + +export function createAdminInstanceTransport({ + taskUrl, + fetchImpl = globalThis.fetch?.bind(globalThis), + locationImpl = globalThis.location, + csrfToken = () => globalThis.ADMIN_CSRF_TOKEN || '', + timeoutMs = 30000, +} = {}) { + if (typeof taskUrl !== 'function') throw new TypeError('taskUrl is required'); + if (typeof fetchImpl !== 'function') throw new TypeError('fetch is unavailable'); + + async function requestJson(path, controller, options = {}) { + const timeout = setTimeout(() => controller.abort('timeout'), timeoutMs); + try { + const response = await fetchImpl(path, { + headers: { Accept: 'application/json', ...(options.headers || {}) }, + credentials: 'same-origin', cache: 'no-store', signal: controller.signal, + ...options, + }); + if (response.status === 401) { + throw new Error(options.method ? '登录已过期,请重新登录。' : '登录已过期,请重新登录后刷新。'); + } + let payload; + try { payload = await response.json(); } + catch { throw new Error('服务返回异常,请检查服务器日志后重试。'); } + if (!response.ok || payload?.ret === 0) { + const error = new Error(messageFromPayload(payload, response.status)); + error.status = response.status; + throw error; + } + return { payload, response }; + } finally { + clearTimeout(timeout); + } + } + + async function read(path, controller) { + try { + const { payload } = await requestJson(path, controller); + return payload; + } catch (error) { + if (controller.signal.reason === 'timeout') throw new Error('请求超时,请稍后重试。'); + throw error; + } + } + + async function mutate(path, body, controller, method = 'PATCH') { + if (locationImpl?.protocol !== 'https:' + && !['localhost', '127.0.0.1', '[::1]'].includes(locationImpl?.hostname)) { + throw new Error('请通过 HTTPS 修改实例配置。'); + } + try { + const { payload, response } = await requestJson(path, controller, { + method, + headers: { + 'Content-Type': 'application/json', + 'X-CSRF-Token': csrfToken(), + 'Idempotency-Key': mutationId(), + }, + body: JSON.stringify(body), + }); + if (response.status !== 202 || !taskUrl(payload)) { + const error = new Error('请求已送达,但任务回执协议无效。请勿重复提交,并联系管理员核查。'); + error.status = response.status; + error.mutationMayHaveApplied = true; + throw error; + } + return payload; + } catch (error) { + if (controller.signal.reason === 'timeout') { + const timeoutError = new Error('请求超时,结果无法确认。请勿重复提交,并联系管理员核查。'); + timeoutError.mutationMayHaveApplied = true; + throw timeoutError; + } + if (error?.status >= 500 || (!error?.status && error?.name !== 'AbortError')) { + error.mutationMayHaveApplied = true; + } + throw error; + } + } + + return Object.freeze({ read, mutate }); +} diff --git a/web/public/cloud/admin-instances.js b/web/public/cloud/admin-instances.js index 7d5e402f..25b91cd7 100644 --- a/web/public/cloud/admin-instances.js +++ b/web/public/cloud/admin-instances.js @@ -7,10 +7,15 @@ function versionedModuleUrl(path) { return url.href; } -const { +const [{ announceTaskAccepted, observeTask, recoveryTaskFailureNotice, taskUrl, taskSucceededWithoutRecovery, -} = await import(versionedModuleUrl('./task-observer.js')); +}, { createAdminInstanceTransport }] = await Promise.all([ + import(versionedModuleUrl('./task-observer.js')), + import(versionedModuleUrl('./admin-instance-transport.js')), +]); + +const { read: api, mutate } = createAdminInstanceTransport({ taskUrl }); const root = document.querySelector('[data-admin-instances]'); const byId = id => document.getElementById(id); @@ -223,78 +228,6 @@ function notice(message, error = false) { node.setAttribute('role', error ? 'alert' : 'status'); } -async function api(path, controller) { - const timeout = setTimeout(() => controller.abort('timeout'), 30000); - try { - const response = await fetch(path, { - headers: { Accept: 'application/json' }, credentials: 'same-origin', cache: 'no-store', signal: controller.signal, - }); - if (response.status === 401) throw new Error('登录已过期,请重新登录后刷新。'); - let payload; - try { payload = await response.json(); } - catch { throw new Error('服务返回异常,请检查服务器日志后重试。'); } - if (!response.ok || payload?.ret === 0) { - const error = new Error(typeof payload?.detail === 'string' ? payload.detail : (payload?.message || `请求失败 (${response.status})`)); - error.status = response.status; - throw error; - } - return payload; - } catch (error) { - if (controller.signal.reason === 'timeout') throw new Error('请求超时,请稍后重试。'); - throw error; - } finally { clearTimeout(timeout); } -} - -async function mutate(path, body, controller, method = 'PATCH') { - if (location.protocol !== 'https:' && !['localhost', '127.0.0.1', '[::1]'].includes(location.hostname)) { - throw new Error('请通过 HTTPS 修改实例配置。'); - } - const timeout = setTimeout(() => controller.abort('timeout'), 30000); - try { - const response = await fetch(path, { - method, - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json', - 'X-CSRF-Token': window.ADMIN_CSRF_TOKEN || '', - 'Idempotency-Key': globalThis.crypto?.randomUUID?.() - || `admin-${Date.now()}-${Math.random().toString(36).slice(2)}-${Math.random().toString(36).slice(2)}`, - }, - credentials: 'same-origin', cache: 'no-store', signal: controller.signal, - body: JSON.stringify(body), - }); - if (response.status === 401) throw new Error('登录已过期,请重新登录。'); - let payload; - try { payload = await response.json(); } - catch { throw new Error('服务返回异常,请检查服务器日志后重试。'); } - if (!response.ok || payload?.ret === 0) { - const detail = Array.isArray(payload?.detail) - ? payload.detail.map(item => item?.msg || '输入错误').join(';') - : payload?.detail; - const error = new Error(typeof detail === 'string' ? detail : (payload?.message || `请求失败 (${response.status})`)); - error.status = response.status; - throw error; - } - if (response.status !== 202 || !taskUrl(payload)) { - const error = new Error('请求已送达,但任务回执协议无效。请勿重复提交,并联系管理员核查。'); - error.status = response.status; - error.mutationMayHaveApplied = true; - throw error; - } - return payload; - } catch (error) { - if (controller.signal.reason === 'timeout') { - const timeoutError = new Error('请求超时,结果无法确认。请勿重复提交,并联系管理员核查。'); - timeoutError.mutationMayHaveApplied = true; - throw timeoutError; - } - if (error?.status >= 500 || (!error?.status && error?.name !== 'AbortError')) { - error.mutationMayHaveApplied = true; - } - throw error; - } finally { clearTimeout(timeout); } -} - function copyButton(value, label = '复制') { const button = el('button', 'btn btn-light btn-sm'); button.type = 'button'; diff --git a/web/tests/CloudPortableBackupAdminUiContractTest.php b/web/tests/CloudPortableBackupAdminUiContractTest.php index 22df05ae..f1fd18cb 100644 --- a/web/tests/CloudPortableBackupAdminUiContractTest.php +++ b/web/tests/CloudPortableBackupAdminUiContractTest.php @@ -13,7 +13,8 @@ $assert = static function (bool $condition, string $message): void { $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'); +$runtime = $read('public/cloud/admin-instances.js') + . "\n" . $read('public/cloud/admin-instance-transport.js'); $assets = $read('resources/views/venix/layout_assets.tpl'); $service = $read('app/Services/Cloud/CloudBackupService.php'); $placement = $read('app/Services/Cloud/CloudPlacementService.php'); diff --git a/web/tests/CloudTaskObserverBehaviorTest.mjs b/web/tests/CloudTaskObserverBehaviorTest.mjs index ed4e876a..0d262dca 100644 --- a/web/tests/CloudTaskObserverBehaviorTest.mjs +++ b/web/tests/CloudTaskObserverBehaviorTest.mjs @@ -11,6 +11,7 @@ const layoutAssetsUrl = new URL('../resources/views/venix/layout_assets.tpl', im const adminUrl = new URL('../public/cloud/admin.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 runtimeUrl = new URL('../public/cloud/runtime.js', import.meta.url); const isoImagesUrl = new URL('../public/cloud/iso-images.js', import.meta.url); const invoiceDetailRuntimeUrl = new URL('../public/cloud/invoice-detail-runtime.js', import.meta.url); @@ -507,7 +508,7 @@ const protocolFailure = task => { assert.match(detailSource, /taskSucceededWithoutRecovery\(task\)/); assert.doesNotMatch(detailSource, /task\.status === 'succeeded'/); - const adminInstancesSource = await readFile(adminInstancesUrl, 'utf8'); + const adminInstancesSource = `${await readFile(adminInstancesUrl, 'utf8')}\n${await readFile(adminInstanceTransportUrl, 'utf8')}`; assert.doesNotMatch(adminInstancesSource, /state\.networkRequest \|\| activeJob/); assert.match(adminInstancesSource, /response\.status !== 202 \|\| !taskUrl\(payload\)/); assert.match(adminInstancesSource, /await refreshDetail\(vm\.id\)/);