polotno-node 0.1.16 → 0.2.1

package/dist/client.html

@@ -1 +1 @@
-<html><head><title>Canvas editor</title><style>body{padding:0;margin:0}</style><meta name="viewport" content="width=device-width, initial-scale=1"></head><body class="bp3-dark"> <div id="root"></div> <script src="client.f410bb82.js"></script> </body></html>
+<html><head><title>Canvas editor</title><style>body{padding:0;margin:0}</style><meta name="viewport" content="width=device-width, initial-scale=1"></head><body class="bp3-dark"> <div id="root"></div> <script src="client.3b178911.js"></script> </body></html>

package/index.js

@@ -1,17 +1,10 @@
+const chrome = require('chrome-aws-lambda');
 const puppeteer = require('puppeteer');
 const path = require('path');
 
-const defaultLaunch = async () => {
-  const puppeteer = require('puppeteer');
-  return await puppeteer.launch({});
-};
+const DEFAULT_CLIENT = `file:${path.join(__dirname, 'dist', 'client.html')}`;
 
-module.exports.createInstance = async ({
-  key,
-  launch = defaultLaunch,
-  url,
-} = {}) => {
-  const browser = await launch();
+const getNewPage = async (browser, url) => {
   const page = await browser.newPage();
 
   page.on('console', (msg) => {
@@ -28,23 +21,39 @@ module.exports.createInstance = async ({
     });
   });
 
-  page.on('error', (err) => {
-    console.log('error happen at the page: ', err);
-  });
-
-  page.on('pageerror', (pageerr) => {
-    console.log('pageerror occurred: ', pageerr);
-  });
+  await page.goto(url);
 
-  const visitPage =
-    url || `file:${path.join(__dirname, 'dist', 'client.html')}?key=${key}`;
+  return page;
+};
 
-  console.log('visit page', visitPage);
+module.exports.createInstance = async ({ key, url, useParallelPages } = {}) => {
+  const browser = await puppeteer.launch({
+    args: [
+      ...chrome.args,
+      '--no-sandbox',
+      '--hide-scrollbars',
+      '--disable-web-security',
+      '--allow-file-access-from-files',
+    ],
+    defaultViewport: chrome.defaultViewport,
+    executablePath: await chrome.executablePath,
+    headless: true,
+    ignoreHTTPSErrors: true,
+  });
+  const visitPage = url || `${DEFAULT_CLIENT}?key=${key}`;
 
-  await page.goto(visitPage);
+  const firstPage = await getNewPage(browser, visitPage);
 
   const run = async (func, ...args) => {
-    return await page.evaluate(func, ...args);
+    const page = useParallelPages
+      ? await getNewPage(browser, visitPage)
+      : firstPage;
+
+    const result = await page.evaluate(func, ...args);
+    if (useParallelPages) {
+      page.close();
+    }
+    return result;
   };
 
   const jsonToDataURL = async (json, attrs) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polotno-node",
-  "version": "0.1.16",
+  "version": "0.2.1",
   "description": "Polotno workflow from NodeJS",
   "main": "index.js",
   "scripts": {
@@ -14,13 +14,14 @@
   ],
   "devDependencies": {
     "parcel-bundler": "^1.12.4",
-    "polotno": "^0.34.6",
+    "polotno": "^0.38.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
   "author": "Anton Lavrenov",
   "license": "MIT",
   "dependencies": {
+    "chrome-aws-lambda": "^10.1.0",
     "puppeteer": "^10.4.0"
   }
 }