polotno-node 0.2.4 → 0.3.3

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.3b178911.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.6ea1044c.js"></script> </body></html>

package/index.js

@@ -1,30 +1,7 @@
 const chrome = require('chrome-aws-lambda');
 const puppeteer = require('puppeteer');
-const path = require('path');
 
-const DEFAULT_CLIENT = `file:${path.join(__dirname, 'dist', 'client.html')}`;
-
-const getNewPage = async (browser, url) => {
-  const page = await browser.newPage();
-
-  page.on('console', (msg) => {
-    msg.args().forEach((message) => {
-      // skip style information
-      if (message.toString().indexOf('margin') >= 0) {
-        return;
-      }
-      const text = message
-        .toString()
-        .replace('JSHandle:', '')
-        .replace('%c', '');
-      console.log(text);
-    });
-  });
-
-  await page.goto(url);
-
-  return page;
-};
+const { createInstance } = require('./instance');
 
 module.exports.createInstance = async ({
   key,
@@ -50,64 +27,12 @@ module.exports.createInstance = async ({
     headless: true,
     ignoreHTTPSErrors: true,
   });
-  const visitPage = url || `${DEFAULT_CLIENT}?key=${key}`;
-
-  const firstPage = await getNewPage(browser, visitPage);
 
-  const run = async (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) => {
-    return await run(
-      async (json, attrs) => {
-        const pixelRatio = attrs.pixelRatio || 1;
-        store.loadJSON(json);
-        store.setElementsPixelRatio(pixelRatio);
-        await store.waitLoading();
-        return store.toDataURL({ ...attrs, pixelRatio });
-      },
-      json,
-      attrs || {}
-    );
-  };
-
-  const jsonToImageBase64 = async (json, attrs) => {
-    const url = await jsonToDataURL(json, attrs);
-    return url.split('base64,')[1];
-  };
-
-  const jsonToPDFDataURL = async (json, attrs) => {
-    return await run(
-      async (json, attrs) => {
-        store.loadJSON(json);
-        await store.waitLoading();
-        return await store.toPDFDataURL(attrs);
-      },
-      json,
-      attrs || {}
-    );
-  };
-
-  const jsonToPDFBase64 = async (json, attrs) => {
-    const url = await jsonToPDFDataURL(json, attrs);
-    return url.split('base64,')[1];
-  };
-
-  return {
-    close: async () => await browser.close(),
-    run,
-    jsonToDataURL,
-    jsonToImageBase64,
-    jsonToPDFDataURL,
-    jsonToPDFBase64,
-  };
+  return await createInstance({
+    browser,
+    key,
+    url,
+    useParallelPages,
+    browserArgs,
+  });
 };

package/instance.js

@@ -0,0 +1,123 @@
+const path = require('path');
+const DEFAULT_CLIENT = `file:${path.join(__dirname, 'dist', 'client.html')}`;
+
+module.exports.createPage = async (browser, url) => {
+  const page = await browser.newPage();
+
+  page.on('console', (msg) => {
+    msg.args().forEach((message) => {
+      // skip style information
+      if (message.toString().indexOf('margin') >= 0) {
+        return;
+      }
+      const text = message
+        .toString()
+        .replace('JSHandle:', '')
+        .replace('%c', '');
+      console.log(text);
+    });
+  });
+
+  await page.goto(url);
+
+  return page;
+};
+
+module.exports.run = async (page, func, args) => {
+  return await page.evaluate(func, ...args);
+};
+
+module.exports.jsonToDataURL = async (page, json, attrs) => {
+  return await page.evaluate(
+    async (json, attrs) => {
+      const pixelRatio = attrs.pixelRatio || 1;
+      store.loadJSON(json);
+      store.setElementsPixelRatio(pixelRatio);
+      await store.waitLoading();
+      return store.toDataURL({ ...attrs, pixelRatio });
+    },
+    json,
+    attrs || {}
+  );
+};
+
+module.exports.jsonToPDFDataURL = async (page, json, attrs) => {
+  return page.evaluate(
+    async (json, attrs) => {
+      store.loadJSON(json);
+      await store.waitLoading();
+      return await store.toPDFDataURL(attrs);
+    },
+    json,
+    attrs || {}
+  );
+};
+
+module.exports.createInstance = async ({
+  key,
+  url,
+  useParallelPages,
+  browser,
+} = {}) => {
+  const visitPage = url || `${DEFAULT_CLIENT}?key=${key}`;
+  const firstPage = useParallelPages
+    ? null
+    : await module.exports.createPage(browser, visitPage);
+
+  const run = async (func, ...args) => {
+    const page = useParallelPages
+      ? await module.exports.createPage(browser, visitPage)
+      : firstPage;
+
+    const result = await page.evaluate(func, ...args);
+    if (useParallelPages) {
+      page.close();
+    }
+    return result;
+  };
+
+  const jsonToDataURL = async (json, attrs) => {
+    return await run(
+      async (json, attrs) => {
+        const pixelRatio = attrs.pixelRatio || 1;
+        store.loadJSON(json);
+        store.setElementsPixelRatio(pixelRatio);
+        await store.waitLoading();
+        return store.toDataURL({ ...attrs, pixelRatio });
+      },
+      json,
+      attrs || {}
+    );
+  };
+
+  const jsonToImageBase64 = async (json, attrs) => {
+    const url = await jsonToDataURL(json, attrs);
+    return url.split('base64,')[1];
+  };
+
+  const jsonToPDFDataURL = async (json, attrs) => {
+    return await run(
+      async (json, attrs) => {
+        store.loadJSON(json);
+        await store.waitLoading();
+        return await store.toPDFDataURL(attrs);
+      },
+      json,
+      attrs || {}
+    );
+  };
+
+  const jsonToPDFBase64 = async (json, attrs) => {
+    const url = await jsonToPDFDataURL(json, attrs);
+    return url.split('base64,')[1];
+  };
+
+  return {
+    close: async () => await browser.close(),
+    run,
+    jsonToDataURL,
+    jsonToImageBase64,
+    jsonToPDFDataURL,
+    jsonToPDFBase64,
+  };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polotno-node",
-  "version": "0.2.4",
+  "version": "0.3.3",
   "description": "Polotno workflow from NodeJS",
   "main": "index.js",
   "scripts": {
@@ -10,11 +10,12 @@
   "files": [
     "dist",
     "index.js",
+    "instance.js",
     "README.md"
   ],
   "devDependencies": {
     "parcel-bundler": "^1.12.4",
-    "polotno": "^0.38.2",
+    "polotno": "^0.39.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },