removed caching from zeit, added table in by country api too

Author: sagarkarira

app.js

@@ -16,39 +16,40 @@ function errorHandler(error, res) {
 }
 
 app.use(morgan(':remote-addr :remote-user :method :url :status :res[content-length] - :response-time ms'));
+app.use((req, res, next) => {
+  res.setHeader('Cache-Control', 'no-cache');
+  next();
+});
 
 app.get('/', (req, res) => {
-  const isCurl = req.headers['user-agent'].match(/\bcurl\b/gmi) !== null
+  const isCurl = req.headers['user-agent'].match(/\bcurl\b/gmi) !== null;
   const format = req.query.format ? req.query.format : '';
 
   if (format.toLowerCase() === 'json') {
     return getJSONData().then(result => {
-      res.setHeader('Cache-Control', 's-maxage=900');
       return res.json(result);
     }).catch(error => errorHandler(error, res));
   }
 
-  return getCompleteTable({isCurl}).then(result => {
-    res.setHeader('Cache-Control', 's-maxage=900');
+  return getCompleteTable({ isCurl }).then(result => {
     return res.send(result);
   }).catch(error => errorHandler(error, res));
 });
 
 app.get('/:country', (req, res) => {
   const { country } = req.params;
+  const isCurl = req.headers['user-agent'].match(/\bcurl\b/gmi) !== null;
   const format = req.query.format ? req.query.format : '';
 
   if (!country || 'ALL' === country.toUpperCase()) {
     if (format.toLowerCase() === 'json') {
       return getJSONData().then(result => {
-        res.setHeader('Cache-Control', 's-maxage=900');
         return res.json(result);
       }).catch(error => errorHandler(error, res));
     }
 
 
-    return getCompleteTable().then(result => {
-      res.setHeader('Cache-Control', 's-maxage=900');
+    return getCompleteTable({ isCurl }).then(result => {
       return res.send(result);
     }).catch(error => errorHandler(error, res));
   }
@@ -70,13 +71,11 @@ app.get('/:country', (req, res) => {
 
   if (format.toLowerCase() === 'json') {
     return getJSONDataForCountry(iso2).then(result => {
-      res.setHeader('Cache-Control', 's-maxage=900');
       return res.json(result);
     }).catch(error => errorHandler(error, res));
   }
 
-  return getCountryTable(iso2).then(result => {
-    res.setHeader('Cache-Control', 's-maxage=900');
+  return getCountryTable({ countryCode: iso2, isCurl }).then(result => {
     return res.send(result);
   }).catch(error => errorHandler(error, res));
 });

bin/index.js

@@ -1,14 +1,13 @@
 #!/usr/bin/env node
-const yargonaut = require('yargonaut')
-  .style('green');
+const yargonaut = require('yargonaut').style('green');
 const yargs = require('yargs');
 const chalk = require('chalk');
 const { getCompleteTable } = require('../lib/corona');
 const { getCountryTable } = require('../lib/byCountry');
 const { lookupCountry } = require('../lib/helpers');
 
 const { argv } = yargs
-  .command('$0 [country]','Tool to COVID-19 statistics for the world or the given country', yargs =>
+  .command('$0 [country]','Tool to track COVID-19 statistics for the world or the given country', yargs =>
     yargs.positional('country', {
       coerce(arg) {
         if ('ALL' === arg.toUpperCase()) {
@@ -51,7 +50,7 @@ const { emojis, country } = argv;
 (
   country === 'ALL'
     ? getCompleteTable({emojis})
-    : getCountryTable(country, emojis)
+    : getCountryTable({ countryCode: country, emojis })
 )
   .then(console.log)
   .catch(console.error);

lib/byCountry.js

@@ -4,6 +4,7 @@ const _ = require('lodash');
 const chalk = require('chalk');
 const helpers = require('./helpers');
 const api = require('./api');
+const stripAnsi = require('strip-ansi');
 const {
   getCountry,
   getConfirmed,
@@ -79,7 +80,7 @@ exports.getJSONDataForCountry = async (countryCode) => {
   return countryData;
 }
 
-exports.getCountryTable = async (countryCode, emojis = false) => {
+exports.getCountryTable = async ({countryCode, emojis = false, isCurl = true}) => {
   const head = [
     '',
     'State',
@@ -147,5 +148,30 @@ exports.getCountryTable = async (countryCode, emojis = false) => {
     });
   }
   const lastUpdated = countryData[0].lastUpdated;
+  if (!isCurl) {
+    const template = `<!DOCTYPE html>
+    <html lang="en">
+    <head>
+      <meta charset="UTF-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      <link href="https://fonts.googleapis.com/css?family=Roboto+Mono&display=swap" rel="stylesheet">
+      <title>Coronavirus Tracker</title>
+      <style>
+        body {
+          background: #0D0208;
+          color: #00FF41;
+        }
+        pre {
+          font-family: 'Roboto Mono', monospace;
+          white-space: pre;
+        }
+      </style>
+    </head>
+      <body>
+        <pre>${table.toString() + footer(lastUpdated)}</pre>
+      </body>
+    </html>`;
+    return stripAnsi(template);
+  }
   return table.toString() + footer(lastUpdated);
 }

lib/corona.js

@@ -4,6 +4,7 @@ const _ = require('lodash');
 const chalk = require('chalk');
 const helpers = require('./helpers');
 const api = require('./api');
+const stripAnsi = require('strip-ansi');
 const {
   getCountry,
   getConfirmed,
@@ -79,7 +80,7 @@ function extraStats(dataArr) {
   );
 }
 
-exports.getCompleteTable = async ({isCurl, emojis = false}) => {
+exports.getCompleteTable = async ({isCurl = true, emojis = false}) => {
   const head = [
     '',
     'Country',
@@ -148,6 +149,10 @@ exports.getCompleteTable = async ({isCurl, emojis = false}) => {
       <link href="https://fonts.googleapis.com/css?family=Roboto+Mono&display=swap" rel="stylesheet">
       <title>Coronavirus Tracker</title>
       <style>
+        body {
+          background:  #0D0208;
+          color: #00FF41;
+        }
         pre {
           font-family: 'Roboto Mono', monospace;
           white-space: pre;
@@ -158,7 +163,7 @@ exports.getCompleteTable = async ({isCurl, emojis = false}) => {
         <pre>${table.toString() + footer(lastUpdated)}</pre>
       </body>
     </html>`
-    return template;
+    return stripAnsi(template);
   }
   return table.toString() + footer(lastUpdated);
 }

package-lock.json

@@ -29,6 +29,7 @@
     "moment": "^2.24.0",
     "morgan": "^1.9.1",
     "node-cache": "^5.1.0",
+    "strip-ansi": "^6.0.0",
     "yargonaut": "^1.1.4",
     "yargs": "15.3.1"
   },