feat: blessed to stream

Author: jkga

app.js

@@ -23,7 +23,25 @@ app.get('/', async (req, res, next) => {
     }
     return next();
 });
+// historical chart by country
+app.get('/test/blessed', async (req, res, next) => {
+  const blessedStream = require('./test-blessed')
+
+  let t = await new Promise((resolve, reject) => {
+    blessedStream((data) => {
+      resolve(data)
+    })
+  })
 
+  
+
+  setTimeout(function() {
+    res.send(t+'\r\n'+'\u2800'+'\033[?25h')
+  },100)
+  return null;
+  
+  return next();
+});
 // global historical chart
 app.get(['/history/all/:chartType(cases|deaths)?', '/history/'], async (req, res, next) => {
   const userAgent = req.headers['user-agent'],
@@ -154,6 +172,9 @@ app.get('/history/charts/:country', async (req, res, next) => {
   return next();
 });
 
+
+
+
 app.get('*', (req, res) => res.send(`
 Welcome to COVID-19 Tracker CLI v${pkg.version} by Waren Gonzaga\n
 Please visit: https://warengonza.ga/covid19-tracker-cli

cli.js

@@ -4,6 +4,8 @@ const axios = require('axios'),
       ora = require('ora'),
       spinner = ora({ text: 'Loading...'}),
       covid19 = require('./lib/cli'),
+      covid19GFX = require ('./lib/cli/gfx'),
+      http = require('http'),
       apiBaseURL = "https://corona.lmao.ninja",
       argv = require('yargs')
             .usage('Usage: $0 <country> [options]')
@@ -49,12 +51,46 @@ const getCountry = async (u, country) => {
     spinner.stop();
     return console.log(result);
 }
+
+
+const getCountryGFX = async (u, country) => {
+    let result;
+    let resHead = {}
+    const api = await axios.get(`${apiBaseURL}/countries/${country}`),
+            history = await axios.get(`${apiBaseURL}/v2/historical/${api.data.country}?lastdays=all`),
+            s = api.data,
+            h = history.data,
+            chartType = 'cases';
+
+
+    var http = require('http');
+        http.createServer(function (req, res) {
+            resHead = res
+        return covid19GFX.historyCountryTracker(
+            req,res,
+            s.country, s.cases, s.todayCases, 
+            s.deaths, s.todayDeaths, s.recovered, 
+            s.active, s.critical, s.casesPerOneMillion,
+            s.updated, h, chartType, s.countryInfo)
+    }).listen(1000);
+
+    result = await axios.get('http://localhost:1000')
+    clear()
+    spinner.stop();
+    console.log(result.data)
+    return 'dfdfd'
+    
+    
+
+  
+}
+
 
 (async () => {
     clear();
-    country = argv._[0];      
     spinner.start();
+    country = argv._[0];      
     const all = await axios.get(`${apiBaseURL}/all`);
-    !country && getGlobal(all.data);
-    country && getCountry(all.data, country);
+    getCountryGFX(all.data, country);
+      
 })()

lib/cli/gfx/presenter.js

@@ -42,7 +42,7 @@ const present = (req, res, body, cba) => {
       }, '' ? 5000:0)
     }
 
-    catch (e) {
+    catch (e) { console.log('-------',e)
       return cba(e)
     } 
   })

lib/cli/gfx/server-util.js

@@ -0,0 +1,52 @@
+/** Modified script from blessed-contrib server-util */
+const blessed = require('blessed');
+
+function OutputBuffer(options) { 
+  this.isTTY = true;
+  this.columns = options.cols;
+  this.rows = options.rows;
+  this.write = function(s) {
+    s = s.replace('\x1b8', ''); //not clear from where in blessed this code comes from. It forces the terminal to clear and loose existing content.
+    options.stream.write(s)
+  };
+
+  this.on = function() {};
+}
+
+function InputBuffer() {
+  this.isTTY = true;
+  this.isRaw = true;
+
+  this.emit = function() {};
+
+  this.setRawMode = function() {};
+  this.resume = function() {};
+  this.pause = function() {};
+
+  this.on = function() {};
+}
+
+function serverError(err) {
+  throw new Error(err)
+}
+
+
+function createScreen(opt = {}) {
+  let cols = opt.cols || 250;
+  let rows = opt.rows || 50;
+
+  if (cols<=35 || cols>=500 || rows<=5 || rows>=300) {
+    serverError('cols must be bigger than 35 and rows must be bigger than 5');
+    return null;
+  }
+  
+  const output = new OutputBuffer({stream: opt.stream, cols: cols, rows: rows});
+  const input = new InputBuffer(); //required to run under forever since it replaces stdin to non-tty
+  const program = blessed.program({output: output, input: input});
+
+  let screen = blessed.screen({program: program});
+  return screen
+}
+
+
+exports.createScreen = createScreen;

test-blessed.js

@@ -0,0 +1,61 @@
+
+
+const   blessed         =   require('blessed'),
+        contrib         =   require('blessed-contrib'),
+        Stream          =   require('stream'),
+        GFXUtil         =   require('./lib/cli/gfx/server-util');
+        
+
+const showGraph = (callback) => {
+
+  blessed.Screen.global = null
+  blessed.Program.global = null
+  const 
+      readableStream  =   new Stream.Transform()
+      screen          =   GFXUtil.createScreen({stream: readableStream}),
+      grid            =   new contrib.grid({rows: 10, cols: 10, screen: screen})
+  
+  let result = []
+
+  var donut = grid.set(0, 0, 2, 2, contrib.donut, 
+    {
+    label: 'Percent Donut',
+    radius: 10,
+    arcWidth: 4,
+    yPadding: 4,
+    data: [{label: 'Storage', percent: 87}]
+  })
+
+
+  var map = grid.set(0, 2, 4, 4, contrib.map,
+    {
+      label: 'World Map'
+    })
+
+    map.addMarker({"lon" : "-79.0000", "lat" : "37.5000", color: 'yellow', char: 'vgdfggdfX' })
+
+  /*readableStream._write = (chunk, encoding, next) => {
+    res.send(chunk.toString())
+  }*/
+
+  readableStream._transform = function (chunk,encoding,done) 
+{
+    result.push(chunk.toString())
+    done()
+}
+
+  readableStream._final = () => {
+    callback(result.join(''))
+  }
+
+  screen.render()
+
+  setTimeout(() => {
+    readableStream.end()
+  }, 100)
+}
+
+module.exports = showGraph
+
+
+