thatcher 1.0.7 → 1.0.34

package/src/lib/index.js

@@ -1,4 +1,4 @@
-export * from '@/lib/query-engine';
+export * from '@/lib/busybase-store';
 export * from '@/lib/validate';
 export * from '@/lib/field-types';
 export * from '@/lib/field-iterator';
@@ -17,17 +17,14 @@ export {
   UnauthorizedError,
   ConflictError,
   DatabaseError,
-  ExternalAPIError,
-  errorHandler,
-  apiErrorHandler,
   normalizeError,
   formatErrorResponse,
   createErrorLogger,
 } from '@/lib/error-handler';
 export { createApiHandler } from '@/lib/api';
-export * from '@/lib/errors';
-export { getDatabase, migrate, genId, now } from '@/lib/database-core';
-export { logAction, getAuditHistory, getEntityAuditTrail, getActionStats, getUserStats } from '@/lib/audit-logger';
+export { genId, now } from '@/lib/id-helpers';
+export { setBusyBaseClient } from '@/lib/busybase-store';
+export { logAction } from '@/lib/busybase-audit';
 export * from '@/lib/realtime-server';
 export * from '@/lib/hook-engine';
 export * from '@/lib/events-engine';

package/src/lib/log-aggregator.js

@@ -32,7 +32,6 @@ function log(level, message, metadata = {}) {
     console.error(prefix, message, metaStr)
   } else if (level === 'warn') {
     console.warn(prefix, message, metaStr)
-  } else {
   }
 }
 

package/src/lib/logger.js

@@ -1,8 +1,3 @@
-/**
- * Structured Logger - Consistent logging across the SDK
- * Simple wrapper with prefix support
- */
-
 const LOG_PREFIXES = {
   API: '[API]',
   DB: '[DB]',
@@ -17,11 +12,6 @@ const LOG_PREFIXES = {
   workflow: '[Workflow]',
 };
 
-/**
- * Create a logger with prefix
- * @param {string} prefix - Log prefix (from LOG_PREFIXES or custom)
- * @returns {object} Logger with methods
- */
 export function createLogger(prefix) {
   const logger = {
     error: (msg, meta = {}) => {
@@ -43,11 +33,6 @@ export function createLogger(prefix) {
   return logger;
 }
 
-/**
- * Get prefixed logger
- * @param {string} key - Key from LOG_PREFIXES
- * @returns {object}
- */
 export function getLogger(key) {
   return createLogger(LOG_PREFIXES[key] || `[${key.toUpperCase()}]`);
 }

package/src/lib/metrics-collector.js

@@ -1,6 +1,4 @@
-/**
- * Metrics Collector - Request metrics and stats
- *
+/*
  * Thatcher keeps its original lightweight request-summary API
  * (recordRequest/getMetrics/getSummary/resetMetrics) for backward compat.
  * Merged in the richer per-channel collector API consumed by
@@ -18,13 +16,6 @@ const metrics = {
 
 let _requestCount = 0;
 
-/**
- * Record a request
- * @param {string} endpoint
- * @param {string} method
- * @param {number} durationMs
- * @param {number} statusCode
- */
 export function recordRequest(endpoint, method, durationMs, statusCode) {
   _requestCount++;
 
@@ -38,17 +29,14 @@ export function recordRequest(endpoint, method, durationMs, statusCode) {
 
   metrics.requests.push(record);
 
-  // Keep last 1000 requests
   if (metrics.requests.length > 1000) {
     metrics.requests.shift();
   }
 
-  // Track slow queries (>500ms)
   if (durationMs > 500) {
     metrics.slowQueries.push(record);
   }
 
-  // Track errors
   if (statusCode >= 400) {
     metrics.errors.push(record);
   }
@@ -63,16 +51,12 @@ export function recordRequest(endpoint, method, durationMs, statusCode) {
   if (arr.length > 1000) arr.shift();
 }
 
-/**
- * Get all metrics
- * @returns {object}
- */
 export function getMetrics() {
   const now = Date.now();
   const uptimeSec = Math.floor((now - metrics.startTime) / 1000);
 
   const requests = metrics.requests;
-  const recent = requests.filter(r => now - r.timestamp < 60000); // last minute
+  const recent = requests.filter(r => now - r.timestamp < 60000);
 
   const avgDuration = recent.length
     ? recent.reduce((sum, r) => sum + r.durationMs, 0) / recent.length
@@ -93,10 +77,6 @@ export function getMetrics() {
   };
 }
 
-/**
- * Get summary statistics
- * @returns {object}
- */
 export function getSummary() {
   const m = getMetrics();
   return {
@@ -106,9 +86,6 @@ export function getSummary() {
   };
 }
 
-/**
- * Reset metrics (for testing)
- */
 export function resetMetrics() {
   metrics.requests = [];
   metrics.slowQueries = [];
@@ -135,9 +112,6 @@ const channels = {
 const errorCounts = new Map();
 const resourceSamples = [];
 
-/**
- * Record an error against an endpoint.
- */
 export function recordError(path, method, error, stack) {
   const key = `${method}:${path}`;
   if (!channels.errors.has(key)) {
@@ -151,9 +125,6 @@ export function recordError(path, method, error, stack) {
   errorCounts.set(countKey, (errorCounts.get(countKey) || 0) + 1);
 }
 
-/**
- * Record a database operation timing.
- */
 export function recordDatabase(operation, duration, query) {
   const key = operation;
   if (!channels.database.has(key)) {
@@ -164,17 +135,11 @@ export function recordDatabase(operation, duration, query) {
   if (arr.length > 1000) arr.shift();
 }
 
-/**
- * Record a resource sample (cpu/memory/disk).
- */
 export function recordResource(cpu, memory, disk) {
   resourceSamples.push({ cpu, memory, disk, ts: Date.now() });
   if (resourceSamples.length > 1000) resourceSamples.shift();
 }
 
-/**
- * Record a custom metric value with optional tags.
- */
 export function recordCustom(name, value, tags = {}) {
   const key = name;
   if (!channels.custom.has(key)) {
@@ -192,9 +157,6 @@ function getPercentile(values, percentile) {
   return sorted[Math.max(0, index)];
 }
 
-/**
- * Compute count/min/max/avg/p50/p95/p99 stats over a data array.
- */
 export function getStats(dataArray, field = 'duration') {
   if (!dataArray || dataArray.length === 0) {
     return { count: 0, min: 0, max: 0, avg: 0, p50: 0, p95: 0, p99: 0 };
@@ -257,9 +219,6 @@ export function getResourceMetrics() {
   };
 }
 
-/**
- * Aggregate snapshot across all channels.
- */
 export function getAllMetrics() {
   return {
     requests: getRequestMetrics(),
@@ -273,9 +232,6 @@ export function getAllMetrics() {
   };
 }
 
-/**
- * Clear the per-channel collector state.
- */
 export function clearMetrics() {
   channels.requests.clear();
   channels.errors.clear();

package/src/lib/next-compat.js

@@ -1,9 +1,23 @@
 const MAX_BODY_SIZE = 10 * 1024 * 1024;
 
+// Wrap node's raw (plain-object, lowercased) headers so both the Fetch-style
+// `headers.get('x')` API and direct `headers['x']` index access work. Node
+// already lowercases header names; `.get()` lowercases its argument to match.
+function wrapHeaders(raw) {
+  const h = raw || {};
+  return new Proxy(h, {
+    get(target, prop) {
+      if (prop === 'get') return (name) => target[String(name).toLowerCase()] ?? null;
+      if (prop === 'has') return (name) => String(name).toLowerCase() in target;
+      return target[prop];
+    },
+  });
+}
+
 export class NextRequest {
   constructor(req, body, url) {
     this.method = req.method;
-    this.headers = req.headers;
+    this.headers = wrapHeaders(req.headers);
     this.url = url;
     this.body = body;
   }

package/src/lib/observability-bootstrap.js

@@ -1,8 +1,3 @@
-/**
- * Observability Bootstrap - Initializes all observability subsystems on server startup
- * Starts tracing, registers debug exposures, begins metric collection
- */
-
 import { tracer } from './tracing.js';
 import { perfProfiler } from './perf-profiler.js';
 import { debugRegistry } from './debug-registry.js';

package/src/lib/perf-monitor.js

@@ -1,3 +1,6 @@
+import { createLogger } from './logger.js';
+
+const log = createLogger('[Perf]');
 const metrics = new Map()
 const thresholds = { render: 100, query: 50, api: 200, total: 500 }
 let enabled = process.env.PERF_MONITOR !== 'false'
@@ -49,7 +52,7 @@ export function checkThreshold(key, value) {
   if (!enabled) return true
   const limit = thresholds[key]
   if (limit && value > limit) {
-    console.warn(`[PERF] ${key} exceeded threshold: ${value.toFixed(2)}ms > ${limit}ms`)
+    log.warn(`${key} exceeded threshold: ${value.toFixed(2)}ms > ${limit}ms`)
     return false
   }
   return true

package/src/lib/perf-profiler.js

@@ -1,8 +1,3 @@
-/**
- * Performance Profiler - Threshold-based profiling with regression detection
- * Per-operation p50/p95/p99 statistics with automatic alerting
- */
-
 import { createLogger } from './logger.js';
 
 const logger = createLogger('[PerfProfiler]');

package/src/lib/query-string-adapter.js

@@ -1,17 +1,9 @@
-/**
- * Query String Adapter - Parse URL query parameters into typed objects
- * Adapted from moonlanding/src/lib/query-string-adapter.js
- */
+// Adapted from moonlanding/src/lib/query-string-adapter.js
 
 // Thatcher uses a fixed default page size (no async config-engine lookup);
 // keeps QueryAdapter helpers synchronous to match existing call sites.
 const DEFAULT_PAGE_SIZE = 50;
 
-/**
- * Parse query string from URL
- * @param {object} request - Fetch Request or NextRequest-like
- * @returns {Promise<{q?: string, page?: number, pageSize?: number, filters?: object, sort?: object}>}
- */
 export async function parseQuery(request) {
   const url = request.url || (request._url ? `http://localhost${request._url}` : 'http://localhost/');
   const searchParams = new URL(url).searchParams;
@@ -45,11 +37,6 @@ export async function parseQuery(request) {
   return result;
 }
 
-/**
- * Coerce string to appropriate type
- * @param {string} value
- * @returns {any}
- */
 function coerceValue(value) {
   // Lowercase boolean strings
   if (value === 'true') return true;
@@ -63,11 +50,6 @@ function coerceValue(value) {
   return value;
 }
 
-/**
- * Get default value for config key
- * @param {string} key
- * @returns {any}
- */
 export function getDefault(key) {
   const defaults = {
     page: 1,
@@ -81,23 +63,14 @@ export function getDefault(key) {
   return defaults[key] ?? null;
 }
 
-/**
- * QueryAdapter - static helpers for parsing and building query strings.
- * Ported from moonlanding; methods kept synchronous to match thatcher call sites
- * (e.g. api.js destructures QueryAdapter.fromSearchParams(...) without await).
- */
+// Ported from moonlanding; methods kept synchronous to match thatcher call sites
+// (e.g. api.js destructures QueryAdapter.fromSearchParams(...) without await).
 export class QueryAdapter {
-  /**
-   * Parse a Request-like object. Delegates to thatcher's parseQuery so the
-   * returned shape ({ q, page, pageSize, filters, sort }) stays consistent.
-   */
+  // Delegates to thatcher's parseQuery so the returned shape stays consistent.
   static parse(request) {
     return parseQuery(request);
   }
 
-  /**
-   * Extract non-reserved filter params from a URLSearchParams instance.
-   */
   static extractFilters(searchParams) {
     const filters = {};
     const reserved = new Set(['q', 'page', 'pageSize', 'page_size', 'action', 'limit', 'offset', 'sort', 'sortBy', 'dir', 'direction', 'sortDir', 'domain']);
@@ -109,9 +82,6 @@ export class QueryAdapter {
     return filters;
   }
 
-  /**
-   * Build a URLSearchParams from a params object, dropping empty values.
-   */
   static build(params = {}) {
     const query = new URLSearchParams();
     Object.entries(params)
@@ -120,25 +90,16 @@ export class QueryAdapter {
     return query;
   }
 
-  /**
-   * Build a full URL from a base and params object.
-   */
   static buildUrl(baseUrl, params = {}) {
     const queryString = QueryAdapter.build(params).toString();
     return queryString ? `${baseUrl}?${queryString}` : baseUrl;
   }
 
-  /**
-   * Get a default value for a config key (synchronous; delegates to getDefault).
-   */
   static getDefault(key) {
     return getDefault(key);
   }
 
-  /**
-   * Parse pagination params from a URLSearchParams instance OR a plain object.
-   * Synchronous so callers can destructure the result directly.
-   */
+  // Synchronous so callers can destructure the result directly.
   static fromSearchParams(searchParams, spec = null) {
     const get = (key) => {
       if (searchParams && typeof searchParams.get === 'function') {
@@ -154,9 +115,6 @@ export class QueryAdapter {
     };
   }
 
-  /**
-   * Serialize a params object to a query string.
-   */
   static toQueryString(params = {}) {
     return QueryAdapter.build(params).toString();
   }

package/src/lib/realtime-server.js

@@ -1,30 +1,19 @@
-/**
- * Realtime Server - WebSocket/Server-Sent Events for live updates
- * Optional component - can be disabled if not needed
- */
+import { createLogger } from './logger.js';
+
+const log = createLogger('[Realtime]');
 
 let subscribers = new Map(); // channel -> Set of callbacks
 let enabled = false;
 
-/**
- * Initialize realtime (optional)
- * @param {object} server - HTTP server to attach WS endpoint
- */
 export function initRealtime(server) {
   if (!server) return;
 
   // Can be extended with ws library for full WebSocket support
   // For now, provides a polling-based notification system
   enabled = true;
-  console.log('[Realtime] Initialized (polling mode)');
+  log.info('initialized (polling mode)');
 }
 
-/**
- * Broadcast update to all subscribers of a channel
- * @param {string} channel
- * @param {string} event
- * @param {any} data
- */
 export function broadcastUpdate(channel, event, data) {
   if (!enabled) return;
 
@@ -37,28 +26,17 @@ export function broadcastUpdate(channel, event, data) {
   }
 }
 
-/**
- * Subscribe to updates for a channel
- * @param {string} channel
- * @param {Function} callback
- * @returns {Function} Unsubscribe function
- */
 export function subscribe(channel, callback) {
   if (!subscribers.has(channel)) {
     subscribers.set(channel, new Set());
   }
   subscribers.get(channel).add(callback);
 
-  // Return unsubscribe function
   return () => {
     subscribers.get(channel)?.delete(callback);
   };
 }
 
-/**
- * Get update stats
- * @returns {object}
- */
 export function getStats() {
   return {
     channels: subscribers.size,

package/src/lib/request-tracing.js

@@ -1,8 +1,3 @@
-/**
- * Request Tracing Middleware - Instruments all HTTP requests with distributed tracing
- * Wraps handlers with automatic trace/span creation and context propagation
- */
-
 import { tracer } from './tracing.js';
 import { perfProfiler } from './perf-profiler.js';
 import { createLogger } from './logger.js';

package/src/lib/resource-monitor.js

@@ -1,6 +1,9 @@
 import os from 'os'
 import fs from 'fs'
 import { recordResource } from '@/lib/metrics-collector.js'
+import { createLogger } from './logger.js';
+
+const log = createLogger('[ResourceMonitor]');
 
 let monitoringInterval = null
 let dbPath = null
@@ -69,7 +72,7 @@ function collectResources() {
 
     return { cpu, memory, disk }
   } catch (err) {
-    console.error('[ResourceMonitor] Collection error:', err)
+    log.error('collection error:', { message: err?.message || String(err) })
     return null
   }
 }

package/src/lib/response-formatter.js

@@ -1,14 +1,5 @@
-/**
- * Response Formatter - Standardized API response helpers
- */
-
 import { HTTP } from '../config/constants.js';
 
-/**
- * Successful response with data
- * @param {any} data
- * @returns {Response} NextResponse-compatible
- */
 export function ok(data) {
   return new Response(JSON.stringify(data), {
     status: HTTP.OK,
@@ -16,11 +7,6 @@ export function ok(data) {
   });
 }
 
-/**
- * Created response (201)
- * @param {any} data
- * @returns {Response}
- */
 export function created(data) {
   return new Response(JSON.stringify(data), {
     status: HTTP.CREATED,
@@ -28,12 +14,6 @@ export function created(data) {
   });
 }
 
-/**
- * Paginated response
- * @param {Array} items
- * @param {object} pagination
- * @returns {Response}
- */
 export function paginated(items, pagination) {
   return new Response(JSON.stringify({
     items,
@@ -44,21 +24,10 @@ export function paginated(items, pagination) {
   });
 }
 
-/**
- * No content response (204)
- * @returns {Response}
- */
 export function noContent() {
   return new Response(null, { status: HTTP.NO_CONTENT });
 }
 
-/**
- * Error response
- * @param {string} message
- * @param {number} status
- * @param {string} code
- * @returns {Response}
- */
 export function error(message, status = HTTP.INTERNAL_ERROR, code = 'ERROR') {
   return new Response(JSON.stringify({ error: message, code }), {
     status,
@@ -66,13 +35,6 @@ export function error(message, status = HTTP.INTERNAL_ERROR, code = 'ERROR') {
   });
 }
 
-/**
- * With metadata wrapper
- * @param {any} data
- * @param {number} status
- * @param {string} type
- * @returns {object}
- */
 export function withMetadata(data, status, type = 'success') {
   return { ...data, _meta: { status, type, timestamp: Date.now() } };
 }

package/src/lib/route-helpers.js

@@ -1,3 +1,4 @@
+import { createLogger } from '@/lib/logger.js';
 import { getSpec, getNavItems } from '@/config/spec-helpers';
 import { get, getChildren } from '@/engine';
 import { can } from '@/services/permission.service';
@@ -25,7 +26,8 @@ export async function getFormContext(entityName, id = null, action = 'create') {
 
 export const getPageProps = (user, spec) => ({ user, nav: getNavItems(), canCreate: can(user, spec, 'create'), canEdit: can(user, spec, 'edit'), canDelete: can(user, spec, 'delete') });
 
-const createMeta = (fn) => (...args) => { try { return fn(...args); } catch { return { title: 'Not Found' }; } };
+const log = createLogger('[RouteHelpers]');
+const createMeta = (fn) => (...args) => { try { return fn(...args); } catch (err) { log.warn('metadata error:', { message: err?.message || String(err) }); return { title: 'Not Found' }; } };
 
 export const listMetadata = createMeta((entity) => ({ title: getSpec(entity).labelPlural }));
 export const detailMetadata = createMeta((entity, id) => { const spec = getSpec(entity), data = get(entity, id); return { title: data?.name || data?.email || spec.label }; });

package/src/lib/safe-json.js

@@ -1,8 +1,12 @@
+import { createLogger } from './logger.js';
+
+const log = createLogger('[SafeJSON]');
+
 export const safeJsonParse = (str, fallback = null) => {
   try {
     return JSON.parse(str || 'null') ?? fallback;
   } catch {
-    console.warn('[SafeJSON] Parse failed:', str?.substring(0, 50));
+    log.warn('parse failed:', { preview: str?.substring(0, 50) });
     return fallback;
   }
 };

package/src/lib/server-bootstrap.js

@@ -1,5 +1,8 @@
 import fs from 'fs';
 import path from 'path';
+import { createLogger } from './logger.js';
+
+const log = createLogger('[Server]');
 
 export function loadEnv(filePath) {
   try {
@@ -12,18 +15,16 @@ export function loadEnv(filePath) {
       if (key) process.env[key] = value;
     });
   } catch (e) {
-    console.warn('[Server] .env file not loaded:', e.message);
+    log.warn('.env file not loaded:', { message: e.message });
   }
 }
 
 export function setupProcessGuards() {
   process.on('uncaughtException', (err) => {
-    console.error('[FATAL] Uncaught exception (process kept alive):', err?.message || err);
-    if (err?.stack) console.error(err.stack);
+    log.error('uncaught exception (process kept alive):', { message: err?.message || String(err), stack: err?.stack });
   });
   process.on('unhandledRejection', (reason) => {
-    console.error('[FATAL] Unhandled rejection (process kept alive):', reason?.message || reason);
-    if (reason?.stack) console.error(reason.stack);
+    log.error('unhandled rejection (process kept alive):', { message: reason?.message || String(reason), stack: reason?.stack });
   });
 }
 
@@ -36,18 +37,18 @@ export function setupHotReload(__dirname, moduleCache, onConfigReset) {
         if (filename && (filename.endsWith('.js') || filename.endsWith('.jsx') || filename.endsWith('.yml'))) {
           moduleCache.clear();
           globalThis.__reloadTs__ = Date.now();
-          console.log(`[Hot] Invalidated: ${filename}`);
+          log.info(`hot invalidated: ${filename}`);
           if (filename.endsWith('master-config.yml') || filename.includes('master-config')) {
             try {
               const { resetConfigEngine } = await import('./config-generator-engine.js');
               resetConfigEngine();
               onConfigReset?.();
-            } catch (e) { console.log('[Hot] Could not reset config engine:', e.message); }
+            } catch (e) { log.warn('could not reset config engine:', { message: e.message }); }
           }
         }
       });
-      watcher.on('error', (err) => console.error(`[Hot] Watcher error on ${dir}:`, err.message));
-    } catch (err) { console.error(`[Hot] Failed to watch ${dir}:`, err.message); }
+      watcher.on('error', (err) => log.error(`hot watcher error on ${dir}:`, { message: err.message }));
+    } catch (err) { log.error(`hot failed to watch ${dir}:`, { message: err.message }); }
   });
 }
 

package/src/lib/stage-pipeline.js

@@ -52,7 +52,7 @@ export function createStagePipeline(options = {}) {
     `;
 
     if (isComplete) {
-      circle.textContent = '✓';
+      circle.textContent = 'ok';
     } else {
       circle.textContent = idx + 1;
     }
@@ -110,7 +110,7 @@ export function createStagePipeline(options = {}) {
 
         if (i < idx) {
           circle.style.background = '#28a745';
-          circle.textContent = '✓';
+          circle.textContent = 'ok';
           label.style.color = '#28a745';
         } else if (i === idx) {
           circle.style.background = '#007bff';

package/src/lib/state-transport-client.js

@@ -1,5 +1,8 @@
 import Protocol from './state-protocol.js'
 import { CONFIG, ReconnectManager } from './state-transport-reconnect.js'
+import { createLogger } from './logger.js'
+
+const log = createLogger('[StateTransport]')
 
 class StateTransportClient {
   constructor(config = {}) {
@@ -151,7 +154,7 @@ class StateTransportClient {
       try {
         handler(data)
       } catch (error) {
-        console.error(`Error in event handler for ${event}:`, error)
+        log.error(`event handler error for ${event}:`, { message: error?.message || String(error) })
       }
     }
   }