@mastra/upstash 1.2.1-alpha.0 → 1.2.1

package/dist/index.js

@@ -1764,6 +1764,36 @@ var WorkflowsUpstash = class extends WorkflowsStorage {
   async dangerouslyClearAll() {
     await this.#db.deleteData({ tableName: TABLE_WORKFLOW_SNAPSHOT });
   }
+  async getWorkflowRunRecord({
+    namespace,
+    runId,
+    resourceId,
+    workflowName
+  }) {
+    if (workflowName) {
+      const keyVariants = [
+        ...resourceId ? [{ namespace, workflow_name: workflowName, run_id: runId, resourceId }] : [],
+        { namespace, workflow_name: workflowName, run_id: runId }
+      ];
+      for (const keys2 of keyVariants) {
+        const data = await this.#db.get({
+          tableName: TABLE_WORKFLOW_SNAPSHOT,
+          keys: keys2
+        });
+        if (data) return data;
+      }
+    }
+    const key = `${getKey(TABLE_WORKFLOW_SNAPSHOT, { namespace })}:*run_id:${runId}*`;
+    const keys = await this.#db.scanKeys(key);
+    const workflows = await Promise.all(
+      keys.map(async (key2) => {
+        return this.client.get(key2);
+      })
+    );
+    return workflows.find(
+      (w) => w?.run_id === runId && (!workflowName || w.workflow_name === workflowName) && (!resourceId || w.resourceId === resourceId)
+    ) ?? null;
+  }
   async updateWorkflowResults({
     workflowName,
     runId,
@@ -1967,18 +1997,38 @@ var WorkflowsUpstash = class extends WorkflowsStorage {
   async persistWorkflowSnapshot(params) {
     const { namespace = "workflows", workflowName, runId, resourceId, snapshot, createdAt, updatedAt } = params;
     try {
-      await this.#db.insert({
-        tableName: TABLE_WORKFLOW_SNAPSHOT,
-        record: {
-          namespace,
-          workflow_name: workflowName,
-          run_id: runId,
-          resourceId,
-          snapshot,
-          createdAt: createdAt ?? /* @__PURE__ */ new Date(),
-          updatedAt: updatedAt ?? /* @__PURE__ */ new Date()
-        }
+      const now = /* @__PURE__ */ new Date();
+      const key = getKey(TABLE_WORKFLOW_SNAPSHOT, {
+        namespace,
+        workflow_name: workflowName,
+        run_id: runId,
+        ...resourceId ? { resourceId } : {}
       });
+      const record = {
+        namespace,
+        workflow_name: workflowName,
+        run_id: runId,
+        resourceId,
+        snapshot,
+        createdAt: (createdAt ?? now).toISOString(),
+        updatedAt: (updatedAt ?? now).toISOString()
+      };
+      await this.client.eval(
+        `
+        local existing = redis.call("GET", KEYS[1])
+        local next = cjson.decode(ARGV[1])
+        if existing then
+          local current = cjson.decode(existing)
+          if current["createdAt"] then
+            next["createdAt"] = current["createdAt"]
+          end
+        end
+        redis.call("SET", KEYS[1], cjson.encode(next))
+        return 1
+        `,
+        [key],
+        [JSON.stringify(record)]
+      );
     } catch (error) {
       throw new MastraError(
         {
@@ -1997,15 +2047,10 @@ var WorkflowsUpstash = class extends WorkflowsStorage {
   }
   async loadWorkflowSnapshot(params) {
     const { namespace = "workflows", workflowName, runId } = params;
-    const key = getKey(TABLE_WORKFLOW_SNAPSHOT, {
-      namespace,
-      workflow_name: workflowName,
-      run_id: runId
-    });
     try {
-      const data = await this.client.get(key);
+      const data = await this.getWorkflowRunRecord({ namespace, runId, workflowName });
       if (!data) return null;
-      return data.snapshot;
+      return typeof data.snapshot === "string" ? JSON.parse(data.snapshot) : data.snapshot;
     } catch (error) {
       throw new MastraError(
         {
@@ -2027,15 +2072,7 @@ var WorkflowsUpstash = class extends WorkflowsStorage {
     workflowName
   }) {
     try {
-      const key = getKey(TABLE_WORKFLOW_SNAPSHOT, { namespace: "workflows", workflow_name: workflowName, run_id: runId }) + "*";
-      const keys = await this.#db.scanKeys(key);
-      const workflows = await Promise.all(
-        keys.map(async (key2) => {
-          const data2 = await this.client.get(key2);
-          return data2;
-        })
-      );
-      const data = workflows.find((w) => w?.run_id === runId && w?.workflow_name === workflowName);
+      const data = await this.getWorkflowRunRecord({ namespace: "workflows", runId, workflowName });
       if (!data) return null;
       return this.parseWorkflowRun(data);
     } catch (error) {
@@ -2055,8 +2092,14 @@ var WorkflowsUpstash = class extends WorkflowsStorage {
     }
   }
   async deleteWorkflowRunById({ runId, workflowName }) {
-    const key = getKey(TABLE_WORKFLOW_SNAPSHOT, { namespace: "workflows", workflow_name: workflowName, run_id: runId });
     try {
+      const record = await this.getWorkflowRunRecord({ namespace: "workflows", runId, workflowName });
+      const key = getKey(TABLE_WORKFLOW_SNAPSHOT, {
+        namespace: "workflows",
+        workflow_name: workflowName,
+        run_id: runId,
+        ...record?.resourceId ? { resourceId: record.resourceId } : {}
+      });
       await this.client.del(key);
     } catch (error) {
       throw new MastraError(
@@ -2095,24 +2138,7 @@ var WorkflowsUpstash = class extends WorkflowsStorage {
           new Error("page must be >= 0")
         );
       }
-      let pattern = getKey(TABLE_WORKFLOW_SNAPSHOT, { namespace: "workflows" }) + ":*";
-      if (workflowName && resourceId) {
-        pattern = getKey(TABLE_WORKFLOW_SNAPSHOT, {
-          namespace: "workflows",
-          workflow_name: workflowName,
-          run_id: "*",
-          resourceId
-        });
-      } else if (workflowName) {
-        pattern = getKey(TABLE_WORKFLOW_SNAPSHOT, { namespace: "workflows", workflow_name: workflowName }) + ":*";
-      } else if (resourceId) {
-        pattern = getKey(TABLE_WORKFLOW_SNAPSHOT, {
-          namespace: "workflows",
-          workflow_name: "*",
-          run_id: "*",
-          resourceId
-        });
-      }
+      const pattern = `${getKey(TABLE_WORKFLOW_SNAPSHOT, { namespace: "workflows" })}:*`;
       const keys = await this.#db.scanKeys(pattern);
       if (keys.length === 0) {
         return { runs: [], total: 0 };
@@ -2122,7 +2148,7 @@ var WorkflowsUpstash = class extends WorkflowsStorage {
       const results = await pipeline.exec();
       let runs = results.map((result) => result).filter(
         (record) => record !== null && record !== void 0 && typeof record === "object" && "workflow_name" in record
-      ).filter((record) => !workflowName || record.workflow_name === workflowName).map((w) => this.parseWorkflowRun(w)).filter((w) => {
+      ).filter((record) => !workflowName || record.workflow_name === workflowName).filter((record) => !resourceId || record.resourceId === resourceId).map((w) => this.parseWorkflowRun(w)).filter((w) => {
         if (fromDate && w.createdAt < fromDate) return false;
         if (toDate && w.createdAt > toDate) return false;
         if (status) {