powr-sdk-api 4.7.3 → 4.8.1

package/dist/index.js

@@ -22,8 +22,7 @@ const {
   initializeTools,
   executeTasks,
   executeTool,
-  createTask,
-  createActivityFeedItem
+  createTask
 } = require("./managers");
 const {
   verifyToken
@@ -45,6 +44,5 @@ module.exports = {
   executeTasks,
   executeTool,
   createTask,
-  createActivityFeedItem,
   getPowrDb
 };

package/dist/managers/activities.js

@@ -8,55 +8,50 @@ const {
 } = require("mongodb");
 
 /**
- * Create a feed activity entry in the activities collection.
- * Used by host apps (e.g. Spriny) in-process and by POST /activities (feed shape).
+ * Emit an activity to PowrBase. Inserts one document into the activities collection.
+ * Does not send notification; an Atlas trigger on the collection handles that.
  *
- * @param {Object} params - action, userId, projectId?, targetType?, targetId?, metadata?, projectName?, projectSlug?
- * @returns {Promise<{ success: boolean, id?: string, message?: string }>}
+ * @param {Object} options
+ * @param {string} options.projectId - Project context (required)
+ * @param {string} options.action - e.g. "task_created", "task_assigned", "enquiry_converted"
+ * @param {string|ObjectId} options.userId - Who performed the action
+ * @param {string} [options.targetType] - e.g. "task", "project", "enquiry"
+ * @param {string|ObjectId} [options.targetId] - ID of the target entity
+ * @param {Object} [options.metadata] - Extra payload (e.g. recipientIds, title, body, url for notification)
+ * @returns {Promise<{ insertedId: ObjectId }>} The inserted document's _id
  */
-async function createActivityFeedItem(params) {
-  try {
-    const {
-      action,
-      userId,
-      projectId,
-      targetType,
-      targetId,
-      metadata = {},
-      projectName,
-      projectSlug
-    } = params;
-    if (!action || !userId) {
-      return {
-        success: false,
-        message: "action and userId are required"
-      };
-    }
-    const doc = {
-      action,
-      userId: new ObjectId(userId.toString()),
-      projectId: projectId ? new ObjectId(projectId.toString()) : null,
-      targetType: targetType || null,
-      targetId: targetId ? new ObjectId(targetId.toString()) : null,
-      metadata: metadata || {},
-      projectName: projectName || null,
-      projectSlug: projectSlug || null,
-      createdAt: new Date()
-    };
-    const db = await getDb();
-    const result = await db.collection("activities").insertOne(doc);
-    return {
-      success: true,
-      id: result.insertedId.toString()
-    };
-  } catch (error) {
-    console.error("createActivityFeedItem error:", error);
-    return {
-      success: false,
-      message: error.message
-    };
+async function emitActivity(options) {
+  const {
+    projectId,
+    action,
+    userId,
+    targetType,
+    targetId,
+    metadata = {}
+  } = options;
+  if (!projectId || !action) {
+    throw new Error("emitActivity: projectId and action are required");
   }
+  const normalizeId = id => {
+    if (id == null) return null;
+    if (typeof id === "string" && ObjectId.isValid(id)) return new ObjectId(id);
+    return id;
+  };
+  const doc = {
+    projectId,
+    action,
+    userId: normalizeId(userId),
+    targetType: targetType || null,
+    targetId: normalizeId(targetId),
+    metadata,
+    createdAt: new Date()
+  };
+  const db = await getDb();
+  const result = await db.collection("activities").insertOne(doc);
+  return {
+    insertedId: result.insertedId
+  };
 }
 module.exports = {
-  createActivityFeedItem
+  emitActivity
 };

package/dist/managers/index.js

@@ -3,9 +3,6 @@
 const functionsManager = require('./functions');
 const toolsManager = require('./tools');
 const scheduledTasksManager = require('./tasks');
-const {
-  createActivityFeedItem
-} = require('./activities');
 
 // Async Functions initialization function
 const initializeFunctions = async (options = {}) => {
@@ -36,6 +33,5 @@ module.exports = {
   initializeTools,
   executeTasks,
   executeTool,
-  createTask,
-  createActivityFeedItem
+  createTask
 };

package/dist/routes/activities.js

@@ -5,119 +5,21 @@ const router = express.Router();
 const {
   getDb
 } = require("../services/mongo");
-const {
-  ObjectId
-} = require("mongodb");
-const {
-  createActivityFeedItem
-} = require("../managers/activities");
 
-/**
- * GET /activities
- * - Content-scoped (existing): ?contentId= → returns docs with projectId + contentId (shape: activity, createdAt).
- * - Feed: ?projectId=...&from=&to=&action=&limit= → returns feed docs (action, userId, metadata, etc.) from same collection.
- * Feed docs have "action" field; content-scoped docs have "contentId" and "activity".
- */
+// Get all activities
 router.get("/", async (req, res) => {
   try {
     const {
-      contentId,
-      from,
-      to,
-      action,
-      limit
+      contentId
     } = req.query;
-    const projectId = req.projectId;
-    const isFeedRequest = from !== undefined || to !== undefined || req.query.projectId && contentId === undefined;
-    if (isFeedRequest) {
-      const projectIds = [].concat(req.query.projectId || []).filter(Boolean);
-      if (projectIds.length === 0) {
-        return res.json({
-          success: true,
-          activities: []
-        });
-      }
-      const query = {
-        projectId: {
-          $in: projectIds.map(id => new ObjectId(id))
-        },
-        action: {
-          $exists: true
-        }
-      };
-      if (from || to) {
-        query.createdAt = {};
-        if (from) query.createdAt.$gte = new Date(from);
-        if (to) query.createdAt.$lte = new Date(to);
-      }
-      if (action) query.action = action;
-      const db = await getDb();
-      const activities = await db.collection("activities").find(query).sort({
-        createdAt: -1
-      }).limit(Math.min(parseInt(limit, 10) || 50, 100)).toArray();
-      const actorIds = [...new Set(activities.map(a => {
-        var _a$userId;
-        return (_a$userId = a.userId) === null || _a$userId === void 0 ? void 0 : _a$userId.toString();
-      }).filter(Boolean))];
-      let actorDetails = {};
-      if (actorIds.length > 0) {
-        const actors = await db.collection("users").find({
-          _id: {
-            $in: actorIds.map(id => new ObjectId(id))
-          }
-        }).project({
-          _id: 1,
-          fullName: 1
-        }).toArray();
-        actorDetails = actors.reduce((acc, u) => {
-          acc[u._id.toString()] = u.fullName || "Unknown";
-          return acc;
-        }, {});
-      }
-      const assigneeIds = activities.filter(a => {
-        var _a$metadata;
-        return (_a$metadata = a.metadata) === null || _a$metadata === void 0 ? void 0 : _a$metadata.assigneeId;
-      }).map(a => a.metadata.assigneeId);
-      let assigneeDetails = {};
-      if (assigneeIds.length > 0) {
-        const assignees = await db.collection("users").find({
-          _id: {
-            $in: assigneeIds.map(id => new ObjectId(id))
-          }
-        }).project({
-          _id: 1,
-          fullName: 1
-        }).toArray();
-        assigneeDetails = assignees.reduce((acc, u) => {
-          acc[u._id.toString()] = u.fullName || "Unknown";
-          return acc;
-        }, {});
-      }
-      const enriched = activities.map(a => {
-        var _a$userId2, _a$projectId, _a$userId3, _a$metadata2;
-        return {
-          ...a,
-          _id: a._id.toString(),
-          userId: (_a$userId2 = a.userId) === null || _a$userId2 === void 0 ? void 0 : _a$userId2.toString(),
-          projectId: (_a$projectId = a.projectId) === null || _a$projectId === void 0 ? void 0 : _a$projectId.toString(),
-          actorName: actorDetails[(_a$userId3 = a.userId) === null || _a$userId3 === void 0 ? void 0 : _a$userId3.toString()] || "Unknown",
-          assigneeName: (_a$metadata2 = a.metadata) !== null && _a$metadata2 !== void 0 && _a$metadata2.assigneeId ? assigneeDetails[a.metadata.assigneeId] || "Unknown" : null,
-          projectName: a.projectName || null,
-          projectSlug: a.projectSlug || null
-        };
-      });
-      return res.json({
-        success: true,
-        activities: enriched
-      });
-    }
+    const projectId = req.projectId; // Use middleware-injected projectId
+
     const query = {
-      activity: {
-        $exists: true
-      }
+      projectId
     };
-    if (projectId) query.projectId = new ObjectId(projectId);
-    if (contentId) query.contentId = contentId;
+    if (contentId) {
+      query.contentId = contentId;
+    }
     const db = await getDb();
     const activities = await db.collection("activities").find(query).toArray();
     return res.json({
@@ -133,36 +35,15 @@ router.get("/", async (req, res) => {
   }
 });
 
-/**
- * POST /activities
- * - Feed: body has action, userId → insert feed doc into activities collection.
- * - Content-scoped (existing): body has contentId, activity → insert content-scoped doc.
- */
+// Create new activity
 router.post("/", async (req, res) => {
   try {
-    const body = req.body;
-    const projectId = req.projectId;
-    if (body.action && body.userId) {
-      const payload = {
-        ...body,
-        projectId: body.projectId || projectId
-      };
-      const result = await createActivityFeedItem(payload);
-      if (!result.success) {
-        return res.status(400).json({
-          success: false,
-          message: result.message
-        });
-      }
-      return res.status(201).json({
-        success: true,
-        id: result.id
-      });
-    }
     const {
       contentId,
       activity
-    } = body;
+    } = req.body;
+    const projectId = req.projectId; // Use middleware-injected projectId
+
     if (!contentId || !activity) {
       return res.status(400).json({
         success: false,
@@ -170,7 +51,7 @@ router.post("/", async (req, res) => {
       });
     }
     const activityData = {
-      projectId: projectId ? new ObjectId(projectId) : undefined,
+      projectId,
       contentId,
       activity,
       createdAt: new Date()

package/dist/routes/auth.js

@@ -17,6 +17,9 @@ const {
 const {
   config
 } = require("../config");
+const {
+  getClientIp
+} = require("../utils/getClientIp");
 
 // Register User
 router.post("/register", async (req, res) => {
@@ -77,11 +80,13 @@ router.post("/register", async (req, res) => {
     };
     const result = await db.collection("users").insertOne(newUser);
     if (projectId) {
+      const now = new Date();
       const newProfile = {
         userId: result.insertedId,
         projectId: projectId,
-        createdAt: new Date(),
-        updatedAt: new Date()
+        createdAt: now,
+        lastActiveAt: now,
+        lastActiveFrom: getClientIp(req)
       };
       await db.collection("profiles").insertOne(newProfile);
     }
@@ -156,21 +161,23 @@ router.post("/login", async (req, res) => {
         projectId: projectId
       });
       if (profile) {
-        // Update lastActiveAt
+        const now = new Date();
         await db.collection("profiles").updateOne({
           _id: profile._id
         }, {
           $set: {
-            lastActiveAt: new Date()
+            lastActiveAt: now,
+            lastActiveFrom: getClientIp(req)
           }
         });
       } else {
-        // Create profile if it doesn't exist - only essential fields
+        const now = new Date();
         const newProfile = {
           userId: user._id,
           projectId: projectId,
-          createdAt: new Date(),
-          updatedAt: new Date()
+          createdAt: now,
+          lastActiveAt: now,
+          lastActiveFrom: getClientIp(req)
         };
         const profileResult = await db.collection("profiles").insertOne(newProfile);
         profile = {
@@ -204,6 +211,8 @@ router.post("/login", async (req, res) => {
         projectId,
         createdAt,
         updatedAt,
+        lastActiveAt,
+        lastActiveFrom,
         ...profileData
       } = profile;
       mergedUser = {

package/dist/routes/users.js

@@ -11,6 +11,9 @@ const {
 const {
   verifyToken
 } = require("../middleware/jwtToken");
+const {
+  getClientIp
+} = require("../utils/getClientIp");
 
 // Create User
 router.post("/", verifyToken, async (req, res) => {
@@ -52,7 +55,8 @@ router.post("/", verifyToken, async (req, res) => {
       projectId: projectId,
       access: userData.access || 1,
       createdAt: new Date(),
-      updatedAt: new Date()
+      lastActiveAt: new Date(),
+      lastActiveFrom: getClientIp(req)
     };
     await db.collection("profiles").insertOne(newProfile);
     return res.status(201).json({

package/dist/utils/getClientIp.js

@@ -0,0 +1,40 @@
+"use strict";
+
+/**
+ * Best-effort client IP from the incoming HTTP request
+ * (uses X-Forwarded-For, X-Real-IP, req.ip, or socket address).
+ */
+function getClientIp(req) {
+  const forwarded = req.headers["x-forwarded-for"];
+  const realIp = req.headers["x-real-ip"];
+  if (typeof forwarded === "string" && forwarded.length > 0) {
+    const first = forwarded.split(",")[0].trim();
+    if (first) {
+      console.log("[getClientIp] using x-forwarded-for:", first);
+      return first;
+    }
+  }
+  if (typeof realIp === "string" && realIp.trim()) {
+    const v = realIp.trim();
+    console.log("[getClientIp] using x-real-ip:", v);
+    return v;
+  }
+  if (req.ip) {
+    console.log("[getClientIp] using req.ip:", req.ip);
+    return req.ip;
+  }
+  if (req.socket && req.socket.remoteAddress) {
+    console.log("[getClientIp] using socket.remoteAddress:", req.socket.remoteAddress);
+    return req.socket.remoteAddress;
+  }
+  console.log("[getClientIp] no IP found", {
+    "x-forwarded-for": forwarded,
+    "x-real-ip": realIp,
+    reqIp: req.ip,
+    remoteAddress: req.socket && req.socket.remoteAddress
+  });
+  return null;
+}
+module.exports = {
+  getClientIp
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "powr-sdk-api",
-  "version": "4.7.3",
+  "version": "4.8.1",
   "description": "Shared API core library for PowrStack projects. Zero dependencies - works with Express, Next.js API routes, and other frameworks. All features are optional and install only what you need.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",