From d9216c95dfb2da81ed8dcdb0146d302a93688cea Mon Sep 17 00:00:00 2001
From: R4SAS <r4sas@i2pd.xyz>
Date: Thu, 2 Jan 2020 17:05:12 +0000
Subject: [PATCH] add 24 hours node count

---
 api/max-min.py           |  7 ++++++-
 api/niflheim-api.py      | 27 ++++++++++++++++++++++++++-
 api/templates/index.html |  8 ++++++--
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/api/max-min.py b/api/max-min.py
index bc86ccf..5e81515 100644
--- a/api/max-min.py
+++ b/api/max-min.py
@@ -12,8 +12,13 @@ DB_USER = "yggindex"
 DB_NAME = "yggindex"
 DB_HOST = "localhost"
 
+# count peer alive if it was available not more that amount of seconds ago
+# I'm using 1 hour beause of running crawler every 15 minutes
+ALIVE_SECONDS = 3600 # 1 hour
+
+
 def age_calc(ustamp):
-	if (time.time() - ustamp) <= 14400 :
+	if (time.time() - ustamp) <= ALIVE_SECONDS :
 		return True
 	else:
 		return False
diff --git a/api/niflheim-api.py b/api/niflheim-api.py
index c78bb7a..bb6a3aa 100644
--- a/api/niflheim-api.py
+++ b/api/niflheim-api.py
@@ -16,7 +16,7 @@ DB_NAME = "yggindex"
 DB_HOST = "localhost"
 
 # count peer alive if it was available not more that amount of seconds ago
-# I'm using 1 hour beause of running cron job every 15 minutes
+# I'm using 1 hour beause of running crawler every 15 minutes
 ALIVE_SECONDS = 3600 # 1 hour
 
 
@@ -74,6 +74,30 @@ class nodesInfo(Resource):
         return nodeinfo
 
 
+# alive nodes count for latest 24 hours
+class nodes24h(Resource):
+    def get(self):
+        dbconn = psycopg2.connect(host=DB_HOST,\
+                                    database=DB_NAME,\
+                                    user=DB_USER,\
+                                    password=DB_PASSWORD)
+        cur = dbconn.cursor()
+        nodes = {}
+        cur.execute("SELECT * FROM timeseries ORDER BY unixtstamp DESC LIMIT 24")
+        for i in cur.fetchall():
+            nodes[i[1]] = i[0]
+
+        dbconn.commit()
+        cur.close()
+        dbconn.close()
+
+        nodeinfo = {}
+        nodeinfo['nodes24h'] = nodes
+
+        return nodeinfo
+
+
+
 @app.route("/")
 def fpage():
     dbconn = psycopg2.connect(host=DB_HOST,\
@@ -98,6 +122,7 @@ def fpage():
 #sort out the api request here for the url
 api.add_resource(nodesCurrent, '/current')
 api.add_resource(nodesInfo, '/nodeinfo')
+api.add_resource(nodes24h, '/nodes24h')
 
 if __name__ == '__main__':
     app.run(host='::', port=3000)
diff --git a/api/templates/index.html b/api/templates/index.html
index cc64317..b9550e3 100644
--- a/api/templates/index.html
+++ b/api/templates/index.html
@@ -23,11 +23,15 @@
 
             Get a current list of active and online nodes:<br />
             <div class="apireq">
-                <a href="/current">http://[31a:fb8a:c43e:ca59::2]/current</a>
+                <a href="/current" target="_blank">http://[31a:fb8a:c43e:ca59::2]/current</a>
             </div>
             Nodeinfo from all current active nodes:<br />
             <div class="apireq">
-                <a href="/nodeinfo">http://[31a:fb8a:c43e:ca59::2]/nodeinfo</a>
+                <a href="/nodeinfo" target="_blank">http://[31a:fb8a:c43e:ca59::2]/nodeinfo</a>
+            </div>
+            Active nodes count for last 24 hours:<br />
+            <div class="apireq">
+                <a href="/nodes24h" target="_blank">http://[31a:fb8a:c43e:ca59::2]/nodes24h</a>
             </div>
 
             <div class="wide"></div>