millas 0.2.12-beta → 0.2.12-beta-1

package/src/http/adapters/HttpAdapter.js

@@ -0,0 +1,168 @@
+'use strict';
+
+/**
+ * HttpAdapter
+ *
+ * Abstract interface between the Millas kernel and any underlying HTTP engine.
+ * The kernel never imports Express (or Fastify, or Hono) directly — it only
+ * calls the methods defined here.
+ *
+ * To add a new HTTP engine, create a class that extends HttpAdapter and
+ * implements every method. The kernel works unchanged.
+ *
+ * ── Implemented by ───────────────────────────────────────────────────────────
+ *
+ *   ExpressAdapter   (default, ships with Millas)
+ *   FastifyAdapter   (future)
+ *   HonoAdapter      (future)
+ *
+ * ── Lifecycle ────────────────────────────────────────────────────────────────
+ *
+ *   1. adapter.applyBodyParsers()          — JSON + urlencoded
+ *   2. adapter.applyMiddleware(fn)         — any raw adapter-level middleware
+ *   3. adapter.mountRoute(verb, path, handlers) — register app routes
+ *   4. adapter.mountWelcome(handler)       — optional dev welcome page
+ *   5. adapter.mountNotFound()             — 404 handler
+ *   6. adapter.mountErrorHandler()         — global error handler
+ *   7. await adapter.listen(port, host)    — start accepting connections
+ *   8. adapter.close()                     — graceful shutdown
+ */
+class HttpAdapter {
+
+  // ── Setup ──────────────────────────────────────────────────────────────────
+
+  /**
+   * Apply JSON + urlencoded body parsers.
+   * Called once during bootstrap, before any routes are mounted.
+   */
+  applyBodyParsers() {
+    throw new Error(`${this.constructor.name} must implement applyBodyParsers()`);
+  }
+
+  /**
+   * Apply a single raw middleware function at the adapter level.
+   * Used for things like helmet(), compression() that are engine-specific.
+   *
+   * @param {Function} fn  — adapter-native middleware function
+   */
+  applyMiddleware(fn) {
+    throw new Error(`${this.constructor.name} must implement applyMiddleware(fn)`);
+  }
+
+  // ── Route mounting ─────────────────────────────────────────────────────────
+
+  /**
+   * Register a route handler.
+   *
+   * @param {string}     verb      — 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'
+   * @param {string}     path      — e.g. '/users/:id'
+   * @param {Function[]} handlers  — [middleware..., terminalHandler]
+   *                                 Each handler is a Millas kernel handler
+   *                                 (expressReq, expressRes, expressNext) already
+   *                                 converted by the adapter's wrapKernelHandler().
+   */
+  mountRoute(verb, path, handlers) {
+    throw new Error(`${this.constructor.name} must implement mountRoute(verb, path, handlers)`);
+  }
+
+  /**
+   * Mount the dev welcome page for GET /.
+   * Only called when no user route covers GET /.
+   *
+   * @param {Function} handler  — adapter-native handler function
+   */
+  mountWelcome(handler) {
+    throw new Error(`${this.constructor.name} must implement mountWelcome(handler)`);
+  }
+
+  /**
+   * Mount the 404 fallback handler.
+   * Must be called AFTER all routes and mountWelcome().
+   */
+  mountNotFound() {
+    throw new Error(`${this.constructor.name} must implement mountNotFound()`);
+  }
+
+  /**
+   * Mount the global error handler.
+   * Must be called LAST — after mountNotFound().
+   */
+  mountErrorHandler() {
+    throw new Error(`${this.constructor.name} must implement mountErrorHandler()`);
+  }
+
+  // ── Request / Response bridge ──────────────────────────────────────────────
+
+  /**
+   * Wrap a Millas kernel handler function into an adapter-native handler.
+   *
+   * The kernel handler signature is:
+   *   (millaCtx: RequestContext, trackedNext: Function) => Promise<MillasResponse>
+   *
+   * The adapter wraps this into whatever its native handler signature is,
+   * e.g. (req, res, next) for Express.
+   *
+   * @param {Function} kernelFn
+   * @param {string}   displayName  — for error messages
+   * @param {object}   container    — DI container
+   * @returns {Function}  adapter-native handler
+   */
+  wrapKernelHandler(kernelFn, displayName, container) {
+    throw new Error(`${this.constructor.name} must implement wrapKernelHandler()`);
+  }
+
+  /**
+   * Wrap a Millas middleware instance into an adapter-native handler.
+   *
+   * @param {object} instance  — Millas Middleware instance with handle(ctx, next)
+   * @param {object} container — DI container
+   * @returns {Function}  adapter-native handler
+   */
+  wrapMiddleware(instance, container) {
+    throw new Error(`${this.constructor.name} must implement wrapMiddleware()`);
+  }
+
+  /**
+   * Dispatch a MillasResponse to the underlying engine's response object.
+   *
+   * @param {MillasResponse} response
+   * @param {*}              nativeRes  — e.g. Express res
+   */
+  dispatch(response, nativeRes) {
+    throw new Error(`${this.constructor.name} must implement dispatch(response, nativeRes)`);
+  }
+
+  // ── Server lifecycle ───────────────────────────────────────────────────────
+
+  /**
+   * Start listening on port/host.
+   * Returns a Promise that resolves once the server is bound.
+   *
+   * @param {number} port
+   * @param {string} host
+   * @returns {Promise<void>}
+   */
+  listen(port, host) {
+    throw new Error(`${this.constructor.name} must implement listen(port, host)`);
+  }
+
+  /**
+   * Gracefully close the server.
+   * Returns a Promise that resolves once all connections are drained.
+   *
+   * @returns {Promise<void>}
+   */
+  close() {
+    throw new Error(`${this.constructor.name} must implement close()`);
+  }
+
+  /**
+   * The name of this adapter, used in logs and error messages.
+   * @returns {string}
+   */
+  get name() {
+    return this.constructor.name;
+  }
+}
+
+module.exports = HttpAdapter;

package/src/http/adapters/index.js

@@ -0,0 +1,9 @@
+'use strict';
+
+const HttpAdapter    = require('./HttpAdapter');
+const ExpressAdapter = require('./ExpressAdapter');
+
+module.exports = {
+  HttpAdapter,
+  ExpressAdapter,
+};

package/src/index.js

@@ -1,147 +1,8 @@
 'use strict';
 
-// ── HTTP Layer ────────────────────────────────────────────────────
-const {
-  MillasRequest,
-  MillasResponse,
-  ResponseDispatcher,
-  jsonify,
-  view,
-  redirect,
-  text,
-  file,
-  empty,
-  abort,
-  notFound,
-  unauthorized,
-  forbidden,
-} = require('./http/index');
-const RequestContext = require('./http/RequestContext');
+const Millas = require('./container/MillasApp');
 
-// ── Validation ────────────────────────────────────────────────────
-const {
-  Validator,
-  BaseValidator,
-  StringValidator,
-  EmailValidator,
-  NumberValidator,
-  BooleanValidator,
-  DateValidator,
-  ArrayValidator,
-  ObjectValidator,
-  FileValidator,
-  string,
-  email,
-  number,
-  boolean,
-  date,
-  array,
-  object: objectField,
-  file:   fileField,
-} = require('./validation/Validator');
-const MillasApp = require('./container/MillasApp');
-// ── HTTP Layer (old) ──────────────────────────────────────────────
-const Controller         = require('./controller/Controller');
-const Middleware         = require('./middleware/Middleware');
-const MiddlewarePipeline = require('./middleware/MiddlewarePipeline');
-const CorsMiddleware     = require('./middleware/CorsMiddleware');
-const ThrottleMiddleware = require('./middleware/ThrottleMiddleware');
-const LogMiddleware      = require('./middleware/LogMiddleware');
-const HttpError          = require('./errors/HttpError');
-
-// ── DI Container ─────────────────────────────────────────────────
-const Container          = require('./container/Container');
-const Application        = require('./container/Application');
-const ServiceProvider    = require('./providers/ServiceProvider');
-const ProviderRegistry   = require('./providers/ProviderRegistry');
-
-// ── ORM ───────────────────────────────────────────────────────────
-const { Model, fields, QueryBuilder, DatabaseManager,
-        SchemaBuilder, MigrationRunner, ModelInspector } = require('./orm');
-const DatabaseServiceProvider = require('./providers/DatabaseServiceProvider');
-
-// ── Auth ──────────────────────────────────────────────────────────
-const Auth                = require('./auth/Auth');
-const Hasher              = require('./auth/Hasher');
-const JwtDriver           = require('./auth/JwtDriver');
-const AuthMiddleware      = require('./auth/AuthMiddleware');
-const RoleMiddleware      = require('./auth/RoleMiddleware');
-const AuthController      = require('./auth/AuthController');
-const AuthServiceProvider = require('./providers/AuthServiceProvider');
-
-// ── Mail ──────────────────────────────────────────────────────────
-const { Mail, MailMessage, TemplateEngine,
-        SmtpDriver, SendGridDriver, MailgunDriver, LogDriver } = require('./mail');
-const MailServiceProvider = require('./providers/MailServiceProvider');
-
-// ── Queue ─────────────────────────────────────────────────────────
-const Queue              = require('./queue/Queue');
-const Job                = require('./queue/Job');
-const QueueWorker        = require('./queue/workers/QueueWorker');
-const { dispatch }       = require('./queue/Queue');
-const QueueServiceProvider = require('./providers/QueueServiceProvider');
-
-// ── Events ────────────────────────────────────────────────────────
-const EventEmitter         = require('./events/EventEmitter');
-const Event                = require('./events/Event');
-const Listener             = require('./events/Listener');
-const { emit }             = require('./events/EventEmitter');
-const EventServiceProvider = require('./providers/EventServiceProvider');
-
-// ── Cache ─────────────────────────────────────────────────────────
-const Cache        = require('./cache/Cache');
-const MemoryDriver = require('./cache/drivers/MemoryDriver');
-const FileDriver   = require('./cache/drivers/FileDriver');
-const NullDriver   = require('./cache/drivers/NullDriver');
-const { CacheServiceProvider, StorageServiceProvider } = require('./providers/CacheStorageServiceProvider');
-
-// ── Storage ───────────────────────────────────────────────────────
-const Storage     = require('./storage/Storage');
-const LocalDriver = require('./storage/drivers/LocalDriver');
-
-module.exports = {
-  // Millas App
-  MillasApp,
-  // ── Millas HTTP layer ──────────────────────────────────────────
-  MillasRequest, MillasResponse, ResponseDispatcher, RequestContext,
-  jsonify, view, redirect, text, send_file:file, empty,
-  abort, notFound, unauthorized, forbidden,
-  // ── Validation ────────────────────────────────────────────────
-  Validator,
-  BaseValidator,
-  StringValidator, EmailValidator, NumberValidator, BooleanValidator,
-  DateValidator, ArrayValidator, ObjectValidator, FileValidator,
-  string, email, number, boolean, date, array,
-  object: objectField,
-  file:   fileField,
-  // HTTP
-  Controller, Middleware, MiddlewarePipeline,
-  CorsMiddleware, ThrottleMiddleware, LogMiddleware, HttpError,
-  // DI
-  Container, Application, ServiceProvider, ProviderRegistry,
-  // ORM
-  Model, fields, QueryBuilder, DatabaseManager, SchemaBuilder,
-  MigrationRunner, ModelInspector, DatabaseServiceProvider,
-  // Auth
-  Auth, Hasher, JwtDriver, AuthMiddleware, RoleMiddleware,
-  AuthController, AuthServiceProvider,
-  // Mail
-  Mail, MailMessage, TemplateEngine,
-  SmtpDriver, SendGridDriver, MailgunDriver, LogDriver, MailServiceProvider,
-  // Queue
-  Queue, Job, QueueWorker, dispatch, QueueServiceProvider,
-  // Events
-  EventEmitter, Event, Listener, emit, EventServiceProvider,
-  // Cache
-  Cache, MemoryDriver, FileDriver, NullDriver, CacheServiceProvider,
-  // Storage
-  Storage, LocalDriver, StorageServiceProvider,
-};
-
-// ── Admin ─────────────────────────────────────────────────────────
-const { Admin, AdminResource, AdminField, AdminFilter } = require('./admin');
-const AdminServiceProvider = require('./providers/AdminServiceProvider');
-
-Object.assign(module.exports, {
-  Admin, AdminResource, AdminField, AdminFilter, AdminServiceProvider,
-});
+/**
+ * @module millas
+ */
+module.exports = { Millas };

package/src/logger/formatters/PrettyFormatter.js

@@ -56,19 +56,29 @@ class PrettyFormatter {
       parts.push(`${b}${tagStr}${r}`);
     }
 
-    // Message
-    parts.push(`${c}${message}${r}`);
+    // Message (handle multi-line)
+    const lines = message.split('\n');
+    parts.push(`${c}${lines[0]}${r}`);
+
+    let output = parts.join('  ');
+
+    // Continuation lines (aligned with first line)
+    if (lines.length > 1) {
+      const prefix = parts.slice(0, -1).map(p => p.replace(/\x1b\[[0-9;]*m/g, '')).join('  ');
+      const indent = ' '.repeat(prefix.length + 2);
+      for (let i = 1; i < lines.length; i++) {
+        output += `\n${indent}${c}${lines[i]}${r}`;
+      }
+    }
 
     // Context object
     if (context !== undefined && context !== null) {
       const ctx = typeof context === 'object'
         ? JSON.stringify(context, null, 0)
         : String(context);
-      parts.push(`${d}${ctx}${r}`);
+      output += `  ${d}${ctx}${r}`;
     }
 
-    let output = parts.join('  ');
-
     // Error stack
     if (error instanceof Error) {
       output += `\n${d}${error.stack || error.message}${r}`;

package/src/logger/internal.js

@@ -64,12 +64,12 @@ const MillasLog = new Logger();
 // from the framework itself unless you opt in to lower levels.
 MillasLog.configure({
   defaultTag: 'Millas',
-  minLevel:   LEVELS.WARN,
+  minLevel:   LEVELS.VERBOSE,
   channel:    new ConsoleChannel({
     formatter: new PrettyFormatter({
       colour: process.stdout.isTTY !== false,
     }),
-    minLevel: LEVELS.WARN,
+    minLevel: LEVELS.VERBOSE,
   }),
 });
 

package/src/logger/patchConsole.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { LEVELS } = require('./levels');
+const {LEVELS} = require('./levels');
 
 /**
  * patchConsole(Log, defaultTag)
@@ -25,44 +25,54 @@ const { LEVELS } = require('./levels');
  *   console.dir   → Log.d  (DEBUG)
  */
 function patchConsole(Log, defaultTag = 'App') {
-  // Save originals — restore() puts these back
-  const originals = {
-    log:   console.log.bind(console),
-    info:  console.info.bind(console),
-    warn:  console.warn.bind(console),
-    error: console.error.bind(console),
-    debug: console.debug.bind(console),
-    trace: console.trace.bind(console),
-    dir:   console.dir.bind(console),
-  };
-
-  // Build a dispatcher for a given level
-  function make(level) {
-    return function (...args) {
-      const { message, context, error } = parse(args);
-      Log._emit({
-        level,
-        tag:       defaultTag,
-        message:   message || '',
-        context,
-        error,
+
+    // Save originals — restore() puts these back
+    const originals = {
+        log: console.log.bind(console),
+        info: console.info.bind(console),
+        warn: console.warn.bind(console),
+        error: console.error.bind(console),
+        debug: console.debug.bind(console),
+        trace: console.trace.bind(console),
+        dir: console.dir.bind(console),
+    };
+
+    // Build a dispatcher for a given level
+    function make(level) {
+        return function (...args) {
+            const {message, context, error} = parse(args);
+            Log._emit({
+                level,
+                tag: defaultTag,
+                message: message || '',
+                context,
+                error,
+                timestamp: new Date().toISOString(),
+                pid: process.pid,
+            });
+            return true
+        };
+    }
+
+    console.log = make(LEVELS.INFO);
+    console.info = make(LEVELS.INFO);
+    console.warn = make(LEVELS.WARN);
+    console.error = make(LEVELS.ERROR);
+    console.debug = make(LEVELS.DEBUG);
+    console.trace = make(LEVELS.VERBOSE);
+    console.dir = (obj) => Log._emit({
+        level: LEVELS.DEBUG,
+        tag: defaultTag,
+        message: '',
+        context: obj,
+        error: undefined,
         timestamp: new Date().toISOString(),
-        pid:       process.pid,
-      });
+        pid: process.pid
+    });
+
+    return function restore() {
+        Object.assign(console, originals);
     };
-  }
-
-  console.log   = make(LEVELS.INFO);
-  console.info  = make(LEVELS.INFO);
-  console.warn  = make(LEVELS.WARN);
-  console.error = make(LEVELS.ERROR);
-  console.debug = make(LEVELS.DEBUG);
-  console.trace = make(LEVELS.VERBOSE);
-  console.dir   = (obj) => Log._emit({ level: LEVELS.DEBUG, tag: defaultTag, message: '', context: obj, error: undefined, timestamp: new Date().toISOString(), pid: process.pid });
-
-  return function restore() {
-    Object.assign(console, originals);
-  };
 }
 
 // ── Argument parser ───────────────────────────────────────────────────────────
@@ -78,58 +88,58 @@ function patchConsole(Log, defaultTag = 'App') {
 //   console.log('a', 'b', 'c')     → message: 'a b c'
 
 function parse(args) {
-  if (args.length === 0) {
-    return { message: '', context: undefined, error: undefined };
-  }
-
-  if (args.length === 1) {
-    const a = args[0];
-    if (a instanceof Error)                      return { message: a.message,    context: undefined, error: a };
-    if (typeof a === 'object' && a !== null)     return { message: '',           context: a,         error: undefined };
-    return { message: String(a), context: undefined, error: undefined };
-  }
-
-  const [first, ...rest] = args;
-
-  // First arg is an Error
-  if (first instanceof Error) {
-    return { message: first.message, context: rest.length ? rest : undefined, error: first };
-  }
-
-  // First arg is a string message
-  if (typeof first === 'string') {
-    // Single extra arg
-    if (rest.length === 1) {
-      const r = rest[0];
-      if (r instanceof Error)                    return { message: first, context: undefined, error: r };
-      if (typeof r === 'object' && r !== null)   return { message: first, context: r,         error: undefined };
-      // Scalar extra: append to message (console.log('count:', 42))
-      return { message: first + ' ' + String(r), context: undefined, error: undefined };
+    if (args.length === 0) {
+        return {message: '', context: undefined, error: undefined};
     }
 
-    // Multiple extra args — find a trailing Error, collect the rest as context
-    const lastArg = rest[rest.length - 1];
-    if (lastArg instanceof Error) {
-      const ctx = rest.slice(0, -1);
-      return { message: first, context: ctx.length ? ctx : undefined, error: lastArg };
+    if (args.length === 1) {
+        const a = args[0];
+        if (a instanceof Error) return {message: a.message, context: undefined, error: a};
+        if (typeof a === 'object' && a !== null) return {message: '', context: a, error: undefined};
+        return {message: String(a), context: undefined, error: undefined};
     }
 
-    // All strings/scalars — join into message
-    if (rest.every(r => typeof r !== 'object' || r === null)) {
-      return { message: [first, ...rest].map(String).join(' '), context: undefined, error: undefined };
+    const [first, ...rest] = args;
+
+    // First arg is an Error
+    if (first instanceof Error) {
+        return {message: first.message, context: rest.length ? rest : undefined, error: first};
     }
 
-    // Mixed — put extras in context
-    return { message: first, context: rest, error: undefined };
-  }
+    // First arg is a string message
+    if (typeof first === 'string') {
+        // Single extra arg
+        if (rest.length === 1) {
+            const r = rest[0];
+            if (r instanceof Error) return {message: first, context: undefined, error: r};
+            if (typeof r === 'object' && r !== null) return {message: first, context: r, error: undefined};
+            // Scalar extra: append to message (console.log('count:', 42))
+            return {message: first + ' ' + String(r), context: undefined, error: undefined};
+        }
+
+        // Multiple extra args — find a trailing Error, collect the rest as context
+        const lastArg = rest[rest.length - 1];
+        if (lastArg instanceof Error) {
+            const ctx = rest.slice(0, -1);
+            return {message: first, context: ctx.length ? ctx : undefined, error: lastArg};
+        }
+
+        // All strings/scalars — join into message
+        if (rest.every(r => typeof r !== 'object' || r === null)) {
+            return {message: [first, ...rest].map(String).join(' '), context: undefined, error: undefined};
+        }
+
+        // Mixed — put extras in context
+        return {message: first, context: rest, error: undefined};
+    }
 
-  // First arg is an object
-  if (typeof first === 'object' && first !== null) {
-    return { message: '', context: first, error: undefined };
-  }
+    // First arg is an object
+    if (typeof first === 'object' && first !== null) {
+        return {message: '', context: first, error: undefined};
+    }
 
-  // Fallback — join everything as a string
-  return { message: args.map(String).join(' '), context: undefined, error: undefined };
+    // Fallback — join everything as a string
+    return {message: args.map(String).join(' '), context: undefined, error: undefined};
 }
 
 module.exports = patchConsole;