acrylblends 0.4.0 → 0.5.0

package/plugins/acryl-router/src/core/utils/jwt/jws.ts

@@ -9,7 +9,7 @@ import { decodeBase64 } from '../encode.ts'
 import type { SignatureAlgorithm } from './jwa.ts'
 import { CryptoKeyUsage, JwtAlgorithmNotImplemented } from './types.ts'
 import { utf8Encoder } from './utf8.ts'
-import type { BufferSource } from '../types.ts'
+import type { BufferSource, CryptoKey, JsonWebKey } from '../types.ts'
 
 type KeyImporterAlgorithm = Parameters<typeof crypto.subtle.importKey>[2]
 type KeyAlgorithm =
@@ -21,11 +21,11 @@ type KeyAlgorithm =
 
 // Extending the JsonWebKey interface to include the "kid" property.
 // https://datatracker.ietf.org/doc/html/rfc7515#section-4.1.4
-export interface AppJsonWebKey extends JsonWebKey {
+export interface AcrylJsonWebKey extends JsonWebKey {
   kid?: string
 }
 
-export type SignatureKey = string | AppJsonWebKey | CryptoKey
+export type SignatureKey = string | AcrylJsonWebKey | CryptoKey
 
 export async function signing(
   privateKey: SignatureKey,

package/plugins/acryl-router/src/core/utils/jwt/jwt.test.ts

@@ -2,7 +2,7 @@
 import { vi } from 'vitest'
 import { encodeBase64, encodeBase64Url } from '../encode.ts'
 import { AlgorithmTypes } from './jwa.ts'
-import type { AppJsonWebKey } from './jws.ts'
+import type { AcrylJsonWebKey } from './jws.ts'
 import { signing } from './jws.ts'
 import * as JWT from './jwt.ts'
 import { verifyWithJwks } from './jwt.ts'
@@ -1475,7 +1475,7 @@ describe('verifyWithJwks algorithm whitelist', () => {
 
 describe('verifyWithJwks key handling', () => {
   it('Should not mutate provided keys when JWKS is fetched repeatedly', async () => {
-    const localKeys: AppJsonWebKey[] = [
+    const localKeys: AcrylJsonWebKey[] = [
       {
         kty: 'RSA',
         kid: 'local-key',

package/plugins/acryl-router/src/core/utils/jwt/jwt.ts

@@ -8,7 +8,7 @@ import { decodeBase64Url, encodeBase64Url } from '../encode.ts'
 import { AlgorithmTypes } from './jwa.ts'
 import type { AsymmetricAlgorithm, SignatureAlgorithm, SymmetricAlgorithm } from './jwa.ts'
 import { signing, verifying } from './jws.ts'
-import type { AppJsonWebKey, SignatureKey } from './jws.ts'
+import type { AcrylJsonWebKey, SignatureKey } from './jws.ts'
 import {
   JwtAlgorithmMismatch,
   JwtAlgorithmNotAllowed,
@@ -198,7 +198,7 @@ const symmetricAlgorithms: SymmetricAlgorithm[] = [
 export const verifyWithJwks = async (
   token: string,
   options: {
-    keys?: AppJsonWebKey[]
+    keys?: AcrylJsonWebKey[]
     jwks_uri?: string
     verification?: VerifyOptions
     allowedAlgorithms: readonly AsymmetricAlgorithm[]
@@ -241,7 +241,7 @@ export const verifyWithJwks = async (
       throw new Error('invalid JWKS response. "keys" field is not an array')
     }
     verifyKeys ??= []
-    verifyKeys.push(...(data.keys as AppJsonWebKey[]))
+    verifyKeys.push(...(data.keys as AcrylJsonWebKey[]))
   } else if (!verifyKeys) {
     throw new Error('verifyWithJwks requires options for either "keys" or "jwks_uri" or both')
   }

package/plugins/acryl-router/src/core/utils/jwt/types.ts

@@ -154,4 +154,4 @@ export type JWTPayload = {
   aud?: string | string[]
 }
 
-export type { AppJsonWebKey } from './jws.ts'
+export type { AcrylJsonWebKey } from './jws.ts'

package/plugins/acryl-router/src/core/utils/types.ts

@@ -121,3 +121,45 @@ export type StringLiteralUnion<T> = T | (string & Record<never, never>)
 
 /** Bytes a Web Crypto call accepts; declared here so the public types do not need the DOM library. */
 export type BufferSource = ArrayBufferView<ArrayBuffer> | ArrayBuffer
+
+/** A Web Crypto key, named from the runtime's own `crypto` so the public types do not need the DOM library. */
+export type CryptoKey = Awaited<ReturnType<typeof crypto.subtle.importKey>>
+
+/** How a WebSocket hands binary data to `onmessage`; declared here so the public types do not need the DOM library. */
+export type BinaryType = 'arraybuffer' | 'blob'
+
+/** The members of a WebSocket `message` event the helpers hand out (the Web `MessageEvent`, whose Node global is not generic); declared here so the public types do not need the DOM library. */
+export interface MessageEvent<T = unknown> extends Event {
+  readonly data: T
+  readonly lastEventId: string
+  readonly origin: string
+}
+
+/** The members of a WebSocket `close` event the helpers hand out (the Web `CloseEvent`, which Node has no global type for); declared here so the public types do not need the DOM library. */
+export interface CloseEvent extends Event {
+  readonly code: number
+  readonly reason: string
+  readonly wasClean: boolean
+}
+
+/** A JSON Web Key (RFC 7517), the same members as the Web Crypto dictionary; declared here so the public types do not need the DOM library. */
+export interface JsonWebKey {
+  alg?: string
+  crv?: string
+  d?: string
+  dp?: string
+  dq?: string
+  e?: string
+  ext?: boolean
+  k?: string
+  key_ops?: string[]
+  kty?: string
+  n?: string
+  oth?: { d?: string; r?: string; t?: string }[]
+  p?: string
+  q?: string
+  qi?: string
+  use?: string
+  x?: string
+  y?: string
+}

package/plugins/acryl-router/src/core/utils/url.test.ts

@@ -270,7 +270,7 @@ describe('url', () => {
       )
       expect(getQueryParam('http://example.com/?safe=1#&admin=true')).toEqual({ safe: '1' })
       expect(getQueryParam('http://example.com/?name=hey&age=20&tall=170', 'age')).toBe('20')
-      expect(getQueryParam('http://example.com/?App+is=a+web+framework', 'App is')).toBe(
+      expect(getQueryParam('http://example.com/?Acryl+is=a+web+framework', 'Acryl is')).toBe(
         'a web framework'
       )
       expect(getQueryParam('http://example.com/?name=%E0%A4%A', 'name')).toBe('%E0%A4%A')
@@ -330,7 +330,7 @@ describe('url', () => {
       expect(
         getQueryParams('http://example.com/?name=hey&age=20&tall=170&name=foo&age=30', 'age')
       ).toEqual(['20', '30'])
-      expect(getQueryParams('http://example.com/?App+is=a+web+framework', 'App is')).toEqual([
+      expect(getQueryParams('http://example.com/?Acryl+is=a+web+framework', 'Acryl is')).toEqual([
         'a web framework',
       ])
       expect(getQueryParams('http://example.com/?name=%E0%A4%A', 'name')).toEqual(['%E0%A4%A'])

package/plugins/acryl-router/src/core/validator/index.ts

@@ -1,6 +1,6 @@
 /**
  * @module
- * Validator for App.
+ * Validator for Acryl.
  */
 
 export { validator } from './validator.ts'

package/plugins/acryl-router/src/core/validator/validator.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import * as z from 'zod'
 import type { Context } from '../context.ts'
-import { App } from '../app.ts'
+import { Acryl } from '../app.ts'
 import { HTTPException } from '../http-exception.ts'
 import { cloneRawRequest } from '../request.ts'
 import type {
@@ -61,7 +61,7 @@ const zodValidator = <
 }
 
 describe('Basic', () => {
-  const app = new App()
+  const app = new Acryl()
 
   const route = app.get(
     '/search',
@@ -124,7 +124,7 @@ const onErrorHandler: ErrorHandler = (e, c) => {
 }
 
 describe('JSON', () => {
-  const app = new App()
+  const app = new Acryl()
   app.post(
     '/post',
     validator('json', (value) => value),
@@ -230,7 +230,7 @@ describe('JSON', () => {
 })
 
 describe('Malformed JSON', () => {
-  const app = new App()
+  const app = new Acryl()
   app.post(
     '/post',
     validator('json', (value) => value),
@@ -254,7 +254,7 @@ describe('Malformed JSON', () => {
 })
 
 describe('FormData', () => {
-  const app = new App()
+  const app = new Acryl()
   app.post(
     '/post',
     validator('form', (value) => value),
@@ -373,7 +373,7 @@ describe('FormData', () => {
 })
 
 describe('Malformed FormData request', () => {
-  const app = new App()
+  const app = new Acryl()
   app.post(
     '/post',
     validator('form', (value) => value),
@@ -399,7 +399,7 @@ describe('Malformed FormData request', () => {
 })
 
 describe('JSON and FormData', () => {
-  const app = new App()
+  const app = new Acryl()
   app.post(
     '/',
     validator('json', (value) => value),
@@ -442,7 +442,7 @@ describe('JSON and FormData', () => {
 
 describe('Cached contents', () => {
   describe('json', () => {
-    const app = new App()
+    const app = new Acryl()
     const bodyTypes = ['json', 'text', 'arrayBuffer', 'blob']
 
     for (const type of bodyTypes) {
@@ -483,7 +483,7 @@ describe('Cached contents', () => {
   })
 
   describe('Cached content', () => {
-    const app = new App()
+    const app = new Acryl()
     const bodyTypes = ['formData', 'text', 'arrayBuffer', 'blob']
 
     for (const type of bodyTypes) {
@@ -523,7 +523,7 @@ describe('Cached contents', () => {
 })
 
 describe('Validator middleware with a custom validation function', () => {
-  const app = new App()
+  const app = new Acryl()
 
   const validationFunction: ValidationFunction<{ id: string }, { id: number }> = (v) => {
     return {
@@ -595,7 +595,7 @@ describe('Validator middleware with a custom validation function', () => {
 })
 
 describe('Validator middleware with Zod validates JSON', () => {
-  const app = new App()
+  const app = new Acryl()
 
   const schema = z.object({
     id: z.number(),
@@ -688,7 +688,7 @@ describe('Validator middleware with Zod validates JSON', () => {
 })
 
 describe('Validator middleware with Zod validates Form data', () => {
-  const app = new App()
+  const app = new Acryl()
 
   const schema = z.object({
     id: z.string(),
@@ -728,7 +728,7 @@ describe('Validator middleware with Zod validates Form data', () => {
 })
 
 describe('Validator middleware with Zod validates query params', () => {
-  const app = new App()
+  const app = new Acryl()
 
   const schema = z.object({
     page: z
@@ -767,7 +767,7 @@ describe('Validator middleware with Zod validates query params', () => {
 })
 
 describe('Validator middleware with Zod validates param', () => {
-  const app = new App()
+  const app = new Acryl()
 
   const schema = z.object({
     id: z
@@ -804,7 +804,7 @@ describe('Validator middleware with Zod validates param', () => {
 })
 
 describe('Validator middleware with Zod validates header values', () => {
-  const app = new App()
+  const app = new Acryl()
 
   const schema = z.object({
     'x-request-id': z.string().uuid(),
@@ -842,7 +842,7 @@ describe('Validator middleware with Zod validates header values', () => {
 })
 
 describe('Validator middleware with Zod validates cookies', () => {
-  const app = new App()
+  const app = new Acryl()
 
   const schema = z.object({
     debug: z.enum(['0', '1']),
@@ -879,7 +879,7 @@ describe('Validator middleware with Zod validates cookies', () => {
 })
 
 describe('Validator middleware with Zod multiple validators', () => {
-  const app = new App<{ Variables: { id: number } }>()
+  const app = new Acryl<{ Variables: { id: number } }>()
   const route = app.post(
     '/posts',
     zodValidator(
@@ -977,7 +977,7 @@ describe('Validator middleware with Zod multiple validators', () => {
 })
 
 it('With path parameters', () => {
-  const app = new App()
+  const app = new Acryl()
 
   const route = app.put(
     '/posts/:id',
@@ -1020,7 +1020,7 @@ it('With path parameters', () => {
 })
 
 it('`on`', () => {
-  const app = new App()
+  const app = new Acryl()
 
   const route = app.on(
     'PURGE',
@@ -1068,7 +1068,7 @@ it('`on`', () => {
 })
 
 it('`app.on`', () => {
-  const app = new App()
+  const app = new Acryl()
 
   const route = app
     .get(
@@ -1112,7 +1112,7 @@ it('`app.on`', () => {
 
 describe('Clone Request object', () => {
   describe('json', () => {
-    const app = new App()
+    const app = new Acryl()
     app.post(
       '/',
       validator('json', () => {
@@ -1147,7 +1147,7 @@ describe('Clone Request object', () => {
   })
 
   describe('form', () => {
-    const app = new App()
+    const app = new Acryl()
     app.post(
       '/',
       validator('form', () => {
@@ -1212,7 +1212,7 @@ describe('Clone Request object', () => {
 })
 
 describe('Async validator function', () => {
-  const app = new App()
+  const app = new Acryl()
 
   app.get(
     '/posts',
@@ -1243,7 +1243,7 @@ describe('Validator with using Zod directly', () => {
       age: z.number(),
       type: z.enum(['a']),
     })
-    const app = new App()
+    const app = new Acryl()
 
     const route = app.post(
       '/posts',
@@ -1308,7 +1308,7 @@ describe('Validator with using Zod directly', () => {
 
 describe('Transform', () => {
   it('Should be number when the type is transformed', () => {
-    const route = new App().get(
+    const route = new Acryl().get(
       '/',
       validator('query', async () => {
         return {
@@ -1347,7 +1347,7 @@ describe('Transform', () => {
   })
 
   it('Should be number and union when the type is transformed', () => {
-    const app = new App()
+    const app = new Acryl()
     const route = app.get(
       '/',
       validator('query', () => {
@@ -1400,7 +1400,7 @@ describe('Transform', () => {
 
 describe('Raw Request cloning after validation', () => {
   it('Should allow the `cloneRawRequest` util to clone the request object after validation', async () => {
-    const app = new App()
+    const app = new Acryl()
 
     app.post(
       '/json-validation',
@@ -1469,7 +1469,7 @@ describe('Raw Request cloning after validation', () => {
 
 describe('Form validator prototype pollution prevention', () => {
   it('should store __proto__ as data and not misdetect inherited keys', async () => {
-    const app = new App()
+    const app = new Acryl()
     app.post(
       '/form',
       validator('form', (value) => value),

package/plugins/acryl-router/src/deprecated.ts

@@ -0,0 +1,15 @@
+/**
+ * The 0.4 names, kept for one release so code written against them keeps working: `App` is now `Acryl` and `AppRequest` is now `AcrylRequest`,
+ * the upstream names with the project renamed. Not part of the ported core; both the plugin's root and the public package's root export these.
+ */
+
+import { Acryl } from './core/app.ts'
+import type { AcrylRequest } from './core/request.ts'
+import type { BlankEnv, BlankSchema, Env, Input, Schema } from './core/types.ts'
+
+/** @deprecated Use `Acryl` (`new Acryl()`); `App` is the 0.4 name and goes away in the next release. */
+export const App = Acryl
+/** @deprecated Use `Acryl`; `App` is the 0.4 name and goes away in the next release. */
+export type App<E extends Env = BlankEnv, S extends Schema = BlankSchema, BasePath extends string = '/'> = Acryl<E, S, BasePath>
+/** @deprecated Use `AcrylRequest`; `AppRequest` is the 0.4 name and goes away in the next release. */
+export type AppRequest<P extends string = '/', I extends Input['out'] = {}> = AcrylRequest<P, I>

package/plugins/acryl-router/src/index.ts

@@ -1,6 +1,7 @@
 export { Router, Config, apply, name, type MountableApp, type RouterHttpService, type TrailingSlash } from './service.ts'
 export { connectionOf, getConnInfo, type ConnectionInfo, type RouterBindings, type RouterEnv } from './connection.ts'
-export { App, Context } from './core/index.ts'
-export type { AppRequest, ContextRenderer, ContextVariableMap, Env, ErrorHandler, ExecutionContext, Handler, Input, MiddlewareHandler, Next, NotFoundHandler, NotFoundResponse, Schema, ToSchema, TypedResponse, ValidationTargets } from './core/index.ts'
+export { Acryl, Context } from './core/index.ts'
+export { App, type AppRequest } from './deprecated.ts'
+export type { AcrylRequest, ContextRenderer, ContextVariableMap, Env, ErrorHandler, ExecutionContext, Handler, Input, MiddlewareHandler, Next, NotFoundHandler, NotFoundResponse, Schema, ToSchema, TypedResponse, ValidationTargets } from './core/index.ts'
 export { HTTPException } from './core/http-exception.ts'
 export type { ContentfulStatusCode, StatusCode } from './core/utils/http-status.ts'

package/plugins/acryl-router/src/middleware/index.ts

@@ -22,4 +22,4 @@ export { NONCE, secureHeaders, type SecureHeadersVariables } from '../core/middl
 export { timeout } from '../core/middleware/timeout/index.ts'
 export { endTime, setMetric, startTime, timing, wrapTime, type TimingVariables } from '../core/middleware/timing/index.ts'
 export { appendTrailingSlash, trimTrailingSlash } from '../core/middleware/trailing-slash/index.ts'
-export { LOOPBACK_HOSTNAMES, loopbackAuthority, loopbackOnly, sameOrigin, type LoopbackOptions } from './loopback-only.ts'
+export { LOOPBACK_HOSTNAMES, fromOwnPage, loopbackAuthority, loopbackOnly, sameOrigin, type LoopbackOptions } from './loopback-only.ts'

package/plugins/acryl-router/src/middleware/loopback-only.ts

@@ -19,6 +19,13 @@ export interface LoopbackOptions {
    * checked in full: only a call with no connection facts at all counts as in process.
    */
   readonly inProcess?: 'deny' | 'allow'
+  /**
+   * Who may call. `local` (default): any program on this machine, a browser page only as `mutations` allows. `own-page`: only this app's own page,
+   * for private routes a script on the machine must not drive or read either. A request then shows an `Origin` that is exactly this authority (with
+   * `Sec-Fetch-Site` absent or `same-origin`), or, for a read (GET, HEAD, OPTIONS), which browsers often send without `Origin`, `Sec-Fetch-Site:
+   * same-origin` and a `Referer` from this authority. `mutations` is not consulted: every request is held to that rule.
+   */
+  readonly callers?: 'local' | 'own-page'
 }
 
 const loopback = new BlockList()
@@ -68,10 +75,31 @@ export function sameOrigin(c: Context, authority: URL): boolean {
   }
 }
 
-/** Only requests from this machine to this app: loopback peer, the real port, an allowed `Host`, and for mutations a matching `Origin`. Everything else gets a 403. */
+function originOf(value: string | undefined): string | undefined {
+  if (value === undefined) return undefined
+  try {
+    return new URL(value).origin
+  } catch {
+    return undefined
+  }
+}
+
+/** Whether the request comes from a page served by this authority itself: the `own-page` rule of {@link LoopbackOptions.callers}. */
+export function fromOwnPage(c: Context, authority: URL): boolean {
+  const origin = c.req.header('origin')
+  const fetchSite = c.req.header('sec-fetch-site')
+  if (origin !== undefined && originOf(origin) === origin && origin === authority.origin) return fetchSite === undefined || fetchSite === 'same-origin'
+  return SAFE_METHODS.has(c.req.method) && fetchSite === 'same-origin' && originOf(c.req.header('referer')) === authority.origin
+}
+
+/**
+ * Only requests from this machine to this app: loopback peer, the real port, an allowed `Host`, and for mutations a matching `Origin` (with
+ * `callers: 'own-page'`, every request from this app's own page). Everything else gets a 403.
+ */
 export function loopbackOnly(options: LoopbackOptions = {}): MiddlewareHandler {
   const mutations = options.mutations ?? 'same-origin'
   const inProcess = options.inProcess ?? 'deny'
+  const ownPage = options.callers === 'own-page'
   return async (c, next) => {
     const connection = connectionOf(c)
     if (inProcess === 'allow' && connection.remoteAddress === undefined && connection.localPort === undefined) {
@@ -80,6 +108,11 @@ export function loopbackOnly(options: LoopbackOptions = {}): MiddlewareHandler {
     }
     const authority = loopbackAuthority(c, options.hostnames)
     if (authority === undefined) return c.json({ error: 'request authority rejected' }, 403)
+    if (ownPage) {
+      if (!fromOwnPage(c, authority)) return c.json({ error: 'only this app\'s own page may call this' }, 403)
+      await next()
+      return
+    }
     if (mutations === 'same-origin' && !SAFE_METHODS.has(c.req.method) && !sameOrigin(c, authority)) {
       return c.json({ error: 'a change must come from this app\'s own origin' }, 403)
     }

package/plugins/acryl-router/src/service.ts

@@ -1,7 +1,7 @@
 /**
- * The ACRYL router service (`ctx.router`): plugin-owned `App` mounts on Web-standard Request and Response.
+ * The ACRYL router service (`ctx.router`): plugin-owned `Acryl` mounts on Web-standard Request and Response.
  *
- * A plugin builds an ordinary `App` and mounts it with `ctx.router.route(path, app)` from its own context, so the mount disappears when that
+ * A plugin builds an ordinary `Acryl` and mounts it with `ctx.router.route(path, app)` from its own context, so the mount disappears when that
  * plugin unloads. `fetch(request)` runs a request in process: Web and Desktop serve it behind HTTP through an adapter, the terminal UI calls
  * it directly, so one handler serves every surface without opening a socket. Disposal refuses new requests, aborts in-flight ones, ends any
  * response body still streaming and waits for all of it to settle.
@@ -10,7 +10,7 @@
 import { Context, Service } from '@deepseek-ai/cordis'
 import z from '@deepseek-ai/schemastery'
 import type { ConnectionInfo, RouterBindings } from './connection.ts'
-import { App } from './core/app.ts'
+import { Acryl } from './core/app.ts'
 import type { ExecutionContext } from './core/context.ts'
 import { HTTPException } from './core/http-exception.ts'
 import { TrieRouter } from './core/router/trie-router/index.ts'
@@ -54,9 +54,9 @@ declare module '@deepseek-ai/cordis' {
 /** Stable Cordis plugin name, equal to the package name and the Loader row id. */
 export const name = 'acryl-router'
 
-// Any `App`, whatever its Env and schema; the router only reads its routes.
+// Any `Acryl`, whatever its Env and schema; the router only reads its routes.
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type MountableApp = App<any, any, any>
+export type MountableApp = Acryl<any, any, any>
 
 interface Mount {
   readonly path: string
@@ -68,7 +68,7 @@ interface RouterState {
   errorHandler: ErrorHandler | undefined
   notFoundHandler: NotFoundHandler | undefined
   /** The app composed from the live mounts; dropped on every change and composed again by the next request. */
-  composed: App | undefined
+  composed: Acryl | undefined
   closing: boolean
 }
 
@@ -144,9 +144,15 @@ export class Router extends Service {
       this.state.composed = undefined
       return this.end([...this.flights].filter(flight => (flight.running.get(mount) ?? 0) > 0 || flight.producer === mount), `removing ${path}`)
     }
-    // The label lists what the mount serves, so the inspector can report routes without asking the router (`ALL` is middleware or `all`).
-    const served = app.routes.map(route => `${route.method} ${mergePath(path, route.path)}`).join(', ')
-    this.ctx.effect(() => remove, `acryl-router: route ${path} (${served})`)
+    // Each route the mount serves is a child effect of it, labeled on its own, so the inspector can report routes without asking the
+    // router and no label grows with the size of the app (`ALL` is middleware or `all`). The children hold nothing: the mount does.
+    // (Cordis adopts an effect as a child only when the parent's body yields it.)
+    const served = new Set(app.routes.map(route => `${route.method} ${mergePath(path, route.path)}`))
+    const owner = this.ctx
+    owner.effect(function* () {
+      for (const route of served) yield owner.effect(() => () => {}, `acryl-router: serves ${route}`)
+      yield remove
+    }, `acryl-router: route ${path}`)
     return () => { void remove() }
   }
 
@@ -155,8 +161,8 @@ export class Router extends Service {
    * mount's code a request is in. The core's `app.route` runs first so a sub-app's own `onError` still applies to its routes.
    */
   private snapshot(path: string, app: MountableApp): Mount {
-    const copy = new App().route('/', app)
-    const tagged = new App()
+    const copy = new Acryl().route('/', app)
+    const tagged = new Acryl()
     const mount: Mount = { path, app: tagged }
     for (const route of copy.routes) {
       const inner = route.handler
@@ -285,12 +291,12 @@ export class Router extends Service {
     }
   }
 
-  private app(): App {
+  private app(): Acryl {
     if (this.state.composed !== undefined) return this.state.composed
     // The trie router, because the composed app is rebuilt after every mount change: the default matcher compiles one regular expression
     // over all routes on its first request, which grows faster than the route count (measured: 22 ms at 1000 routes, 163 ms at 2000),
     // while the trie rebuilds in about 1 ms per 1000 routes and matches as fast (scripts/bench-remount.mjs).
-    const root = new App({ strict: this.strict, router: new TrieRouter() })
+    const root = new Acryl({ strict: this.strict, router: new TrieRouter() })
     for (const mount of this.state.mounts) root.route(mount.path, mount.app)
     root.onError(this.state.errorHandler ?? this.logError)
     if (this.state.notFoundHandler !== undefined) root.notFound(this.state.notFoundHandler)