acrylblends 0.6.3 → 0.7.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/README.md +4 -3
- package/docs/framework/README.md +2 -2
- package/docs/framework/UPSTREAM.md +1 -1
- package/docs/framework/guides/jsx.md +51 -1
- 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/{base-ddiVmiE7.js → base-NSN_SNv-.js} +1 -0
- 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-DYZdxJIJ.js → components-JXVm45kK.js} +1 -1
- package/lib/{components-Ce5FRyHU.js → components-cEW3ovK0.js} +3 -3
- 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-w72iLeFR.js} +6 -6
- 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 +2 -2
- package/lib/jsx/dom.js +4 -4
- package/lib/jsx/jsx-dev-runtime.js +1 -1
- package/lib/jsx/jsx-runtime.js +1 -1
- package/lib/jsx/streaming.js +1 -1
- package/lib/{jsx-dev-runtime-kAhR_4C7.js → jsx-dev-runtime-CWLRA2F3.js} +2 -2
- package/lib/jsx-renderer.d.ts +75 -0
- package/lib/jsx-renderer.js +99 -0
- package/lib/jsx.js +4 -4
- 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/register.d.ts +1 -0
- package/lib/node-server/register.js +73 -0
- 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 +13 -1
- package/plugins/acryl-inspect/upstream.json +1 -1
- package/plugins/acryl-node-server/src/register.ts +86 -0
- package/plugins/acryl-node-server/upstream.json +5 -3
- 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/main.ts +4 -1
- package/plugins/desktop/upstream.json +1 -1
- package/plugins/desktop-web/main.ts +3 -1
- package/plugins/desktop-web/upstream.json +1 -1
- package/plugins/extensions/resolve.ts +4 -0
- package/shared/AGENTS.core.md +3 -0
- package/templates/agent/package.json +7 -3
- package/templates/agent/tsconfig.json +10 -2
- package/templates/blank/package.json +7 -3
- package/templates/blank/src/about.tsx +14 -0
- package/templates/blank/src/routes.ts +2 -0
- package/templates/blank/test/app.test.ts +15 -0
- package/templates/blank/tsconfig.json +3 -1
- package/templates/todo/package.json +7 -3
- package/templates/todo/tsconfig.json +3 -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,310 +0,0 @@
|
|
|
1
|
-
import { endTime, setMetric, startTime, timing, wrapTime } from './index.ts'
|
|
2
|
-
import { Acryl } from '../../app.ts'
|
|
3
|
-
|
|
4
|
-
describe('Server-Timing API', () => {
|
|
5
|
-
const app = new Acryl()
|
|
6
|
-
|
|
7
|
-
const totalDescription = 'my total DescRipTion!'
|
|
8
|
-
const name = 'sleep'
|
|
9
|
-
const region = 'region'
|
|
10
|
-
const regionDesc = 'europe-west3'
|
|
11
|
-
|
|
12
|
-
app.use(
|
|
13
|
-
'*',
|
|
14
|
-
timing({
|
|
15
|
-
totalDescription,
|
|
16
|
-
})
|
|
17
|
-
)
|
|
18
|
-
app.get('/', (c) => c.text('/'))
|
|
19
|
-
app.get('/api', async (c) => {
|
|
20
|
-
startTime(c, name)
|
|
21
|
-
await new Promise((r) => setTimeout(r, 30))
|
|
22
|
-
endTime(c, name)
|
|
23
|
-
|
|
24
|
-
return c.text('api!')
|
|
25
|
-
})
|
|
26
|
-
app.get('/api-wrap', async (c) => {
|
|
27
|
-
await wrapTime(c, name, new Promise((r) => setTimeout(r, 30)))
|
|
28
|
-
|
|
29
|
-
return c.text('api!')
|
|
30
|
-
})
|
|
31
|
-
app.get('/api-wrap-throw', async (c) => {
|
|
32
|
-
try {
|
|
33
|
-
await wrapTime(c, name, new Promise((_, r) => setTimeout(r, 30)))
|
|
34
|
-
} catch (e) {
|
|
35
|
-
return c.text(`error :( ${e}`, 500)
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
return c.text('api!')
|
|
39
|
-
})
|
|
40
|
-
app.get('/cache', async (c) => {
|
|
41
|
-
setMetric(c, region, regionDesc)
|
|
42
|
-
|
|
43
|
-
return c.text('cache!')
|
|
44
|
-
})
|
|
45
|
-
|
|
46
|
-
const sub = new Acryl()
|
|
47
|
-
|
|
48
|
-
sub.use(timing())
|
|
49
|
-
sub.get('/', (c) => c.text('sub'))
|
|
50
|
-
app.route('/sub', sub)
|
|
51
|
-
|
|
52
|
-
it('Should contain total duration', async () => {
|
|
53
|
-
const res = await app.request('http://localhost/')
|
|
54
|
-
expect(res).not.toBeNull()
|
|
55
|
-
expect(res.headers.has('server-timing')).toBeTruthy()
|
|
56
|
-
expect(res.headers.get('server-timing')?.includes('total;dur=')).toBeTruthy()
|
|
57
|
-
expect(res.headers.get('server-timing')?.includes(totalDescription)).toBeTruthy()
|
|
58
|
-
})
|
|
59
|
-
|
|
60
|
-
it('Should contain value metrics', async () => {
|
|
61
|
-
const res = await app.request('http://localhost/api')
|
|
62
|
-
expect(res).not.toBeNull()
|
|
63
|
-
expect(res.headers.has('server-timing')).toBeTruthy()
|
|
64
|
-
expect(res.headers.get('server-timing')?.includes(`${name};dur=`)).toBeTruthy()
|
|
65
|
-
expect(res.headers.get('server-timing')?.includes(name)).toBeTruthy()
|
|
66
|
-
})
|
|
67
|
-
|
|
68
|
-
it('Should contain value metrics, wrapped', async () => {
|
|
69
|
-
const res = await app.request('http://localhost/api-wrap')
|
|
70
|
-
expect(res).not.toBeNull()
|
|
71
|
-
expect(res.headers.has('server-timing')).toBeTruthy()
|
|
72
|
-
expect(res.headers.get('server-timing')?.includes(`${name};dur=`)).toBeTruthy()
|
|
73
|
-
expect(res.headers.get('server-timing')?.includes(name)).toBeTruthy()
|
|
74
|
-
})
|
|
75
|
-
|
|
76
|
-
it('Should contain value metrics, wrapped throw', async () => {
|
|
77
|
-
const res = await app.request('http://localhost/api-wrap-throw')
|
|
78
|
-
expect(res).not.toBeNull()
|
|
79
|
-
expect(res.headers.has('server-timing')).toBeTruthy()
|
|
80
|
-
expect(res.status).toBeGreaterThanOrEqual(500)
|
|
81
|
-
expect(res.headers.get('server-timing')?.includes(`${name};dur=`)).toBeTruthy()
|
|
82
|
-
expect(res.headers.get('server-timing')?.includes(name)).toBeTruthy()
|
|
83
|
-
})
|
|
84
|
-
|
|
85
|
-
it('Should contain value-less metrics', async () => {
|
|
86
|
-
const res = await app.request('http://localhost/cache')
|
|
87
|
-
expect(res).not.toBeNull()
|
|
88
|
-
expect(res.headers.has('server-timing')).toBeTruthy()
|
|
89
|
-
expect(
|
|
90
|
-
res.headers.get('server-timing')?.includes(`${region};desc="${regionDesc}"`)
|
|
91
|
-
).toBeTruthy()
|
|
92
|
-
expect(res.headers.get('server-timing')?.includes(region)).toBeTruthy()
|
|
93
|
-
expect(res.headers.get('server-timing')?.includes(regionDesc)).toBeTruthy()
|
|
94
|
-
})
|
|
95
|
-
|
|
96
|
-
it('Should not be enabled if the main app has the timing middleware', async () => {
|
|
97
|
-
const consoleWarnSpy = vi.spyOn(console, 'warn')
|
|
98
|
-
const res = await app.request('/sub')
|
|
99
|
-
expect(res.status).toBe(200)
|
|
100
|
-
expect(res.headers.has('server-timing')).toBeTruthy()
|
|
101
|
-
expect(res.headers.get('server-timing')?.includes(totalDescription)).toBeTruthy()
|
|
102
|
-
expect(consoleWarnSpy).not.toHaveBeenCalled()
|
|
103
|
-
consoleWarnSpy.mockRestore()
|
|
104
|
-
})
|
|
105
|
-
|
|
106
|
-
describe('Should handle timing options', async () => {
|
|
107
|
-
it('Should handle autoEnd option', async () => {
|
|
108
|
-
const autoEndApp = new Acryl()
|
|
109
|
-
|
|
110
|
-
autoEndApp.use('*', timing())
|
|
111
|
-
autoEndApp.get('/', (c) => {
|
|
112
|
-
startTime(c, 'test')
|
|
113
|
-
return c.text('/')
|
|
114
|
-
})
|
|
115
|
-
|
|
116
|
-
const res = await autoEndApp.request('/')
|
|
117
|
-
|
|
118
|
-
expect(res.status).toBe(200)
|
|
119
|
-
expect(res.headers.get('server-timing')).toContain('test;dur=')
|
|
120
|
-
|
|
121
|
-
const disabledAutoEndApp = new Acryl()
|
|
122
|
-
|
|
123
|
-
disabledAutoEndApp.use('*', timing({ autoEnd: false }))
|
|
124
|
-
disabledAutoEndApp.get('/', (c) => {
|
|
125
|
-
startTime(c, 'test')
|
|
126
|
-
return c.text('/')
|
|
127
|
-
})
|
|
128
|
-
|
|
129
|
-
const disabledRes = await disabledAutoEndApp.request('/')
|
|
130
|
-
|
|
131
|
-
expect(disabledRes.status).toBe(200)
|
|
132
|
-
expect(disabledRes.headers.get('server-timing')).not.toContain('test;dur=')
|
|
133
|
-
})
|
|
134
|
-
|
|
135
|
-
it('Should use enabled function return value', async () => {
|
|
136
|
-
const enabledApp = new Acryl()
|
|
137
|
-
const enabled = vi.fn(() => false)
|
|
138
|
-
|
|
139
|
-
enabledApp.use('*', timing({ enabled }))
|
|
140
|
-
enabledApp.get('/', (c) => c.text('/'))
|
|
141
|
-
|
|
142
|
-
const res = await enabledApp.request('/')
|
|
143
|
-
|
|
144
|
-
expect(res.status).toBe(200)
|
|
145
|
-
expect(enabled).toHaveBeenCalled()
|
|
146
|
-
expect(res.headers.has('server-timing')).toBeFalsy()
|
|
147
|
-
})
|
|
148
|
-
|
|
149
|
-
it('Should handle total false and value-less metrics without description', async () => {
|
|
150
|
-
const metricApp = new Acryl()
|
|
151
|
-
|
|
152
|
-
metricApp.use('*', timing({ total: false }))
|
|
153
|
-
metricApp.get('/', (c) => {
|
|
154
|
-
setMetric(c, 'test')
|
|
155
|
-
return c.text('/')
|
|
156
|
-
})
|
|
157
|
-
|
|
158
|
-
const res = await metricApp.request('/')
|
|
159
|
-
|
|
160
|
-
expect(res.status).toBe(200)
|
|
161
|
-
expect(res.headers.get('server-timing')).toBe('test')
|
|
162
|
-
})
|
|
163
|
-
})
|
|
164
|
-
|
|
165
|
-
describe('Should handle crossOrigin setting', async () => {
|
|
166
|
-
it('Should do nothing when crossOrigin is falsy', async () => {
|
|
167
|
-
const crossOriginApp = new Acryl()
|
|
168
|
-
|
|
169
|
-
crossOriginApp.use(
|
|
170
|
-
'*',
|
|
171
|
-
timing({
|
|
172
|
-
crossOrigin: false,
|
|
173
|
-
})
|
|
174
|
-
)
|
|
175
|
-
|
|
176
|
-
crossOriginApp.get('/', (c) => c.text('/'))
|
|
177
|
-
|
|
178
|
-
const res = await crossOriginApp.request('http://localhost/')
|
|
179
|
-
|
|
180
|
-
expect(res).not.toBeNull()
|
|
181
|
-
expect(res.headers.has('server-timing')).toBeTruthy()
|
|
182
|
-
expect(res.headers.has('timing-allow-origin')).toBeFalsy()
|
|
183
|
-
})
|
|
184
|
-
|
|
185
|
-
it('Should set Timing-Allow-Origin to * when crossOrigin is true', async () => {
|
|
186
|
-
const crossOriginApp = new Acryl()
|
|
187
|
-
|
|
188
|
-
crossOriginApp.use(
|
|
189
|
-
'*',
|
|
190
|
-
timing({
|
|
191
|
-
crossOrigin: true,
|
|
192
|
-
})
|
|
193
|
-
)
|
|
194
|
-
|
|
195
|
-
crossOriginApp.get('/', (c) => c.text('/'))
|
|
196
|
-
|
|
197
|
-
const res = await crossOriginApp.request('http://localhost/')
|
|
198
|
-
|
|
199
|
-
expect(res).not.toBeNull()
|
|
200
|
-
expect(res.headers.has('server-timing')).toBeTruthy()
|
|
201
|
-
expect(res.headers.has('timing-allow-origin')).toBeTruthy()
|
|
202
|
-
expect(res.headers.get('timing-allow-origin')).toBe('*')
|
|
203
|
-
})
|
|
204
|
-
|
|
205
|
-
it('Should set Timing-Allow-Origin to the value of crossOrigin when it is a string', async () => {
|
|
206
|
-
const crossOriginApp = new Acryl()
|
|
207
|
-
|
|
208
|
-
crossOriginApp.use(
|
|
209
|
-
'*',
|
|
210
|
-
timing({
|
|
211
|
-
crossOrigin: 'https://example.com',
|
|
212
|
-
})
|
|
213
|
-
)
|
|
214
|
-
|
|
215
|
-
crossOriginApp.get('/', (c) => c.text('/'))
|
|
216
|
-
|
|
217
|
-
const res = await crossOriginApp.request('http://localhost/')
|
|
218
|
-
|
|
219
|
-
expect(res).not.toBeNull()
|
|
220
|
-
expect(res.headers.has('server-timing')).toBeTruthy()
|
|
221
|
-
expect(res.headers.has('timing-allow-origin')).toBeTruthy()
|
|
222
|
-
expect(res.headers.get('timing-allow-origin')).toBe('https://example.com')
|
|
223
|
-
})
|
|
224
|
-
|
|
225
|
-
it('Should set Timing-Allow-Origin to the return value of crossOrigin when it is a function', async () => {
|
|
226
|
-
const crossOriginApp = new Acryl()
|
|
227
|
-
|
|
228
|
-
crossOriginApp.use(
|
|
229
|
-
'*',
|
|
230
|
-
timing({
|
|
231
|
-
crossOrigin: (c) => c.req.header('origin') ?? '*',
|
|
232
|
-
})
|
|
233
|
-
)
|
|
234
|
-
|
|
235
|
-
crossOriginApp.get('/', (c) => c.text('/'))
|
|
236
|
-
|
|
237
|
-
const res = await crossOriginApp.request('http://localhost/', {
|
|
238
|
-
headers: {
|
|
239
|
-
origin: 'https://example.com',
|
|
240
|
-
},
|
|
241
|
-
})
|
|
242
|
-
|
|
243
|
-
expect(res).not.toBeNull()
|
|
244
|
-
expect(res.headers.has('server-timing')).toBeTruthy()
|
|
245
|
-
expect(res.headers.has('timing-allow-origin')).toBeTruthy()
|
|
246
|
-
expect(res.headers.get('timing-allow-origin')).toBe('https://example.com')
|
|
247
|
-
})
|
|
248
|
-
|
|
249
|
-
it("Should use Date.now as backup if performance API isn't available", async () => {
|
|
250
|
-
const originalPerformance = globalThis.performance
|
|
251
|
-
// @ts-expect-error disable performance API for testing
|
|
252
|
-
delete globalThis.performance
|
|
253
|
-
const DateNowSpy = vi.spyOn(Date, 'now').mockReturnValue(123456789)
|
|
254
|
-
|
|
255
|
-
const app = new Acryl().use(timing()).get('/', (c) => {
|
|
256
|
-
startTime(c, 'test')
|
|
257
|
-
endTime(c, 'test')
|
|
258
|
-
return c.text('hello')
|
|
259
|
-
})
|
|
260
|
-
|
|
261
|
-
const res = await app.request('/')
|
|
262
|
-
expect(res.status).toBe(200)
|
|
263
|
-
|
|
264
|
-
expect(DateNowSpy).toHaveBeenCalled()
|
|
265
|
-
|
|
266
|
-
DateNowSpy.mockRestore()
|
|
267
|
-
globalThis.performance = originalPerformance
|
|
268
|
-
})
|
|
269
|
-
})
|
|
270
|
-
|
|
271
|
-
describe('Configuration validation', async () => {
|
|
272
|
-
it('Should silently warn when no timing metrics are available', async () => {
|
|
273
|
-
const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
|
|
274
|
-
|
|
275
|
-
const app = new Acryl().get('/', (c) => {
|
|
276
|
-
setMetric(c, 'test', 123)
|
|
277
|
-
startTime(c, 'test')
|
|
278
|
-
endTime(c, 'test')
|
|
279
|
-
return c.text('hello')
|
|
280
|
-
})
|
|
281
|
-
|
|
282
|
-
const res = await app.request('/')
|
|
283
|
-
expect(res.status).toBe(200)
|
|
284
|
-
|
|
285
|
-
expect(consoleWarnSpy).toHaveBeenNthCalledWith(
|
|
286
|
-
2,
|
|
287
|
-
'Metrics not initialized! Please add the `timing()` middleware to this route!'
|
|
288
|
-
)
|
|
289
|
-
|
|
290
|
-
consoleWarnSpy.mockRestore()
|
|
291
|
-
})
|
|
292
|
-
|
|
293
|
-
it('Should silently warn when trying to end a non-existent timer', async () => {
|
|
294
|
-
const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
|
|
295
|
-
|
|
296
|
-
const app = new Acryl().use(timing()).get('/', (c) => {
|
|
297
|
-
setMetric(c, 'region', 'europe-west3')
|
|
298
|
-
endTime(c, 'nonExistentTimer')
|
|
299
|
-
return c.text('hello')
|
|
300
|
-
})
|
|
301
|
-
|
|
302
|
-
const res = await app.request('/')
|
|
303
|
-
expect(res.status).toBe(200)
|
|
304
|
-
|
|
305
|
-
expect(consoleWarnSpy).toHaveBeenCalledWith('Timer "nonExistentTimer" does not exist!')
|
|
306
|
-
|
|
307
|
-
consoleWarnSpy.mockRestore()
|
|
308
|
-
})
|
|
309
|
-
})
|
|
310
|
-
})
|
|
@@ -1,381 +0,0 @@
|
|
|
1
|
-
import { appendTrailingSlash, trimTrailingSlash } from './index.ts'
|
|
2
|
-
import { Acryl } from '../../app.ts'
|
|
3
|
-
|
|
4
|
-
describe('Resolve trailing slash', () => {
|
|
5
|
-
describe('trimTrailingSlash middleware', () => {
|
|
6
|
-
const app = new Acryl({ strict: true })
|
|
7
|
-
app.use('*', trimTrailingSlash())
|
|
8
|
-
|
|
9
|
-
app.get('/', async (c) => {
|
|
10
|
-
return c.text('ok')
|
|
11
|
-
})
|
|
12
|
-
app.get('/the/example/endpoint/without/trailing/slash', async (c) => {
|
|
13
|
-
return c.text('ok')
|
|
14
|
-
})
|
|
15
|
-
|
|
16
|
-
it('should handle GET request for root path correctly', async () => {
|
|
17
|
-
const resp = await app.request('/')
|
|
18
|
-
|
|
19
|
-
expect(resp).not.toBeNull()
|
|
20
|
-
expect(resp.status).toBe(200)
|
|
21
|
-
})
|
|
22
|
-
|
|
23
|
-
it('should handle GET request for path without trailing slash correctly', async () => {
|
|
24
|
-
const resp = await app.request('/the/example/endpoint/without/trailing/slash')
|
|
25
|
-
|
|
26
|
-
expect(resp).not.toBeNull()
|
|
27
|
-
expect(resp.status).toBe(200)
|
|
28
|
-
})
|
|
29
|
-
|
|
30
|
-
it('should handle GET request for path with trailing slash correctly', async () => {
|
|
31
|
-
const resp = await app.request('/the/example/endpoint/without/trailing/slash/')
|
|
32
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
33
|
-
|
|
34
|
-
expect(resp).not.toBeNull()
|
|
35
|
-
expect(resp.status).toBe(301)
|
|
36
|
-
expect(loc.pathname).toBe('/the/example/endpoint/without/trailing/slash')
|
|
37
|
-
})
|
|
38
|
-
|
|
39
|
-
it('should preserve query parameters when redirecting', async () => {
|
|
40
|
-
const resp = await app.request('/the/example/endpoint/without/trailing/slash/?exampleParam=1')
|
|
41
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
42
|
-
|
|
43
|
-
expect(resp).not.toBeNull()
|
|
44
|
-
expect(resp.status).toBe(301)
|
|
45
|
-
expect(loc.pathname).toBe('/the/example/endpoint/without/trailing/slash')
|
|
46
|
-
expect(loc.searchParams.get('exampleParam')).toBe('1')
|
|
47
|
-
})
|
|
48
|
-
|
|
49
|
-
it('should handle HEAD request for root path correctly', async () => {
|
|
50
|
-
const resp = await app.request('/', { method: 'HEAD' })
|
|
51
|
-
|
|
52
|
-
expect(resp).not.toBeNull()
|
|
53
|
-
expect(resp.status).toBe(200)
|
|
54
|
-
})
|
|
55
|
-
|
|
56
|
-
it('should handle HEAD request for path without trailing slash correctly', async () => {
|
|
57
|
-
const resp = await app.request('/the/example/endpoint/without/trailing/slash', {
|
|
58
|
-
method: 'HEAD',
|
|
59
|
-
})
|
|
60
|
-
|
|
61
|
-
expect(resp).not.toBeNull()
|
|
62
|
-
expect(resp.status).toBe(200)
|
|
63
|
-
})
|
|
64
|
-
|
|
65
|
-
it('should handle HEAD request for path with trailing slash correctly', async () => {
|
|
66
|
-
const resp = await app.request('/the/example/endpoint/without/trailing/slash/', {
|
|
67
|
-
method: 'HEAD',
|
|
68
|
-
})
|
|
69
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
70
|
-
|
|
71
|
-
expect(resp).not.toBeNull()
|
|
72
|
-
expect(resp.status).toBe(301)
|
|
73
|
-
expect(loc.pathname).toBe('/the/example/endpoint/without/trailing/slash')
|
|
74
|
-
})
|
|
75
|
-
|
|
76
|
-
it('should preserve query parameters when redirecting HEAD requests', async () => {
|
|
77
|
-
const resp = await app.request(
|
|
78
|
-
'/the/example/endpoint/without/trailing/slash/?exampleParam=1',
|
|
79
|
-
{ method: 'HEAD' }
|
|
80
|
-
)
|
|
81
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
82
|
-
|
|
83
|
-
expect(resp).not.toBeNull()
|
|
84
|
-
expect(resp.status).toBe(301)
|
|
85
|
-
expect(loc.pathname).toBe('/the/example/endpoint/without/trailing/slash')
|
|
86
|
-
expect(loc.searchParams.get('exampleParam')).toBe('1')
|
|
87
|
-
})
|
|
88
|
-
})
|
|
89
|
-
|
|
90
|
-
describe('trimTrailingSlash middleware with alwaysRedirect option', () => {
|
|
91
|
-
const app = new Acryl()
|
|
92
|
-
app.use('*', trimTrailingSlash({ alwaysRedirect: true }))
|
|
93
|
-
|
|
94
|
-
app.get('/', async (c) => {
|
|
95
|
-
return c.text('ok')
|
|
96
|
-
})
|
|
97
|
-
app.get('/my-path/*', async (c) => {
|
|
98
|
-
return c.text('wildcard')
|
|
99
|
-
})
|
|
100
|
-
app.get('/exact-path', async (c) => {
|
|
101
|
-
return c.text('exact')
|
|
102
|
-
})
|
|
103
|
-
|
|
104
|
-
it('should handle GET request for root path correctly', async () => {
|
|
105
|
-
const resp = await app.request('/')
|
|
106
|
-
|
|
107
|
-
expect(resp).not.toBeNull()
|
|
108
|
-
expect(resp.status).toBe(200)
|
|
109
|
-
})
|
|
110
|
-
|
|
111
|
-
it('should redirect wildcard route with trailing slash', async () => {
|
|
112
|
-
const resp = await app.request('/my-path/something/else/')
|
|
113
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
114
|
-
|
|
115
|
-
expect(resp).not.toBeNull()
|
|
116
|
-
expect(resp.status).toBe(301)
|
|
117
|
-
expect(loc.pathname).toBe('/my-path/something/else')
|
|
118
|
-
})
|
|
119
|
-
|
|
120
|
-
it('should not redirect wildcard route without trailing slash', async () => {
|
|
121
|
-
const resp = await app.request('/my-path/something/else')
|
|
122
|
-
|
|
123
|
-
expect(resp).not.toBeNull()
|
|
124
|
-
expect(resp.status).toBe(200)
|
|
125
|
-
expect(await resp.text()).toBe('wildcard')
|
|
126
|
-
})
|
|
127
|
-
|
|
128
|
-
it('should redirect exact route with trailing slash', async () => {
|
|
129
|
-
const resp = await app.request('/exact-path/')
|
|
130
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
131
|
-
|
|
132
|
-
expect(resp).not.toBeNull()
|
|
133
|
-
expect(resp.status).toBe(301)
|
|
134
|
-
expect(loc.pathname).toBe('/exact-path')
|
|
135
|
-
})
|
|
136
|
-
|
|
137
|
-
it('should preserve query parameters when redirecting', async () => {
|
|
138
|
-
const resp = await app.request('/my-path/something/?param=1')
|
|
139
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
140
|
-
|
|
141
|
-
expect(resp).not.toBeNull()
|
|
142
|
-
expect(resp.status).toBe(301)
|
|
143
|
-
expect(loc.pathname).toBe('/my-path/something')
|
|
144
|
-
expect(loc.searchParams.get('param')).toBe('1')
|
|
145
|
-
})
|
|
146
|
-
|
|
147
|
-
it('should handle HEAD request for wildcard route with trailing slash', async () => {
|
|
148
|
-
const resp = await app.request('/my-path/something/', { method: 'HEAD' })
|
|
149
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
150
|
-
|
|
151
|
-
expect(resp).not.toBeNull()
|
|
152
|
-
expect(resp.status).toBe(301)
|
|
153
|
-
expect(loc.pathname).toBe('/my-path/something')
|
|
154
|
-
})
|
|
155
|
-
})
|
|
156
|
-
|
|
157
|
-
describe('appendTrailingSlash middleware', () => {
|
|
158
|
-
const app = new Acryl({ strict: true })
|
|
159
|
-
app.use('*', appendTrailingSlash())
|
|
160
|
-
|
|
161
|
-
app.get('/', async (c) => {
|
|
162
|
-
return c.text('ok')
|
|
163
|
-
})
|
|
164
|
-
app.get('/the/example/endpoint/with/trailing/slash/', async (c) => {
|
|
165
|
-
return c.text('ok')
|
|
166
|
-
})
|
|
167
|
-
app.get('/the/example/simulate/a.file', async (c) => {
|
|
168
|
-
return c.text('ok')
|
|
169
|
-
})
|
|
170
|
-
|
|
171
|
-
it('should handle GET request for root path correctly', async () => {
|
|
172
|
-
const resp = await app.request('/')
|
|
173
|
-
|
|
174
|
-
expect(resp).not.toBeNull()
|
|
175
|
-
expect(resp.status).toBe(200)
|
|
176
|
-
})
|
|
177
|
-
|
|
178
|
-
it('should handle GET request for file-like paths correctly', async () => {
|
|
179
|
-
const resp = await app.request('/the/example/simulate/a.file')
|
|
180
|
-
|
|
181
|
-
expect(resp).not.toBeNull()
|
|
182
|
-
expect(resp.status).toBe(200)
|
|
183
|
-
})
|
|
184
|
-
|
|
185
|
-
it('should handle GET request for path with trailing slash correctly', async () => {
|
|
186
|
-
const resp = await app.request('/the/example/endpoint/with/trailing/slash/')
|
|
187
|
-
|
|
188
|
-
expect(resp).not.toBeNull()
|
|
189
|
-
expect(resp.status).toBe(200)
|
|
190
|
-
})
|
|
191
|
-
|
|
192
|
-
it('should redirect path without trailing slash to one with it', async () => {
|
|
193
|
-
const resp = await app.request('/the/example/endpoint/with/trailing/slash')
|
|
194
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
195
|
-
|
|
196
|
-
expect(resp).not.toBeNull()
|
|
197
|
-
expect(resp.status).toBe(301)
|
|
198
|
-
expect(loc.pathname).toBe('/the/example/endpoint/with/trailing/slash/')
|
|
199
|
-
})
|
|
200
|
-
|
|
201
|
-
it('should preserve query parameters when redirecting', async () => {
|
|
202
|
-
const resp = await app.request('/the/example/endpoint/with/trailing/slash?exampleParam=1')
|
|
203
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
204
|
-
|
|
205
|
-
expect(resp).not.toBeNull()
|
|
206
|
-
expect(resp.status).toBe(301)
|
|
207
|
-
expect(loc.pathname).toBe('/the/example/endpoint/with/trailing/slash/')
|
|
208
|
-
expect(loc.searchParams.get('exampleParam')).toBe('1')
|
|
209
|
-
})
|
|
210
|
-
|
|
211
|
-
it('should handle HEAD request for root path correctly', async () => {
|
|
212
|
-
const resp = await app.request('/', { method: 'HEAD' })
|
|
213
|
-
|
|
214
|
-
expect(resp).not.toBeNull()
|
|
215
|
-
expect(resp.status).toBe(200)
|
|
216
|
-
})
|
|
217
|
-
|
|
218
|
-
it('should handle HEAD request for file-like paths correctly', async () => {
|
|
219
|
-
const resp = await app.request('/the/example/simulate/a.file', { method: 'HEAD' })
|
|
220
|
-
|
|
221
|
-
expect(resp).not.toBeNull()
|
|
222
|
-
expect(resp.status).toBe(200)
|
|
223
|
-
})
|
|
224
|
-
|
|
225
|
-
it('should handle HEAD request for path with trailing slash correctly', async () => {
|
|
226
|
-
const resp = await app.request('/the/example/endpoint/with/trailing/slash/', {
|
|
227
|
-
method: 'HEAD',
|
|
228
|
-
})
|
|
229
|
-
|
|
230
|
-
expect(resp).not.toBeNull()
|
|
231
|
-
expect(resp.status).toBe(200)
|
|
232
|
-
})
|
|
233
|
-
|
|
234
|
-
it('should redirect HEAD request for path without trailing slash to one with it', async () => {
|
|
235
|
-
const resp = await app.request('/the/example/endpoint/with/trailing/slash', {
|
|
236
|
-
method: 'HEAD',
|
|
237
|
-
})
|
|
238
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
239
|
-
|
|
240
|
-
expect(resp).not.toBeNull()
|
|
241
|
-
expect(resp.status).toBe(301)
|
|
242
|
-
expect(loc.pathname).toBe('/the/example/endpoint/with/trailing/slash/')
|
|
243
|
-
})
|
|
244
|
-
|
|
245
|
-
it('should preserve query parameters when redirecting HEAD requests', async () => {
|
|
246
|
-
const resp = await app.request('/the/example/endpoint/with/trailing/slash?exampleParam=1', {
|
|
247
|
-
method: 'HEAD',
|
|
248
|
-
})
|
|
249
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
250
|
-
|
|
251
|
-
expect(resp).not.toBeNull()
|
|
252
|
-
expect(resp.status).toBe(301)
|
|
253
|
-
expect(loc.pathname).toBe('/the/example/endpoint/with/trailing/slash/')
|
|
254
|
-
expect(loc.searchParams.get('exampleParam')).toBe('1')
|
|
255
|
-
})
|
|
256
|
-
})
|
|
257
|
-
|
|
258
|
-
describe('appendTrailingSlash middleware with skip option', () => {
|
|
259
|
-
const hasExtension = (path: string): boolean => /\.\w+$/.test(path.split('/').at(-1) ?? '')
|
|
260
|
-
const app = new Acryl({ strict: true })
|
|
261
|
-
app.use('*', appendTrailingSlash({ skip: hasExtension }))
|
|
262
|
-
|
|
263
|
-
app.get('/page/', (c) => c.text('ok'))
|
|
264
|
-
|
|
265
|
-
it('should not redirect paths with file extensions', async () => {
|
|
266
|
-
const resp = await app.request('/foo.html')
|
|
267
|
-
|
|
268
|
-
expect(resp.status).toBe(404)
|
|
269
|
-
})
|
|
270
|
-
|
|
271
|
-
it('should redirect paths without file extensions', async () => {
|
|
272
|
-
const resp = await app.request('/page')
|
|
273
|
-
|
|
274
|
-
expect(resp.status).toBe(301)
|
|
275
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
276
|
-
expect(loc.pathname).toBe('/page/')
|
|
277
|
-
})
|
|
278
|
-
})
|
|
279
|
-
|
|
280
|
-
describe('appendTrailingSlash middleware with alwaysRedirect and skip options', () => {
|
|
281
|
-
const hasExtension = (path: string): boolean => /\.\w+$/.test(path.split('/').at(-1) ?? '')
|
|
282
|
-
const app = new Acryl()
|
|
283
|
-
app.use('*', appendTrailingSlash({ alwaysRedirect: true, skip: hasExtension }))
|
|
284
|
-
|
|
285
|
-
app.get('/', (c) => c.text('ok'))
|
|
286
|
-
app.get('/my-path/*', (c) => c.text('wildcard'))
|
|
287
|
-
|
|
288
|
-
it('should redirect paths without extensions', async () => {
|
|
289
|
-
const resp = await app.request('/my-path/something')
|
|
290
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
291
|
-
|
|
292
|
-
expect(resp.status).toBe(301)
|
|
293
|
-
expect(loc.pathname).toBe('/my-path/something/')
|
|
294
|
-
})
|
|
295
|
-
|
|
296
|
-
it('should not redirect paths with file extensions', async () => {
|
|
297
|
-
const resp = await app.request('/my-path/style.css')
|
|
298
|
-
|
|
299
|
-
expect(resp.status).toBe(200)
|
|
300
|
-
})
|
|
301
|
-
|
|
302
|
-
it('should not redirect paths with extensions like .html', async () => {
|
|
303
|
-
const resp = await app.request('/my-path/page.html')
|
|
304
|
-
|
|
305
|
-
expect(resp.status).toBe(200)
|
|
306
|
-
})
|
|
307
|
-
|
|
308
|
-
it('should handle HEAD request for paths with extensions', async () => {
|
|
309
|
-
const resp = await app.request('/my-path/script.js', { method: 'HEAD' })
|
|
310
|
-
|
|
311
|
-
expect(resp.status).toBe(200)
|
|
312
|
-
})
|
|
313
|
-
})
|
|
314
|
-
|
|
315
|
-
describe('appendTrailingSlash middleware with alwaysRedirect option', () => {
|
|
316
|
-
const app = new Acryl()
|
|
317
|
-
app.use('*', appendTrailingSlash({ alwaysRedirect: true }))
|
|
318
|
-
|
|
319
|
-
app.get('/', async (c) => {
|
|
320
|
-
return c.text('ok')
|
|
321
|
-
})
|
|
322
|
-
app.get('/my-path/*', async (c) => {
|
|
323
|
-
return c.text('wildcard')
|
|
324
|
-
})
|
|
325
|
-
app.get('/exact-path/', async (c) => {
|
|
326
|
-
return c.text('exact')
|
|
327
|
-
})
|
|
328
|
-
|
|
329
|
-
it('should handle GET request for root path correctly', async () => {
|
|
330
|
-
const resp = await app.request('/')
|
|
331
|
-
|
|
332
|
-
expect(resp).not.toBeNull()
|
|
333
|
-
expect(resp.status).toBe(200)
|
|
334
|
-
})
|
|
335
|
-
|
|
336
|
-
it('should redirect wildcard route without trailing slash', async () => {
|
|
337
|
-
const resp = await app.request('/my-path/something/else')
|
|
338
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
339
|
-
|
|
340
|
-
expect(resp).not.toBeNull()
|
|
341
|
-
expect(resp.status).toBe(301)
|
|
342
|
-
expect(loc.pathname).toBe('/my-path/something/else/')
|
|
343
|
-
})
|
|
344
|
-
|
|
345
|
-
it('should not redirect wildcard route with trailing slash', async () => {
|
|
346
|
-
const resp = await app.request('/my-path/something/else/')
|
|
347
|
-
|
|
348
|
-
expect(resp).not.toBeNull()
|
|
349
|
-
expect(resp.status).toBe(200)
|
|
350
|
-
expect(await resp.text()).toBe('wildcard')
|
|
351
|
-
})
|
|
352
|
-
|
|
353
|
-
it('should redirect exact route without trailing slash', async () => {
|
|
354
|
-
const resp = await app.request('/exact-path')
|
|
355
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
356
|
-
|
|
357
|
-
expect(resp).not.toBeNull()
|
|
358
|
-
expect(resp.status).toBe(301)
|
|
359
|
-
expect(loc.pathname).toBe('/exact-path/')
|
|
360
|
-
})
|
|
361
|
-
|
|
362
|
-
it('should preserve query parameters when redirecting', async () => {
|
|
363
|
-
const resp = await app.request('/my-path/something?param=1')
|
|
364
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
365
|
-
|
|
366
|
-
expect(resp).not.toBeNull()
|
|
367
|
-
expect(resp.status).toBe(301)
|
|
368
|
-
expect(loc.pathname).toBe('/my-path/something/')
|
|
369
|
-
expect(loc.searchParams.get('param')).toBe('1')
|
|
370
|
-
})
|
|
371
|
-
|
|
372
|
-
it('should handle HEAD request for wildcard route without trailing slash', async () => {
|
|
373
|
-
const resp = await app.request('/my-path/something', { method: 'HEAD' })
|
|
374
|
-
const loc = new URL(resp.headers.get('location')!)
|
|
375
|
-
|
|
376
|
-
expect(resp).not.toBeNull()
|
|
377
|
-
expect(resp.status).toBe(301)
|
|
378
|
-
expect(loc.pathname).toBe('/my-path/something/')
|
|
379
|
-
})
|
|
380
|
-
})
|
|
381
|
-
})
|