From 873acf0fd8993fd9b88396dfe4104593db26ecd1 Mon Sep 17 00:00:00 2001 From: codex Date: Sat, 24 Oct 2026 03:46:57 +0800 Subject: [PATCH] fix(web): unify asset versions and remove SES --- web/app/Services/Mail.php | 6 +- web/app/Services/Mail/Ses.php | 43 -------------- web/config/.config.php.example | 2 +- web/public/cloud/admin-instances.js | 13 +++- web/public/cloud/admin-operations.js | 13 +++- web/public/cloud/admin.js | 14 ++++- web/public/cloud/app.js | 46 +++++++++------ web/public/cloud/detail.js | 23 +++++--- web/public/cloud/instances.js | 11 +++- web/public/cloud/invoice-detail-runtime.js | 19 +++++- web/public/cloud/iso-images.js | 23 +++++--- web/public/cloud/runtime.js | 19 +++++- web/public/cloud/ssh-keys.js | 11 +++- web/public/cloud/task-center.js | 13 +++- web/resources/views/venix/layout_assets.tpl | 2 +- web/tests/AdminHostNetworkBehaviorTest.mjs | 4 +- ...AdminTemplateStartupScriptBehaviorTest.mjs | 4 +- web/tests/CloudAssetVersionContractTest.php | 59 +++++++++++++++++++ web/tests/CloudTaskObserverBehaviorTest.mjs | 6 +- web/tests/MailDriverRegistryContractTest.php | 40 +++++++++++++ web/tests/UserNativeDialogContractTest.php | 12 ++-- web/tests/VirtualizationAssetsTest.php | 6 +- 22 files changed, 282 insertions(+), 107 deletions(-) delete mode 100644 web/app/Services/Mail/Ses.php create mode 100644 web/tests/CloudAssetVersionContractTest.php create mode 100644 web/tests/MailDriverRegistryContractTest.php diff --git a/web/app/Services/Mail.php b/web/app/Services/Mail.php index b06ec7fd..e0eb25d6 100644 --- a/web/app/Services/Mail.php +++ b/web/app/Services/Mail.php @@ -9,7 +9,6 @@ namespace App\Services; use App\Models\Configurations; use App\Models\EmailLog; use App\Services\Mail\Mailgun; -use App\Services\Mail\Ses; use App\Services\Mail\Smtp; use App\Services\Mail\NullMail; use Smarty; @@ -20,7 +19,7 @@ class Mail private const EMAIL_BLACKLIST_CACHE_KEY = 'email_blacklist'; /** - * @return Mailgun|Ses|Smtp|NullMail + * @return Mailgun|Smtp|NullMail */ public static function getClient() { @@ -28,14 +27,11 @@ class Mail switch ($driver) { case "mailgun": return new Mailgun(); - case "ses": - return new Ses(); case "smtp": return new Smtp(); default: return new NullMail(); } - return null; } /** diff --git a/web/app/Services/Mail/Ses.php b/web/app/Services/Mail/Ses.php deleted file mode 100644 index 0ae086b2..00000000 --- a/web/app/Services/Mail/Ses.php +++ /dev/null @@ -1,43 +0,0 @@ -client = Factory::createSes(); - } - - public function send($to, $subject, $text, $file) - { - if (!empty($file)) { - return false; - } - - return $this->client->sendEmail([ - 'Destination' => [ // REQUIRED - 'ToAddresses' => [$to], - ], - 'Message' => [ // REQUIRED - 'Body' => [ // REQUIRED - 'Html' => [ - 'Data' => $text, // REQUIRED - ], - 'Text' => [ - 'Data' => $text, // REQUIRED - ], - ], - 'Subject' => [ // REQUIRED - 'Data' => $subject, // REQUIRED - ], - ], - 'Source' => $this->getSender(), // REQUIRED - ]) !== false; - } -} diff --git a/web/config/.config.php.example b/web/config/.config.php.example index 63c58a0f..44b4e3fe 100644 --- a/web/config/.config.php.example +++ b/web/config/.config.php.example @@ -1,6 +1,6 @@ document.getElementById(id); diff --git a/web/public/cloud/admin-operations.js b/web/public/cloud/admin-operations.js index 99445b9a..43cecfa8 100644 --- a/web/public/cloud/admin-operations.js +++ b/web/public/cloud/admin-operations.js @@ -1,7 +1,16 @@ -import { +const assetVersion = new URL(import.meta.url).searchParams.get('v'); + +function versionedModuleUrl(path) { + const url = new URL(path, import.meta.url); + url.search = ''; + if (assetVersion) url.searchParams.set('v', assetVersion); + return url.href; +} + +const { announceTaskAccepted, observeTask, recoveryTaskFailureNotice, taskUrl, taskSucceededWithoutRecovery, -} from './task-observer.js?v=2026102102'; +} = await import(versionedModuleUrl('./task-observer.js')); const root = document.querySelector('[data-admin-operations]'); const byId = id => document.getElementById(id); diff --git a/web/public/cloud/admin.js b/web/public/cloud/admin.js index ecc78968..7c8fce37 100644 --- a/web/public/cloud/admin.js +++ b/web/public/cloud/admin.js @@ -1,4 +1,16 @@ -import { announceTaskAccepted, observeTask, recoveryTaskFailureNotice, taskSucceededWithoutRecovery, taskUrl } from './task-observer.js?v=2026102102'; +const assetVersion = new URL(import.meta.url).searchParams.get('v'); + +function versionedModuleUrl(path) { + const url = new URL(path, import.meta.url); + url.search = ''; + if (assetVersion) url.searchParams.set('v', assetVersion); + return url.href; +} + +const { + announceTaskAccepted, observeTask, recoveryTaskFailureNotice, + taskSucceededWithoutRecovery, taskUrl, +} = await import(versionedModuleUrl('./task-observer.js')); const root = document.querySelector('[data-cloud-admin]'); const byId = id => document.getElementById(id); diff --git a/web/public/cloud/app.js b/web/public/cloud/app.js index 18258e06..b7b609ef 100644 --- a/web/public/cloud/app.js +++ b/web/public/cloud/app.js @@ -1,5 +1,3 @@ -import { initializeTaskCenter } from './task-center.js?v=2026102408'; - const pageModules = Object.freeze({ instances: '/cloud/instances.js', detail: '/cloud/detail.js', @@ -12,23 +10,37 @@ const pageModules = Object.freeze({ }); const page = document.body.dataset.cloudPage || ''; -initializeTaskCenter(); -const modulePath = pageModules[page]; -if (modulePath) { - const moduleUrl = new URL(modulePath, location.origin); - const assetVersion = new URL(import.meta.url).searchParams.get('v'); - if (assetVersion) moduleUrl.searchParams.set('v', assetVersion); - import(moduleUrl.href).then(module => module.initialize()).catch(error => { - const target = document.getElementById('cloud-page-error'); - if (target) { - target.textContent = error?.message || '页面加载失败,请刷新后重试。'; - target.hidden = false; - } - }); -} else { +const assetVersion = new URL(import.meta.url).searchParams.get('v'); + +function versionedModuleUrl(path) { + const url = new URL(path, import.meta.url); + url.search = ''; + if (assetVersion) url.searchParams.set('v', assetVersion); + return url.href; +} + +function showPageError(message) { const target = document.getElementById('cloud-page-error'); if (target) { - target.textContent = '页面类型无效,请返回实例列表。'; + target.textContent = message; target.hidden = false; } } + +async function initializeCloudApp() { + const { initializeTaskCenter } = await import(versionedModuleUrl('./task-center.js')); + initializeTaskCenter(); + + const modulePath = pageModules[page]; + if (!modulePath) { + showPageError('页面类型无效,请返回实例列表。'); + return; + } + + const module = await import(versionedModuleUrl(modulePath)); + module.initialize(); +} + +initializeCloudApp().catch(error => { + showPageError(error?.message || '页面加载失败,请刷新后重试。'); +}); diff --git a/web/public/cloud/detail.js b/web/public/cloud/detail.js index 927cbef4..e8d57b64 100644 --- a/web/public/cloud/detail.js +++ b/web/public/cloud/detail.js @@ -1,12 +1,21 @@ -import { +const assetVersion = new URL(import.meta.url).searchParams.get('v'); + +function versionedModuleUrl(path) { + const url = new URL(path, import.meta.url); + url.search = ''; + if (assetVersion) url.searchParams.set('v', assetVersion); + return url.href; +} + +const [taskObserver, runtime] = await Promise.all([ + import(versionedModuleUrl('./task-observer.js')), + import(versionedModuleUrl('/cloud/runtime.js')), +]); +const { announceTaskAccepted, normalizeTask, observeTask, recoveryTaskFailureNotice, resolvedTaskFailureNotice, taskSucceededWithoutRecovery, -} from './task-observer.js?v=2026102102'; - -const runtimeUrl = new URL('/cloud/runtime.js', location.origin); -const assetVersion = new URL(import.meta.url).searchParams.get('v'); -if (assetVersion) runtimeUrl.searchParams.set('v', assetVersion); +} = taskObserver; const { VM_DETAIL_TABS, api, bindPageCleanup, byId, clearCredential, clearVmMetrics, clearVmTrafficDaily, closeConsole, copyText, credential, @@ -14,7 +23,7 @@ const { loadVmTrafficDaily, renderVmDetail, renderVmMetrics, selectedVm, setVmDetailTab, showError, state, stopVmMetrics, stopVmTrafficDaily, toast, trafficDailyViewVisible, vmIp, -} = await import(runtimeUrl.href); +} = runtime; const requestUserConfirmation = options => window.VenixDialog?.confirm?.(options) ?? Promise.resolve(false); const VM_METADATA_FIELDS = Object.freeze([ diff --git a/web/public/cloud/instances.js b/web/public/cloud/instances.js index d0fd3bbf..f7e72047 100644 --- a/web/public/cloud/instances.js +++ b/web/public/cloud/instances.js @@ -1,4 +1,13 @@ -import { toast } from './toast.js?v=2026100206'; +const assetVersion = new URL(import.meta.url).searchParams.get('v'); + +function versionedModuleUrl(path) { + const url = new URL(path, import.meta.url); + url.search = ''; + if (assetVersion) url.searchParams.set('v', assetVersion); + return url.href; +} + +const { toast } = await import(versionedModuleUrl('./toast.js')); // The first twenty instances are rendered by PHP. This lightweight module only // handles local filtering, pagination and batched live-state refreshes. diff --git a/web/public/cloud/invoice-detail-runtime.js b/web/public/cloud/invoice-detail-runtime.js index 928e5d22..942c8abb 100644 --- a/web/public/cloud/invoice-detail-runtime.js +++ b/web/public/cloud/invoice-detail-runtime.js @@ -1,8 +1,21 @@ -import { toast } from './toast.js?v=2026100102'; -import { +const assetVersion = new URL(import.meta.url).searchParams.get('v'); + +function versionedModuleUrl(path) { + const url = new URL(path, import.meta.url); + url.search = ''; + if (assetVersion) url.searchParams.set('v', assetVersion); + return url.href; +} + +const [toastModule, taskObserver] = await Promise.all([ + import(versionedModuleUrl('./toast.js')), + import(versionedModuleUrl('./task-observer.js')), +]); +const { toast } = toastModule; +const { announceTaskAccepted, observeTask, recoveryTaskFailureNotice, taskSucceededWithoutRecovery, taskUrl, -} from './task-observer.js?v=2026102102'; +} = taskObserver; // Lightweight invoice-detail runtime. This module deliberately contains no VM, // deployment, metrics or console code so the bill is interactive without diff --git a/web/public/cloud/iso-images.js b/web/public/cloud/iso-images.js index b6dbe1db..fd3caa46 100644 --- a/web/public/cloud/iso-images.js +++ b/web/public/cloud/iso-images.js @@ -1,14 +1,23 @@ -import { +const assetVersion = new URL(import.meta.url).searchParams.get('v'); + +function versionedModuleUrl(path) { + const url = new URL(path, import.meta.url); + url.search = ''; + if (assetVersion) url.searchParams.set('v', assetVersion); + return url.href; +} + +const [taskObserver, runtime] = await Promise.all([ + import(versionedModuleUrl('./task-observer.js')), + import(versionedModuleUrl('/cloud/runtime.js')), +]); +const { announceTaskAccepted, observeTask, recoveryTaskFailureNotice, taskUrl, taskSucceededWithoutRecovery, -} from './task-observer.js?v=2026102102'; - -const runtimeUrl = new URL('/cloud/runtime.js', location.origin); -const assetVersion = new URL(import.meta.url).searchParams.get('v'); -if (assetVersion) runtimeUrl.searchParams.set('v', assetVersion); +} = taskObserver; const { api, bindPageCleanup, byId, initializeSession, showError, state, toast, -} = await import(runtimeUrl.href); +} = runtime; const requestUserConfirmation = options => window.VenixDialog?.confirm?.(options) ?? Promise.resolve(false); const pageState = { diff --git a/web/public/cloud/runtime.js b/web/public/cloud/runtime.js index eca19c0c..7ba1b356 100644 --- a/web/public/cloud/runtime.js +++ b/web/public/cloud/runtime.js @@ -1,8 +1,21 @@ -import { toast } from './toast.js?v=2026100102'; -import { +const assetVersion = new URL(import.meta.url).searchParams.get('v'); + +function versionedModuleUrl(path) { + const url = new URL(path, import.meta.url); + url.search = ''; + if (assetVersion) url.searchParams.set('v', assetVersion); + return url.href; +} + +const [toastModule, taskObserver] = await Promise.all([ + import(versionedModuleUrl('./toast.js')), + import(versionedModuleUrl('./task-observer.js')), +]); +const { toast } = toastModule; +const { announceTaskAccepted, observeTask, recoveryTaskFailureNotice, resolvedTaskFailureNotice, taskSucceededWithoutRecovery, taskUrl, -} from './task-observer.js?v=2026102102'; +} = taskObserver; // PHP owns authentication, authorisation, ownership and purchasing. No Agent // address, token, host credential or unrestricted create API exists in this UI. diff --git a/web/public/cloud/ssh-keys.js b/web/public/cloud/ssh-keys.js index f9f10fcf..d146d8bd 100644 --- a/web/public/cloud/ssh-keys.js +++ b/web/public/cloud/ssh-keys.js @@ -1,4 +1,13 @@ -import { toast } from './toast.js?v=2026100102'; +const assetVersion = new URL(import.meta.url).searchParams.get('v'); + +function versionedModuleUrl(path) { + const url = new URL(path, import.meta.url); + url.search = ''; + if (assetVersion) url.searchParams.set('v', assetVersion); + return url.href; +} + +const { toast } = await import(versionedModuleUrl('./toast.js')); // The saved-key list and the user/CSRF bootstrap are rendered into the // first HTML response. This module owns only the add/delete interactions and diff --git a/web/public/cloud/task-center.js b/web/public/cloud/task-center.js index 1c192753..3cd95e53 100644 --- a/web/public/cloud/task-center.js +++ b/web/public/cloud/task-center.js @@ -1,6 +1,15 @@ -import { +const assetVersion = new URL(import.meta.url).searchParams.get('v'); + +function versionedModuleUrl(path) { + const url = new URL(path, import.meta.url); + url.search = ''; + if (assetVersion) url.searchParams.set('v', assetVersion); + return url.href; +} + +const { normalizeTask, recoveryTaskFailureNotice, resolvedTaskFailureNotice, -} from './task-observer.js?v=2026102102'; +} = await import(versionedModuleUrl('./task-observer.js')); const REFRESH_MS = 10000; // Covers the longest server-side absolute task deadline (145 minutes) while diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index fb9b6a8f..deeb72ac 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='2026102409' scope='global'} +{assign var=venix_asset_version value='2026102410' scope='global'} diff --git a/web/tests/AdminHostNetworkBehaviorTest.mjs b/web/tests/AdminHostNetworkBehaviorTest.mjs index 8ead8031..aa8c583f 100644 --- a/web/tests/AdminHostNetworkBehaviorTest.mjs +++ b/web/tests/AdminHostNetworkBehaviorTest.mjs @@ -2,8 +2,8 @@ import assert from 'node:assert/strict'; import { readFile } from 'node:fs/promises'; import vm from 'node:vm'; -const source = (await readFile(new URL('../public/cloud/admin.js', import.meta.url), 'utf8')) - .replace(/^import[^\n]*\n/, '') +const adminSource = await readFile(new URL('../public/cloud/admin.js', import.meta.url), 'utf8'); +const source = adminSource.slice(adminSource.indexOf('const root =')) .replace('void initialize();', '') + '\nglobalThis.hostUI = { initialize, fillHost, saveHost, renderHostNetworkPools, state };'; const submit = { preventDefault() {} }; diff --git a/web/tests/AdminTemplateStartupScriptBehaviorTest.mjs b/web/tests/AdminTemplateStartupScriptBehaviorTest.mjs index cc0c0d6a..0455a7b4 100644 --- a/web/tests/AdminTemplateStartupScriptBehaviorTest.mjs +++ b/web/tests/AdminTemplateStartupScriptBehaviorTest.mjs @@ -2,8 +2,8 @@ import assert from 'node:assert/strict'; import { readFile } from 'node:fs/promises'; import vm from 'node:vm'; -const source = (await readFile(new URL('../public/cloud/admin.js', import.meta.url), 'utf8')) - .replace(/^import[^\n]*\n/, '') +const adminSource = await readFile(new URL('../public/cloud/admin.js', import.meta.url), 'utf8'); +const source = adminSource.slice(adminSource.indexOf('const root =')) .replace('void initialize();', '') + '\n;globalThis.__scripts = { startupScriptState, openStartupScript, closeStartupScript, saveStartupScript, loadCatalog };\n'; diff --git a/web/tests/CloudAssetVersionContractTest.php b/web/tests/CloudAssetVersionContractTest.php new file mode 100644 index 00000000..7f4f12f9 --- /dev/null +++ b/web/tests/CloudAssetVersionContractTest.php @@ -0,0 +1,59 @@ + { const layoutAssets = await readFile(layoutAssetsUrl, 'utf8'); const assetVersion = layoutAssets.match(/venix_asset_version value='([0-9]+)'/)?.[1]; assert.ok(assetVersion, 'The shared cloud asset version is missing.'); - assert.match(appSource, new RegExp(`task-center\\.js\\?v=${assetVersion}`)); + assert.match(appSource, /const assetVersion = new URL\(import\.meta\.url\)\.searchParams\.get\('v'\);/); + assert.match(appSource, /function versionedModuleUrl\(path\)/); + assert.match(appSource, /url\.searchParams\.set\('v', assetVersion\)/); + assert.match(appSource, /await import\(versionedModuleUrl\('\.\/task-center\.js'\)\)/); + assert.doesNotMatch(appSource, /task-center\.js\?v=[0-9]+/); assert.match(clientCss, /\.panel-announcements-close\.button:focus,\s*\.panel-task-close\.button:focus,\s*\.panel-account-drawer-close\.button:focus\s*\{/, 'Touch-opened task drawers must match announcements without retaining a close-button frame.'); diff --git a/web/tests/MailDriverRegistryContractTest.php b/web/tests/MailDriverRegistryContractTest.php new file mode 100644 index 00000000..cbc9b249 --- /dev/null +++ b/web/tests/MailDriverRegistryContractTest.php @@ -0,0 +1,40 @@ += 3 && substr_count($clientScript, 'if (!event.persisted) return;') >= 3