s3db.js 10.0.5 → 10.0.7

package/dist/s3db.cjs.js

@@ -3869,6 +3869,10 @@ class CachePlugin extends Plugin {
     }
   }
   shouldCacheResource(resourceName) {
+    const resourceMetadata = this.database.savedMetadata?.resources?.[resourceName];
+    if (resourceMetadata?.createdBy && resourceMetadata.createdBy !== "user" && !this.config.include) {
+      return false;
+    }
     if (resourceName.startsWith("plg_") && !this.config.include) {
       return false;
     }
@@ -4418,8 +4422,9 @@ class EventualConsistencyPlugin extends Plugin {
         behavior: "body-overflow",
         timestamps: true,
         partitions: partitionConfig,
-        asyncPartitions: true
+        asyncPartitions: true,
         // Use async partitions for better performance
+        createdBy: "EventualConsistencyPlugin"
       })
     );
     if (!ok && !this.database.resources[transactionResourceName]) {
@@ -4436,7 +4441,8 @@ class EventualConsistencyPlugin extends Plugin {
           workerId: "string|optional"
         },
         behavior: "body-only",
-        timestamps: false
+        timestamps: false,
+        createdBy: "EventualConsistencyPlugin"
       })
     );
     if (!lockOk && !this.database.resources[lockResourceName]) {
@@ -4449,8 +4455,24 @@ class EventualConsistencyPlugin extends Plugin {
     this.addHelperMethods();
     if (this.config.autoConsolidate) {
       this.startConsolidationTimer();
+      if (this.config.verbose) {
+        console.log(
+          `[EventualConsistency] ${this.config.resource}.${this.config.field} - Auto-consolidation ENABLED (interval: ${this.config.consolidationInterval}s, window: ${this.config.consolidationWindow}h, mode: ${this.config.mode})`
+        );
+      }
+    } else {
+      if (this.config.verbose) {
+        console.log(
+          `[EventualConsistency] ${this.config.resource}.${this.config.field} - Auto-consolidation DISABLED (manual consolidation only)`
+        );
+      }
     }
     this.startGarbageCollectionTimer();
+    if (this.config.verbose) {
+      console.log(
+        `[EventualConsistency] ${this.config.resource}.${this.config.field} - Setup complete. Resources: ${this.config.resource}_transactions_${this.config.field}, ${this.config.resource}_consolidation_locks_${this.config.field}${this.config.enableAnalytics ? `, ${this.config.resource}_analytics_${this.config.field}` : ""}`
+      );
+    }
   }
   async onStart() {
     if (this.deferredSetup) {
@@ -4532,7 +4554,8 @@ class EventualConsistencyPlugin extends Plugin {
           byCohort: {
             fields: { cohort: "string" }
           }
-        }
+        },
+        createdBy: "EventualConsistencyPlugin"
       })
     );
     if (!ok && !this.database.resources[analyticsResourceName]) {
@@ -4711,11 +4734,21 @@ class EventualConsistencyPlugin extends Plugin {
     };
     if (this.config.batchTransactions) {
       this.pendingTransactions.set(transaction.id, transaction);
+      if (this.config.verbose) {
+        console.log(
+          `[EventualConsistency] ${this.config.resource}.${this.config.field} - Transaction batched: ${data.operation} ${data.value} for ${data.originalId} (batch: ${this.pendingTransactions.size}/${this.config.batchSize})`
+        );
+      }
       if (this.pendingTransactions.size >= this.config.batchSize) {
         await this.flushPendingTransactions();
       }
     } else {
       await this.transactionResource.insert(transaction);
+      if (this.config.verbose) {
+        console.log(
+          `[EventualConsistency] ${this.config.resource}.${this.config.field} - Transaction created: ${data.operation} ${data.value} for ${data.originalId} (cohort: ${cohortInfo.hour}, applied: false)`
+        );
+      }
     }
     return transaction;
   }
@@ -4780,11 +4813,23 @@ class EventualConsistencyPlugin extends Plugin {
   }
   startConsolidationTimer() {
     const intervalMs = this.config.consolidationInterval * 1e3;
+    if (this.config.verbose) {
+      const nextRun = new Date(Date.now() + intervalMs);
+      console.log(
+        `[EventualConsistency] ${this.config.resource}.${this.config.field} - Consolidation timer started. Next run at ${nextRun.toISOString()} (every ${this.config.consolidationInterval}s)`
+      );
+    }
     this.consolidationTimer = setInterval(async () => {
       await this.runConsolidation();
     }, intervalMs);
   }
   async runConsolidation() {
+    const startTime = Date.now();
+    if (this.config.verbose) {
+      console.log(
+        `[EventualConsistency] ${this.config.resource}.${this.config.field} - Starting consolidation run at ${(/* @__PURE__ */ new Date()).toISOString()}`
+      );
+    }
     try {
       const now = /* @__PURE__ */ new Date();
       const hoursToCheck = this.config.consolidationWindow || 24;
@@ -4794,6 +4839,11 @@ class EventualConsistencyPlugin extends Plugin {
         const cohortInfo = this.getCohortInfo(date);
         cohortHours.push(cohortInfo.hour);
       }
+      if (this.config.verbose) {
+        console.log(
+          `[EventualConsistency] ${this.config.resource}.${this.config.field} - Querying ${hoursToCheck} hour partitions for pending transactions...`
+        );
+      }
       const transactionsByHour = await Promise.all(
         cohortHours.map(async (cohortHour) => {
           const [ok, err, txns] = await tryFn(
@@ -4808,26 +4858,47 @@ class EventualConsistencyPlugin extends Plugin {
       const transactions = transactionsByHour.flat();
       if (transactions.length === 0) {
         if (this.config.verbose) {
-          console.log(`[EventualConsistency] No pending transactions to consolidate`);
+          console.log(
+            `[EventualConsistency] ${this.config.resource}.${this.config.field} - No pending transactions found. Next run in ${this.config.consolidationInterval}s`
+          );
         }
         return;
       }
       const uniqueIds = [...new Set(transactions.map((t) => t.originalId))];
+      if (this.config.verbose) {
+        console.log(
+          `[EventualConsistency] ${this.config.resource}.${this.config.field} - Found ${transactions.length} pending transactions for ${uniqueIds.length} records. Consolidating with concurrency=${this.config.consolidationConcurrency}...`
+        );
+      }
       const { results, errors } = await promisePool.PromisePool.for(uniqueIds).withConcurrency(this.config.consolidationConcurrency).process(async (id) => {
         return await this.consolidateRecord(id);
       });
+      const duration = Date.now() - startTime;
       if (errors && errors.length > 0) {
-        console.error(`Consolidation completed with ${errors.length} errors:`, errors);
+        console.error(
+          `[EventualConsistency] ${this.config.resource}.${this.config.field} - Consolidation completed with ${errors.length} errors in ${duration}ms:`,
+          errors
+        );
+      }
+      if (this.config.verbose) {
+        console.log(
+          `[EventualConsistency] ${this.config.resource}.${this.config.field} - Consolidation complete: ${results.length} records consolidated in ${duration}ms (${errors.length} errors). Next run in ${this.config.consolidationInterval}s`
+        );
       }
       this.emit("eventual-consistency.consolidated", {
         resource: this.config.resource,
         field: this.config.field,
         recordCount: uniqueIds.length,
         successCount: results.length,
-        errorCount: errors.length
+        errorCount: errors.length,
+        duration
       });
     } catch (error) {
-      console.error("Consolidation error:", error);
+      const duration = Date.now() - startTime;
+      console.error(
+        `[EventualConsistency] ${this.config.resource}.${this.config.field} - Consolidation error after ${duration}ms:`,
+        error
+      );
       this.emit("eventual-consistency.consolidation-error", error);
     }
   }
@@ -4862,8 +4933,18 @@ class EventualConsistencyPlugin extends Plugin {
         })
       );
       if (!ok || !transactions || transactions.length === 0) {
+        if (this.config.verbose) {
+          console.log(
+            `[EventualConsistency] ${this.config.resource}.${this.config.field} - No pending transactions for ${originalId}, skipping`
+          );
+        }
         return currentValue;
       }
+      if (this.config.verbose) {
+        console.log(
+          `[EventualConsistency] ${this.config.resource}.${this.config.field} - Consolidating ${originalId}: ${transactions.length} pending transactions (current: ${currentValue})`
+        );
+      }
       transactions.sort(
         (a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime()
       );
@@ -4872,6 +4953,11 @@ class EventualConsistencyPlugin extends Plugin {
         transactions.unshift(this._createSyntheticSetTransaction(currentValue));
       }
       const consolidatedValue = this.config.reducer(transactions);
+      if (this.config.verbose) {
+        console.log(
+          `[EventualConsistency] ${this.config.resource}.${this.config.field} - ${originalId}: ${currentValue} \u2192 ${consolidatedValue} (${consolidatedValue > currentValue ? "+" : ""}${consolidatedValue - currentValue})`
+        );
+      }
       const [updateOk, updateErr] = await tryFn(
         () => this.targetResource.update(originalId, {
           [this.config.field]: consolidatedValue
@@ -4894,6 +4980,23 @@ class EventualConsistencyPlugin extends Plugin {
         if (this.config.enableAnalytics && transactionsToUpdate.length > 0) {
           await this.updateAnalytics(transactionsToUpdate);
         }
+        if (this.targetResource.cache && typeof this.targetResource.cache.delete === "function") {
+          try {
+            const cacheKey = await this.targetResource.cacheKeyFor({ id: originalId });
+            await this.targetResource.cache.delete(cacheKey);
+            if (this.config.verbose) {
+              console.log(
+                `[EventualConsistency] ${this.config.resource}.${this.config.field} - Cache invalidated for ${originalId}`
+              );
+            }
+          } catch (cacheErr) {
+            if (this.config.verbose) {
+              console.warn(
+                `[EventualConsistency] ${this.config.resource}.${this.config.field} - Failed to invalidate cache for ${originalId}: ${cacheErr?.message}`
+              );
+            }
+          }
+        }
       }
       return consolidatedValue;
     } finally {
@@ -5108,21 +5211,43 @@ class EventualConsistencyPlugin extends Plugin {
    */
   async updateAnalytics(transactions) {
     if (!this.analyticsResource || transactions.length === 0) return;
+    if (this.config.verbose) {
+      console.log(
+        `[EventualConsistency] ${this.config.resource}.${this.config.field} - Updating analytics for ${transactions.length} transactions...`
+      );
+    }
     try {
       const byHour = this._groupByCohort(transactions, "cohortHour");
+      const cohortCount = Object.keys(byHour).length;
+      if (this.config.verbose) {
+        console.log(
+          `[EventualConsistency] ${this.config.resource}.${this.config.field} - Updating ${cohortCount} hourly analytics cohorts...`
+        );
+      }
       for (const [cohort, txns] of Object.entries(byHour)) {
         await this._upsertAnalytics("hour", cohort, txns);
       }
       if (this.config.analyticsConfig.rollupStrategy === "incremental") {
         const uniqueHours = Object.keys(byHour);
+        if (this.config.verbose) {
+          console.log(
+            `[EventualConsistency] ${this.config.resource}.${this.config.field} - Rolling up ${uniqueHours.length} hours to daily/monthly analytics...`
+          );
+        }
         for (const cohortHour of uniqueHours) {
           await this._rollupAnalytics(cohortHour);
         }
       }
-    } catch (error) {
       if (this.config.verbose) {
-        console.warn(`[EventualConsistency] Analytics update error:`, error.message);
+        console.log(
+          `[EventualConsistency] ${this.config.resource}.${this.config.field} - Analytics update complete for ${cohortCount} cohorts`
+        );
       }
+    } catch (error) {
+      console.warn(
+        `[EventualConsistency] ${this.config.resource}.${this.config.field} - Analytics update error:`,
+        error.message
+      );
     }
   }
   /**
@@ -9259,7 +9384,8 @@ ${errorDetails}`,
       versioningEnabled = false,
       events = {},
       asyncEvents = true,
-      asyncPartitions = true
+      asyncPartitions = true,
+      createdBy = "user"
     } = config;
     this.name = name;
     this.client = client;
@@ -9288,7 +9414,8 @@ ${errorDetails}`,
       autoDecrypt,
       allNestedObjectsOptional,
       asyncEvents,
-      asyncPartitions
+      asyncPartitions,
+      createdBy
     };
     this.hooks = {
       beforeInsert: [],
@@ -11652,7 +11779,7 @@ class Database extends EventEmitter {
     this.id = idGenerator(7);
     this.version = "1";
     this.s3dbVersion = (() => {
-      const [ok, err, version] = tryFn(() => true ? "10.0.5" : "latest");
+      const [ok, err, version] = tryFn(() => true ? "10.0.7" : "latest");
       return ok ? version : "latest";
     })();
     this.resources = {};
@@ -12013,6 +12140,7 @@ class Database extends EventEmitter {
       metadata.resources[name] = {
         currentVersion: version,
         partitions: resource.config.partitions || {},
+        createdBy: existingResource?.createdBy || resource.config.createdBy || "user",
         versions: {
           ...existingResource?.versions,
           // Preserve previous versions
@@ -12371,6 +12499,7 @@ class Database extends EventEmitter {
    * @param {boolean} [config.autoDecrypt=true] - Auto-decrypt secret fields
    * @param {Function|number} [config.idGenerator] - Custom ID generator or size
    * @param {number} [config.idSize=22] - Size for auto-generated IDs
+   * @param {string} [config.createdBy='user'] - Who created this resource ('user', 'plugin', or plugin name)
    * @returns {Promise<Resource>} The created or updated resource
    */
   async createResource({ name, attributes, behavior = "user-managed", hooks, ...config }) {
@@ -12429,7 +12558,8 @@ class Database extends EventEmitter {
       idGenerator: config.idGenerator,
       idSize: config.idSize,
       asyncEvents: config.asyncEvents,
-      events: config.events || {}
+      events: config.events || {},
+      createdBy: config.createdBy || "user"
     });
     resource.database = this;
     this.resources[name] = resource;