fix: handle unhandled promise rejections (#2568)

niklasvh · Jul 12, 2021 · 4555940 · 4555940
1 parent 382853c
commit 4555940
Show file tree

Hide file tree

Showing 6 changed files with 182 additions and 46 deletions.
diff --git a/src/core/cache-storage.ts b/src/core/cache-storage.ts
@@ -87,7 +87,9 @@ export class Cache {
         }
 
         if (isBlobImage(src) || isRenderable(src)) {
-            this._cache[src] = this.loadImage(src);
+            (this._cache[src] = this.loadImage(src)).catch(() => {
+                // prevent unhandled rejection
+            });
             return result;
         }
 

diff --git a/tests/reftests/iframe.html b/tests/reftests/iframe.html
@@ -2,10 +2,21 @@
 <html>
 <head>
     <title>iframe test</title>
+    <script>
+        h2cOptions = {useCORS: true, proxy: null};
+    </script>
     <script type="text/javascript" src="../test.js"></script>
 </head>
 <body>
     <div style="background: cornflowerblue; padding: 20px; width: 200px;">Parent document content</div>
     <iframe src="/tests/assets/iframe/frame1.html" width="500" height="500"></iframe>
+    <iframe
+        title="Github"
+        src="https://ghbtns.com/github-btn.html?user=niklasvh&repo=html2canvas&type=star&count=true&size=large"
+        frameBorder="0"
+        scrolling="0"
+        width="160px"
+        height="30px"
+    ></iframe>
 </body>
 </html>
diff --git a/tests/test.js b/tests/test.js
@@ -24,6 +24,10 @@ var REFTEST = window.location.search.indexOf('reftest') !== -1;
         ])
         .forEach(appendScript);
 
+    window.addEventListener("unhandledrejection", function(event) {
+        console.info('UNHANDLED PROMISE REJECTION:', event);
+    });
+
     window.onload = function() {
         (function($) {
             $.fn.html2canvas = function(options) {

diff --git a/tests/testrunner.ts b/tests/testrunner.ts
@@ -86,6 +86,11 @@ testList
                     throw new Error('Window not found for iframe');
                 }
 
+                contentWindow.addEventListener('unhandledrejection', (event) => {
+                    console.error(event.reason);
+                    throw new Error(`unhandledrejection: ${JSON.stringify(event.reason)}`);
+                });
+
                 const canvas: HTMLCanvasElement = await contentWindow
                     // @ts-ignore
                     .html2canvas(contentWindow.forceElement || contentWindow.document.documentElement, {

diff --git a/www/package-lock.json b/www/package-lock.json
diff --git a/www/package.json b/www/package.json
@@ -19,7 +19,7 @@
     "gatsby-transformer-remark": "^2.3.8",
     "glamor": "^2.20.40",
     "gzip-size": "^5.0.0",
-    "html2canvas": "^1.0.0-alpha.12",
+    "html2canvas": "file:../",
     "mkdirp": "^0.5.1",
     "prismjs": "^1.16.0",
     "react": "^16.8.6",