Skip to content

fix apocalypse downloads and readiness showcase #2833

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
webbrain-one merged 1 commit into from
Aug 17, 2026
Merged

fix apocalypse downloads and readiness showcase #2833

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
49 changes: 42 additions & 7 deletions src/chrome/src/agent/emergency-box.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,15 +621,23 @@ export async function resolveEmergencyResource(resource, fetchImpl = globalThis.
return normalizedRecord(resource, { url });
}

export async function downloadEmergencyResource(resource, options = {}) {
const store = options.store || createEmergencyBoxStore();
const storage = options.storage || createEmergencyBoxStorage();
const fetchImpl = options.fetchImpl || globalThis.fetch;
const signal = options.signal;
const onProgress = typeof options.onProgress === 'function' ? options.onProgress : () => {};
const resolved = await resolveEmergencyResource(resource, fetchImpl);
export async function withEmergencyResourceLock(resourceId, task, options = {}) {
const lockManager = options.lockManager ?? globalThis.navigator?.locks;
if (typeof lockManager?.request !== 'function') return await task();
const lockName = `webbrain-emergency-pdf:${safeResourceKey(resourceId)}`;
const lockOptions = { mode: 'exclusive' };
if (options.signal) lockOptions.signal = options.signal;
return await lockManager.request(lockName, lockOptions, task);
}

async function downloadResolvedEmergencyResource(resolved, options) {
const { store, storage, fetchImpl, signal, onProgress } = options;
const storageKey = resolved.storageKey || resolved.id;
const existing = await store.get(resolved.id);
if (existing?.status === 'ready' && (existing.storageKey || existing.id) === storageKey) {
onProgress(existing);
return existing;
}
const replacedStorageKey = existing?.storageKey && existing.storageKey !== storageKey
? existing.storageKey
: '';
Expand Down Expand Up @@ -720,6 +728,33 @@ export async function downloadEmergencyResource(resource, options = {}) {
}
}

export async function downloadEmergencyResource(resource, options = {}) {
const store = options.store || createEmergencyBoxStore();
const storage = options.storage || createEmergencyBoxStorage();
const fetchImpl = options.fetchImpl || globalThis.fetch;
const signal = options.signal;
const onProgress = typeof options.onProgress === 'function' ? options.onProgress : () => {};
const resolved = await resolveEmergencyResource(resource, fetchImpl);
try {
return await withEmergencyResourceLock(resolved.id, () => downloadResolvedEmergencyResource(resolved, {
store,
storage,
fetchImpl,
signal,
onProgress,
}), { lockManager: options.lockManager, signal });
} catch (error) {
if (error?.name !== 'AbortError' && !signal?.aborted) throw error;
return await store.get(resolved.id) || normalizedRecord(resolved, {
storageKey: resolved.storageKey || resolved.id,
status: 'paused',
bytesReceived: 0,
error: '',
updatedAt: Date.now(),
});
}
}

export async function deleteEmergencyResource(id, options = {}) {
const store = options.store || createEmergencyBoxStore();
const storage = options.storage || createEmergencyBoxStorage();
Expand Down
1 change: 1 addition & 0 deletions src/chrome/src/ui/download-tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ async function runItemAction(item, action) {
if (item.modelKind === 'text' && state) textModelState = state;
} else if (item.kind === 'pdf') {
if (action === 'resume' && !/\/emergency-box\.html$/.test(globalThis.location?.pathname || '')) {
signalEmergencyBox('pause', item);
globalThis.location.href = `${item.href}?resume=${encodeURIComponent(item.sourceId)}`;
return;
}
Expand Down
18 changes: 14 additions & 4 deletions src/chrome/src/ui/emergency-box.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,15 @@ function resourceById(id) {
}

async function startDownload(resource, options = {}) {
if (!resource || downloads.has(resource.id) || !apocalypseEnabled) return;
if (!resource || !apocalypseEnabled) return;
const activeEntry = downloads.get(resource.id);
if (activeEntry) {
if (options.resume !== true) return;
activeEntry.controller.abort();
if (activeEntry.promise) await activeEntry.promise.catch(() => {});
resource = resourceById(resource.id) || resource;
if (resource.status === 'ready') return resource;
}
if (options.confirm !== false) {
const confirmed = globalThis.confirm(t('eb.confirm_download', {
title: resource.title,
Expand Down Expand Up @@ -355,7 +363,7 @@ async function handleDownloadControl(detail = {}) {
const resource = resourceById(id);
if (!id || !resource) return;
if (action === 'pause') downloads.get(id)?.controller.abort();
if (action === 'resume') await startDownload(resource, { confirm: false });
if (action === 'resume') await startDownload(resource, { confirm: false, resume: true });
if (action === 'stop') await stopAndDeleteDownload(id);
}

Expand Down Expand Up @@ -442,7 +450,9 @@ elements['resource-list'].addEventListener('click', async event => {
if (!button) return;
const { action, id } = button.dataset;
const resource = resourceById(id);
if (action === 'download') await startDownload(resource);
if (action === 'download') await startDownload(resource, {
resume: ['paused', 'error'].includes(resource?.status),
});
if (action === 'pause') downloads.get(id)?.controller.abort();
if (action === 'read') openReader(resource);
if (action === 'delete' && globalThis.confirm(t('eb.confirm_delete', { title: resource?.title || id }))) {
Expand Down Expand Up @@ -481,6 +491,6 @@ refreshState({ recoverInterrupted: true }).then(async () => {
globalThis.history.replaceState({}, '', globalThis.location.pathname);
const resource = resourceById(resumeId);
if (resource && ['paused', 'error'].includes(resource.status)) {
await startDownload(resource, { confirm: false });
await startDownload(resource, { confirm: false, resume: true });
}
}).catch(error => setNotice(error.message, 'error'));
49 changes: 40 additions & 9 deletions src/chrome/src/ui/emergency-communication.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,18 @@ const ESSENTIALS = new Set(['cold', 'come', 'die', 'drink', 'eat', 'fire', 'good
const BODY = new Set(['belly', 'blood', 'bone', 'breast', 'ear', 'eye', 'fat', 'foot', 'hair', 'hand', 'head', 'hear', 'heart', 'knee', 'liver', 'mouth', 'neck', 'nose', 'skin', 'tongue', 'tooth']);
const PEOPLE = new Set(['I', 'man', 'many', 'one', 'person', 'that', 'this', 'two', 'we', 'what', 'who', 'woman', 'you']);

const currentCopy = COPY[getLocale()] || COPY.en;
const languageDisplayNameFormatters = [...new Set(['en', getLocale()])].flatMap(locale => {
try { return [new Intl.DisplayNames([locale], { type: 'language' })]; } catch { return []; }
});
function copyForLocale() {
return COPY[getLocale()] || COPY.en;
}

function createLanguageDisplayNameFormatters() {
return [...new Set(['en', getLocale()])].flatMap(locale => {
try { return [new Intl.DisplayNames([locale], { type: 'language' })]; } catch { return []; }
});
}

let currentCopy = copyForLocale();
let languageDisplayNameFormatters = createLanguageDisplayNameFormatters();
let currentThemeMode = 'system';
loadMode().then(mode => { currentThemeMode = mode; applyMode(mode, { syncStorage: false }); });
watch(() => currentThemeMode);
Expand Down Expand Up @@ -128,6 +136,15 @@ function languageAliases(language) {
return [...new Set(aliases.filter(Boolean).map(normalizeSearch))];
}

function rebuildLanguageIndex() {
if (!lexicon) return;
languageLabels = new Map(lexicon.languages.map(language => [languageLabel(language), language]));
languageRows = lexicon.languages.map((language, index) => {
const aliases = languageAliases(language);
return { language, index, aliases, searchText: aliases.join(' ') };
});
}

function languageMatchScore(row, query) {
if (row.aliases.includes(query)) return 0;
if (row.aliases.some(alias => alias.startsWith(query))) return 1;
Expand Down Expand Up @@ -341,6 +358,24 @@ elements['word-dialog'].addEventListener('click', event => {
if (event.target === elements['word-dialog']) elements['word-dialog'].close();
});

document.addEventListener('wb-locale-changed', () => {
const selectedLabel = selectedLanguage ? languageLabel(selectedLanguage) : '';
const pickerQuery = languagePickerOpen && elements['language-input'].value !== selectedLabel
? elements['language-input'].value
: '';
currentCopy = copyForLocale();
languageDisplayNameFormatters = createLanguageDisplayNameFormatters();
applyCopy();
if (!lexicon) return;
rebuildLanguageIndex();
elements['concept-count'].textContent = lexicon.conceptCount.toLocaleString(getLocale());
elements['language-count'].textContent = lexicon.languageCount.toLocaleString(getLocale());
elements['variety-count'].textContent = lexicon.varietyCount.toLocaleString(getLocale());
if (languagePickerOpen) renderLanguageOptions(pickerQuery);
else if (selectedLanguage) elements['language-input'].value = languageLabel(selectedLanguage);
render();
});

applyCopy();
try {
const response = await fetch('./data/panlex-swadesh-110.json');
Expand All @@ -349,11 +384,7 @@ try {
elements['concept-count'].textContent = lexicon.conceptCount.toLocaleString();
elements['language-count'].textContent = lexicon.languageCount.toLocaleString();
elements['variety-count'].textContent = lexicon.varietyCount.toLocaleString();
languageLabels = new Map(lexicon.languages.map(language => [languageLabel(language), language]));
languageRows = lexicon.languages.map((language, index) => {
const aliases = languageAliases(language);
return { language, index, aliases, searchText: aliases.join(' ') };
});
rebuildLanguageIndex();
const preferredUid = DEFAULT_UID[getLocale()] || 'eng-000';
selectLanguage(lexicon.languages.find(language => language.uid === preferredUid)
|| lexicon.languages.find(language => language.uid === 'eng-000') || lexicon.languages[0], { closePicker: false });
Expand Down
49 changes: 42 additions & 7 deletions src/firefox/src/agent/emergency-box.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,15 +621,23 @@ export async function resolveEmergencyResource(resource, fetchImpl = globalThis.
return normalizedRecord(resource, { url });
}

export async function downloadEmergencyResource(resource, options = {}) {
const store = options.store || createEmergencyBoxStore();
const storage = options.storage || createEmergencyBoxStorage();
const fetchImpl = options.fetchImpl || globalThis.fetch;
const signal = options.signal;
const onProgress = typeof options.onProgress === 'function' ? options.onProgress : () => {};
const resolved = await resolveEmergencyResource(resource, fetchImpl);
export async function withEmergencyResourceLock(resourceId, task, options = {}) {
const lockManager = options.lockManager ?? globalThis.navigator?.locks;
if (typeof lockManager?.request !== 'function') return await task();
const lockName = `webbrain-emergency-pdf:${safeResourceKey(resourceId)}`;
const lockOptions = { mode: 'exclusive' };
if (options.signal) lockOptions.signal = options.signal;
return await lockManager.request(lockName, lockOptions, task);
}

async function downloadResolvedEmergencyResource(resolved, options) {
const { store, storage, fetchImpl, signal, onProgress } = options;
const storageKey = resolved.storageKey || resolved.id;
const existing = await store.get(resolved.id);
if (existing?.status === 'ready' && (existing.storageKey || existing.id) === storageKey) {
onProgress(existing);
return existing;
}
const replacedStorageKey = existing?.storageKey && existing.storageKey !== storageKey
? existing.storageKey
: '';
Expand Down Expand Up @@ -720,6 +728,33 @@ export async function downloadEmergencyResource(resource, options = {}) {
}
}

export async function downloadEmergencyResource(resource, options = {}) {
const store = options.store || createEmergencyBoxStore();
const storage = options.storage || createEmergencyBoxStorage();
const fetchImpl = options.fetchImpl || globalThis.fetch;
const signal = options.signal;
const onProgress = typeof options.onProgress === 'function' ? options.onProgress : () => {};
const resolved = await resolveEmergencyResource(resource, fetchImpl);
try {
return await withEmergencyResourceLock(resolved.id, () => downloadResolvedEmergencyResource(resolved, {
store,
storage,
fetchImpl,
signal,
onProgress,
}), { lockManager: options.lockManager, signal });
} catch (error) {
if (error?.name !== 'AbortError' && !signal?.aborted) throw error;
return await store.get(resolved.id) || normalizedRecord(resolved, {
storageKey: resolved.storageKey || resolved.id,
status: 'paused',
bytesReceived: 0,
error: '',
updatedAt: Date.now(),
});
}
}

export async function deleteEmergencyResource(id, options = {}) {
const store = options.store || createEmergencyBoxStore();
const storage = options.storage || createEmergencyBoxStorage();
Expand Down
1 change: 1 addition & 0 deletions src/firefox/src/ui/download-tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ async function runItemAction(item, action) {
if (item.modelKind === 'text' && state) textModelState = state;
} else if (item.kind === 'pdf') {
if (action === 'resume' && !/\/emergency-box\.html$/.test(globalThis.location?.pathname || '')) {
signalEmergencyBox('pause', item);
globalThis.location.href = `${item.href}?resume=${encodeURIComponent(item.sourceId)}`;
return;
}
Expand Down
18 changes: 14 additions & 4 deletions src/firefox/src/ui/emergency-box.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,15 @@ function resourceById(id) {
}

async function startDownload(resource, options = {}) {
if (!resource || downloads.has(resource.id) || !apocalypseEnabled) return;
if (!resource || !apocalypseEnabled) return;
const activeEntry = downloads.get(resource.id);
if (activeEntry) {
if (options.resume !== true) return;
activeEntry.controller.abort();
if (activeEntry.promise) await activeEntry.promise.catch(() => {});
resource = resourceById(resource.id) || resource;
if (resource.status === 'ready') return resource;
}
if (options.confirm !== false) {
const confirmed = globalThis.confirm(t('eb.confirm_download', {
title: resource.title,
Expand Down Expand Up @@ -355,7 +363,7 @@ async function handleDownloadControl(detail = {}) {
const resource = resourceById(id);
if (!id || !resource) return;
if (action === 'pause') downloads.get(id)?.controller.abort();
if (action === 'resume') await startDownload(resource, { confirm: false });
if (action === 'resume') await startDownload(resource, { confirm: false, resume: true });
if (action === 'stop') await stopAndDeleteDownload(id);
}

Expand Down Expand Up @@ -442,7 +450,9 @@ elements['resource-list'].addEventListener('click', async event => {
if (!button) return;
const { action, id } = button.dataset;
const resource = resourceById(id);
if (action === 'download') await startDownload(resource);
if (action === 'download') await startDownload(resource, {
resume: ['paused', 'error'].includes(resource?.status),
});
if (action === 'pause') downloads.get(id)?.controller.abort();
if (action === 'read') openReader(resource);
if (action === 'delete' && globalThis.confirm(t('eb.confirm_delete', { title: resource?.title || id }))) {
Expand Down Expand Up @@ -481,6 +491,6 @@ refreshState({ recoverInterrupted: true }).then(async () => {
globalThis.history.replaceState({}, '', globalThis.location.pathname);
const resource = resourceById(resumeId);
if (resource && ['paused', 'error'].includes(resource.status)) {
await startDownload(resource, { confirm: false });
await startDownload(resource, { confirm: false, resume: true });
}
}).catch(error => setNotice(error.message, 'error'));
49 changes: 40 additions & 9 deletions src/firefox/src/ui/emergency-communication.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,18 @@ const ESSENTIALS = new Set(['cold', 'come', 'die', 'drink', 'eat', 'fire', 'good
const BODY = new Set(['belly', 'blood', 'bone', 'breast', 'ear', 'eye', 'fat', 'foot', 'hair', 'hand', 'head', 'hear', 'heart', 'knee', 'liver', 'mouth', 'neck', 'nose', 'skin', 'tongue', 'tooth']);
const PEOPLE = new Set(['I', 'man', 'many', 'one', 'person', 'that', 'this', 'two', 'we', 'what', 'who', 'woman', 'you']);

const currentCopy = COPY[getLocale()] || COPY.en;
const languageDisplayNameFormatters = [...new Set(['en', getLocale()])].flatMap(locale => {
try { return [new Intl.DisplayNames([locale], { type: 'language' })]; } catch { return []; }
});
function copyForLocale() {
return COPY[getLocale()] || COPY.en;
}

function createLanguageDisplayNameFormatters() {
return [...new Set(['en', getLocale()])].flatMap(locale => {
try { return [new Intl.DisplayNames([locale], { type: 'language' })]; } catch { return []; }
});
}

let currentCopy = copyForLocale();
let languageDisplayNameFormatters = createLanguageDisplayNameFormatters();
let currentThemeMode = 'system';
loadMode().then(mode => { currentThemeMode = mode; applyMode(mode, { syncStorage: false }); });
watch(() => currentThemeMode);
Expand Down Expand Up @@ -128,6 +136,15 @@ function languageAliases(language) {
return [...new Set(aliases.filter(Boolean).map(normalizeSearch))];
}

function rebuildLanguageIndex() {
if (!lexicon) return;
languageLabels = new Map(lexicon.languages.map(language => [languageLabel(language), language]));
languageRows = lexicon.languages.map((language, index) => {
const aliases = languageAliases(language);
return { language, index, aliases, searchText: aliases.join(' ') };
});
}

function languageMatchScore(row, query) {
if (row.aliases.includes(query)) return 0;
if (row.aliases.some(alias => alias.startsWith(query))) return 1;
Expand Down Expand Up @@ -341,6 +358,24 @@ elements['word-dialog'].addEventListener('click', event => {
if (event.target === elements['word-dialog']) elements['word-dialog'].close();
});

document.addEventListener('wb-locale-changed', () => {
const selectedLabel = selectedLanguage ? languageLabel(selectedLanguage) : '';
const pickerQuery = languagePickerOpen && elements['language-input'].value !== selectedLabel
? elements['language-input'].value
: '';
currentCopy = copyForLocale();
languageDisplayNameFormatters = createLanguageDisplayNameFormatters();
applyCopy();
if (!lexicon) return;
rebuildLanguageIndex();
elements['concept-count'].textContent = lexicon.conceptCount.toLocaleString(getLocale());
elements['language-count'].textContent = lexicon.languageCount.toLocaleString(getLocale());
elements['variety-count'].textContent = lexicon.varietyCount.toLocaleString(getLocale());
if (languagePickerOpen) renderLanguageOptions(pickerQuery);
else if (selectedLanguage) elements['language-input'].value = languageLabel(selectedLanguage);
render();
});

applyCopy();
try {
const response = await fetch('./data/panlex-swadesh-110.json');
Expand All @@ -349,11 +384,7 @@ try {
elements['concept-count'].textContent = lexicon.conceptCount.toLocaleString();
elements['language-count'].textContent = lexicon.languageCount.toLocaleString();
elements['variety-count'].textContent = lexicon.varietyCount.toLocaleString();
languageLabels = new Map(lexicon.languages.map(language => [languageLabel(language), language]));
languageRows = lexicon.languages.map((language, index) => {
const aliases = languageAliases(language);
return { language, index, aliases, searchText: aliases.join(' ') };
});
rebuildLanguageIndex();
const preferredUid = DEFAULT_UID[getLocale()] || 'eng-000';
selectLanguage(lexicon.languages.find(language => language.uid === preferredUid)
|| lexicon.languages.find(language => language.uid === 'eng-000') || lexicon.languages[0], { closePicker: false });
Expand Down
2 changes: 2 additions & 0 deletions src/firefox/src/ui/locales/ar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,8 @@ export default {
'st.display.advanced': 'متقدم',
...getApocalypseModeCopy('ar'),
...getEmergencyBoxCopy('ar'),
'st.providers.webgpu_download.stopping': 'جارٍ الإيقاف وحذف الملفات…',
'st.providers.webgpu_download.stop': 'إيقاف وحذف',
'st.display.clarify_timeout.label': 'مهلة التوضيح',
'st.display.clarify_timeout.desc': 'مدة انتظار الرد على سؤال التوضيح قبل اختيار الخيار الأول تلقائيًا (أو انتهاء المهلة إن لم توجد خيارات). 0 = فوري (اختيار تلقائي دائمًا). أعلى من 1200 ثانية = انتظار بلا حدود (إيقاف). الافتراضي 60 ثانية. لا ينطبق على أذونات أو تأكيدات إرسال النماذج.',
'st.display.clarify_timeout.off': 'إيقاف',
Expand Down
Loading
Loading