canvasxpress-cli 63.2.0 → 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

@@ -42,13 +42,13 @@ module.exports = async (obj) => {
       viewport: { width: 1000, height: 1000 }
     });
 
-    await context.route('**/*', route => {
-      route.continue({ headers: { ...route.request().headers() } });
-    });
-
     const page = await context.newPage();
 
-    await page.context().setDefaultDownloadDirectory(obj.output);
+    const downloadDir = path.resolve(obj.output);
+    const downloads = [];
+    page.on('download', (dl) => {
+      downloads.push(dl.saveAs(path.join(downloadDir, dl.suggestedFilename())));
+    });
 
     page.on('console', consoleObj => {
       if (consoleObj.type() !== 'warning') {
@@ -120,35 +120,30 @@ module.exports = async (obj) => {
       }
     }
 
-    const downloadDir = path.resolve(obj.output);
-    await page.route('**/*', async route => {
-      const response = await route.fetch();
-      const headers = response.headers();
-      if (headers['content-disposition'] && headers['content-disposition'].includes('attachment')) {
-        const buffer = await response.body();
-        const disposition = headers['content-disposition'];
-        const match = disposition.match(/filename="?([^"]+)"?/);
-        const filename = match ? match[1] : 'download';
-        fs.writeFileSync(path.join(downloadDir, filename), buffer);
-        route.abort();
-      } else {
-        route.continue();
-      }
-    });
-
     const targetUrl = obj.input
       ? (obj.cmd == 'csv' ? defhtml : obj.cmd == 'reproduce' ? obj.input + '?showTransition=false' : obj.input)
       : defhtml;
 
     await page.goto(targetUrl, { waitUntil: 'networkidle' });
 
-    await page.waitForFunction(() => typeof CanvasXpress !== 'undefined' && CanvasXpress.ready);
+    await page.waitForFunction(() => typeof CanvasXpress !== 'undefined');
+
+    // 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)})`);
 
     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();
 

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.2.0",
+  "version": "63.3.0",
   "license": {
     "type": "Dual licensing",
     "url": "https://www.canvasxpress.org/docs/license.html"

package/src/canvasXpress.css

@@ -2780,6 +2780,8 @@ span.CanvasXpressMousePosition {
 .cX-Workflow-Slider-Area {
   flex-grow: 1;
   position: relative;
+  margin-right: 15px;
+  margin-left: 5px;
 }
 
 .cX-Workflow-Slider-Track {
@@ -2815,7 +2817,7 @@ span.CanvasXpressMousePosition {
   border: 1px var(--cx-border-style) var(--cx-workflow-timeline-border-color);
   border-radius: var(--cx-border-radius);
   margin-top: 10px;
-  padding-top: 10px;
+  /* padding-top: 10px; */
   max-height: 200px;
   overflow-y: auto;
 }