canvasxpress-cli 41.2.67 → 41.3.3

package/cmds/help.js

@@ -1,5 +1,5 @@
 const menus = {
-		
+
   main: `
     canvasxpress [command] <options>
 
@@ -12,10 +12,10 @@ const menus = {
     canvas ............. run scripts files to test CanvasXpres
 
     test ............... test package. Creates images and json file in test directory
-    version ............ show this package version    
+    version ............ show this package version
     help ............... show this help. Add command to show correponding help
   `,
-  
+
   canvas: `
     --input, -i ........ <required> path/to/js/file
     --directory, -f .... [optional] directory of CanvasXpres version to check
@@ -24,14 +24,14 @@ const menus = {
     --timeout, -t ...... [optional] timeout in millisecods to close browser
                          {default} 500
     --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
-    
+
     Examples:
 
       canvasxpress canvas -i canvas/scripts/compareImages.js
 
       canvasxpress canvas -i canvas/scripts/compareImages.js -g violin -n 11
   `,
-    
+
   csv: `
     --input, -i ........ [optional - required] file or url with a csv file:
                          file:///path/to/local/file.csv
@@ -48,13 +48,13 @@ const menus = {
     --timeout, -t ...... [optional] timeout in millisecods to close browser
                          {default} 500
     --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
-    
+
     Examples:
 
       canvasxpress csv -i ../src/ToothGrowth.csv -t 3000
 
       canvasxpress csv -i https://raw.githubusercontent.com/neuhausi/Rdatasets/master/csv/datasets/ToothGrowth.csv -t 3000
-    
+
       canvasxpress csv -i file:///node/src/ToothGrownth.csv -c '{"graphType":"Boxplot","transposeData":true,"asVariableFactors":["dose"],"stringSampleFactors":["dose"],"groupingFactors":["dose"]}' -t 3000
 
       canvasxpress csv -d '{"y":{"vars":["Variable1"],"smps":["Sample1","Sample2","Sample3"],"data":[[33,44,55]]}}' -c '{"graphOrientation":"vertical","theme":"CanvasXpress","title":"Bar Graph Title"}' -t 3000
@@ -70,11 +70,11 @@ const menus = {
     --timeout, -t ...... [optional] timeout in millisecods to close browser
                          {default} 500
     --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
-    
+
     Examples:
 
-      canvasxpress reproduce -i https://canvasxpress.org/html/layout-7.html
-    
+      canvasxpress reproduce -i https://canvasxpress.org/examples/layout-7.html
+
       canvasxpress reproduce -i file:///node/src/canvasXpress.html
 
       canvasxpress reproduce -i ../src/canvasXpress.html
@@ -97,11 +97,11 @@ const menus = {
     --timeout, -t ...... [optional] timeout in millisecods to close browser
                          {default} 500
     --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
-    
+
     Examples:
 
-      canvasxpress png -i https://canvasxpress.org/html/bar-3.html
-    
+      canvasxpress png -i https://canvasxpress.org/examples/bar-3.html
+
       canvasxpress png -i file:///node/src/canvasXpress.html
 
       canvasxpress png -i ../src/canvasXpress.html
@@ -126,11 +126,11 @@ const menus = {
     --timeout, -t ...... [optional] timeout in millisecods to close browser
                          {default} 500
     --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
-    
+
     Examples:
 
-      canvasxpress svg -i https://canvasxpress.org/html/bar-3.html
-    
+      canvasxpress svg -i https://canvasxpress.org/examples/bar-3.html
+
       canvasxpress svg -i file:///node/src/canvasXpress.html
 
       canvasxpress svg -i ../src/canvasXpress.html
@@ -138,7 +138,7 @@ const menus = {
       canvasxpress svg -d '{"y":{"vars":["Variable1"],"smps":["Sample1","Sample2","Sample3"],"data":[[33,44,55]]}}'
         -c '{"graphOrientation":"vertical","theme":"CanvasXpress","title":"Bar Graph Title"}'
   `,
-    
+
   json: `
     --input, -i ........ [optional - required] file or url with a html file:
                          file:///path/to/local/file.html
@@ -155,11 +155,11 @@ const menus = {
     --timeout, -t ...... [optional] timeout in millisecods to close browser
                          {default} 500
     --browser, -b ...... [optional] boolean to do not run headless and pause for debugging
-    
+
     Examples:
 
-      canvasxpress json -i https://canvasxpress.org/html/bar-3.html
-    
+      canvasxpress json -i https://canvasxpress.org/examples/bar-3.html
+
       canvasxpress json -i file:///node/src/canvasXpress.html
 
       canvasxpress json -i ../src/canvasXpress.html
@@ -187,9 +187,9 @@ const menus = {
 }
 
 module.exports = (args) => {
-  
+
 	const subCmd = args._[0] === 'help' ? args._[1] : args._[0];
 
   console.log(menus[subCmd] || menus.main);
-  
+
 }

package/cmds/io.js

@@ -10,15 +10,11 @@ module.exports = async (obj) => {
 
   const today = new Date().toISOString().replace('-', '').split('T')[0].replace('-', '');
 
-  const logFile = fs.createWriteStream((dirname + '/logs/io-' + today + '.log'), { flags: 'a' });
+  const logFile = fs.createWriteStream(('/tmp/io-' + today + '.log'), { flags: 'a' });
 
   const logStdout = process.stdout;
 
-  const defhtml = ("file://" + dirname + "/src/canvasXpress.html");
-
-  if (!fs.existsSync(dirname + '/logs')) {
-    fs.mkdirSync(dirname + '/logs');
-  }
+  const defhtml = ("file://" + dirname + "/src/canvasXpress.html" + (obj.debug ? "?cXH" : ""));
 
   console.log = function () {
     logFile.write(util.format.apply(null, arguments) + '\n');
@@ -38,32 +34,16 @@ module.exports = async (obj) => {
         width: 1000,
         height: 1000
       },
-      args: ['--no-sandbox',
+      args: [
+        '--no-sandbox',
+        '--disable-setuid-sandbox',
         '--allow-file-access-from-files',
-        '--enable-local-file-accesses']
+        '--enable-local-file-accesses'
+      ]
     });
 
     const page = await browser.newPage();
 
-    // Print All
-    //page.on("console", (consoleObj) => console.log(consoleObj.text()));
-
-    // Print All except warnings
-    page.on('console', consoleObj => {
-      if (consoleObj.type() !== 'warning') {
-          console.log(consoleObj.text());
-      }
-    });
-
-    /*
-    // Print only logs
-    page.on('console', consoleObj => {
-      if (consoleObj.type() === 'log') {
-          console.log(consoleObj.text());
-      }
-    });
-    */
-
     if (obj.input && !obj.input.match(/^file|^http/)) {
       obj.input = "file://" + path.resolve(obj.input);
     }
@@ -107,7 +87,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,13 +108,14 @@ module.exports = async (obj) => {
       }
     }
 
-    await page._client.send('Page.setDownloadBehavior', {
+    const client = await page.target().createCDPSession()
+    await client.send('Page.setDownloadBehavior', {
       behavior: 'allow',
       downloadPath: obj.output
-    });
+    })
 
     if (obj.input) {
-      await page.goto(obj.cmd == 'csv' ? defhtml : obj.cmd == 'reproduce' ? obj.input + '?showTransition=false' : obj.input);
+      await page.goto(obj.cmd == 'csv' ? defhtml : obj.cmd == 'reproduce' ? obj.input + '?showTransition=false' + (obj.debug ? '&cXH' : '') : obj.input + (obj.debug ? '?cXH' : ''));
     } else {
       await page.goto(defhtml);
     }
@@ -154,4 +135,4 @@ module.exports = async (obj) => {
 
   }
 
-}
+}

package/cmds/version.js

@@ -1,7 +1,7 @@
 const { version } = require('../package.json')
 
 module.exports = (args) => {
-	
+
   console.log(`v${version}`);
-  
+
 }

package/package.json

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