heic-to 1.1.13 → 1.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "heic-to",
-  "version": "1.1.13",
+  "version": "1.1.14",
   "description": "Converting HEIF/HEIF image formats to PNG/JPEG in the browser",
   "main": "dist/heic-to.js",
   "exports": {

package/src/index.js

@@ -42,14 +42,21 @@ const decodeBuffer = async (buffer) => {
     worker.postMessage(message);
     const handleEvent = (event) => {
       if (event.data.id === id) {
-        event.currentTarget.removeEventListener("message", handleEvent)
+        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);
 	});
 }
 
@@ -65,15 +72,27 @@ const encodeByCanvas = async (imageBuffer) => {
   return canvas;
 };
 
+const releaseCanvas = (canvas) => {
+    canvas.width = 1;
+    canvas.height = 1;
+    const ctx = canvas.getContext('2d');
+    ctx && ctx.clearRect(0, 0, 1, 1);
+}
+
 const heicTo = async ({blob, type, quality}) => {
   const imageBuffer = await blob.arrayBuffer()
-  const canvas = await encodeByCanvas(imageBuffer);
-  return await new Promise((resolve, reject) => canvas.toBlob(blob => {
-    if (blob != null)
-      resolve(blob);
-    else
-      reject(`Can't convert canvas to blob.`);
-  }, type, quality));
+  let canvas;
+  try {
+    canvas = await encodeByCanvas(imageBuffer);
+    return await new Promise((resolve, reject) => canvas.toBlob(blob => {
+      if (blob != null)
+        resolve(blob);
+      else
+        reject(`Can't convert canvas to blob.`);
+    }, type, quality));
+  } finally {
+    if (canvas) releaseCanvas(canvas);
+  }
 };
 
 export {

package/src/worker.js

@@ -3,41 +3,53 @@ import buildLibheif from LIB_HEIF_PATH;
 const libheif = buildLibheif()
 
 const decodeBuffer = async (buffer) => {
-  const decoder = new libheif.HeifDecoder();
-  const data = decoder.decode(buffer);
+  let decoder, data;
+  try {
+    decoder = new libheif.HeifDecoder();
+    data = decoder.decode(buffer);
 
-  if (!data.length) {
-    throw new Error('HEIF image not found');
-  }
+    if (!data.length) {
+      throw new Error('HEIF image not found');
+    }
 
-  const image = data[0]
+    const image = data[0]
 
-  const width = image.get_width();
-  const height = image.get_height();
+    const width = image.get_width();
+    const height = image.get_height();
 
-  const whiteImage = new ImageData(width, height)
-  for (let i = 0; i < width * height; i++) {
-    whiteImage.data[i * 4 + 3] = 255;
-  }
+    const whiteImage = new ImageData(width, height)
+    for (let i = 0; i < width * height; i++) {
+      whiteImage.data[i * 4 + 3] = 255;
+    }
 
-  const imageData = await new Promise((resolve, reject) => {
-    image.display(whiteImage, (displayData) => {
-      if (!displayData) {
-        return reject(new Error('HEIF processing error'));
-      }
+    const imageData = await new Promise((resolve, reject) => {
+      image.display(whiteImage, (displayData) => {
+        if (!displayData) {
+          return reject(new Error('HEIF processing error'));
+        }
 
-      resolve(displayData);
+        resolve(displayData);
+      });
     });
-  });
 
-  return imageData;
+    return imageData;
+  } finally {
+    if (data && data.length) {
+      for (let i = 0; i < data.length; i++) {
+        data[i].free();
+      }
+    }
+    if (decoder && decoder.decoder) {
+      libheif.heif_context_free(decoder.decoder);
+    }
+  }
 };
 
 onmessage = async (message) => {
 	const id = message.data.id;
 
   try {
-    const imageData = await decodeBuffer(message.data.buffer)
+    const imageData = await decodeBuffer(message.data.buffer);
     postMessage({ id, imageData, error: "" });
   } catch (e) {
 		postMessage({