Automatically download completed browser deliveries

This commit is contained in:
2026-09-27 21:50:44 +02:00
parent 7643e84950
commit 4e86bbcb5b
3 changed files with 108 additions and 1 deletions

View File

@@ -11,7 +11,9 @@
"contextMenus",
"webRequest",
"bookmarks",
"scripting"
"scripting",
"downloads",
"alarms"
],
"optional_permissions": [
"clipboardRead"

View File

@@ -2323,6 +2323,10 @@ export default function App() {
};
appendRequestHistory(nextHistory);
if (!accepted) throw new Error(formatApiResponse(text) || `API rejected request (${res.status})`);
const browserDelivery = resolvedProfile.browser_delivery;
if (parsed?.job_id && browserDelivery && typeof browserDelivery === 'object' && !Array.isArray(browserDelivery) && (browserDelivery as Record<string, unknown>).enabled === true) {
chrome.runtime.sendMessage({ type: 'track-browser-job', jobId: parsed.job_id, apiUrl: currentSettings.apiUrl });
}
return true;
} catch (error) {
const nextHistory: HistoryEntry = {
@@ -2386,6 +2390,11 @@ export default function App() {
profile: buildApiPayload(task, currentProfiles, currentSettings).profile,
jobId: result?.job_id || null,
});
const profile = buildApiPayload(task, currentProfiles, currentSettings).profile;
const browserDelivery = profile.browser_delivery;
if (accepted && result?.job_id && browserDelivery && typeof browserDelivery === 'object' && !Array.isArray(browserDelivery) && (browserDelivery as Record<string, unknown>).enabled === true) {
chrome.runtime.sendMessage({ type: 'track-browser-job', jobId: result.job_id, apiUrl: currentSettings.apiUrl });
}
return { task, accepted, response, jobId: result?.job_id || null };
});
};
@@ -3624,6 +3633,8 @@ export default function App() {
useEffect(() => {
const runtimeListener = (message: unknown) => {
const msg = message as { type?: string; urls?: string[]; seedRecords?: Array<{ url: string; sourceUrl: string }>; items?: Array<{ url: string; sourceUrl: string; parentUrl: string | null; extractor: DropExtractorId; depth: number; path: string[] }>; graph?: Array<{ url: string; sourceUrl: string; parentUrl: string | null; extractor: DropExtractorId; depth: number; status: ExtractionGraphNode['status']; detail?: string }>; tasks?: Task[]; pipelineExtractors?: Partial<DropExtractorSettings>; pipelineControls?: Partial<TabPipelineControls>; pipelineJobId?: string; crawlJobId?: string; jobId?: string; phase?: CollectorProgressEvent['phase']; totalTabs?: number; processedTabs?: number; currentUrl?: string; extractor?: string; urlsCollected?: number; elapsedMs?: number; feed?: CollectorProgressEvent['feed']; currentCrawl?: CollectorProgressEvent['currentCrawl']; graphProgress?: CollectorProgressEvent['graphProgress']; paused?: boolean; error?: string; record?: ExtensionDiagnostic };
if (msg.type === 'browser-download-ready') showToast(`Browser download started for ${msg.jobId || 'completed job'}.`, 'success');
if (msg.type === 'browser-download-error') showToast(`Browser delivery failed: ${msg.error || 'unknown error'}`, 'error');
if (msg.type === 'extension-diagnostic' && msg.record) {
const record = normalizeDiagnostics([msg.record])[0];
if (record) setDiagnostics((previous) => [record, ...previous.filter((entry) => entry.id !== record.id)].slice(0, MAX_PERSISTED_RECORDS));

View File

@@ -7,6 +7,7 @@ type CollectorMessage = {
type TabDownloadStartedMessage = { type: 'tab-download-started'; tabId: number; };
type SiteLogoMessage = { type: 'get-site-logo'; origin: string; };
type BrowserDeliveryTrackMessage = { type: 'track-browser-job'; jobId: string; apiUrl: string; };
import { DEFAULT_TAB_PIPELINE_CONTROLS, normalizeTabPipelineControls, extractorPlanForUrl, type ExtractorId, type TabPipelineControls } from './extractor-pipeline';
import { DEFAULT_MAX_INDEXED_DB_BYTES, HARD_MAX_INDEXED_DB_BYTES, MIN_MAX_INDEXED_DB_BYTES, ensureLargeStorageReady, largeStorage } from './indexeddb-storage';
@@ -1672,6 +1673,87 @@ function safeSendMessage(message: unknown) {
}
}
type TrackedBrowserJob = { jobId: string; apiUrl: string; createdAt: number };
const BROWSER_JOB_STORAGE_KEY = 'browserDeliveryJobs';
let browserDeliveryPollRunning = false;
function isBrowserDeliveryTrackMessage(value: unknown): value is BrowserDeliveryTrackMessage {
return isObject(value)
&& value.type === 'track-browser-job'
&& typeof value.jobId === 'string' && /^[A-Za-z0-9_-]{1,120}$/.test(value.jobId)
&& typeof value.apiUrl === 'string' && value.apiUrl.length <= 2_000;
}
function apiBaseUrl(apiUrl: string): string | null {
try {
const url = new URL(apiUrl);
url.pathname = url.pathname.replace(/\/run\/?$/, '').replace(/\/$/, '');
url.search = '';
url.hash = '';
return url.toString().replace(/\/$/, '');
} catch {
return null;
}
}
async function readTrackedBrowserJobs(): Promise<TrackedBrowserJob[]> {
const stored = await chrome.storage.local.get(BROWSER_JOB_STORAGE_KEY) as { browserDeliveryJobs?: unknown };
return Array.isArray(stored.browserDeliveryJobs)
? stored.browserDeliveryJobs.filter((entry): entry is TrackedBrowserJob => isObject(entry) && typeof entry.jobId === 'string' && typeof entry.apiUrl === 'string' && typeof entry.createdAt === 'number')
: [];
}
async function writeTrackedBrowserJobs(jobs: TrackedBrowserJob[]): Promise<void> {
await chrome.storage.local.set({ [BROWSER_JOB_STORAGE_KEY]: jobs.slice(-500) });
}
async function pollBrowserDeliveryJobs(): Promise<void> {
if (browserDeliveryPollRunning) return;
browserDeliveryPollRunning = true;
try {
const [jobs, local] = await Promise.all([
readTrackedBrowserJobs(),
chrome.storage.local.get('apiToken') as Promise<{ apiToken?: unknown }>,
]);
const token = typeof local.apiToken === 'string' ? local.apiToken : '';
const remaining: TrackedBrowserJob[] = [];
for (const tracked of jobs) {
const base = apiBaseUrl(tracked.apiUrl);
if (!base || !token || Date.now() - tracked.createdAt > 7 * 24 * 60 * 60 * 1000) continue;
try {
const statusResponse = await fetch(`${base}/jobs/${encodeURIComponent(tracked.jobId)}`, { headers: { Authorization: `Bearer ${token}` }, signal: AbortSignal.timeout(15_000) });
if (!statusResponse.ok) { remaining.push(tracked); continue; }
const job = await statusResponse.json() as { status?: string };
if (job.status !== 'done' && !String(job.status || '').startsWith('failed')) { remaining.push(tracked); continue; }
if (job.status !== 'done') {
safeSendMessage({ type: 'browser-download-error', jobId: tracked.jobId, error: `Download job ended with status ${job.status}` });
continue;
}
const downloadsResponse = await fetch(`${base}/jobs/${encodeURIComponent(tracked.jobId)}/downloads`, { headers: { Authorization: `Bearer ${token}` }, signal: AbortSignal.timeout(15_000) });
if (!downloadsResponse.ok) { remaining.push(tracked); continue; }
const manifest = await downloadsResponse.json() as { downloads?: Array<{ name?: string; url?: string }> };
const downloads = Array.isArray(manifest.downloads) ? manifest.downloads : [];
for (const item of downloads) {
if (typeof item.url !== 'string' || typeof item.name !== 'string') continue;
await chrome.downloads.download({ url: new URL(item.url, base).toString(), filename: item.name, saveAs: false });
}
safeSendMessage({ type: 'browser-download-ready', jobId: tracked.jobId, count: downloads.length });
} catch (error) {
remaining.push(tracked);
safeSendMessage({ type: 'browser-download-error', jobId: tracked.jobId, error: error instanceof Error ? error.message : 'Browser delivery check failed' });
}
}
await writeTrackedBrowserJobs(remaining);
if (remaining.length === 0) chrome.alarms.clear('browser-delivery-poll');
} finally {
browserDeliveryPollRunning = false;
}
}
chrome.alarms.onAlarm.addListener((alarm) => {
if (alarm.name === 'browser-delivery-poll') void pollBrowserDeliveryJobs();
});
function forwardUrls(urls: string[]) {
safeSendMessage({ type: 'panel-add-urls', urls });
}
@@ -1914,6 +1996,18 @@ chrome.commands.onCommand.addListener((command) => {
});
chrome.runtime.onMessage.addListener((rawMessage: unknown, _sender, sendResponse) => {
if (isBrowserDeliveryTrackMessage(rawMessage)) {
void readTrackedBrowserJobs().then(async (jobs) => {
const next = jobs.filter((job) => job.jobId !== rawMessage.jobId);
next.push({ jobId: rawMessage.jobId, apiUrl: rawMessage.apiUrl, createdAt: Date.now() });
await writeTrackedBrowserJobs(next);
await chrome.alarms.create('browser-delivery-poll', { delayInMinutes: 0.1, periodInMinutes: 1 });
await pollBrowserDeliveryJobs();
sendResponse({ ok: true });
}).catch((error) => sendResponse({ ok: false, error: error instanceof Error ? error.message : 'Unable to track browser delivery' }));
return true;
}
if (isSiteLogoMessage(rawMessage)) {
void resolveSiteLogo(rawMessage.origin).then((dataUrl) => sendResponse({ dataUrl }));
return true;