canvasxpress-cli 63.1.1 → 63.3.0

package/cmds/help.js

@@ -22,7 +22,7 @@ const menus = {
     --graph, -g ........ [optional] graph name
     --number, -n ....... [optional] number for the graph
     --timeout, -t ...... [optional] timeout in millisecods to close browser
-                         {default} 500
+                         {default} 2500
     --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
     
     Examples:
@@ -46,7 +46,7 @@ const menus = {
     --data, -d ......... [optional - required] json string with the data for CanvasXpress
     --config, -c ....... [optional] json string with configuration for CanvasXpress
     --timeout, -t ...... [optional] timeout in millisecods to close browser
-                         {default} 500
+                         {default} 2500
     --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
     
     Examples:
@@ -68,7 +68,7 @@ const menus = {
     --output, -o ....... [optional] directory path to save image
                          {default} './'
     --timeout, -t ...... [optional] timeout in millisecods to close browser
-                         {default} 500
+                         {default} 2500
     --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
     
     Examples:
@@ -92,10 +92,9 @@ const menus = {
     --height, -y ....... [optional] integer for image height
                          {default} 800
     --data, -d ......... [optional - required] json string with the data for CanvasXpress
-    --config, -c ....... [optional] json string with configuration for CanvasXpress    --timeout, -t ...... [optional] timeout in millisecods to close browser
-                         {default} 500
+    --config, -c ....... [optional] json string with configuration for CanvasXpress
     --timeout, -t ...... [optional] timeout in millisecods to close browser
-                         {default} 500
+                         {default} 2500
     --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
     
     Examples:
@@ -124,7 +123,7 @@ const menus = {
     --data, -d ......... [optional - required] json string with the data for CanvasXpress
     --config, -c ....... [optional] json string with configuration for CanvasXpress
     --timeout, -t ...... [optional] timeout in millisecods to close browser
-                         {default} 500
+                         {default} 2500
     --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
     
     Examples:
@@ -153,7 +152,7 @@ const menus = {
     --data, -d ......... [optional - required] json string with the data for CanvasXpress
     --config, -c ....... [optional] json string with configuration for CanvasXpress
     --timeout, -t ...... [optional] timeout in millisecods to close browser
-                         {default} 500
+                         {default} 2500
     --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
     
     Examples:

package/cmds/io.js

@@ -2,7 +2,7 @@ const util = require('util');
 const path = require('path');
 const fs = require('fs');
 const ora = require('ora');
-const puppeteer = require('puppeteer');
+const { chromium } = require('playwright');
 
 module.exports = async (obj) => {
 
@@ -30,39 +30,31 @@ module.exports = async (obj) => {
 
   try {
 
-    const browser = await puppeteer.launch({
+    const browser = await chromium.launch({
       headless: obj.debug ? false : true,
       devtools: obj.debug ? true : false,
-      executablePath: puppeteer.executablePath(),
-      defaultViewport: {
-        width: 1000,
-        height: 1000
-      },
       args: ['--no-sandbox',
         '--allow-file-access-from-files',
         '--enable-local-file-accesses']
     });
 
-    const page = await browser.newPage();
+    const context = await browser.newContext({
+      viewport: { width: 1000, height: 1000 }
+    });
 
-    // Print All
-    //page.on("console", (consoleObj) => console.log(consoleObj.text()));
+    const page = await context.newPage();
 
-    // Print All except warnings
-    page.on('console', consoleObj => {
-      if (consoleObj.type() !== 'warning') {
-          console.log(consoleObj.text());
-      }
+    const downloadDir = path.resolve(obj.output);
+    const downloads = [];
+    page.on('download', (dl) => {
+      downloads.push(dl.saveAs(path.join(downloadDir, dl.suggestedFilename())));
     });
 
-    /*
-    // Print only logs
     page.on('console', consoleObj => {
-      if (consoleObj.type() === 'log') {
-          console.log(consoleObj.text());
+      if (consoleObj.type() !== 'warning') {
+        console.log(consoleObj.text());
       }
     });
-    */
 
     if (obj.input && !obj.input.match(/^file|^http/)) {
       obj.input = "file://" + path.resolve(obj.input);
@@ -107,7 +99,7 @@ module.exports = async (obj) => {
               cx.dataURL = obj.input;
               cx.remoteTransitionEffect = 'none';
               cx.getDataFromURLOrString(obj.target || cx.target, obj.config, false, false, clbk);
-            } else {        
+            } else {
               console.log("Creating " + (obj.cmd == 'csv' ? 'png' : obj.cmd) + " file from " + (obj.input ? obj.input : 'input data') + " (" + obj.output + (obj.target || cx.target) + "." + obj.cmd + ")");
               exec(cx, obj.target || cx.target);
             }
@@ -128,25 +120,32 @@ module.exports = async (obj) => {
       }
     }
 
-    await page._client.send('Page.setDownloadBehavior', {
-      behavior: 'allow',
-      downloadPath: obj.output
-    });
+    const targetUrl = obj.input
+      ? (obj.cmd == 'csv' ? defhtml : obj.cmd == 'reproduce' ? obj.input + '?showTransition=false' : obj.input)
+      : defhtml;
 
-    if (obj.input) {
-      await page.goto(obj.cmd == 'csv' ? defhtml : obj.cmd == 'reproduce' ? obj.input + '?showTransition=false' : obj.input);
-    } else {
-      await page.goto(defhtml);
-    }
+    await page.goto(targetUrl, { waitUntil: 'networkidle' });
+
+    await page.waitForFunction(() => typeof CanvasXpress !== 'undefined');
 
-    await page.waitFor(() => typeof (CanvasXpress) !== undefined && CanvasXpress.ready);
+    // Create a CX instance if one doesn't already exist (onReady in template
+    // has a circular dependency that prevents auto-instantiation in headless)
+    await page.evaluate(() => {
+      if (!CanvasXpress.instances || CanvasXpress.instances.length === 0) {
+        new CanvasXpress("cX", {y:{vars:["V"],smps:["S"],data:[[0]]}}, {});
+      }
+    });
+    await page.waitForFunction(() => CanvasXpress.ready);
 
     await page.evaluate(`(${func.toString()})(${JSON.stringify(obj)})`);
 
-    await setTimeout(() => {
-      browser.close();
-      spinner.stop();
-    }, obj.cmd == 'csv' || obj.cmd == 'reproduce' ? obj.tmout + 2500 : obj.tmout);
+    const delay = obj.cmd == 'csv' || obj.cmd == 'reproduce' ? obj.tmout + 2500 : obj.tmout;
+    await page.waitForTimeout(delay);
+
+    await Promise.all(downloads);
+
+    await browser.close();
+    spinner.stop();
 
   } catch (err) {
 

package/index.js

@@ -14,7 +14,7 @@ module.exports = () => {
 
   let output = args.output || args.o || "./";
 
-  let target = args.target || args.t || false;
+  let target = args.target || false;
 
   let dat = args.data || args.d || false;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canvasxpress-cli",
-  "version": "63.1.1",
+  "version": "63.3.0",
   "license": {
     "type": "Dual licensing",
     "url": "https://www.canvasxpress.org/docs/license.html"