Merge branch 'main'

Author: warengonzaga

.gitignore

@@ -1,4 +1,5 @@
 node_modules
+debug.log
 .now
 .DS_Store
-.now
+.now

README.md

@@ -1,10 +1,10 @@
-# COVID-19 Tracker CLI [![Developed by Waren Gonzaga](https://img.shields.io/badge/Developed%20by-Waren%20Gonzaga-blue.svg?longCache=true&style=for-the-badge)](https://facebook.com/warengonzagaofficial)
+# COVID-19 Tracker CLI [![Mentioned in Awesome Coronavirus](https://awesome.re/mentioned-badge-flat.svg)](https://github.com/soroushchehresa/awesome-coronavirus)
 
-[![Github Release](https://img.shields.io/github/release/trackercli/covid19-tracker-cli.svg?style=for-the-badge)](https://github.com/trackercli/covid19-tracker-cli/releases) [![Github Star](https://img.shields.io/github/stars/trackercli/covid19-tracker-cli.svg?style=for-the-badge)](https://github.com/trackercli/covid19-tracker-cli) [![Github Fork](https://img.shields.io/github/forks/trackercli/covid19-tracker-cli.svg?style=for-the-badge)](https://github.com/trackercli/covid19-tracker-cli) [![License](https://img.shields.io/github/license/trackercli/covid19-tracker-cli.svg?style=for-the-badge)](https://github.com/trackercli/covid19-tracker-cli) [![Powered By](https://img.shields.io/badge/Powered%20By-NodeJS-green.svg?style=for-the-badge)](https://nodejs.org)
+[![Developed by Waren Gonzaga](https://img.shields.io/badge/Developed%20by-Waren%20Gonzaga-blue.svg?longCache=true&style=for-the-badge)](https://facebook.com/warengonzagaofficial) [![Github Release](https://img.shields.io/github/release/trackercli/covid19-tracker-cli.svg?style=for-the-badge)](https://github.com/trackercli/covid19-tracker-cli/releases) [![Github Star](https://img.shields.io/github/stars/trackercli/covid19-tracker-cli.svg?style=for-the-badge)](https://github.com/trackercli/covid19-tracker-cli) [![Github Fork](https://img.shields.io/github/forks/trackercli/covid19-tracker-cli.svg?style=for-the-badge)](https://github.com/trackercli/covid19-tracker-cli) [![License](https://img.shields.io/github/license/trackercli/covid19-tracker-cli.svg?style=for-the-badge)](https://github.com/trackercli/covid19-tracker-cli) [![Powered By](https://img.shields.io/badge/Powered%20By-NodeJS-green.svg?style=for-the-badge)](https://nodejs.org)
 
 ![Github Banner](https://raw.githubusercontent.com/trackercli/covid19-tracker-cli/master/lib/img/covid19-tracker-cli-github-banner.jpg)
 
-**COVID-19 Tracker CLI** is an open-source NodeJS application for command line interface to track COVID-19 cases around the world. An optimized NodeJS application and a simple tracker with real-time updates from reliable data source. [Visit Wiki](https://github.com/tracker-cli/covid19-tracker-cli/wiki)
+**COVID-19 Tracker CLI** is an open-source NodeJS application for command line interface to track COVID-19 cases around the world. An optimized NodeJS application and a simple tracker with real-time updates from reliable data source. It Supports terminal for linux and macos, command prompt for windows, and termux for android. [Visit Wiki](https://github.com/tracker-cli/covid19-tracker-cli/wiki)
 
 ## Public Domain Names
 
@@ -75,7 +75,7 @@ curl -L covid19.trackercli.com
 #### WGET
 
 ```bash
-wget -i https://covid19.trackercli.com && cat index.html
+wget -qO- https://covid19.trackercli.com
 ```
 
 #### HTTPie
@@ -140,6 +140,15 @@ curl -L covid19.trackercli.com/history/ph/deaths
 
 ![CURL](https://github.com/trackercli/covid19-tracker-cli/raw/master/lib/img/demo-history-country.gif)
 
+#### Country Tracking with History Chart (Dashboard)
+
+```bash
+# shows result with history chart
+curl -L covid19.trackercli.com/history/charts/ph
+```
+
+![CURL](./lib/img/demo-history-chart.gif)
+
 ## Advance Usage
 
 ### Check Update Automagically
@@ -190,6 +199,24 @@ covid ph --plain
 covid help
 ```
 
+### Local Command Line Tracker in Container
+```bash
+# Create build file 
+$ vim covid19-tracker-cli.containerfile
+FROM docker.io/library/alpine
+RUN apk update
+RUN apk add git
+RUN apk add npm
+RUN git clone https://github.com/warengonzaga/covid19-tracker-cli.git
+RUN cd covid19-tracker-cli && npm install && npm link
+
+# Build container
+$ podman build -t covid19-tracker-cli --file=covid19-tracker-cli.containerfile
+
+# Run container
+$ podman run -it --rm=true localhost/covid19-tracker-cli covid PH
+```
+
 ## Official Blog
 
 Many people asking me how to properly use my tracker. Here's the blog on [How to Track Coronavirus on Command Line](https://warengonza.ga/covid19-tracker-cli). If you have comments or suggestions please leave it on the comment section of the blog.
@@ -340,4 +367,4 @@ COVID-19 Tracker CLI is Developed and Maintained by **Waren Gonzaga**, **Ian Viz
 
 ---
 
-**</>** with **<3** by **Waren Gonzaga**
+:computer: with :heart: by **Waren Gonzaga** with **YHWH** | Tracker CLI Developers

app.js

@@ -4,7 +4,8 @@ const express     = require('express'),
       util        = require('./bin/util'),
       axios       = require('axios'),
       covid19     = require('./lib/cli'),
-      covid19GFX = require('./lib/cli/gfx'),
+      covid19GFX  = require('./lib/cli/gfx'),
+      EventEmitter = require('events'),
       pkg         = require('./package.json'),    // package.json info
       apiBaseURL  = "https://corona.lmao.ninja/v2",  // NovelCOVID API
       port        = process.env.port || 7070;     // set port
@@ -147,12 +148,66 @@ app.get('/history/charts/:country/:chartSize(sm|md|lg)?', async (req, res, next)
         s.deaths, s.todayDeaths, s.recovered, 
         s.active, s.critical, s.casesPerOneMillion,
         s.updated, h, chartType, s.countryInfo, chartSize
-      )
+      );
     return null;
   }
   return next();
 });
 
+
+// historical chart by country
+app.get('/history/web/charts/:country?/:chartSize(sm|md|lg)?', async (req, res, next) => {
+  const userAgent = req.headers['user-agent'],
+        countryData = req.params.country || 'ph',
+        chartType = req.params.chartType || 'cases',
+        chartSize = req.params.chartSize || 'sm',
+        summary = await axios.get(`${apiBaseURL}/countries/${countryData}`),
+        history = await axios.get(`${apiBaseURL}/historical/${summary.data.country}?lastdays=all`),
+        s = summary.data,
+        h = history.data,
+        terminator = `\r\n`+'\033[?25h',
+        xtermHTMLTemplate = require('./lib/cli/gfx/terminal-html-template'),
+        bufferEmitter = new EventEmitter();
+
+  let customHttpResponse = {
+      send: (data) => {
+          bufferEmitter.emit('screenBuffer', data)
+          this.data = data
+          return this;
+        },
+          get: () => {
+            return this.data
+          }
+      };
+
+  covid19GFX.historyCountryTracker(
+    req, customHttpResponse,
+    s.country, s.cases, s.todayCases, 
+    s.deaths, s.todayDeaths, s.recovered, 
+    s.active, s.critical, s.casesPerOneMillion,
+    s.updated, h, chartType, s.countryInfo, chartSize
+  );
+
+  let screenOutput = (await new Promise((resolve, reject) => {
+    bufferEmitter.on('screenBuffer', (screen) => {
+      resolve(screen)
+    })
+    setTimeout(() => {
+      resolve('')
+    },5000)
+  }));
+
+
+  if(!screenOutput.length || !h) res.send('Unable to load the chart.Please refresh the page')
+
+  return util.isCommandline(userAgent) ? res.send(screenOutput+terminator) : res.send(xtermHTMLTemplate(screenOutput.replace(terminator, '')))
+
+});
+
+app.use('/xterm', express.static(__dirname + '/node_modules/xterm'));
+app.use('/xterm/addons', express.static(__dirname + '/node_modules/xterm-addon-fit'));
+
+// route for web browser clients
 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

lib/cli/gfx/template.js

@@ -36,7 +36,7 @@ exports.load = (grid, data, chartStyle) => {
             [
                 ['',data.cases, data.deaths, data.recovered, data.active, data.casesPerOneMillion],
                 ['','Today Cases', 'Today Deaths', 'Critical', 'Mortality %', 'Recovery %'],
-                ['',data.todayCases, data.todayDeaths, data.critical, data.mortalityPercentage, data.recoveredPercentage]
+                ['',data.todayCases, data.todayDeaths, data.critical, parseFloat(data.mortalityPercentage).toFixed(2), parseFloat(data.recoveredPercentage).toFixed(2)]
             ]
         })
 

lib/cli/gfx/terminal-html-template.js

@@ -0,0 +1,33 @@
+
+const html = (data) => {
+    return (`<!doctype html>
+        <html>
+            <head>
+            <script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/xterm.min.js"></script>
+            <script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/xterm-addon-fit.min.js"></script>
+            </head>
+            <body>
+            <div id="terminal" style='width: 105%;height: 100vh;padding-left: 2px;'></div>
+            </body>
+            <script>
+                var term = new Terminal();
+                var fitAddon = new FitAddon.FitAddon()
+                term.loadAddon(fitAddon);
+                term.open(document.getElementById('terminal'));
+                fitAddon.fit();
+                term.write('${data}')
+            </script>
+            <style>
+                body{
+                    background: #000; 
+                    margin:0;padding:0;
+                    overflow:hidden;
+                }
+                textarea, .xterm-char-measure-element, .xterm-scroll-area{
+                    display: none;
+                }
+            </style>
+        </html>`)
+}
+
+module.exports = html