webspresso 0.0.102 → 0.0.104

package/plugins/webhooks/sender.js

@@ -32,7 +32,8 @@ const { signPayload } = require('./crypto');
  *   timestamp: number
  * }>}
  */
-async function sendWebhook(options) {
+async function sendWebhook(options = {}) {
+  const opts = options || {};
   const {
     url,
     event,
@@ -43,7 +44,7 @@ async function sendWebhook(options) {
     timeoutMs = 10000,
     wrapPayload = true,
     maxResponseBodyLength = 2048,
-  } = options;
+  } = opts;
 
   if (!url || typeof url !== 'string') {
     return {
@@ -57,6 +58,32 @@ async function sendWebhook(options) {
     };
   }
 
+  let parsedUrl;
+  try {
+    parsedUrl = new URL(url);
+    if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
+      return {
+        success: false,
+        statusCode: 0,
+        responseBody: '',
+        durationMs: 0,
+        error: `Invalid webhook URL protocol: "${parsedUrl.protocol}". Only http: and https: are supported.`,
+        deliveryId,
+        timestamp: Math.floor(Date.now() / 1000),
+      };
+    }
+  } catch (err) {
+    return {
+      success: false,
+      statusCode: 0,
+      responseBody: '',
+      durationMs: 0,
+      error: 'Invalid webhook URL: destination URL is malformed.',
+      deliveryId,
+      timestamp: Math.floor(Date.now() / 1000),
+    };
+  }
+
   const timestamp = Math.floor(Date.now() / 1000);
 
   // Construct request body
@@ -116,6 +143,9 @@ async function sendWebhook(options) {
     timeoutId = setTimeout(() => {
       controller.abort();
     }, timeoutMs);
+    if (timeoutId && timeoutId.unref) {
+      timeoutId.unref();
+    }
 
     const response = await fetch(url, {
       method: 'POST',

package/src/api/api-loader.js

@@ -95,7 +95,7 @@ function createApiHandler(descriptor, context) {
       // 1. Reload module in development
       if (isDev) {
         try {
-          const resolvedPath = require.resolve(descriptor.file);
+          const resolvedPath = descriptor._resolvedPath || (descriptor._resolvedPath = require.resolve(descriptor.file));
           if (require.cache[resolvedPath]) {
             delete require.cache[resolvedPath];
             cachedMiddlewares = null;

package/src/dev-reload/index.js

@@ -15,6 +15,8 @@ const CLIENT_RUNTIME_SCRIPT = `(function() {
 
   var es = null;
   var reconnectTimer = null;
+  var wasConnected = false;
+  var reconnectDelay = 200;
 
   function reloadCss(targetFile) {
     var links = document.querySelectorAll('link[rel="stylesheet"]');
@@ -166,6 +168,36 @@ const CLIENT_RUNTIME_SCRIPT = `(function() {
     document.addEventListener('keydown', onKeyDown);
   }
 
+  function safeReload(reason) {
+    clearOverlay();
+    var reasonMsg = reason ? ' (' + reason + ')' : '';
+    console.log('[Webspresso] 🔄 Reloading page' + reasonMsg + '...');
+
+    // Ping server with lightweight HEAD request to make sure it is ready before full reload.
+    // This prevents browser "This site can't be reached" (ERR_CONNECTION_REFUSED) screens
+    // when the dev server is in the middle of restarting.
+    function pingAndReload() {
+      if (typeof window.fetch !== 'function') {
+        window.location.reload();
+        return;
+      }
+
+      fetch(window.location.href, { method: 'HEAD', cache: 'no-store' })
+        .then(function(res) {
+          if (res.ok || res.status < 500) {
+            window.location.reload();
+          } else {
+            setTimeout(pingAndReload, 150);
+          }
+        })
+        .catch(function() {
+          setTimeout(pingAndReload, 150);
+        });
+    }
+
+    setTimeout(pingAndReload, 30);
+  }
+
   function connect() {
     if (es) {
       try { es.close(); } catch (_) {}
@@ -173,6 +205,16 @@ const CLIENT_RUNTIME_SCRIPT = `(function() {
 
     es = new window.EventSource('${SSE_ENDPOINT_PATH}');
 
+    es.addEventListener('open', function() {
+      reconnectDelay = 200;
+      if (wasConnected) {
+        console.log('[Webspresso] 🔄 Dev server reconnected, reloading page...');
+        safeReload('server reconnected');
+        return;
+      }
+      wasConnected = true;
+    });
+
     es.addEventListener('reload', function(e) {
       try {
         var data = JSON.parse(e.data);
@@ -180,10 +222,7 @@ const CLIENT_RUNTIME_SCRIPT = `(function() {
           clearOverlay();
           reloadCss(data.file);
         } else if (data.type === 'full') {
-          clearOverlay();
-          var reasonMsg = data.reason ? ' (' + data.reason + ')' : '';
-          console.log('[Webspresso] 🔄 Reloading page' + reasonMsg + '...');
-          window.location.reload();
+          safeReload(data.reason);
         } else if (data.type === 'error') {
           showOverlay(data);
         } else if (data.type === 'clear-error') {
@@ -195,12 +234,14 @@ const CLIENT_RUNTIME_SCRIPT = `(function() {
     });
 
     es.onerror = function() {
-      es.close();
+      try { es.close(); } catch (_) {}
       if (!reconnectTimer) {
+        var delay = reconnectDelay;
+        reconnectDelay = Math.min(reconnectDelay * 1.5, 1500);
         reconnectTimer = setTimeout(function() {
           reconnectTimer = null;
           connect();
-        }, 2000);
+        }, delay);
       }
     };
   }

package/src/discovery/scan-routes.js

@@ -94,6 +94,19 @@ function scanDirSafely(dirPath, baseDir = dirPath, checkWarnings = false) {
   return results;
 }
 
+let isWebspressoPackageCache = null;
+function checkIsWebspressoPackage() {
+  if (isWebspressoPackageCache === null) {
+    try {
+      const pkg = JSON.parse(fs.readFileSync(path.join(process.cwd(), 'package.json'), 'utf8'));
+      isWebspressoPackageCache = Boolean(pkg && pkg.name === 'webspresso');
+    } catch (_) {
+      isWebspressoPackageCache = false;
+    }
+  }
+  return isWebspressoPackageCache;
+}
+
 /**
  * Scans configured pages, api, and module directories
  * @param {Object} options
@@ -106,10 +119,7 @@ function scanDirSafely(dirPath, baseDir = dirPath, checkWarnings = false) {
 function scanRoutes(options = {}) {
   const rootDir = options.rootDir || (() => {
     if (process.env.NODE_ENV === 'test') {
-      try {
-        const pkg = JSON.parse(fs.readFileSync(path.join(process.cwd(), 'package.json'), 'utf8'));
-        if (pkg.name === 'webspresso') return process.cwd();
-      } catch (_) {}
+      if (checkIsWebspressoPackage()) return process.cwd();
       return path.resolve(__dirname, '../..');
     }
     return process.cwd();

package/src/file-router.js

@@ -190,6 +190,10 @@ const translatorCache = new Map();
 
 function clearTranslatorCache() {
   translatorCache.clear();
+  intlNumberFormatCache.clear();
+  intlDateTimeFormatCache.clear();
+  intlRelativeTimeFormatCache.clear();
+  filePathToRouteCache.clear();
 }
 
 // Cache for route configs in production
@@ -215,6 +219,48 @@ const methodFromFilenameCache = new Map();
 // Cache for translation param replacement regexes
 const paramRegexCache = new Map();
 
+// Caches for file-to-route resolution and Intl formatters
+const filePathToRouteCache = new Map();
+const intlNumberFormatCache = new Map();
+const intlDateTimeFormatCache = new Map();
+const intlRelativeTimeFormatCache = new Map();
+
+function getCachedNumberFormat(locale, opts) {
+  const key = opts ? `${locale}::${JSON.stringify(opts)}` : locale;
+  let fmt = intlNumberFormatCache.get(key);
+  if (!fmt) {
+    fmt = new Intl.NumberFormat(locale, opts);
+    if (intlNumberFormatCache.size < 500) {
+      intlNumberFormatCache.set(key, fmt);
+    }
+  }
+  return fmt;
+}
+
+function getCachedDateTimeFormat(locale, opts) {
+  const key = opts ? `${locale}::${JSON.stringify(opts)}` : locale;
+  let fmt = intlDateTimeFormatCache.get(key);
+  if (!fmt) {
+    fmt = new Intl.DateTimeFormat(locale, opts);
+    if (intlDateTimeFormatCache.size < 500) {
+      intlDateTimeFormatCache.set(key, fmt);
+    }
+  }
+  return fmt;
+}
+
+function getCachedRelativeTimeFormat(locale, opts) {
+  const key = opts ? `${locale}::${JSON.stringify(opts)}` : locale;
+  let fmt = intlRelativeTimeFormatCache.get(key);
+  if (!fmt) {
+    fmt = new Intl.RelativeTimeFormat(locale, opts);
+    if (intlRelativeTimeFormatCache.size < 500) {
+      intlRelativeTimeFormatCache.set(key, fmt);
+    }
+  }
+  return fmt;
+}
+
 const MAX_LOCALE_LEN = 16;
 
 let cachedSupportedLocalesRaw = null;
@@ -404,6 +450,12 @@ function isApiRouteFile(file) {
  * @returns {string} Express route pattern
  */
 function filePathToRoute(filePath, ext) {
+  const cacheKey = filePath + '::' + ext;
+  const cached = filePathToRouteCache.get(cacheKey);
+  if (cached !== undefined) {
+    return cached;
+  }
+
   // Remove extension
   let route = filePath.replace(ext, '');
   
@@ -429,6 +481,10 @@ function filePathToRoute(filePath, ext) {
     route = '/' + route;
   }
   
+  if (filePathToRouteCache.size < 5000) {
+    filePathToRouteCache.set(cacheKey, route);
+  }
+
   return route;
 }
 
@@ -886,8 +942,8 @@ function createTranslator(translations = {}, options = EMPTY_OBJECT) {
       return value;
     }
 
-    // Replace params like {{name}} in the translation
-    if (interpolationParams && interpolationParams !== EMPTY_OBJECT && Object.keys(interpolationParams).length > 0) {
+    // Replace params like {{name}} in the translation (skip if no placeholders in template)
+    if (value.includes('{{') && interpolationParams && interpolationParams !== EMPTY_OBJECT && Object.keys(interpolationParams).length > 0) {
       for (const [paramKey, paramValue] of Object.entries(interpolationParams)) {
         let regex = paramRegexCache.get(paramKey);
         if (regex === undefined) {
@@ -911,7 +967,7 @@ function createTranslator(translations = {}, options = EMPTY_OBJECT) {
   t.number = function formatNumber(num, numOpts) {
     if (num === null || num === undefined || Number.isNaN(Number(num))) return '';
     try {
-      return new Intl.NumberFormat(locale, numOpts).format(Number(num));
+      return getCachedNumberFormat(locale, numOpts).format(Number(num));
     } catch {
       return String(num);
     }
@@ -921,7 +977,7 @@ function createTranslator(translations = {}, options = EMPTY_OBJECT) {
   t.currency = function formatCurrency(amount, currency = 'USD', currOpts = {}) {
     if (amount === null || amount === undefined || Number.isNaN(Number(amount))) return '';
     try {
-      return new Intl.NumberFormat(locale, { style: 'currency', currency, ...currOpts }).format(Number(amount));
+      return getCachedNumberFormat(locale, { style: 'currency', currency, ...currOpts }).format(Number(amount));
     } catch {
       return `${amount} ${currency}`;
     }
@@ -933,7 +989,7 @@ function createTranslator(translations = {}, options = EMPTY_OBJECT) {
     try {
       const d = date instanceof Date ? date : new Date(date);
       if (Number.isNaN(d.getTime())) return '';
-      return new Intl.DateTimeFormat(locale, dateOpts).format(d);
+      return getCachedDateTimeFormat(locale, dateOpts).format(d);
     } catch {
       return String(date);
     }
@@ -943,7 +999,7 @@ function createTranslator(translations = {}, options = EMPTY_OBJECT) {
   t.relativeTime = function formatRelativeTime(val, unit = 'day', relOpts = { numeric: 'auto' }) {
     if (val === null || val === undefined || Number.isNaN(Number(val))) return '';
     try {
-      return new Intl.RelativeTimeFormat(locale, relOpts).format(Number(val), unit);
+      return getCachedRelativeTimeFormat(locale, relOpts).format(Number(val), unit);
     } catch {
       return `${val} ${unit}`;
     }

package/src/helpers.js

@@ -21,6 +21,25 @@ dayjs.extend(customParseFormat);
 // Cache for isPath regex patterns
 const isPathRegexCache = new Map();
 
+// Caches for manifest files and filesystem existence checks
+const manifestFileCache = new Map();
+const diskExistenceCache = new Map();
+
+function cachedExistsSync(filePath) {
+  const cached = diskExistenceCache.get(filePath);
+  if (cached !== undefined) return cached;
+  let exists = false;
+  try {
+    exists = fs.existsSync(filePath);
+  } catch (_) {
+    exists = false;
+  }
+  if (diskExistenceCache.size < 2000) {
+    diskExistenceCache.set(filePath, exists);
+  }
+  return exists;
+}
+
 /**
  * Asset Manager - handles asset paths, versioning, and manifest
  */
@@ -34,6 +53,12 @@ class AssetManager {
     this.version = options.version || null;
     this.prefix = options.prefix || '';
     
+    // Per-instance fast-path caches
+    this._resolveCache = new Map();
+    this._hasJsCache = new Map();
+    this._hasCssCache = new Map();
+    this._lookupIndex = null;
+    
     // Auto-detect manifest if not explicitly provided
     if (!this.manifestPath) {
       const candidates = [
@@ -42,7 +67,7 @@ class AssetManager {
         path.join(this.publicDir, '.vite', 'manifest.json'),
       ];
       for (const candidate of candidates) {
-        if (fs.existsSync(candidate)) {
+        if (cachedExistsSync(candidate)) {
           this.manifestPath = candidate;
           break;
         }
@@ -54,6 +79,25 @@ class AssetManager {
       this.loadManifest();
     }
   }
+
+  /**
+   * Pre-build lookup index for fast O(1) fallback matching
+   */
+  _buildLookupIndex() {
+    if (!this.manifest || typeof this.manifest !== 'object') {
+      this._lookupIndex = null;
+      return;
+    }
+    const idx = new Map();
+    for (const [key, val] of Object.entries(this.manifest)) {
+      idx.set(key, val);
+      const base = path.basename(key);
+      if (!idx.has(base)) {
+        idx.set(base, val);
+      }
+    }
+    this._lookupIndex = idx;
+  }
   
   /**
    * Load asset manifest file (Vite, Webpack, etc.)
@@ -62,12 +106,35 @@ class AssetManager {
     try {
       const fullPath = path.resolve(this.manifestPath);
       if (fs.existsSync(fullPath)) {
-        const content = fs.readFileSync(fullPath, 'utf-8');
-        this.manifest = JSON.parse(content);
+        try {
+          const stats = fs.statSync(fullPath);
+          const cached = manifestFileCache.get(fullPath);
+          if (cached && cached.mtimeMs === stats.mtimeMs && cached.size === stats.size) {
+            this.manifest = cached.manifest;
+            this._lookupIndex = cached.lookupIndex;
+            return;
+          }
+          const content = fs.readFileSync(fullPath, 'utf-8');
+          this.manifest = JSON.parse(content);
+          this._buildLookupIndex();
+          manifestFileCache.set(fullPath, {
+            mtimeMs: stats.mtimeMs,
+            size: stats.size,
+            manifest: this.manifest,
+            lookupIndex: this._lookupIndex,
+          });
+          return;
+        } catch (_) {
+          const content = fs.readFileSync(fullPath, 'utf-8');
+          this.manifest = JSON.parse(content);
+          this._buildLookupIndex();
+          return;
+        }
       }
     } catch (err) {
       console.warn('Failed to load asset manifest:', err.message);
       this.manifest = null;
+      this._lookupIndex = null;
     }
   }
   
@@ -77,6 +144,9 @@ class AssetManager {
    * @returns {string}
    */
   resolve(assetPath) {
+    const cached = this._resolveCache.get(assetPath);
+    if (cached !== undefined) return cached;
+
     // Remove leading slash for manifest lookup
     const lookupPath = assetPath.replace(/^\//, '');
     
@@ -85,7 +155,12 @@ class AssetManager {
       // 1. Direct match with lookupPath or assetPath
       let entry = this.manifest[lookupPath] || this.manifest[assetPath];
 
-      // 2. Flexible fallback: match by basename or trailing path
+      // 2. Fast lookup index match
+      if (!entry && this._lookupIndex) {
+        entry = this._lookupIndex.get(lookupPath) || this._lookupIndex.get(path.basename(lookupPath));
+      }
+
+      // 3. Flexible fallback: match by basename or trailing path
       if (!entry) {
         const baseName = path.basename(lookupPath);
         for (const [key, val] of Object.entries(this.manifest)) {
@@ -102,14 +177,20 @@ class AssetManager {
       }
 
       if (entry) {
+        let result;
         // Webpack string format (e.g. "/dist/app.xyz789.js")
         if (typeof entry === 'string') {
-          return this.prefix + entry;
-        }
-        // Vite / esbuild metafile format (e.g. { file: "assets/app-xyz789.js" })
-        if (entry.file) {
+          result = this.prefix + entry;
+        } else if (entry.file) {
+          // Vite / esbuild metafile format (e.g. { file: "assets/app-xyz789.js" })
           const file = entry.file.startsWith('/') ? entry.file : '/' + entry.file;
-          return this.prefix ? (this.prefix + file).replace(/\/+/g, '/') : file;
+          result = this.prefix ? (this.prefix + file).replace(/\/+/g, '/') : file;
+        }
+        if (result !== undefined) {
+          if (this._resolveCache.size < 2000) {
+            this._resolveCache.set(assetPath, result);
+          }
+          return result;
         }
       }
     }
@@ -123,6 +204,9 @@ class AssetManager {
       finalPath += `${separator}v=${this.version}`;
     }
     
+    if (this._resolveCache.size < 2000) {
+      this._resolveCache.set(assetPath, finalPath);
+    }
     return finalPath;
   }
   
@@ -136,8 +220,11 @@ class AssetManager {
   /**
    * Generate CSS link tag
    */
-  css(href, attributes = {}) {
+  css(href, attributes) {
     const resolvedHref = this.resolve(href);
+    if (!attributes || Object.keys(attributes).length === 0) {
+      return `<link rel="stylesheet" href="${this.escapeHtml(resolvedHref)}">`;
+    }
     const attrs = this.buildAttributes({
       rel: 'stylesheet',
       href: resolvedHref,
@@ -149,8 +236,11 @@ class AssetManager {
   /**
    * Generate JS script tag
    */
-  js(src, attributes = {}) {
+  js(src, attributes) {
     const resolvedSrc = this.resolve(src);
+    if (!attributes || Object.keys(attributes).length === 0) {
+      return `<script src="${this.escapeHtml(resolvedSrc)}"></script>`;
+    }
     const attrs = this.buildAttributes({
       src: resolvedSrc,
       ...attributes
@@ -161,8 +251,11 @@ class AssetManager {
   /**
    * Generate image tag
    */
-  img(src, alt = '', attributes = {}) {
+  img(src, alt = '', attributes) {
     const resolvedSrc = this.resolve(src);
+    if (!attributes || Object.keys(attributes).length === 0) {
+      return `<img src="${this.escapeHtml(resolvedSrc)}" alt="${this.escapeHtml(alt)}">`;
+    }
     const attrs = this.buildAttributes({
       src: resolvedSrc,
       alt,
@@ -325,6 +418,9 @@ class AssetManager {
    */
   hasPageJs(name) {
     if (!name || typeof name !== 'string') return false;
+    const cached = this._hasJsCache.get(name);
+    if (cached !== undefined) return cached;
+
     let clean = String(name).trim().replace(/^\/+/, '');
     if (clean.startsWith('pages/')) clean = clean.slice(6);
     if (clean.startsWith('dist/pages/')) clean = clean.slice(11);
@@ -343,6 +439,7 @@ class AssetManager {
         this.manifest['src/client/' + pagePath] ||
         this.manifest['client/' + pagePath]
       ) {
+        if (this._hasJsCache.size < 500) this._hasJsCache.set(name, true);
         return true;
       }
     }
@@ -369,13 +466,13 @@ class AssetManager {
     ];
 
     for (const p of diskChecks) {
-      try {
-        if (fs.existsSync(p)) {
-          return true;
-        }
-      } catch (_) {}
+      if (cachedExistsSync(p)) {
+        if (this._hasJsCache.size < 500) this._hasJsCache.set(name, true);
+        return true;
+      }
     }
 
+    if (this._hasJsCache.size < 500) this._hasJsCache.set(name, false);
     return false;
   }
 
@@ -386,6 +483,9 @@ class AssetManager {
    */
   hasPageCss(name) {
     if (!name || typeof name !== 'string') return false;
+    const cached = this._hasCssCache.get(name);
+    if (cached !== undefined) return cached;
+
     let clean = String(name).trim().replace(/^\/+/, '');
     if (clean.startsWith('pages/')) clean = clean.slice(6);
     if (clean.startsWith('dist/pages/')) clean = clean.slice(11);
@@ -404,6 +504,7 @@ class AssetManager {
         this.manifest['src/client/' + pagePath] ||
         this.manifest['client/' + pagePath]
       ) {
+        if (this._hasCssCache.size < 500) this._hasCssCache.set(name, true);
         return true;
       }
     }
@@ -426,13 +527,13 @@ class AssetManager {
     ];
 
     for (const p of diskChecks) {
-      try {
-        if (fs.existsSync(p)) {
-          return true;
-        }
-      } catch (_) {}
+      if (cachedExistsSync(p)) {
+        if (this._hasCssCache.size < 500) this._hasCssCache.set(name, true);
+        return true;
+      }
     }
 
+    if (this._hasCssCache.size < 500) this._hasCssCache.set(name, false);
     return false;
   }
 
@@ -507,22 +608,26 @@ class AssetManager {
    * Build HTML attributes string
    */
   buildAttributes(attrs) {
-    return Object.entries(attrs)
-      .filter(([k, v]) => v !== undefined && v !== null && v !== false && /^[a-zA-Z0-9_\-:]+$/.test(k))
-      .map(([k, v]) => v === true ? k : `${k}="${this.escapeHtml(String(v))}"`)
-      .join(' ');
+    if (!attrs || typeof attrs !== 'object') return '';
+    let result = '';
+    const keys = Object.keys(attrs);
+    for (let i = 0; i < keys.length; i++) {
+      const k = keys[i];
+      const v = attrs[k];
+      if (v === undefined || v === null || v === false || !/^[a-zA-Z0-9_\-:]+$/.test(k)) {
+        continue;
+      }
+      if (result) result += ' ';
+      result += v === true ? k : `${k}="${this.escapeHtml(String(v))}"`;
+    }
+    return result;
   }
   
   /**
    * Escape HTML special characters
    */
   escapeHtml(str) {
-    return str
-      .replace(/&/g, '&amp;')
-      .replace(/"/g, '&quot;')
-      .replace(/'/g, '&#39;')
-      .replace(/</g, '&lt;')
-      .replace(/>/g, '&gt;');
+    return require('../core/utils/html').escapeHtml(str);
   }
 }
 
@@ -2091,6 +2196,26 @@ const utils = {
 
   pageAssets(nameOrAttrs, attrs) {
     return getAssetManager().pageAssets(nameOrAttrs, attrs);
+  },
+
+  fetchWithTimeout(url, options) {
+    return require('../core/utils/fetch').fetchWithTimeout(url, options);
+  },
+
+  safeCompare(a, b) {
+    return require('../core/utils/crypto').safeCompare(a, b);
+  },
+
+  escapeHtml(value) {
+    return require('../core/utils/html').escapeHtml(value);
+  },
+
+  unescapeHtml(value) {
+    return require('../core/utils/html').unescapeHtml(value);
+  },
+
+  getClientIp(req, fallback) {
+    return require('../core/utils/ip').getClientIp(req, fallback);
   }
 };