Implemented /task/list

Author: pierotofy

Diff for: libs/asrProvider.js

@@ -76,7 +76,12 @@ module.exports = {
                 // Attempt to retrieve task info and save it in task table before deleting node
                 // so that users can continue to access this information.
                 try{
-                    await tasktable.add(taskId, {taskInfo: await node.taskInfo(taskId)});
+                    const route = await routetable.lookup(taskId);
+                    if (route){
+                        await tasktable.add(taskId, {taskInfo: await node.taskInfo(taskId)}, route.token);
+                    }else{
+                        logger.warn(`Cannot add task table entry for ${taskId} (route missing)`);
+                    }
                 }catch(e){
                     logger.warn(`Cannot add task table entry for ${taskId} from ${node}`);
                 }

Diff for: libs/proxy.js

@@ -402,7 +402,7 @@ module.exports = {
 
                                         if (pathname === '/task/cancel'){
                                             taskTableEntry.taskInfo.status.code = statusCodes.CANCELED;
-                                            await tasktable.add(taskId, taskTableEntry);
+                                            await tasktable.add(taskId, taskTableEntry, query.token);
                                         }
 
                                         json(res, { success: true });
@@ -419,6 +419,19 @@ module.exports = {
                     });
 
                     utils.stringToStream(body).pipe(busboy);
+                }else if (req.method === 'GET' && pathname === '/task/list') {
+                    const taskIds = {};
+                    const taskTableEntries = await tasktable.findByToken(query.token);
+                    for (let taskId in taskTableEntries){
+                        taskIds[taskId] = true;
+                    }
+
+                    const routeTableEntries = await routetable.findByToken(query.token, true);
+                    for (let taskId in routeTableEntries){
+                        taskIds[taskId] = true;
+                    }
+                    
+                    json(res, Object.keys(taskIds).map(uuid => { return { uuid } }));
                 }else{
                     // Lookup task id
                     const matches = pathname.match(/^\/task\/([\w\d]+\-[\w\d]+\-[\w\d]+\-[\w\d]+\-[\w\d]+)\/(.+)$/);

Diff for: libs/routetable.js

@@ -16,6 +16,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 const fs = require('fs');
+const async = require("async");
 const logger = require('./logger');
 const nodes = require('./nodes');
 
@@ -95,14 +96,27 @@ module.exports = {
         }
     },
 
-    findByToken: async function(token){
+    findByToken: async function(token, activeOnly = false){
         const result = {};
         for (let taskId in routes){
             if (routes[taskId].token === token){
                 result[taskId] = routes[taskId];
             }
         }
-        return result;
+        if (!activeOnly) return result;
+
+        // Actually ping the node for these tasks and filter out
+        // inactive / deleted / stale ones
+        return new Promise((resolve) => {
+            async.each(Object.keys(result), (taskId, cb) => {
+                (routes[taskId]).node.taskInfo(taskId).then((taskInfo) => {
+                    if (taskInfo.error) delete(result[taskId]);
+                    cb();
+                });
+            }, () => {
+                resolve(result);
+            });
+        });
     },
 
     lookupNode: async function(taskId){

Diff for: libs/taskNew.js

@@ -453,7 +453,7 @@ module.exports = {
                     const taskInfo = taskTableEntry.taskInfo;
                     if (taskInfo){
                         taskInfo.status.code = statusCodes.FAILED;
-                        await tasktable.add(uuid, { taskInfo, output: [err.message] });
+                        await tasktable.add(uuid, { taskInfo, output: [err.message] }, token);
                         logger.warn(`Cannot forward task ${uuid} to processing node ${node}: ${err.message}`);
                     }
                 }
@@ -491,7 +491,7 @@ module.exports = {
             };  
 
             // Add item to task table
-            await tasktable.add(uuid, { taskInfo, abort: abortTask, output: ["Launching... please wait! This can take a few minutes."] });
+            await tasktable.add(uuid, { taskInfo, abort: abortTask, output: ["Launching... please wait! This can take a few minutes."] }, token);
 
             // Send back response to user right away
             utils.json(res, { uuid });

Diff for: libs/tasktable.js

@@ -43,15 +43,16 @@ module.exports = {
         setInterval(cleanup, 1000 * 60 * 60);
     },
 
-    add: async function(taskId, obj){
+    add: async function(taskId, obj, token){
         if (!taskId) throw new Error("taskId is not valid");
         if (!obj) throw new Error("obj is not valid");
 
         logger.debug(`Added ${taskId} --> ${JSON.stringify(obj)} in task table`);
 
         tasks[taskId] = {
-            obj: obj,
-            accessed: new Date().getTime()
+            obj,
+            token,
+            accessed: new Date().getTime(),
         };
     },
 
@@ -67,5 +68,15 @@ module.exports = {
         }
 
         return null;
+    },
+
+    findByToken: async function(token){
+        const result = {};
+        for (let taskId in tasks){
+            if (tasks[taskId].token === token){
+                result[taskId] = tasks[taskId].obj;
+            }
+        }
+        return result;
     }
 };

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "ClusterODM",
-  "version": "1.3.7",
+  "version": "1.4.0",
   "description": "",
   "main": "index.js",
   "scripts": {