Merge branch 'master' into master

Author: Donaldcwl

lib/image-compression.js

@@ -1,4 +1,4 @@
-import { canvasToFile, drawFileInCanvas, followExifOrientation, getExifOrientation, handleMaxWidthOrHeight, getNewCanvasAndCtx } from './utils'
+import { canvasToFile, drawFileInCanvas, followExifOrientation, getExifOrientation, handleMaxWidthOrHeight, getNewCanvasAndCtx, cleanupMemory } from './utils'
 
 /**
  * Compress an image file.
@@ -17,39 +17,49 @@ export default async function compress (file, options) {
   const maxSizeByte = options.maxSizeMB * 1024 * 1024
 
   // drawFileInCanvas
-  let [img, canvas] = await drawFileInCanvas(file)
+  let [img, origCanvas] = await drawFileInCanvas(file)
 
   // handleMaxWidthOrHeight
-  canvas = handleMaxWidthOrHeight(canvas, options)
+  let maxWidthOrHeightFixedCanvas = handleMaxWidthOrHeight(origCanvas, options)
 
   // exifOrientation
   options.exifOrientation = options.exifOrientation || await getExifOrientation(file)
-  canvas = followExifOrientation(canvas, options.exifOrientation)
+  let orientationFixedCanvas = followExifOrientation(maxWidthOrHeightFixedCanvas, options.exifOrientation)
 
   let quality = 1
-
-  let tempFile = await canvasToFile(canvas, file.type, file.name, file.lastModified, quality)
+  
+  let tempFile = await canvasToFile(orientationFixedCanvas, file.type, file.name, file.lastModified, quality)
   // check if we need to compress or resize
   if (tempFile.size <= maxSizeByte) {
     // no need to compress
     return tempFile
   }
 
   let compressedFile = tempFile
+  let newCanvas, ctx
+  let canvas = orientationFixedCanvas
   while (remainingTrials-- && compressedFile.size > maxSizeByte) {
-    const newWidth = canvas.width * 0.9
-    const newHeight = canvas.height * 0.9
-    const [newCanvas, ctx] = getNewCanvasAndCtx(newWidth, newHeight)
+    const newWidth = canvas.width * 0.9;
+    const newHeight = canvas.height * 0.9;
+    [newCanvas, ctx] = getNewCanvasAndCtx(newWidth, newHeight)
 
     ctx.drawImage(canvas, 0, 0, newWidth, newHeight)
 
     if (file.type === 'image/jpeg') {
       quality *= 0.9
     }
     compressedFile = await canvasToFile(newCanvas, file.type, file.name, file.lastModified, quality)
-
+    cleanupMemory(canvas)
     canvas = newCanvas
   }
 
+  // garbage clean canvas for safari
+  // ref: https://bugs.webkit.org/show_bug.cgi?id=195325
+  cleanupMemory(canvas)
+  cleanupMemory(newCanvas)
+  cleanupMemory(maxWidthOrHeightFixedCanvas)
+  cleanupMemory(orientationFixedCanvas)
+  cleanupMemory(origCanvas)
+
   return compressedFile
 }

lib/utils.js

@@ -1,5 +1,5 @@
 // add support for cordova-plugin-file
-const moduleMapper = typeof window !== 'undefined' && window.cordova && window.cordova.require('cordova/modulemapper');
+const moduleMapper = typeof window !== 'undefined' && window.cordova && window.cordova.require && window.cordova.require('cordova/modulemapper');
 export const CustomFile = (moduleMapper && moduleMapper.getOriginalSymbol(window, 'File')) || File;
 export const CustomFileReader = (moduleMapper && moduleMapper.getOriginalSymbol(window, 'FileReader')) || FileReader;
 /**
@@ -198,6 +198,8 @@ export function handleMaxWidthOrHeight (canvas, options) {
       newCanvas.height = maxWidthOrHeight
     }
     ctx.drawImage(canvas, 0, 0, newCanvas.width, newCanvas.height)
+
+    cleanupMemory(canvas)
   }
 
   return newCanvas
@@ -240,6 +242,8 @@ export function followExifOrientation (canvas, exifOrientation) {
 
   ctx.drawImage(canvas, 0, 0, width, height)
 
+  cleanupMemory(canvas)
+
   return newCanvas
 }
 
@@ -268,4 +272,14 @@ Number.isInteger = Number.isInteger || function(value) {
   return typeof value === 'number' && 
     isFinite(value) && 
     Math.floor(value) === value;
+
+/**
+ * clear Canvas memory
+ * @param canvas
+ * @returns null
+ */
+export function cleanupMemory(canvas) {
+  canvas.width = 0;
+  canvas.height = 0;
+  canvas = null;
 }