webspresso 0.0.97 → 0.0.98

package/plugins/email/purge.js

@@ -3,24 +3,74 @@
  * @module plugins/email/purge
  */
 
+'use strict';
+
 /**
  * @param {import('knex').Knex} knex
- * @param {Object} options
+ * @param {Object} [options={}]
  * @param {string} [options.tableName='email_logs']
- * @param {Date|string} options.olderThan
- * @returns {Promise<number>}
+ * @param {Date|string|number} [options.olderThan] - Rows with created_at strictly before this are removed
+ * @param {number} [options.days] - Number of days of email logs to keep
+ * @param {number} [options.retentionDays=90] - Alias for days
+ * @returns {Promise<number>} Deleted row count
  */
-async function purgeEmailLogs(knex, options) {
+async function purgeEmailLogs(knex, options = {}) {
+  if (!knex) {
+    throw new Error('purgeEmailLogs requires a database (knex) instance');
+  }
+
   const tableName = options.tableName || 'email_logs';
-  const olderThan = options.olderThan instanceof Date
-    ? options.olderThan
-    : new Date(options.olderThan);
 
-  if (Number.isNaN(olderThan.getTime())) {
-    throw new Error('purgeEmailLogs: invalid olderThan date');
+  let olderThan;
+  if (options.olderThan !== undefined) {
+    olderThan = options.olderThan instanceof Date
+      ? options.olderThan
+      : new Date(options.olderThan);
+
+    if (Number.isNaN(olderThan.getTime())) {
+      throw new Error('purgeEmailLogs: invalid olderThan date');
+    }
+  } else {
+    const rawDays = options.days !== undefined ? options.days : (options.retentionDays !== undefined ? options.retentionDays : 90);
+    const days = typeof rawDays === 'number' ? rawDays : Number(rawDays);
+    if (Number.isNaN(days) || days <= 0) {
+      throw new Error('purgeEmailLogs: days must be a positive number');
+    }
+    olderThan = new Date(Date.now() - days * 24 * 60 * 60 * 1000);
+  }
+
+  let hasTable = true;
+  if (knex.schema && typeof knex.schema.hasTable === 'function') {
+    try {
+      hasTable = await knex.schema.hasTable(tableName);
+    } catch {
+      hasTable = false;
+    }
+  }
+
+  if (!hasTable) {
+    return 0;
+  }
+
+  const client = knex?.client?.config?.client;
+  const isSqlite = client === 'sqlite3' || client === 'better-sqlite3';
+
+  let query = knex(tableName);
+  if (isSqlite) {
+    const iso = olderThan.toISOString();
+    const cutoffMs = olderThan.getTime();
+    query = query.where((builder) => {
+      builder.whereRaw(
+        "((typeof(created_at) = 'integer' and created_at < ?) or (typeof(created_at) = 'text' and created_at < ?))",
+        [cutoffMs, iso]
+      );
+    });
+  } else {
+    query = query.where('created_at', '<', olderThan);
   }
 
-  return knex(tableName).where('created_at', '<', olderThan).delete();
+  const deleted = await query.delete();
+  return Number(deleted) || 0;
 }
 
 module.exports = {

package/plugins/index.js

@@ -7,6 +7,8 @@ module.exports = {
   get sitemapPlugin() { return require('./sitemap'); },
   get analyticsPlugin() { return require('./analytics'); },
   get dashboardPlugin() { return require('./dashboard/index'); },
+  get devToolbarPlugin() { return require('./dashboard/index').devToolbarPlugin; },
+  get devtoolsPlugin() { return require('./dashboard/index').devtoolsPlugin; },
   get schemaExplorerPlugin() { return require('./schema-explorer'); },
   get adminPanelPlugin() { return require('./admin-panel'); },
   get seoCheckerPlugin() { return require('./seo-checker'); },
@@ -14,6 +16,8 @@ module.exports = {
   get auditLogPlugin() { return require('./audit-log'); },
   get recaptchaPlugin() { return require('./recaptcha'); },
   get swaggerPlugin() { return require('./swagger'); },
+  get openapiPlugin() { return require('./swagger'); },
+  get apiDocsPlugin() { return require('./swagger'); },
   get healthCheckPlugin() { return require('./health-check'); },
   get restResourcePlugin() { return require('./rest-resources'); },
   get ormCacheAdminPlugin() { return require('./orm-cache-admin'); },

package/plugins/orm-cache-admin/index.js

@@ -11,7 +11,8 @@ const { generateOrmCacheAdminComponent } = require('./admin-component');
  * @param {import('../../core/orm/types').DatabaseInstance} options.db - From createDatabase({ cache: true })
  */
 function ormCacheAdminPlugin(options = {}) {
-  const { db } = options;
+  const { db, title, adminTitle } = options;
+  const pageTitle = title || adminTitle || 'ORM Cache';
 
   if (!db) {
     throw new Error('orm-cache-admin plugin requires `db` (database instance from createDatabase)');
@@ -41,9 +42,10 @@ function ormCacheAdminPlugin(options = {}) {
 
       adminApi.registerModule({
         id: 'orm-cache',
+        title: pageTitle,
         pages: [{
           id: 'orm-cache',
-          title: 'ORM Cache',
+          title: pageTitle,
           path: '/orm-cache',
           icon: 'database',
           component: generateOrmCacheAdminComponent(),

package/plugins/queue/index.js

@@ -72,6 +72,12 @@ function queuePlugin(options = {}) {
         pollInterval,
         jobsDir,
         autoStart,
+        retention: options.retention,
+        retentionDays: options.retentionDays,
+        retentionStatuses: options.retentionStatuses,
+        cleanupIntervalMs: options.cleanupIntervalMs,
+        autoCleanup: options.autoCleanup,
+        cleanupOnStart: options.cleanupOnStart,
       });
 
       // Expose to ctx & app
@@ -90,6 +96,11 @@ function queuePlugin(options = {}) {
       this.queue = queueManager;
     },
 
+    api: {
+      getQueueManager: () => queueManager,
+      clean: (opts) => queueManager?.clean(opts),
+    },
+
     onRoutesReady(ctx) {
       if (jobsDir && fs.existsSync(jobsDir)) {
         queueManager.loadJobsFromDirectory(jobsDir);