webspresso 0.0.103 → 0.0.104

package/bin/commands/dev.js

@@ -13,8 +13,9 @@ const { spawn } = require('child_process');
 function buildWatchArgs() {
   const args = ['--watch'];
   
-  // Add watch paths for common directories
-  const watchPaths = ['pages', 'models', 'views'];
+  // Add watch paths for server-side code directories (services, models, config, pages)
+  // Note: views contains Nunjucks templates which are live-reloaded in-memory by devReloadHub
+  const watchPaths = ['pages', 'models', 'services', 'config'];
   
   for (const dir of watchPaths) {
     if (fs.existsSync(dir)) {

package/bin/utils/orm-map-html.js

@@ -4,6 +4,7 @@
 
 const fs = require('fs');
 const path = require('path');
+const { escapeHtml } = require('../../core/utils/html');
 
 /**
  * @param {object} snapshot - { generatedAt, models }
@@ -661,14 +662,7 @@ function buildOrmMapHtml(snapshot, mermaidSource, meta = {}) {
 `;
 }
 
-function escapeHtml(s) {
-  if (s == null) return '';
-  return String(s)
-    .replace(/&/g, '&')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;');
-}
+
 
 /**
  * Optional: read package name from cwd/package.json

package/core/auth/jwt.js

@@ -5,6 +5,7 @@
  */
 
 const crypto = require('crypto');
+const { safeCompare } = require('../utils/crypto');
 
 const HS256_HEADER_BASE64URL = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9';
 
@@ -172,10 +173,7 @@ function verifyJwt(token, secret, options = {}) {
 
   const actualSignatureBuf = Buffer.from(encodedSignature, 'base64url');
 
-  if (
-    expectedSignatureBuf.length !== actualSignatureBuf.length ||
-    !crypto.timingSafeEqual(expectedSignatureBuf, actualSignatureBuf)
-  ) {
+  if (!safeCompare(expectedSignatureBuf, actualSignatureBuf)) {
     throw new Error('Invalid JWT signature');
   }
 

package/core/auth/oauth.js

@@ -6,6 +6,8 @@
  */
 
 const crypto = require('crypto');
+const { fetchWithTimeout } = require('../utils/fetch');
+const { safeCompare } = require('../utils/crypto');
 
 /**
  * Custom error class for OAuth operations
@@ -57,14 +59,17 @@ const DEFAULT_PROVIDERS = {
     userEmailsUrl: 'https://api.github.com/user/emails',
     defaultScopes: ['read:user', 'user:email'],
     defaultParams: {},
-    async fetchExtra(tokens) {
+    async fetchExtra(tokens, options = {}) {
       try {
-        const res = await fetch('https://api.github.com/user/emails', {
+        const timeout = typeof options?.timeout === 'number' ? options.timeout : 10000;
+        const res = await fetchWithTimeout('https://api.github.com/user/emails', {
           headers: {
             Authorization: `Bearer ${tokens.access_token}`,
             Accept: 'application/vnd.github.v3+json',
             'User-Agent': 'Webspresso-OAuth',
           },
+          timeout,
+          signal: options?.signal,
         });
         if (res.ok) {
           const emails = await res.json();
@@ -78,7 +83,7 @@ const DEFAULT_PROVIDERS = {
           }
         }
       } catch {
-        // Fallback gracefully if email endpoint is unreachable
+        // Fallback gracefully if email endpoint is unreachable or times out
       }
       return null;
     },
@@ -167,10 +172,7 @@ function verifySignedState(stateString, secret, maxAgeMs = 10 * 60 * 1000) {
     .update(body)
     .digest('base64url');
 
-  const bufA = Buffer.from(signature);
-  const bufB = Buffer.from(expectedSignature);
-
-  if (bufA.length !== bufB.length || !crypto.timingSafeEqual(bufA, bufB)) {
+  if (!safeCompare(signature, expectedSignature)) {
     throw new OAuthError('OAuth state signature verification failed', 'INVALID_STATE');
   }
 
@@ -202,6 +204,9 @@ class OAuthClient {
   constructor(config = {}) {
     this.secret = config.secret || process.env.OAUTH_SECRET || process.env.SESSION_SECRET || 'webspresso-oauth-secret';
     this.stateTtlMs = config.stateTtlMs || 10 * 60 * 1000;
+    this.timeout = typeof (config.timeout || config.requestTimeout) === 'number'
+      ? (config.timeout || config.requestTimeout)
+      : 10000;
     this.providers = {};
 
     if (config.providers) {
@@ -227,6 +232,7 @@ class OAuthClient {
       redirectUri: options.redirectUri || options.redirect_uri || builtin.redirectUri,
       scopes: options.scopes || options.scope || builtin.defaultScopes || [],
       params: { ...(builtin.defaultParams || {}), ...(options.params || {}) },
+      timeout: typeof options.timeout === 'number' ? options.timeout : (builtin.timeout || this.timeout || 10000),
     };
     return this;
   }
@@ -330,7 +336,7 @@ class OAuthClient {
    * @param {string} [params.codeVerifier]
    * @returns {Promise<Object>} Token response
    */
-  async exchangeCode(providerName, { code, redirectUri, codeVerifier }) {
+  async exchangeCode(providerName, { code, redirectUri, codeVerifier, timeout, signal } = {}) {
     const provider = this.getProvider(providerName);
 
     if (!code) {
@@ -354,9 +360,13 @@ class OAuthClient {
       bodyParams.set('code_verifier', codeVerifier);
     }
 
+    const requestTimeout = typeof timeout === 'number'
+      ? timeout
+      : (provider.timeout || this.timeout || 10000);
+
     let res;
     try {
-      res = await fetch(provider.tokenUrl, {
+      res = await fetchWithTimeout(provider.tokenUrl, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/x-www-form-urlencoded',
@@ -364,6 +374,8 @@ class OAuthClient {
           'User-Agent': 'Webspresso-OAuth',
         },
         body: bodyParams.toString(),
+        timeout: requestTimeout,
+        signal,
       });
     } catch (err) {
       throw new OAuthError(`Token exchange network request failed: ${err.message}`, 'NETWORK_ERROR', err);
@@ -398,7 +410,7 @@ class OAuthClient {
    * @param {Object} tokens - Tokens object returned from exchangeCode
    * @returns {Promise<Object>} Normalized user profile
    */
-  async fetchUserProfile(providerName, tokens) {
+  async fetchUserProfile(providerName, tokens, options = {}) {
     const provider = this.getProvider(providerName);
     const accessToken = tokens.access_token || tokens.accessToken;
 
@@ -406,19 +418,26 @@ class OAuthClient {
       throw new OAuthError('Missing access_token for user profile retrieval', 'MISSING_TOKEN');
     }
 
+    const requestTimeout = typeof options?.timeout === 'number'
+      ? options.timeout
+      : (provider.timeout || this.timeout || 10000);
+    const signal = options?.signal;
+
     let extraData = null;
     if (typeof provider.fetchExtra === 'function') {
-      extraData = await provider.fetchExtra(tokens);
+      extraData = await provider.fetchExtra(tokens, { timeout: requestTimeout, signal });
     }
 
     let res;
     try {
-      res = await fetch(provider.userInfoUrl, {
+      res = await fetchWithTimeout(provider.userInfoUrl, {
         headers: {
           Authorization: `Bearer ${accessToken}`,
           Accept: 'application/json',
           'User-Agent': 'Webspresso-OAuth',
         },
+        timeout: requestTimeout,
+        signal,
       });
     } catch (err) {
       throw new OAuthError(`User profile fetch failed: ${err.message}`, 'NETWORK_ERROR', err);
@@ -457,7 +476,7 @@ class OAuthClient {
    * @param {string} [params.redirectUri] - Redirect URI
    * @returns {Promise<{ provider: string, user: Object, tokens: Object, stateData: Object }>}
    */
-  async handleCallback(providerName, { code, state, redirectUri }) {
+  async handleCallback(providerName, { code, state, redirectUri, timeout, signal } = {}) {
     if (!state) {
       throw new OAuthError('Missing OAuth state in callback', 'INVALID_STATE');
     }
@@ -483,10 +502,15 @@ class OAuthClient {
       code,
       redirectUri: effectiveRedirectUri,
       codeVerifier,
+      timeout,
+      signal,
     });
 
     // Fetch normalized profile
-    const user = await this.fetchUserProfile(providerName, tokens);
+    const user = await this.fetchUserProfile(providerName, tokens, {
+      timeout,
+      signal,
+    });
 
     return {
       provider: providerName,

package/core/auth/totp.js

@@ -163,20 +163,8 @@ function generateHotp(secret, counter, options = {}) {
   return token;
 }
 
-/**
- * Timing-safe token equality check
- * @param {string} a
- * @param {string} b
- * @returns {boolean}
- */
-function timingSafeTokenCompare(a, b) {
-  if (typeof a !== 'string' || typeof b !== 'string') return false;
-  if (a.length !== b.length) return false;
-
-  const bufA = Buffer.from(a);
-  const bufB = Buffer.from(b);
-  return crypto.timingSafeEqual(bufA, bufB);
-}
+const { safeCompare } = require('../utils/crypto');
+const timingSafeTokenCompare = safeCompare;
 
 /**
  * Verify HOTP token against counter
@@ -412,7 +400,7 @@ function verifyRecoveryCode(code, hashedCodes = []) {
       continue;
     }
     const candidateBuf = Buffer.from(candidateHash, 'hex');
-    if (crypto.timingSafeEqual(targetBuf, candidateBuf)) {
+    if (safeCompare(targetBuf, candidateBuf)) {
       matchedIndex = i;
       break;
     }

package/core/auth/user-agent.js

@@ -17,27 +17,7 @@
  * @property {boolean} isBot
  */
 
-/**
- * Extract client IP address handling proxies
- * @param {Object} req - Express / Node.js HTTP request
- * @returns {string}
- */
-function getClientIp(req) {
-  if (!req) return '127.0.0.1';
-
-  const forwarded = req.headers?.['x-forwarded-for'];
-  if (forwarded) {
-    const ips = typeof forwarded === 'string' ? forwarded.split(',') : forwarded;
-    const first = Array.isArray(ips) ? ips[0] : ips;
-    if (first) return first.trim();
-  }
-
-  return req.headers?.['x-real-ip'] ||
-    req.ip ||
-    req.connection?.remoteAddress ||
-    req.socket?.remoteAddress ||
-    '127.0.0.1';
-}
+const { getClientIp } = require('../utils/ip');
 
 /**
  * Parse raw User-Agent header string into structured device info

package/core/content/renderer.js

@@ -3,19 +3,7 @@
  * @module core/content/renderer
  */
 
-/**
- * Escape HTML for text nodes (not for rich-text which uses | safe separately).
- * @param {unknown} value
- * @returns {string}
- */
-function escapeHtml(value) {
-  if (value === null || value === undefined) return '';
-  return String(value)
-    .replace(/&/g, '&')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;');
-}
+const { escapeHtml } = require('../utils/html');
 
 /**
  * @param {unknown} value

package/core/errors/middleware.js

@@ -5,6 +5,7 @@
 
 const { normalizeError, toErrorResponseObject } = require('./normalize');
 const { RequestAbortedError } = require('./domain');
+const { escapeHtml } = require('../utils/html');
 
 /**
  * Check if the request prefers a JSON error response
@@ -60,14 +61,7 @@ function renderDefaultErrorHtml(err, isDev) {
 </html>`;
 }
 
-function escapeHtml(str) {
-  return String(str || '')
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#39;');
-}
+
 
 /**
  * Create Webspresso Central Error Handler Middleware

package/core/forms/form-builder.js

@@ -4,15 +4,7 @@
  * @module core/forms/form-builder
  */
 
-function escapeHtml(str) {
-  if (str === null || str === undefined) return '';
-  return String(str)
-    .replace(/&/g, '&')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#039;');
-}
+const { escapeHtml } = require('../utils/html');
 
 /**
  * Render a single form field with label, input, and validation error message

package/core/orm/index.js

@@ -392,4 +392,9 @@ module.exports = {
   // Schema Diff & Makemigrations (Django-inspired)
   diffSchema: require('./migrations/diff').diffSchema,
   makeMigrations: require('./migrations/diff').makeMigrations,
+  // Universal Query Filters (REST Resources & Admin Panel)
+  buildFilteredQuery: require('./query-filters').buildFilteredQuery,
+  applyColumnFilters: require('./query-filters').applyColumnFilters,
+  applyFilterCondition: require('./query-filters').applyFilterCondition,
+  queryFilters: require('./query-filters'),
 };