polotno-node 2.10.1 → 2.10.2

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.1",
+  "version": "2.10.2",
   "description": "Polotno workflow from NodeJS",
   "main": "index.js",
   "scripts": {
@@ -12,14 +12,13 @@
     "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",
@@ -29,14 +28,14 @@
     "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.js

@@ -1,161 +0,0 @@
-const fs = require('fs');
-const ffmpeg = require('fluent-ffmpeg');
-const axios = require('axios');
-const path = require('path');
-
-const downloadVideo = async (url, destination) => {
-  const response = await axios({
-    method: 'GET',
-    url: url,
-    responseType: 'stream',
-  });
-
-  const writer = response.data.pipe(fs.createWriteStream(destination));
-
-  return new Promise((resolve, reject) => {
-    writer.on('finish', resolve);
-    writer.on('error', reject);
-  });
-};
-
-// 2. Convert it into webm format
-
-const convertToWebM = (input, output) => {
-  console.log(input, output);
-  return new Promise((resolve, reject) => {
-    ffmpeg(input)
-      .outputOptions(['-c:v libvpx', '-crf 30', '-b:v 1000k'])
-      .output(output)
-      .on('start', () => {})
-      .on('end', () => {
-        resolve();
-      })
-      .on('error', (err) => {
-        console.log('Error occurred: ' + err.message);
-        reject(err);
-      })
-      .run();
-  });
-};
-
-// 3. Serialize file into dataurl string
-const fileToDataUrl = (filename) => {
-  return new Promise((resolve, reject) => {
-    fs.readFile(filename, 'base64', (err, data) => {
-      if (err) reject(err);
-      resolve(`data:video/webm;base64,${data}`);
-    });
-  });
-};
-
-const videoToDataURL = async (url) => {
-  console.log('downloading', url);
-  const filename = Math.random().toString(36).substring(7);
-  const destination = path.join('./tmp', 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);
-  return dataUrl;
-};
-
-function printProgress(progress) {
-  process.stdout.clearLine(0);
-  process.stdout.cursorTo(0);
-  process.stdout.write('Rendering frames: ' + progress + '%');
-}
-
-module.exports.jsonToVideo = async function jsonToGifFile(page, json, attrs) {
-  try {
-    fs.rmSync('./tmp', { recursive: true });
-  } catch (e) {}
-
-  fs.mkdirSync('./tmp', { recursive: true });
-
-  for (const page of json.pages) {
-    for (const el of page.children) {
-      if (el.type === 'video') {
-        el.src = await videoToDataURL(el.src);
-      }
-    }
-  }
-  // first load json
-  await page.evaluate(
-    async (json, attrs) => {
-      store.loadJSON(json);
-      await store.waitLoading();
-      // TODO: we need to active all pages first
-      // disable text fit, as it is already should be processed
-      if (window.config.unstable_setTextOverflow) {
-        window.config.unstable_setTextOverflow('resize');
-      } else {
-        console.error('Can not set text overflow mode');
-      }
-    },
-    json,
-    attrs || {}
-  );
-
-  const duration = await page.evaluate(async () => {
-    return store.duration;
-  });
-
-  const fps = 15;
-  const timePerFrame = 1000 / fps;
-
-  // loop through the images and add each to the animation
-  const frames = Math.floor((duration / 1000) * fps);
-  for (let i = 0; i < frames; i++) {
-    let currentTime = i * timePerFrame;
-    if (i === 0) {
-      // offset the very first frame to enable animation start
-      currentTime = 1;
-    }
-    if (i === frames - 1) {
-      // offset the very last frame to enable animation end
-      currentTime = duration - 1;
-    }
-
-    const dataURL = await page.evaluate(
-      async (json, attrs, currentTime) => {
-        store.setCurrentTime(currentTime);
-        const currentPage = store.pages.find((p) => {
-          return (
-            store.currentTime >= p.startTime &&
-            store.currentTime < p.startTime + p.duration
-          );
-        });
-        const url = await store.toDataURL({
-          pixelRatio: 0.5,
-          ...attrs,
-          pageId: currentPage?.id,
-        });
-        return url;
-      },
-      json,
-      attrs || {},
-      currentTime
-    );
-    const progress = ((i / (frames - 1)) * 100).toFixed(1);
-    printProgress(progress);
-    fs.mkdirSync('./tmp', { recursive: true });
-    fs.writeFileSync(`./tmp/${i}.png`, dataURL.split(',')[1], 'base64');
-  }
-
-  console.log('\nRendering video');
-
-  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.
-      .inputFPS(fps)
-      .videoCodec('libx264')
-      .outputOptions('-pix_fmt yuv420p')
-      .format('mp4')
-      .on('end', () => resolve())
-      .on('error', (err) => reject(err))
-      .save(attrs.out);
-  });
-
-  fs.rmSync('./tmp', { recursive: true });
-};