add suport for x-forwarded-for header

api/collect.go

@@ -34,11 +34,16 @@ func CollectHandler(w http.ResponseWriter, r *http.Request) {
 
   // TODO: Mask IP Address
   // TODO: Query DB to determine whether visitor is returning
+  ipAddress := r.RemoteAddr
+  headerForwardedFor := r.Header.Get("X-Forwarded-For")
+  if( headerForwardedFor != "" ) {
+    ipAddress = headerForwardedFor
+  }
 
   q := r.URL.Query()
   visit := models.Visit{
     Path: q.Get("p"),
-    IpAddress: r.RemoteAddr,
+    IpAddress: ipAddress,
     ReferrerUrl: q.Get("r"),
     BrowserLanguage: q.Get("l"),
     ScreenResolution: q.Get("sr"),

assets/js/components/Realtime.js

@@ -12,17 +12,18 @@ class Realtime extends Component {
     }
     this.fetchData = this.fetchData.bind(this);
     this.fetchData();
+    window.setInterval(this.fetchData, 6000);
   }
 
   fetchData() {
     return fetch('/api/visits/count/realtime', {
       credentials: 'include'
     }).then((r) => {
-        if( r.ok ) { r.json(); }
+        if( r.ok ) { return r.json(); }
         throw new Error();
      }).then((data) => {
         this.setState({ count: data })
-    }).catch((e) => {});
+    });
   }
 
   render() {