powr-sdk-api 4.2.0 → 4.3.1

package/dist/routes/tasks.js

@@ -2,32 +2,57 @@
 
 const express = require("express");
 const router = express.Router();
-const toolsManager = require("../services/tools");
 const {
-  getDb
-} = require("../services/mongo");
+  toolsManager,
+  scheduledTasksManager
+} = require("../managers");
 
 // GET /tasks - Get all tasks
 router.get("/", async (req, res) => {
-  const projectId = req.projectId;
   try {
-    const query = {
-      projectId
-    };
-    if (req.user.access !== 100) {
-      query.userId = req.user.powrId;
+    const isAdmin = req.user.access === 100;
+    const result = await scheduledTasksManager.getUserTasks(req.user.powrId, req.projectId, isAdmin);
+    if (result.success) {
+      return res.status(200).json({
+        success: true,
+        tasks: result.tasks
+      });
+    } else {
+      return res.status(400).json({
+        success: false,
+        message: result.message
+      });
     }
-    const db = await getDb();
-    const tasksData = await db.collection("tasks").find(query).toArray();
-    return res.status(200).json({
-      success: true,
-      tasks: tasksData
+  } catch (error) {
+    console.error("Error retrieving tasks:", error);
+    return res.status(500).json({
+      success: false,
+      message: "Failed to retrieve tasks."
     });
+  }
+});
+
+// GET /tasks/:taskId - Get specific task
+router.get("/:taskId", async (req, res) => {
+  try {
+    const isAdmin = req.user.access === 100;
+    const result = await scheduledTasksManager.getTask(req.params.taskId, req.user.powrId, req.projectId, isAdmin);
+    if (result.success) {
+      return res.status(200).json({
+        success: true,
+        task: result.task
+      });
+    } else {
+      return res.status(404).json({
+        success: false,
+        message: result.message
+      });
+    }
   } catch (error) {
-    console.error("Error retrieving tasks entries:", error);
+    console.error("Error retrieving task:", error);
     return res.status(500).json({
       success: false,
-      message: "Failed to retrieve tasks entries."
+      message: "Failed to retrieve task."
     });
   }
 });
@@ -39,7 +64,7 @@ router.post("/", async (req, res) => {
     const {
       name,
       description,
-      cronExpression,
+      scheduledFor,
       toolId,
       actionId,
       params,
@@ -47,10 +72,10 @@ router.post("/", async (req, res) => {
     } = req.body;
 
     // Validate required fields
-    if (!name || !cronExpression || !toolId || !actionId) {
+    if (!name || !toolId || !actionId) {
       return res.status(400).json({
         success: false,
-        message: "Missing required fields: name, cronExpression, toolId, actionId"
+        message: "Missing required fields: name, toolId, actionId"
       });
     }
 
@@ -74,24 +99,28 @@ router.post("/", async (req, res) => {
     const taskData = {
       name,
       description,
-      cronExpression,
+      scheduledFor,
+      // null, timestamp, or cron expression
       toolId,
       actionId,
       params: params || {},
+      userId: req.user.powrId,
       projectId: req.projectId,
-      userId: req.user.access === 100 ? null : req.user.powrId,
-      isActive: isActive !== false,
-      // Default to true
-      createdAt: new Date(),
-      updatedAt: new Date()
+      isActive: isActive !== false // Default to true
     };
-    const db = await getDb();
-    await db.collection("tasks").insertOne(taskData);
-    console.log(`✅ Created scheduled task: ${taskData.name}`);
-    res.status(201).json({
-      success: true,
-      message: "Task created successfully"
-    });
+    const result = await scheduledTasksManager.createTask(taskData);
+    if (result.success) {
+      res.status(201).json({
+        success: true,
+        message: "Task created successfully",
+        task: result.task
+      });
+    } else {
+      res.status(400).json({
+        success: false,
+        message: result.message
+      });
+    }
   } catch (error) {
     console.error("❌ Error creating scheduled task:", error);
     res.status(500).json({
@@ -107,7 +136,7 @@ router.put("/:taskId", async (req, res) => {
     const {
       name,
       description,
-      cronExpression,
+      scheduledFor,
       toolId,
       actionId,
       params,
@@ -136,47 +165,139 @@ router.put("/:taskId", async (req, res) => {
         }
       }
     }
-    const updates = {};
-    if (name !== undefined) updates.name = name;
-    if (description !== undefined) updates.description = description;
-    if (cronExpression !== undefined) updates.cronExpression = cronExpression;
-    if (toolId !== undefined) updates.toolId = toolId;
-    if (actionId !== undefined) updates.actionId = actionId;
-    if (params !== undefined) updates.params = params;
-    if (isActive !== undefined) updates.isActive = isActive;
+    const updateData = {};
+    if (name !== undefined) updateData.name = name;
+    if (description !== undefined) updateData.description = description;
+    if (scheduledFor !== undefined) updateData.scheduledFor = scheduledFor;
+    if (toolId !== undefined) updateData.toolId = toolId;
+    if (actionId !== undefined) updateData.actionId = actionId;
+    if (params !== undefined) updateData.params = params;
+    if (isActive !== undefined) updateData.isActive = isActive;
+    const isAdmin = req.user.access === 100;
+    const result = await scheduledTasksManager.updateTask(req.params.taskId, req.user.powrId, req.projectId, updateData, isAdmin);
+    if (result.success) {
+      res.status(200).json({
+        success: true,
+        message: "Task updated successfully"
+      });
+    } else {
+      res.status(400).json({
+        success: false,
+        message: result.message
+      });
+    }
+  } catch (error) {
+    console.error("❌ Error updating scheduled task:", error);
+    res.status(500).json({
+      success: false,
+      message: "Failed to update scheduled task"
+    });
+  }
+});
 
-    // Build query based on user role
-    let query = {
-      id: req.params.taskId
-    };
-    const db = await getDb();
-    // Get existing task
-    const existingTask = await db.collection("tasks").findOne(query);
-    if (!existingTask) {
-      return res.status(404).json({
+// POST /tasks/:taskId/execute - Execute task manually
+router.post("/:taskId/execute", async (req, res) => {
+  try {
+    const taskId = req.params.taskId;
+    const isAdmin = req.user.access === 100;
+    const result = await scheduledTasksManager.executeTask(taskId, req.user.powrId, req.projectId, isAdmin);
+    if (result.success) {
+      res.json({
+        success: true,
+        message: "Task executed successfully",
+        result: result.result
+      });
+    } else {
+      res.status(400).json({
         success: false,
-        message: "Task not found"
+        message: result.message
       });
     }
+  } catch (error) {
+    console.error("❌ Error executing scheduled task:", error);
+    res.status(500).json({
+      success: false,
+      message: "Failed to execute scheduled task"
+    });
+  }
+});
 
-    // Update fields
-    const updatedTask = {
-      ...existingTask,
-      ...updates,
-      updatedAt: new Date()
-    };
-    await db.collection("tasks").updateOne(query, {
-      $set: updatedTask
+// POST /tasks/:taskId/toggle - Toggle task active status
+router.post("/:taskId/toggle", async (req, res) => {
+  try {
+    const taskId = req.params.taskId;
+    const {
+      isActive
+    } = req.body;
+    const isAdmin = req.user.access === 100;
+    const result = await scheduledTasksManager.toggleTask(taskId, req.user.powrId, req.projectId, isActive, isAdmin);
+    if (result.success) {
+      res.json({
+        success: true,
+        message: `Task ${isActive ? 'activated' : 'deactivated'} successfully`
+      });
+    } else {
+      res.status(400).json({
+        success: false,
+        message: result.message
+      });
+    }
+  } catch (error) {
+    console.error("❌ Error toggling scheduled task:", error);
+    res.status(500).json({
+      success: false,
+      message: "Failed to toggle scheduled task"
     });
-    res.status(200).json({
+  }
+});
+
+// DELETE /tasks/:taskId - Delete task
+router.delete("/:taskId", async (req, res) => {
+  try {
+    const taskId = req.params.taskId;
+    const isAdmin = req.user.access === 100;
+    const result = await scheduledTasksManager.deleteTask(taskId, req.user.powrId, req.projectId, isAdmin);
+    if (result.success) {
+      res.json({
+        success: true,
+        message: "Task deleted successfully"
+      });
+    } else {
+      res.status(400).json({
+        success: false,
+        message: result.message
+      });
+    }
+  } catch (error) {
+    console.error("❌ Error deleting scheduled task:", error);
+    res.status(500).json({
+      success: false,
+      message: "Failed to delete scheduled task"
+    });
+  }
+});
+
+// POST /tasks/execute-scheduled - Execute all scheduled tasks (called by Atlas)
+router.post("/execute-scheduled", async (req, res) => {
+  try {
+    const projectId = req.projectId;
+    console.log(`🔍 API: Executing scheduled tasks for project: ${projectId}`);
+
+    // Execute all scheduled tasks for this project
+    const result = await scheduledTasksManager.executeScheduledTasks(projectId);
+    console.log(`✅ API: Scheduled tasks execution completed for project: ${projectId}`);
+    res.json({
       success: true,
-      message: "Task updated successfully"
+      message: "Scheduled tasks executed successfully",
+      projectId: projectId,
+      result: result
     });
   } catch (error) {
-    console.error("❌ Error updating scheduled task:", error);
+    console.error("❌ API: Error executing scheduled tasks:", error);
     res.status(500).json({
       success: false,
-      message: "Failed to update scheduled task"
+      message: "Failed to execute scheduled tasks",
+      error: error.message
     });
   }
 });

package/dist/routes/tools.js

@@ -2,7 +2,9 @@
 
 const express = require("express");
 const router = express.Router();
-const toolsManager = require("../services/tools");
+const {
+  toolsManager
+} = require("../managers");
 const {
   getDb
 } = require("../services/mongo");
@@ -192,7 +194,7 @@ router.post('/:toolId/configure', async (req, res) => {
 // Execute tool action
 router.post('/:toolId/execute', async (req, res) => {
   try {
-    var _req$user2;
+    var _req$headers$authoriz;
     const {
       toolId
     } = req.params;
@@ -200,13 +202,24 @@ router.post('/:toolId/execute', async (req, res) => {
       actionId,
       params
     } = req.body;
-    const userId = (_req$user2 = req.user) === null || _req$user2 === void 0 ? void 0 : _req$user2.powrId; // From JWT token
 
-    if (!userId) {
-      return res.status(401).json({
-        success: false,
-        message: "User not authenticated"
-      });
+    // Check for service-to-service authentication
+    const apiKey = req.headers['x-api-key'] || ((_req$headers$authoriz = req.headers['authorization']) === null || _req$headers$authoriz === void 0 ? void 0 : _req$headers$authoriz.replace('Bearer ', ''));
+    const isServiceCall = apiKey === process.env.POWR_SERVICE_API_KEY;
+    let userId;
+    if (isServiceCall) {
+      // For service calls, use the userId from the task
+      userId = req.headers['x-user-id'] || 'system';
+    } else {
+      var _req$user2;
+      // For regular calls, use JWT token
+      userId = (_req$user2 = req.user) === null || _req$user2 === void 0 ? void 0 : _req$user2.powrId;
+      if (!userId) {
+        return res.status(401).json({
+          success: false,
+          message: "User not authenticated"
+        });
+      }
     }
     if (!actionId) {
       return res.status(400).json({

package/package.json

@@ -1,71 +1,69 @@
-{
-  "name": "powr-sdk-api",
-  "version": "4.2.0",
-  "description": "Shared API core library for PowrStack projects",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist",
-    "README.md"
-  ],
-  "scripts": {
-    "test": "jest --passWithNoTests",
-    "lint": "eslint .",
-    "build": "babel src -d dist",
-    "prepare": "npm run build",
-    "prepublishOnly": "npm run test"
-  },
-  "keywords": [
-    "api",
-    "express",
-    "middleware",
-    "error-handling",
-    "response-formatting",
-    "logging",
-    "swagger",
-    "documentation"
-  ],
-  "author": "Lawazia Tech",
-  "license": "ISC",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/powrstack/powr-sdk-api.git"
-  },
-  "bugs": {
-    "url": "https://github.com/powrstack/powr-sdk-api/issues"
-  },
-  "homepage": "https://github.com/powrstack/powr-sdk-api#readme",
-  "dependencies": {
-    "@aws-sdk/client-s3": "^3.787.0",
-    "@google-cloud/storage": "^7.16.0",
-    "axios": "^1.6.0",
-    "bcrypt": "^5.1.1",
-    "cron-parser": "^4.9.0",
-    "express": "^4.18.2",
-    "jsonwebtoken": "^9.0.2",
-    "mongodb": "^6.3.0",
-    "multer": "^1.4.5-lts.1",
-    "node-cron": "^3.0.3",
-    "nodemailer": "^6.10.0",
-    "swagger-jsdoc": "^6.2.8",
-    "swagger-ui-express": "^5.0.0",
-    "winston": "^3.17.0"
-  },
-  "devDependencies": {
-    "@babel/cli": "^7.23.9",
-    "@babel/core": "^7.24.0",
-    "@babel/preset-env": "^7.24.0",
-    "@types/express": "^4.17.21",
-    "@types/swagger-jsdoc": "^6.0.4",
-    "@types/swagger-ui-express": "^4.1.6",
-    "eslint": "^8.57.0",
-    "jest": "^29.7.0",
-    "typescript": "^5.3.3"
-  },
-  "peerDependencies": {
-    "express": "^4.18.2"
-  },
-  "engines": {
-    "node": ">=14.0.0"
-  }
-}
+{
+  "name": "powr-sdk-api",
+  "version": "4.3.1",
+  "description": "Shared API core library for PowrStack projects",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "scripts": {
+    "test": "jest --passWithNoTests",
+    "lint": "eslint .",
+    "build": "babel src -d dist",
+    "prepare": "npm run build",
+    "prepublishOnly": "npm run test"
+  },
+  "keywords": [
+    "api",
+    "express",
+    "middleware",
+    "error-handling",
+    "response-formatting",
+    "logging",
+    "swagger",
+    "documentation"
+  ],
+  "author": "Lawazia Tech",
+  "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/powrstack/powr-sdk-api.git"
+  },
+  "bugs": {
+    "url": "https://github.com/powrstack/powr-sdk-api/issues"
+  },
+  "homepage": "https://github.com/powrstack/powr-sdk-api#readme",
+  "dependencies": {
+    "@aws-sdk/client-s3": "^3.787.0",
+    "@google-cloud/storage": "^7.16.0",
+    "axios": "^1.6.0",
+    "bcrypt": "^5.1.1",
+    "cron-parser": "^4.9.0",
+    "express": "^4.18.2",
+    "jsonwebtoken": "^9.0.2",
+    "mongodb": "^6.3.0",
+    "multer": "^1.4.5-lts.1",
+    "nodemailer": "^6.10.0",
+    "swagger-jsdoc": "^6.2.8",
+    "winston": "^3.17.0"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.23.9",
+    "@babel/core": "^7.24.0",
+    "@babel/preset-env": "^7.24.0",
+    "@types/express": "^4.17.21",
+    "@types/swagger-jsdoc": "^6.0.4",
+    "@types/swagger-ui-express": "^4.1.6",
+    "eslint": "^8.57.0",
+    "jest": "^29.7.0",
+    "typescript": "^5.3.3"
+  },
+  "peerDependencies": {
+    "express": "^4.18.2"
+  },
+  "engines": {
+    "node": ">=14.0.0"
+  }
+}

package/dist/admin/activities.js

@@ -1,81 +0,0 @@
-"use strict";
-
-const express = require("express");
-const router = express.Router();
-const {
-  getDb
-} = require("../services/mongo");
-
-// Get activities
-router.get("/", async (req, res) => {
-  const {
-    projectId,
-    contentId
-  } = req.query;
-  try {
-    const query = {
-      projectId
-    };
-    if (contentId) {
-      query.contentId = contentId;
-    }
-    console.log("Filter.....:", query);
-    const activities = await getDb().collection("activities").find(query).toArray();
-    if (!activities || activities.length === 0) {
-      console.log("Data not found.");
-      return res.status(200).json({
-        success: true,
-        activities: []
-      });
-    }
-    return res.status(200).json({
-      success: true,
-      activities: activities
-    });
-  } catch (error) {
-    console.error("Error retrieving activities:", error);
-    return res.status(500).json({
-      success: false,
-      message: "Failed to retrieve activities."
-    });
-  }
-});
-
-// Add activity
-router.post("/", async (req, res) => {
-  const {
-    projectId,
-    contentId,
-    activity
-  } = req.body;
-  const activityData = {
-    projectId,
-    contentId,
-    activity,
-    createdAt: new Date()
-  };
-  try {
-    const result = await getDb().collection("activities").insertOne(activityData);
-    if (result && result.insertedId) {
-      console.log("Activity added with ID:", result.insertedId);
-      return res.status(200).json({
-        success: true,
-        message: "Activity added successfully.",
-        activityId: result.insertedId
-      });
-    } else {
-      console.error("Insert operation failed. Result:", result);
-      return res.status(500).json({
-        success: false,
-        message: "Activity could not be added."
-      });
-    }
-  } catch (error) {
-    console.error("Error adding activity:", error);
-    return res.status(500).json({
-      success: false,
-      message: "Failed to add activity due to a server error."
-    });
-  }
-});
-module.exports = router;