@amohamud23/notihub 1.1.51 → 1.1.52

package/dist/index.cjs

@@ -545,43 +545,70 @@ var Notifications = class _Notifications {
       throw new Error("Could not create notification");
     }
   }
-  // Additional methods can be added here as needed
   /**
    * Fetches and merges paginated notifications for multiple notiTypeIds, sorted by createdAt descending.
    * @param notiTypeIds - Array of notiTypeIds to fetch.
-   * @param limitPerType - Max items to fetch per notiTypeId.
-   * @param exclusiveStartKeys - Optional map of pagination keys per notiTypeId.
-   * @returns An object with merged, sorted notifications and nextPageKeys map.
-   */
-  static async getUnifiedFeedByNotiTypeIds(notiTypeIds, limitPerType = 20, exclusiveStartKeys) {
+   * @param options - Pagination options
+   * @returns An object with paginated notifications, cursor for next page, and hasMore flag.
+   */
+  static async getUnifiedFeedByNotiTypeIds(notiTypeIds, options = {}) {
+    const limit = options.limit || 20;
+    const limitPerType = options.limitPerType || limit;
+    let exclusiveStartKeys = {};
+    if (options.cursor) {
+      try {
+        exclusiveStartKeys = JSON.parse(
+          Buffer.from(options.cursor, "base64").toString("utf-8")
+        );
+      } catch (error) {
+        console.error("Invalid cursor:", error);
+        throw new Error("Invalid pagination cursor");
+      }
+    }
     const results = await Promise.all(
       notiTypeIds.map(async (ntid) => {
         const params = {
           TableName: this.TABLE_NAME,
           IndexName: "NotiTypeIdCreatedAtIndex",
-          // Assuming you have a GSI for notiTypeId
           KeyConditionExpression: "notiTypeId = :ntid",
           ExpressionAttributeValues: { ":ntid": ntid },
           ScanIndexForward: false,
           Limit: limitPerType,
-          ExclusiveStartKey: exclusiveStartKeys?.[ntid]
-        };
-        const result = await ddbDocClient.send(new import_lib_dynamodb4.QueryCommand(params));
-        return {
-          notiTypeId: ntid,
-          notifications: result.Items || [],
-          nextPageKey: result.LastEvaluatedKey
+          ExclusiveStartKey: exclusiveStartKeys[ntid]
         };
+        try {
+          const result = await ddbDocClient.send(new import_lib_dynamodb4.QueryCommand(params));
+          return {
+            notiTypeId: ntid,
+            notifications: result.Items || [],
+            nextPageKey: result.LastEvaluatedKey
+          };
+        } catch (error) {
+          console.error(
+            `Error fetching notifications for notiTypeId: ${ntid}`,
+            error
+          );
+          return {
+            notiTypeId: ntid,
+            notifications: [],
+            nextPageKey: void 0
+          };
+        }
       })
     );
-    const mergedNotifications = results.flatMap((r) => r.notifications).sort((a, b) => b.createdAt.localeCompare(a.createdAt));
+    const mergedNotifications = results.flatMap((r) => r.notifications).sort((a, b) => b.createdAt.localeCompare(a.createdAt)).slice(0, limit);
     const nextPageKeys = results.reduce((acc, curr) => {
-      acc[curr.notiTypeId] = curr.nextPageKey;
+      if (curr.nextPageKey) {
+        acc[curr.notiTypeId] = curr.nextPageKey;
+      }
       return acc;
     }, {});
+    const hasMore = Object.keys(nextPageKeys).length > 0;
+    const cursor = hasMore ? Buffer.from(JSON.stringify(nextPageKeys)).toString("base64") : void 0;
     return {
       notifications: mergedNotifications,
-      nextPageKeys
+      cursor,
+      hasMore
     };
   }
 };

package/dist/index.d.cts

@@ -373,13 +373,17 @@ declare class Notifications {
     /**
      * Fetches and merges paginated notifications for multiple notiTypeIds, sorted by createdAt descending.
      * @param notiTypeIds - Array of notiTypeIds to fetch.
-     * @param limitPerType - Max items to fetch per notiTypeId.
-     * @param exclusiveStartKeys - Optional map of pagination keys per notiTypeId.
-     * @returns An object with merged, sorted notifications and nextPageKeys map.
-     */
-    static getUnifiedFeedByNotiTypeIds(notiTypeIds: string[], limitPerType?: number, exclusiveStartKeys?: Record<string, Record<string, any>>): Promise<{
+     * @param options - Pagination options
+     * @returns An object with paginated notifications, cursor for next page, and hasMore flag.
+     */
+    static getUnifiedFeedByNotiTypeIds(notiTypeIds: string[], options?: {
+        limit?: number;
+        limitPerType?: number;
+        cursor?: string;
+    }): Promise<{
         notifications: INotiHubNotification[];
-        nextPageKeys: Record<string, Record<string, any> | undefined>;
+        cursor?: string;
+        hasMore: boolean;
     }>;
 }
 

package/dist/index.d.ts

@@ -373,13 +373,17 @@ declare class Notifications {
     /**
      * Fetches and merges paginated notifications for multiple notiTypeIds, sorted by createdAt descending.
      * @param notiTypeIds - Array of notiTypeIds to fetch.
-     * @param limitPerType - Max items to fetch per notiTypeId.
-     * @param exclusiveStartKeys - Optional map of pagination keys per notiTypeId.
-     * @returns An object with merged, sorted notifications and nextPageKeys map.
-     */
-    static getUnifiedFeedByNotiTypeIds(notiTypeIds: string[], limitPerType?: number, exclusiveStartKeys?: Record<string, Record<string, any>>): Promise<{
+     * @param options - Pagination options
+     * @returns An object with paginated notifications, cursor for next page, and hasMore flag.
+     */
+    static getUnifiedFeedByNotiTypeIds(notiTypeIds: string[], options?: {
+        limit?: number;
+        limitPerType?: number;
+        cursor?: string;
+    }): Promise<{
         notifications: INotiHubNotification[];
-        nextPageKeys: Record<string, Record<string, any> | undefined>;
+        cursor?: string;
+        hasMore: boolean;
     }>;
 }
 

package/dist/index.js

@@ -522,43 +522,70 @@ var Notifications = class _Notifications {
       throw new Error("Could not create notification");
     }
   }
-  // Additional methods can be added here as needed
   /**
    * Fetches and merges paginated notifications for multiple notiTypeIds, sorted by createdAt descending.
    * @param notiTypeIds - Array of notiTypeIds to fetch.
-   * @param limitPerType - Max items to fetch per notiTypeId.
-   * @param exclusiveStartKeys - Optional map of pagination keys per notiTypeId.
-   * @returns An object with merged, sorted notifications and nextPageKeys map.
-   */
-  static async getUnifiedFeedByNotiTypeIds(notiTypeIds, limitPerType = 20, exclusiveStartKeys) {
+   * @param options - Pagination options
+   * @returns An object with paginated notifications, cursor for next page, and hasMore flag.
+   */
+  static async getUnifiedFeedByNotiTypeIds(notiTypeIds, options = {}) {
+    const limit = options.limit || 20;
+    const limitPerType = options.limitPerType || limit;
+    let exclusiveStartKeys = {};
+    if (options.cursor) {
+      try {
+        exclusiveStartKeys = JSON.parse(
+          Buffer.from(options.cursor, "base64").toString("utf-8")
+        );
+      } catch (error) {
+        console.error("Invalid cursor:", error);
+        throw new Error("Invalid pagination cursor");
+      }
+    }
     const results = await Promise.all(
       notiTypeIds.map(async (ntid) => {
         const params = {
           TableName: this.TABLE_NAME,
           IndexName: "NotiTypeIdCreatedAtIndex",
-          // Assuming you have a GSI for notiTypeId
           KeyConditionExpression: "notiTypeId = :ntid",
           ExpressionAttributeValues: { ":ntid": ntid },
           ScanIndexForward: false,
           Limit: limitPerType,
-          ExclusiveStartKey: exclusiveStartKeys?.[ntid]
-        };
-        const result = await ddbDocClient.send(new QueryCommand3(params));
-        return {
-          notiTypeId: ntid,
-          notifications: result.Items || [],
-          nextPageKey: result.LastEvaluatedKey
+          ExclusiveStartKey: exclusiveStartKeys[ntid]
         };
+        try {
+          const result = await ddbDocClient.send(new QueryCommand3(params));
+          return {
+            notiTypeId: ntid,
+            notifications: result.Items || [],
+            nextPageKey: result.LastEvaluatedKey
+          };
+        } catch (error) {
+          console.error(
+            `Error fetching notifications for notiTypeId: ${ntid}`,
+            error
+          );
+          return {
+            notiTypeId: ntid,
+            notifications: [],
+            nextPageKey: void 0
+          };
+        }
       })
     );
-    const mergedNotifications = results.flatMap((r) => r.notifications).sort((a, b) => b.createdAt.localeCompare(a.createdAt));
+    const mergedNotifications = results.flatMap((r) => r.notifications).sort((a, b) => b.createdAt.localeCompare(a.createdAt)).slice(0, limit);
     const nextPageKeys = results.reduce((acc, curr) => {
-      acc[curr.notiTypeId] = curr.nextPageKey;
+      if (curr.nextPageKey) {
+        acc[curr.notiTypeId] = curr.nextPageKey;
+      }
       return acc;
     }, {});
+    const hasMore = Object.keys(nextPageKeys).length > 0;
+    const cursor = hasMore ? Buffer.from(JSON.stringify(nextPageKeys)).toString("base64") : void 0;
     return {
       notifications: mergedNotifications,
-      nextPageKeys
+      cursor,
+      hasMore
     };
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amohamud23/notihub",
-  "version": "1.1.51",
+  "version": "1.1.52",
   "description": "Notihub Package",
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.cts",