Skip to content

fix: await component request hashing #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tifycloud merged 1 commit into from
Jul 21, 2026
Merged

fix: await component request hashing #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions site/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,7 @@ function resetComponentsForTarget() {
setComponentMessage('');
}
renderComponentChoices();
updateBuildRequest();
return updateBuildRequest();
}

function setupComponentBuilder(catalog) {
Expand All @@ -1002,13 +1002,13 @@ function setupComponentBuilder(catalog) {
function updateFlavors() {
const available = flavorsForTarget(targetSelect.value);
populateSelect(flavorSelect, available, available[0].id);
resetComponentsForTarget();
return resetComponentsForTarget();
}
targetSelect.addEventListener('change', updateFlavors);
flavorSelect.addEventListener('change', () => updateBuildRequest());
categorySelect.addEventListener('change', renderComponentChoices);
document.querySelector('#component-search').addEventListener('input', renderComponentChoices);
updateFlavors();
return updateFlavors();
}

async function loadComponentCatalog() {
Expand All @@ -1018,7 +1018,7 @@ async function loadComponentCatalog() {
if (!response.ok) throw new Error(`HTTP ${response.status}`);
const catalog = await response.json();
if (!validateComponentCatalog(catalog)) throw new Error('unexpected component catalog schema');
setupComponentBuilder(catalog);
await setupComponentBuilder(catalog);
status.classList.remove('error');
status.textContent = `组件目录 ${catalog.catalog_version} 已验证 / Catalog verified`;
} catch (error) {
Expand Down
20 changes: 16 additions & 4 deletions tests/test_pages_ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,10 +480,14 @@ function assertSafeEmptyState() {

const componentCatalog = JSON.parse(fs.readFileSync(path.join(root, 'components/catalog.json'), 'utf8'));

async function loadCatalogWith(responseFactory) {
async function loadCatalogWith(responseFactory, cryptoImpl = webcrypto) {
context.fetch = responseFactory;
await loadComponentCatalog();
await new Promise((resolve) => setTimeout(resolve, 20));
context.crypto = cryptoImpl;
try {
await loadComponentCatalog();
} finally {
context.crypto = webcrypto;
}
}

function flattenChildren(element) {
Expand Down Expand Up @@ -522,12 +526,20 @@ function flattenChildren(element) {
const normalized = normalizedBuildRequest(componentCatalog, 'official', dependencySelection, normalizedHash);
assert.match(actionsInputs(normalized), /^target=x86_64\nflavor=official\ncomponents=wireguard\ncatalog_version=2026\.07\.20\nrequest_hash=2aeca1c0914e74fa52c7e7748a5e3870e510a91883b1f647312addf678f966cf$/);

const delayedCrypto = {
subtle: {
async digest(...args) {
await new Promise((resolve) => setTimeout(resolve, 50));
return webcrypto.subtle.digest(...args);
},
},
};
await loadCatalogWith(async (url, options) => {
assert.equal(url, 'components/catalog.json');
assert.equal(options.cache, 'no-store');
assert.equal(options.credentials, 'same-origin');
return { ok: true, json: async () => clone(componentCatalog) };
});
}, delayedCrypto);
assert.equal(document.querySelector('#component-status').classList.contains('error'), false);
assert.equal(document.querySelector('#component-target').disabled, false);
assert.equal(document.querySelector('#component-target').value, 'x86_64');
Expand Down
Loading