webspresso 0.0.102 → 0.0.104

package/plugins/rest-resources/index.js

@@ -8,8 +8,7 @@ const { getAllModels } = require('../../core/orm/model');
 const { omit } = require('../../core/orm/utils');
 const { trimUrlPathSlashes } = require('../../core/url-path-normalize');
 const { validateQueryComplexity } = require('../../core/orm/complexity');
-
-const RESERVED_QUERY_KEYS = new Set(['page', 'perPage', 'sort', 'order', 'include', 'trashed']);
+const { applyColumnFilters, RESERVED_QUERY_KEYS } = require('../../core/orm/query-filters');
 
 /**
  * Pluralize a PascalCase model name to a URL segment (e.g. User -> users, Company -> companies)
@@ -234,212 +233,7 @@ function parseSortParams(model, rawSort, rawOrder) {
   return result;
 }
 
-function applyColumnFilters(query, countQuery, model, req) {
-  let q = query;
-  let c = countQuery;
-
-  function applyCondition(col, op, rawVal) {
-    if (!model.columns.has(col)) return;
-    const meta = model.columns.get(col);
-    const colType = meta?.type;
-
-    let operator = String(op || 'eq').toLowerCase();
-    let val = rawVal;
-
-    // Normalize booleans
-    if (colType === 'boolean' && typeof val === 'string') {
-      if (val === 'true' || val === '1') val = true;
-      else if (val === 'false' || val === '0') val = false;
-    }
-
-    switch (operator) {
-      case 'eq':
-      case '=':
-        if (val !== undefined && val !== '') {
-          q = q.where(col, '=', val);
-          c = c.where(col, '=', val);
-        }
-        break;
-
-      case 'ne':
-      case '!=':
-      case '<>':
-        if (val !== undefined && val !== '') {
-          q = q.where(col, '!=', val);
-          c = c.where(col, '!=', val);
-        }
-        break;
-
-      case 'gt':
-      case '>':
-        if (val !== undefined && val !== '') {
-          q = q.where(col, '>', val);
-          c = c.where(col, '>', val);
-        }
-        break;
-
-      case 'gte':
-      case '>=':
-        if (val !== undefined && val !== '') {
-          q = q.where(col, '>=', val);
-          c = c.where(col, '>=', val);
-        }
-        break;
-
-      case 'lt':
-      case '<':
-        if (val !== undefined && val !== '') {
-          q = q.where(col, '<', val);
-          c = c.where(col, '<', val);
-        }
-        break;
-
-      case 'lte':
-      case '<=':
-        if (val !== undefined && val !== '') {
-          q = q.where(col, '<=', val);
-          c = c.where(col, '<=', val);
-        }
-        break;
-
-      case 'in': {
-        const arr = Array.isArray(val)
-          ? val
-          : (typeof val === 'string' ? val.split(',').map(s => s.trim()).filter(Boolean) : [val]);
-        if (arr.length > 0) {
-          q = q.whereIn(col, arr);
-          c = c.whereIn(col, arr);
-        }
-        break;
-      }
-
-      case 'nin':
-      case 'notin': {
-        const arr = Array.isArray(val)
-          ? val
-          : (typeof val === 'string' ? val.split(',').map(s => s.trim()).filter(Boolean) : [val]);
-        if (arr.length > 0) {
-          q = q.whereNotIn(col, arr);
-          c = c.whereNotIn(col, arr);
-        }
-        break;
-      }
-
-      case 'like':
-        if (val !== undefined && val !== '') {
-          q = q.where(col, 'like', String(val));
-          c = c.where(col, 'like', String(val));
-        }
-        break;
-
-      case 'ilike':
-        if (val !== undefined && val !== '') {
-          q = q.where(col, 'ilike', String(val));
-          c = c.where(col, 'ilike', String(val));
-        }
-        break;
-
-      case 'contains':
-        if (val !== undefined && val !== '') {
-          q = q.where(col, 'like', `%${String(val)}%`);
-          c = c.where(col, 'like', `%${String(val)}%`);
-        }
-        break;
-
-      case 'startswith':
-        if (val !== undefined && val !== '') {
-          q = q.where(col, 'like', `${String(val)}%`);
-          c = c.where(col, 'like', `${String(val)}%`);
-        }
-        break;
-
-      case 'endswith':
-        if (val !== undefined && val !== '') {
-          q = q.where(col, 'like', `%${String(val)}`);
-          c = c.where(col, 'like', `%${String(val)}`);
-        }
-        break;
-
-      case 'isnull':
-      case 'is_null': {
-        const isTrue = val === true || val === 'true' || val === '1' || val === 1 || val === '';
-        if (isTrue) {
-          q = q.whereNull(col);
-          c = c.whereNull(col);
-        }
-        break;
-      }
-
-      case 'isnotnull':
-      case 'is_not_null': {
-        const isTrue = val === true || val === 'true' || val === '1' || val === 1 || val === '';
-        if (isTrue) {
-          q = q.whereNotNull(col);
-          c = c.whereNotNull(col);
-        }
-        break;
-      }
-
-      case 'between': {
-        let parts = [];
-        if (Array.isArray(val)) {
-          parts = val;
-        } else if (typeof val === 'string') {
-          parts = val.split(',').map(s => s.trim());
-        }
-        if (parts.length === 2 && parts[0] !== '' && parts[1] !== '') {
-          q = q.where(col, '>=', parts[0]).where(col, '<=', parts[1]);
-          c = c.where(col, '>=', parts[0]).where(col, '<=', parts[1]);
-        }
-        break;
-      }
-
-      default:
-        if (val !== undefined && val !== '') {
-          q = q.where(col, '=', val);
-          c = c.where(col, '=', val);
-        }
-        break;
-    }
-  }
-
-  // 1. Process dedicated filter object ?filter[col]=... or ?filter[col][op]=...
-  if (req.query.filter && typeof req.query.filter === 'object') {
-    for (const [col, colFilter] of Object.entries(req.query.filter)) {
-      if (!model.columns.has(col)) continue;
-      if (colFilter && typeof colFilter === 'object' && !Array.isArray(colFilter)) {
-        if (colFilter.op !== undefined && colFilter.value !== undefined) {
-          applyCondition(col, colFilter.op, colFilter.value);
-        } else {
-          for (const [op, val] of Object.entries(colFilter)) {
-            applyCondition(col, op, val);
-          }
-        }
-      } else if (colFilter !== undefined && colFilter !== '') {
-        applyCondition(col, 'eq', colFilter);
-      }
-    }
-  }
 
-  // 2. Process top-level query parameters ?price[gte]=100 or ?status=active
-  for (const [key, value] of Object.entries(req.query)) {
-    if (RESERVED_QUERY_KEYS.has(key) || key === 'filter') {
-      continue;
-    }
-    if (!model.columns.has(key)) {
-      continue;
-    }
-    if (value && typeof value === 'object' && !Array.isArray(value)) {
-      for (const [op, val] of Object.entries(value)) {
-        applyCondition(key, op, val);
-      }
-    } else if (value !== undefined && value !== '') {
-      applyCondition(key, 'eq', value);
-    }
-  }
-
-  return { query: q, countQuery: c };
-}
 
 /**
  * @param {Object} options

package/plugins/schema-explorer/admin-component.js

@@ -20,10 +20,12 @@ function generateSchemaExplorerAdminComponent(options = {}) {
 function getSchemaApi(method, path) {
   var adminPath = window.__ADMIN_PATH__ || '/_admin';
   var url = adminPath + '/api${apiPrefix}' + (path || '');
-  return fetch(url, {
+  var fetchFn = (typeof window !== 'undefined' && window.Admin && window.Admin.fetch) ? window.Admin.fetch : fetch;
+  return fetchFn(url, {
     method: method || 'GET',
     credentials: 'include',
-    headers: { 'Accept': 'application/json' }
+    headers: { 'Accept': 'application/json' },
+    timeout: 30000,
   }).then(function(res) {
     if (!res.ok) {
       return res.json().catch(function() { return { error: res.statusText }; }).then(function(err) {

package/plugins/schema-explorer.js

@@ -59,6 +59,25 @@ function schemaExplorerPlugin(options = {}) {
 
   const pageTitle = title || adminTitle || menuLabel;
 
+  let cachedGraph = null;
+  let cachedGraphTime = 0;
+  const GRAPH_CACHE_TTL = 5000; // 5 seconds in dev, infinite in prod
+
+  function getEnrichedGraph() {
+    const isProd = process.env.NODE_ENV === 'production';
+    const now = Date.now();
+    if (cachedGraph && (isProd || (now - cachedGraphTime) < GRAPH_CACHE_TTL)) {
+      return cachedGraph;
+    }
+    const rawModels = serializeAllModels({ exclude, includeColumns, includeRelations, includeScopes });
+    const relationships = extractAllRelationships(rawModels);
+    const enriched = enrichModelsWithGraph(rawModels, relationships);
+    const mermaid = generateMermaidErDiagram(rawModels, relationships);
+    cachedGraph = { rawModels, relationships, enriched, mermaid };
+    cachedGraphTime = now;
+    return cachedGraph;
+  }
+
   return {
     name: 'schema-explorer',
     version: '1.0.0',
@@ -66,6 +85,14 @@ function schemaExplorerPlugin(options = {}) {
 
     // Expose API for other plugins & programmatic consumption
     api: {
+      /**
+       * Invalidate schema explorer cache
+       */
+      invalidateCache() {
+        cachedGraph = null;
+        cachedGraphTime = 0;
+      },
+
       /**
        * Get all models metadata
        * @returns {Object[]}
@@ -79,9 +106,7 @@ function schemaExplorerPlugin(options = {}) {
        * @returns {Object[]}
        */
       getEnrichedModels() {
-        const raw = serializeAllModels({ exclude, includeColumns, includeRelations, includeScopes });
-        const rels = extractAllRelationships(raw);
-        return enrichModelsWithGraph(raw, rels);
+        return getEnrichedGraph().enriched;
       },
 
       /**
@@ -109,8 +134,7 @@ function schemaExplorerPlugin(options = {}) {
        * @returns {Object[]}
        */
       getRelationships() {
-        const raw = serializeAllModels({ exclude, includeColumns, includeRelations, includeScopes });
-        return extractAllRelationships(raw);
+        return getEnrichedGraph().relationships;
       },
 
       /**
@@ -118,9 +142,7 @@ function schemaExplorerPlugin(options = {}) {
        * @returns {string}
        */
       getMermaid() {
-        const raw = serializeAllModels({ exclude, includeColumns, includeRelations, includeScopes });
-        const rels = extractAllRelationships(raw);
-        return generateMermaidErDiagram(raw, rels);
+        return getEnrichedGraph().mermaid;
       },
 
       extractAllRelationships,
@@ -250,21 +272,17 @@ function schemaExplorerPlugin(options = {}) {
                   method: 'get',
                   path: '',
                   handler: (req, res) => {
-                    const rawModels = serializeAllModels({ exclude, includeColumns, includeRelations, includeScopes });
-                    const relationships = extractAllRelationships(rawModels);
-                    const models = enrichModelsWithGraph(rawModels, relationships);
-                    const mermaid = generateMermaidErDiagram(rawModels, relationships);
-
+                    const graph = getEnrichedGraph();
                     res.json({
                       meta: {
                         version: '1.0.0',
                         generatedAt: new Date().toISOString(),
-                        modelCount: models.length,
-                        relationCount: relationships.length,
+                        modelCount: graph.enriched.length,
+                        relationCount: graph.relationships.length,
                       },
-                      models,
-                      relationships,
-                      mermaid,
+                      models: graph.enriched,
+                      relationships: graph.relationships,
+                      mermaid: graph.mermaid,
                     });
                   },
                 },
@@ -272,19 +290,14 @@ function schemaExplorerPlugin(options = {}) {
                   method: 'get',
                   path: '/relations',
                   handler: (req, res) => {
-                    const rawModels = serializeAllModels({ exclude, includeColumns, includeRelations, includeScopes });
-                    const relationships = extractAllRelationships(rawModels);
-                    res.json({ relationships });
+                    res.json({ relationships: getEnrichedGraph().relationships });
                   },
                 },
                 {
                   method: 'get',
                   path: '/mermaid',
                   handler: (req, res) => {
-                    const rawModels = serializeAllModels({ exclude, includeColumns, includeRelations, includeScopes });
-                    const relationships = extractAllRelationships(rawModels);
-                    const mermaid = generateMermaidErDiagram(rawModels, relationships);
-                    res.json({ mermaid });
+                    res.json({ mermaid: getEnrichedGraph().mermaid });
                   },
                 },
                 {
@@ -298,10 +311,8 @@ function schemaExplorerPlugin(options = {}) {
                       return res.status(404).json({ error: `Model "${modelName}" not found` });
                     }
 
-                    const rawModels = serializeAllModels({ exclude, includeColumns, includeRelations, includeScopes });
-                    const relationships = extractAllRelationships(rawModels);
-                    const models = enrichModelsWithGraph(rawModels, relationships);
-                    const found = models.find(m => m.name === modelName);
+                    const graph = getEnrichedGraph();
+                    const found = graph.enriched.find(m => m.name === modelName);
 
                     res.json({ model: found });
                   },

package/plugins/seo-checker/index.js

@@ -50,12 +50,15 @@ function seoCheckerPlugin(options = {}) {
       // Inject panel styles into head
       ctx.injectHead(generatePanelStyles(), { priority: 100 });
 
+      const safeSettings = JSON.stringify(mergedSettings).replace(/</g, '\\u003c').replace(/>/g, '\\u003e');
+      const safeChecks = JSON.stringify(checkDefinitions).replace(/</g, '\\u003c').replace(/>/g, '\\u003e');
+
       // Inject panel HTML and analyzer script into body
       ctx.injectBody(`
         ${generatePanelHtml(checkDefinitions)}
         <script>
-          window.__SEO_CHECKER_SETTINGS__ = ${JSON.stringify(mergedSettings)};
-          window.__SEO_CHECKER_CHECKS__ = ${JSON.stringify(checkDefinitions)};
+          window.__SEO_CHECKER_SETTINGS__ = ${safeSettings};
+          window.__SEO_CHECKER_CHECKS__ = ${safeChecks};
         </script>
         <script>${analyzerScript}</script>
       `);

package/plugins/site-analytics/bot-patterns.js

@@ -27,9 +27,12 @@ const BOT_PATTERNS = [
   { pattern: /petalbot/i, name: 'PetalBot' },
   { pattern: /gptbot/i, name: 'GPTBot' },
   { pattern: /claudebot/i, name: 'ClaudeBot' },
+  { pattern: /amazonbot/i, name: 'Amazon' },
   { pattern: /anthropic/i, name: 'Anthropic' },
   { pattern: /ccbot/i, name: 'CCBot' },
   { pattern: /bytespider/i, name: 'ByteSpider' },
+  { pattern: /dataforseo/i, name: 'DataForSEO' },
+  { pattern: /yisouspider/i, name: 'Yisou' },
   { pattern: /open-research-bot/i, name: 'open-research-bot' },
   { pattern: /ptb12/i, name: 'PTB12' },
   { pattern: /curl\//i, name: 'curl' },

package/plugins/site-analytics/client-error-handler.js

@@ -4,6 +4,8 @@
  * @module plugins/site-analytics/client-error-handler
  */
 
+const { formatDbError } = require('./tracking');
+
 const DEFAULT_TABLE = 'analytics_client_errors';
 
 /**
@@ -71,7 +73,7 @@ function createErrorReportHandler(options) {
 
       res.status(202).json({ ok: true });
     } catch (e) {
-      console.error('[site-analytics] Client error report failed:', e.message);
+      console.error('[site-analytics] Client error report failed:', formatDbError(e));
       res.status(500).json({ error: 'Report failed' });
     }
   };

package/plugins/site-analytics/index.js

@@ -140,6 +140,8 @@ function siteAnalyticsPlugin(options = {}) {
     }
   }
 
+  let trackingMiddleware = null;
+
   return {
     name: 'site-analytics',
     version: '1.0.0',
@@ -177,13 +179,17 @@ function siteAnalyticsPlugin(options = {}) {
     register(ctx) {
       const knex = db.knex || db;
 
-      const trackingMiddleware = createTrackingMiddleware({
+      trackingMiddleware = createTrackingMiddleware({
         knex,
         excludePaths,
         trackBots,
         tableName,
         batchSize: options.batchSize ?? 20,
         flushIntervalMs: options.flushIntervalMs ?? 3000,
+        maxRetries: options.maxRetries ?? 3,
+        maxBackoffMs: options.maxBackoffMs ?? 60000,
+        maxQueueSize: options.maxQueueSize ?? 5000,
+        errorLogIntervalMs: options.errorLogIntervalMs ?? 60000,
       });
 
       ctx.app.use(trackingMiddleware);
@@ -199,15 +205,18 @@ function siteAnalyticsPlugin(options = {}) {
 
       return () => {
         stopCleanup();
+        if (trackingMiddleware && trackingMiddleware.stop) trackingMiddleware.stop();
       };
     },
 
     dispose() {
       stopCleanup();
+      if (trackingMiddleware && trackingMiddleware.stop) trackingMiddleware.stop();
     },
 
     shutdown() {
       stopCleanup();
+      if (trackingMiddleware && trackingMiddleware.stop) trackingMiddleware.stop();
     },
 
     onRoutesReady(ctx) {