--- a/src/index.js +++ b/src/index.js @@ -24,11 +24,13 @@ -// Lazy-load worker to avoid initialization issues on load -let worker; -const loadWorker = () => { - if (!worker) { - const workerFileContent = WORKER_FILE_CONTENT - const workerBlob = new Blob([workerFileContent], {type: 'application/javascript'}) - worker = new Worker(URL.createObjectURL(workerBlob)) - worker.onerror = (error) => console.error('Worker error:', error) - } - return worker -} +// IF Drama modification: bound the lifetime of each independent decode. +const decodeBuffer = (buffer) => new Promise((resolve, reject) => { + const url = URL.createObjectURL(new Blob([WORKER_FILE_CONTENT], {type:'application/javascript'})); + const worker = new Worker(url); + const cleanup = () => { clearTimeout(timer); worker.terminate(); URL.revokeObjectURL(url); }; + const timer = setTimeout(() => { cleanup(); reject(new Error('HEIF decode timed out')); }, 20000); + worker.onerror = () => { cleanup(); reject(new Error('HEIF worker failed')); }; + worker.onmessage = ({data}) => { + cleanup(); + if (data.error) reject(new Error(data.error)); else resolve(data.imageData); + }; + worker.postMessage({id:1, buffer}, [buffer]); +}); @@ -36,26 +37,0 @@ -const decodeBuffer = async (buffer) => { - return new Promise((resolve, reject) => { - loadWorker() - const id = (Math.random() * new Date().getTime()).toString(); - const message = { id, buffer }; - worker.postMessage(message); - const handleEvent = (event) => { - if (event.data.id === id) { - event.currentTarget.removeEventListener("message", handleEvent); - event.currentTarget.removeEventListener("error", handleError); - if (event.data.error) { - return reject(event.data.error); - } - return resolve(event.data.imageData); - } - } - const handleError = (event) => { - event.currentTarget.removeEventListener("message", handleEvent); - event.currentTarget.removeEventListener("error", handleError); - return reject(event.data); - } - worker.addEventListener("message", handleEvent); - worker.addEventListener("error", handleError); - }); -} - --- a/src/worker.js +++ b/src/worker.js @@ -3 +3 @@ -const libheif = buildLibheif() +const runtime = buildLibheif() @@ -5,0 +6 @@ + const libheif = await runtime; @@ -21,0 +23,2 @@ + if (width <= 0 || height <= 0 || width * height > 50_000_000) + throw new Error('HEIF image exceeds the pixel limit');