polotno-node 2.9.24 → 2.9.26

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-B_ojGXHf.js"></script>
+    <script type="module" crossorigin src="./assets/index-K6bexdEY.js"></script>
   </head>
   <body>
     <div id="root"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polotno-node",
-  "version": "2.9.24",
+  "version": "2.9.26",
   "description": "Polotno workflow from NodeJS",
   "main": "index.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "gifencoder": "^2.0.1",
     "pixelmatch": "^5.3.0",
     "pngjs": "^7.0.0",
-    "polotno": "^2.7.1",
+    "polotno": "^2.8.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "vite": "^5.2.11"

package/video-parallel.js

@@ -56,7 +56,7 @@ const fileToDataUrl = (filename) => {
   });
 };
 
-const videoToDataURL = async (url, tempFolder) => {
+const convertVideo = async (url, tempFolder) => {
   const shortUrl = url.slice(0, 50) + '...';
   console.log('Downloading video: ' + shortUrl);
   const filename = Math.random().toString(36).substring(7);
@@ -75,14 +75,6 @@ const videoToDataURL = async (url, tempFolder) => {
   };
 };
 
-const urlCache = {};
-const cachedVideoToDataURL = async (url, tempFolder) => {
-  if (!urlCache[url]) {
-    urlCache[url] = videoToDataURL(url, tempFolder);
-  }
-  return urlCache[url];
-};
-
 module.exports.jsonToVideo = async function jsonToVideo(
   inst,
   json,
@@ -108,7 +100,7 @@ module.exports.jsonToVideo = async function jsonToVideo(
 
     await Promise.all(
       videoEls.map(async (el) => {
-        const { dataURL, file, mp4File } = await cachedVideoToDataURL(
+        const { dataURL, file, mp4File } = await convertVideo(
           el.src,
           tempFolder
         );
@@ -127,7 +119,7 @@ module.exports.jsonToVideo = async function jsonToVideo(
     const timePerFrame = 1000 / fps;
 
     // loop through the images and add each to the animation
-    const framesNumber = Math.floor((duration / 1000) * fps);
+    const framesNumber = Math.floor((duration / 1000) * fps) || 1;
     const frames = Array.from(Array(framesNumber).keys());
 
     // split frames into parallel chunks
@@ -237,12 +229,17 @@ module.exports.jsonToVideo = async function jsonToVideo(
     const inputs = [];
     let pageStartTime = 0;
     for (const page of json.pages) {
+      const pageDuration = page.duration || 5000;
       for (const el of page.children) {
         if (el.type === 'video') {
-          const elStartTime = el.startTime * el.duration;
+          const startTime = el.startTime || 0;
+          const endTime = el.endTime || 1;
+          const dur = el.duration || 5000;
+          const elStartTime = startTime * dur;
+
           const elDuration = Math.min(
-            page.duration,
-            el.duration * (el.endTime - el.startTime)
+            pageDuration,
+            dur * (endTime - startTime)
           );
           const elEndTime = elStartTime + elDuration;
           inputs.push({
@@ -251,16 +248,15 @@ module.exports.jsonToVideo = async function jsonToVideo(
             inputStartTime: elStartTime,
             inputEndTime: elEndTime,
             outputStartTime: pageStartTime,
-            outputEndTime: pageStartTime + page.duration,
+            outputEndTime: pageStartTime + pageDuration,
           });
         }
       }
-      pageStartTime += page.duration;
+      pageStartTime += pageDuration;
     }
 
     const format = attrs.out.split('.').pop() || 'mp4';
 
-    console.time('ffmpeg');
     await new Promise((resolve, reject) => {
       const ffmpegCmd = ffmpeg()
         .input(`${tempFolder.name}/%d.jpeg`)
@@ -307,7 +303,6 @@ module.exports.jsonToVideo = async function jsonToVideo(
   } catch (e) {
     throw e;
   } finally {
-    console.timeEnd('ffmpeg');
     fs.rmSync(tempFolder.name, { recursive: true });
   }
 };