webspresso 0.0.97 → 0.0.99

package/plugins/email/index.js

@@ -29,10 +29,21 @@ const { emailPluginOptionsFromManifest } = require('./manifest');
  * @param {Object} [options.authEmails] - Auth email bridge config
  * @param {Object} [options.emailTemplates] - Precompiled templates from build manifest
  * @param {Object} [options.manifest] - Full build manifest (uses emailTemplates field)
+ * @param {Object|boolean} [options.retention] - Retention policy configuration (set false to disable)
+ * @param {number} [options.retention.days=90] - Days to retain email logs
+ * @param {number} [options.retention.intervalMs=86400000] - Auto-cleanup timer frequency (24h)
+ * @param {boolean} [options.retention.runOnStart=true] - Run initial purge shortly after startup
+ * @param {number} [options.retentionDays=90] - Shorthand for retention.days
+ * @param {number} [options.cleanupIntervalMs=86400000] - Shorthand for retention.intervalMs
+ * @param {boolean} [options.autoCleanup=true] - Enable automatic background cleanup
+ * @param {boolean} [options.cleanupOnStart=true] - Run initial purge on start
+ * @param {number} [options.cleanupStartDelayMs] - Delay in ms before start purge
  */
 function emailPlugin(options = {}) {
   const {
     db,
+    title,
+    adminTitle,
     transport,
     smtp,
     defaults = {},
@@ -48,6 +59,8 @@ function emailPlugin(options = {}) {
     manifest,
   } = options;
 
+  const pageTitle = title || adminTitle || 'Email';
+
   const logToDb = options.logToDb !== undefined ? options.logToDb : !!db;
   const knex = db ? (db.knex || db) : null;
 
@@ -55,6 +68,90 @@ function emailPlugin(options = {}) {
     console.warn('[email] logToDb is enabled but no db was passed — logging disabled');
   }
 
+  // Retention configuration
+  const retentionOption = options.retention;
+  const isRetentionDisabled =
+    retentionOption === false ||
+    (typeof retentionOption === 'object' && retentionOption.enabled === false) ||
+    options.retentionDays === null ||
+    options.retentionDays === 0 ||
+    !logToDb ||
+    !knex;
+
+  const autoCleanupEnabled =
+    !isRetentionDisabled &&
+    options.autoCleanup !== false &&
+    (typeof retentionOption !== 'object' || retentionOption.autoCleanup !== false);
+
+  const retentionConfig = {
+    enabled: !isRetentionDisabled,
+    autoCleanup: autoCleanupEnabled,
+    days: (typeof options.retentionDays === 'number' && options.retentionDays > 0)
+      ? options.retentionDays
+      : (typeof retentionOption === 'object' && retentionOption?.days ? retentionOption.days : 90),
+    intervalMs: (typeof options.cleanupIntervalMs === 'number' && options.cleanupIntervalMs > 0)
+      ? options.cleanupIntervalMs
+      : (typeof retentionOption === 'object' && retentionOption?.intervalMs ? retentionOption.intervalMs : 24 * 60 * 60 * 1000),
+    runOnStart: (typeof retentionOption === 'object' && retentionOption?.runOnStart !== undefined)
+      ? !!retentionOption.runOnStart
+      : (options.cleanupOnStart !== undefined ? !!options.cleanupOnStart : true),
+  };
+
+  let cleanupInterval = null;
+  let cleanupStartTimeout = null;
+
+  async function runCleanup() {
+    if (!knex) return 0;
+    try {
+      return await purgeEmailLogs(knex, {
+        tableName,
+        days: retentionConfig.days,
+      });
+    } catch (err) {
+      if (process.env.NODE_ENV !== 'test') {
+        console.warn('[email] Failed to run retention cleanup:', err.message);
+      }
+    }
+  }
+
+  function startCleanup(customIntervalMs) {
+    stopCleanup();
+    if (!retentionConfig.enabled || !knex) return;
+    if (typeof customIntervalMs === 'number' && customIntervalMs > 0) {
+      retentionConfig.intervalMs = customIntervalMs;
+    }
+
+    if (retentionConfig.runOnStart) {
+      const delayMs = typeof options.cleanupStartDelayMs === 'number'
+        ? options.cleanupStartDelayMs
+        : (process.env.NODE_ENV === 'test' ? 50 : 5000);
+      cleanupStartTimeout = setTimeout(() => {
+        runCleanup();
+      }, delayMs);
+      if (cleanupStartTimeout && cleanupStartTimeout.unref) {
+        cleanupStartTimeout.unref();
+      }
+    }
+
+    cleanupInterval = setInterval(() => {
+      runCleanup();
+    }, retentionConfig.intervalMs);
+    if (cleanupInterval && cleanupInterval.unref) {
+      cleanupInterval.unref();
+    }
+  }
+
+  function stopCleanup() {
+    if (cleanupStartTimeout) {
+      clearTimeout(cleanupStartTimeout);
+      cleanupStartTimeout = null;
+    }
+    if (cleanupInterval) {
+      clearInterval(cleanupInterval);
+      cleanupInterval = null;
+    }
+  }
+
   const registry = new TemplateRegistry();
 
   const manifestChunks = emailTemplatesOpt
@@ -81,7 +178,7 @@ function emailPlugin(options = {}) {
   return {
     name: 'email',
     version: '1.0.0',
-    description: 'MJML + Nodemailer email sending with optional admin UI and auth integration',
+    description: 'MJML + Nodemailer email sending with optional admin UI, auth integration, and retention cleanup',
     dependencies: includeAdminPage ? { 'admin-panel': '*' } : {},
 
     api: {
@@ -92,13 +189,29 @@ function emailPlugin(options = {}) {
       listTemplates: () => registry.list(),
       verifyConnection: () => emailService.verifyConnection(),
       queryLogs: (filters) => emailService.queryLogs(filters),
+      purge: (opts = {}) => {
+        if (!knex) throw new Error('Database is required for purge');
+        return purgeEmailLogs(knex, {
+          tableName: opts.tableName || tableName,
+          days: opts.days !== undefined ? opts.days : (opts.retentionDays !== undefined ? opts.retentionDays : retentionConfig.days),
+          olderThan: opts.olderThan,
+          ...opts,
+        });
+      },
       purgeLogs: (opts = {}) => {
         if (!knex) throw new Error('Database is required for purgeLogs');
         return purgeEmailLogs(knex, {
           tableName: opts.tableName || tableName,
           olderThan: opts.olderThan,
+          days: opts.days !== undefined ? opts.days : (opts.retentionDays !== undefined ? opts.retentionDays : retentionConfig.days),
+          ...opts,
         });
       },
+      startCleanup,
+      stopCleanup,
+      getRetentionConfig() {
+        return { ...retentionConfig };
+      },
       getMigrationTemplate: (name) => generateEmailLogsMigration(name || tableName),
       isTransportReady: () => emailService.isTransportReady(),
       loadFromManifest: (chunks) => registry.loadFromManifest(chunks),
@@ -120,6 +233,22 @@ function emailPlugin(options = {}) {
           }
         }
       }
+
+      if (retentionConfig.enabled && autoCleanupEnabled) {
+        startCleanup();
+      }
+
+      return () => {
+        stopCleanup();
+      };
+    },
+
+    dispose() {
+      stopCleanup();
+    },
+
+    shutdown() {
+      stopCleanup();
     },
 
     onRoutesReady(ctx) {
@@ -159,10 +288,11 @@ function emailPlugin(options = {}) {
 
       adminApi.registerModule({
         id: 'email',
+        title: pageTitle,
 
         pages: [{
           id: 'email',
-          title: 'Email',
+          title: pageTitle,
           path: '/email',
           icon: 'mail',
           component: generateEmailComponent({ apiPrefix }),

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/file-manager/admin-component.js

@@ -569,30 +569,46 @@ function generateFileManagerComponent(options = {}) {
     var onSelect = opts.onSelect;
     var accept = opts.accept || '';
 
+    var existing = document.getElementById('file-manager-picker-modal-root');
+    if (existing && existing.parentNode) {
+      m.mount(existing, null);
+      existing.parentNode.removeChild(existing);
+    }
+
     var modalContainer = document.createElement('div');
     modalContainer.id = 'file-manager-picker-modal-root';
     document.body.appendChild(modalContainer);
 
     function cleanup() {
+      document.removeEventListener('keydown', onKeyDown);
       if (modalContainer && modalContainer.parentNode) {
         m.mount(modalContainer, null);
         modalContainer.parentNode.removeChild(modalContainer);
       }
     }
 
+    function onKeyDown(e) {
+      if (e.key === 'Escape') cleanup();
+    }
+    document.addEventListener('keydown', onKeyDown);
+
     var PickerModalComponent = {
       view: function() {
-        return m('div.fixed.inset-0.bg-black/60.flex.items-center.justify-center.z-[9999].p-4.backdrop-blur-sm', [
+        return m('div.fixed.inset-0.bg-black/60.flex.items-center.justify-center.z-[9999].p-4.backdrop-blur-sm', {
+          onclick: function(e) {
+            if (e.target === e.currentTarget) cleanup();
+          }
+        }, [
           m('div.bg-white.dark:bg-slate-900.rounded-2xl.shadow-2xl.max-w-4xl.w-full.max-h-[90vh].flex.flex-col.overflow-hidden.border.border-gray-200.dark:border-slate-700', [
             m('div.flex.items-center.justify-between.p-4.border-b.border-gray-200.dark:border-slate-700.bg-gray-50.dark:bg-slate-800', [
-              m('h2.text-base.font-bold.text-gray-900.dark:text-slate-100', opts.title || '📁 Ortam Kütüphanesinden Dosya Seç'),
+              m('h2.text-base.font-bold.text-gray-900.dark:text-slate-100', opts.title || 'Choose from Media Library'),
               m('button.text-gray-400.hover:text-gray-600.dark:hover:text-slate-200.text-xl', {
                 onclick: cleanup
               }, '✕')
             ]),
             m('div.p-4.overflow-y-auto.flex-1', [
-              m(FileManagerView(true, function(selectedUrl) {
-                if (onSelect) onSelect(selectedUrl);
+              m(FileManagerView(true, function(selectedUrl, item) {
+                if (onSelect) onSelect(selectedUrl, item);
                 cleanup();
               }, accept))
             ])

package/plugins/file-manager/index.js

@@ -92,6 +92,26 @@ function fileManagerPlugin(options = {}) {
         return;
       }
 
+      const componentCode = generateFileManagerComponent({
+        apiPrefix,
+        publicBasePath,
+      });
+
+      // Always configure fileManager in admin settings and register client component
+      // so window.__openFileManagerPicker is available across all admin pages (models, records, rich-text)
+      if (typeof adminApi.getRegistry === 'function') {
+        const registry = adminApi.getRegistry();
+        registry.configure({
+          fileManager: {
+            enabled: true,
+            apiPrefix,
+            publicBasePath,
+            pageTitle,
+          },
+        });
+        registry.registerClientComponent('files', componentCode);
+      }
+
       adminApi.registerModule({
         id: 'files',
         pages: includePage
@@ -100,10 +120,7 @@ function fileManagerPlugin(options = {}) {
               title: pageTitle,
               path: '/files',
               icon: 'folder',
-              component: generateFileManagerComponent({
-                apiPrefix,
-                publicBasePath,
-              }),
+              component: componentCode,
             }]
           : [],
 

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'); },
@@ -49,6 +53,12 @@ module.exports = {
   get xlsx() { return require('./xlsx').xlsx; },
   get csvPlugin() { return require('./csv').csvPlugin; },
   get csv() { return require('./csv').csv; },
+  get oauthPlugin() { return require('./oauth'); },
+  get OAuthClient() { return require('./oauth').OAuthClient; },
+  get OAuthError() { return require('./oauth').OAuthError; },
+  get createOAuthClient() { return require('./oauth').createOAuthClient; },
+  get apiKeyPlugin() { return require('./api-key').apiKeyPlugin; },
+  get createApiKeyMiddleware() { return require('./api-key').createApiKeyMiddleware; },
 };