acrylblends 0.6.3 → 0.6.4
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/README.md +3 -2
- package/docs/framework/README.md +2 -2
- package/docs/framework/UPSTREAM.md +1 -1
- package/docs/framework/guides/jsx.md +24 -0
- package/docs/framework/helpers/ssg.md +3 -6
- package/docs/framework/middleware/builtin/jsx-renderer.md +0 -3
- package/docs/framework/upstream.json +2 -2
- package/lib/accepts.d.ts +1 -1
- package/lib/acryl-base.d.ts +1 -1
- package/lib/adapter.d.ts +1 -1
- package/lib/{app-wFwpg-bt.d.ts → app-D8riatvv.d.ts} +1 -1
- package/lib/basic-auth.d.ts +1 -1
- package/lib/bearer-auth.d.ts +1 -1
- package/lib/body-limit.d.ts +1 -1
- package/lib/cache.d.ts +1 -1
- package/lib/cache.js +4 -4
- package/lib/{client-BHTr318g.js → client-DDLXwhBo.js} +2 -125
- package/lib/client.d.ts +2 -2
- package/lib/client.js +2 -1
- package/lib/combine.d.ts +1 -1
- package/lib/{components-Ce5FRyHU.js → components-0o0CBYNv.js} +2 -2
- package/lib/{components-DYZdxJIJ.js → components-DdI7-ns7.js} +1 -1
- package/lib/compress.d.ts +1 -1
- package/lib/conninfo.d.ts +2 -2
- package/lib/{context-DVQBjuns.d.ts → context-DS3fYyG-.d.ts} +1 -1
- package/lib/context-storage.d.ts +1 -1
- package/lib/cookie.d.ts +1 -1
- package/lib/cors.d.ts +1 -1
- package/lib/csrf.d.ts +1 -1
- package/lib/dev.d.ts +2 -2
- package/lib/etag.d.ts +1 -1
- package/lib/factory.d.ts +2 -2
- package/lib/{hooks-Bq5q9IMl.js → hooks-BMw6BAyP.js} +5 -5
- package/lib/{index-CUTfU69R.d.ts → index-Bb7YJKCq.d.ts} +2 -2
- package/lib/{index-CsvB-F9j.d.ts → index-BvFh1Gfx.d.ts} +1 -1
- package/lib/{index-Cqcdluyn.d.ts → index-CTy4N7ng.d.ts} +2 -2
- package/lib/index.d.ts +4 -4
- package/lib/ip-restriction.d.ts +2 -2
- package/lib/jsx/dom/client.js +1 -1
- package/lib/jsx/dom/jsx-dev-runtime.js +1 -1
- package/lib/jsx/dom/jsx-runtime.js +1 -1
- package/lib/jsx/dom/server.js +1 -1
- package/lib/jsx/dom.js +3 -3
- package/lib/jsx/streaming.js +1 -1
- package/lib/{jsx-dev-runtime-kAhR_4C7.js → jsx-dev-runtime-D18Y35TI.js} +1 -1
- package/lib/jsx-renderer.d.ts +75 -0
- package/lib/jsx-renderer.js +99 -0
- package/lib/jsx.js +3 -3
- package/lib/jwk.d.ts +1 -1
- package/lib/jwt.d.ts +1 -1
- package/lib/language.d.ts +1 -1
- package/lib/logger.d.ts +1 -1
- package/lib/loopback-only.d.ts +1 -1
- package/lib/method-not-allowed.d.ts +2 -2
- package/lib/method-override.d.ts +2 -2
- package/lib/mount.d.ts +1 -1
- package/lib/node-server/conninfo.d.ts +1 -1
- package/lib/node-server/serve-static.d.ts +1 -1
- package/lib/node-server/serve-static.js +1 -1
- package/lib/node-server.d.ts +1 -1
- package/lib/node-server.js +1 -1
- package/lib/powered-by.d.ts +1 -1
- package/lib/pretty-json.d.ts +1 -1
- package/lib/quick.d.ts +1 -1
- package/lib/request-id.d.ts +1 -1
- package/lib/request.d.ts +1 -1
- package/lib/route.d.ts +1 -1
- package/lib/schema-validator.d.ts +1 -1
- package/lib/secure-headers.d.ts +1 -1
- package/lib/{serve-static-Cw23shXv.js → serve-static-B14MF1Va.js} +1 -0
- package/lib/serve-static.d.ts +1 -1
- package/lib/ssg-BwjcA-Ge.js +389 -0
- package/lib/ssg.d.ts +156 -0
- package/lib/ssg.js +2 -0
- package/lib/streaming.d.ts +1 -1
- package/lib/testing.d.ts +3 -3
- package/lib/testing.js +1 -1
- package/lib/timeout.d.ts +1 -1
- package/lib/timing.d.ts +1 -1
- package/lib/tiny.d.ts +1 -1
- package/lib/trailing-slash.d.ts +1 -1
- package/lib/{types-nEL8VPDC.d.ts → types-Dv_nV2cv.d.ts} +1 -1
- package/lib/{types-CQiGmsWW.d.ts → types-zNxyEpG2.d.ts} +2 -2
- package/lib/types.d.ts +1 -1
- package/lib/utils/body.d.ts +1 -1
- package/lib/utils/ipaddr.d.ts +1 -1
- package/lib/utils-Cx61GFMC.js +125 -0
- package/lib/validator.d.ts +1 -1
- package/lib/ws.d.ts +1 -1
- package/package.json +9 -1
- package/plugins/acryl-inspect/upstream.json +1 -1
- package/plugins/acryl-node-server/upstream.json +1 -1
- package/plugins/acryl-router/src/core/helper/ssg/index.ts +14 -0
- package/plugins/acryl-router/src/core/helper/ssg/middleware.ts +83 -0
- package/plugins/acryl-router/src/core/helper/ssg/plugins.ts +72 -0
- package/plugins/acryl-router/src/core/helper/ssg/ssg.ts +471 -0
- package/plugins/acryl-router/src/core/helper/ssg/utils.ts +118 -0
- package/plugins/acryl-router/src/core/jsx/dom/render.ts +6 -6
- package/plugins/acryl-router/src/core/middleware/cache/index.ts +4 -4
- package/plugins/acryl-router/src/core/middleware/jsx-renderer/index.ts +162 -0
- package/plugins/acryl-router/src/helpers/index.ts +1 -0
- package/plugins/acryl-router/src/middleware/index.ts +1 -0
- package/plugins/acryl-router/upstream.json +2 -2
- package/plugins/acryl-router-http/upstream.json +1 -1
- package/plugins/acryl-state/upstream.json +1 -1
- package/plugins/desktop/upstream.json +1 -1
- package/plugins/desktop-web/upstream.json +1 -1
- package/plugins/extensions/resolve.ts +4 -0
- package/shared/AGENTS.core.md +4 -0
- package/templates/agent/tsconfig.json +7 -1
- package/templates/todo/upstream.json +1 -1
- package/plugins/acryl-inspect/tests/report.spec.ts +0 -69
- package/plugins/acryl-inspect/tests/service.spec.ts +0 -121
- package/plugins/acryl-node-server/tests/adapter/app.ts +0 -76
- package/plugins/acryl-node-server/tests/adapter/assets/.static/plain.txt +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/favicon.ico +0 -0
- package/plugins/acryl-node-server/tests/adapter/assets/secret.txt +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static/acryl.html +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static/admin/secret.txt +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static/data.json +0 -5
- package/plugins/acryl-node-server/tests/adapter/assets/static/extensionless +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static/foo..bar.txt +0 -0
- package/plugins/acryl-node-server/tests/adapter/assets/static/index.html +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static/plain.txt +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static-with-context-path/plain.txt +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static-with-precompressed/hello.bin +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static-with-precompressed/hello.bin.br +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static-with-precompressed/hello.txt +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static-with-precompressed/hello.txt.br +0 -1
- package/plugins/acryl-node-server/tests/adapter/assets/static-with-precompressed/hello.txt.zst +0 -1
- package/plugins/acryl-node-server/tests/adapter/conninfo.test.ts +0 -34
- package/plugins/acryl-node-server/tests/adapter/content-length.test.ts +0 -248
- package/plugins/acryl-node-server/tests/adapter/early-hints.test.ts +0 -457
- package/plugins/acryl-node-server/tests/adapter/fixtures/keys/agent1-cert.pem +0 -23
- package/plugins/acryl-node-server/tests/adapter/fixtures/keys/agent1-key.pem +0 -27
- package/plugins/acryl-node-server/tests/adapter/headers.test.ts +0 -252
- package/plugins/acryl-node-server/tests/adapter/helpers/request.ts +0 -190
- package/plugins/acryl-node-server/tests/adapter/listener.test.ts +0 -727
- package/plugins/acryl-node-server/tests/adapter/request-client-disconnect.test.ts +0 -189
- package/plugins/acryl-node-server/tests/adapter/request.test.ts +0 -1230
- package/plugins/acryl-node-server/tests/adapter/response.test.ts +0 -285
- package/plugins/acryl-node-server/tests/adapter/serve-static.test.ts +0 -849
- package/plugins/acryl-node-server/tests/adapter/server-socket.test.ts +0 -790
- package/plugins/acryl-node-server/tests/adapter/server.test.ts +0 -1312
- package/plugins/acryl-node-server/tests/adapter/setup.ts +0 -16
- package/plugins/acryl-node-server/tests/adapter/url.test.ts +0 -76
- package/plugins/acryl-node-server/tests/adapter/utils/response.test.ts +0 -23
- package/plugins/acryl-node-server/tests/adapter/utils/stream.test.ts +0 -75
- package/plugins/acryl-node-server/tests/adapter/utils.test.ts +0 -235
- package/plugins/acryl-node-server/tests/adapter/websocket.test.ts +0 -260
- package/plugins/acryl-node-server/tests/server.spec.ts +0 -141
- package/plugins/acryl-router/src/core/app.test.ts +0 -3833
- package/plugins/acryl-router/src/core/client/client.test.ts +0 -2313
- package/plugins/acryl-router/src/core/client/types.test.ts +0 -149
- package/plugins/acryl-router/src/core/client/utils.test.ts +0 -405
- package/plugins/acryl-router/src/core/compose.test.ts +0 -751
- package/plugins/acryl-router/src/core/context.test.ts +0 -629
- package/plugins/acryl-router/src/core/helper/accepts/accepts.test.ts +0 -344
- package/plugins/acryl-router/src/core/helper/adapter/index.test.ts +0 -55
- package/plugins/acryl-router/src/core/helper/cookie/index.test.ts +0 -510
- package/plugins/acryl-router/src/core/helper/css/common.case.test.tsx +0 -506
- package/plugins/acryl-router/src/core/helper/css/index.test.tsx +0 -678
- package/plugins/acryl-router/src/core/helper/dev/index.test.ts +0 -181
- package/plugins/acryl-router/src/core/helper/factory/index.test.ts +0 -434
- package/plugins/acryl-router/src/core/helper/html/index.test.ts +0 -78
- package/plugins/acryl-router/src/core/helper/proxy/index.test.ts +0 -356
- package/plugins/acryl-router/src/core/helper/route/index.test.ts +0 -259
- package/plugins/acryl-router/src/core/helper/streaming/sse.test.tsx +0 -557
- package/plugins/acryl-router/src/core/helper/streaming/stream.test.ts +0 -128
- package/plugins/acryl-router/src/core/helper/streaming/text.test.ts +0 -34
- package/plugins/acryl-router/src/core/helper/testing/index.test.ts +0 -42
- package/plugins/acryl-router/src/core/helper/websocket/index.test.ts +0 -124
- package/plugins/acryl-router/src/core/http-exception.test.ts +0 -45
- package/plugins/acryl-router/src/core/jsx/base.test.tsx +0 -97
- package/plugins/acryl-router/src/core/jsx/children.test.ts +0 -52
- package/plugins/acryl-router/src/core/jsx/components.test.tsx +0 -936
- package/plugins/acryl-router/src/core/jsx/context-isolation.test.ts +0 -655
- package/plugins/acryl-router/src/core/jsx/dom/client.test.tsx +0 -128
- package/plugins/acryl-router/src/core/jsx/dom/components.test.tsx +0 -330
- package/plugins/acryl-router/src/core/jsx/dom/context.test.tsx +0 -184
- package/plugins/acryl-router/src/core/jsx/dom/css.test.tsx +0 -149
- package/plugins/acryl-router/src/core/jsx/dom/hooks/index.test.tsx +0 -172
- package/plugins/acryl-router/src/core/jsx/dom/index.test.tsx +0 -3681
- package/plugins/acryl-router/src/core/jsx/dom/intrinsic-element/components.test.tsx +0 -1344
- package/plugins/acryl-router/src/core/jsx/dom/server.test.tsx +0 -199
- package/plugins/acryl-router/src/core/jsx/hooks/dom.test.tsx +0 -859
- package/plugins/acryl-router/src/core/jsx/hooks/string.test.tsx +0 -40
- package/plugins/acryl-router/src/core/jsx/index.test.tsx +0 -1744
- package/plugins/acryl-router/src/core/jsx/intrinsic-element/components.test.tsx +0 -666
- package/plugins/acryl-router/src/core/jsx/jsx-runtime.test.tsx +0 -85
- package/plugins/acryl-router/src/core/jsx/streaming.test.tsx +0 -1281
- package/plugins/acryl-router/src/core/jsx/utils.test.ts +0 -366
- package/plugins/acryl-router/src/core/middleware/basic-auth/index.test.ts +0 -434
- package/plugins/acryl-router/src/core/middleware/bearer-auth/index.test.ts +0 -1018
- package/plugins/acryl-router/src/core/middleware/body-limit/index.test.ts +0 -273
- package/plugins/acryl-router/src/core/middleware/cache/index.test.ts +0 -1211
- package/plugins/acryl-router/src/core/middleware/combine/index.test.ts +0 -355
- package/plugins/acryl-router/src/core/middleware/compress/index.test.ts +0 -535
- package/plugins/acryl-router/src/core/middleware/context-storage/index.test.ts +0 -43
- package/plugins/acryl-router/src/core/middleware/cors/index.test.ts +0 -532
- package/plugins/acryl-router/src/core/middleware/csrf/index.test.ts +0 -534
- package/plugins/acryl-router/src/core/middleware/etag/digest.test.ts +0 -21
- package/plugins/acryl-router/src/core/middleware/etag/index.test.ts +0 -503
- package/plugins/acryl-router/src/core/middleware/ip-restriction/index.test.ts +0 -217
- package/plugins/acryl-router/src/core/middleware/jwk/index.test.ts +0 -1135
- package/plugins/acryl-router/src/core/middleware/jwk/keys.test.json +0 -48
- package/plugins/acryl-router/src/core/middleware/jwt/index.test.ts +0 -802
- package/plugins/acryl-router/src/core/middleware/language/index.test.ts +0 -552
- package/plugins/acryl-router/src/core/middleware/logger/index.test.ts +0 -204
- package/plugins/acryl-router/src/core/middleware/method-not-allowed/index.test.ts +0 -292
- package/plugins/acryl-router/src/core/middleware/method-override/index.test.ts +0 -221
- package/plugins/acryl-router/src/core/middleware/mount/index.test.ts +0 -334
- package/plugins/acryl-router/src/core/middleware/powered-by/index.test.ts +0 -37
- package/plugins/acryl-router/src/core/middleware/pretty-json/index.test.ts +0 -218
- package/plugins/acryl-router/src/core/middleware/request-id/index.test.ts +0 -168
- package/plugins/acryl-router/src/core/middleware/secure-headers/index.test.ts +0 -671
- package/plugins/acryl-router/src/core/middleware/serve-static/index.test.ts +0 -450
- package/plugins/acryl-router/src/core/middleware/serve-static/path.test.ts +0 -50
- package/plugins/acryl-router/src/core/middleware/timeout/index.test.ts +0 -70
- package/plugins/acryl-router/src/core/middleware/timing/index.test.ts +0 -310
- package/plugins/acryl-router/src/core/middleware/trailing-slash/index.test.ts +0 -381
- package/plugins/acryl-router/src/core/preset/quick.test.ts +0 -42
- package/plugins/acryl-router/src/core/preset/tiny.test.ts +0 -42
- package/plugins/acryl-router/src/core/request.test.ts +0 -751
- package/plugins/acryl-router/src/core/router/common.case.test.ts +0 -1132
- package/plugins/acryl-router/src/core/router/linear-router/router.test.ts +0 -80
- package/plugins/acryl-router/src/core/router/pattern-router/router.test.ts +0 -46
- package/plugins/acryl-router/src/core/router/reg-exp-router/prepared-router.test.ts +0 -154
- package/plugins/acryl-router/src/core/router/reg-exp-router/router.test.ts +0 -265
- package/plugins/acryl-router/src/core/router/smart-router/router.test.ts +0 -13
- package/plugins/acryl-router/src/core/router/trie-router/node.test.ts +0 -896
- package/plugins/acryl-router/src/core/router/trie-router/router.test.ts +0 -8
- package/plugins/acryl-router/src/core/types.test.ts +0 -4134
- package/plugins/acryl-router/src/core/utils/accept.test.ts +0 -299
- package/plugins/acryl-router/src/core/utils/basic-auth.test.ts +0 -56
- package/plugins/acryl-router/src/core/utils/body.test.ts +0 -496
- package/plugins/acryl-router/src/core/utils/buffer.test.ts +0 -147
- package/plugins/acryl-router/src/core/utils/color.test.ts +0 -23
- package/plugins/acryl-router/src/core/utils/concurrent.test.ts +0 -69
- package/plugins/acryl-router/src/core/utils/cookie.test.ts +0 -460
- package/plugins/acryl-router/src/core/utils/crypto.test.ts +0 -43
- package/plugins/acryl-router/src/core/utils/encode.test.ts +0 -61
- package/plugins/acryl-router/src/core/utils/filepath.test.ts +0 -78
- package/plugins/acryl-router/src/core/utils/html.test.ts +0 -16
- package/plugins/acryl-router/src/core/utils/ipaddr.test.ts +0 -149
- package/plugins/acryl-router/src/core/utils/jwt/jwa.test.ts +0 -86
- package/plugins/acryl-router/src/core/utils/jwt/jwt.test.ts +0 -1788
- package/plugins/acryl-router/src/core/utils/mime.test.ts +0 -64
- package/plugins/acryl-router/src/core/utils/stream.test.ts +0 -212
- package/plugins/acryl-router/src/core/utils/types.test.ts +0 -295
- package/plugins/acryl-router/src/core/utils/url.test.ts +0 -384
- package/plugins/acryl-router/src/core/validator/utils.test.ts +0 -82
- package/plugins/acryl-router/src/core/validator/validator.test.ts +0 -1488
- package/plugins/acryl-router/tests/docs-examples.spec.ts +0 -152
- package/plugins/acryl-router/tests/jsx.spec.tsx +0 -63
- package/plugins/acryl-router/tests/live-install.spec.ts +0 -64
- package/plugins/acryl-router/tests/loader.spec.ts +0 -72
- package/plugins/acryl-router/tests/loopback-only.spec.ts +0 -80
- package/plugins/acryl-router/tests/no-dom/consumer.ts +0 -11
- package/plugins/acryl-router/tests/no-dom/tsconfig.json +0 -13
- package/plugins/acryl-router/tests/service.spec.ts +0 -426
- package/plugins/acryl-router/tests/shadow-state.spec.ts +0 -79
- package/plugins/acryl-router-http/tests/adapter.spec.ts +0 -174
- package/plugins/acryl-router-http/tests/stream.spec.ts +0 -133
- package/plugins/acryl-router-http/tests/surfaces.spec.ts +0 -101
- package/plugins/acryl-state/src/react.ts +0 -11
- package/plugins/acryl-state/tests/cell.spec.ts +0 -71
- package/plugins/acryl-state/tests/react.spec.ts +0 -39
- package/plugins/acryl-state/tests/service.spec.ts +0 -132
|
@@ -1,218 +0,0 @@
|
|
|
1
|
-
import { prettyJSON } from './index.ts'
|
|
2
|
-
import { Acryl } from '../../app.ts'
|
|
3
|
-
|
|
4
|
-
describe('JSON pretty by Middleware', () => {
|
|
5
|
-
it('Should return pretty JSON output', async () => {
|
|
6
|
-
const app = new Acryl()
|
|
7
|
-
app.use('*', prettyJSON())
|
|
8
|
-
app.get('/', (c) => {
|
|
9
|
-
return c.json({ message: 'Acryl!' })
|
|
10
|
-
})
|
|
11
|
-
|
|
12
|
-
const res = await app.request('http://localhost/?pretty')
|
|
13
|
-
expect(res).not.toBeNull()
|
|
14
|
-
expect(res.status).toBe(200)
|
|
15
|
-
expect(await res.text()).toBe(`{
|
|
16
|
-
"message": "Acryl!"
|
|
17
|
-
}`)
|
|
18
|
-
})
|
|
19
|
-
|
|
20
|
-
it('Should return pretty JSON output with 4 spaces', async () => {
|
|
21
|
-
const app = new Acryl()
|
|
22
|
-
app.use('*', prettyJSON({ space: 4 }))
|
|
23
|
-
app.get('/', (c) => {
|
|
24
|
-
return c.json({ message: 'Acryl!' })
|
|
25
|
-
})
|
|
26
|
-
|
|
27
|
-
const res = await app.request('http://localhost/?pretty')
|
|
28
|
-
expect(res).not.toBeNull()
|
|
29
|
-
expect(res.status).toBe(200)
|
|
30
|
-
expect(await res.text()).toBe(`{
|
|
31
|
-
"message": "Acryl!"
|
|
32
|
-
}`)
|
|
33
|
-
})
|
|
34
|
-
|
|
35
|
-
it('Should return pretty JSON output when middleware received custom query', async () => {
|
|
36
|
-
const targetQuery = 'format'
|
|
37
|
-
|
|
38
|
-
const app = new Acryl()
|
|
39
|
-
app.use(
|
|
40
|
-
'*',
|
|
41
|
-
prettyJSON({
|
|
42
|
-
query: targetQuery,
|
|
43
|
-
})
|
|
44
|
-
)
|
|
45
|
-
app.get('/', (c) =>
|
|
46
|
-
c.json({
|
|
47
|
-
message: 'Acryl!',
|
|
48
|
-
})
|
|
49
|
-
)
|
|
50
|
-
|
|
51
|
-
const prettyText = await (await app.request(`?${targetQuery}`)).text()
|
|
52
|
-
expect(prettyText).toBe(`{
|
|
53
|
-
"message": "Acryl!"
|
|
54
|
-
}`)
|
|
55
|
-
const nonPrettyText = await (await app.request('?pretty')).text()
|
|
56
|
-
expect(nonPrettyText).toBe('{"message":"Acryl!"}')
|
|
57
|
-
})
|
|
58
|
-
|
|
59
|
-
it('Should force pretty JSON output when force option is true', async () => {
|
|
60
|
-
const app = new Acryl()
|
|
61
|
-
app.use('*', prettyJSON({ force: true }))
|
|
62
|
-
app.get('/', (c) => {
|
|
63
|
-
return c.json({ message: 'Acryl!' })
|
|
64
|
-
})
|
|
65
|
-
|
|
66
|
-
const resWithoutQuery = await (await app.request('http://localhost/')).text()
|
|
67
|
-
expect(resWithoutQuery).toBe(`{
|
|
68
|
-
"message": "Acryl!"
|
|
69
|
-
}`)
|
|
70
|
-
|
|
71
|
-
const resWithQuery = await (await app.request('http://localhost/?pretty')).text()
|
|
72
|
-
expect(resWithQuery).toBe(`{
|
|
73
|
-
"message": "Acryl!"
|
|
74
|
-
}`)
|
|
75
|
-
})
|
|
76
|
-
|
|
77
|
-
it('Should return pretty JSON output for structured JSON content-types (+json)', async () => {
|
|
78
|
-
const app = new Acryl()
|
|
79
|
-
app.use('*', prettyJSON({ force: true }))
|
|
80
|
-
app.get('/problem', (c) => {
|
|
81
|
-
return c.newResponse(JSON.stringify({ type: 'about:blank', title: 'Bad Request' }), 400, {
|
|
82
|
-
'Content-Type': 'application/problem+json',
|
|
83
|
-
})
|
|
84
|
-
})
|
|
85
|
-
app.get('/jsonapi', (c) => {
|
|
86
|
-
return c.newResponse(JSON.stringify({ data: { id: '1', type: 'articles' } }), 200, {
|
|
87
|
-
'Content-Type': 'application/vnd.api+json',
|
|
88
|
-
})
|
|
89
|
-
})
|
|
90
|
-
|
|
91
|
-
const problemRes = await app.request('http://localhost/problem')
|
|
92
|
-
expect(await problemRes.text()).toBe(`{
|
|
93
|
-
"type": "about:blank",
|
|
94
|
-
"title": "Bad Request"
|
|
95
|
-
}`)
|
|
96
|
-
|
|
97
|
-
const jsonApiRes = await app.request('http://localhost/jsonapi')
|
|
98
|
-
expect(await jsonApiRes.text()).toBe(`{
|
|
99
|
-
"data": {
|
|
100
|
-
"id": "1",
|
|
101
|
-
"type": "articles"
|
|
102
|
-
}
|
|
103
|
-
}`)
|
|
104
|
-
})
|
|
105
|
-
|
|
106
|
-
it('Should not touch responses with non-JSON content-types', async () => {
|
|
107
|
-
const app = new Acryl()
|
|
108
|
-
app.use('*', prettyJSON({ force: true }))
|
|
109
|
-
app.get('/text', (c) => c.text('{"message":"Acryl!"}'))
|
|
110
|
-
app.get('/json-seq', (c) => {
|
|
111
|
-
return c.body('{"message":"Acryl!"}', 200, {
|
|
112
|
-
'Content-Type': 'application/json-seq',
|
|
113
|
-
})
|
|
114
|
-
})
|
|
115
|
-
|
|
116
|
-
const textRes = await app.request('http://localhost/text')
|
|
117
|
-
expect(await textRes.text()).toBe('{"message":"Acryl!"}')
|
|
118
|
-
|
|
119
|
-
const jsonSeqRes = await app.request('http://localhost/json-seq')
|
|
120
|
-
expect(await jsonSeqRes.text()).toBe('{"message":"Acryl!"}')
|
|
121
|
-
})
|
|
122
|
-
|
|
123
|
-
it('Should not break 204 responses with a JSON content-type', async () => {
|
|
124
|
-
const app = new Acryl()
|
|
125
|
-
app.use('*', prettyJSON({ force: true }))
|
|
126
|
-
app.delete('/x', (c) => {
|
|
127
|
-
c.header('Content-Type', 'application/json')
|
|
128
|
-
return c.body(null, 204)
|
|
129
|
-
})
|
|
130
|
-
|
|
131
|
-
const res = await app.request('http://localhost/x', { method: 'DELETE' })
|
|
132
|
-
expect(res.status).toBe(204)
|
|
133
|
-
expect(res.body).toBeNull()
|
|
134
|
-
})
|
|
135
|
-
|
|
136
|
-
it('Should not break 304 responses with a JSON content-type', async () => {
|
|
137
|
-
const app = new Acryl()
|
|
138
|
-
app.use('*', prettyJSON({ force: true }))
|
|
139
|
-
app.get('/x', (c) => {
|
|
140
|
-
c.header('Content-Type', 'application/json')
|
|
141
|
-
return c.body(null, 304)
|
|
142
|
-
})
|
|
143
|
-
|
|
144
|
-
const res = await app.request('http://localhost/x')
|
|
145
|
-
expect(res.status).toBe(304)
|
|
146
|
-
expect(res.body).toBeNull()
|
|
147
|
-
})
|
|
148
|
-
|
|
149
|
-
it('Should not break empty responses with a JSON content-type', async () => {
|
|
150
|
-
const app = new Acryl()
|
|
151
|
-
app.use('*', prettyJSON())
|
|
152
|
-
app.get('/x', () => new Response('', { headers: { 'Content-Type': 'application/json' } }))
|
|
153
|
-
|
|
154
|
-
const res = await app.request('http://localhost/x?pretty')
|
|
155
|
-
expect(res.status).toBe(200)
|
|
156
|
-
expect(await res.text()).toBe('')
|
|
157
|
-
})
|
|
158
|
-
|
|
159
|
-
it('Should pass through a response with an invalid JSON body unchanged', async () => {
|
|
160
|
-
const app = new Acryl()
|
|
161
|
-
app.use('*', prettyJSON({ force: true }))
|
|
162
|
-
app.get(
|
|
163
|
-
'/x',
|
|
164
|
-
() =>
|
|
165
|
-
new Response('not json', {
|
|
166
|
-
status: 200,
|
|
167
|
-
headers: {
|
|
168
|
-
'Content-Type': 'application/json',
|
|
169
|
-
'X-Custom': 'custom',
|
|
170
|
-
ETag: '"abc"',
|
|
171
|
-
'Content-Length': '8',
|
|
172
|
-
},
|
|
173
|
-
})
|
|
174
|
-
)
|
|
175
|
-
|
|
176
|
-
const res = await app.request('http://localhost/x')
|
|
177
|
-
expect(res.status).toBe(200)
|
|
178
|
-
expect(res.headers.get('X-Custom')).toBe('custom')
|
|
179
|
-
expect(res.headers.get('ETag')).toBe('"abc"')
|
|
180
|
-
expect(res.headers.get('Content-Length')).toBe('8')
|
|
181
|
-
expect(await res.text()).toBe('not json')
|
|
182
|
-
})
|
|
183
|
-
|
|
184
|
-
it('Should pass through a response whose body was already consumed by another middleware', async () => {
|
|
185
|
-
const app = new Acryl()
|
|
186
|
-
app.use('*', prettyJSON({ force: true }))
|
|
187
|
-
app.use('*', async (c, next) => {
|
|
188
|
-
await next()
|
|
189
|
-
await c.res.text()
|
|
190
|
-
})
|
|
191
|
-
app.get('/x', (c) => c.json({ message: 'Acryl!' }))
|
|
192
|
-
|
|
193
|
-
// The other middleware has read the body, so the bytes are no longer available;
|
|
194
|
-
// pretty JSON must not turn this into a 500 and must leave the response as is.
|
|
195
|
-
const res = await app.request('http://localhost/x')
|
|
196
|
-
expect(res.status).toBe(200)
|
|
197
|
-
expect(res.bodyUsed).toBe(true)
|
|
198
|
-
await expect(res.text()).rejects.toThrow()
|
|
199
|
-
})
|
|
200
|
-
|
|
201
|
-
it('Should remove a stale Content-Length when the body is prettified', async () => {
|
|
202
|
-
const app = new Acryl()
|
|
203
|
-
app.use('*', prettyJSON({ force: true }))
|
|
204
|
-
app.get(
|
|
205
|
-
'/x',
|
|
206
|
-
() =>
|
|
207
|
-
new Response('{"message":"Acryl!"}', {
|
|
208
|
-
headers: { 'Content-Type': 'application/json', 'Content-Length': '19' },
|
|
209
|
-
})
|
|
210
|
-
)
|
|
211
|
-
|
|
212
|
-
const res = await app.request('http://localhost/x')
|
|
213
|
-
expect(await res.text()).toBe(`{
|
|
214
|
-
"message": "Acryl!"
|
|
215
|
-
}`)
|
|
216
|
-
expect(res.headers.get('Content-Length')).toBeNull()
|
|
217
|
-
})
|
|
218
|
-
})
|
|
@@ -1,168 +0,0 @@
|
|
|
1
|
-
import { requestId } from './index.ts'
|
|
2
|
-
import type { Context } from '../../context.ts'
|
|
3
|
-
import { Acryl } from '../../app.ts'
|
|
4
|
-
|
|
5
|
-
const regexUUIDv4 = /([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{12})/
|
|
6
|
-
|
|
7
|
-
describe('Request ID Middleware', () => {
|
|
8
|
-
const app = new Acryl()
|
|
9
|
-
app.use('*', requestId())
|
|
10
|
-
app.get('/requestId', (c) => c.text(c.get('requestId') ?? 'No Request ID'))
|
|
11
|
-
|
|
12
|
-
it('Should return random request id', async () => {
|
|
13
|
-
const res = await app.request('http://localhost/requestId')
|
|
14
|
-
expect(res).not.toBeNull()
|
|
15
|
-
expect(res.status).toBe(200)
|
|
16
|
-
expect(res.headers.get('X-Request-Id')).toMatch(regexUUIDv4)
|
|
17
|
-
expect(await res.text()).match(regexUUIDv4)
|
|
18
|
-
})
|
|
19
|
-
|
|
20
|
-
it('Should return custom request id', async () => {
|
|
21
|
-
const res = await app.request('http://localhost/requestId', {
|
|
22
|
-
headers: {
|
|
23
|
-
'X-Request-Id': 'acryl-is-hot',
|
|
24
|
-
},
|
|
25
|
-
})
|
|
26
|
-
expect(res).not.toBeNull()
|
|
27
|
-
expect(res.status).toBe(200)
|
|
28
|
-
expect(res.headers.get('X-Request-Id')).toBe('acryl-is-hot')
|
|
29
|
-
expect(await res.text()).toBe('acryl-is-hot')
|
|
30
|
-
})
|
|
31
|
-
|
|
32
|
-
it('Should return custom request id with all valid characters', async () => {
|
|
33
|
-
const validRequestId = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_='
|
|
34
|
-
const res = await app.request('http://localhost/requestId', {
|
|
35
|
-
headers: {
|
|
36
|
-
'X-Request-Id': validRequestId,
|
|
37
|
-
},
|
|
38
|
-
})
|
|
39
|
-
expect(res).not.toBeNull()
|
|
40
|
-
expect(res.status).toBe(200)
|
|
41
|
-
expect(res.headers.get('X-Request-Id')).toBe(validRequestId)
|
|
42
|
-
expect(await res.text()).toBe(validRequestId)
|
|
43
|
-
})
|
|
44
|
-
|
|
45
|
-
it('Should return random request id without using request header', async () => {
|
|
46
|
-
const res = await app.request('http://localhost/requestId', {
|
|
47
|
-
headers: {
|
|
48
|
-
'X-Request-Id': 'Hello!12345-@*^',
|
|
49
|
-
},
|
|
50
|
-
})
|
|
51
|
-
expect(res).not.toBeNull()
|
|
52
|
-
expect(res.status).toBe(200)
|
|
53
|
-
expect(res.headers.get('X-Request-Id')).toMatch(regexUUIDv4)
|
|
54
|
-
expect(await res.text()).toMatch(regexUUIDv4)
|
|
55
|
-
})
|
|
56
|
-
})
|
|
57
|
-
|
|
58
|
-
describe('Request ID Middleware with custom generator', () => {
|
|
59
|
-
function generateWord() {
|
|
60
|
-
return 'AcrylIsWebFramework'
|
|
61
|
-
}
|
|
62
|
-
function generateDoubleRequestId(c: Context) {
|
|
63
|
-
const acrylId = c.req.header('Acryl-Request-Id')
|
|
64
|
-
const ohnoId = c.req.header('Ohno-Request-Id')
|
|
65
|
-
if (acrylId && ohnoId) {
|
|
66
|
-
return acrylId + ohnoId
|
|
67
|
-
}
|
|
68
|
-
return crypto.randomUUID()
|
|
69
|
-
}
|
|
70
|
-
const app = new Acryl()
|
|
71
|
-
app.use('/word', requestId({ generator: generateWord }))
|
|
72
|
-
app.use('/doubleRequestId', requestId({ generator: generateDoubleRequestId }))
|
|
73
|
-
app.get('/word', (c) => c.text(c.get('requestId') ?? 'No Request ID'))
|
|
74
|
-
app.get('/doubleRequestId', (c) => c.text(c.get('requestId') ?? 'No Request ID'))
|
|
75
|
-
it('Should return custom request id', async () => {
|
|
76
|
-
const res = await app.request('http://localhost/word')
|
|
77
|
-
expect(res).not.toBeNull()
|
|
78
|
-
expect(res.status).toBe(200)
|
|
79
|
-
expect(res.headers.get('X-Request-Id')).toBe('AcrylIsWebFramework')
|
|
80
|
-
expect(await res.text()).toBe('AcrylIsWebFramework')
|
|
81
|
-
})
|
|
82
|
-
|
|
83
|
-
it('Should return complex request id', async () => {
|
|
84
|
-
const res = await app.request('http://localhost/doubleRequestId', {
|
|
85
|
-
headers: {
|
|
86
|
-
'Acryl-Request-Id': 'Hello',
|
|
87
|
-
'Ohno-Request-Id': 'World',
|
|
88
|
-
},
|
|
89
|
-
})
|
|
90
|
-
expect(res).not.toBeNull()
|
|
91
|
-
expect(res.status).toBe(200)
|
|
92
|
-
expect(res.headers.get('X-Request-Id')).toBe('HelloWorld')
|
|
93
|
-
expect(await res.text()).toBe('HelloWorld')
|
|
94
|
-
})
|
|
95
|
-
})
|
|
96
|
-
|
|
97
|
-
describe('Request ID Middleware with limit length', () => {
|
|
98
|
-
const charactersOf255 = 'h'.repeat(255)
|
|
99
|
-
const charactersOf256 = 'h'.repeat(256)
|
|
100
|
-
|
|
101
|
-
const app = new Acryl()
|
|
102
|
-
app.use('/requestId', requestId())
|
|
103
|
-
app.use('/limit256', requestId({ limitLength: 256 }))
|
|
104
|
-
app.get('/requestId', (c) => c.text(c.get('requestId') ?? 'No Request ID'))
|
|
105
|
-
app.get('/limit256', (c) => c.text(c.get('requestId') ?? 'No Request ID'))
|
|
106
|
-
|
|
107
|
-
it('Should return custom request id', async () => {
|
|
108
|
-
const res = await app.request('http://localhost/requestId', {
|
|
109
|
-
headers: {
|
|
110
|
-
'X-Request-Id': charactersOf255,
|
|
111
|
-
},
|
|
112
|
-
})
|
|
113
|
-
expect(res).not.toBeNull()
|
|
114
|
-
expect(res.status).toBe(200)
|
|
115
|
-
expect(res.headers.get('X-Request-Id')).toBe(charactersOf255)
|
|
116
|
-
expect(await res.text()).toBe(charactersOf255)
|
|
117
|
-
})
|
|
118
|
-
it('Should return random request id without using request header', async () => {
|
|
119
|
-
const res = await app.request('http://localhost/requestId', {
|
|
120
|
-
headers: {
|
|
121
|
-
'X-Request-Id': charactersOf256,
|
|
122
|
-
},
|
|
123
|
-
})
|
|
124
|
-
expect(res).not.toBeNull()
|
|
125
|
-
expect(res.status).toBe(200)
|
|
126
|
-
expect(res.headers.get('X-Request-Id')).toMatch(regexUUIDv4)
|
|
127
|
-
expect(await res.text()).toMatch(regexUUIDv4)
|
|
128
|
-
})
|
|
129
|
-
it('Should return custom request id with 256 characters', async () => {
|
|
130
|
-
const res = await app.request('http://localhost/limit256', {
|
|
131
|
-
headers: {
|
|
132
|
-
'X-Request-Id': charactersOf256,
|
|
133
|
-
},
|
|
134
|
-
})
|
|
135
|
-
expect(res).not.toBeNull()
|
|
136
|
-
expect(res.status).toBe(200)
|
|
137
|
-
expect(res.headers.get('X-Request-Id')).toBe(charactersOf256)
|
|
138
|
-
expect(await res.text()).toBe(charactersOf256)
|
|
139
|
-
})
|
|
140
|
-
})
|
|
141
|
-
|
|
142
|
-
describe('Request ID Middleware with custom header', () => {
|
|
143
|
-
const app = new Acryl()
|
|
144
|
-
app.use('/requestId', requestId({ headerName: 'Acryl-Request-Id' }))
|
|
145
|
-
app.get('/emptyId', requestId({ headerName: '' }))
|
|
146
|
-
app.get('/requestId', (c) => c.text(c.get('requestId') ?? 'No Request ID'))
|
|
147
|
-
app.get('/emptyId', (c) => c.text(c.get('requestId') ?? 'No Request ID'))
|
|
148
|
-
|
|
149
|
-
it('Should return custom request id', async () => {
|
|
150
|
-
const res = await app.request('http://localhost/requestId', {
|
|
151
|
-
headers: {
|
|
152
|
-
'Acryl-Request-Id': 'acryl-is-hot',
|
|
153
|
-
},
|
|
154
|
-
})
|
|
155
|
-
expect(res).not.toBeNull()
|
|
156
|
-
expect(res.status).toBe(200)
|
|
157
|
-
expect(res.headers.get('Acryl-Request-Id')).toBe('acryl-is-hot')
|
|
158
|
-
expect(await res.text()).toBe('acryl-is-hot')
|
|
159
|
-
})
|
|
160
|
-
|
|
161
|
-
it('Should not return request id', async () => {
|
|
162
|
-
const res = await app.request('http://localhost/emptyId')
|
|
163
|
-
expect(res).not.toBeNull()
|
|
164
|
-
expect(res.status).toBe(200)
|
|
165
|
-
expect(res.headers.get('X-Request-Id')).toBeNull()
|
|
166
|
-
expect(await res.text()).toMatch(regexUUIDv4)
|
|
167
|
-
})
|
|
168
|
-
})
|