polotno-node 2.7.0 → 2.7.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-13b6e0f3.js"></script>
+    <script type="module" crossorigin src="./assets/index-db239b7c.js"></script>
   </head>
   <body>
     <div id="root"></div>

package/index.js

@@ -49,7 +49,7 @@ const minimal_args = [
   '--use-mock-keychain',
 ];
 
-const createBrowser = async ({ browserArgs }) => {
+async function createBrowser({ browserArgs = [], ...rest } = {}) {
   return puppeteer.launch({
     args: [
       ...chrome.args,
@@ -69,8 +69,11 @@ const createBrowser = async ({ browserArgs }) => {
     executablePath:
       isMacOs || isWindows ? undefined : await chrome.executablePath(),
     ignoreHTTPSErrors: true,
+    ...rest,
   });
-};
+}
+
+module.exports.createBrowser = createBrowser;
 
 module.exports.createInstance = async ({
   key,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polotno-node",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "description": "Polotno workflow from NodeJS",
   "main": "index.js",
   "scripts": {
@@ -27,7 +27,7 @@
     "gifencoder": "^2.0.1",
     "pixelmatch": "^5.3.0",
     "pngjs": "^7.0.0",
-    "polotno": "^2.0.5",
+    "polotno": "^2.1.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "vite": "^4.5.0"
@@ -37,7 +37,8 @@
   "dependencies": {
     "@sparticuz/chromium": "118.0.0",
     "puppeteer": "^20.9.0",
-    "puppeteer-core": "^20.9.0"
+    "puppeteer-core": "^20.9.0",
+    "tmp": "^0.2.1"
   },
   "bugs": {
     "url": "https://github.com/polotno-project/polotno-node/issues"

package/video-parallel.js

@@ -3,6 +3,10 @@ const ffmpeg = require('fluent-ffmpeg');
 const axios = require('axios');
 const path = require('path');
 
+const tmp = require('tmp');
+
+tmp.setGracefulCleanup();
+
 const downloadVideo = async (url, destination) => {
   const response = await axios({
     method: 'GET',
@@ -51,12 +55,14 @@ const fileToDataUrl = (filename) => {
 const videoToDataURL = async (url) => {
   console.log('downloading', url);
   const filename = Math.random().toString(36).substring(7);
-  const destination = path.join('./tmp', filename + '.mp4');
+  const tempFolder = tmp.dirSync();
+  const destination = path.join(tempFolder.name, filename + '.mp4');
   await downloadVideo(url, destination);
   const webmFile = destination.replace('.mp4', '.webm');
   console.log('converting to webm', url);
   await convertToWebM(destination, webmFile);
   const dataUrl = await fileToDataUrl(webmFile);
+  fs.rmSync(tempFolder.name, { recursive: true });
   return dataUrl;
 };
 
@@ -71,11 +77,7 @@ module.exports.jsonToVideo = async function jsonToVideo(
   json,
   attrs
 ) {
-  try {
-    fs.rmSync('./tmp', { recursive: true });
-  } catch (e) {}
-
-  fs.mkdirSync('./tmp', { recursive: true });
+  const tempFolder = tmp.dirSync();
 
   for (const page of json.pages) {
     for (const el of page.children) {
@@ -124,6 +126,10 @@ module.exports.jsonToVideo = async function jsonToVideo(
       const page = await instance.createPage();
       await page.evaluate(async (json) => {
         store.loadJSON(json);
+        await store.waitLoading();
+        await new Promise((resolve) => {
+          setTimeout(resolve, 100);
+        });
       }, json);
 
       let lastPageIndex = -1;
@@ -165,7 +171,6 @@ module.exports.jsonToVideo = async function jsonToVideo(
               );
             });
             const url = await store.toDataURL({
-              pixelRatio: 0.5,
               ...attrs,
               pageId: currentPage?.id,
             });
@@ -175,9 +180,8 @@ module.exports.jsonToVideo = async function jsonToVideo(
           attrs || {},
           currentTime
         );
-        fs.mkdirSync('./tmp', { recursive: true });
         fs.writeFileSync(
-          `./tmp/${frameIndex}.png`,
+          `${tempFolder.name}/${frameIndex}.png`,
           dataURL.split(',')[1],
           'base64'
         );
@@ -236,19 +240,19 @@ module.exports.jsonToVideo = async function jsonToVideo(
   //   fs.writeFileSync(`./tmp/${i}.png`, dataURL.split(',')[1], 'base64');
   // }
 
-  console.log('\nRendering video');
+  const format = attrs.out.split('.').pop() || 'mp4';
 
   await new Promise((resolve, reject) => {
     ffmpeg()
-      .input(`./tmp/%d.png`) // Make sure your images are named with numbers, e.g. 1.jpg, 2.jpg, etc.
+      .input(`${tempFolder.name}/%d.png`) // Make sure your images are named with numbers, e.g. 1.jpg, 2.jpg, etc.
       .inputFPS(fps)
-      .videoCodec('libx264')
-      .outputOptions('-pix_fmt yuv420p')
-      .format('mp4')
+      // .videoCodec('libx265')
+      .outputOptions('-pix_fmt yuva420p')
+      .format(format)
       .on('end', () => resolve())
       .on('error', (err) => reject(err))
       .save(attrs.out);
   });
 
-  fs.rmSync('./tmp', { recursive: true });
+  fs.rmSync(tempFolder.name, { recursive: true });
 };