@mastra/cloudflare 1.0.0-beta.9 → 1.0.0

package/dist/index.js

@@ -1,5 +1,5 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { MemoryStorage, TABLE_MESSAGES, TABLE_THREADS, TABLE_RESOURCES, ensureDate, createStorageErrorId, normalizePerPage, calculatePagination, serializeDate, ScoresStorage, TABLE_SCORERS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, MastraStorage, TABLE_TRACES, transformScoreRow as transformScoreRow$1 } from '@mastra/core/storage';
+import { MemoryStorage, TABLE_MESSAGES, TABLE_THREADS, TABLE_RESOURCES, ensureDate, createStorageErrorId, normalizePerPage, calculatePagination, serializeDate, filterByDateRange, ScoresStorage, TABLE_SCORERS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, MastraCompositeStore, TABLE_TRACES, transformScoreRow as transformScoreRow$1 } from '@mastra/core/storage';
 import Cloudflare from 'cloudflare';
 import { MessageList } from '@mastra/core/agent';
 import { MastraBase } from '@mastra/core/base';
@@ -614,21 +614,23 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
       return null;
     }
   }
-  async listThreadsByResourceId(args) {
+  async listThreads(args) {
+    const { page = 0, perPage: perPageInput, orderBy, filter } = args;
+    try {
+      this.validatePaginationInput(page, perPageInput ?? 100);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("CLOUDFLARE", "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);
     try {
-      const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
-      const perPage = normalizePerPage(perPageInput, 100);
-      if (page < 0) {
-        throw new MastraError(
-          {
-            id: createStorageErrorId("CLOUDFLARE", "LIST_THREADS_BY_RESOURCE_ID", "INVALID_PAGE"),
-            domain: ErrorDomain.STORAGE,
-            category: ErrorCategory.USER,
-            details: { page }
-          },
-          new Error("page must be >= 0")
-        );
-      }
       const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
       const { field, direction } = this.parseOrderBy(orderBy);
       const prefix = this.#db.namespacePrefix ? `${this.#db.namespacePrefix}:` : "";
@@ -637,7 +639,15 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
       for (const { name: key } of keyObjs) {
         const data = await this.#db.getKV(TABLE_THREADS, key);
         if (!data) continue;
-        if (data.resourceId !== resourceId) continue;
+        if (filter?.resourceId && data.resourceId !== filter.resourceId) {
+          continue;
+        }
+        if (filter?.metadata && Object.keys(filter.metadata).length > 0) {
+          const metadata = this.ensureMetadata(data.metadata);
+          if (!metadata) continue;
+          const matches = Object.entries(filter.metadata).every(([key2, value]) => metadata[key2] === value);
+          if (!matches) continue;
+        }
         threads.push(data);
       }
       threads.sort((a, b) => {
@@ -657,10 +667,10 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("CLOUDFLARE", "LIST_THREADS_BY_RESOURCE_ID", "FAILED"),
+          id: createStorageErrorId("CLOUDFLARE", "LIST_THREADS", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          text: "Failed to get threads by resource ID with pagination"
+          text: "Failed to list threads with filters"
         },
         error
       );
@@ -1194,15 +1204,11 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
       if (resourceId) {
         filteredThreadMessages = filteredThreadMessages.filter((msg) => msg.resourceId === resourceId);
       }
-      const dateRange = filter?.dateRange;
-      if (dateRange) {
-        filteredThreadMessages = filteredThreadMessages.filter((msg) => {
-          const messageDate = new Date(msg.createdAt);
-          if (dateRange.start && messageDate < new Date(dateRange.start)) return false;
-          if (dateRange.end && messageDate > new Date(dateRange.end)) return false;
-          return true;
-        });
-      }
+      filteredThreadMessages = filterByDateRange(
+        filteredThreadMessages,
+        (msg) => new Date(msg.createdAt),
+        filter?.dateRange
+      );
       const total = filteredThreadMessages.length;
       if (perPage === 0 && (!include || include.length === 0)) {
         return {
@@ -1983,7 +1989,7 @@ var WorkflowsStorageCloudflare = class extends WorkflowsStorage {
       try {
         parsedSnapshot = JSON.parse(row.snapshot);
       } catch (e) {
-        console.warn(`Failed to parse snapshot for workflow ${row.workflow_name}: ${e}`);
+        this.logger.warn(`Failed to parse snapshot for workflow ${row.workflow_name}: ${e}`);
       }
     }
     return {
@@ -2157,7 +2163,7 @@ function isWorkersConfig(config) {
 }
 
 // src/storage/index.ts
-var CloudflareStore = class extends MastraStorage {
+var CloudflareStore = class extends MastraCompositeStore {
   stores;
   client;
   accountId;