Small performance and other corrections.

highcharts · May 13, 2024 · 067e026 · 067e026
1 parent eea8edf
commit 067e026
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 264 deletions.
diff --git a/dist/index.cjs b/dist/index.cjs
diff --git a/dist/index.esm.js b/dist/index.esm.js
diff --git a/dist/index.esm.js.map b/dist/index.esm.js.map
diff --git a/lib/browser.js b/lib/browser.js
@@ -180,18 +180,20 @@ export async function newPage() {
  */
 export async function clearPage(page, hardReset = false) {
   try {
-    if (hardReset) {
-      // Navigate to about:blank
-      await page.goto('about:blank', { waitUntil: 'domcontentloaded' });
-
-      // Set the content and and scripts again
-      await setPageContent(page);
-    } else {
-      // Clear body content
-      await page.evaluate(() => {
-        document.body.innerHTML =
-          '<div id="chart-container"><div id="container"></div></div>';
-      });
+    if (!page.isClosed()) {
+      if (hardReset) {
+        // Navigate to about:blank
+        await page.goto('about:blank', { waitUntil: 'domcontentloaded' });
+
+        // Set the content and and scripts again
+        await setPageContent(page);
+      } else {
+        // Clear body content
+        await page.evaluate(() => {
+          document.body.innerHTML =
+            '<div id="chart-container"><div id="container"></div></div>';
+        });
+      }
     }
   } catch (error) {
     logWithStack(

diff --git a/lib/index.js b/lib/index.js
@@ -29,7 +29,7 @@ import {
   setLogLevel,
   enableFileLogging
 } from './logger.js';
-import { initPool } from './pool.js';
+import { initPool, killPool } from './pool.js';
 import { shutdownCleanUp } from './resource_release.js';
 import server, { startServer } from './server/server.js';
 import { printLogo, printUsage } from './utils.js';
@@ -122,16 +122,20 @@ export default {
   batchExport,
   startExport,
 
-  // Other
-  setOptions,
-  shutdownCleanUp,
+  // Pool
+  initPool,
+  killPool,
 
   // Logs
   log,
   logWithStack,
   setLogLevel,
   enableFileLogging,
 
+  // Other
+  setOptions,
+  shutdownCleanUp,
+
   // Utils
   mapToNewConfig,
   manualConfig,

diff --git a/lib/pool.js b/lib/pool.js
@@ -131,15 +131,7 @@ const factory = {
       );
       return false;
     }
-
-    // Clear page
-    try {
-      const { other } = getOptions();
-      await clearPage(workerHandle.page, other.hardResetPage);
-      return true;
-    } catch {
-      return false;
-    }
+    return true;
   },
 
   /**

diff --git a/lib/sanitize.js b/lib/sanitize.js
@@ -31,7 +31,7 @@ import DOMPurify from 'dompurify';
 export function sanitize(input) {
   const window = new JSDOM('').window;
   const purify = DOMPurify(window);
-  return purify.sanitize(input);
+  return purify.sanitize(input, { ADD_TAGS: ['foreignObject'] });
 }
 
 export default sanitize;
diff --git a/lib/schemas/config.js b/lib/schemas/config.js
@@ -106,7 +106,7 @@ export const defaultConfig = {
         '--disable-dev-shm-usage',
         '--disable-domain-reliability',
         '--disable-extensions',
-        '--disable-features=CalculateNativeWinOcclusion,InterestFeedContentSuggestions,MediaRouter,Translate,WebOTP',
+        '--disable-features=CalculateNativeWinOcclusion,InterestFeedContentSuggestions,WebOTP',
         '--disable-hang-monitor',
         '--disable-ipc-flooding-protection',
         '--disable-logging',