millas 0.2.12-beta → 0.2.12-beta-1

package/src/container/Application.js

@@ -1,12 +1,14 @@
 'use strict';
 
-const Container        = require('./Container');
+const Container = require('./Container');
 const ProviderRegistry = require('../providers/ProviderRegistry');
-const { Route, Router, MiddlewareRegistry } = require('../router');
-const CorsMiddleware     = require('../middleware/CorsMiddleware');
+const {Route, Router, MiddlewareRegistry} = require('../router');
+const CorsMiddleware = require('../middleware/CorsMiddleware');
 const ThrottleMiddleware = require('../middleware/ThrottleMiddleware');
-const LogMiddleware      = require('../middleware/LogMiddleware');
-const AuthMiddleware     = require('../auth/AuthMiddleware');
+const LogMiddleware = require('../middleware/LogMiddleware');
+const AuthMiddleware = require('../auth/AuthMiddleware');
+const Facade = require("../facades/Facade");
+const UrlGenerator = require("../http/UrlGenerator");
 
 /**
  * Application
@@ -14,275 +16,298 @@ const AuthMiddleware     = require('../auth/AuthMiddleware');
  * The central Millas kernel. Owns:
  *   - The DI container
  *   - The provider registry
- *   - The Express app
+ *   - The HttpAdapter  (NOT Express directly — any adapter works)
  *   - The route instance
  *   - The middleware registry
  *
+ * The kernel is fully decoupled from Express. It talks to the HTTP layer
+ * exclusively through the HttpAdapter interface.
+ *
  * Usage in bootstrap/app.js:
  *
- *   const { Application } = require('millas/src/container');
- *   const app = new Application(expressApp);
- *   app.providers([AppServiceProvider, DatabaseServiceProvider]);
+ *   const { Application }    = require('millas/src/container');
+ *   const { ExpressAdapter } = require('millas/src/http/adapters');
+ *   const express = require('express');
+ *
+ *   const adapter = new ExpressAdapter(express());
+ *   const app     = new Application(adapter);
+ *   app.providers([AppServiceProvider]);
  *   await app.boot();
- *   app.routes(route => {
- *     require('../routes/web')(route);
- *     require('../routes/api')(route);
- *   });
+ *   app.routes(Route => require('../routes/api')(Route));
  *   app.mount();
  *   app.listen();
  */
 class Application {
-  constructor(expressApp) {
-    this._express   = expressApp;
-    this._container = new Container();
-    this._providers = new ProviderRegistry(this._container, expressApp);
-    this._mwRegistry = new MiddlewareRegistry();
-    this._route     = new Route();
-    this._booted    = false;
-
-    // Register core framework bindings
-    this._registerCoreBindings();
-  }
-
-  // ─── Configuration ───────────────────────────────────────────────────────────
-
-  /**
-   * Add service providers.
-   * @param {Array} providers
-   */
-  providers(providers = []) {
-    this._providers.addMany(providers);
-    return this;
-  }
-
-  /**
-   * Register a middleware alias.
-   *
-   * app.middleware('auth', AuthMiddleware)
-   * app.middleware('throttle', new ThrottleMiddleware({ max: 60 }))
-   */
-  middleware(alias, handler) {
-    this._mwRegistry.register(alias, handler);
-    return this;
-  }
-
-  /**
-   * Define all routes via a callback.
-   *
-   * app.routes(route => {
-   *   require('../routes/web')(route);
-   *   require('../routes/api')(route);
-   * });
-   */
-  routes(callback) {
-    callback(this._route);
-    return this;
-  }
-
-  // ─── Lifecycle ───────────────────────────────────────────────────────────────
-
-  /**
-   * Run the full provider lifecycle:
-   *   Phase 0 — beforeBoot (synchronous, global setup)
-   *   Phase 1 — register   (synchronous, container bindings)
-   *   Phase 2 — boot       (async, all bindings available)
-   *
-   * Emits: platform.booting → platform.booted
-   */
-  async boot() {
-    if (this._booted) return this;
-
-    this._emitSync('platform.booting', { providers: this._providers.list() });
-
-    await this._providers.boot();
-    this._booted = true;
-
-    this._emitSync('platform.booted', { providers: this._providers.list() });
-
-    return this;
-  }
-
-  /**
-   * Bind all routes onto the Express app.
-   * Does NOT add 404/error fallbacks — call mountFallbacks() after
-   * registering any extra middleware (e.g. Admin panel).
-   *
-   * Typical usage:
-   *   app.mountRoutes();
-   *   Admin.mount(expressApp);   // admin routes added here
-   *   app.mountFallbacks();      // 404 + error handler last
-   *
-   * Or use app.mount() which does all three in one call.
-   */
-  mountRoutes() {
-    this._router = new Router(this._express, this._route.getRegistry(), this._mwRegistry, this._container);
-    this._router.mountRoutes();
-    return this;
-  }
-
-  /**
-   * Add 404 + global error handlers. Must be called LAST.
-   */
-  mountFallbacks() {
-    if (!this._router) {
-      this._router = new Router(this._express, this._route.getRegistry(), this._mwRegistry, this._container);
+    /**
+     * @param {import('../http/adapters/HttpAdapter')} adapter
+     */
+    constructor(adapter) {
+        this._adapter = adapter;
+        this._container = new Container();
+        this._providers = new ProviderRegistry(this._container, adapter.nativeApp || adapter);
+        this._mwRegistry = new MiddlewareRegistry();
+        this._route = new Route();
+        this._booted = false;
+
+        this._registerCoreBindings();
+    }
+
+    // ── Configuration ──────────────────────────────────────────────────────────
+
+    providers(providers = []) {
+        this._providers.addMany(providers);
+        return this;
+    }
+
+    /**
+     * Register a middleware alias.
+     *
+     *   app.middleware('auth', AuthMiddleware)
+     *   app.middleware('throttle', new ThrottleMiddleware({ max: 60 }))
+     */
+    middleware(alias, handler) {
+        this._mwRegistry.register(alias, handler);
+        return this;
+    }
+
+    /**
+     * Define all routes via a callback.
+     *
+     *   app.routes(Route => {
+     *     require('../routes/api')(Route);
+     *   });
+     */
+    routes(callback) {
+        callback(this._route);
+        return this;
+    }
+
+    // ── Lifecycle ──────────────────────────────────────────────────────────────
+
+    /**
+     * Run the full provider lifecycle:
+     *   Phase 0 — beforeBoot  (sync, global setup)
+     *   Phase 1 — register    (sync, container bindings)
+     *   Phase 2 — boot        (async, all bindings available)
+     */
+    async boot() {
+        if (this._booted) return this;
+
+        this._emitSync('platform.booting', {providers: this._providers.list()});
+
+        await this._providers.boot();
+        this._booted = true;
+
+        this._emitSync('platform.booted', {providers: this._providers.list()});
+
+        return this;
+    }
+
+    /**
+     * Mount all registered routes onto the adapter.
+     * Does NOT add fallbacks — call mountFallbacks() separately after
+     * any extra middleware (e.g. Admin panel) is mounted.
+     */
+    mountRoutes() {
+        this._router = new Router(
+            this._adapter,
+            this._route.getRegistry(),
+            this._mwRegistry,
+            this._container
+        );
+        this._router.mountRoutes();
+        return this;
     }
-    this._router.mountFallbacks();
-    return this;
-  }
-
-  /**
-   * Bind routes + add 404/error handlers in one call.
-   * Use this when NOT using the Admin panel, or when Admin
-   * is mounted before this call.
-   */
-  mount() {
-    const router = new Router(this._express, this._route.getRegistry(), this._mwRegistry, this._container);
-    router.mount();
-    return this;
-  }
-
-  /**
-   * Start the HTTP server.
-   * Emits: platform.listening
-   */
-  listen(port, host, callback) {
-    const _port = port || parseInt(process.env.APP_PORT,   10) || 3000;
-    const _host = host || process.env.MILLAS_HOST || 'localhost';
-
-    const server = this._express.listen(_port, _host, () => {
-      if (!process.env.MILLAS_ROUTE_LIST) {
-        const chalk      = _tryChalk();
+
+    /**
+     * Mount 404 + error handler. Must be called LAST.
+     */
+    mountFallbacks() {
+        if (!this._router) {
+            this._router = new Router(
+                this._adapter,
+                this._route.getRegistry(),
+                this._mwRegistry,
+                this._container
+            );
+        }
+        this._router.mountFallbacks();
+        return this;
+    }
+
+    /**
+     * Mount routes + fallbacks in one call.
+     */
+    mount() {
+        const router = new Router(
+            this._adapter,
+            this._route.getRegistry(),
+            this._mwRegistry,
+            this._container
+        );
+        router.mount();
+        return this;
+    }
+
+    /**
+     * Start the HTTP server via the adapter.
+     * Emits: platform.listening
+     */
+    async listen(port, host, callback) {
+        const _port = port
+            || parseInt(process.env.MILLAS_INTERNAL_PORT, 10)
+            || parseInt(process.env.APP_PORT, 10)
+            || 3000;
+        const _host = host || process.env.MILLAS_HOST || 'localhost';
+
+        await this._adapter.listen(_port, _host);
+
+        if (process.env.APP_ENV === "development" && process.env.MILLAS_START_UP && !process.env.MILLERS_NODE_ENV) {
+            this._printStartupLog(_host, _port);
+        }
+
+        this._emitSync('platform.listening', {port: _port, host: _host});
+
+        if (typeof callback === 'function') callback(_port, _host);
+
+        return this;
+    }
+
+    _printStartupLog(host, port) {
+        const chalk = _tryChalk();
         const routeCount = this._route.list().length;
+        const url = `http://${host}:${port}`;
 
-        // Use process.stdout.write directly so these lines always appear
-        // regardless of log level — even if console is patched and debug is off.
-        process.stdout.write(
-          '  ' + chalk.dim('›') + '  ' +
-          chalk.white(routeCount + ' route' + (routeCount !== 1 ? 's' : '') + ' registered') +
-          '\n'
+        // console.error(chalk.dim('›') + '  ' +
+        //     chalk.dim('Listening on ') + chalk.bold.white(url)
+        // );
+        console.log(chalk.dim('›') + '  ' +
+            chalk.white(routeCount + ' route' + (routeCount !== 1 ? 's' : '') + ' registered')
         );
-        process.stdout.write(
-          '  ' + chalk.dim('›') + '  ' +
-          chalk.dim('Press ') + chalk.bold('Ctrl+C') + chalk.dim(' to stop') +
-          '\n\n'
+        console.error(chalk.dim('›') + '  ' +
+            chalk.dim('Press ') + chalk.bold('Ctrl+C') + chalk.dim(' to stop')
         );
-      }
-
-      this._emitSync('platform.listening', { port: _port, host: _host });
-
-      if (typeof callback === 'function') callback(_port, _host);
-    });
-
-    this._server = server;
-    return this;
-  }
-
-  /**
-   * Graceful shutdown — emits platform.shutting_down, then closes the server.
-   * Call this instead of process.exit() for clean teardown.
-   *
-   *   process.on('SIGTERM', () => app.shutdown());
-   */
-  async shutdown(code = 0) {
-    this._emitSync('platform.shutting_down', {});
-    if (this._server) {
-      await new Promise(resolve => this._server.close(resolve));
     }
-    process.exit(code);
-  }
-
-  // ─── Platform event bus ───────────────────────────────────────────────────
-
-  /**
-   * Listen to a platform lifecycle event.
-   *
-   *   app.on('platform.booted', ({ providers }) => { ... });
-   *   app.on('platform.listening', ({ port, host }) => { ... });
-   *   app.on('platform.shutting_down', () => process.cleanup());
-   */
-  on(event, fn) {
-    if (!this._platformListeners) this._platformListeners = new Map();
-    if (!this._platformListeners.has(event)) this._platformListeners.set(event, []);
-    this._platformListeners.get(event).push(fn);
-    return this;
-  }
-
-  /** Synchronous platform event dispatch (fire-and-forget, no await). */
-  _emitSync(event, data) {
-    if (!this._platformListeners) return;
-    const listeners = this._platformListeners.get(event) || [];
-    for (const fn of listeners) {
-      try { fn(data); } catch {}
+
+    /**
+     * Graceful shutdown.
+     */
+    async shutdown(code = 0) {
+        this._emitSync('platform.shutting_down', {});
+        await this._adapter.close();
+        process.exit(code);
+    }
+
+    // ── Platform event bus ─────────────────────────────────────────────────────
+
+    on(event, fn) {
+        if (!this._platformListeners) this._platformListeners = new Map();
+        if (!this._platformListeners.has(event)) this._platformListeners.set(event, []);
+        this._platformListeners.get(event).push(fn);
+        return this;
+    }
+
+    _emitSync(event, data) {
+        if (!this._platformListeners) return;
+        const listeners = this._platformListeners.get(event) || [];
+        for (const fn of listeners) {
+            try {
+                fn(data);
+            } catch {
+            }
+        }
+    }
+
+    // ── Container proxy ────────────────────────────────────────────────────────
+
+    bind(abstract, concrete) {
+        this._container.bind(abstract, concrete);
+        return this;
+    }
+
+    singleton(abstract, c) {
+        this._container.singleton(abstract, c);
+        return this;
+    }
+
+    instance(abstract, value) {
+        this._container.instance(abstract, value);
+        return this;
+    }
+
+    make(abstract, overrides) {
+        return this._container.make(abstract, overrides);
+    }
+
+    // ── Accessors ──────────────────────────────────────────────────────────────
+
+    get container() {
+        return this._container;
+    }
+
+    get route() {
+        return this._route;
+    }
+
+    get adapter() {
+        return this._adapter;
+    }
+
+    get mwRegistry() {
+        return this._mwRegistry;
+    }
+
+    /**
+     * express — backward-compatible escape hatch.
+     * Returns the native app from the adapter if available.
+     * Prefer adapter.nativeApp for new code.
+     */
+    get express() {
+        return this._adapter.nativeApp || this._adapter;
+    }
+
+    // ── Internal ───────────────────────────────────────────────────────────────
+
+    _registerCoreBindings() {
+        this._container.instance('app', this);
+        this._container.instance('container', this._container);
+
+        const Facade = require('../facades/Facade');
+        Facade.setContainer(this._container);
+        // Http client — always available, no provider needed
+        const {HttpClient} = require('../http/HttpClient');
+        this._container.instance('HttpClient', HttpClient);
+        this._container.alias('http', "HttpClient");
+
+        const UrlGenerator = require('../http/UrlGenerator');
+        const urlGenerator = new UrlGenerator({
+            baseUrl: process.env.APP_URL || '',
+            appKey: process.env.APP_KEY || '',
+            routeRegistry: this._route?.getRegistry?.() || null,
+        });
+        this._container.instance('url', urlGenerator);
+
+
+        this._mwRegistry.register('cors', new CorsMiddleware());
+        this._mwRegistry.register('throttle', new ThrottleMiddleware({max: 60, window: 60}));
+        this._mwRegistry.register('log', new LogMiddleware());
+        this._mwRegistry.register('auth', AuthMiddleware);
     }
-  }
-
-  // ─── Container Proxy ─────────────────────────────────────────────────────────
-
-  /**
-   * Bind a transient into the container.
-   */
-  bind(abstract, concrete) {
-    this._container.bind(abstract, concrete);
-    return this;
-  }
-
-  /**
-   * Bind a singleton into the container.
-   */
-  singleton(abstract, concrete) {
-    this._container.singleton(abstract, concrete);
-    return this;
-  }
-
-  /**
-   * Register a pre-built instance.
-   */
-  instance(abstract, value) {
-    this._container.instance(abstract, value);
-    return this;
-  }
-
-  /**
-   * Resolve something from the container.
-   */
-  make(abstract, overrides) {
-    return this._container.make(abstract, overrides);
-  }
-
-  // ─── Accessors ───────────────────────────────────────────────────────────────
-
-  get container()    { return this._container; }
-  get route()        { return this._route; }
-  get express()      { return this._express; }
-  get mwRegistry()   { return this._mwRegistry; }
-
-  // ─── Internal ────────────────────────────────────────────────────────────────
-
-  _registerCoreBindings() {
-    // Register the application itself
-    this._container.instance('app',       this);
-    this._container.instance('container', this._container);
-
-    // Register built-in middleware
-    this._mwRegistry.register('cors',     new CorsMiddleware());
-    this._mwRegistry.register('throttle', new ThrottleMiddleware({ max: 60, window: 60 }));
-    this._mwRegistry.register('log',      new LogMiddleware());
-    this._mwRegistry.register('auth',     AuthMiddleware);
-  }
 }
 
 module.exports = Application;
 
 // ── Helpers ───────────────────────────────────────────────────────────────────
 
-// Safely require chalk — it ships with Millas but we guard in case of oddities
 function _tryChalk() {
-  try { return require('chalk'); } catch {
-    // Fallback: no-op chalk that returns strings unchanged
-    const id = s => s;
-    const p  = new Proxy({}, { get: () => p, apply: (_, __, [s]) => String(s || '') });
-    p.dim = id; p.bold = p; p.white = id;
-    return p;
-  }
-}
+    try {
+        return require('chalk');
+    } catch {
+        const id = s => s;
+        const p = new Proxy({}, {get: () => p, apply: (_, __, [s]) => String(s || '')});
+        p.dim = id;
+        p.bold = p;
+        p.white = id;
+        return p;
+    }
+}