acrylblends 0.0.0-stage → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/acrylblends.js +4 -0
- package/dist/index.d.ts +118 -0
- package/dist/index.js +454 -0
- package/dist/index.js.map +1 -0
- package/package.json +50 -4
- package/plugins/acryl-inspect/LICENSE +21 -0
- package/plugins/acryl-inspect/plugin.json +11 -0
- package/plugins/acryl-inspect/src/index.ts +3 -0
- package/plugins/acryl-inspect/src/report.ts +123 -0
- package/plugins/acryl-inspect/src/service.ts +66 -0
- package/plugins/acryl-inspect/tests/report.spec.ts +64 -0
- package/plugins/acryl-inspect/tests/service.spec.ts +120 -0
- package/plugins/acryl-inspect/upstream.json +18 -0
- package/plugins/acryl-node-server/LICENSE +21 -0
- package/plugins/acryl-node-server/plugin.json +12 -0
- package/plugins/acryl-node-server/src/index.ts +94 -0
- package/plugins/acryl-node-server/tests/server.spec.ts +105 -0
- package/plugins/acryl-node-server/upstream.json +18 -0
- package/plugins/acryl-router/LICENSE +21 -0
- package/plugins/acryl-router/plugin.json +12 -0
- package/plugins/acryl-router/src/compose.ts +21 -0
- package/plugins/acryl-router/src/context.ts +59 -0
- package/plugins/acryl-router/src/helpers/index.ts +3 -0
- package/plugins/acryl-router/src/helpers/read-body.ts +59 -0
- package/plugins/acryl-router/src/helpers/sse.ts +83 -0
- package/plugins/acryl-router/src/helpers/validate.ts +44 -0
- package/plugins/acryl-router/src/http-error.ts +21 -0
- package/plugins/acryl-router/src/index.ts +6 -0
- package/plugins/acryl-router/src/middleware/body-limit.ts +25 -0
- package/plugins/acryl-router/src/middleware/cors.ts +46 -0
- package/plugins/acryl-router/src/middleware/index.ts +6 -0
- package/plugins/acryl-router/src/middleware/logger.ts +21 -0
- package/plugins/acryl-router/src/middleware/loopback-only.ts +82 -0
- package/plugins/acryl-router/src/middleware/request-id.ts +24 -0
- package/plugins/acryl-router/src/middleware/secure-headers.ts +23 -0
- package/plugins/acryl-router/src/pattern.ts +89 -0
- package/plugins/acryl-router/src/registrar.ts +90 -0
- package/plugins/acryl-router/src/service.ts +164 -0
- package/plugins/acryl-router/src/table.ts +156 -0
- package/plugins/acryl-router/src/types.ts +73 -0
- package/plugins/acryl-router/src/util.ts +23 -0
- package/plugins/acryl-router/tests/api.spec.ts +223 -0
- package/plugins/acryl-router/tests/conformance.ts +170 -0
- package/plugins/acryl-router/tests/helpers.spec.ts +172 -0
- package/plugins/acryl-router/tests/live-install.spec.ts +64 -0
- package/plugins/acryl-router/tests/loader.spec.ts +71 -0
- package/plugins/acryl-router/tests/middleware.spec.ts +183 -0
- package/plugins/acryl-router/tests/service.spec.ts +211 -0
- package/plugins/acryl-router/tests/table.spec.ts +47 -0
- package/plugins/acryl-router/upstream.json +20 -0
- package/plugins/acryl-router-http/LICENSE +21 -0
- package/plugins/acryl-router-http/plugin.json +11 -0
- package/plugins/acryl-router-http/src/bridge.ts +52 -0
- package/plugins/acryl-router-http/src/index.ts +63 -0
- package/plugins/acryl-router-http/src/serve.ts +24 -0
- package/plugins/acryl-router-http/tests/adapter.spec.ts +170 -0
- package/plugins/acryl-router-http/tests/stream.spec.ts +133 -0
- package/plugins/acryl-router-http/tests/surfaces.spec.ts +99 -0
- package/plugins/acryl-router-http/upstream.json +22 -0
- package/plugins/acryl-state/LICENSE +21 -0
- package/plugins/acryl-state/plugin.json +12 -0
- package/plugins/acryl-state/src/cell.ts +67 -0
- package/plugins/acryl-state/src/index.ts +3 -0
- package/plugins/acryl-state/src/react.ts +11 -0
- package/plugins/acryl-state/src/service.ts +101 -0
- package/plugins/acryl-state/tests/cell.spec.ts +71 -0
- package/plugins/acryl-state/tests/react.spec.ts +39 -0
- package/plugins/acryl-state/tests/service.spec.ts +132 -0
- package/plugins/acryl-state/upstream.json +20 -0
- package/plugins/agent/agent.ts +152 -0
- package/plugins/agent/index.ts +20 -0
- package/plugins/agent/memory.ts +24 -0
- package/plugins/agent/model.ts +79 -0
- package/plugins/agent/plugin.json +10 -0
- package/plugins/agent/tools.ts +50 -0
- package/plugins/builder/index.ts +193 -0
- package/plugins/builder/plugin.json +11 -0
- package/plugins/builder/script.ts +161 -0
- package/plugins/extensions/index.ts +755 -0
- package/plugins/extensions/ledger.ts +39 -0
- package/plugins/extensions/plugin.json +12 -0
- package/plugins/extensions/resolve.ts +30 -0
- package/plugins/extensions/stage.ts +44 -0
- package/plugins/instance/index.ts +167 -0
- package/plugins/instance/plugin.json +10 -0
- package/plugins/manifest/index.ts +635 -0
- package/plugins/manifest/lock.ts +94 -0
- package/plugins/manifest/plugin.json +13 -0
- package/plugins/manifest/upgrade-cli.ts +70 -0
- package/plugins/manifest/upgrade.ts +97 -0
- package/plugins/openai/index.ts +159 -0
- package/plugins/openai/plugin.json +11 -0
- package/plugins/openai/prompt.ts +35 -0
- package/plugins/sandbox/index.ts +150 -0
- package/plugins/sandbox/plugin.json +8 -0
- package/plugins/sandbox/runner.mjs +18 -0
- package/plugins/save/cli.ts +19 -0
- package/plugins/save/index.ts +55 -0
- package/plugins/save/plugin.json +12 -0
- package/plugins/settings/index.ts +270 -0
- package/plugins/settings/merge.ts +79 -0
- package/plugins/settings/plugin.json +13 -0
- package/plugins/tasks/index.ts +246 -0
- package/plugins/tasks/plugin.json +11 -0
- package/plugins/tasks/store.ts +86 -0
- package/plugins/tsconfig.json +27 -0
- package/templates/agent/Dockerfile +15 -0
- package/templates/agent/README.md +52 -0
- package/templates/agent/blend.yaml +56 -0
- package/templates/agent/dockerignore +3 -0
- package/templates/agent/gitignore +2 -0
- package/templates/agent/package.json +23 -0
- package/templates/agent/src/app.ts +98 -0
- package/templates/agent/src/main.ts +25 -0
- package/templates/agent/src/routes.ts +53 -0
- package/templates/agent/template.json +16 -0
- package/templates/agent/test/agent.test.ts +45 -0
- package/templates/agent/test/app.test.ts +46 -0
- package/templates/agent/test/builder.test.ts +194 -0
- package/templates/agent/test/model.test.ts +88 -0
- package/templates/agent/tsconfig.json +19 -0
- package/templates/blank/README.md +26 -0
- package/templates/blank/blend.yaml +23 -0
- package/templates/blank/gitignore +2 -0
- package/templates/blank/package.json +23 -0
- package/templates/blank/src/app.ts +61 -0
- package/templates/blank/src/main.ts +20 -0
- package/templates/blank/src/routes.ts +14 -0
- package/templates/blank/template.json +1 -0
- package/templates/blank/test/app.test.ts +56 -0
- package/templates/blank/tsconfig.json +19 -0
- package/templates/todo/README.md +27 -0
- package/templates/todo/blend.yaml +25 -0
- package/templates/todo/gitignore +2 -0
- package/templates/todo/package.json +23 -0
- package/templates/todo/src/app.ts +71 -0
- package/templates/todo/src/main.ts +19 -0
- package/templates/todo/src/page.ts +28 -0
- package/templates/todo/src/todo.ts +96 -0
- package/templates/todo/template.json +1 -0
- package/templates/todo/test/todo.test.ts +145 -0
- package/templates/todo/tsconfig.json +19 -0
- package/templates/todo/upstream.json +12 -0
- package/README.md +0 -3
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto'
|
|
2
|
+
import type { Middleware } from '../types.ts'
|
|
3
|
+
import { setHeaders } from '../util.ts'
|
|
4
|
+
|
|
5
|
+
export interface RequestIdOptions {
|
|
6
|
+
/** The header read from the request and written to the response. */
|
|
7
|
+
readonly header?: string
|
|
8
|
+
/** Makes an id when the request brought none. */
|
|
9
|
+
readonly generate?: () => string
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
const SAFE_ID = /^[\w\-=]{1,255}$/u
|
|
13
|
+
|
|
14
|
+
/** Give every request an id: the caller's, when it is well formed, otherwise a new one. It is `c.get('requestId')` and the response header. */
|
|
15
|
+
export function requestId(options: RequestIdOptions = {}): Middleware {
|
|
16
|
+
const header = options.header ?? 'x-request-id'
|
|
17
|
+
const generate = options.generate ?? randomUUID
|
|
18
|
+
return async (c, next) => {
|
|
19
|
+
const incoming = c.req.headers.get(header)
|
|
20
|
+
const id = incoming !== null && SAFE_ID.test(incoming) ? incoming : generate()
|
|
21
|
+
c.set('requestId', id)
|
|
22
|
+
return setHeaders(await next(), { [header]: id })
|
|
23
|
+
}
|
|
24
|
+
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { Middleware } from '../types.ts'
|
|
2
|
+
import { setHeaders } from '../util.ts'
|
|
3
|
+
|
|
4
|
+
export interface SecureHeadersOptions {
|
|
5
|
+
/** Extra or replacement headers, merged over the defaults. A value of `''` removes a default. */
|
|
6
|
+
readonly headers?: Readonly<Record<string, string>>
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
const DEFAULTS: Record<string, string> = {
|
|
10
|
+
'x-content-type-options': 'nosniff',
|
|
11
|
+
'x-frame-options': 'SAMEORIGIN',
|
|
12
|
+
'referrer-policy': 'no-referrer',
|
|
13
|
+
'cross-origin-resource-policy': 'same-origin',
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/** Add the standard hardening headers to every response (never overriding one the handler already set). */
|
|
17
|
+
export function secureHeaders(options: SecureHeadersOptions = {}): Middleware {
|
|
18
|
+
const wanted = Object.entries({ ...DEFAULTS, ...options.headers }).filter(([, value]) => value !== '')
|
|
19
|
+
return async (_c, next) => {
|
|
20
|
+
const response = await next()
|
|
21
|
+
return setHeaders(response, Object.fromEntries(wanted.filter(([name]) => !response.headers.has(name))))
|
|
22
|
+
}
|
|
23
|
+
}
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import type { TrailingSlash } from './types.ts'
|
|
2
|
+
|
|
3
|
+
/** One piece of a route path. */
|
|
4
|
+
export type Segment =
|
|
5
|
+
| { readonly kind: 'static', readonly value: string }
|
|
6
|
+
| { readonly kind: 'param', readonly name: string }
|
|
7
|
+
| { readonly kind: 'wildcard' }
|
|
8
|
+
|
|
9
|
+
export interface Pattern {
|
|
10
|
+
/** The path as written (normalized for the trailing-slash rule). */
|
|
11
|
+
readonly source: string
|
|
12
|
+
readonly segments: readonly Segment[]
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
/** Split a pathname into segments. `/` is the empty list; under `strict` a trailing slash leaves a final empty segment. */
|
|
16
|
+
export function splitPath(path: string, trailingSlash: TrailingSlash): string[] {
|
|
17
|
+
let value = path
|
|
18
|
+
if (trailingSlash === 'ignore' && value.length > 1 && value.endsWith('/')) value = value.slice(0, -1)
|
|
19
|
+
if (value === '/' || value === '') return []
|
|
20
|
+
return value.slice(1).split('/')
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/** Compile `/a/:id/*`. A `*` is allowed only as the last segment; param names must be non-empty and unique. */
|
|
24
|
+
export function compilePattern(path: string, trailingSlash: TrailingSlash): Pattern {
|
|
25
|
+
if (!path.startsWith('/')) throw new TypeError(`router: path "${path}" must start with "/"`)
|
|
26
|
+
const parts = splitPath(path, trailingSlash)
|
|
27
|
+
const names = new Set<string>()
|
|
28
|
+
const segments: Segment[] = parts.map((part, index) => {
|
|
29
|
+
if (part === '*') {
|
|
30
|
+
if (index !== parts.length - 1) throw new TypeError(`router: "*" must be the last segment in "${path}"`)
|
|
31
|
+
return { kind: 'wildcard' }
|
|
32
|
+
}
|
|
33
|
+
if (part.startsWith(':')) {
|
|
34
|
+
const name = part.slice(1)
|
|
35
|
+
if (name === '') throw new TypeError(`router: empty parameter name in "${path}"`)
|
|
36
|
+
if (names.has(name)) throw new TypeError(`router: duplicate parameter ":${name}" in "${path}"`)
|
|
37
|
+
names.add(name)
|
|
38
|
+
return { kind: 'param', name }
|
|
39
|
+
}
|
|
40
|
+
return { kind: 'static', value: part }
|
|
41
|
+
})
|
|
42
|
+
return { source: path, segments }
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/** The same path with every parameter name erased, so `/a/:id` and `/a/:name` collide as duplicates. */
|
|
46
|
+
export function shapeOf(pattern: Pattern): string {
|
|
47
|
+
return '/' + pattern.segments.map(s => s.kind === 'static' ? s.value : s.kind === 'param' ? ':' : '*').join('/')
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
function decode(value: string): string {
|
|
51
|
+
try { return decodeURIComponent(value) } catch { return value }
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
/** Match concrete path segments against a pattern; returns the parameters, or `undefined` when it does not match. */
|
|
55
|
+
export function matchPattern(pattern: Pattern, parts: readonly string[]): Record<string, string> | undefined {
|
|
56
|
+
const params: Record<string, string> = {}
|
|
57
|
+
const { segments } = pattern
|
|
58
|
+
for (let i = 0; i < segments.length; i++) {
|
|
59
|
+
const segment = segments[i]
|
|
60
|
+
if (segment === undefined) return undefined
|
|
61
|
+
if (segment.kind === 'wildcard') {
|
|
62
|
+
params['*'] = parts.slice(i).map(decode).join('/')
|
|
63
|
+
return params
|
|
64
|
+
}
|
|
65
|
+
const part = parts[i]
|
|
66
|
+
if (part === undefined) return undefined
|
|
67
|
+
if (segment.kind === 'static') {
|
|
68
|
+
if (segment.value !== part) return undefined
|
|
69
|
+
} else {
|
|
70
|
+
params[segment.name] = decode(part)
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
return parts.length === segments.length ? params : undefined
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
const SCORE = { static: 3, param: 2, wildcard: 1 } as const
|
|
77
|
+
|
|
78
|
+
/** Compare two matching patterns: the more specific one (static before param before wildcard, left to right) wins. */
|
|
79
|
+
export function compareSpecificity(a: Pattern, b: Pattern): number {
|
|
80
|
+
const length = Math.max(a.segments.length, b.segments.length)
|
|
81
|
+
for (let i = 0; i < length; i++) {
|
|
82
|
+
const left = a.segments[i]
|
|
83
|
+
const right = b.segments[i]
|
|
84
|
+
const l = left === undefined ? 0 : SCORE[left.kind]
|
|
85
|
+
const r = right === undefined ? 0 : SCORE[right.kind]
|
|
86
|
+
if (l !== r) return l - r
|
|
87
|
+
}
|
|
88
|
+
return 0
|
|
89
|
+
}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The registration API every router scope shares (`get`, `use`, `group`): the router itself is one scope with an empty prefix, and
|
|
3
|
+
* `router.group('/api')` is another with a prefix. A scope never owns anything; every registration is released by the plugin that made it.
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
import type { Context } from '@deepseek-ai/cordis'
|
|
7
|
+
import { compose } from './compose.ts'
|
|
8
|
+
import type { Handler, Method, Middleware, RouteMethod } from './types.ts'
|
|
9
|
+
|
|
10
|
+
/** The last argument is the handler; everything before it is middleware that runs for this route only. */
|
|
11
|
+
export type RouteHandlers = readonly [...Middleware[], Handler]
|
|
12
|
+
|
|
13
|
+
export type UseArguments = readonly [Middleware, ...Middleware[]] | readonly [string, Middleware, ...Middleware[]]
|
|
14
|
+
|
|
15
|
+
export interface Registrar {
|
|
16
|
+
/** Register a route owned by the calling plugin. Returns a remover; the route also goes away when the caller unloads. */
|
|
17
|
+
route(method: RouteMethod, path: string, ...handlers: RouteHandlers): () => void
|
|
18
|
+
get(path: string, ...handlers: RouteHandlers): () => void
|
|
19
|
+
post(path: string, ...handlers: RouteHandlers): () => void
|
|
20
|
+
put(path: string, ...handlers: RouteHandlers): () => void
|
|
21
|
+
patch(path: string, ...handlers: RouteHandlers): () => void
|
|
22
|
+
delete(path: string, ...handlers: RouteHandlers): () => void
|
|
23
|
+
/** A route that answers every method no more specific route claims. */
|
|
24
|
+
all(path: string, ...handlers: RouteHandlers): () => void
|
|
25
|
+
/** The same handlers on several methods. Returns one remover for all of them. */
|
|
26
|
+
on(methods: Method | readonly Method[], path: string, ...handlers: RouteHandlers): () => void
|
|
27
|
+
/** Middleware for a path and everything below it (default: everything in this scope), in registration order. */
|
|
28
|
+
use(...args: UseArguments): () => void
|
|
29
|
+
/** A scope whose paths all start with `prefix`; optional middleware runs for everything under it. */
|
|
30
|
+
group(prefix: string, ...middleware: Middleware[]): Registrar
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/** What a scope needs from the router: put one route or one middleware into the table, owned by `owner`. */
|
|
34
|
+
export interface Primitives {
|
|
35
|
+
add(owner: Context, method: RouteMethod, path: string, handler: Handler): () => void
|
|
36
|
+
use(owner: Context, path: string, middleware: Middleware): () => void
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
const PREFIX = /^\/(?:[^/*:\s]+(?:\/[^/*:\s]+)*)?$/
|
|
40
|
+
|
|
41
|
+
/** Join a scope prefix and a path: `('/api', '/x')` is `/api/x`, `('/api', '/')` is `/api`, and an empty prefix leaves the path alone. */
|
|
42
|
+
export function joinPath(prefix: string, path: string): string {
|
|
43
|
+
if (prefix === '') return path
|
|
44
|
+
if (path === '/' || path === '') return prefix
|
|
45
|
+
if (!path.startsWith('/')) throw new TypeError(`router: path "${path}" must start with "/"`)
|
|
46
|
+
return `${prefix}${path}`
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
function validatePrefix(prefix: string): void {
|
|
50
|
+
if (prefix !== '' && !PREFIX.test(prefix)) throw new TypeError(`router: group prefix "${prefix}" must be a plain path like "/api" (no wildcard, no parameter, no trailing slash)`)
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
function single(handlers: RouteHandlers): Handler {
|
|
54
|
+
const last = handlers.at(-1)
|
|
55
|
+
if (last === undefined) throw new TypeError('router: a route needs a handler')
|
|
56
|
+
const middleware = handlers.slice(0, -1) as Middleware[]
|
|
57
|
+
return middleware.length === 0 ? last as Handler : compose(middleware, last as Handler)
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export function createRegistrar(owner: Context, prefix: string, primitives: Primitives): Registrar {
|
|
61
|
+
validatePrefix(prefix)
|
|
62
|
+
const route = (method: RouteMethod, path: string, ...handlers: RouteHandlers): (() => void) =>
|
|
63
|
+
primitives.add(owner, method, joinPath(prefix, path), single(handlers))
|
|
64
|
+
const registrar: Registrar = {
|
|
65
|
+
route,
|
|
66
|
+
get: (path, ...h) => route('GET', path, ...h),
|
|
67
|
+
post: (path, ...h) => route('POST', path, ...h),
|
|
68
|
+
put: (path, ...h) => route('PUT', path, ...h),
|
|
69
|
+
patch: (path, ...h) => route('PATCH', path, ...h),
|
|
70
|
+
delete: (path, ...h) => route('DELETE', path, ...h),
|
|
71
|
+
all: (path, ...h) => route('*', path, ...h),
|
|
72
|
+
on: (methods, path, ...h) => {
|
|
73
|
+
const removers = (Array.isArray(methods) ? methods as readonly Method[] : [methods as Method]).map(method => route(method, path, ...h))
|
|
74
|
+
return () => { for (const remove of removers) remove() }
|
|
75
|
+
},
|
|
76
|
+
use: (...args) => {
|
|
77
|
+
const [first, ...rest] = args as readonly [string | Middleware, ...Middleware[]]
|
|
78
|
+
const path = typeof first === 'string' ? first : '/'
|
|
79
|
+
const middleware = typeof first === 'string' ? rest : [first, ...rest]
|
|
80
|
+
const removers = middleware.map(mw => primitives.use(owner, joinPath(prefix, path), mw))
|
|
81
|
+
return () => { for (const remove of removers) remove() }
|
|
82
|
+
},
|
|
83
|
+
group: (nested, ...middleware) => {
|
|
84
|
+
const scope = createRegistrar(owner, joinPath(prefix, nested), primitives)
|
|
85
|
+
if (middleware.length > 0) scope.use(...(middleware as [Middleware, ...Middleware[]]))
|
|
86
|
+
return scope
|
|
87
|
+
},
|
|
88
|
+
}
|
|
89
|
+
return registrar
|
|
90
|
+
}
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The ACRYL router service (`ctx.router`): plugin-owned routes and middleware on Web-standard Request and Response.
|
|
3
|
+
*
|
|
4
|
+
* A route is registered from the owning plugin's context, so it disappears when that plugin unloads. `fetch(request)`
|
|
5
|
+
* runs a request in process: Web serves it behind HTTP (see spec 046, milestone M2), Desktop and the terminal UI call it
|
|
6
|
+
* directly, so one handler serves every surface without opening a socket. Disposal aborts in-flight requests through their
|
|
7
|
+
* `signal` and waits for them to settle.
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
import { Context, Service } from '@deepseek-ai/cordis'
|
|
11
|
+
import z from '@deepseek-ai/schemastery'
|
|
12
|
+
import { createRegistrar, type Primitives, type Registrar, type RouteHandlers, type UseArguments } from './registrar.ts'
|
|
13
|
+
import { RouteTable } from './table.ts'
|
|
14
|
+
import type { ConnectionInfo, ErrorHandler, Method, Middleware, NotFoundHandler, RouteMethod, TrailingSlash } from './types.ts'
|
|
15
|
+
|
|
16
|
+
const DEFAULT_DISPOSE_GRACE_MS = 2000
|
|
17
|
+
|
|
18
|
+
/** Validated plugin configuration. */
|
|
19
|
+
export interface Config {
|
|
20
|
+
trailingSlash: TrailingSlash
|
|
21
|
+
disposeGraceMs: number
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export const Config: z<Config> = z.object({
|
|
25
|
+
trailingSlash: z.union(['strict', 'ignore']).default('strict').description('Whether `/a` and `/a/` are different paths.'),
|
|
26
|
+
disposeGraceMs: z.number().min(0).default(DEFAULT_DISPOSE_GRACE_MS).description('How long disposal waits for aborted requests (and their waitUntil tasks) to finish before it gives up on them.'),
|
|
27
|
+
})
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* The Web adapter's service (`ctx.routerHttp`, provided by `acryl-router-http`). Declared here, beside `router`, so a plugin can ask for its routes to be
|
|
31
|
+
* served over HTTP without depending on the adapter package.
|
|
32
|
+
*/
|
|
33
|
+
export interface RouterHttpService {
|
|
34
|
+
/** Serve `prefix` and everything below it through the router; returns a remover. The mount also goes away when the calling plugin unloads. */
|
|
35
|
+
mount(prefix: string): () => void
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
declare module '@deepseek-ai/cordis' {
|
|
39
|
+
interface Context {
|
|
40
|
+
router: Router
|
|
41
|
+
routerHttp: RouterHttpService
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/** Stable Cordis plugin name, equal to the package name and the Loader row id. */
|
|
46
|
+
export const name = 'acryl-router'
|
|
47
|
+
|
|
48
|
+
interface Flight {
|
|
49
|
+
readonly controller: AbortController
|
|
50
|
+
/** Settles when the handler is done and every `waitUntil` task it registered has settled. */
|
|
51
|
+
readonly settled: Promise<unknown>
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
export class Router extends Service {
|
|
55
|
+
private readonly table: RouteTable
|
|
56
|
+
private readonly flights = new Set<Flight>()
|
|
57
|
+
private closing = false
|
|
58
|
+
private readonly graceMs: number
|
|
59
|
+
|
|
60
|
+
constructor(ctx: Context, config: Partial<Config> = {}) {
|
|
61
|
+
super(ctx, 'router')
|
|
62
|
+
// The schema supplies these defaults when the Loader mounts the package; a plugin object mounted by hand skips the schema.
|
|
63
|
+
const { trailingSlash = 'strict', disposeGraceMs = DEFAULT_DISPOSE_GRACE_MS } = config
|
|
64
|
+
this.graceMs = disposeGraceMs
|
|
65
|
+
this.table = new RouteTable({
|
|
66
|
+
trailingSlash,
|
|
67
|
+
onError: error => ctx.logger.error(`acryl-router: handler failed: ${error instanceof Error ? error.message : String(error)}`),
|
|
68
|
+
})
|
|
69
|
+
ctx.effect(() => async () => {
|
|
70
|
+
this.closing = true
|
|
71
|
+
const open = [...this.flights]
|
|
72
|
+
for (const flight of open) flight.controller.abort()
|
|
73
|
+
let timer: ReturnType<typeof setTimeout> | undefined
|
|
74
|
+
const gaveUp = new Promise<'gave-up'>(resolve => { timer = setTimeout(() => { resolve('gave-up') }, this.graceMs) })
|
|
75
|
+
const outcome = await Promise.race([Promise.allSettled(open.map(flight => flight.settled)).then(() => 'settled' as const), gaveUp])
|
|
76
|
+
clearTimeout(timer)
|
|
77
|
+
if (outcome === 'gave-up') ctx.logger.warn(`acryl-router: ${String(this.flights.size)} request(s) did not finish ${String(this.graceMs)} ms after abort; disposal continued without them`)
|
|
78
|
+
}, 'acryl-router: abort and settle in-flight requests')
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
/** Routes plus middleware currently registered; a leak check for reload tests. */
|
|
82
|
+
get size(): number {
|
|
83
|
+
return this.table.size
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
private readonly primitives: Primitives = {
|
|
87
|
+
add: (owner, method, path, handler) => {
|
|
88
|
+
const remove = this.table.add(method, path, handler)
|
|
89
|
+
owner.effect(() => () => { remove() }, `acryl-router: ${method} ${path}`)
|
|
90
|
+
return remove
|
|
91
|
+
},
|
|
92
|
+
use: (owner, path, middleware) => {
|
|
93
|
+
const remove = this.table.use(path, middleware)
|
|
94
|
+
owner.effect(() => () => { remove() }, `acryl-router: use ${path}`)
|
|
95
|
+
return remove
|
|
96
|
+
},
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
/** The scope the calling plugin registers into; `this.ctx` is the caller's context for the duration of a call made through `ctx.router`. */
|
|
100
|
+
private scope(): Registrar {
|
|
101
|
+
return createRegistrar(this.ctx, '', this.primitives)
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
route(method: RouteMethod, path: string, ...handlers: RouteHandlers): () => void { return this.scope().route(method, path, ...handlers) }
|
|
105
|
+
get(path: string, ...handlers: RouteHandlers): () => void { return this.scope().get(path, ...handlers) }
|
|
106
|
+
post(path: string, ...handlers: RouteHandlers): () => void { return this.scope().post(path, ...handlers) }
|
|
107
|
+
put(path: string, ...handlers: RouteHandlers): () => void { return this.scope().put(path, ...handlers) }
|
|
108
|
+
patch(path: string, ...handlers: RouteHandlers): () => void { return this.scope().patch(path, ...handlers) }
|
|
109
|
+
delete(path: string, ...handlers: RouteHandlers): () => void { return this.scope().delete(path, ...handlers) }
|
|
110
|
+
all(path: string, ...handlers: RouteHandlers): () => void { return this.scope().all(path, ...handlers) }
|
|
111
|
+
on(methods: Method | readonly Method[], path: string, ...handlers: RouteHandlers): () => void { return this.scope().on(methods, path, ...handlers) }
|
|
112
|
+
use(...args: UseArguments): () => void { return this.scope().use(...args) }
|
|
113
|
+
group(prefix: string, ...middleware: Middleware[]): Registrar { return this.scope().group(prefix, ...middleware) }
|
|
114
|
+
|
|
115
|
+
/** Turn errors into responses. One handler per router; the calling plugin owns it. */
|
|
116
|
+
onError(handler: ErrorHandler): () => void {
|
|
117
|
+
const remove = this.table.setErrorHandler(handler)
|
|
118
|
+
this.ctx.effect(() => () => { remove() }, 'acryl-router: onError')
|
|
119
|
+
return remove
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
/** Answer requests no route claimed. One handler per router; the calling plugin owns it. */
|
|
123
|
+
notFound(handler: NotFoundHandler): () => void {
|
|
124
|
+
const remove = this.table.setNotFoundHandler(handler)
|
|
125
|
+
this.ctx.effect(() => () => { remove() }, 'acryl-router: notFound')
|
|
126
|
+
return remove
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
/**
|
|
130
|
+
* Call the router the way a test calls an app: a path or URL string, a `URL` or a `Request`, with the usual init.
|
|
131
|
+
* A relative path is resolved against `http://localhost`.
|
|
132
|
+
*/
|
|
133
|
+
request(input: string | URL | Request, init?: RequestInit, connection?: ConnectionInfo): Promise<Response> {
|
|
134
|
+
const request = input instanceof Request ? input : new Request(new URL(String(input), 'http://localhost'), init)
|
|
135
|
+
return this.fetch(request, connection)
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
/**
|
|
139
|
+
* Run a request in process. Never throws: failures become a 500, a disposed router answers 503. `connection` describes
|
|
140
|
+
* the transport (an HTTP adapter passes the socket's peer address); an in-process caller omits it.
|
|
141
|
+
*/
|
|
142
|
+
fetch(request: Request, connection: ConnectionInfo = {}): Promise<Response> {
|
|
143
|
+
if (this.closing) return Promise.resolve(new Response('Service Unavailable', { status: 503 }))
|
|
144
|
+
const controller = new AbortController()
|
|
145
|
+
const forward = (): void => controller.abort()
|
|
146
|
+
if (request.signal.aborted) controller.abort()
|
|
147
|
+
else request.signal.addEventListener('abort', forward, { once: true })
|
|
148
|
+
const tasks: Promise<unknown>[] = []
|
|
149
|
+
// The caller gets the Response the moment the handler returns it; the flight lasts until every waitUntil task settles.
|
|
150
|
+
const response = this.table.dispatch(request, controller.signal, connection, task => { tasks.push(task) })
|
|
151
|
+
const settled = response.then(() => Promise.allSettled(tasks))
|
|
152
|
+
const flight: Flight = { controller, settled }
|
|
153
|
+
this.flights.add(flight)
|
|
154
|
+
void settled.finally(() => {
|
|
155
|
+
request.signal.removeEventListener('abort', forward)
|
|
156
|
+
this.flights.delete(flight)
|
|
157
|
+
})
|
|
158
|
+
return response
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
export function apply(ctx: Context, config: Partial<Config> = {}): void {
|
|
163
|
+
new Router(ctx, config)
|
|
164
|
+
}
|
|
@@ -0,0 +1,156 @@
|
|
|
1
|
+
import { compose } from './compose.ts'
|
|
2
|
+
import { createContext } from './context.ts'
|
|
3
|
+
import { compareSpecificity, compilePattern, matchPattern, shapeOf, splitPath, type Pattern } from './pattern.ts'
|
|
4
|
+
import { HttpError } from './http-error.ts'
|
|
5
|
+
import type { ConnectionInfo, ErrorHandler, Handler, Middleware, NotFoundHandler, RouteContext, RouteMethod, TrailingSlash } from './types.ts'
|
|
6
|
+
|
|
7
|
+
interface RouteEntry {
|
|
8
|
+
readonly method: RouteMethod
|
|
9
|
+
readonly pattern: Pattern
|
|
10
|
+
readonly handler: Handler
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
interface MiddlewareEntry {
|
|
14
|
+
readonly pattern: Pattern
|
|
15
|
+
readonly middleware: Middleware
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export interface RouteTableOptions {
|
|
19
|
+
readonly trailingSlash: TrailingSlash
|
|
20
|
+
/** Called with anything a handler or middleware throws; the caller still receives a 500. */
|
|
21
|
+
readonly onError?: (error: unknown) => void
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* The routing core: pure data and matching, no Cordis. Registrations return an idempotent remover, and the table keeps
|
|
26
|
+
* insertion order so middleware runs in registration order. Matching picks the most specific route (static before
|
|
27
|
+
* parameter before wildcard) among those that answer the request method.
|
|
28
|
+
*/
|
|
29
|
+
export class RouteTable {
|
|
30
|
+
private readonly routes = new Map<string, RouteEntry>()
|
|
31
|
+
private readonly middleware = new Map<symbol, MiddlewareEntry>()
|
|
32
|
+
private errorHandler: ErrorHandler | undefined
|
|
33
|
+
private notFoundHandler: NotFoundHandler | undefined
|
|
34
|
+
|
|
35
|
+
private readonly options: RouteTableOptions
|
|
36
|
+
|
|
37
|
+
constructor(options: RouteTableOptions) {
|
|
38
|
+
this.options = options
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/** Routes plus middleware currently registered. A reload that leaks registrations makes this grow. */
|
|
42
|
+
get size(): number {
|
|
43
|
+
return this.routes.size + this.middleware.size
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
add(method: RouteMethod, path: string, handler: Handler): () => void {
|
|
47
|
+
const pattern = compilePattern(path, this.options.trailingSlash)
|
|
48
|
+
const key = `${method} ${shapeOf(pattern)}`
|
|
49
|
+
if (this.routes.has(key)) throw new Error(`router: duplicate route ${method} ${path}`)
|
|
50
|
+
const entry: RouteEntry = { method, pattern, handler }
|
|
51
|
+
this.routes.set(key, entry)
|
|
52
|
+
return () => {
|
|
53
|
+
if (this.routes.get(key) === entry) this.routes.delete(key)
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/** Register middleware for `path` and everything below it (`/` means every request). */
|
|
58
|
+
use(path: string, middleware: Middleware): () => void {
|
|
59
|
+
const compiled = compilePattern(path, this.options.trailingSlash)
|
|
60
|
+
const last = compiled.segments.at(-1)
|
|
61
|
+
const pattern: Pattern = last?.kind === 'wildcard'
|
|
62
|
+
? compiled
|
|
63
|
+
: { source: compiled.source, segments: [...compiled.segments, { kind: 'wildcard' }] }
|
|
64
|
+
const id = Symbol(path)
|
|
65
|
+
this.middleware.set(id, { pattern, middleware })
|
|
66
|
+
return () => { this.middleware.delete(id) }
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
/** Register the one handler that turns errors into responses. A second registration throws: the app has one voice for its errors. */
|
|
70
|
+
setErrorHandler(handler: ErrorHandler): () => void {
|
|
71
|
+
if (this.errorHandler !== undefined) throw new Error('router: an error handler is already registered')
|
|
72
|
+
this.errorHandler = handler
|
|
73
|
+
return () => { if (this.errorHandler === handler) this.errorHandler = undefined }
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
/** Register the one handler that answers requests no route claimed. A second registration throws. */
|
|
77
|
+
setNotFoundHandler(handler: NotFoundHandler): () => void {
|
|
78
|
+
if (this.notFoundHandler !== undefined) throw new Error('router: a not-found handler is already registered')
|
|
79
|
+
this.notFoundHandler = handler
|
|
80
|
+
return () => { if (this.notFoundHandler === handler) this.notFoundHandler = undefined }
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
private readonly notFoundResponse = (c: RouteContext): Response | Promise<Response> =>
|
|
84
|
+
this.notFoundHandler === undefined ? new Response('Not Found', { status: 404 }) : this.notFoundHandler(c)
|
|
85
|
+
|
|
86
|
+
private async errorResponse(error: unknown, context: RouteContext): Promise<Response> {
|
|
87
|
+
if (this.errorHandler !== undefined) {
|
|
88
|
+
try {
|
|
89
|
+
return await this.errorHandler(error, context)
|
|
90
|
+
} catch (inner) {
|
|
91
|
+
this.options.onError?.(inner)
|
|
92
|
+
return new Response('Internal Server Error', { status: 500 })
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
if (error instanceof HttpError) return error.getResponse()
|
|
96
|
+
this.options.onError?.(error)
|
|
97
|
+
return new Response('Internal Server Error', { status: 500 })
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
private hasMethod(method: RouteMethod, parts: readonly string[]): boolean {
|
|
101
|
+
for (const entry of this.routes.values()) {
|
|
102
|
+
if (entry.method === method && matchPattern(entry.pattern, parts) !== undefined) return true
|
|
103
|
+
}
|
|
104
|
+
return false
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
async dispatch(
|
|
108
|
+
req: Request,
|
|
109
|
+
signal: AbortSignal,
|
|
110
|
+
connection: ConnectionInfo = {},
|
|
111
|
+
track: (task: Promise<unknown>) => void = () => undefined,
|
|
112
|
+
): Promise<Response> {
|
|
113
|
+
const parts = splitPath(new URL(req.url).pathname, this.options.trailingSlash)
|
|
114
|
+
const method = req.method.toUpperCase()
|
|
115
|
+
|
|
116
|
+
let best: { entry: RouteEntry, params: Record<string, string> } | undefined
|
|
117
|
+
const allowed = new Set<string>()
|
|
118
|
+
// HEAD is answered by the GET route when no route claims HEAD itself, and the body is dropped below.
|
|
119
|
+
const headFromGet = method === 'HEAD' && !this.hasMethod('HEAD', parts)
|
|
120
|
+
for (const entry of this.routes.values()) {
|
|
121
|
+
const params = matchPattern(entry.pattern, parts)
|
|
122
|
+
if (params === undefined) continue
|
|
123
|
+
allowed.add(entry.method)
|
|
124
|
+
if (entry.method === 'GET') allowed.add('HEAD')
|
|
125
|
+
const answers = entry.method === '*' || entry.method === method || (headFromGet && entry.method === 'GET')
|
|
126
|
+
if (!answers) continue
|
|
127
|
+
if (best === undefined || isBetter(entry, best.entry)) best = { entry, params }
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
const chain: Middleware[] = []
|
|
131
|
+
for (const entry of this.middleware.values()) {
|
|
132
|
+
if (matchPattern(entry.pattern, parts) !== undefined) chain.push(entry.middleware)
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
const final: Handler = best !== undefined
|
|
136
|
+
? best.entry.handler
|
|
137
|
+
: allowed.size > 0 && !allowed.has('*')
|
|
138
|
+
? () => new Response('Method Not Allowed', { status: 405, headers: { allow: [...allowed].sort().join(', ') } })
|
|
139
|
+
: this.notFoundResponse
|
|
140
|
+
|
|
141
|
+
const context = createContext(req, best?.params ?? {}, signal, connection, track, this.notFoundResponse)
|
|
142
|
+
try {
|
|
143
|
+
const response = await compose(chain, final)(context)
|
|
144
|
+
return method === 'HEAD' ? new Response(null, { status: response.status, statusText: response.statusText, headers: response.headers }) : response
|
|
145
|
+
} catch (error) {
|
|
146
|
+
if (signal.aborted) return new Response('Request aborted', { status: 499 })
|
|
147
|
+
return await this.errorResponse(error, context)
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
function isBetter(candidate: RouteEntry, current: RouteEntry): boolean {
|
|
153
|
+
const order = compareSpecificity(candidate.pattern, current.pattern)
|
|
154
|
+
if (order !== 0) return order > 0
|
|
155
|
+
return current.method === '*' && candidate.method !== '*'
|
|
156
|
+
}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
/** What a `Response` can be constructed from: bytes, a string, a stream, or nothing. */
|
|
2
|
+
export type ResponseBody = ConstructorParameters<typeof Response>[0]
|
|
3
|
+
|
|
4
|
+
/** HTTP methods a route can answer; `*` answers any method not claimed by a more specific route. */
|
|
5
|
+
export type Method = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'HEAD' | 'OPTIONS'
|
|
6
|
+
export type RouteMethod = Method | '*'
|
|
7
|
+
|
|
8
|
+
/** How a trailing slash is read: `strict` keeps `/a` and `/a/` distinct, `ignore` treats them as one path. */
|
|
9
|
+
export type TrailingSlash = 'strict' | 'ignore'
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Facts about the transport the request arrived on, supplied by the caller of `fetch` and never by the request itself.
|
|
13
|
+
* An in-process caller (the terminal UI) passes nothing, so a handler that needs a trusted peer must refuse it.
|
|
14
|
+
*/
|
|
15
|
+
export interface ConnectionInfo {
|
|
16
|
+
/** The peer address of the socket, when the request came over one (for example `127.0.0.1`). */
|
|
17
|
+
readonly remoteAddress?: string | undefined
|
|
18
|
+
/** The local port the socket is connected to, the real one a `Host` header should be checked against. */
|
|
19
|
+
readonly localPort?: number | undefined
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
/** What a handler or middleware sees. Deliberately small: the Web-standard request plus a few response helpers. */
|
|
23
|
+
export interface RouteContext {
|
|
24
|
+
/** The incoming request. */
|
|
25
|
+
readonly req: Request
|
|
26
|
+
/** Parsed `req.url`. */
|
|
27
|
+
readonly url: URL
|
|
28
|
+
/** Matched `:name` segments, and `*` for the remainder of a wildcard route. Values are URL-decoded. */
|
|
29
|
+
readonly params: Readonly<Record<string, string>>
|
|
30
|
+
/** The transport the request arrived on; empty for an in-process call. */
|
|
31
|
+
readonly connection: ConnectionInfo
|
|
32
|
+
/** Aborted when the caller aborts the request or when the router is disposed. Handlers should honor it. */
|
|
33
|
+
readonly signal: AbortSignal
|
|
34
|
+
/** Request-scoped values shared between middleware and the handler. */
|
|
35
|
+
get<T>(key: string): T | undefined
|
|
36
|
+
set(key: string, value: unknown): void
|
|
37
|
+
/**
|
|
38
|
+
* Keep this request "in flight" until `task` settles, even after the handler returned its `Response`. A handler that
|
|
39
|
+
* streams (server-sent events) registers the promise that resolves when its stream ends; disposing the router aborts
|
|
40
|
+
* `signal` and waits for it, so a stream never outlives the plugin that served it.
|
|
41
|
+
*/
|
|
42
|
+
waitUntil(task: Promise<unknown>): void
|
|
43
|
+
/**
|
|
44
|
+
* Set a header that the response helpers below (`json`, `text`, `html`, `body`, `redirect`, `notFound`) carry. A response built
|
|
45
|
+
* by hand with `new Response` is the handler's own and is left alone; middleware that must change any response reads it from `next()`.
|
|
46
|
+
*/
|
|
47
|
+
header(name: string, value: string): void
|
|
48
|
+
/** The status the response helpers use when they are not given one. */
|
|
49
|
+
status(code: number): void
|
|
50
|
+
/** One query parameter, or all of them as an object (repeated names keep the first). */
|
|
51
|
+
query(): Record<string, string>
|
|
52
|
+
query(name: string): string | undefined
|
|
53
|
+
/** One route parameter, or all of them. Same values as `params`. */
|
|
54
|
+
param(): Readonly<Record<string, string>>
|
|
55
|
+
param(name: string): string | undefined
|
|
56
|
+
json(data: unknown, status?: number): Response
|
|
57
|
+
text(body: string, status?: number): Response
|
|
58
|
+
html(body: string, status?: number): Response
|
|
59
|
+
/** A response with a raw body (bytes, a string, a stream, or nothing) and optional extra headers. */
|
|
60
|
+
body(data: ResponseBody, status?: number, headers?: Record<string, string>): Response
|
|
61
|
+
redirect(location: string, status?: 301 | 302 | 303 | 307 | 308): Response
|
|
62
|
+
/** The router's not-found response (or the registered `notFound` handler's). */
|
|
63
|
+
notFound(): Response | Promise<Response>
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
export type Handler = (c: RouteContext) => Response | Promise<Response>
|
|
67
|
+
export type Next = () => Promise<Response>
|
|
68
|
+
export type Middleware = (c: RouteContext, next: Next) => Response | Promise<Response>
|
|
69
|
+
|
|
70
|
+
/** Turns anything a handler or middleware threw into a response. Registered with `router.onError`. */
|
|
71
|
+
export type ErrorHandler = (error: unknown, c: RouteContext) => Response | Promise<Response>
|
|
72
|
+
/** Answers a request no route claimed. Registered with `router.notFound`. */
|
|
73
|
+
export type NotFoundHandler = (c: RouteContext) => Response | Promise<Response>
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/** Small response utilities shared by the middleware. Not exported from the package. */
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Set headers on a response a handler already built. Responses made with `new Response` are mutable; ones from `fetch` or `Response.redirect` are
|
|
5
|
+
* not, so on a failed write the response is rebuilt around the same body.
|
|
6
|
+
*/
|
|
7
|
+
export function setHeaders(response: Response, headers: Record<string, string>): Response {
|
|
8
|
+
try {
|
|
9
|
+
for (const [name, value] of Object.entries(headers)) response.headers.set(name, value)
|
|
10
|
+
return response
|
|
11
|
+
} catch {
|
|
12
|
+
const merged = new Headers(response.headers)
|
|
13
|
+
for (const [name, value] of Object.entries(headers)) merged.set(name, value)
|
|
14
|
+
return new Response(response.body, { status: response.status, statusText: response.statusText, headers: merged })
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export function appendVary(response: Response, value: string): Response {
|
|
19
|
+
const current = response.headers.get('vary')
|
|
20
|
+
const present = current?.split(',').map(part => part.trim().toLowerCase()) ?? []
|
|
21
|
+
if (present.includes('*') || present.includes(value.toLowerCase())) return response
|
|
22
|
+
return setHeaders(response, { vary: current === null || current === '' ? value : `${current}, ${value}` })
|
|
23
|
+
}
|