feat: map of requests

Author: tyliec

app.js

@@ -159,6 +159,7 @@ app.get('/urls/edit/:id', urlsController.editUrl);
 // app.put('/urls/:id', urlsController.updateUrl);
 app.delete('/urls/deleteUrl', urlsController.deleteUrl);
 app.get('/admin', adminController.index);
+app.get('/admin/country', adminController.country);
 app.get('/account/verify', passportConfig.isAuthenticated, userController.getVerifyEmail);
 app.get('/account/verify/:token', passportConfig.isAuthenticated, userController.getVerifyEmailToken);
 app.get('/account', passportConfig.isAuthenticated, userController.getAccount);
@@ -169,6 +170,7 @@ app.get('/account/unlink/:provider', passportConfig.isAuthenticated, userControl
 app.post('/shorten', shortUrlController.postShortUrl);
 app.get('/shortener', shortenerController.index);
 
+
 // Must be last due to wildcard matching
 app.get('/:slug', shortUrlController.getShortUrl);
 

controllers/admin.js

@@ -2,9 +2,30 @@
  * GET /
  * Admin page.
  */
+
+const Url = require('../models/Url')
+
  exports.index = (req, res) => {
     res.render('admin', {
       title: 'Admin'
     });
   };
-  
+
+exports.country = async (req, res) => {
+  const countryMap = {};
+
+  Url.find({}, function(err, urls) {
+    if (err) {
+      console.error(err);
+    }
+    for (const url of urls) {
+      const { country, countryCode } = url;
+      if (countryMap[country]) {
+        countryMap[country] += 1;
+      } else {
+        countryMap[country] = 1;
+      }
+    }
+    res.json(countryMap);
+  });
+};

controllers/shortUrl.js

@@ -1,9 +1,20 @@
 const Url = require('../models/Url')
 const { validateUrl } = require('../utils/utils')
-const compareUrls = require('compare-urls');
+const dns = require('dns');
+const fetch = require('node-fetch');
+
 // const dotenv = require('dotenv')
 // dotenv.config({ path: '.env.example' })
 
+async function lookupPromise(domain) {
+  return new Promise((resolve, reject) => {
+    dns.lookup(domain, (err, address, family) => {
+      if (err) reject(err);
+      resolve(address);
+    });
+  });
+};
+
 
 const urlNotDenylisted = (url) => {
   const denylist = [
@@ -18,11 +29,9 @@ const urlNotDenylisted = (url) => {
   } catch (err) {
     return 'Invalid URL';
   }
-  
-  for (const deniedUrl of denylist) {
-    if (denylist.includes(urlObj.hostname) || denylist.includes(urlObj.host)) {
-      return "That URL domain is banned";
-    }
+
+  if (denylist.includes(urlObj.hostname) || denylist.includes(urlObj.host)) {
+    return "That URL domain is banned";
   }
 
   return true;
@@ -36,7 +45,7 @@ exports.postShortUrl = async (req, res) => {
   const { longUrl, user } = req.body
   const base = process.env.BASE_URL
 
-  const { nanoid } = await import ('nanoid');
+  const { nanoid } = await import('nanoid');
 
   const slug = nanoid(5)
   if (!validateUrl(longUrl)) {
@@ -56,6 +65,12 @@ exports.postShortUrl = async (req, res) => {
     }
   }
 
+  const ipAddress = await lookupPromise(new URL(longUrl).hostname);
+
+  const response = await fetch(`http://ip-api.com/json/${ipAddress}`);
+
+  const { country, countryCode } = await response.json();
+
   try {
     let url = await Url.findOne({ longUrl, user })
     if (url) {
@@ -69,6 +84,9 @@ exports.postShortUrl = async (req, res) => {
         slug,
         date: new Date(),
         user,
+        ipAddress,
+        country,
+        countryCode
       })
 
       await url.save()
@@ -94,7 +112,7 @@ exports.getShortUrl = async (req, res) => {
       return res.redirect(url.longUrl)
     } else {
       res.status(404).json('No url found')
-    } 
+    }
   } catch (err) {
     console.error(err)
     res.status(500).json('Server Error')

models/Url.js

@@ -25,6 +25,15 @@ const UrlSchema = new mongoose.Schema({
   user: {
     type: String,
     required: true,
+  },
+  ipAddess: {
+    type: String,
+  },
+  country: {
+    type: String,
+  },
+  countryCode: {
+    type: String,
   }
 })
 

package-lock.json

@@ -44,6 +44,7 @@
     "mongoose": "^6.2.8",
     "morgan": "^1.10.0",
     "nanoid": "^4.0.0",
+    "node-fetch": "2.6.0",
     "node-quickbooks": "^2.0.39",
     "node-sass": "^7.0.1",
     "node-sass-middleware": "^1.0.1",

package.json

@@ -0,0 +1,92 @@
+var map = L.map('map').setView([37.8, -96], 2);
+var geojson;
+var info = L.control();
+
+info.onAdd = function (map) {
+    this._div = L.DomUtil.create('div', 'info'); // create a div with a class "info"
+    this.update();
+    return this._div;
+};
+
+// method that we will use to update the control based on feature properties passed
+info.update = function (props) {
+    this._div.innerHTML = '<h4>Countries</h4>' +  (props ?
+        '<b>' + props.name + '</b><br />' + (props.density || '0') + ' redirections'
+        : 'Hover over a country');
+};
+
+info.addTo(map);
+
+function getColor(d) {
+    return d > 7 ? '#800026' :
+           d > 6  ? '#BD0026' :
+           d > 5  ? '#E31A1C' :
+           d > 4  ? '#FC4E2A' :
+           d > 3   ? '#FD8D3C' :
+           d > 2   ? '#FEB24C' :
+           d > 1    ? '#FED976' :
+                      '#FFEDA0';
+}
+
+function highlightFeature(e) {
+    var layer = e.target;
+
+    layer.setStyle({
+        weight: 5,
+        color: '#666',
+        dashArray: '',
+        fillOpacity: 0.7
+    });
+
+    layer.bringToFront();
+    info.update(layer.feature.properties);
+}
+
+function resetHighlight(e) {
+    geojson.resetStyle(e.target);
+    info.update();
+}
+
+function zoomToFeature(e) {
+    map.fitBounds(e.target.getBounds());
+}
+
+function onEachFeature(feature, layer) {
+    layer.on({
+        mouseover: highlightFeature,
+        mouseout: resetHighlight,
+        click: zoomToFeature
+    });
+}
+
+fetch("/admin/country")
+  .then(response => response.json())
+  .then(data => {
+    // const newCountriesData = JSON.parse(JSON.stringify(countriesData));
+    console.log(data);
+    for (const country of countriesData.features) {
+        for (const countryData of Object.keys(data)) {
+            if (country.properties.name.includes(countryData)) {
+                country.properties.density = data[countryData];
+            }
+        }
+    }
+    console.log(countriesData);
+    geojson = L.geoJson(countriesData, {style, onEachFeature}).addTo(map);
+  });
+
+function style(feature) {
+    return {
+        fillColor: getColor(feature.properties.density),
+        weight: 2,
+        opacity: 1,
+        color: 'white',
+        dashArray: '3',
+        fillOpacity: 0.7
+    };
+}
+
+var tiles = L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+    maxZoom: 19,
+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+}).addTo(map);