@mastra/upstash 1.0.0-beta.11 → 1.0.0-beta.13

package/dist/index.js

@@ -1,4 +1,4 @@
-import { MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, ensureDate, createStorageErrorId, normalizePerPage, calculatePagination, filterByDateRange, ScoresStorage, TABLE_SCORERS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, MastraStorage, createVectorErrorId, serializeDate, transformScoreRow as transformScoreRow$1 } from '@mastra/core/storage';
+import { MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, ensureDate, createStorageErrorId, normalizePerPage, calculatePagination, filterByDateRange, ScoresStorage, TABLE_SCORERS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, MastraCompositeStore, createVectorErrorId, serializeDate, transformScoreRow as transformScoreRow$1 } from '@mastra/core/storage';
 import { Redis } from '@upstash/redis';
 import { MessageList } from '@mastra/core/agent';
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
@@ -190,19 +190,34 @@ var StoreMemoryUpstash = class extends MemoryStorage {
       );
     }
   }
-  async listThreadsByResourceId(args) {
-    const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
+  async listThreads(args) {
+    const { page = 0, perPage: perPageInput, orderBy, filter } = args;
     const { field, direction } = this.parseOrderBy(orderBy);
+    try {
+      this.validatePaginationInput(page, perPageInput ?? 100);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("UPSTASH", "LIST_THREADS", "INVALID_PAGE"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { page, ...perPageInput !== void 0 && { perPage: perPageInput } }
+        },
+        error instanceof Error ? error : new Error("Invalid pagination parameters")
+      );
+    }
     const perPage = normalizePerPage(perPageInput, 100);
-    if (page < 0) {
+    try {
+      this.validateMetadataKeys(filter?.metadata);
+    } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("UPSTASH", "LIST_THREADS_BY_RESOURCE_ID", "INVALID_PAGE"),
+          id: createStorageErrorId("UPSTASH", "LIST_THREADS", "INVALID_METADATA_KEY"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
-          details: { page }
+          details: { metadataKeys: filter?.metadata ? Object.keys(filter.metadata).join(", ") : "" }
         },
-        new Error("page must be >= 0")
+        error instanceof Error ? error : new Error("Invalid metadata key")
       );
     }
     const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
@@ -210,19 +225,35 @@ var StoreMemoryUpstash = class extends MemoryStorage {
       let allThreads = [];
       const pattern = `${TABLE_THREADS}:*`;
       const keys = await this.#db.scanKeys(pattern);
+      if (keys.length === 0) {
+        return {
+          threads: [],
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
       const pipeline = this.client.pipeline();
       keys.forEach((key) => pipeline.get(key));
       const results = await pipeline.exec();
       for (let i = 0; i < results.length; i++) {
         const thread = results[i];
-        if (thread && thread.resourceId === resourceId) {
-          allThreads.push({
-            ...thread,
-            createdAt: ensureDate(thread.createdAt),
-            updatedAt: ensureDate(thread.updatedAt),
-            metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata
-          });
+        if (!thread) continue;
+        if (filter?.resourceId && thread.resourceId !== filter.resourceId) {
+          continue;
         }
+        if (filter?.metadata && Object.keys(filter.metadata).length > 0) {
+          const threadMetadata = typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata;
+          const matches = Object.entries(filter.metadata).every(([key, value]) => threadMetadata?.[key] === value);
+          if (!matches) continue;
+        }
+        allThreads.push({
+          ...thread,
+          createdAt: ensureDate(thread.createdAt),
+          updatedAt: ensureDate(thread.updatedAt),
+          metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata
+        });
       }
       const sortedThreads = this.sortThreads(allThreads, field, direction);
       const total = sortedThreads.length;
@@ -239,11 +270,12 @@ var StoreMemoryUpstash = class extends MemoryStorage {
     } catch (error) {
       const mastraError = new MastraError(
         {
-          id: createStorageErrorId("UPSTASH", "LIST_THREADS_BY_RESOURCE_ID", "FAILED"),
+          id: createStorageErrorId("UPSTASH", "LIST_THREADS", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
-            resourceId,
+            ...filter?.resourceId && { resourceId: filter.resourceId },
+            hasMetadataFilter: !!filter?.metadata,
             page,
             perPage
           }
@@ -1703,7 +1735,7 @@ var WorkflowsUpstash = class extends WorkflowsStorage {
 var isClientConfig = (config) => {
   return "client" in config;
 };
-var UpstashStore = class extends MastraStorage {
+var UpstashStore = class extends MastraCompositeStore {
   redis;
   stores;
   constructor(config) {