@suveren/gateway 0.7.4 → 0.8.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/content/integrations/mollie.json +103 -28
- package/dist/control-plane/index.mjs +248 -58
- package/dist/mcp-server/http.mjs +577 -124
- package/dist/ui/assets/index-BFnSVa9N.js +110 -0
- package/dist/ui/assets/{index-CkWaRck1.css → index-BYVb_0oG.css} +1 -1
- package/dist/ui/index.html +2 -2
- package/node_modules/@hap/core/dist/index.d.mts +285 -13
- package/node_modules/@hap/core/dist/index.d.ts +285 -13
- package/node_modules/@hap/core/dist/index.js +281 -13
- package/node_modules/@hap/core/dist/index.mjs +266 -12
- package/node_modules/@hap/core/package.json +4 -2
- package/node_modules/@hap/core/src/did-key.ts +126 -0
- package/node_modules/@hap/core/src/frame.ts +115 -14
- package/node_modules/@hap/core/src/gatekeeper.ts +26 -0
- package/node_modules/@hap/core/src/identity.ts +21 -5
- package/node_modules/@hap/core/src/index.ts +3 -0
- package/node_modules/@hap/core/src/mandate.ts +207 -0
- package/node_modules/@hap/core/src/receipt.ts +74 -0
- package/node_modules/@hap/core/src/types.ts +87 -5
- package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/lib/accept.js +54 -0
- package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/lib/charset.js +10 -34
- package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/lib/encoding.js +9 -30
- package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/lib/language.js +15 -36
- package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/lib/mediaType.js +16 -134
- package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/node_modules/content-type/LICENSE +22 -0
- package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/node_modules/content-type/README.md +71 -0
- package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/node_modules/content-type/dist/index.d.ts +46 -0
- package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/node_modules/content-type/dist/index.js +176 -0
- package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/node_modules/content-type/dist/index.js.map +1 -0
- package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/node_modules/content-type/package.json +52 -0
- package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/package.json +16 -10
- package/node_modules/@types/node/README.md +1 -1
- package/node_modules/@types/node/buffer.buffer.d.ts +10 -5
- package/node_modules/@types/node/crypto.d.ts +2 -4
- package/node_modules/@types/node/dgram.d.ts +119 -4
- package/node_modules/@types/node/ffi.d.ts +1 -1
- package/node_modules/@types/node/fs/promises.d.ts +61 -65
- package/node_modules/@types/node/fs.d.ts +86 -76
- package/node_modules/@types/node/http.d.ts +17 -1
- package/node_modules/@types/node/http2.d.ts +12 -4
- package/node_modules/@types/node/index.d.ts +1 -0
- package/node_modules/@types/node/inspector.d.ts +2 -1
- package/node_modules/@types/node/net.d.ts +108 -16
- package/node_modules/@types/node/package.json +2 -2
- package/node_modules/@types/node/process.d.ts +52 -0
- package/node_modules/@types/node/quic.d.ts +246 -38
- package/node_modules/@types/node/sqlite.d.ts +6 -2
- package/node_modules/@types/node/stream/iter.d.ts +4 -4
- package/node_modules/@types/node/test.d.ts +36 -0
- package/node_modules/@types/node/tls.d.ts +24 -0
- package/node_modules/@types/node/ts5.6/buffer.buffer.d.ts +5 -0
- package/node_modules/@types/node/ts5.6/index.d.ts +1 -0
- package/node_modules/@types/node/ts5.7/index.d.ts +1 -0
- package/node_modules/@types/node/tty.d.ts +4 -3
- package/node_modules/@types/node/vfs.d.ts +210 -0
- package/node_modules/@types/node/vm.d.ts +1 -1
- package/node_modules/express-rate-limit/dist/index.cjs +6 -3
- package/node_modules/express-rate-limit/dist/index.d.cts +11 -0
- package/node_modules/express-rate-limit/dist/index.d.mts +11 -0
- package/node_modules/express-rate-limit/dist/index.d.ts +11 -0
- package/node_modules/express-rate-limit/dist/index.mjs +6 -3
- package/node_modules/express-rate-limit/{license.md → license} +7 -6
- package/node_modules/express-rate-limit/package.json +5 -5
- package/node_modules/express-rate-limit/readme.md +1 -0
- package/node_modules/fast-uri/index.js +215 -47
- package/node_modules/fast-uri/lib/schemes.js +9 -4
- package/node_modules/fast-uri/lib/utils.js +396 -92
- package/node_modules/fast-uri/package.json +1 -1
- package/node_modules/fast-uri/test/component-safe-serialization.test.js +163 -0
- package/node_modules/fast-uri/test/equal.test.js +31 -3
- package/node_modules/fast-uri/test/fixtures/uri-js-parse.json +2 -0
- package/node_modules/fast-uri/test/ipv6-canonical.test.js +34 -0
- package/node_modules/fast-uri/test/ipv6-validation.test.js +124 -0
- package/node_modules/fast-uri/test/malformed-percent.test.js +77 -0
- package/node_modules/fast-uri/test/malformed-urn.test.js +61 -0
- package/node_modules/fast-uri/test/parse.test.js +7 -3
- package/node_modules/fast-uri/test/query-fragment-normalization.test.js +33 -0
- package/node_modules/fast-uri/test/reserved-path-normalization.test.js +109 -0
- package/node_modules/fast-uri/test/scheme-validation.test.js +124 -0
- package/node_modules/fast-uri/test/security-normalization.test.js +101 -0
- package/node_modules/fast-uri/test/security.test.js +75 -3
- package/node_modules/fast-uri/test/urn-full-input.test.js +29 -0
- package/node_modules/fast-uri/test/websocket-query-preservation.test.js +24 -0
- package/node_modules/hono/dist/cjs/client/client.js +25 -11
- package/node_modules/hono/dist/cjs/client/utils.js +4 -1
- package/node_modules/hono/dist/cjs/context.js +4 -0
- package/node_modules/hono/dist/cjs/helper/accepts/accepts.js +36 -2
- package/node_modules/hono/dist/cjs/helper/ssg/ssg.js +1 -1
- package/node_modules/hono/dist/cjs/helper/ssg/utils.js +30 -10
- package/node_modules/hono/dist/cjs/jsx/dom/render.js +2 -0
- package/node_modules/hono/dist/cjs/middleware/cache/index.js +1 -1
- package/node_modules/hono/dist/cjs/middleware/cors/index.js +1 -1
- package/node_modules/hono/dist/cjs/middleware/csrf/index.js +1 -1
- package/node_modules/hono/dist/cjs/middleware/etag/digest.js +1 -1
- package/node_modules/hono/dist/cjs/middleware/etag/index.js +3 -3
- package/node_modules/hono/dist/cjs/middleware/pretty-json/index.js +3 -1
- package/node_modules/hono/dist/cjs/request.js +8 -4
- package/node_modules/hono/dist/cjs/router/linear-router/router.js +7 -2
- package/node_modules/hono/dist/cjs/router/pattern-router/router.js +3 -9
- package/node_modules/hono/dist/cjs/router/reg-exp-router/node.js +10 -3
- package/node_modules/hono/dist/cjs/router/reg-exp-router/router.js +47 -83
- package/node_modules/hono/dist/cjs/router/reg-exp-router/trie.js +2 -1
- package/node_modules/hono/dist/cjs/router/trie-router/node.js +46 -69
- package/node_modules/hono/dist/cjs/router/trie-router/router.js +3 -11
- package/node_modules/hono/dist/cjs/router/utils.js +27 -0
- package/node_modules/hono/dist/cjs/utils/body.js +15 -3
- package/node_modules/hono/dist/cjs/utils/cookie.js +1 -1
- package/node_modules/hono/dist/cjs/utils/ipaddr.js +5 -3
- package/node_modules/hono/dist/cjs/utils/stream.js +7 -1
- package/node_modules/hono/dist/cjs/utils/url.js +9 -1
- package/node_modules/hono/dist/client/client.js +25 -11
- package/node_modules/hono/dist/client/utils.js +4 -1
- package/node_modules/hono/dist/context.js +4 -0
- package/node_modules/hono/dist/helper/accepts/accepts.js +36 -2
- package/node_modules/hono/dist/helper/ssg/ssg.js +1 -1
- package/node_modules/hono/dist/helper/ssg/utils.js +30 -10
- package/node_modules/hono/dist/jsx/dom/render.js +2 -0
- package/node_modules/hono/dist/middleware/cache/index.js +1 -1
- package/node_modules/hono/dist/middleware/cors/index.js +1 -1
- package/node_modules/hono/dist/middleware/csrf/index.js +1 -1
- package/node_modules/hono/dist/middleware/etag/digest.js +1 -1
- package/node_modules/hono/dist/middleware/etag/index.js +3 -3
- package/node_modules/hono/dist/middleware/pretty-json/index.js +3 -1
- package/node_modules/hono/dist/request.js +8 -4
- package/node_modules/hono/dist/router/linear-router/router.js +7 -2
- package/node_modules/hono/dist/router/pattern-router/router.js +3 -9
- package/node_modules/hono/dist/router/reg-exp-router/node.js +6 -2
- package/node_modules/hono/dist/router/reg-exp-router/router.js +53 -84
- package/node_modules/hono/dist/router/reg-exp-router/trie.js +2 -1
- package/node_modules/hono/dist/router/trie-router/node.js +46 -69
- package/node_modules/hono/dist/router/trie-router/router.js +3 -11
- package/node_modules/hono/dist/router/utils.js +5 -0
- package/node_modules/hono/dist/types/context.d.ts +4 -0
- package/node_modules/hono/dist/types/router/reg-exp-router/node.d.ts +3 -0
- package/node_modules/hono/dist/types/router/trie-router/node.d.ts +1 -2
- package/node_modules/hono/dist/types/router/trie-router/router.d.ts +0 -1
- package/node_modules/hono/dist/types/router/utils.d.ts +1 -0
- package/node_modules/hono/dist/types/utils/url.d.ts +4 -0
- package/node_modules/hono/dist/utils/body.js +15 -3
- package/node_modules/hono/dist/utils/cookie.js +1 -1
- package/node_modules/hono/dist/utils/ipaddr.js +5 -3
- package/node_modules/hono/dist/utils/stream.js +7 -1
- package/node_modules/hono/dist/utils/url.js +9 -1
- package/node_modules/hono/package.json +1 -1
- package/node_modules/ip-address/README.md +92 -82
- package/node_modules/ip-address/dist/common.d.ts +20 -0
- package/node_modules/ip-address/dist/common.js +36 -0
- package/node_modules/ip-address/dist/common.js.map +1 -1
- package/node_modules/ip-address/dist/ipv4.d.ts +50 -0
- package/node_modules/ip-address/dist/ipv4.js +75 -0
- package/node_modules/ip-address/dist/ipv4.js.map +1 -1
- package/node_modules/ip-address/dist/ipv6.d.ts +79 -10
- package/node_modules/ip-address/dist/ipv6.js +120 -30
- package/node_modules/ip-address/dist/ipv6.js.map +1 -1
- package/node_modules/ip-address/dist/v4/constants.d.ts +12 -0
- package/node_modules/ip-address/dist/v4/constants.js +40 -1
- package/node_modules/ip-address/dist/v4/constants.js.map +1 -1
- package/node_modules/ip-address/dist/v6/constants.d.ts +14 -0
- package/node_modules/ip-address/dist/v6/constants.js +47 -1
- package/node_modules/ip-address/dist/v6/constants.js.map +1 -1
- package/node_modules/ip-address/package.json +1 -1
- package/node_modules/is-plain-object/README.md +39 -95
- package/node_modules/is-plain-object/dist/is-plain-object.js +0 -2
- package/node_modules/is-plain-object/is-plain-object.d.ts +6 -1
- package/node_modules/is-plain-object/package.json +8 -34
- package/node_modules/jose/dist/types/jwe/compact/decrypt.d.ts +7 -16
- package/node_modules/jose/dist/types/jwe/compact/encrypt.d.ts +10 -20
- package/node_modules/jose/dist/types/jwe/flattened/decrypt.d.ts +7 -16
- package/node_modules/jose/dist/types/jwe/flattened/encrypt.d.ts +16 -38
- package/node_modules/jose/dist/types/jwe/general/decrypt.d.ts +7 -16
- package/node_modules/jose/dist/types/jwe/general/encrypt.d.ts +19 -38
- package/node_modules/jose/dist/types/jwk/embedded.d.ts +3 -8
- package/node_modules/jose/dist/types/jwk/thumbprint.d.ts +5 -5
- package/node_modules/jose/dist/types/jwks/local.d.ts +6 -10
- package/node_modules/jose/dist/types/jwks/remote.d.ts +17 -28
- package/node_modules/jose/dist/types/jws/compact/sign.d.ts +5 -10
- package/node_modules/jose/dist/types/jws/compact/verify.d.ts +9 -18
- package/node_modules/jose/dist/types/jws/flattened/sign.d.ts +7 -16
- package/node_modules/jose/dist/types/jws/flattened/verify.d.ts +9 -18
- package/node_modules/jose/dist/types/jws/general/sign.d.ts +11 -21
- package/node_modules/jose/dist/types/jws/general/verify.d.ts +12 -21
- package/node_modules/jose/dist/types/jwt/decrypt.d.ts +10 -20
- package/node_modules/jose/dist/types/jwt/encrypt.d.ts +17 -29
- package/node_modules/jose/dist/types/jwt/sign.d.ts +12 -19
- package/node_modules/jose/dist/types/jwt/unsecured.d.ts +17 -28
- package/node_modules/jose/dist/types/jwt/verify.d.ts +9 -19
- package/node_modules/jose/dist/types/key/export.d.ts +4 -4
- package/node_modules/jose/dist/types/key/generate_key_pair.d.ts +6 -8
- package/node_modules/jose/dist/types/key/generate_secret.d.ts +4 -11
- package/node_modules/jose/dist/types/key/import.d.ts +10 -17
- package/node_modules/jose/dist/types/types.d.ts +48 -86
- package/node_modules/jose/dist/types/util/base64url.d.ts +2 -2
- package/node_modules/jose/dist/types/util/decode_jwt.d.ts +3 -10
- package/node_modules/jose/dist/types/util/decode_protected_header.d.ts +4 -4
- package/node_modules/jose/dist/types/util/errors.d.ts +26 -53
- package/node_modules/jose/dist/webapi/index.js +70 -32
- package/node_modules/jose/dist/webapi/jwe/compact/decrypt.js +7 -8
- package/node_modules/jose/dist/webapi/jwe/compact/encrypt.js +42 -26
- package/node_modules/jose/dist/webapi/jwe/flattened/decrypt.js +14 -10
- package/node_modules/jose/dist/webapi/jwe/flattened/encrypt.js +53 -71
- package/node_modules/jose/dist/webapi/jwe/general/decrypt.js +38 -49
- package/node_modules/jose/dist/webapi/jwe/general/encrypt.js +121 -158
- package/node_modules/jose/dist/webapi/jwk/embedded.js +30 -18
- package/node_modules/jose/dist/webapi/jwk/thumbprint.js +54 -64
- package/node_modules/jose/dist/webapi/jwks/local.js +49 -74
- package/node_modules/jose/dist/webapi/jwks/remote.js +91 -160
- package/node_modules/jose/dist/webapi/jws/compact/sign.js +21 -20
- package/node_modules/jose/dist/webapi/jws/compact/verify.js +7 -8
- package/node_modules/jose/dist/webapi/jws/flattened/sign.js +29 -30
- package/node_modules/jose/dist/webapi/jws/flattened/verify.js +21 -23
- package/node_modules/jose/dist/webapi/jws/general/sign.js +61 -70
- package/node_modules/jose/dist/webapi/jws/general/verify.js +47 -41
- package/node_modules/jose/dist/webapi/jwt/decrypt.js +13 -22
- package/node_modules/jose/dist/webapi/jwt/encrypt.js +58 -100
- package/node_modules/jose/dist/webapi/jwt/sign.js +18 -50
- package/node_modules/jose/dist/webapi/jwt/unsecured.js +34 -63
- package/node_modules/jose/dist/webapi/jwt/verify.js +12 -14
- package/node_modules/jose/dist/webapi/key/export.js +32 -37
- package/node_modules/jose/dist/webapi/key/generate_key_pair.js +40 -44
- package/node_modules/jose/dist/webapi/key/generate_secret.js +35 -39
- package/node_modules/jose/dist/webapi/key/import.js +52 -52
- package/node_modules/jose/dist/webapi/lib/asn1.js +130 -164
- package/node_modules/jose/dist/webapi/lib/base64.js +18 -20
- package/node_modules/jose/dist/webapi/lib/buffer_utils.js +34 -38
- package/node_modules/jose/dist/webapi/lib/content_encryption.js +79 -123
- package/node_modules/jose/dist/webapi/lib/crypto_key.js +24 -25
- package/node_modules/jose/dist/webapi/lib/deflate.js +46 -40
- package/node_modules/jose/dist/webapi/lib/helpers.js +40 -37
- package/node_modules/jose/dist/webapi/lib/invalid_key_input.js +10 -24
- package/node_modules/jose/dist/webapi/lib/is_key_like.js +17 -15
- package/node_modules/jose/dist/webapi/lib/jwe_algorithms.js +106 -93
- package/node_modules/jose/dist/webapi/lib/jwe_decrypt.js +210 -176
- package/node_modules/jose/dist/webapi/lib/jwe_encrypt.js +105 -107
- package/node_modules/jose/dist/webapi/lib/jwk_metadata.js +19 -0
- package/node_modules/jose/dist/webapi/lib/jwk_to_key.js +9 -16
- package/node_modules/jose/dist/webapi/lib/jws_algorithms.js +62 -61
- package/node_modules/jose/dist/webapi/lib/jws_sign.js +58 -72
- package/node_modules/jose/dist/webapi/lib/jws_verify.js +90 -103
- package/node_modules/jose/dist/webapi/lib/jwt_claims_set.js +134 -185
- package/node_modules/jose/dist/webapi/lib/key.js +84 -121
- package/node_modules/jose/dist/webapi/lib/key_algorithm.js +13 -8
- package/node_modules/jose/dist/webapi/lib/key_descriptor.js +8 -6
- package/node_modules/jose/dist/webapi/lib/key_management.js +200 -225
- package/node_modules/jose/dist/webapi/lib/key_options.js +8 -0
- package/node_modules/jose/dist/webapi/lib/options.js +57 -44
- package/node_modules/jose/dist/webapi/lib/signing.js +18 -22
- package/node_modules/jose/dist/webapi/lib/type_checks.js +28 -33
- package/node_modules/jose/dist/webapi/util/base64url.js +26 -35
- package/node_modules/jose/dist/webapi/util/decode_jwt.js +32 -31
- package/node_modules/jose/dist/webapi/util/decode_protected_header.js +18 -23
- package/node_modules/jose/dist/webapi/util/errors.js +94 -84
- package/node_modules/jose/package.json +17 -81
- package/package.json +2 -2
- package/profiles/calendar/0.5.profile.json +190 -0
- package/profiles/charge/0.5.profile.json +210 -0
- package/profiles/customers/0.7.profile.json +157 -0
- package/profiles/deploy/0.9.profile.json +176 -0
- package/profiles/email/0.6.profile.json +208 -0
- package/profiles/index.json +9 -1
- package/profiles/publish/0.5.profile.json +186 -0
- package/profiles/purchase/0.5.profile.json +231 -0
- package/profiles/records/0.5.profile.json +117 -0
- package/dist/ui/assets/index-0Q2eNytX.js +0 -110
- package/node_modules/@modelcontextprotocol/sdk/node_modules/negotiator/HISTORY.md +0 -114
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
'use strict'
|
|
2
|
+
|
|
3
|
+
const test = require('tape')
|
|
4
|
+
const fastURI = require('..')
|
|
5
|
+
|
|
6
|
+
const PATH_RESERVED = "!$&'()*+,;=:@/"
|
|
7
|
+
|
|
8
|
+
function percentEncode (character, lowerCase) {
|
|
9
|
+
const hex = character.charCodeAt(0).toString(16).padStart(2, '0')
|
|
10
|
+
return '%' + (lowerCase ? hex : hex.toUpperCase())
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
test('normalize preserves literal and escaped reserved path characters', (t) => {
|
|
14
|
+
t.equal(
|
|
15
|
+
fastURI.normalize('http://example.com/a;b'),
|
|
16
|
+
'http://example.com/a;b',
|
|
17
|
+
'literal semicolon remains literal'
|
|
18
|
+
)
|
|
19
|
+
t.equal(
|
|
20
|
+
fastURI.normalize('http://example.com/a%3ab'),
|
|
21
|
+
'http://example.com/a%3Ab',
|
|
22
|
+
'escaped colon remains escaped and its hex is uppercased'
|
|
23
|
+
)
|
|
24
|
+
|
|
25
|
+
for (const character of PATH_RESERVED) {
|
|
26
|
+
const literal = `http://example.com/a${character}b`
|
|
27
|
+
const escaped = `http://example.com/a${percentEncode(character, true)}b`
|
|
28
|
+
const normalizedEscape = `http://example.com/a${percentEncode(character, false)}b`
|
|
29
|
+
|
|
30
|
+
t.equal(fastURI.normalize(literal), literal, `preserves literal ${character}`)
|
|
31
|
+
t.equal(fastURI.normalize(escaped), normalizedEscape, `preserves escaped ${character}`)
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
t.equal(
|
|
35
|
+
fastURI.normalize('http://example.com/a/./café'),
|
|
36
|
+
'http://example.com/a/caf%C3%A9',
|
|
37
|
+
'removes real dot segments and UTF-8 encodes raw non-ASCII'
|
|
38
|
+
)
|
|
39
|
+
t.equal(
|
|
40
|
+
fastURI.normalize('http://example.com/a/%2e%2e/b'),
|
|
41
|
+
'http://example.com/a/%2E%2E/b',
|
|
42
|
+
'preserves escaped dots as path data'
|
|
43
|
+
)
|
|
44
|
+
t.equal(
|
|
45
|
+
fastURI.normalize('http://example.com/Kſ'),
|
|
46
|
+
'http://example.com/%E2%84%AA%C5%BF',
|
|
47
|
+
'UTF-8 encodes Unicode characters that case-fold to ASCII'
|
|
48
|
+
)
|
|
49
|
+
t.end()
|
|
50
|
+
})
|
|
51
|
+
|
|
52
|
+
test('serialize uses the RFC 3986 path character set without opening escapes', (t) => {
|
|
53
|
+
const rawPath = `/a${PATH_RESERVED}b`
|
|
54
|
+
t.equal(
|
|
55
|
+
fastURI.serialize({ scheme: 'http', host: 'example.com', path: rawPath }),
|
|
56
|
+
`http://example.com${rawPath}`,
|
|
57
|
+
'keeps all legal raw path characters'
|
|
58
|
+
)
|
|
59
|
+
|
|
60
|
+
const escapedPath = Array.from(PATH_RESERVED, (character) => percentEncode(character, true)).join('')
|
|
61
|
+
const normalizedEscapedPath = Array.from(PATH_RESERVED, (character) => percentEncode(character, false)).join('')
|
|
62
|
+
t.equal(
|
|
63
|
+
fastURI.serialize({ scheme: 'http', host: 'example.com', path: '/' + escapedPath }),
|
|
64
|
+
'http://example.com/' + normalizedEscapedPath,
|
|
65
|
+
'uppercases valid escapes without decoding reserved characters'
|
|
66
|
+
)
|
|
67
|
+
|
|
68
|
+
t.equal(
|
|
69
|
+
fastURI.serialize({ scheme: 'http', host: 'example.com', path: '/a?b#c[d]' }),
|
|
70
|
+
'http://example.com/a%3Fb%23c%5Bd%5D',
|
|
71
|
+
'encodes characters that would leave the path component'
|
|
72
|
+
)
|
|
73
|
+
t.equal(
|
|
74
|
+
fastURI.serialize({ path: 'a:b/c:d' }),
|
|
75
|
+
'a%3Ab/c:d',
|
|
76
|
+
'only escapes a colon where path-noscheme requires it'
|
|
77
|
+
)
|
|
78
|
+
t.equal(
|
|
79
|
+
fastURI.serialize({ path: './a:b/c:d' }),
|
|
80
|
+
'a%3Ab/c:d',
|
|
81
|
+
'escapes a first-segment colon exposed by dot-segment removal'
|
|
82
|
+
)
|
|
83
|
+
t.equal(
|
|
84
|
+
fastURI.normalize('./a:b'),
|
|
85
|
+
'a%3Ab',
|
|
86
|
+
'normalization keeps a relative path from becoming a scheme'
|
|
87
|
+
)
|
|
88
|
+
t.equal(
|
|
89
|
+
fastURI.serialize({ path: '/Kſ' }),
|
|
90
|
+
'/%E2%84%AA%C5%BF',
|
|
91
|
+
'UTF-8 encodes Unicode characters that case-fold to ASCII'
|
|
92
|
+
)
|
|
93
|
+
t.end()
|
|
94
|
+
})
|
|
95
|
+
|
|
96
|
+
test('equal distinguishes escaped reserved path data from literal syntax', (t) => {
|
|
97
|
+
for (const character of PATH_RESERVED) {
|
|
98
|
+
const literal = `http://example.com/a${character}b`
|
|
99
|
+
const escaped = `http://example.com/a${percentEncode(character, false)}b`
|
|
100
|
+
t.equal(fastURI.equal(literal, escaped, {}), false, `distinguishes literal and escaped ${character}`)
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
t.equal(
|
|
104
|
+
fastURI.equal('./a:b', 'a:b', {}),
|
|
105
|
+
false,
|
|
106
|
+
'does not equate a relative path with an absolute URI after removing dot segments'
|
|
107
|
+
)
|
|
108
|
+
t.end()
|
|
109
|
+
})
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
'use strict'
|
|
2
|
+
|
|
3
|
+
const test = require('tape')
|
|
4
|
+
const fastURI = require('..')
|
|
5
|
+
|
|
6
|
+
const MALFORMED_SCHEME_ERROR = 'URI scheme is malformed.'
|
|
7
|
+
|
|
8
|
+
const malformedSchemes = [
|
|
9
|
+
'%2f%2fevil.example:/pwn',
|
|
10
|
+
'%u002f%u002fevil.example:/pwn',
|
|
11
|
+
'%0d%0aSet-Cookie:%20sid=attacker:/p',
|
|
12
|
+
'foo%3Abar:value',
|
|
13
|
+
'foo%2Fbar:value',
|
|
14
|
+
'1http://example.com/',
|
|
15
|
+
'foo_bar:value',
|
|
16
|
+
'éxample:value',
|
|
17
|
+
'Kttp://example.com/',
|
|
18
|
+
'ſcheme:value'
|
|
19
|
+
]
|
|
20
|
+
|
|
21
|
+
test('parse validates the decoded scheme against RFC 3986', (t) => {
|
|
22
|
+
const validSchemes = [
|
|
23
|
+
['a:value', 'a'],
|
|
24
|
+
['HTTP://example.com/', 'http'],
|
|
25
|
+
['a1+.-:value', 'a1+.-'],
|
|
26
|
+
['%4Aavascript:alert(1)', 'javascript'],
|
|
27
|
+
['foo%2Bbar:value', 'foo+bar'],
|
|
28
|
+
['%u006Aavascript:1', 'javascript'],
|
|
29
|
+
['ht%74ps://example.com/', 'https']
|
|
30
|
+
]
|
|
31
|
+
|
|
32
|
+
for (const [uri, scheme] of validSchemes) {
|
|
33
|
+
const parsed = fastURI.parse(uri)
|
|
34
|
+
t.equal(parsed.error, undefined, uri)
|
|
35
|
+
t.equal(parsed.scheme, scheme, uri + ' scheme')
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
for (const uri of malformedSchemes) {
|
|
39
|
+
const parsed = fastURI.parse(uri)
|
|
40
|
+
t.equal(parsed.error, MALFORMED_SCHEME_ERROR, uri)
|
|
41
|
+
}
|
|
42
|
+
t.end()
|
|
43
|
+
})
|
|
44
|
+
|
|
45
|
+
test('decoded schemes select their scheme handlers', (t) => {
|
|
46
|
+
t.equal(
|
|
47
|
+
fastURI.normalize('ht%74ps://example.com:443'),
|
|
48
|
+
'https://example.com/',
|
|
49
|
+
'HTTP normalization runs after decoding the scheme'
|
|
50
|
+
)
|
|
51
|
+
|
|
52
|
+
// 3.x has no mailto scheme handler (added in v4); use the ws handler to
|
|
53
|
+
// verify that a percent-encoded scheme still selects its scheme handler
|
|
54
|
+
const ws = fastURI.parse('we%62socket://example.com/')
|
|
55
|
+
t.equal(ws.scheme, 'websocket', 'ws parsing runs after decoding the scheme')
|
|
56
|
+
t.end()
|
|
57
|
+
})
|
|
58
|
+
|
|
59
|
+
test('normalize preserves schemes that decode to invalid identifiers', (t) => {
|
|
60
|
+
for (const uri of malformedSchemes) {
|
|
61
|
+
t.equal(fastURI.normalize(uri), uri, uri)
|
|
62
|
+
}
|
|
63
|
+
t.end()
|
|
64
|
+
})
|
|
65
|
+
|
|
66
|
+
test('scheme normalization cannot introduce authority or control delimiters', (t) => {
|
|
67
|
+
const authority = '%2f%2fevil.example:/pwn'
|
|
68
|
+
const crlf = '%0d%0aSet-Cookie:%20sid=attacker:/p'
|
|
69
|
+
|
|
70
|
+
t.equal(fastURI.parse(authority).host, undefined, 'original input has no authority')
|
|
71
|
+
t.equal(fastURI.normalize(authority), authority, 'normalization does not create an authority')
|
|
72
|
+
t.equal(fastURI.normalize(crlf), crlf, 'normalization does not emit raw CRLF')
|
|
73
|
+
t.equal(fastURI.normalize(crlf).includes('\r\n'), false, 'normalized output contains no raw CRLF')
|
|
74
|
+
t.end()
|
|
75
|
+
})
|
|
76
|
+
|
|
77
|
+
test('equal returns false for malformed decoded schemes', (t) => {
|
|
78
|
+
for (const uri of malformedSchemes) {
|
|
79
|
+
t.equal(fastURI.equal(uri, uri, {}), false, uri)
|
|
80
|
+
}
|
|
81
|
+
t.end()
|
|
82
|
+
})
|
|
83
|
+
|
|
84
|
+
test('resolve rejects malformed decoded schemes in either input', (t) => {
|
|
85
|
+
t.throws(
|
|
86
|
+
() => fastURI.resolve('%2f%2fevil.example:/base', 'child'),
|
|
87
|
+
/URI scheme is malformed\./,
|
|
88
|
+
'malformed base'
|
|
89
|
+
)
|
|
90
|
+
t.throws(
|
|
91
|
+
() => fastURI.resolve('https://allowed.example/app/', '%2f%2fevil.example:/pwn'),
|
|
92
|
+
/URI scheme is malformed\./,
|
|
93
|
+
'malformed relative reference'
|
|
94
|
+
)
|
|
95
|
+
t.end()
|
|
96
|
+
})
|
|
97
|
+
|
|
98
|
+
test('serialize validates decoded component schemes', (t) => {
|
|
99
|
+
t.equal(
|
|
100
|
+
fastURI.serialize({ scheme: 'foo%2Bbar', path: 'value' }),
|
|
101
|
+
'foo+bar:value',
|
|
102
|
+
'valid decoded scheme is serialized'
|
|
103
|
+
)
|
|
104
|
+
t.throws(
|
|
105
|
+
() => fastURI.serialize({ scheme: '//evil.example', path: '/pwn' }),
|
|
106
|
+
/URI scheme is malformed\./,
|
|
107
|
+
'raw invalid scheme'
|
|
108
|
+
)
|
|
109
|
+
t.throws(
|
|
110
|
+
() => fastURI.serialize({ scheme: '%2f%2fevil.example', path: '/pwn' }),
|
|
111
|
+
/URI scheme is malformed\./,
|
|
112
|
+
'encoded invalid scheme'
|
|
113
|
+
)
|
|
114
|
+
t.equal(
|
|
115
|
+
fastURI.equal(
|
|
116
|
+
{ scheme: '%2f%2fevil.example', path: '/pwn' },
|
|
117
|
+
{ scheme: '%2f%2fevil.example', path: '/pwn' },
|
|
118
|
+
{}
|
|
119
|
+
),
|
|
120
|
+
false,
|
|
121
|
+
'equality fails closed for malformed component objects'
|
|
122
|
+
)
|
|
123
|
+
t.end()
|
|
124
|
+
})
|
|
@@ -37,3 +37,104 @@ test('equal does not treat reserved path escapes as live path syntax', (t) => {
|
|
|
37
37
|
|
|
38
38
|
t.end()
|
|
39
39
|
})
|
|
40
|
+
|
|
41
|
+
test('serialize preserves literal RFC 3986 reserved path characters', (t) => {
|
|
42
|
+
// GHSA-7mh8-fcmq-x23c: literal reserved path chars must not be rewritten to
|
|
43
|
+
// percent escapes by the escape()-style safe set.
|
|
44
|
+
const cases = [
|
|
45
|
+
'http://example.com/a;b',
|
|
46
|
+
'http://example.com/a=b',
|
|
47
|
+
'http://example.com/a&b',
|
|
48
|
+
'http://example.com/a$b',
|
|
49
|
+
'http://example.com/a:b',
|
|
50
|
+
'http://example.com/a@b'
|
|
51
|
+
]
|
|
52
|
+
|
|
53
|
+
t.plan(cases.length)
|
|
54
|
+
|
|
55
|
+
cases.forEach((uri) => {
|
|
56
|
+
t.equal(fastURI.serialize(fastURI.parse(uri)), uri, uri)
|
|
57
|
+
})
|
|
58
|
+
t.end()
|
|
59
|
+
})
|
|
60
|
+
|
|
61
|
+
test('serialize preserves existing reserved path escapes as data', (t) => {
|
|
62
|
+
// GHSA-7mh8-fcmq-x23c: an existing %3A escape must stay %3A instead of being
|
|
63
|
+
// rewritten into a live colon.
|
|
64
|
+
const cases = [
|
|
65
|
+
'http://example.com/a%3Ab',
|
|
66
|
+
'http://example.com/a%3Bb',
|
|
67
|
+
'http://example.com/a%3D%3D'
|
|
68
|
+
]
|
|
69
|
+
|
|
70
|
+
t.plan(cases.length)
|
|
71
|
+
|
|
72
|
+
cases.forEach((uri) => {
|
|
73
|
+
t.equal(fastURI.serialize(fastURI.parse(uri)), uri, uri)
|
|
74
|
+
})
|
|
75
|
+
t.end()
|
|
76
|
+
})
|
|
77
|
+
|
|
78
|
+
test('serialize keeps path-noscheme colon escaping', (t) => {
|
|
79
|
+
// Without a scheme a literal colon would be reparsed as a scheme separator,
|
|
80
|
+
// so it must stay percent-escaped while an existing %3A is preserved.
|
|
81
|
+
t.equal(fastURI.serialize({ path: 'foo:bar' }), 'foo%3Abar')
|
|
82
|
+
t.equal(fastURI.serialize({ path: 'a%3Ab' }), 'a%3Ab')
|
|
83
|
+
t.end()
|
|
84
|
+
})
|
|
85
|
+
|
|
86
|
+
test('hostname normalization never decodes an escape more than once', (t) => {
|
|
87
|
+
const encodedLocalhost = 'http://%256c%256f%2563%2561%256c%2568%256f%2573%2574/'
|
|
88
|
+
const encodedLoopback = '//127%252e0%252e0%252e1/private'
|
|
89
|
+
const encodedMetadataAddress = '//169%252E254%252E169%252E254/latest/meta-data/'
|
|
90
|
+
|
|
91
|
+
t.equal(fastURI.normalize(encodedLocalhost), encodedLocalhost, 'nested hostname letters remain encoded')
|
|
92
|
+
t.equal(fastURI.normalize(encodedLoopback), encodedLoopback, 'nested IPv4 dots remain encoded')
|
|
93
|
+
t.equal(
|
|
94
|
+
fastURI.resolve('https://safe.example/', encodedLoopback),
|
|
95
|
+
'https://127%252e0%252e0%252e1/private',
|
|
96
|
+
'resolve does not turn nested dots into a loopback address'
|
|
97
|
+
)
|
|
98
|
+
t.equal(
|
|
99
|
+
fastURI.resolve('https://allowed.com/api/v1/', encodedMetadataAddress),
|
|
100
|
+
'https://169%252e254%252e169%252e254/latest/meta-data/',
|
|
101
|
+
'resolve does not turn nested dots into a metadata address'
|
|
102
|
+
)
|
|
103
|
+
t.equal(
|
|
104
|
+
fastURI.normalize('http://allowed.com%255Cevil.com/'),
|
|
105
|
+
'http://allowed.com%255Cevil.com/',
|
|
106
|
+
'normalize does not activate a nested backslash'
|
|
107
|
+
)
|
|
108
|
+
t.equal(
|
|
109
|
+
fastURI.serialize({ scheme: 'http', host: '%256cocalhost', path: '/' }),
|
|
110
|
+
'http://%256cocalhost/',
|
|
111
|
+
'component serialization preserves an encoded percent sign'
|
|
112
|
+
)
|
|
113
|
+
t.equal(
|
|
114
|
+
fastURI.equal(encodedLocalhost, 'http://localhost/', {}),
|
|
115
|
+
false,
|
|
116
|
+
'nested escapes do not compare equal to their twice-decoded target'
|
|
117
|
+
)
|
|
118
|
+
t.end()
|
|
119
|
+
})
|
|
120
|
+
|
|
121
|
+
test('hostname normalization decodes only current unreserved escapes', (t) => {
|
|
122
|
+
t.equal(fastURI.normalize('x://%6cocalhost/'), 'x://localhost/', 'a current unreserved escape is decoded')
|
|
123
|
+
t.equal(fastURI.normalize('x://%256cocalhost/'), 'x://%256cocalhost/', 'an encoded percent is preserved')
|
|
124
|
+
t.equal(fastURI.normalize('x://host%2540evil/'), 'x://host%2540evil/', 'a nested authority delimiter stays inert')
|
|
125
|
+
t.equal(fastURI.normalize('x://%2525/'), 'x://%2525/', 'nested encoded percent signs stay encoded')
|
|
126
|
+
t.end()
|
|
127
|
+
})
|
|
128
|
+
|
|
129
|
+
test('host conversion failures are not treated as comparable URLs', (t) => {
|
|
130
|
+
const malformedHost = 'http://trusted.test%2540evil.test/'
|
|
131
|
+
|
|
132
|
+
t.equal(fastURI.normalize(malformedHost), malformedHost, 'normalization preserves the failing input')
|
|
133
|
+
t.equal(fastURI.equal(malformedHost, malformedHost, {}), false, 'equal rejects a failed host conversion')
|
|
134
|
+
t.throws(
|
|
135
|
+
() => fastURI.resolve(malformedHost, 'child', { domainHost: true }),
|
|
136
|
+
/Host's domain name can not be converted to ASCII/,
|
|
137
|
+
'resolve propagates a host conversion failure'
|
|
138
|
+
)
|
|
139
|
+
t.end()
|
|
140
|
+
})
|
|
@@ -125,11 +125,13 @@ test('serialize escapes authority delimiters in host field', (t) => {
|
|
|
125
125
|
})
|
|
126
126
|
|
|
127
127
|
test('normalize does not double-decode %2540 into a live @', (t) => {
|
|
128
|
-
const
|
|
128
|
+
const input = 'http://trusted.com%2540evil.com/'
|
|
129
|
+
const result = fastURI.normalize(input)
|
|
129
130
|
const parsed = fastURI.parse(result)
|
|
130
131
|
|
|
131
|
-
t.plan(
|
|
132
|
-
t.
|
|
132
|
+
t.plan(2)
|
|
133
|
+
t.equal(result, input, 'the encoded percent sign is preserved')
|
|
134
|
+
t.notEqual(parsed.host, 'trusted.com@evil.com', input)
|
|
133
135
|
})
|
|
134
136
|
|
|
135
137
|
test('parse canonicalises IDN / Unicode hosts to their ASCII form', (t) => {
|
|
@@ -160,6 +162,76 @@ test('parse canonicalises IDN / Unicode hosts to their ASCII form', (t) => {
|
|
|
160
162
|
})
|
|
161
163
|
})
|
|
162
164
|
|
|
165
|
+
test('resolve canonicalises the host using the final resolved scheme', (t) => {
|
|
166
|
+
const cases = [
|
|
167
|
+
{
|
|
168
|
+
base: 'http://trusted.example/base',
|
|
169
|
+
relative: '//127\u30020\u30020\u30021/private',
|
|
170
|
+
expected: 'http://127.0.0.1/private',
|
|
171
|
+
expectedHost: '127.0.0.1',
|
|
172
|
+
description: 'scheme-relative loopback host'
|
|
173
|
+
},
|
|
174
|
+
{
|
|
175
|
+
base: 'https://ex\u00ADample.com/base',
|
|
176
|
+
relative: 'child',
|
|
177
|
+
expected: 'https://example.com/child',
|
|
178
|
+
expectedHost: 'example.com',
|
|
179
|
+
description: 'host inherited from the base'
|
|
180
|
+
},
|
|
181
|
+
{
|
|
182
|
+
base: 'http://trusted.example/base',
|
|
183
|
+
relative: 'http://ex\u200Bample.com/',
|
|
184
|
+
expected: 'http://example.com/',
|
|
185
|
+
expectedHost: 'example.com',
|
|
186
|
+
description: 'absolute relative reference'
|
|
187
|
+
}
|
|
188
|
+
]
|
|
189
|
+
|
|
190
|
+
t.plan(cases.length * 2)
|
|
191
|
+
|
|
192
|
+
cases.forEach(({ base, relative, expected, expectedHost, description }) => {
|
|
193
|
+
const resolved = fastURI.resolve(base, relative)
|
|
194
|
+
t.equal(resolved, expected, description)
|
|
195
|
+
t.equal(fastURI.parse(resolved).host, expectedHost, `${description} reparses consistently`)
|
|
196
|
+
})
|
|
197
|
+
})
|
|
198
|
+
|
|
199
|
+
test('resolve applies domain canonicalisation only when the effective scheme opts in', (t) => {
|
|
200
|
+
const host = 'ex\u00ADample.com'
|
|
201
|
+
|
|
202
|
+
t.plan(2)
|
|
203
|
+
t.equal(
|
|
204
|
+
fastURI.resolve('uri://trusted.example/', `//${host}/`),
|
|
205
|
+
`uri://${host}/`,
|
|
206
|
+
'an unsupported scheme preserves the host'
|
|
207
|
+
)
|
|
208
|
+
t.equal(
|
|
209
|
+
fastURI.resolve('http://trusted.example/', `//${host}/`, { unicodeSupport: true }),
|
|
210
|
+
`http://${host}/`,
|
|
211
|
+
'unicodeSupport preserves the Unicode host'
|
|
212
|
+
)
|
|
213
|
+
})
|
|
214
|
+
|
|
215
|
+
test('resolve throws when the final scheme cannot canonicalise the host', (t) => {
|
|
216
|
+
const invalidHost = '\u200D.example'
|
|
217
|
+
const cases = [
|
|
218
|
+
['http://trusted.example/', `//${invalidHost}/`],
|
|
219
|
+
[`https://${invalidHost}/base`, 'child'],
|
|
220
|
+
['http://trusted.example/', `http://${invalidHost}/`],
|
|
221
|
+
['http://trusted.example/', `//${invalidHost}%2Etest/`]
|
|
222
|
+
]
|
|
223
|
+
|
|
224
|
+
t.plan(cases.length)
|
|
225
|
+
|
|
226
|
+
cases.forEach(([base, relative]) => {
|
|
227
|
+
t.throws(
|
|
228
|
+
() => fastURI.resolve(base, relative),
|
|
229
|
+
/Host's domain name can not be converted to ASCII/,
|
|
230
|
+
`${base} + ${relative}`
|
|
231
|
+
)
|
|
232
|
+
})
|
|
233
|
+
})
|
|
234
|
+
|
|
163
235
|
test('parse rejects a literal backslash in the authority as malformed (RFC 3986)', (t) => {
|
|
164
236
|
// Regression for the host-confusion bypass: a literal "\" is invalid RFC 3986
|
|
165
237
|
// syntax and must be flagged malformed, not silently rewritten. Otherwise "\"
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
'use strict'
|
|
2
|
+
|
|
3
|
+
const test = require('tape')
|
|
4
|
+
const fastURI = require('..')
|
|
5
|
+
|
|
6
|
+
test('URN parsing validates the complete scheme-specific input', (t) => {
|
|
7
|
+
const embedded = fastURI.parse('urn:x|foo:bar')
|
|
8
|
+
t.equal(embedded.error, 'URN can not be parsed.', 'does not search for a later nid:nss substring')
|
|
9
|
+
t.equal(embedded.nid, undefined, 'does not adopt the later nid')
|
|
10
|
+
t.equal(embedded.nss, undefined, 'does not adopt the later nss')
|
|
11
|
+
|
|
12
|
+
const trailing = fastURI.parse('urn:foo:bar|ignored')
|
|
13
|
+
t.equal(trailing.error, 'URN can not be parsed.', 'rejects trailing input outside the RFC 2141 NSS grammar')
|
|
14
|
+
t.equal(trailing.nid, undefined, 'does not return an nid from a partial match')
|
|
15
|
+
t.equal(trailing.nss, undefined, 'does not return a truncated nss')
|
|
16
|
+
|
|
17
|
+
t.end()
|
|
18
|
+
})
|
|
19
|
+
|
|
20
|
+
test('URN parsing preserves the complete RFC 2141 NSS', (t) => {
|
|
21
|
+
const parsed = fastURI.parse('urn:foo:allowed/evil')
|
|
22
|
+
t.equal(parsed.error, undefined, 'accepts slash in an RFC 2141 NSS')
|
|
23
|
+
t.equal(parsed.nid, 'foo', 'parses the nid')
|
|
24
|
+
t.equal(parsed.nss, 'allowed/evil', 'preserves the complete NSS')
|
|
25
|
+
t.equal(fastURI.normalize('urn:foo:allowed/evil'), 'urn:foo:allowed/evil', 'normalization retains slash data')
|
|
26
|
+
t.equal(fastURI.equal('urn:foo:allowed/evil', 'urn:foo:allowed'), false, 'distinct NSS values do not compare equal')
|
|
27
|
+
|
|
28
|
+
t.end()
|
|
29
|
+
})
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
'use strict'
|
|
2
|
+
|
|
3
|
+
const test = require('tape')
|
|
4
|
+
const fastURI = require('..')
|
|
5
|
+
|
|
6
|
+
test('WebSocket queries preserve additional question marks', (t) => {
|
|
7
|
+
for (const scheme of ['ws', 'wss']) {
|
|
8
|
+
const uri = `${scheme}://example.com/chat?a?b`
|
|
9
|
+
const truncatedURI = `${scheme}://example.com/chat?a`
|
|
10
|
+
const parsed = fastURI.parse(uri)
|
|
11
|
+
|
|
12
|
+
t.equal(parsed.resourceName, '/chat?a?b', `${scheme} parse preserves the resource name`)
|
|
13
|
+
t.equal(fastURI.serialize(parsed), uri, `${scheme} parsed components round-trip`)
|
|
14
|
+
t.equal(
|
|
15
|
+
fastURI.serialize({ scheme, host: 'example.com', resourceName: '/chat?a?b' }),
|
|
16
|
+
uri,
|
|
17
|
+
`${scheme} resource name serializes without truncation`
|
|
18
|
+
)
|
|
19
|
+
t.equal(fastURI.normalize(uri), uri, `${scheme} normalization preserves the full query`)
|
|
20
|
+
t.equal(fastURI.equal(uri, truncatedURI), false, `${scheme} equality distinguishes the full query`)
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
t.end()
|
|
24
|
+
})
|
|
@@ -40,6 +40,10 @@ const createProxy = (callback, path) => {
|
|
|
40
40
|
});
|
|
41
41
|
return proxy;
|
|
42
42
|
};
|
|
43
|
+
const appendQueryParams = (url, searchParams) => {
|
|
44
|
+
const queryString = searchParams.toString();
|
|
45
|
+
return queryString ? `${url}?${queryString}` : url;
|
|
46
|
+
};
|
|
43
47
|
class ClientRequestImpl {
|
|
44
48
|
url;
|
|
45
49
|
method;
|
|
@@ -66,6 +70,9 @@ class ClientRequestImpl {
|
|
|
66
70
|
}
|
|
67
71
|
if (Array.isArray(v)) {
|
|
68
72
|
for (const v2 of v) {
|
|
73
|
+
if (v2 === void 0) {
|
|
74
|
+
continue;
|
|
75
|
+
}
|
|
69
76
|
form.append(k, v2);
|
|
70
77
|
}
|
|
71
78
|
} else {
|
|
@@ -90,19 +97,29 @@ class ClientRequestImpl {
|
|
|
90
97
|
if (args?.cookie) {
|
|
91
98
|
const cookies = [];
|
|
92
99
|
for (const [key, value] of Object.entries(args.cookie)) {
|
|
100
|
+
if (value === void 0) {
|
|
101
|
+
continue;
|
|
102
|
+
}
|
|
93
103
|
cookies.push((0, import_cookie.serialize)(key, value));
|
|
94
104
|
}
|
|
95
|
-
|
|
105
|
+
if (cookies.length > 0) {
|
|
106
|
+
headerValues["Cookie"] = cookies.join("; ");
|
|
107
|
+
}
|
|
96
108
|
}
|
|
97
109
|
if (this.cType) {
|
|
98
110
|
headerValues["Content-Type"] = this.cType;
|
|
99
111
|
}
|
|
100
|
-
const headers = new Headers(
|
|
112
|
+
const headers = new Headers();
|
|
113
|
+
for (const [key, value] of Object.entries(headerValues)) {
|
|
114
|
+
if (value !== void 0) {
|
|
115
|
+
headers.set(key, value);
|
|
116
|
+
}
|
|
117
|
+
}
|
|
101
118
|
let url = this.url;
|
|
102
119
|
url = (0, import_utils.removeIndexString)(url);
|
|
103
120
|
url = (0, import_utils.replaceUrlParam)(url, this.pathParams);
|
|
104
121
|
if (this.queryParams) {
|
|
105
|
-
url = url
|
|
122
|
+
url = appendQueryParams(url, this.queryParams);
|
|
106
123
|
}
|
|
107
124
|
methodUpperCase = this.method.toUpperCase();
|
|
108
125
|
const setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
|
|
@@ -146,7 +163,7 @@ const hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
|
|
|
146
163
|
result = (0, import_utils.replaceUrlParam)(url, opts.args[0].param);
|
|
147
164
|
}
|
|
148
165
|
if (opts.args[0].query) {
|
|
149
|
-
result = result
|
|
166
|
+
result = appendQueryParams(result, buildSearchParamsOption(opts.args[0].query));
|
|
150
167
|
}
|
|
151
168
|
}
|
|
152
169
|
result = (0, import_utils.removeIndexString)(result);
|
|
@@ -157,18 +174,15 @@ const hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
|
|
|
157
174
|
}
|
|
158
175
|
if (method === "ws") {
|
|
159
176
|
const webSocketUrl = (0, import_utils.replaceUrlProtocol)(
|
|
160
|
-
opts.args[0]
|
|
177
|
+
opts.args[0]?.param ? (0, import_utils.replaceUrlParam)(url, opts.args[0].param) : url,
|
|
161
178
|
"ws"
|
|
162
179
|
);
|
|
163
180
|
const targetUrl = new URL(webSocketUrl);
|
|
164
181
|
const queryParams = opts.args[0]?.query;
|
|
165
182
|
if (queryParams) {
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
} else {
|
|
170
|
-
targetUrl.searchParams.set(key, value);
|
|
171
|
-
}
|
|
183
|
+
const searchParams = buildSearchParamsOption(queryParams);
|
|
184
|
+
searchParams.forEach((value, key) => {
|
|
185
|
+
targetUrl.searchParams.append(key, value);
|
|
172
186
|
});
|
|
173
187
|
}
|
|
174
188
|
const establishWebSocket = (...args) => {
|
|
@@ -37,7 +37,7 @@ const mergePath = (base, path) => {
|
|
|
37
37
|
const replaceUrlParam = (urlString, params) => {
|
|
38
38
|
for (const [k, v] of Object.entries(params)) {
|
|
39
39
|
const reg = new RegExp("/:" + k + "(?:{[^/]+})?\\??(?=/|$)");
|
|
40
|
-
urlString = urlString.replace(reg, v ? `/${v}` : "");
|
|
40
|
+
urlString = urlString.replace(reg, () => v ? `/${v}` : "");
|
|
41
41
|
}
|
|
42
42
|
return urlString;
|
|
43
43
|
};
|
|
@@ -49,6 +49,9 @@ const buildSearchParams = (query) => {
|
|
|
49
49
|
}
|
|
50
50
|
if (Array.isArray(v)) {
|
|
51
51
|
for (const v2 of v) {
|
|
52
|
+
if (v2 === void 0) {
|
|
53
|
+
continue;
|
|
54
|
+
}
|
|
52
55
|
searchParams.append(k, v2);
|
|
53
56
|
}
|
|
54
57
|
} else {
|
|
@@ -224,6 +224,10 @@ class Context {
|
|
|
224
224
|
* c.header('X-Message', 'Hello!')
|
|
225
225
|
* c.header('Content-Type', 'text/plain')
|
|
226
226
|
*
|
|
227
|
+
* // Append multiple headers using the append option (e.g. Vary)
|
|
228
|
+
* c.header('Vary', 'Accept-Encoding', { append: true })
|
|
229
|
+
* c.header('Vary', 'User-Agent', { append: true })
|
|
230
|
+
*
|
|
227
231
|
* return c.body('Thank you for coming')
|
|
228
232
|
* })
|
|
229
233
|
* ```
|
|
@@ -22,10 +22,44 @@ __export(accepts_exports, {
|
|
|
22
22
|
});
|
|
23
23
|
module.exports = __toCommonJS(accepts_exports);
|
|
24
24
|
var import_accept = require("../../utils/accept");
|
|
25
|
+
const matchType = (acceptType, supportedType) => {
|
|
26
|
+
if (acceptType === supportedType) {
|
|
27
|
+
return true;
|
|
28
|
+
}
|
|
29
|
+
if (acceptType === "*/*" || acceptType === "*") {
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
if (acceptType.endsWith("/*")) {
|
|
33
|
+
const [acceptMain] = acceptType.split("/");
|
|
34
|
+
const [supportedMain] = supportedType.split("/");
|
|
35
|
+
return acceptMain === supportedMain;
|
|
36
|
+
}
|
|
37
|
+
return false;
|
|
38
|
+
};
|
|
39
|
+
const getSpecificity = (type) => {
|
|
40
|
+
if (type === "*/*" || type === "*") {
|
|
41
|
+
return 1;
|
|
42
|
+
}
|
|
43
|
+
if (type.endsWith("/*")) {
|
|
44
|
+
return 2;
|
|
45
|
+
}
|
|
46
|
+
return 3;
|
|
47
|
+
};
|
|
25
48
|
const defaultMatch = (accepts2, config) => {
|
|
26
49
|
const { supports, default: defaultSupport } = config;
|
|
27
|
-
const
|
|
28
|
-
|
|
50
|
+
const sortedAccepts = accepts2.slice().sort((a, b) => {
|
|
51
|
+
if (b.q !== a.q) {
|
|
52
|
+
return b.q - a.q;
|
|
53
|
+
}
|
|
54
|
+
return getSpecificity(b.type) - getSpecificity(a.type);
|
|
55
|
+
});
|
|
56
|
+
for (const accept of sortedAccepts) {
|
|
57
|
+
const matched = supports.find((supported) => matchType(accept.type, supported));
|
|
58
|
+
if (matched) {
|
|
59
|
+
return matched;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
return defaultSupport;
|
|
29
63
|
};
|
|
30
64
|
const accepts = (c, options) => {
|
|
31
65
|
const acceptHeader = c.req.header(options.header);
|
|
@@ -206,7 +206,7 @@ const saveContentToFile = async (data, fsModule, outDir, extensionMap) => {
|
|
|
206
206
|
const { routePath, content, mimeType } = awaitedData;
|
|
207
207
|
const filePath = generateFilePath(routePath, outDir, mimeType, extensionMap);
|
|
208
208
|
const dirPath = (0, import_utils2.dirname)(filePath);
|
|
209
|
-
if (!createdDirs.has(dirPath)) {
|
|
209
|
+
if (dirPath !== "" && !createdDirs.has(dirPath)) {
|
|
210
210
|
await fsModule.mkdir(dirPath, { recursive: true });
|
|
211
211
|
createdDirs.add(dirPath);
|
|
212
212
|
}
|