@fedify/fedify 2.0.0-dev.1726 → 2.0.0-dev.1750

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.
Files changed (194) hide show
  1. package/README.md +3 -0
  2. package/dist/{actor-menZmmiI.js → actor-CMgHXjhs.js} +189 -677
  3. package/dist/{actor-dO7jHa6A.js → actor-CRS7Dbo1.js} +1 -1
  4. package/dist/{actor-T6RyhRgk.d.ts → actor-DqFajh9s.d.ts} +2 -2
  5. package/dist/{actor-Bn2RCpws.cjs → actor-JG822JBi.cjs} +921 -1451
  6. package/dist/{actor-D6K058Tb.d.cts → actor-f2NtjyCg.d.cts} +2 -2
  7. package/dist/{assert_rejects-DiIiJbZn.js → assert_rejects-Ce45JcFg.js} +1 -1
  8. package/dist/{assert_is_error-BPGph1Jx.js → assert_throws-BNXdRGWP.js} +31 -1
  9. package/dist/{builder-CGF1vv7G.js → builder-D44QzfuD.js} +3 -4
  10. package/dist/{client-CegPX0Rn.d.cts → client-94iWEfQa.d.cts} +1 -1
  11. package/dist/{client-bgSdkFa2.d.ts → client-BsGzbnV-.d.ts} +1 -1
  12. package/dist/{client-BfzV3u96.js → client-pY7-3icS.js} +1 -1
  13. package/dist/compat/mod.d.cts +11 -12
  14. package/dist/compat/mod.d.ts +11 -12
  15. package/dist/compat/transformers.test.js +20 -20
  16. package/dist/{context-B1X8-X33.d.ts → context-DG0huGW-.d.ts} +25 -55
  17. package/dist/{context-DYCJXr7J.d.cts → context-DJ8aSy2Q.d.cts} +25 -55
  18. package/dist/{authdocloader-DevmXsTo.js → docloader-BvlqkI1M.js} +17 -8
  19. package/dist/{esm-BODOj_Oi.js → esm-BZMLn6gu.js} +11 -11
  20. package/dist/federation/builder.test.js +8 -10
  21. package/dist/federation/collection.test.js +7 -9
  22. package/dist/federation/handler.test.js +25 -26
  23. package/dist/federation/idempotency.test.js +25 -26
  24. package/dist/federation/inbox.test.js +4 -6
  25. package/dist/federation/keycache.test.js +3 -4
  26. package/dist/federation/kv.test.js +6 -8
  27. package/dist/federation/middleware.test.js +26 -27
  28. package/dist/federation/mod.cjs +9 -11
  29. package/dist/federation/mod.d.cts +11 -12
  30. package/dist/federation/mod.d.ts +11 -12
  31. package/dist/federation/mod.js +9 -11
  32. package/dist/federation/mq.test.js +8 -10
  33. package/dist/federation/negotiation.test.js +7 -9
  34. package/dist/federation/retry.test.js +4 -5
  35. package/dist/federation/router.test.js +6 -8
  36. package/dist/federation/send.test.js +13 -15
  37. package/dist/{http-gHyCrTrX.js → http-BPsXiq3Y.js} +256 -6
  38. package/dist/{http-D6Uj2x2y.d.ts → http-BbO0ejuk.d.ts} +2 -2
  39. package/dist/{http-BmbMWfmh.cjs → http-CPqfuthT.cjs} +289 -9
  40. package/dist/{http-Danw_xTY.js → http-DIsJckI7.js} +2 -2
  41. package/dist/{http-D-e6AFwR.d.cts → http-M8k5mKc0.d.cts} +2 -2
  42. package/dist/{inbox-Blp5F74G.js → inbox-24__vIeD.js} +1 -1
  43. package/dist/{key-CIIkeide.js → key-CcqQC_vj.js} +3 -2
  44. package/dist/{keycache-Covv8lvK.js → keycache-BUF-P0-V.js} +1 -1
  45. package/dist/{keys-DZ1bqhJz.js → keys-DSikT9wk.js} +2 -1
  46. package/dist/kv-cache-CBOkGH5t.js +121 -0
  47. package/dist/kv-cache-gyMh96Y-.cjs +133 -0
  48. package/dist/kv-cache-z0lgwFi_.js +93 -0
  49. package/dist/{ld-C7KL1MK2.js → ld-C5wht8V2.js} +3 -2
  50. package/dist/lookup-BE8ZMmug.js +261 -0
  51. package/dist/{type-D_8QzkEn.js → lookup-CxJLpHHf.js} +503 -5327
  52. package/dist/lookup-Doq5XdGY.cjs +273 -0
  53. package/dist/{middleware-HKKY6sAX.js → middleware-BImvTjdU.js} +18 -17
  54. package/dist/middleware-BsLmqSNx.cjs +15 -0
  55. package/dist/middleware-CdFqipch.js +15 -0
  56. package/dist/{middleware-C60xXvWx.cjs → middleware-ClcQM1de.cjs} +30 -31
  57. package/dist/{middleware-DXOZ6_ST.js → middleware-D5NFjhOL.js} +10 -11
  58. package/dist/middleware-ZZJaIUDZ.js +26 -0
  59. package/dist/{mod-BhUKmBJD.d.ts → mod-B2iOw50L.d.ts} +3 -3
  60. package/dist/mod-BYynOiJG.d.ts +109 -0
  61. package/dist/{mod-DlU8ISoa.d.ts → mod-BlVovdcy.d.ts} +2 -2
  62. package/dist/{mod-DcKxhFQ8.d.ts → mod-BoHnwOCs.d.ts} +2 -2
  63. package/dist/{mod-CxkWO3Mg.d.cts → mod-BxRCHTz-.d.cts} +2 -2
  64. package/dist/{mod-jQ4OODsl.d.cts → mod-C58MZ7Wx.d.cts} +1 -1
  65. package/dist/{mod-twdvV2hR.d.cts → mod-DJcZDvjA.d.cts} +2 -2
  66. package/dist/{mod-Djzcw2ry.d.cts → mod-DgdBYYa0.d.cts} +3 -3
  67. package/dist/{mod-DBzN0aCM.d.ts → mod-Ds0mpFZU.d.ts} +1 -1
  68. package/dist/mod-VastcQsk.d.cts +107 -0
  69. package/dist/mod.cjs +19 -32
  70. package/dist/mod.d.cts +15 -16
  71. package/dist/mod.d.ts +16 -17
  72. package/dist/mod.js +14 -16
  73. package/dist/nodeinfo/client.test.js +8 -10
  74. package/dist/nodeinfo/handler.test.js +24 -25
  75. package/dist/nodeinfo/mod.cjs +2 -3
  76. package/dist/nodeinfo/mod.d.cts +2 -4
  77. package/dist/nodeinfo/mod.d.ts +2 -4
  78. package/dist/nodeinfo/mod.js +2 -3
  79. package/dist/nodeinfo/types.test.js +7 -9
  80. package/dist/{owner-BN_tO3cY.d.cts → owner-B4HbyP8s.d.cts} +3 -3
  81. package/dist/{owner-COcyel6J.js → owner-DIa5WpbP.js} +3 -2
  82. package/dist/{owner-hd9lvQcP.d.ts → owner-kQRGVXG1.d.ts} +3 -3
  83. package/dist/{proof-Cpk853lc.js → proof-CCzhKDDB.js} +2 -2
  84. package/dist/{proof-D6pbnNx2.js → proof-D0ak0hhc.js} +5 -4
  85. package/dist/{proof-CMJcrQoM.cjs → proof-DTKtjEh_.cjs} +17 -16
  86. package/dist/{send-C7A7_big.js → send-BWfkS2zO.js} +2 -2
  87. package/dist/sig/http.test.js +12 -13
  88. package/dist/sig/key.test.js +9 -11
  89. package/dist/sig/ld.test.js +8 -10
  90. package/dist/sig/mod.cjs +9 -11
  91. package/dist/sig/mod.d.cts +5 -7
  92. package/dist/sig/mod.d.ts +5 -7
  93. package/dist/sig/mod.js +5 -7
  94. package/dist/sig/owner.test.js +10 -12
  95. package/dist/sig/proof.test.js +13 -14
  96. package/dist/testing/docloader.test.js +6 -8
  97. package/dist/testing/mod.d.ts +16 -131
  98. package/dist/testing/mod.js +2 -3
  99. package/dist/{testing-e8Kpb1uV.js → testing-BHLtJbQx.js} +1 -2
  100. package/dist/{types-Db4ukgX8.js → types-BtUjyi5y.js} +1 -1
  101. package/dist/{types-LjTL4QMx.cjs → types-CWgzGaqk.cjs} +3 -3
  102. package/dist/{runtime/authdocloader.test.js → utils/docloader.test.js} +14 -15
  103. package/dist/utils/kv-cache.test.js +209 -0
  104. package/dist/utils/mod.cjs +12 -0
  105. package/dist/utils/mod.d.cts +5 -0
  106. package/dist/utils/mod.d.ts +7 -0
  107. package/dist/utils/mod.js +11 -0
  108. package/dist/vocab/actor.test.js +8 -10
  109. package/dist/vocab/lookup.test.js +7 -9
  110. package/dist/vocab/mod.cjs +3 -4
  111. package/dist/vocab/mod.d.cts +3 -5
  112. package/dist/vocab/mod.d.ts +3 -5
  113. package/dist/vocab/mod.js +3 -4
  114. package/dist/vocab/type.test.js +2 -3
  115. package/dist/vocab/vocab.test.js +9 -10
  116. package/dist/{vocab-BI0Ak5lL.d.ts → vocab-BCWe1Ih5.d.ts} +2 -21
  117. package/dist/{vocab-DLHpZwOW.cjs → vocab-C3ZbIV8S.cjs} +5 -5
  118. package/dist/{vocab-Dw1-yVGg.d.cts → vocab-CeDBzu-f.d.cts} +2 -21
  119. package/dist/{vocab-CJHF7Q71.js → vocab-CjheaIIe.js} +3 -3
  120. package/dist/webfinger/handler.test.js +24 -25
  121. package/dist/webfinger/lookup.test.js +7 -9
  122. package/dist/webfinger/mod.cjs +2 -3
  123. package/dist/webfinger/mod.d.cts +1 -3
  124. package/dist/webfinger/mod.d.ts +1 -3
  125. package/dist/webfinger/mod.js +2 -3
  126. package/dist/x/cfworkers.d.cts +2 -2
  127. package/dist/x/cfworkers.d.ts +2 -2
  128. package/dist/x/cfworkers.test.js +6 -8
  129. package/dist/x/hono.d.cts +10 -11
  130. package/dist/x/hono.d.ts +10 -11
  131. package/dist/x/sveltekit.d.cts +10 -11
  132. package/dist/x/sveltekit.d.ts +10 -11
  133. package/package.json +15 -14
  134. package/dist/assert_throws-BOO88avQ.js +0 -39
  135. package/dist/authdocloader-CEqdZdT7.cjs +0 -58
  136. package/dist/authdocloader-CZsCIRLV.js +0 -52
  137. package/dist/docloader-Buh0Ah9G.cjs +0 -4861
  138. package/dist/docloader-CxWcuWqQ.d.ts +0 -221
  139. package/dist/docloader-D-MrRyHl.d.cts +0 -219
  140. package/dist/docloader-DOmINJ1U.js +0 -4795
  141. package/dist/key-B2cp5-JF.js +0 -10
  142. package/dist/key-BR1W25rw.cjs +0 -290
  143. package/dist/key-BnjofJ4e.js +0 -260
  144. package/dist/key-DhflzsBJ.cjs +0 -10
  145. package/dist/key-WES6wszI.js +0 -10
  146. package/dist/lookup-CDOxr8vw.cjs +0 -137
  147. package/dist/lookup-D8tCnUj2.js +0 -131
  148. package/dist/lookup-VSVPBU3J.js +0 -331
  149. package/dist/middleware-9KSLASn7.js +0 -17
  150. package/dist/middleware-CH0PNtaj.cjs +0 -17
  151. package/dist/middleware-CrzCnpdt.js +0 -26
  152. package/dist/mod-CerN_Sza.d.ts +0 -104
  153. package/dist/mod-Cj1tHXBR.d.cts +0 -102
  154. package/dist/runtime/docloader.test.js +0 -522
  155. package/dist/runtime/key.test.d.ts +0 -3
  156. package/dist/runtime/key.test.js +0 -103
  157. package/dist/runtime/langstr.test.d.ts +0 -3
  158. package/dist/runtime/langstr.test.js +0 -39
  159. package/dist/runtime/link.test.d.ts +0 -3
  160. package/dist/runtime/link.test.js +0 -61
  161. package/dist/runtime/mod.cjs +0 -25
  162. package/dist/runtime/mod.d.cts +0 -6
  163. package/dist/runtime/mod.d.ts +0 -8
  164. package/dist/runtime/mod.js +0 -13
  165. package/dist/runtime/multibase/multibase.test.d.ts +0 -3
  166. package/dist/runtime/multibase/multibase.test.js +0 -358
  167. package/dist/runtime/url.test.d.ts +0 -3
  168. package/dist/runtime/url.test.js +0 -45
  169. /package/dist/{assert_not_equals-f3m3epl3.js → assert_not_equals-C80BG-_5.js} +0 -0
  170. /package/dist/{collection-CcnIw1qY.js → collection-BzWsN9pB.js} +0 -0
  171. /package/dist/{denokv-Bv33Xxea.js → denokv-CCssOzMJ.js} +0 -0
  172. /package/dist/{federation-H2_En3j5.cjs → federation-CRpdnOMS.cjs} +0 -0
  173. /package/dist/{federation-D1U8YY9t.js → federation-jcR8-ZxP.js} +0 -0
  174. /package/dist/{kv-C7sopW2E.d.ts → kv-BKNZ-Tb-.d.ts} +0 -0
  175. /package/dist/{kv-63Cil1MD.d.cts → kv-Bxr0Q87_.d.cts} +0 -0
  176. /package/dist/{mod-FZd39qVq.d.cts → mod-B-hUPT2N.d.cts} +0 -0
  177. /package/dist/{mod-1pDWKvUL.d.ts → mod-CVgZgliM.d.ts} +0 -0
  178. /package/dist/{mod-g0xFzAP9.d.ts → mod-xIj-IT58.d.ts} +0 -0
  179. /package/dist/{mq-CRGm1e_F.d.ts → mq-CUKlBw08.d.ts} +0 -0
  180. /package/dist/{mq-B7R1Q-M5.d.cts → mq-DcJPkXD5.d.cts} +0 -0
  181. /package/dist/{negotiation-5NPJL6zp.js → negotiation-C4nFufNk.js} +0 -0
  182. /package/dist/{nodeinfo-DfycQ8Wf.js → nodeinfo-BnthBobC.js} +0 -0
  183. /package/dist/{nodeinfo-Co9lJrWl.cjs → nodeinfo-CdN0rEnZ.cjs} +0 -0
  184. /package/dist/{retry-D4GJ670a.js → retry-CfF8Gn4d.js} +0 -0
  185. /package/dist/{runtime-DPYEDf-o.js → sig-C34-oHBl.js} +0 -0
  186. /package/dist/{runtime-C58AJWSv.cjs → sig-YYj5tCnr.cjs} +0 -0
  187. /package/dist/{std__assert-X-_kMxKM.js → std__assert-DWivtrGR.js} +0 -0
  188. /package/dist/{types-BSuWJsOm.js → types-C2XVl6gj.js} +0 -0
  189. /package/dist/{runtime → utils}/docloader.test.d.ts +0 -0
  190. /package/dist/{runtime/authdocloader.test.d.ts → utils/kv-cache.test.d.ts} +0 -0
  191. /package/dist/{sig-Cj3tk-ig.js → utils-D-Va7aXC.js} +0 -0
  192. /package/dist/{sig-ByHXzqUi.cjs → utils-DyRU1gdZ.cjs} +0 -0
  193. /package/dist/{webfinger-De_bU0iE.js → webfinger-C72Y8lrh.js} +0 -0
  194. /package/dist/{webfinger-BjOEdFPs.cjs → webfinger-vAtLmxOF.cjs} +0 -0
@@ -3,16 +3,266 @@
3
3
  const { URLPattern } = require("urlpattern-polyfill");
4
4
 
5
5
  const require_chunk = require('./chunk-DqRYRqnO.cjs');
6
- const require_docloader = require('./docloader-Buh0Ah9G.cjs');
7
- const require_actor = require('./actor-Bn2RCpws.cjs');
8
- const require_key = require('./key-BR1W25rw.cjs');
6
+ const require_lookup = require('./lookup-Doq5XdGY.cjs');
7
+ const require_actor = require('./actor-JG822JBi.cjs');
9
8
  const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
10
9
  const __opentelemetry_api = require_chunk.__toESM(require("@opentelemetry/api"));
11
- const byte_encodings_base64 = require_chunk.__toESM(require("byte-encodings/base64"));
10
+ const __fedify_vocab_runtime = require_chunk.__toESM(require("@fedify/vocab-runtime"));
12
11
  const byte_encodings_hex = require_chunk.__toESM(require("byte-encodings/hex"));
13
12
  const __opentelemetry_semantic_conventions = require_chunk.__toESM(require("@opentelemetry/semantic-conventions"));
13
+ const byte_encodings_base64 = require_chunk.__toESM(require("byte-encodings/base64"));
14
14
  const structured_field_values = require_chunk.__toESM(require("structured-field-values"));
15
15
 
16
+ //#region src/sig/key.ts
17
+ /**
18
+ * Checks if the given key is valid and supported. No-op if the key is valid,
19
+ * otherwise throws an error.
20
+ * @param key The key to check.
21
+ * @param type Which type of key to check. If not specified, the key can be
22
+ * either public or private.
23
+ * @throws {TypeError} If the key is invalid or unsupported.
24
+ */
25
+ function validateCryptoKey(key, type) {
26
+ if (type != null && key.type !== type) throw new TypeError(`The key is not a ${type} key.`);
27
+ if (!key.extractable) throw new TypeError("The key is not extractable.");
28
+ if (key.algorithm.name !== "RSASSA-PKCS1-v1_5" && key.algorithm.name !== "Ed25519") throw new TypeError("Currently only RSASSA-PKCS1-v1_5 and Ed25519 keys are supported. More algorithms will be added in the future!");
29
+ if (key.algorithm.name === "RSASSA-PKCS1-v1_5") {
30
+ const algorithm = key.algorithm;
31
+ if (algorithm.hash.name !== "SHA-256") throw new TypeError("For compatibility with the existing Fediverse software (e.g., Mastodon), hash algorithm for RSASSA-PKCS1-v1_5 keys must be SHA-256.");
32
+ }
33
+ }
34
+ /**
35
+ * Generates a key pair which is appropriate for Fedify.
36
+ * @param algorithm The algorithm to use. Currently only RSASSA-PKCS1-v1_5 and
37
+ * Ed25519 are supported.
38
+ * @returns The generated key pair.
39
+ * @throws {TypeError} If the algorithm is unsupported.
40
+ */
41
+ function generateCryptoKeyPair(algorithm) {
42
+ if (algorithm == null) (0, __logtape_logtape.getLogger)([
43
+ "fedify",
44
+ "sig",
45
+ "key"
46
+ ]).warn("No algorithm specified. Using RSASSA-PKCS1-v1_5 by default, but it is recommended to specify the algorithm explicitly as the parameter will be required in the future.");
47
+ if (algorithm == null || algorithm === "RSASSA-PKCS1-v1_5") return crypto.subtle.generateKey({
48
+ name: "RSASSA-PKCS1-v1_5",
49
+ modulusLength: 4096,
50
+ publicExponent: new Uint8Array([
51
+ 1,
52
+ 0,
53
+ 1
54
+ ]),
55
+ hash: "SHA-256"
56
+ }, true, ["sign", "verify"]);
57
+ else if (algorithm === "Ed25519") return crypto.subtle.generateKey("Ed25519", true, ["sign", "verify"]);
58
+ throw new TypeError("Unsupported algorithm: " + algorithm);
59
+ }
60
+ /**
61
+ * Exports a key in JWK format.
62
+ * @param key The key to export. Either public or private key.
63
+ * @returns The exported key in JWK format. The key is suitable for
64
+ * serialization and storage.
65
+ * @throws {TypeError} If the key is invalid or unsupported.
66
+ */
67
+ async function exportJwk(key) {
68
+ validateCryptoKey(key);
69
+ const jwk = await crypto.subtle.exportKey("jwk", key);
70
+ if (jwk.crv === "Ed25519") jwk.alg = "Ed25519";
71
+ return jwk;
72
+ }
73
+ /**
74
+ * Imports a key from JWK format.
75
+ * @param jwk The key in JWK format.
76
+ * @param type Which type of key to import, either `"public"` or `"private"`.
77
+ * @returns The imported key.
78
+ * @throws {TypeError} If the key is invalid or unsupported.
79
+ */
80
+ async function importJwk(jwk, type) {
81
+ let key;
82
+ if (jwk.kty === "RSA" && jwk.alg === "RS256") key = await crypto.subtle.importKey("jwk", jwk, {
83
+ name: "RSASSA-PKCS1-v1_5",
84
+ hash: "SHA-256"
85
+ }, true, type === "public" ? ["verify"] : ["sign"]);
86
+ else if (jwk.kty === "OKP" && jwk.crv === "Ed25519") {
87
+ if (navigator?.userAgent === "Cloudflare-Workers") {
88
+ jwk = { ...jwk };
89
+ delete jwk.alg;
90
+ }
91
+ key = await crypto.subtle.importKey("jwk", jwk, "Ed25519", true, type === "public" ? ["verify"] : ["sign"]);
92
+ } else throw new TypeError("Unsupported JWK format.");
93
+ validateCryptoKey(key, type);
94
+ return key;
95
+ }
96
+ /**
97
+ * Fetches a {@link CryptographicKey} or {@link Multikey} from the given URL.
98
+ * If the given URL contains an {@link Actor} object, it tries to find
99
+ * the corresponding key in the `publicKey` or `assertionMethod` property.
100
+ * @template T The type of the key to fetch. Either {@link CryptographicKey}
101
+ * or {@link Multikey}.
102
+ * @param keyId The URL of the key.
103
+ * @param cls The class of the key to fetch. Either {@link CryptographicKey}
104
+ * or {@link Multikey}.
105
+ * @param options Options for fetching the key. See {@link FetchKeyOptions}.
106
+ * @returns The fetched key or `null` if the key is not found.
107
+ * @since 1.3.0
108
+ */
109
+ function fetchKey(keyId, cls, options = {}) {
110
+ const tracerProvider = options.tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
111
+ const tracer = tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
112
+ keyId = typeof keyId === "string" ? new URL(keyId) : keyId;
113
+ return tracer.startActiveSpan("activitypub.fetch_key", {
114
+ kind: __opentelemetry_api.SpanKind.CLIENT,
115
+ attributes: {
116
+ "http.method": "GET",
117
+ "url.full": keyId.href,
118
+ "url.scheme": keyId.protocol.replace(/:$/, ""),
119
+ "url.domain": keyId.hostname,
120
+ "url.path": keyId.pathname,
121
+ "url.query": keyId.search.replace(/^\?/, ""),
122
+ "url.fragment": keyId.hash.replace(/^#/, "")
123
+ }
124
+ }, async (span) => {
125
+ try {
126
+ const result = await fetchKeyInternal(keyId, cls, options);
127
+ span.setAttribute("activitypub.actor.key.cached", result.cached);
128
+ return result;
129
+ } catch (e) {
130
+ span.setStatus({
131
+ code: __opentelemetry_api.SpanStatusCode.ERROR,
132
+ message: String(e)
133
+ });
134
+ throw e;
135
+ } finally {
136
+ span.end();
137
+ }
138
+ });
139
+ }
140
+ async function fetchKeyInternal(keyId, cls, { documentLoader, contextLoader, keyCache, tracerProvider } = {}) {
141
+ const logger = (0, __logtape_logtape.getLogger)([
142
+ "fedify",
143
+ "sig",
144
+ "key"
145
+ ]);
146
+ const cacheKey = typeof keyId === "string" ? new URL(keyId) : keyId;
147
+ keyId = typeof keyId === "string" ? keyId : keyId.href;
148
+ if (keyCache != null) {
149
+ const cachedKey = await keyCache.get(cacheKey);
150
+ if (cachedKey instanceof cls && cachedKey.publicKey != null) {
151
+ logger.debug("Key {keyId} found in cache.", { keyId });
152
+ return {
153
+ key: cachedKey,
154
+ cached: true
155
+ };
156
+ } else if (cachedKey === null) {
157
+ logger.debug("Entry {keyId} found in cache, but it is unavailable.", { keyId });
158
+ return {
159
+ key: null,
160
+ cached: true
161
+ };
162
+ }
163
+ }
164
+ logger.debug("Fetching key {keyId} to verify signature...", { keyId });
165
+ let document;
166
+ try {
167
+ const remoteDocument = await (documentLoader ?? (0, __fedify_vocab_runtime.getDocumentLoader)())(keyId);
168
+ document = remoteDocument.document;
169
+ } catch (_) {
170
+ logger.debug("Failed to fetch key {keyId}.", { keyId });
171
+ await keyCache?.set(cacheKey, null);
172
+ return {
173
+ key: null,
174
+ cached: false
175
+ };
176
+ }
177
+ let object;
178
+ try {
179
+ object = await require_actor.Object.fromJsonLd(document, {
180
+ documentLoader,
181
+ contextLoader,
182
+ tracerProvider
183
+ });
184
+ } catch (e) {
185
+ if (!(e instanceof TypeError)) throw e;
186
+ try {
187
+ object = await cls.fromJsonLd(document, {
188
+ documentLoader,
189
+ contextLoader,
190
+ tracerProvider
191
+ });
192
+ } catch (e$1) {
193
+ if (e$1 instanceof TypeError) {
194
+ logger.debug("Failed to verify; key {keyId} returned an invalid object.", { keyId });
195
+ await keyCache?.set(cacheKey, null);
196
+ return {
197
+ key: null,
198
+ cached: false
199
+ };
200
+ }
201
+ throw e$1;
202
+ }
203
+ }
204
+ let key = null;
205
+ if (object instanceof cls) key = object;
206
+ else if (require_actor.isActor(object)) {
207
+ const keys = cls === require_actor.CryptographicKey ? object.getPublicKeys({
208
+ documentLoader,
209
+ contextLoader,
210
+ tracerProvider
211
+ }) : object.getAssertionMethods({
212
+ documentLoader,
213
+ contextLoader,
214
+ tracerProvider
215
+ });
216
+ let length = 0;
217
+ let lastKey = null;
218
+ for await (const k of keys) {
219
+ length++;
220
+ lastKey = k;
221
+ if (k.id?.href === keyId) {
222
+ key = k;
223
+ break;
224
+ }
225
+ }
226
+ const keyIdUrl = new URL(keyId);
227
+ if (key == null && keyIdUrl.hash === "" && length === 1) key = lastKey;
228
+ if (key == null) {
229
+ logger.debug("Failed to verify; object {keyId} returned an {actorType}, but has no key matching {keyId}.", {
230
+ keyId,
231
+ actorType: object.constructor.name
232
+ });
233
+ await keyCache?.set(cacheKey, null);
234
+ return {
235
+ key: null,
236
+ cached: false
237
+ };
238
+ }
239
+ } else {
240
+ logger.debug("Failed to verify; key {keyId} returned an invalid object.", { keyId });
241
+ await keyCache?.set(cacheKey, null);
242
+ return {
243
+ key: null,
244
+ cached: false
245
+ };
246
+ }
247
+ if (key.publicKey == null) {
248
+ logger.debug("Failed to verify; key {keyId} has no publicKeyPem field.", { keyId });
249
+ await keyCache?.set(cacheKey, null);
250
+ return {
251
+ key: null,
252
+ cached: false
253
+ };
254
+ }
255
+ if (keyCache != null) {
256
+ await keyCache.set(cacheKey, key);
257
+ logger.debug("Key {keyId} cached.", { keyId });
258
+ }
259
+ return {
260
+ key,
261
+ cached: false
262
+ };
263
+ }
264
+
265
+ //#endregion
16
266
  //#region src/sig/http.ts
17
267
  /**
18
268
  * Signs a request using the given private key.
@@ -24,9 +274,9 @@ const structured_field_values = require_chunk.__toESM(require("structured-field-
24
274
  * @throws {TypeError} If the private key is invalid or unsupported.
25
275
  */
26
276
  async function signRequest(request, privateKey, keyId, options = {}) {
27
- require_key.validateCryptoKey(privateKey, "private");
277
+ validateCryptoKey(privateKey, "private");
28
278
  const tracerProvider = options.tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
29
- const tracer = tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
279
+ const tracer = tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
30
280
  return await tracer.startActiveSpan("http_signatures.sign", async (span) => {
31
281
  try {
32
282
  const spec = options.spec ?? "draft-cavage-http-signatures-12";
@@ -255,7 +505,7 @@ const supportedHashAlgorithms = {
255
505
  */
256
506
  async function verifyRequest(request, options = {}) {
257
507
  const tracerProvider = options.tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
258
- const tracer = tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
508
+ const tracer = tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
259
509
  return await tracer.startActiveSpan("http_signatures.verify", async (span) => {
260
510
  if (span.isRecording()) {
261
511
  span.setAttribute(__opentelemetry_semantic_conventions.ATTR_HTTP_REQUEST_METHOD, request.method);
@@ -427,7 +677,7 @@ async function verifyRequestDraft(request, span, { documentLoader, contextLoader
427
677
  const { keyId, headers, signature } = sigValues;
428
678
  span?.setAttribute("http_signatures.key_id", keyId);
429
679
  if ("algorithm" in sigValues) span?.setAttribute("http_signatures.algorithm", sigValues.algorithm);
430
- const { key, cached } = await require_key.fetchKey(new URL(keyId), require_actor.CryptographicKey, {
680
+ const { key, cached } = await fetchKey(new URL(keyId), require_actor.CryptographicKey, {
431
681
  documentLoader,
432
682
  contextLoader,
433
683
  keyCache,
@@ -620,7 +870,7 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
620
870
  }
621
871
  span?.setAttribute("http_signatures.key_id", sigInput.keyId);
622
872
  span?.setAttribute("http_signatures.created", sigInput.created.toString());
623
- const { key, cached } = await require_key.fetchKey(new URL(sigInput.keyId), require_actor.CryptographicKey, {
873
+ const { key, cached } = await fetchKey(new URL(sigInput.keyId), require_actor.CryptographicKey, {
624
874
  documentLoader,
625
875
  contextLoader,
626
876
  keyCache,
@@ -812,12 +1062,42 @@ Object.defineProperty(exports, 'doubleKnock', {
812
1062
  return doubleKnock;
813
1063
  }
814
1064
  });
1065
+ Object.defineProperty(exports, 'exportJwk', {
1066
+ enumerable: true,
1067
+ get: function () {
1068
+ return exportJwk;
1069
+ }
1070
+ });
1071
+ Object.defineProperty(exports, 'fetchKey', {
1072
+ enumerable: true,
1073
+ get: function () {
1074
+ return fetchKey;
1075
+ }
1076
+ });
1077
+ Object.defineProperty(exports, 'generateCryptoKeyPair', {
1078
+ enumerable: true,
1079
+ get: function () {
1080
+ return generateCryptoKeyPair;
1081
+ }
1082
+ });
1083
+ Object.defineProperty(exports, 'importJwk', {
1084
+ enumerable: true,
1085
+ get: function () {
1086
+ return importJwk;
1087
+ }
1088
+ });
815
1089
  Object.defineProperty(exports, 'signRequest', {
816
1090
  enumerable: true,
817
1091
  get: function () {
818
1092
  return signRequest;
819
1093
  }
820
1094
  });
1095
+ Object.defineProperty(exports, 'validateCryptoKey', {
1096
+ enumerable: true,
1097
+ get: function () {
1098
+ return validateCryptoKey;
1099
+ }
1100
+ });
821
1101
  Object.defineProperty(exports, 'verifyRequest', {
822
1102
  enumerable: true,
823
1103
  get: function () {
@@ -3,8 +3,8 @@
3
3
  import { URLPattern } from "urlpattern-polyfill";
4
4
  globalThis.addEventListener = () => {};
5
5
 
6
- import { CryptographicKey, deno_default } from "./type-D_8QzkEn.js";
7
- import { fetchKey, validateCryptoKey } from "./key-CIIkeide.js";
6
+ import { CryptographicKey, deno_default } from "./lookup-CxJLpHHf.js";
7
+ import { fetchKey, validateCryptoKey } from "./key-CcqQC_vj.js";
8
8
  import { getLogger } from "@logtape/logtape";
9
9
  import { SpanStatusCode, trace } from "@opentelemetry/api";
10
10
  import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
@@ -1,5 +1,5 @@
1
- import { DocumentLoader } from "./docloader-D-MrRyHl.cjs";
2
- import { CryptographicKey, Multikey } from "./vocab-Dw1-yVGg.cjs";
1
+ import { CryptographicKey, Multikey } from "./vocab-CeDBzu-f.cjs";
2
+ import { DocumentLoader } from "@fedify/vocab-runtime";
3
3
  import { TracerProvider } from "@opentelemetry/api";
4
4
 
5
5
  //#region src/sig/key.d.ts
@@ -3,7 +3,7 @@
3
3
  import { URLPattern } from "urlpattern-polyfill";
4
4
  globalThis.addEventListener = () => {};
5
5
 
6
- import { Activity, deno_default, getTypeId } from "./type-D_8QzkEn.js";
6
+ import { Activity, deno_default, getTypeId } from "./lookup-CxJLpHHf.js";
7
7
  import { getLogger } from "@logtape/logtape";
8
8
  import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
9
9
 
@@ -3,8 +3,9 @@
3
3
  import { URLPattern } from "urlpattern-polyfill";
4
4
  globalThis.addEventListener = () => {};
5
5
 
6
- import { CryptographicKey, Object as Object$1, deno_default, getDocumentLoader } from "./type-D_8QzkEn.js";
7
- import { isActor } from "./actor-dO7jHa6A.js";
6
+ import { CryptographicKey, Object as Object$1, deno_default } from "./lookup-CxJLpHHf.js";
7
+ import { isActor } from "./actor-CRS7Dbo1.js";
8
+ import { getDocumentLoader } from "@fedify/vocab-runtime";
8
9
  import { getLogger } from "@logtape/logtape";
9
10
  import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
10
11
 
@@ -3,7 +3,7 @@
3
3
  import { URLPattern } from "urlpattern-polyfill";
4
4
  globalThis.addEventListener = () => {};
5
5
 
6
- import { CryptographicKey, Multikey } from "./type-D_8QzkEn.js";
6
+ import { CryptographicKey, Multikey } from "./lookup-CxJLpHHf.js";
7
7
 
8
8
  //#region src/federation/keycache.ts
9
9
  var KvKeyCache = class {
@@ -3,7 +3,8 @@
3
3
  import { URLPattern } from "urlpattern-polyfill";
4
4
  globalThis.addEventListener = () => {};
5
5
 
6
- import { CryptographicKey, Multikey, importSpki } from "./type-D_8QzkEn.js";
6
+ import { CryptographicKey, Multikey } from "./lookup-CxJLpHHf.js";
7
+ import { importSpki } from "@fedify/vocab-runtime";
7
8
 
8
9
  //#region src/testing/keys.ts
9
10
  const rsaPublicKey1 = new CryptographicKey({
@@ -0,0 +1,121 @@
1
+
2
+ import { Temporal } from "@js-temporal/polyfill";
3
+ import { URLPattern } from "urlpattern-polyfill";
4
+
5
+ import { doubleKnock, validateCryptoKey } from "./http-BPsXiq3Y.js";
6
+ import { getLogger } from "@logtape/logtape";
7
+ import { UrlError, createActivityPubRequest, getDocumentLoader, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";
8
+ import { curry } from "es-toolkit";
9
+
10
+ //#region src/utils/docloader.ts
11
+ const logger$1 = getLogger([
12
+ "fedify",
13
+ "utils",
14
+ "docloader"
15
+ ]);
16
+ /**
17
+ * Gets an authenticated {@link DocumentLoader} for the given identity.
18
+ * Note that an authenticated document loader intentionally does not cache
19
+ * the fetched documents.
20
+ * @param identity The identity to get the document loader for.
21
+ * The actor's key pair.
22
+ * @param options The options for the document loader.
23
+ * @returns The authenticated document loader.
24
+ * @throws {TypeError} If the key is invalid or unsupported.
25
+ * @since 0.4.0
26
+ */
27
+ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, userAgent, specDeterminer, tracerProvider } = {}) {
28
+ validateCryptoKey(identity.privateKey);
29
+ async function load(url, options) {
30
+ if (!allowPrivateAddress) try {
31
+ await validatePublicUrl(url);
32
+ } catch (error) {
33
+ if (error instanceof UrlError) logger$1.error("Disallowed private URL: {url}", {
34
+ url,
35
+ error
36
+ });
37
+ throw error;
38
+ }
39
+ const originalRequest = createActivityPubRequest(url, { userAgent });
40
+ const response = await doubleKnock(originalRequest, identity, {
41
+ specDeterminer,
42
+ log: curry(logRequest)(logger$1),
43
+ tracerProvider,
44
+ signal: options?.signal
45
+ });
46
+ return getRemoteDocument(url, response, load);
47
+ }
48
+ return load;
49
+ }
50
+ const _fetchDocumentLoader = getDocumentLoader();
51
+ const _fetchDocumentLoader_allowPrivateAddress = getDocumentLoader({ allowPrivateAddress: true });
52
+
53
+ //#endregion
54
+ //#region src/utils/kv-cache.ts
55
+ const logger = getLogger([
56
+ "fedify",
57
+ "utils",
58
+ "kv-cache"
59
+ ]);
60
+ /**
61
+ * Decorates a {@link DocumentLoader} with a cache backed by a {@link Deno.Kv}.
62
+ * @param parameters The parameters for the cache.
63
+ * @returns The decorated document loader which is cache-enabled.
64
+ */
65
+ function kvCache({ loader, kv, prefix, rules }) {
66
+ const keyPrefix = prefix ?? ["_fedify", "remoteDocument"];
67
+ rules ??= [[new URLPattern({}), Temporal.Duration.from({ minutes: 5 })]];
68
+ for (const [p, duration] of rules) if (Temporal.Duration.compare(duration, { days: 30 }) > 0) throw new TypeError("The maximum cache duration is 30 days: " + (p instanceof URLPattern ? `${p.protocol}://${p.username}:${p.password}@${p.hostname}:${p.port}/${p.pathname}?${p.search}#${p.hash}` : p.toString()));
69
+ return async (url, options) => {
70
+ if (url in preloadedContexts) {
71
+ logger.debug("Using preloaded context: {url}.", { url });
72
+ return {
73
+ contextUrl: null,
74
+ document: preloadedContexts[url],
75
+ documentUrl: url
76
+ };
77
+ }
78
+ const match = matchRule(url, rules);
79
+ if (match == null) return await loader(url, options);
80
+ const key = [...keyPrefix, url];
81
+ let cache = void 0;
82
+ try {
83
+ cache = await kv.get(key);
84
+ } catch (error) {
85
+ if (error instanceof Error) logger.warn("Failed to get the document of {url} from the KV cache: {error}", {
86
+ url,
87
+ error
88
+ });
89
+ }
90
+ if (cache == null) {
91
+ const remoteDoc = await loader(url, options);
92
+ try {
93
+ await kv.set(key, remoteDoc, { ttl: match });
94
+ } catch (error) {
95
+ logger.warn("Failed to save the document of {url} to the KV cache: {error}", {
96
+ url,
97
+ error
98
+ });
99
+ }
100
+ return remoteDoc;
101
+ }
102
+ return cache;
103
+ };
104
+ }
105
+ function matchRule(url, rules) {
106
+ for (const [pattern, duration] of rules) {
107
+ if (typeof pattern === "string") {
108
+ if (url === pattern) return duration;
109
+ continue;
110
+ }
111
+ if (pattern instanceof URL) {
112
+ if (pattern.href == url) return duration;
113
+ continue;
114
+ }
115
+ if (pattern.test(url)) return duration;
116
+ }
117
+ return null;
118
+ }
119
+
120
+ //#endregion
121
+ export { getAuthenticatedDocumentLoader, kvCache };
@@ -0,0 +1,133 @@
1
+
2
+ const { Temporal } = require("@js-temporal/polyfill");
3
+ const { URLPattern } = require("urlpattern-polyfill");
4
+
5
+ const require_chunk = require('./chunk-DqRYRqnO.cjs');
6
+ const require_http = require('./http-CPqfuthT.cjs');
7
+ const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
8
+ const __fedify_vocab_runtime = require_chunk.__toESM(require("@fedify/vocab-runtime"));
9
+ const es_toolkit = require_chunk.__toESM(require("es-toolkit"));
10
+
11
+ //#region src/utils/docloader.ts
12
+ const logger$1 = (0, __logtape_logtape.getLogger)([
13
+ "fedify",
14
+ "utils",
15
+ "docloader"
16
+ ]);
17
+ /**
18
+ * Gets an authenticated {@link DocumentLoader} for the given identity.
19
+ * Note that an authenticated document loader intentionally does not cache
20
+ * the fetched documents.
21
+ * @param identity The identity to get the document loader for.
22
+ * The actor's key pair.
23
+ * @param options The options for the document loader.
24
+ * @returns The authenticated document loader.
25
+ * @throws {TypeError} If the key is invalid or unsupported.
26
+ * @since 0.4.0
27
+ */
28
+ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, userAgent, specDeterminer, tracerProvider } = {}) {
29
+ require_http.validateCryptoKey(identity.privateKey);
30
+ async function load(url, options) {
31
+ if (!allowPrivateAddress) try {
32
+ await (0, __fedify_vocab_runtime.validatePublicUrl)(url);
33
+ } catch (error) {
34
+ if (error instanceof __fedify_vocab_runtime.UrlError) logger$1.error("Disallowed private URL: {url}", {
35
+ url,
36
+ error
37
+ });
38
+ throw error;
39
+ }
40
+ const originalRequest = (0, __fedify_vocab_runtime.createActivityPubRequest)(url, { userAgent });
41
+ const response = await require_http.doubleKnock(originalRequest, identity, {
42
+ specDeterminer,
43
+ log: (0, es_toolkit.curry)(__fedify_vocab_runtime.logRequest)(logger$1),
44
+ tracerProvider,
45
+ signal: options?.signal
46
+ });
47
+ return (0, __fedify_vocab_runtime.getRemoteDocument)(url, response, load);
48
+ }
49
+ return load;
50
+ }
51
+ const _fetchDocumentLoader = (0, __fedify_vocab_runtime.getDocumentLoader)();
52
+ const _fetchDocumentLoader_allowPrivateAddress = (0, __fedify_vocab_runtime.getDocumentLoader)({ allowPrivateAddress: true });
53
+
54
+ //#endregion
55
+ //#region src/utils/kv-cache.ts
56
+ const logger = (0, __logtape_logtape.getLogger)([
57
+ "fedify",
58
+ "utils",
59
+ "kv-cache"
60
+ ]);
61
+ /**
62
+ * Decorates a {@link DocumentLoader} with a cache backed by a {@link Deno.Kv}.
63
+ * @param parameters The parameters for the cache.
64
+ * @returns The decorated document loader which is cache-enabled.
65
+ */
66
+ function kvCache({ loader, kv, prefix, rules }) {
67
+ const keyPrefix = prefix ?? ["_fedify", "remoteDocument"];
68
+ rules ??= [[new URLPattern({}), Temporal.Duration.from({ minutes: 5 })]];
69
+ for (const [p, duration] of rules) if (Temporal.Duration.compare(duration, { days: 30 }) > 0) throw new TypeError("The maximum cache duration is 30 days: " + (p instanceof URLPattern ? `${p.protocol}://${p.username}:${p.password}@${p.hostname}:${p.port}/${p.pathname}?${p.search}#${p.hash}` : p.toString()));
70
+ return async (url, options) => {
71
+ if (url in __fedify_vocab_runtime.preloadedContexts) {
72
+ logger.debug("Using preloaded context: {url}.", { url });
73
+ return {
74
+ contextUrl: null,
75
+ document: __fedify_vocab_runtime.preloadedContexts[url],
76
+ documentUrl: url
77
+ };
78
+ }
79
+ const match = matchRule(url, rules);
80
+ if (match == null) return await loader(url, options);
81
+ const key = [...keyPrefix, url];
82
+ let cache = void 0;
83
+ try {
84
+ cache = await kv.get(key);
85
+ } catch (error) {
86
+ if (error instanceof Error) logger.warn("Failed to get the document of {url} from the KV cache: {error}", {
87
+ url,
88
+ error
89
+ });
90
+ }
91
+ if (cache == null) {
92
+ const remoteDoc = await loader(url, options);
93
+ try {
94
+ await kv.set(key, remoteDoc, { ttl: match });
95
+ } catch (error) {
96
+ logger.warn("Failed to save the document of {url} to the KV cache: {error}", {
97
+ url,
98
+ error
99
+ });
100
+ }
101
+ return remoteDoc;
102
+ }
103
+ return cache;
104
+ };
105
+ }
106
+ function matchRule(url, rules) {
107
+ for (const [pattern, duration] of rules) {
108
+ if (typeof pattern === "string") {
109
+ if (url === pattern) return duration;
110
+ continue;
111
+ }
112
+ if (pattern instanceof URL) {
113
+ if (pattern.href == url) return duration;
114
+ continue;
115
+ }
116
+ if (pattern.test(url)) return duration;
117
+ }
118
+ return null;
119
+ }
120
+
121
+ //#endregion
122
+ Object.defineProperty(exports, 'getAuthenticatedDocumentLoader', {
123
+ enumerable: true,
124
+ get: function () {
125
+ return getAuthenticatedDocumentLoader;
126
+ }
127
+ });
128
+ Object.defineProperty(exports, 'kvCache', {
129
+ enumerable: true,
130
+ get: function () {
131
+ return kvCache;
132
+ }
133
+ });