polotno-node 2.10.0 → 2.10.2

package/dist/index.html

@@ -8,7 +8,7 @@
       }
     </style>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <script type="module" crossorigin src="./assets/index-BWNdW2kw.js"></script>
+    <script type="module" crossorigin src="./assets/index-D56TTNQ-.js"></script>
   </head>
   <body>
     <div id="root"></div>

package/instance.js

@@ -75,6 +75,8 @@ module.exports.jsonToBlob = async (page, json, attrs) => {
 
 const busyPages = [];
 
+const createdInstances = [];
+
 module.exports.createInstance = async ({
   key,
   url,
@@ -272,8 +274,9 @@ module.exports.createInstance = async ({
     return blob;
   };
 
-  return {
+  const instance = {
     close: async () => {
+      createdInstances.splice(createdInstances.indexOf(instance), 1);
       await browser.close();
     },
     firstPage,
@@ -288,4 +291,33 @@ module.exports.createInstance = async ({
     jsonToGIFBase64,
     createPage: async () => await module.exports.createPage(browser, visitPage),
   };
+
+  createdInstances.push(instance);
+  return instance;
 };
+
+// Function to close all created instances in parallel
+const closeAllInstances = async () => {
+  await Promise.all(createdInstances.map((instance) => instance.close()));
+};
+
+// Register the function to be called on process exit
+process.on('beforeExit', () => {
+  closeAllInstances().catch((error) => {
+    console.error('Error closing instances:', error);
+  });
+});
+
+// Also handle other termination signals
+['SIGINT', 'SIGTERM', 'SIGQUIT', 'exit', 'beforeExit'].forEach((signal) => {
+  process.on(signal, () => {
+    closeAllInstances()
+      .then(() => {
+        process.exit(0);
+      })
+      .catch((error) => {
+        console.error('Error closing instances:', error);
+        process.exit(1);
+      });
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polotno-node",
-  "version": "2.10.0",
+  "version": "2.10.2",
   "description": "Polotno workflow from NodeJS",
   "main": "index.js",
   "scripts": {
@@ -12,31 +12,30 @@
     "dist",
     "index.js",
     "instance.js",
-    "video.js",
     "video-parallel.js",
     "README.md"
   ],
   "browserslist": "> 0.5%, last 2 versions, not dead",
   "devDependencies": {
     "ava": "^6.1.3",
-    "axios": "^1.7.2",
+    "axios": "^1.7.5",
     "canvas": "^2.11.2",
     "dotenv": "^16.4.5",
     "fluent-ffmpeg": "^2.1.3",
     "gifencoder": "^2.0.1",
     "pixelmatch": "^6.0.0",
     "pngjs": "^7.0.0",
-    "polotno": "^2.11.5",
+    "polotno": "^2.12.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "vite": "^5.3.4"
+    "vite": "^5.4.2"
   },
   "author": "Anton Lavrenov",
   "license": "MIT",
   "dependencies": {
-    "@sparticuz/chromium": "126.0.0",
-    "puppeteer": "22.13.0",
-    "puppeteer-core": "22.13.0",
+    "@sparticuz/chromium": "127.0.0",
+    "puppeteer": "23.1.1",
+    "puppeteer-core": "23.1.1",
     "tmp": "^0.2.3"
   },
   "bugs": {

package/video-parallel.js

@@ -153,11 +153,10 @@ module.exports.jsonToVideo = async function jsonToVideo(
       chunks.push(frames.slice(i, i + chunkSize));
     }
 
+    let lastTime = 0;
     const pages = json.pages.map((p, index) => {
-      const previousPage = json.pages[index - 1];
-      const startTime = previousPage
-        ? previousPage.startTime + previousPage.duration
-        : 0;
+      const startTime = lastTime;
+      lastTime = startTime + p.duration;
       return {
         id: p.id,
         startTime,
@@ -171,16 +170,19 @@ module.exports.jsonToVideo = async function jsonToVideo(
       chunks.map(async (chunk, chunkIndex) => {
         const instance = typeof inst === 'function' ? await inst() : inst;
         const page = await instance.createPage();
+        await page.evaluate(() => {
+          if (window.config?.onLoadError) {
+            window.config.onLoadError((error) => {
+              window._polotnoError = error;
+            });
+          } else {
+            console.error(
+              'onLoadError function is not defined in the client. Error handling will not work.'
+            );
+          }
+        });
         page.setDefaultNavigationTimeout(60000); // Increase timeout to 60 seconds
 
-        await page.evaluate(async (json) => {
-          store.loadJSON(json);
-          await store.waitLoading();
-          await new Promise((resolve) => {
-            setTimeout(resolve, 100);
-          });
-        }, json);
-
         let lastPageIndex = -1;
         for (const frameIndex of chunk) {
           let currentTime = frameIndex * timePerFrame;
@@ -199,9 +201,23 @@ module.exports.jsonToVideo = async function jsonToVideo(
             );
           });
           if (storePageIndex !== lastPageIndex) {
+            await page.evaluate(async (json) => {
+              store.loadJSON(json);
+              await store.waitLoading();
+              await new Promise((resolve) => {
+                setTimeout(resolve, 100);
+              });
+            }, json);
             await page.evaluate(async (currentTime) => {
               store.setCurrentTime(currentTime);
+              store.checkActivePage();
+              store.activePage.set({
+                _rendering: true,
+              });
               await store.waitLoading();
+              await new Promise((resolve) => {
+                setTimeout(resolve, 100);
+              });
               if (window.config.unstable_setTextOverflow) {
                 window.config.unstable_setTextOverflow('resize');
               } else {
@@ -209,7 +225,8 @@ module.exports.jsonToVideo = async function jsonToVideo(
                 //   'Can not set text overflow mode. Define window.config.unstable_setTextOverflow function'
                 // );
               }
-            });
+            }, currentTime);
+            lastPageIndex = storePageIndex;
           }
           const startTime = Date.now();
           const dataURL = await page.evaluate(
@@ -233,6 +250,25 @@ module.exports.jsonToVideo = async function jsonToVideo(
             attrs || {},
             currentTime
           );
+          const error = await page.evaluate(() => window._polotnoError);
+          if (error) {
+            // clear error
+            await page.evaluate(() => {
+              window._polotnoError = null;
+            });
+            const message = error.toString();
+            const isFontError =
+              message.indexOf('Timeout for loading font') >= 0;
+            const skipError = isFontError && attrs.skipFontError;
+
+            const isImageError = message.indexOf('image ') >= 0;
+            const skipImageError = isImageError && attrs.skipImageError;
+
+            if (!skipError && !skipImageError) {
+              throw new Error(error);
+            }
+          }
+          // TODO: add error handling!!!!
           fs.writeFileSync(
             `${tempFolder.name}/${frameIndex}.jpeg`,
             dataURL.split(',')[1],