canvasxpress-cli 60.9.1 → 61.0.1

package/cmds/io-playwright.js

@@ -0,0 +1,149 @@
+const util = require('util');
+const path = require('path');
+const fs = require('fs');
+const ora = require('ora');
+const { chromium } = require('playwright');
+
+module.exports = async (obj) => {
+
+  const dirname = process.argv[1].replace('/bin/canvasxpress', '');
+
+  const today = new Date().toISOString().replace('-', '').split('T')[0].replace('-', '');
+
+  const logFile = fs.createWriteStream(('/tmp/io-' + today + '.log'), { flags: 'a' });
+
+  const logStdout = process.stdout;
+
+  const html = (obj.input && obj.input.match(/.html$/) ? obj.input : ("file://" + dirname + "/src/canvasXpress.html")) + (obj.debug ? "?cXH" : "");
+
+  console.log = function () {
+    logFile.write(util.format.apply(null, arguments) + '\n');
+    logStdout.write(util.format.apply(null, arguments) + '\n');
+  }
+  console.error = console.log;
+
+  const spinner = ora().start();
+
+  try {
+
+    const browser = await chromium.launch({
+      headless: obj.debug ? false : true,
+      devtools: obj.debug ? true : false,
+      args: [
+        '--no-sandbox',
+        '--disable-setuid-sandbox',
+        '--allow-file-access-from-files',
+        '--enable-local-file-accesses'
+      ]
+    });
+
+    const context = await browser.newContext({
+      viewport: {
+        width: 1000,
+        height: 1000
+      }
+    });
+
+    const page = await context.newPage();
+
+    page.on('console', (consoleObj) => console.log(consoleObj.text()));
+
+    if (obj.input && !obj.input.match(/^file|^http/)) {
+      obj.input = "file://" + path.resolve(obj.input);
+    }
+
+    const func = function (obj) {
+
+      if (obj.debug) {
+        debugger;
+      }
+
+      var exec = function (cx, tg) {
+        switch (obj.cmd) {
+          case 'png':
+            cx.print(false, tg + '.png');
+            break;
+          case 'svg':
+            cx.saveSVG(false, tg + '.svg');
+            break;
+          case 'json':
+            cx.save(false, tg + '.json');
+            break;
+        }
+      }
+
+      var clbk = function () {
+        var cx = CanvasXpress.instances[0];
+        var dt = arguments[0];
+        if (dt.config) {
+          dt.config.isNode = true;
+        }
+        cx.updateData(dt, false, false, JSON.parse(JSON.stringify(dt.config)));
+        console.log(logStr);
+        exec(cx, dt.renderTo);
+      }
+
+      var cx = CanvasXpress.instances[0];
+
+      const extFile = obj.input ? obj.input.split(".").pop() : false;
+
+      const logStr = "Creating " + obj.cmd + " file from " + (obj.input ? obj.input : 'input data') + " (" + obj.output + (obj.target || cx.target) + (extFile == 'html' ? '' : '-1') + "." + obj.cmd + ")";
+
+      cx.setDimensions(obj.width, obj.height);
+
+      if (obj.input) {
+        try {
+          switch (extFile) {
+            case 'html':
+              console.log(logStr);
+              exec(cx, obj.target || cx.target);
+              return;
+            case 'json':
+            case 'csv':
+            case 'text':
+            case 'png':
+              console.log(logStr);
+              CanvasXpress.loadRemoteData(obj.target || cx.target, obj.input, obj.config, false, clbk);
+              return;
+          }
+        } catch (err) {
+          console.error(err);
+        }
+      } else if (obj.data) {
+        try {
+          console.log(logStr);
+          cx.updateData(obj.data, false, false, obj.config);
+          exec(cx, obj.target || cx.target);
+          return;
+        } catch (err) {
+          console.error(err);
+        }
+      }
+
+    }
+
+    const client = await context.newCDPSession(page);
+
+    await client.send('Page.setDownloadBehavior', {
+      behavior: 'allow',
+      downloadPath: obj.output
+    });
+
+    await page.goto(html);
+
+    await page.waitForFunction('typeof (CanvasXpress) !== undefined && CanvasXpress.ready');
+
+    await page.evaluate(`(${func.toString()})(${JSON.stringify(obj)})`);
+
+    await setTimeout(() => {
+      browser.close();
+      spinner.stop();
+    }, obj.tmout);
+
+  } catch (err) {
+
+    console.error(err);
+
+  }
+
+}

package/index.js

@@ -30,6 +30,8 @@ module.exports = () => {
 
   let tmout = args.timeout || args.q || 2500;
 
+  let usePlaywright = args.playwright || args.pw || false;
+
   let data = dat ? JSON.parse(dat) : false;
 
   let config = conf ? JSON.parse(conf) : false;
@@ -46,6 +48,7 @@ module.exports = () => {
     width: width,
     height: height,
     tmout: tmout,
+    usePlaywright: usePlaywright,
     args: args
   }
 
@@ -75,7 +78,7 @@ module.exports = () => {
     case 'svg':
     case 'json':
       if (input || data) {
-        require('./cmds/io')(obj);
+        require(usePlaywright ? './cmds/io-playwright' : './cmds/io')(obj);
       } else {
         require('./cmds/help')(args);
       }
@@ -90,7 +93,7 @@ module.exports = () => {
       require('./cmds/help')(args);
       break;
     case 'test':
-      require('./cmds/io')({
+      require(usePlaywright ? './cmds/io-playwright' : './cmds/io')({
         cmd: "png",
         input: "https://www.canvasxpress.org/examples/bar-1.html",
         output: "./test/",
@@ -104,7 +107,7 @@ module.exports = () => {
         tmout: tmout,
         args: args
       });
-      require('./cmds/io')({
+      require(usePlaywright ? './cmds/io-playwright' : './cmds/io')({
         cmd: "svg",
         input: "https://www.canvasxpress.org/examples/bar-1.html",
         output: "./test/",
@@ -118,7 +121,7 @@ module.exports = () => {
         tmout: tmout,
         args: args
       });
-      require('./cmds/io')({
+      require(usePlaywright ? './cmds/io-playwright' : './cmds/io')({
         cmd: "json",
         input: "https://www.canvasxpress.org/examples/bar-1.html",
         output: "./test/",

package/package.json

@@ -1,6 +1,6 @@
   {
   "name": "canvasxpress-cli",
-  "version": "60.9.1",
+  "version": "61.0.1",
   "license": {
     "type": "Dual licensing",
     "url": "https://www.canvasxpress.org/docs/license.html"
@@ -34,6 +34,7 @@
     "figlet": "^1.2.1",
     "minimist": "^1.2.0",
     "ora": "^3.4.0",
+    "playwright": "^1.40.0",
     "puppeteer": "^13.0.0"
   }
 }