Added query ?stats at private path GET. Also private one-to-one GET gives ttl as JSON now

Author: SomajitDey

api/helper.js

@@ -113,6 +113,24 @@ export async function privateRefresh(privateKey){
     return redisData.expire(dbKey, ttl);
 }
 
+export async function privateStats(privateKey){
+    const publicKey = genPublicKey(privateKey);
+    const dbKeyConsume = dbKeyPrefix.manyToOne + publicKey;
+    const dbKeyPublish = dbKeyPrefix.oneToMany + publicKey;
+    const countConsume = await redisData.llen(dbKeyConsume);
+    const ttlConsume = await redisData.ttl(dbKeyConsume);
+    const ttlPublish = await redisData.ttl(dbKeyPublish);
+    return {
+      consume: {
+        count: countConsume,
+        ttl: ttlConsume < 0 ? 0 : ttlConsume
+        },
+      publish: {
+        ttl: ttlPublish < 0 ? 0 : ttlPublish
+        }
+      };
+}
+
 export async function publicConsume(publicKey){
     const dbKey = dbKeyPrefix.oneToMany + publicKey;
     return redisData.get(dbKey);
@@ -132,14 +150,14 @@ export async function oneToOneConsume(publicKey, key){
     return redisData.hget(dbKey, field).then(redisData.hdel(dbKey, field));
 }
 
-export async function oneToOneIsConsumed(privateKey, key){
+export async function oneToOneTTL(privateKey, key){
     const publicKey = genPublicKey(privateKey);
     const dbKey = dbKeyPrefix.oneToOne + publicKey;
     const field = key;
     const bool = await redisData.hexists(dbKey, field);
     if (bool) {
-        return "Not consumed yet.";
+        return {ttl: await redisData.ttl(dbKey)};
     } else {
-        return "Consumed.";
+        return {ttl: 0};
     }
 }

api/index.js

@@ -112,13 +112,15 @@ fastify.post('/public/:publicKey', async (request, reply) => {
 fastify.get('/private/:privateKey', async (request, reply) => {
     const { privateKey } = request.params;
     const webhook = request.query.hook;
+    const statsPresent = 'stats' in request.query;
     try {
         if (helper.validate(privateKey) !== 'private') throw 401;
         if (webhook == null) {
             await helper.cacheDel(privateKey, 'hook');
         } else {
             await helper.cacheSet(privateKey, {hook:webhook});
         }
+        if (statsPresent) return helper.privateStats(privateKey);
         const dataArray = await helper.privateConsume(privateKey);
         if (!dataArray.length) throw 404;
         reply.send(dataArray);
@@ -260,7 +262,7 @@ fastify.get('/private/:privateKey/:key', async (request, reply) => {
     try {
         if (key.substr(0,fieldLimit) !== key) throw 400;
         if (helper.validate(privateKey) !== 'private') throw 401;
-        reply.send(await helper.oneToOneIsConsumed(privateKey, key));
+        return helper.oneToOneTTL(privateKey, key);
     } catch (err) {
         if (err == 400) {
             callBadRequest(reply, 'Provided field is too long');