s3db.js 10.0.13 → 10.0.15

package/dist/s3db.cjs.js

@@ -3926,6 +3926,14 @@ class CachePlugin extends Plugin {
     ];
     for (const method of cacheMethods) {
       resource.useMiddleware(method, async (ctx, next) => {
+        let skipCache = false;
+        const lastArg = ctx.args[ctx.args.length - 1];
+        if (lastArg && typeof lastArg === "object" && lastArg.skipCache === true) {
+          skipCache = true;
+        }
+        if (skipCache) {
+          return await next();
+        }
         let key;
         if (method === "getMany") {
           key = await resource.cacheKeyFor({ action: method, params: { ids: ctx.args[0] } });
@@ -5113,10 +5121,6 @@ class EventualConsistencyPlugin extends Plugin {
       return recordOk && record ? record[this.config.field] || 0 : 0;
     }
     try {
-      const [recordOk, recordErr, record] = await tryFn(
-        () => this.targetResource.get(originalId)
-      );
-      const currentValue = recordOk && record ? record[this.config.field] || 0 : 0;
       const [ok, err, transactions] = await tryFn(
         () => this.transactionResource.query({
           originalId,
@@ -5124,16 +5128,119 @@ class EventualConsistencyPlugin extends Plugin {
         })
       );
       if (!ok || !transactions || transactions.length === 0) {
+        const [recordOk, recordErr, record] = await tryFn(
+          () => this.targetResource.get(originalId)
+        );
+        const currentValue2 = recordOk && record ? record[this.config.field] || 0 : 0;
         if (this.config.verbose) {
           console.log(
             `[EventualConsistency] ${this.config.resource}.${this.config.field} - No pending transactions for ${originalId}, skipping`
           );
         }
-        return currentValue;
+        return currentValue2;
+      }
+      const [appliedOk, appliedErr, appliedTransactions] = await tryFn(
+        () => this.transactionResource.query({
+          originalId,
+          applied: true
+        })
+      );
+      let currentValue = 0;
+      if (appliedOk && appliedTransactions && appliedTransactions.length > 0) {
+        const [recordExistsOk, recordExistsErr, recordExists] = await tryFn(
+          () => this.targetResource.get(originalId)
+        );
+        if (!recordExistsOk || !recordExists) {
+          if (this.config.verbose) {
+            console.log(
+              `[EventualConsistency] ${this.config.resource}.${this.config.field} - Record ${originalId} doesn't exist, deleting ${appliedTransactions.length} old applied transactions`
+            );
+          }
+          const { results, errors } = await promisePool.PromisePool.for(appliedTransactions).withConcurrency(10).process(async (txn) => {
+            const [deleted] = await tryFn(() => this.transactionResource.delete(txn.id));
+            return deleted;
+          });
+          if (this.config.verbose && errors && errors.length > 0) {
+            console.warn(
+              `[EventualConsistency] ${this.config.resource}.${this.config.field} - Failed to delete ${errors.length} old applied transactions`
+            );
+          }
+          currentValue = 0;
+        } else {
+          appliedTransactions.sort(
+            (a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime()
+          );
+          const hasSetInApplied = appliedTransactions.some((t) => t.operation === "set");
+          if (!hasSetInApplied) {
+            const recordValue = recordExists[this.config.field] || 0;
+            let appliedDelta = 0;
+            for (const t of appliedTransactions) {
+              if (t.operation === "add") appliedDelta += t.value;
+              else if (t.operation === "sub") appliedDelta -= t.value;
+            }
+            const baseValue = recordValue - appliedDelta;
+            const hasExistingAnchor = appliedTransactions.some((t) => t.source === "anchor");
+            if (baseValue !== 0 && !hasExistingAnchor) {
+              const firstTransactionDate = new Date(appliedTransactions[0].timestamp);
+              const cohortInfo = this.getCohortInfo(firstTransactionDate);
+              const anchorTransaction = {
+                id: idGenerator(),
+                originalId,
+                field: this.config.field,
+                value: baseValue,
+                operation: "set",
+                timestamp: new Date(firstTransactionDate.getTime() - 1).toISOString(),
+                // 1ms before first txn to ensure it's first
+                cohortDate: cohortInfo.date,
+                cohortHour: cohortInfo.hour,
+                cohortMonth: cohortInfo.month,
+                source: "anchor",
+                applied: true
+              };
+              await this.transactionResource.insert(anchorTransaction);
+              appliedTransactions.unshift(anchorTransaction);
+            }
+          }
+          currentValue = this.config.reducer(appliedTransactions);
+        }
+      } else {
+        const [recordOk, recordErr, record] = await tryFn(
+          () => this.targetResource.get(originalId)
+        );
+        currentValue = recordOk && record ? record[this.config.field] || 0 : 0;
+        if (currentValue !== 0) {
+          let anchorTimestamp;
+          if (transactions && transactions.length > 0) {
+            const firstPendingDate = new Date(transactions[0].timestamp);
+            anchorTimestamp = new Date(firstPendingDate.getTime() - 1).toISOString();
+          } else {
+            anchorTimestamp = (/* @__PURE__ */ new Date()).toISOString();
+          }
+          const cohortInfo = this.getCohortInfo(new Date(anchorTimestamp));
+          const anchorTransaction = {
+            id: idGenerator(),
+            originalId,
+            field: this.config.field,
+            value: currentValue,
+            operation: "set",
+            timestamp: anchorTimestamp,
+            cohortDate: cohortInfo.date,
+            cohortHour: cohortInfo.hour,
+            cohortMonth: cohortInfo.month,
+            source: "anchor",
+            applied: true
+          };
+          await this.transactionResource.insert(anchorTransaction);
+          if (this.config.verbose) {
+            console.log(
+              `[EventualConsistency] ${this.config.resource}.${this.config.field} - Created anchor transaction for ${originalId} with base value ${currentValue}`
+            );
+          }
+        }
       }
       if (this.config.verbose) {
         console.log(
-          `[EventualConsistency] ${this.config.resource}.${this.config.field} - Consolidating ${originalId}: ${transactions.length} pending transactions (current: ${currentValue})`
+          `[EventualConsistency] ${this.config.resource}.${this.config.field} - Consolidating ${originalId}: ${transactions.length} pending transactions (current: ${currentValue} from ${appliedOk && appliedTransactions?.length > 0 ? "applied transactions" : "record"})`
         );
       }
       transactions.sort(
@@ -12053,7 +12160,7 @@ class Database extends EventEmitter {
     this.id = idGenerator(7);
     this.version = "1";
     this.s3dbVersion = (() => {
-      const [ok, err, version] = tryFn(() => true ? "10.0.13" : "latest");
+      const [ok, err, version] = tryFn(() => true ? "10.0.15" : "latest");
       return ok ? version : "latest";
     })();
     this.resources = {};