webspresso 0.0.101 → 0.0.103

package/core/auth/user-agent.js

@@ -39,6 +39,28 @@ function getClientIp(req) {
     '127.0.0.1';
 }
 
+/**
+ * Parse raw User-Agent header string into structured device info
+ * Zero external dependencies — pure regex extraction
+ * 
+ * @param {string} [userAgent='']
+ * @returns {DeviceInfo}
+ */
+const MAX_UA_CACHE = 512;
+const uaCache = new Map();
+
+const EMPTY_DEVICE_INFO = Object.freeze({
+  browser: 'Unknown',
+  os: 'Unknown',
+  device: 'unknown',
+  isMobile: false,
+  isTablet: false,
+  isDesktop: false,
+  isBot: false,
+});
+
+const BOT_PATTERN = /googlebot|bingbot|yandex|baiduspider|duckduckbot|slurp|twitterbot|facebookexternalhit|rogerbot|linkedinbot|embedly|quora link preview|showyoubot|outbrain|pinterest\/|slackbot|vkshare|w3c_validator|whatsapp|curl|wget|postman/i;
+
 /**
  * Parse raw User-Agent header string into structured device info
  * Zero external dependencies — pure regex extraction
@@ -50,34 +72,30 @@ function parseUserAgent(userAgent = '') {
   const ua = String(userAgent || '').trim();
 
   if (!ua) {
-    return {
-      browser: 'Unknown',
-      os: 'Unknown',
-      device: 'unknown',
-      isMobile: false,
-      isTablet: false,
-      isDesktop: false,
-      isBot: false,
-    };
+    return { ...EMPTY_DEVICE_INFO };
+  }
+
+  const cached = uaCache.get(ua);
+  if (cached) {
+    return { ...cached };
   }
 
   // 1. Detect Bots / Crawlers
-  const botPattern = /googlebot|bingbot|yandex|baiduspider|duckduckbot|slurp|twitterbot|facebookexternalhit|rogerbot|linkedinbot|embedly|quora link preview|showyoubot|outbrain|pinterest\/|slackbot|vkshare|w3c_validator|whatsapp|curl|wget|postman/i;
-  const isBot = botPattern.test(ua);
+  const isBot = BOT_PATTERN.test(ua);
 
   // 2. Detect Operating System
   let os = 'Unknown';
+  let match;
   if (/iPad/i.test(ua)) {
-    const match = ua.match(/OS ([\d_\.]+)/i);
+    match = ua.match(/OS ([\d_\.]+)/i);
     os = match ? `iPadOS ${match[1].replace(/_/g, '.')}` : 'iPadOS';
   } else if (/iPhone|iPod/i.test(ua)) {
-    const match = ua.match(/OS ([\d_\.]+)/i);
+    match = ua.match(/OS ([\d_\.]+)/i);
     os = match ? `iOS ${match[1].replace(/_/g, '.')}` : 'iOS';
-  } else if (/Android/i.test(ua)) {
-    const match = ua.match(/Android (\d+(\.\d+)?)/i);
-    os = match ? `Android ${match[1]}` : 'Android';
+  } else if ((match = ua.match(/Android (\d+(\.\d+)?)/i))) {
+    os = `Android ${match[1]}`;
   } else if (/Macintosh|Mac OS X/i.test(ua)) {
-    const match = ua.match(/Mac OS X ([\d_\.]+)/i);
+    match = ua.match(/Mac OS X ([\d_\.]+)/i);
     if (match) {
       const ver = match[1].replace(/_/g, '.');
       os = `macOS ${ver}`;
@@ -100,30 +118,22 @@ function parseUserAgent(userAgent = '') {
 
   // 3. Detect Browser
   let browser = 'Unknown';
-  if (/Edg(e|A|iOS)?\/(\d+)/i.test(ua)) {
-    const match = ua.match(/Edg(e|A|iOS)?\/(\d+)/i);
-    browser = `Edge ${match ? match[2] : ''}`.trim();
-  } else if (/OPR\/(\d+)/i.test(ua)) {
-    const match = ua.match(/OPR\/(\d+)/i);
-    browser = `Opera ${match ? match[1] : ''}`.trim();
-  } else if (/SamsungBrowser\/(\d+)/i.test(ua)) {
-    const match = ua.match(/SamsungBrowser\/(\d+)/i);
-    browser = `Samsung Internet ${match ? match[1] : ''}`.trim();
-  } else if (/Brave\/(\d+)/i.test(ua)) {
-    const match = ua.match(/Brave\/(\d+)/i);
-    browser = `Brave ${match ? match[1] : ''}`.trim();
-  } else if (/Vivaldi\/(\d+)/i.test(ua)) {
-    const match = ua.match(/Vivaldi\/(\d+)/i);
-    browser = `Vivaldi ${match ? match[1] : ''}`.trim();
-  } else if (/Chrome\/(\d+)/i.test(ua) && !/Chromium/i.test(ua)) {
-    const match = ua.match(/Chrome\/(\d+)/i);
-    browser = `Chrome ${match ? match[1] : ''}`.trim();
-  } else if (/Firefox\/(\d+)/i.test(ua) || /FxiOS\/(\d+)/i.test(ua)) {
-    const match = ua.match(/(?:Firefox|FxiOS)\/(\d+)/i);
-    browser = `Firefox ${match ? match[1] : ''}`.trim();
-  } else if (/Safari/i.test(ua) && /Version\/(\d+)/i.test(ua)) {
-    const match = ua.match(/Version\/(\d+)/i);
-    browser = `Safari ${match ? match[1] : ''}`.trim();
+  if ((match = ua.match(/Edg(e|A|iOS)?\/(\d+)/i))) {
+    browser = `Edge ${match[2] || ''}`.trim();
+  } else if ((match = ua.match(/OPR\/(\d+)/i))) {
+    browser = `Opera ${match[1] || ''}`.trim();
+  } else if ((match = ua.match(/SamsungBrowser\/(\d+)/i))) {
+    browser = `Samsung Internet ${match[1] || ''}`.trim();
+  } else if ((match = ua.match(/Brave\/(\d+)/i))) {
+    browser = `Brave ${match[1] || ''}`.trim();
+  } else if ((match = ua.match(/Vivaldi\/(\d+)/i))) {
+    browser = `Vivaldi ${match[1] || ''}`.trim();
+  } else if (!/Chromium/i.test(ua) && (match = ua.match(/Chrome\/(\d+)/i))) {
+    browser = `Chrome ${match[1] || ''}`.trim();
+  } else if ((match = ua.match(/(?:Firefox|FxiOS)\/(\d+)/i))) {
+    browser = `Firefox ${match[1] || ''}`.trim();
+  } else if ((match = ua.match(/Version\/(\d+)/i)) && /Safari/i.test(ua)) {
+    browser = `Safari ${match[1] || ''}`.trim();
   } else if (/Safari/i.test(ua) && !/Chrome/i.test(ua)) {
     browser = 'Safari';
   } else if (/MSIE (\d+)/i.test(ua) || (/Trident/i.test(ua) && /rv:(\d+)/i.test(ua))) {
@@ -144,7 +154,7 @@ function parseUserAgent(userAgent = '') {
   else if (isMobile) device = 'mobile';
   else if (isDesktop) device = 'desktop';
 
-  return {
+  const result = {
     browser,
     os,
     device,
@@ -153,9 +163,18 @@ function parseUserAgent(userAgent = '') {
     isDesktop,
     isBot,
   };
+
+  if (uaCache.size >= MAX_UA_CACHE) {
+    const oldestKey = uaCache.keys().next().value;
+    uaCache.delete(oldestKey);
+  }
+  uaCache.set(ua, result);
+
+  return { ...result };
 }
 
 module.exports = {
   getClientIp,
   parseUserAgent,
 };
+

package/core/compression/compression-stream.js

@@ -5,7 +5,7 @@
  */
 
 const zlib = require('zlib');
-const { supportsBrotli } = require('./negotiate');
+const negotiate = require('./negotiate');
 
 /**
  * Create a zlib compression transform stream based on encoding
@@ -23,7 +23,7 @@ function createCompressionStream(encoding, options = {}) {
 
   switch (enc) {
     case 'br': {
-      if (!supportsBrotli()) {
+      if (options.supportsBrotli === false || !negotiate.supportsBrotli()) {
         return null;
       }
       const brotliOpts = { ...(options.brotli || {}) };

package/core/compression/middleware.js

@@ -55,6 +55,7 @@ function createCompressionMiddleware(options = {}) {
   const customFilter = typeof options.filter === 'function' ? options.filter : null;
 
   const comp = compression({
+    ...options,
     threshold,
     brotli: options.brotli,
     level: options.level,
@@ -73,7 +74,6 @@ function createCompressionMiddleware(options = {}) {
       }
       return compression.filter(req, res);
     },
-    ...options,
   });
 
   return function compressionMiddleware(req, res, next) {

package/core/compression/negotiate.js

@@ -69,6 +69,9 @@ function parseAcceptEncoding(header) {
   return results;
 }
 
+const DEFAULT_SUPPORTED_ENCODINGS = Object.freeze(getDefaultSupportedEncodings());
+const DEFAULT_SUPPORTED_STRING = DEFAULT_SUPPORTED_ENCODINGS.join(',');
+
 const selectEncodingCache = new Map();
 const MAX_ENCODING_CACHE_SIZE = 128;
 
@@ -83,16 +86,20 @@ function selectEncoding(acceptEncoding, supportedEncodings) {
     return 'identity';
   }
 
-  const supported = Array.isArray(supportedEncodings) && supportedEncodings.length > 0
-    ? supportedEncodings.map(e => e.toLowerCase()).filter(e => e !== 'br' || supportsBrotli())
-    : getDefaultSupportedEncodings();
+  const isDefault = !supportedEncodings || !Array.isArray(supportedEncodings) || supportedEncodings.length === 0;
+  const cacheKey = isDefault
+    ? `${acceptEncoding}|${DEFAULT_SUPPORTED_STRING}`
+    : `${acceptEncoding}|${supportedEncodings.join(',')}`;
 
-  const cacheKey = `${acceptEncoding}|${supported.join(',')}`;
   const cached = selectEncodingCache.get(cacheKey);
   if (cached !== undefined) {
     return cached;
   }
 
+  const supported = isDefault
+    ? DEFAULT_SUPPORTED_ENCODINGS
+    : supportedEncodings.map(e => e.toLowerCase()).filter(e => e !== 'br' || supportsBrotli());
+
   const clientPreferences = parseAcceptEncoding(acceptEncoding);
   if (clientPreferences.length === 0) {
     if (selectEncodingCache.size < MAX_ENCODING_CACHE_SIZE) {

package/core/events/dispatcher.js

@@ -12,10 +12,14 @@ const EventEmitter = require('events');
  * @param {string} pattern
  * @returns {RegExp}
  */
+const patternRegexCache = new Map();
+
 function patternToRegExp(pattern) {
   if (pattern === '*' || pattern === '**') {
     return /^.*$/;
   }
+  const cached = patternRegexCache.get(pattern);
+  if (cached !== undefined) return cached;
 
   const escaped = pattern
     .replace(/[.+?^${}()|[\]\\]/g, '\\$&') // Escape regex special chars except *
@@ -23,7 +27,11 @@ function patternToRegExp(pattern) {
     .replace(/\*/g, '[^.]+')
     .replace(/___DOUBLE_STAR___/g, '.*');
 
-  return new RegExp(`^${escaped}$`);
+  const reg = new RegExp(`^${escaped}$`);
+  if (patternRegexCache.size < 500) {
+    patternRegexCache.set(pattern, reg);
+  }
+  return reg;
 }
 
 /**
@@ -193,8 +201,9 @@ class EventDispatcher extends EventEmitter {
     // 1. Exact listeners
     if (this.exactListeners.has(event)) {
       const list = this.exactListeners.get(event);
-      const toKeep = [];
-      for (const item of list) {
+      let hasOnce = false;
+      for (let i = 0; i < list.length; i++) {
+        const item = list[i];
         if (matchesSender(item.sender, sender)) {
           matched.push({
             priority: item.priority,
@@ -207,53 +216,67 @@ class EventDispatcher extends EventEmitter {
             once: item.once,
           });
         }
-        if (!item.once) {
-          toKeep.push(item);
+        if (item.once) {
+          hasOnce = true;
         }
       }
-      this.exactListeners.set(event, toKeep);
+      if (hasOnce) {
+        this.exactListeners.set(event, list.filter((l) => !l.once));
+      }
     }
 
     // 2. Wildcard listeners
-    const remainingWildcards = [];
-    for (const item of this.wildcardListeners) {
-      if (item.regex.test(event) && matchesSender(item.sender, sender)) {
+    if (this.wildcardListeners.length > 0) {
+      let hasOnce = false;
+      for (let i = 0; i < this.wildcardListeners.length; i++) {
+        const item = this.wildcardListeners[i];
+        if (item.regex.test(event) && matchesSender(item.sender, sender)) {
+          matched.push({
+            priority: item.priority,
+            handler: item.handler,
+            isAny: false,
+            remove: () => {
+              this.wildcardListeners = this.wildcardListeners.filter((l) => l.id !== item.id);
+            },
+            once: item.once,
+          });
+          if (item.once) {
+            hasOnce = true;
+          }
+        }
+      }
+      if (hasOnce) {
+        this.wildcardListeners = this.wildcardListeners.filter((l) => !l.once);
+      }
+    }
+
+    // 3. Any listeners
+    if (this.anyListeners.length > 0) {
+      let hasOnce = false;
+      for (let i = 0; i < this.anyListeners.length; i++) {
+        const item = this.anyListeners[i];
         matched.push({
           priority: item.priority,
           handler: item.handler,
-          isAny: false,
+          isAny: true,
           remove: () => {
-            this.wildcardListeners = this.wildcardListeners.filter((l) => l.id !== item.id);
+            this.anyListeners = this.anyListeners.filter((l) => l.id !== item.id);
           },
           once: item.once,
         });
+        if (item.once) {
+          hasOnce = true;
+        }
       }
-      if (!item.once) {
-        remainingWildcards.push(item);
-      }
-    }
-    this.wildcardListeners = remainingWildcards;
-
-    // 3. Any listeners
-    const remainingAny = [];
-    for (const item of this.anyListeners) {
-      matched.push({
-        priority: item.priority,
-        handler: item.handler,
-        isAny: true,
-        remove: () => {
-          this.anyListeners = this.anyListeners.filter((l) => l.id !== item.id);
-        },
-        once: item.once,
-      });
-      if (!item.once) {
-        remainingAny.push(item);
+      if (hasOnce) {
+        this.anyListeners = this.anyListeners.filter((l) => !l.once);
       }
     }
-    this.anyListeners = remainingAny;
 
     // Sort by priority descending (higher numbers first)
-    matched.sort((a, b) => b.priority - a.priority);
+    if (matched.length > 1) {
+      matched.sort((a, b) => b.priority - a.priority);
+    }
 
     return matched;
   }

package/core/openapi/orm-components.js

@@ -2,7 +2,7 @@
  * ORM column → OpenAPI schema fragments (shared by schema-explorer and swagger plugin)
  */
 
-const { getAllModels } = require('../orm/model');
+const modelModule = require('../orm/model');
 
 /**
  * Generate OpenAPI 3 components.schemas from registered ORM models
@@ -10,8 +10,7 @@ const { getAllModels } = require('../orm/model');
  * @returns {Record<string, object>}
  */
 function generateOrmOpenApiSchemas(options = {}) {
-  const { exclude = [] } = options;
-  const models = getAllModels();
+  const { exclude = [], models = modelModule.getAllModels() } = options;
   const schemas = {};
 
   for (const [name, model] of models) {

package/core/orm/cache/listeners.js

@@ -5,7 +5,7 @@
  */
 
 const { ModelEvents, Hooks } = require('../events');
-const { getModel } = require('../model');
+const modelModule = require('../model');
 
 /** @type {Set<import('./layer').OrmCacheLayer>} */
 const layers = new Set();
@@ -27,7 +27,7 @@ function registerOrmCacheListeners(cacheLayer) {
    */
   function handleMutation(record, ctx, op) {
     const modelName = ctx.model;
-    const model = getModel(modelName);
+    const model = modelModule.getModel(modelName);
     if (!model) return;
 
     for (const layer of layers) {
@@ -68,7 +68,17 @@ function unregisterOrmCacheListeners(cacheLayer) {
   }
 }
 
+function _resetForTesting() {
+  for (const unsub of unsubs) {
+    if (typeof unsub === 'function') unsub();
+  }
+  unsubs = [];
+  layers.clear();
+  hooked = false;
+}
+
 module.exports = {
   registerOrmCacheListeners,
   unregisterOrmCacheListeners,
+  _resetForTesting,
 };

package/core/orm/json-fields.js

@@ -9,14 +9,20 @@
  * @returns {Set<string>} Set of JSON column names
  */
 function getJsonColumns(model) {
+  if (model && model._jsonColumns) {
+    return model._jsonColumns;
+  }
   const jsonCols = new Set();
-  if (model.columns) {
+  if (model && model.columns) {
     for (const [name, meta] of model.columns) {
       if (meta.type === 'json' || meta.type === 'array' || meta.type === 'files') {
         jsonCols.add(name);
       }
     }
   }
+  if (model) {
+    model._jsonColumns = jsonCols;
+  }
   return jsonCols;
 }
 

package/core/orm/model.js

@@ -4,9 +4,11 @@
  * @module core/orm/model
  */
 
+const z = require('zod');
 const { trimUrlPathSlashes } = require('../url-path-normalize');
-const { extractColumnsFromSchema } = require('./schema-helpers');
+const { createSchemaHelpers, extractColumnsFromSchema } = require('./schema-helpers');
 const { ModelEvents, Hooks } = require('./events');
+const zdb = z ? createSchemaHelpers(z) : null;
 
 /**
  * Global model registry
@@ -34,6 +36,10 @@ function defineModel(options) {
     queryLimits = {},
     cache: cacheOption,
     searchable,
+    timestamps: timestampsOpt,
+    softDelete: softDeleteOpt,
+    softDeletes: softDeletesOpt,
+    options: nestedOptions = {},
   } = options;
 
   // Validate required fields
@@ -43,15 +49,94 @@ function defineModel(options) {
   if (!table || typeof table !== 'string') {
     throw new Error('Model table is required and must be a string');
   }
-  if (!schema || typeof schema.parse !== 'function') {
+  if (!schema || typeof schema !== 'object' || (typeof schema.parse !== 'function' && Object.keys(schema).length === 0)) {
     throw new Error('Model schema is required and must be a Zod schema');
   }
 
-  let normalizedSchema = schema;
-  if (schema && schema.shape) {
-    for (const [key, val] of Object.entries(schema.shape)) {
+  // Resolve timestamps and softDelete options (from top-level flags, nested options, or scopes)
+  const timestampsConfig = timestampsOpt !== undefined
+    ? timestampsOpt
+    : (nestedOptions.timestamps !== undefined ? nestedOptions.timestamps : scopes.timestamps);
+
+  const softDeleteConfig = softDeleteOpt !== undefined
+    ? softDeleteOpt
+    : (softDeletesOpt !== undefined
+        ? softDeletesOpt
+        : (nestedOptions.softDelete !== undefined
+            ? nestedOptions.softDelete
+            : (nestedOptions.softDeletes !== undefined
+                ? nestedOptions.softDeletes
+                : scopes.softDelete)));
+
+  const isPlainObject = typeof schema.parse !== 'function';
+  const injectedFields = {};
+
+  if (timestampsConfig) {
+    const isSnake = typeof timestampsConfig === 'object'
+      ? Boolean(timestampsConfig.snakeCase || timestampsConfig.format === 'snake')
+      : (timestampsConfig === 'snake');
+    const createdCol = (typeof timestampsConfig === 'object' && timestampsConfig.createdAt)
+      || (isSnake ? 'created_at' : 'createdAt');
+    const updatedCol = (typeof timestampsConfig === 'object' && timestampsConfig.updatedAt)
+      || (isSnake ? 'updated_at' : 'updatedAt');
+
+    const hasCreated = isPlainObject
+      ? (schema[createdCol] !== undefined || schema.created_at !== undefined || schema.createdAt !== undefined)
+      : (schema.shape && (schema.shape[createdCol] !== undefined || schema.shape.created_at !== undefined || schema.shape.createdAt !== undefined));
+    const hasUpdated = isPlainObject
+      ? (schema[updatedCol] !== undefined || schema.updated_at !== undefined || schema.updatedAt !== undefined)
+      : (schema.shape && (schema.shape[updatedCol] !== undefined || schema.shape.updated_at !== undefined || schema.shape.updatedAt !== undefined));
+
+    if (!hasCreated && zdb) {
+      injectedFields[createdCol] = zdb.timestamp({ auto: 'create' });
+    }
+    if (!hasUpdated && zdb) {
+      injectedFields[updatedCol] = zdb.timestamp({ auto: 'update' });
+    }
+  }
+
+  if (softDeleteConfig) {
+    const isSnake = typeof softDeleteConfig === 'object'
+      ? Boolean(softDeleteConfig.snakeCase || softDeleteConfig.format === 'snake')
+      : (softDeleteConfig === 'snake');
+    const deletedCol = (typeof softDeleteConfig === 'object' && softDeleteConfig.deletedAt)
+      || (isSnake ? 'deleted_at' : 'deletedAt');
+
+    const hasDeleted = isPlainObject
+      ? (schema[deletedCol] !== undefined || schema.deleted_at !== undefined || schema.deletedAt !== undefined)
+      : (schema.shape && (schema.shape[deletedCol] !== undefined || schema.shape.deleted_at !== undefined || schema.shape.deletedAt !== undefined));
+
+    if (!hasDeleted && zdb) {
+      injectedFields[deletedCol] = zdb.softDelete();
+    }
+  }
+
+  let normalizedSchema;
+  if (isPlainObject) {
+    if (!zdb) {
+      throw new Error('Zod is required to compile schema object');
+    }
+    normalizedSchema = zdb.schema({
+      ...schema,
+      ...injectedFields,
+    });
+  } else {
+    normalizedSchema = schema;
+    if (Object.keys(injectedFields).length > 0 && typeof normalizedSchema.extend === 'function') {
+      const finalizedInjected = {};
+      for (const [key, field] of Object.entries(injectedFields)) {
+        finalizedInjected[key] = (field && typeof field._finalize === 'function')
+          ? field._finalize()
+          : field;
+      }
+      normalizedSchema = normalizedSchema.extend(finalizedInjected);
+    }
+  }
+
+  if (normalizedSchema && normalizedSchema.shape) {
+    for (const [key, val] of Object.entries(normalizedSchema.shape)) {
       if (val && typeof val._finalize === 'function') {
-        schema.shape[key] = val._finalize();
+        normalizedSchema.shape[key] = val._finalize();
       }
     }
   }
@@ -105,13 +190,19 @@ function defineModel(options) {
     name,
     table,
     schema: normalizedSchema,
+    _partialSchema: typeof normalizedSchema?.partial === 'function' ? normalizedSchema.partial() : normalizedSchema,
     primaryKey,
     relations: normalizedRelations,
     scopes: {
-      softDelete: scopes.softDelete || false,
-      timestamps: scopes.timestamps || false,
+      softDelete: Boolean(softDeleteConfig),
+      timestamps: Boolean(timestampsConfig),
       tenant: scopes.tenant || null,
     },
+    options: {
+      timestamps: timestampsConfig || false,
+      softDelete: softDeleteConfig || false,
+      ...nestedOptions,
+    },
     columns,
     admin: {
       enabled: admin.enabled === true, // Explicit boolean check