@c9up/ream 0.1.34 → 0.2.1

package/dist/session/drivers/RedisDriver.js

@@ -79,13 +79,13 @@ export class RedisDriver {
         const client = await this.#client();
         const raw = await client.get(this.#key(sessionId));
         if (raw === null)
-            return {};
+            return null;
         try {
             const parsed = JSON.parse(raw);
-            return isPlainRecord(parsed) ? parsed : {};
+            return isPlainRecord(parsed) ? parsed : null;
         }
         catch {
-            return {};
+            return null;
         }
     }
     async write(sessionId, data, ttl) {
@@ -125,7 +125,14 @@ export class RedisDriver {
                 stale.push(id);
                 continue;
             }
-            sessions.push({ id, data: await this.read(id) });
+            // The EXISTS check above already established the key is there; a null
+            // here means it expired in the gap, and that device is no longer active.
+            const data = await this.read(id);
+            if (data === null) {
+                stale.push(id);
+                continue;
+            }
+            sessions.push({ id, data });
         }
         if (stale.length > 0)
             await client.srem(key, ...stale);

package/dist/session/drivers/RedisDriver.js.map

@@ -1 +1 @@
-{"version":3,"file":"RedisDriver.js","sourceRoot":"","sources":["../../../src/session/drivers/RedisDriver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RedisDriver.js","sourceRoot":"","sources":["../../../src/session/drivers/RedisDriver.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@c9up/ream",
-  "version": "0.1.34",
+  "version": "0.2.1",
   "description": "Ream — Rust-powered Node.js application framework",
   "license": "MIT",
   "type": "module",
@@ -43,10 +43,42 @@
       "types": "./dist/session/SessionMiddleware.d.ts",
       "import": "./dist/session/SessionMiddleware.js"
     },
+    "./helpers": {
+      "types": "./dist/helpers/index.d.ts",
+      "import": "./dist/helpers/index.js"
+    },
+    "./helpers/string": {
+      "types": "./dist/helpers/string.d.ts",
+      "import": "./dist/helpers/string.js"
+    },
+    "./helpers/is": {
+      "types": "./dist/helpers/is.d.ts",
+      "import": "./dist/helpers/is.js"
+    },
+    "./helpers/base64": {
+      "types": "./dist/helpers/base64.d.ts",
+      "import": "./dist/helpers/base64.js"
+    },
+    "./helpers/types": {
+      "types": "./dist/helpers/types.d.ts",
+      "import": "./dist/helpers/types.js"
+    },
+    "./testing": {
+      "types": "./dist/testing/TestClient.d.ts",
+      "import": "./dist/testing/TestClient.js"
+    },
+    "./bootstrap": {
+      "types": "./dist/bootstrap/hyper-server.d.ts",
+      "import": "./dist/bootstrap/hyper-server.js"
+    },
     "./events": {
       "types": "./dist/events/index.d.ts",
       "import": "./dist/events/index.js"
     },
+    "./health": {
+      "types": "./dist/health/index.d.ts",
+      "import": "./dist/health/index.js"
+    },
     "./events/provider": {
       "types": "./dist/events/EventsProvider.d.ts",
       "import": "./dist/events/EventsProvider.js"
@@ -95,36 +127,18 @@
       "types": "./dist/events/configure.d.ts",
       "import": "./dist/events/configure.js"
     },
-    "./helpers": {
-      "types": "./dist/helpers/index.d.ts",
-      "import": "./dist/helpers/index.js"
-    },
-    "./helpers/string": {
-      "types": "./dist/helpers/string.d.ts",
-      "import": "./dist/helpers/string.js"
-    },
-    "./helpers/is": {
-      "types": "./dist/helpers/is.d.ts",
-      "import": "./dist/helpers/is.js"
-    },
-    "./helpers/base64": {
-      "types": "./dist/helpers/base64.d.ts",
-      "import": "./dist/helpers/base64.js"
-    },
-    "./helpers/types": {
-      "types": "./dist/helpers/types.d.ts",
-      "import": "./dist/helpers/types.js"
-    },
-    "./testing": {
-      "types": "./dist/testing/TestClient.d.ts",
-      "import": "./dist/testing/TestClient.js"
-    },
-    "./bootstrap": {
-      "types": "./dist/bootstrap/hyper-server.d.ts",
-      "import": "./dist/bootstrap/hyper-server.js"
-    },
     "./tsconfig.app.json": "./tsconfig.app.json",
-    "./swcrc.app.json": "./swcrc.app.json"
+    "./swcrc.app.json": "./swcrc.app.json",
+    "./tsconfig.package.json": "./tsconfig.package.json",
+    "./tsconfig.client.json": "./tsconfig.client.json",
+    "./session_middleware": {
+      "types": "./dist/session/SessionMiddleware.d.ts",
+      "import": "./dist/session/SessionMiddleware.js"
+    },
+    "./bodyparser_middleware": {
+      "types": "./dist/bodyparser/BodyParserMiddleware.d.ts",
+      "import": "./dist/bodyparser/BodyParserMiddleware.js"
+    }
   },
   "files": [
     "LICENSE",
@@ -136,7 +150,10 @@
     "scripts",
     "src",
     "swcrc.app.json",
-    "tsconfig.app.json"
+    "tsconfig.app.json",
+    "tsconfig.base.json",
+    "tsconfig.package.json",
+    "tsconfig.client.json"
   ],
   "dependencies": {
     "etag": "^1.8.1",

package/src/Application.ts

@@ -13,10 +13,11 @@
  * @implements FR17, FR20
  */
 
-import { join } from 'node:path'
+import { join, relative } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { ConfigStore } from './ConfigLoader.js'
 import { Container } from './container/Container.js'
+import { type DirectoriesNode, directories as defaultDirectories } from './directories.js'
 import type { AppContext, ProviderContract } from './Provider.js'
 import { callProviderPhase } from './Provider.js'
 
@@ -32,6 +33,7 @@ export class Application implements AppContext {
   readonly container: Container
   readonly config: ConfigStore
   #appRoot?: URL
+  #directories: DirectoriesNode = { ...defaultDirectories }
   private providers: ProviderContract[] = []
   private _booted = false
   #mode: ApplicationMode = 'run'
@@ -92,32 +94,193 @@ export class Application implements AppContext {
 
   /** Absolute path to a file/dir inside the project root. */
   makePath(...paths: string[]): string {
+    return join(fileURLToPath(this.#requireAppRoot()), ...paths)
+  }
+
+  /**
+   * A URL to a file/dir inside the project root, where {@link makePath} gives
+   * a path. What an importer wants.
+   */
+  makeURL(...paths: string[]): URL {
+    // Joined with '/', not `path.join`: a URL keeps forward slashes on every
+    // platform, and `join` would hand Windows a backslash-separated href.
+    return new URL(paths.join('/'), this.#requireAppRoot())
+  }
+
+  /** Turn an absolute path back into one relative to the project root. */
+  relativePath(absolutePath: string): string {
+    return relative(fileURLToPath(this.#requireAppRoot()), absolutePath)
+  }
+
+  #requireAppRoot(): URL {
     if (!this.#appRoot) {
       throw new Error(
         'Application.makePath: app root is not set — construct the Ignitor with `new Ignitor(new URL("../", import.meta.url))`.',
       )
     }
-    return join(fileURLToPath(this.#appRoot), ...paths)
+    return this.#appRoot
+  }
+
+  /**
+   * The conventional directory layout, `reamrc.ts` overrides merged over the
+   * defaults. Every helper below reads it, so moving a directory is declared
+   * once.
+   */
+  get directories(): DirectoriesNode {
+    return this.#directories
+  }
+
+  /**
+   * Feed the loaded rc file to the application (AdonisJS `rcContents`).
+   *
+   * Today it reads one key, `directories`, merged over the defaults; the rest
+   * of the rc file is consumed by the Ignitor and the CLI, which own providers,
+   * preloads, commands and test suites.
+   */
+  rcContents(value: { directories?: Partial<DirectoriesNode> }): this {
+    if (value.directories) {
+      // Skip the undefined entries a `Partial` may carry: spreading them would
+      // blank a default rather than leave it alone.
+      for (const [key, path] of Object.entries(value.directories)) {
+        if (path !== undefined) this.#directories[key] = path
+      }
+    }
+    return this
+  }
+
+  /** Resolve inside one of the conventional directories. */
+  #inDirectory(key: keyof DirectoriesNode, paths: string[]): string {
+    return this.makePath(this.#directories[key], ...paths)
   }
 
   /** Absolute path inside the `config/` directory. */
   configPath(...paths: string[]): string {
-    return this.makePath('config', ...paths)
+    return this.#inDirectory('config', paths)
   }
 
   /** Absolute path inside the `database/migrations/` directory. */
   migrationsPath(...paths: string[]): string {
-    return this.makePath('database', 'migrations', ...paths)
+    return this.#inDirectory('migrations', paths)
   }
 
   /** Absolute path inside the `tmp/` directory. */
   tmpPath(...paths: string[]): string {
-    return this.makePath('tmp', ...paths)
+    return this.#inDirectory('tmp', paths)
   }
 
   /** Absolute path inside the `public/` directory. */
   publicPath(...paths: string[]): string {
-    return this.makePath('public', ...paths)
+    return this.#inDirectory('public', paths)
+  }
+
+  /** Absolute path inside the `providers/` directory. */
+  providersPath(...paths: string[]): string {
+    return this.#inDirectory('providers', paths)
+  }
+
+  /** Absolute path inside the `database/factories/` directory. */
+  factoriesPath(...paths: string[]): string {
+    return this.#inDirectory('factories', paths)
+  }
+
+  /** Absolute path inside the `database/seeders/` directory. */
+  seedersPath(...paths: string[]): string {
+    return this.#inDirectory('seeders', paths)
+  }
+
+  /** Absolute path inside the `resources/lang/` directory. */
+  languageFilesPath(...paths: string[]): string {
+    return this.#inDirectory('languageFiles', paths)
+  }
+
+  /** Absolute path inside the `resources/views/` directory. */
+  viewsPath(...paths: string[]): string {
+    return this.#inDirectory('views', paths)
+  }
+
+  /** Absolute path inside the `start/` directory. */
+  startPath(...paths: string[]): string {
+    return this.#inDirectory('start', paths)
+  }
+
+  /** Absolute path inside the `contracts/` directory. */
+  contractsPath(...paths: string[]): string {
+    return this.#inDirectory('contracts', paths)
+  }
+
+  /** Absolute path inside the `app/controllers/` directory. */
+  httpControllersPath(...paths: string[]): string {
+    return this.#inDirectory('httpControllers', paths)
+  }
+
+  /** Absolute path inside the `app/models/` directory. */
+  modelsPath(...paths: string[]): string {
+    return this.#inDirectory('models', paths)
+  }
+
+  /** Absolute path inside the `app/services/` directory. */
+  servicesPath(...paths: string[]): string {
+    return this.#inDirectory('services', paths)
+  }
+
+  /** Absolute path inside the `app/exceptions/` directory. */
+  exceptionsPath(...paths: string[]): string {
+    return this.#inDirectory('exceptions', paths)
+  }
+
+  /** Absolute path inside the `app/mailers/` directory. */
+  mailersPath(...paths: string[]): string {
+    return this.#inDirectory('mailers', paths)
+  }
+
+  /** Absolute path inside the `app/mails/` directory. */
+  mailsPath(...paths: string[]): string {
+    return this.#inDirectory('mails', paths)
+  }
+
+  /** Absolute path inside the `app/middleware/` directory. */
+  middlewarePath(...paths: string[]): string {
+    return this.#inDirectory('middleware', paths)
+  }
+
+  /** Absolute path inside the `app/policies/` directory. */
+  policiesPath(...paths: string[]): string {
+    return this.#inDirectory('policies', paths)
+  }
+
+  /** Absolute path inside the `app/validators/` directory. */
+  validatorsPath(...paths: string[]): string {
+    return this.#inDirectory('validators', paths)
+  }
+
+  /** Absolute path inside the `commands/` directory. */
+  commandsPath(...paths: string[]): string {
+    return this.#inDirectory('commands', paths)
+  }
+
+  /** Absolute path inside the `app/events/` directory. */
+  eventsPath(...paths: string[]): string {
+    return this.#inDirectory('events', paths)
+  }
+
+  /** Absolute path inside the `app/listeners/` directory. */
+  listenersPath(...paths: string[]): string {
+    return this.#inDirectory('listeners', paths)
+  }
+
+  /** Absolute path inside the `app/transformers/` directory. */
+  transformersPath(...paths: string[]): string {
+    return this.#inDirectory('transformers', paths)
+  }
+
+  /** Absolute path inside the generated-client directory (`.ream/client`). */
+  generatedClientPath(...paths: string[]): string {
+    return this.#inDirectory('generatedClient', paths)
+  }
+
+  /** Absolute path inside the generated-server directory (`.ream/server`). */
+  generatedServerPath(...paths: string[]): string {
+    return this.#inDirectory('generatedServer', paths)
   }
 
   // ─── Environment ──────────────────────────────────────────

package/src/HealthCheck.ts

@@ -27,24 +27,24 @@ const DEFAULT_CHECK_TIMEOUT = 5000
  * Manages health check registrations and produces aggregated status.
  */
 export class HealthCheck {
-  private checkers: Map<string, HealthChecker> = new Map()
-  private startTime = Date.now()
-  private checkTimeout: number
+  readonly #checkers: Map<string, HealthChecker> = new Map()
+  readonly #startTime = Date.now()
+  readonly #checkTimeout: number
 
   constructor(options?: { checkTimeout?: number }) {
-    this.checkTimeout = options?.checkTimeout ?? DEFAULT_CHECK_TIMEOUT
+    this.#checkTimeout = options?.checkTimeout ?? DEFAULT_CHECK_TIMEOUT
   }
 
   /** Register a health checker. */
   register(name: string, checker: HealthChecker): void {
-    this.checkers.set(name, checker)
+    this.#checkers.set(name, checker)
   }
 
   /** Run all health checks and return aggregated status. */
   async check(): Promise<HealthStatus> {
     const checks: HealthCheckResult[] = []
 
-    for (const [name, checker] of this.checkers) {
+    for (const [name, checker] of this.#checkers) {
       const start = Date.now()
       try {
         const result = await Promise.race([
@@ -52,8 +52,8 @@ export class HealthCheck {
           new Promise<never>((_, reject) =>
             setTimeout(
               () =>
-                reject(new Error(`Health check '${name}' timed out after ${this.checkTimeout}ms`)),
-              this.checkTimeout,
+                reject(new Error(`Health check '${name}' timed out after ${this.#checkTimeout}ms`)),
+              this.#checkTimeout,
             ),
           ),
         ])
@@ -76,21 +76,34 @@ export class HealthCheck {
 
     return {
       status: hasError ? 'error' : hasWarn ? 'degraded' : 'ok',
-      uptime: Math.floor((Date.now() - this.startTime) / 1000),
+      uptime: Math.floor((Date.now() - this.#startTime) / 1000),
       timestamp: new Date().toISOString(),
       checks,
     }
   }
 
-  /** Create the /health route handler. Returns 200 for ok, 503 for degraded/error. */
+  /**
+   * Create the /health route handler. Returns 200 for ok, 503 otherwise.
+   *
+   * The parameter is the narrowest shape a real `HttpContext` satisfies, so
+   * this can be mounted straight on a route. It used to assign
+   * `ctx.response.status` and `ctx.response.body` as PROPERTIES, which no Ream
+   * response has ever had — mounted for real it would have answered an empty
+   * 200 to every probe, marking a dead app healthy. Its only test built a fake
+   * context in that invented shape, so nothing caught it.
+   */
   handler(): (ctx: {
-    response: { status: number; headers: Record<string, string>; body: string }
+    response: {
+      status(code: number): unknown
+      header(key: string, value: string): unknown
+      json(body: unknown): unknown
+    }
   }) => Promise<void> {
     return async (ctx) => {
       const health = await this.check()
-      ctx.response.status = health.status === 'ok' ? 200 : 503
-      ctx.response.headers['content-type'] = 'application/json'
-      ctx.response.body = JSON.stringify(health)
+      ctx.response.status(health.status === 'ok' ? 200 : 503)
+      ctx.response.header('content-type', 'application/json')
+      ctx.response.json(health)
     }
   }
 }

package/src/HttpKernel.ts

@@ -49,6 +49,18 @@ export interface HttpKernelConfig {
    * could rewrite itself into a DELETE.
    */
   allowMethodSpoofing?: boolean
+  /**
+   * Default callback name for `response.jsonp()` (AdonisJS
+   * `http.jsonpCallbackName`). Falls back to `callback`.
+   */
+  jsonpCallbackName?: string
+  /**
+   * Ceiling on a buffered response body, in bytes. Default 100MB — the same the
+   * Rust layer caps an incoming body at. Responses are not streamed yet, so the
+   * body is held whole in memory; this is what stops a large one growing until
+   * the process dies with no message.
+   */
+  maxResponseBytes?: number
 }
 
 export interface HttpKernelResponse {
@@ -170,6 +182,12 @@ export function createHttpKernel(
     // What Adonis binds on every request's resolver: the context itself, so a
     // controller or service can take `HttpContext` as a constructor dependency.
     resolver?.bindValue(HttpContext, ctx)
+    if (config.jsonpCallbackName !== undefined) {
+      ctx.response.setJsonpCallbackName(config.jsonpCallbackName)
+    }
+    if (config.maxResponseBytes !== undefined) {
+      ctx.response.setMaxBodyBytes(config.maxResponseBytes)
+    }
     if (config.allowMethodSpoofing === true) {
       // Was never wired: the setter existed but nothing called it, so a
       // migrated config asking for spoofing got a `_method` field that did
@@ -322,8 +340,13 @@ export function createHttpKernel(
       // the HyperServer keeps feeding a dead stream slot forever.
       await ctx.response.abortStream()
       try {
-        await handler.handle(error, ctx)
+        // REPORT first, then handle — the AdonisJS order
+        // (`#requestErrorResponder`: `await report(error, ctx)` before
+        // `handle`). Handling first meant a throwing `handle()` fell into the
+        // catch below and the error was never reported: it vanished from the
+        // logs and the operator saw only "ExceptionHandler failed".
         await handler.report(error, ctx)
+        await handler.handle(error, ctx)
       } catch (handlerError) {
         console.error('ExceptionHandler failed:', handlerError)
         ctx.response
@@ -403,9 +426,9 @@ function readControllerGuardMetadata(
 }
 
 async function serializeResponse(ctx: HttpContext): Promise<HttpKernelResponse> {
-  // A body still being drained by `response.stream()` — upstream returns void
-  // there, so a migrated controller does not await it.
-  await ctx.response.settle()
+  // The terminal step, as AdonisJS' server calls `response.finish()`: it
+  // stamps the request id and waits for a body still being produced.
+  await ctx.response.finish()
   const streamId = ctx.response.getStreamId()
   return {
     status: ctx.response.getStatus(),

package/src/Ignitor.ts

@@ -17,6 +17,7 @@ import { Application } from './Application.js'
 import type { Console } from './console/Console.js'
 import type { CommandLoader, Kernel as ConsoleKernelInstance } from './console/Kernel.js'
 import { type CommandClass, isCommandClass } from './console/types.js'
+import type { DirectoriesNode } from './directories.js'
 import type { ErrorEvent } from './ErrorBoundary.js'
 import { ErrorBoundary } from './ErrorBoundary.js'
 import { loadEnvFiles } from './env/loadEnvFiles.js'
@@ -32,6 +33,7 @@ import { ExceptionHandler } from './http/Exception.js'
 import { HttpContext } from './http/HttpContext.js'
 import type { MiddlewareFunction } from './middleware/Pipeline.js'
 import { MiddlewareRegistry } from './middleware/Pipeline.js'
+import { MigrationRegistry } from './migrations/MigrationRegistry.js'
 import type { AppContext, ProviderContract } from './Provider.js'
 import { callProviderPhase } from './Provider.js'
 import { Router } from './router/Router.js'
@@ -64,6 +66,11 @@ export interface ReamrcConfig {
         environment?: string[]
       }
   >
+  /**
+   * Override the conventional directory layout. Merged over the defaults, so
+   * only the directories that moved need naming.
+   */
+  directories?: Partial<DirectoriesNode>
   commands?: Array<() => Promise<unknown>>
   /**
    * Command shorthands — Console's `commandsAliases`. The value is the command the
@@ -135,14 +142,6 @@ export interface TestsConfig {
    * `tests/bootstrap.ts`; that stays the default here, and this overrides it.
    */
   bootstrap?: string
-  /**
-   * Point `@japa/runner/core` at helix's shim in every worker, so official Japa
-   * plugins (`@japa/assert`, …) instrument the runner that is actually running.
-   *
-   * Off by default: redirecting a package specifier is not something to do
-   * behind a user's back, and a project with no Japa plugin gains nothing.
-   */
-  japaPlugins?: boolean
 }
 
 /** defineConfig helper — like AdonisJS defineConfig(). */
@@ -207,6 +206,8 @@ export class Ignitor {
   private router: Router
   private server: Server
   private middleware: MiddlewareRegistry
+  /** Where each data package registers its migration runner. See `MigrationRegistry`. */
+  private migrations: MigrationRegistry
   private errorBoundary: ErrorBoundary
   private _httpServer?: HyperServerLike
   private config: IgnitorConfig
@@ -248,12 +249,17 @@ export class Ignitor {
     this.router = new Router()
     this.server = new Server(this.router)
     this.middleware = new MiddlewareRegistry()
+    this.migrations = new MigrationRegistry()
     this.errorBoundary = new ErrorBoundary((event) => this.handleError(event), this.isDevMode())
 
     // Register framework services in container
     this.app.container.singleton('router', () => this.router)
     this.app.container.singleton('server', () => this.server)
     this.app.container.singleton('middleware', () => this.middleware)
+    // Always bound, even with no data package: an EMPTY registry is what lets
+    // the CLI tell "this app has no migrations" from "this app predates the
+    // registry" and say something useful in each case.
+    this.app.container.singleton('migrations', () => this.migrations)
     this.app.container.singleton('app', () => this.app)
     // The HttpContext CLASS, so an integration provider can extend it the way
     // AdonisJS does — `HttpContext.getter('view', …)` is how the view layer
@@ -325,6 +331,9 @@ export class Ignitor {
    */
   useRcFile(reamrc: ReamrcConfig): this {
     this.reamrc = reamrc
+    // Hand the app its directory overrides now rather than at boot: a path
+    // helper called from a provider's register() must already see them.
+    this.app.rcContents(reamrc)
     return this
   }