@fedify/fedify 2.0.0-dev.1561 → 2.0.0-dev.158
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/LICENSE +1 -1
- package/README.md +40 -18
- package/dist/{assert_rejects-DiIiJbZn.js → assert_rejects-Ce45JcFg.js} +1 -1
- package/dist/{assert_is_error-BPGph1Jx.js → assert_throws-BNXdRGWP.js} +31 -1
- package/dist/{builder-C8mpxJD3.js → builder-BnWso6VP.js} +15 -8
- package/dist/chunk-DqRYRqnO.cjs +34 -0
- package/dist/client-94iWEfQa.d.cts +222 -0
- package/dist/{client-DF8anIB5.d.ts → client-BivSNrEg.d.ts} +3 -75
- package/dist/{client-DI0GS_3p.js → client-CgMTXmAD.js} +3 -22
- package/dist/compat/mod.cjs +10 -0
- package/dist/compat/mod.d.cts +7 -0
- package/dist/compat/mod.d.ts +6 -12
- package/dist/compat/mod.js +5 -5
- package/dist/compat/transformers.test.js +21 -20
- package/dist/compat-DmDDELst.cjs +4 -0
- package/dist/compat-nxUqe4Z-.js +4 -0
- package/dist/context-Bns6uTJq.js +109 -0
- package/dist/{context-9gCpIkiz.d.ts → context-CYZ2i00R.d.ts} +321 -129
- package/dist/context-D2MrtLch.d.cts +2447 -0
- package/dist/deno-CQV858ip.js +117 -0
- package/dist/{testing-DsuOHyiF.js → dist-B5f6a8Tt.js} +90 -111
- package/dist/{authdocloader-CN-tWO4K.js → docloader-Csc8gQux.js} +17 -8
- package/dist/{esm-CtgLSZwm.js → esm-DGl7uK1r.js} +32 -17
- package/dist/federation/builder.test.js +12 -13
- package/dist/federation/collection.test.js +6 -9
- package/dist/federation/handler.test.js +115 -148
- package/dist/federation/idempotency.test.js +202 -0
- package/dist/federation/inbox.test.js +5 -6
- package/dist/federation/keycache.test.js +4 -5
- package/dist/federation/kv.test.js +61 -9
- package/dist/federation/middleware.test.js +311 -131
- package/dist/federation/mod.cjs +25 -0
- package/dist/federation/mod.d.cts +7 -0
- package/dist/federation/mod.d.ts +7 -13
- package/dist/federation/mod.js +11 -16
- package/dist/federation/mq.test.js +9 -10
- package/dist/federation/negotiation.test.js +25 -0
- package/dist/federation/retry.test.js +2 -4
- package/dist/federation/router.test.js +6 -8
- package/dist/federation/send.test.js +55 -15
- package/dist/{webfinger/handler.test.js → federation/webfinger.test.js} +27 -26
- package/dist/federation-B431K2gm.cjs +266 -0
- package/dist/{federation-CMX7WzeL.js → federation-BbZwNNWj.js} +31 -9
- package/dist/{http-B_tXwHIe.js → http-BizGfAHd.js} +375 -15
- package/dist/{http-DTJgsmYR.js → http-CXG5ZFqn.js} +4 -3
- package/dist/http-ClB3pLcL.d.cts +253 -0
- package/dist/{http-DqSNLFNY.d.ts → http-DLBDPal9.d.ts} +2 -2
- package/dist/http-DbACqYyq.cjs +1222 -0
- package/dist/{inbox-Dx8EjUbq.js → inbox-B7ybw6fk.js} +25 -7
- package/dist/{key-olV6hEgm.js → key-C27c_yHR.js} +3 -2
- package/dist/{keycache-CExtp4Yl.js → keycache-DRxpZ5r9.js} +1 -1
- package/dist/{keys-O0-r0NpJ.js → keys-ZbcByPg9.js} +2 -1
- package/dist/{kv-C7sopW2E.d.ts → kv-CtOmTRNc.d.ts} +30 -1
- package/dist/kv-D8q9fLkA.d.cts +110 -0
- package/dist/{kv-CRZrzyXm.js → kv-QzKcOQgP.js} +22 -0
- package/dist/kv-cache-B7dwGQFA.js +122 -0
- package/dist/kv-cache-BEeqyGER.js +107 -0
- package/dist/kv-cache-rPOPQdj9.cjs +134 -0
- package/dist/{ld-DR6b11xZ.js → ld-D_Jn1aGa.js} +6 -4
- package/dist/middleware-BVqYHBWm.cjs +12 -0
- package/dist/{middleware-GT7W03qw.js → middleware-BjS6_zkf.js} +272 -271
- package/dist/middleware-CAJR7KGo.cjs +4242 -0
- package/dist/{middleware-CUw3Ys9y.js → middleware-ClkhKNXU.js} +230 -327
- package/dist/middleware-DSz6sI16.js +26 -0
- package/dist/middleware-OcaFHSk8.js +12 -0
- package/dist/mod-BrS8tiad.d.cts +266 -0
- package/dist/mod-C81L6_lQ.d.cts +1 -0
- package/dist/mod-CJgbdSqb.d.ts +109 -0
- package/dist/mod-CNNTHyBC.d.cts +80 -0
- package/dist/mod-CS-MS7gZ.d.cts +62 -0
- package/dist/{mod-Bqxcp7eN.d.ts → mod-D_cmv2il.d.ts} +4 -4
- package/dist/mod-DcPRcifg.d.cts +107 -0
- package/dist/mod-DqFSzJA0.d.ts +64 -0
- package/dist/{mod-Drmz72EK.d.ts → mod-jOa7W503.d.ts} +3 -3
- package/dist/mod.cjs +55 -0
- package/dist/mod.d.cts +11 -0
- package/dist/mod.d.ts +11 -17
- package/dist/mod.js +15 -21
- package/dist/negotiation-5NPJL6zp.js +71 -0
- package/dist/nodeinfo/client.test.js +29 -111
- package/dist/nodeinfo/handler.test.js +26 -26
- package/dist/nodeinfo/mod.cjs +10 -0
- package/dist/nodeinfo/mod.d.cts +3 -0
- package/dist/nodeinfo/mod.d.ts +3 -5
- package/dist/nodeinfo/mod.js +6 -7
- package/dist/nodeinfo/types.test.js +7 -15
- package/dist/nodeinfo-BlLsRSiT.js +4 -0
- package/dist/nodeinfo-DuMYTpbZ.cjs +4 -0
- package/dist/otel/exporter.test.js +899 -0
- package/dist/otel/mod.cjs +262 -0
- package/dist/otel/mod.d.cts +230 -0
- package/dist/otel/mod.d.ts +232 -0
- package/dist/otel/mod.js +261 -0
- package/dist/{owner-CQPnQVtf.d.ts → owner-BgI8C-VY.d.ts} +2 -3
- package/dist/owner-C-zfmVAD.d.cts +66 -0
- package/dist/{owner-BtFz-dZ-.js → owner-Dc8rUE-H.js} +45 -8
- package/dist/{proof-DsZjVJ0G.js → proof-BdNM3iSl.js} +4 -3
- package/dist/proof-Bx2JqJ-D.cjs +709 -0
- package/dist/{proof-DKDM7T5F.js → proof-CTYnbjx5.js} +53 -17
- package/dist/router-D9eI0s4b.js +118 -0
- package/dist/{send-s0_EjVhZ.js → send-DBRRqVMa.js} +9 -4
- package/dist/sig/http.test.js +12 -14
- package/dist/sig/key.test.js +9 -11
- package/dist/sig/ld.test.js +8 -10
- package/dist/sig/mod.cjs +26 -0
- package/dist/sig/mod.d.cts +4 -0
- package/dist/sig/mod.d.ts +3 -7
- package/dist/sig/mod.js +6 -10
- package/dist/sig/owner.test.js +33 -12
- package/dist/sig/proof.test.js +13 -14
- package/dist/sig-CwuONEzF.js +4 -0
- package/dist/sig-DeXX2xnj.cjs +4 -0
- package/dist/testing/mod.d.ts +180 -6946
- package/dist/testing/mod.js +4 -4
- package/dist/transformers-BjBg6Lag.cjs +116 -0
- package/dist/{transformers-Dna8Fg7k.js → transformers-N_ip_y4P.js} +5 -5
- package/dist/{types-BIgY6c-l.js → types-BEdCLHqP.js} +1 -3
- package/dist/types-Q-qkJXBV.cjs +315 -0
- package/dist/{types-CGB4mJU6.js → types-hKTi53FO.js} +8 -169
- package/dist/{runtime/authdocloader.test.js → utils/docloader.test.js} +13 -15
- package/dist/utils/kv-cache.test.js +211 -0
- package/dist/utils/mod.cjs +10 -0
- package/dist/utils/mod.d.cts +4 -0
- package/dist/utils/mod.d.ts +6 -0
- package/dist/utils/mod.js +9 -0
- package/dist/utils-Db0ZmjcD.cjs +4 -0
- package/dist/utils-Wranxuoe.js +4 -0
- package/package.json +69 -55
- package/dist/actor-C22bXuuC.d.ts +0 -130
- package/dist/actor-Qc3Ee6k1.js +0 -37311
- package/dist/actor-mhluotIb.js +0 -146
- package/dist/assert_throws-BOO88avQ.js +0 -39
- package/dist/authdocloader-Dp9WS-1G.js +0 -52
- package/dist/compat-Bb5myD13.js +0 -4
- package/dist/denokv-Bv33Xxea.js +0 -57
- package/dist/docloader-CxWcuWqQ.d.ts +0 -221
- package/dist/docloader-DIjo5mkd.js +0 -4615
- package/dist/fixtures/activitypub.academy/users/brauca_darradiul.json +0 -83
- package/dist/fixtures/example.com/announce.json +0 -6
- package/dist/fixtures/example.com/collection.json +0 -19
- package/dist/fixtures/example.com/create.json +0 -6
- package/dist/fixtures/example.com/cross-origin-actor.json +0 -6
- package/dist/fixtures/example.com/hong-gildong.json +0 -11
- package/dist/fixtures/example.com/invite.json +0 -7
- package/dist/fixtures/example.com/key.json +0 -7
- package/dist/fixtures/example.com/key2.json +0 -6
- package/dist/fixtures/example.com/object.json +0 -6
- package/dist/fixtures/example.com/orderedcollectionpage.json +0 -24
- package/dist/fixtures/example.com/paged/a.json +0 -13
- package/dist/fixtures/example.com/paged/b.json +0 -16
- package/dist/fixtures/example.com/paged-collection.json +0 -6
- package/dist/fixtures/example.com/person.json +0 -22
- package/dist/fixtures/example.com/person2.json +0 -40
- package/dist/fixtures/example.com/test.json +0 -5
- package/dist/fixtures/example.com/users/handle.json +0 -16
- package/dist/fixtures/example.com/wrong-type.json +0 -3
- package/dist/fixtures/oeee.cafe/ap/users/3609fd4e-d51d-4db8-9f04-4189815864dd.json +0 -24
- package/dist/fixtures/remote.domain/users/bob.json +0 -20
- package/dist/fixtures/server.example/users/alice.json +0 -20
- package/dist/fixtures/w3id.org/identity/v1.json +0 -152
- package/dist/fixtures/w3id.org/security/data-integrity/v1.json +0 -74
- package/dist/fixtures/w3id.org/security/multikey/v1.json +0 -35
- package/dist/fixtures/w3id.org/security/v1.json +0 -50
- package/dist/fixtures/wizard.casa/users/hongminhee.json +0 -69
- package/dist/fixtures/www.w3.org/ns/activitystreams.json +0 -379
- package/dist/fixtures/www.w3.org/ns/did/v1.json +0 -58
- package/dist/key-CGjkGPkw.js +0 -260
- package/dist/key-CaFAQSic.js +0 -10
- package/dist/key-DcnCet42.js +0 -10
- package/dist/lookup-B8Ld9P9G.js +0 -131
- package/dist/lookup-IyAhz9I6.js +0 -322
- package/dist/middleware-Bx6Sgkth.js +0 -26
- package/dist/middleware-DdRB1d4s.js +0 -17
- package/dist/mod-Cxt4Kpf6.d.ts +0 -291
- package/dist/mod-DBzN0aCM.d.ts +0 -115
- package/dist/mod-TFoH2Ql8.d.ts +0 -104
- package/dist/mod-g0xFzAP9.d.ts +0 -2
- package/dist/mq-CRGm1e_F.d.ts +0 -143
- package/dist/nodeinfo/semver.test.js +0 -143
- package/dist/nodeinfo-CyEbLjHs.js +0 -4
- package/dist/runtime/docloader.test.js +0 -522
- package/dist/runtime/key.test.js +0 -103
- package/dist/runtime/langstr.test.js +0 -39
- package/dist/runtime/mod.d.ts +0 -8
- package/dist/runtime/mod.js +0 -13
- package/dist/runtime/multibase/multibase.test.d.ts +0 -3
- package/dist/runtime/multibase/multibase.test.js +0 -358
- package/dist/runtime/url.test.d.ts +0 -3
- package/dist/runtime/url.test.js +0 -45
- package/dist/runtime-BSkOVUWM.js +0 -4
- package/dist/semver-dArNLkR9.js +0 -149
- package/dist/sig-BXJO--F9.js +0 -4
- package/dist/src/vocab/accept.yaml +0 -15
- package/dist/src/vocab/activity.yaml +0 -98
- package/dist/src/vocab/add.yaml +0 -16
- package/dist/src/vocab/announce.yaml +0 -30
- package/dist/src/vocab/application.yaml +0 -324
- package/dist/src/vocab/arrive.yaml +0 -15
- package/dist/src/vocab/article.yaml +0 -46
- package/dist/src/vocab/audio.yaml +0 -11
- package/dist/src/vocab/block.yaml +0 -16
- package/dist/src/vocab/chatmessage.yaml +0 -50
- package/dist/src/vocab/collection.yaml +0 -154
- package/dist/src/vocab/collectionpage.yaml +0 -55
- package/dist/src/vocab/create.yaml +0 -28
- package/dist/src/vocab/dataintegrityproof.yaml +0 -56
- package/dist/src/vocab/delete.yaml +0 -27
- package/dist/src/vocab/didservice.yaml +0 -22
- package/dist/src/vocab/dislike.yaml +0 -14
- package/dist/src/vocab/document.yaml +0 -31
- package/dist/src/vocab/emoji.yaml +0 -12
- package/dist/src/vocab/emojireact.yaml +0 -17
- package/dist/src/vocab/endpoints.yaml +0 -85
- package/dist/src/vocab/event.yaml +0 -11
- package/dist/src/vocab/export.yaml +0 -9
- package/dist/src/vocab/flag.yaml +0 -15
- package/dist/src/vocab/follow.yaml +0 -19
- package/dist/src/vocab/group.yaml +0 -324
- package/dist/src/vocab/hashtag.yaml +0 -14
- package/dist/src/vocab/ignore.yaml +0 -14
- package/dist/src/vocab/image.yaml +0 -9
- package/dist/src/vocab/intransitiveactivity.yaml +0 -15
- package/dist/src/vocab/invite.yaml +0 -14
- package/dist/src/vocab/join.yaml +0 -14
- package/dist/src/vocab/key.yaml +0 -28
- package/dist/src/vocab/leave.yaml +0 -14
- package/dist/src/vocab/like.yaml +0 -16
- package/dist/src/vocab/link.yaml +0 -101
- package/dist/src/vocab/listen.yaml +0 -12
- package/dist/src/vocab/mention.yaml +0 -9
- package/dist/src/vocab/move.yaml +0 -15
- package/dist/src/vocab/multikey.yaml +0 -36
- package/dist/src/vocab/note.yaml +0 -48
- package/dist/src/vocab/object.yaml +0 -404
- package/dist/src/vocab/offer.yaml +0 -15
- package/dist/src/vocab/orderedcollection.yaml +0 -39
- package/dist/src/vocab/orderedcollectionpage.yaml +0 -50
- package/dist/src/vocab/organization.yaml +0 -324
- package/dist/src/vocab/page.yaml +0 -11
- package/dist/src/vocab/person.yaml +0 -324
- package/dist/src/vocab/place.yaml +0 -75
- package/dist/src/vocab/profile.yaml +0 -26
- package/dist/src/vocab/propertyvalue.yaml +0 -32
- package/dist/src/vocab/question.yaml +0 -103
- package/dist/src/vocab/read.yaml +0 -13
- package/dist/src/vocab/reject.yaml +0 -14
- package/dist/src/vocab/relationship.yaml +0 -52
- package/dist/src/vocab/remove.yaml +0 -14
- package/dist/src/vocab/service.yaml +0 -324
- package/dist/src/vocab/source.yaml +0 -26
- package/dist/src/vocab/tentativeaccept.yaml +0 -14
- package/dist/src/vocab/tentativereject.yaml +0 -14
- package/dist/src/vocab/tombstone.yaml +0 -24
- package/dist/src/vocab/travel.yaml +0 -16
- package/dist/src/vocab/undo.yaml +0 -26
- package/dist/src/vocab/update.yaml +0 -58
- package/dist/src/vocab/video.yaml +0 -11
- package/dist/src/vocab/view.yaml +0 -13
- package/dist/testing/docloader.test.js +0 -24
- package/dist/type-BMGxK0zE.js +0 -42006
- package/dist/vocab/actor.test.d.ts +0 -3
- package/dist/vocab/actor.test.js +0 -5965
- package/dist/vocab/lookup.test.d.ts +0 -3
- package/dist/vocab/lookup.test.js +0 -206
- package/dist/vocab/mod.d.ts +0 -8
- package/dist/vocab/mod.js +0 -10
- package/dist/vocab/schema.yaml +0 -247
- package/dist/vocab/type.test.d.ts +0 -3
- package/dist/vocab/type.test.js +0 -25
- package/dist/vocab/vocab.test.d.ts +0 -3
- package/dist/vocab/vocab.test.js +0 -3363
- package/dist/vocab-CXuKLJjd.js +0 -246
- package/dist/vocab-SOE1ifCr.d.ts +0 -14634
- package/dist/webfinger/handler.test.d.ts +0 -3
- package/dist/webfinger/lookup.test.d.ts +0 -3
- package/dist/webfinger/lookup.test.js +0 -195
- package/dist/webfinger/mod.d.ts +0 -6
- package/dist/webfinger/mod.js +0 -9
- package/dist/webfinger-C3GIyXIg.js +0 -4
- package/dist/x/cfworkers.d.ts +0 -61
- package/dist/x/cfworkers.js +0 -98
- package/dist/x/cfworkers.test.d.ts +0 -3
- package/dist/x/cfworkers.test.js +0 -179
- package/dist/x/hono.d.ts +0 -56
- package/dist/x/hono.js +0 -60
- package/dist/x/sveltekit.d.ts +0 -48
- package/dist/x/sveltekit.js +0 -68
- /package/dist/{assert_not_equals-f3m3epl3.js → assert_not_equals-C80BG-_5.js} +0 -0
- /package/dist/{collection-CSzG2j1P.js → collection-CcnIw1qY.js} +0 -0
- /package/dist/{nodeinfo/semver.test.d.ts → federation/idempotency.test.d.ts} +0 -0
- /package/dist/{runtime/authdocloader.test.d.ts → federation/negotiation.test.d.ts} +0 -0
- /package/dist/{runtime/docloader.test.d.ts → federation/webfinger.test.d.ts} +0 -0
- /package/dist/{mod-1pDWKvUL.d.ts → mod-1E3W847c.d.ts} +0 -0
- /package/dist/{runtime/key.test.d.ts → otel/exporter.test.d.ts} +0 -0
- /package/dist/{std__assert-X-_kMxKM.js → std__assert-DWivtrGR.js} +0 -0
- /package/dist/{testing → utils}/docloader.test.d.ts +0 -0
- /package/dist/{runtime/langstr.test.d.ts → utils/kv-cache.test.d.ts} +0 -0
|
@@ -3,8 +3,9 @@
|
|
|
3
3
|
import { URLPattern } from "urlpattern-polyfill";
|
|
4
4
|
globalThis.addEventListener = () => {};
|
|
5
5
|
|
|
6
|
-
import {
|
|
6
|
+
import { deno_default } from "./deno-CQV858ip.js";
|
|
7
7
|
import { getLogger } from "@logtape/logtape";
|
|
8
|
+
import { Activity, getTypeId } from "@fedify/vocab";
|
|
8
9
|
import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
|
|
9
10
|
|
|
10
11
|
//#region src/federation/inbox.ts
|
|
@@ -41,17 +42,34 @@ var InboxListenerSet = class InboxListenerSet {
|
|
|
41
42
|
return this.dispatchWithClass(activity)?.listener ?? null;
|
|
42
43
|
}
|
|
43
44
|
};
|
|
44
|
-
async function routeActivity({ context: ctx, json, activity, recipient, inboxListeners, inboxContextFactory, inboxErrorHandler, kv, kvPrefixes, queue, span, tracerProvider }) {
|
|
45
|
+
async function routeActivity({ context: ctx, json, activity, recipient, inboxListeners, inboxContextFactory, inboxErrorHandler, kv, kvPrefixes, queue, span, tracerProvider, idempotencyStrategy }) {
|
|
45
46
|
const logger = getLogger([
|
|
46
47
|
"fedify",
|
|
47
48
|
"federation",
|
|
48
49
|
"inbox"
|
|
49
50
|
]);
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
51
|
+
let cacheKey = null;
|
|
52
|
+
if (activity.id != null) {
|
|
53
|
+
const inboxContext = inboxContextFactory(recipient, json, activity.id?.href, getTypeId(activity).href);
|
|
54
|
+
const strategy = idempotencyStrategy ?? "per-inbox";
|
|
55
|
+
let keyString;
|
|
56
|
+
if (typeof strategy === "function") {
|
|
57
|
+
const result = await strategy(inboxContext, activity);
|
|
58
|
+
keyString = result;
|
|
59
|
+
} else switch (strategy) {
|
|
60
|
+
case "global":
|
|
61
|
+
keyString = activity.id.href;
|
|
62
|
+
break;
|
|
63
|
+
case "per-origin":
|
|
64
|
+
keyString = `${ctx.origin}\n${activity.id.href}`;
|
|
65
|
+
break;
|
|
66
|
+
case "per-inbox":
|
|
67
|
+
keyString = `${ctx.origin}\n${activity.id.href}\n${recipient == null ? "sharedInbox" : `inbox\n${recipient}`}`;
|
|
68
|
+
break;
|
|
69
|
+
default: keyString = `${ctx.origin}\n${activity.id.href}`;
|
|
70
|
+
}
|
|
71
|
+
if (keyString != null) cacheKey = [...kvPrefixes.activityIdempotence, keyString];
|
|
72
|
+
}
|
|
55
73
|
if (cacheKey != null) {
|
|
56
74
|
const cached = await kv.get(cacheKey);
|
|
57
75
|
if (cached === true) {
|
|
@@ -3,9 +3,10 @@
|
|
|
3
3
|
import { URLPattern } from "urlpattern-polyfill";
|
|
4
4
|
globalThis.addEventListener = () => {};
|
|
5
5
|
|
|
6
|
-
import {
|
|
7
|
-
import { isActor } from "./actor-mhluotIb.js";
|
|
6
|
+
import { deno_default } from "./deno-CQV858ip.js";
|
|
8
7
|
import { getLogger } from "@logtape/logtape";
|
|
8
|
+
import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
|
|
9
|
+
import { getDocumentLoader } from "@fedify/vocab-runtime";
|
|
9
10
|
import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
|
|
10
11
|
|
|
11
12
|
//#region src/sig/key.ts
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
import { URLPattern } from "urlpattern-polyfill";
|
|
4
4
|
globalThis.addEventListener = () => {};
|
|
5
5
|
|
|
6
|
-
import { CryptographicKey, Multikey } from "
|
|
6
|
+
import { CryptographicKey, Multikey } from "@fedify/vocab";
|
|
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
|
|
6
|
+
import { CryptographicKey, Multikey } from "@fedify/vocab";
|
|
7
|
+
import { importSpki } from "@fedify/vocab-runtime";
|
|
7
8
|
|
|
8
9
|
//#region src/testing/keys.ts
|
|
9
10
|
const rsaPublicKey1 = new CryptographicKey({
|
|
@@ -19,6 +19,21 @@ interface KvStoreSetOptions {
|
|
|
19
19
|
*/
|
|
20
20
|
ttl?: Temporal.Duration;
|
|
21
21
|
}
|
|
22
|
+
/**
|
|
23
|
+
* An entry returned by the {@link KvStore.list} method.
|
|
24
|
+
*
|
|
25
|
+
* @since 1.10.0
|
|
26
|
+
*/
|
|
27
|
+
interface KvStoreListEntry {
|
|
28
|
+
/**
|
|
29
|
+
* The key of the entry.
|
|
30
|
+
*/
|
|
31
|
+
key: KvKey;
|
|
32
|
+
/**
|
|
33
|
+
* The value of the entry.
|
|
34
|
+
*/
|
|
35
|
+
value: unknown;
|
|
36
|
+
}
|
|
22
37
|
/**
|
|
23
38
|
* An abstract interface for a key–value store.
|
|
24
39
|
*
|
|
@@ -54,6 +69,16 @@ interface KvStore {
|
|
|
54
69
|
* @since 1.8.0
|
|
55
70
|
*/
|
|
56
71
|
cas?: (key: KvKey, expectedValue: unknown, newValue: unknown, options?: KvStoreSetOptions) => Promise<boolean>;
|
|
72
|
+
/**
|
|
73
|
+
* Lists all entries in the store that match the given prefix.
|
|
74
|
+
* If no prefix is given, all entries are returned.
|
|
75
|
+
* @param prefix The prefix to filter keys by. If not specified, all entries
|
|
76
|
+
* are returned.
|
|
77
|
+
* @returns An async iterable of entries matching the prefix.
|
|
78
|
+
* @since 1.10.0
|
|
79
|
+
* @since 2.0.0 This method is now required instead of optional.
|
|
80
|
+
*/
|
|
81
|
+
list(prefix?: KvKey): AsyncIterable<KvStoreListEntry>;
|
|
57
82
|
}
|
|
58
83
|
/**
|
|
59
84
|
* A key–value store that stores values in memory.
|
|
@@ -79,6 +104,10 @@ declare class MemoryKvStore implements KvStore {
|
|
|
79
104
|
* {@inheritDoc KvStore.cas}
|
|
80
105
|
*/
|
|
81
106
|
cas(key: KvKey, expectedValue: unknown, newValue: unknown, options?: KvStoreSetOptions): Promise<boolean>;
|
|
107
|
+
/**
|
|
108
|
+
* {@inheritDoc KvStore.list}
|
|
109
|
+
*/
|
|
110
|
+
list(prefix?: KvKey): AsyncIterable<KvStoreListEntry>;
|
|
82
111
|
}
|
|
83
112
|
//#endregion
|
|
84
|
-
export { KvKey, KvStore, KvStoreSetOptions, MemoryKvStore };
|
|
113
|
+
export { KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore };
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
//#region src/federation/kv.d.ts
|
|
2
|
+
/**
|
|
3
|
+
* A key for a key–value store. An array of one or more strings.
|
|
4
|
+
*
|
|
5
|
+
* @since 0.5.0
|
|
6
|
+
*/
|
|
7
|
+
type KvKey = readonly [string] | readonly [string, ...string[]];
|
|
8
|
+
/**
|
|
9
|
+
* Additional options for setting a value in a key–value store.
|
|
10
|
+
*
|
|
11
|
+
* @since 0.5.0
|
|
12
|
+
*/
|
|
13
|
+
interface KvStoreSetOptions {
|
|
14
|
+
/**
|
|
15
|
+
* The time-to-live (TTL) for the value.
|
|
16
|
+
*/
|
|
17
|
+
ttl?: Temporal.Duration;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* An entry returned by the {@link KvStore.list} method.
|
|
21
|
+
*
|
|
22
|
+
* @since 1.10.0
|
|
23
|
+
*/
|
|
24
|
+
interface KvStoreListEntry {
|
|
25
|
+
/**
|
|
26
|
+
* The key of the entry.
|
|
27
|
+
*/
|
|
28
|
+
key: KvKey;
|
|
29
|
+
/**
|
|
30
|
+
* The value of the entry.
|
|
31
|
+
*/
|
|
32
|
+
value: unknown;
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* An abstract interface for a key–value store.
|
|
36
|
+
*
|
|
37
|
+
* @since 0.5.0
|
|
38
|
+
*/
|
|
39
|
+
interface KvStore {
|
|
40
|
+
/**
|
|
41
|
+
* Gets the value for the given key.
|
|
42
|
+
* @param key The key to get the value for.
|
|
43
|
+
* @returns The value for the key, or `undefined` if the key does not exist.
|
|
44
|
+
* @template T The type of the value to get.
|
|
45
|
+
*/
|
|
46
|
+
get<T = unknown>(key: KvKey): Promise<T | undefined>;
|
|
47
|
+
/**
|
|
48
|
+
* Sets the value for the given key.
|
|
49
|
+
* @param key The key to set the value for.
|
|
50
|
+
* @param value The value to set.
|
|
51
|
+
* @param options Additional options for setting the value.
|
|
52
|
+
*/
|
|
53
|
+
set(key: KvKey, value: unknown, options?: KvStoreSetOptions): Promise<void>;
|
|
54
|
+
/**
|
|
55
|
+
* Deletes the value for the given key.
|
|
56
|
+
* @param key The key to delete.
|
|
57
|
+
*/
|
|
58
|
+
delete(key: KvKey): Promise<void>;
|
|
59
|
+
/**
|
|
60
|
+
* Compare-and-swap (CAS) operation for the key–value store.
|
|
61
|
+
* @param key The key to perform the CAS operation on.
|
|
62
|
+
* @param expectedValue The expected value for the key.
|
|
63
|
+
* @param newValue The new value to set if the expected value matches.
|
|
64
|
+
* @param options Additional options for setting the value.
|
|
65
|
+
* @return `true` if the CAS operation was successful, `false` otherwise.
|
|
66
|
+
* @since 1.8.0
|
|
67
|
+
*/
|
|
68
|
+
cas?: (key: KvKey, expectedValue: unknown, newValue: unknown, options?: KvStoreSetOptions) => Promise<boolean>;
|
|
69
|
+
/**
|
|
70
|
+
* Lists all entries in the store that match the given prefix.
|
|
71
|
+
* If no prefix is given, all entries are returned.
|
|
72
|
+
* @param prefix The prefix to filter keys by. If not specified, all entries
|
|
73
|
+
* are returned.
|
|
74
|
+
* @returns An async iterable of entries matching the prefix.
|
|
75
|
+
* @since 1.10.0
|
|
76
|
+
* @since 2.0.0 This method is now required instead of optional.
|
|
77
|
+
*/
|
|
78
|
+
list(prefix?: KvKey): AsyncIterable<KvStoreListEntry>;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* A key–value store that stores values in memory.
|
|
82
|
+
* Do not use this in production as it does not persist values.
|
|
83
|
+
*
|
|
84
|
+
* @since 0.5.0
|
|
85
|
+
*/
|
|
86
|
+
declare class MemoryKvStore implements KvStore {
|
|
87
|
+
#private;
|
|
88
|
+
/**
|
|
89
|
+
* {@inheritDoc KvStore.get}
|
|
90
|
+
*/
|
|
91
|
+
get<T = unknown>(key: KvKey): Promise<T | undefined>;
|
|
92
|
+
/**
|
|
93
|
+
* {@inheritDoc KvStore.set}
|
|
94
|
+
*/
|
|
95
|
+
set(key: KvKey, value: unknown, options?: KvStoreSetOptions): Promise<void>;
|
|
96
|
+
/**
|
|
97
|
+
* {@inheritDoc KvStore.delete}
|
|
98
|
+
*/
|
|
99
|
+
delete(key: KvKey): Promise<void>;
|
|
100
|
+
/**
|
|
101
|
+
* {@inheritDoc KvStore.cas}
|
|
102
|
+
*/
|
|
103
|
+
cas(key: KvKey, expectedValue: unknown, newValue: unknown, options?: KvStoreSetOptions): Promise<boolean>;
|
|
104
|
+
/**
|
|
105
|
+
* {@inheritDoc KvStore.list}
|
|
106
|
+
*/
|
|
107
|
+
list(prefix?: KvKey): AsyncIterable<KvStoreListEntry>;
|
|
108
|
+
}
|
|
109
|
+
//#endregion
|
|
110
|
+
export { KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore };
|
|
@@ -68,6 +68,28 @@ var MemoryKvStore = class {
|
|
|
68
68
|
this.#values[encodedKey] = [newValue, expiration];
|
|
69
69
|
return Promise.resolve(true);
|
|
70
70
|
}
|
|
71
|
+
/**
|
|
72
|
+
* {@inheritDoc KvStore.list}
|
|
73
|
+
*/
|
|
74
|
+
async *list(prefix) {
|
|
75
|
+
const now = Temporal.Now.instant();
|
|
76
|
+
for (const [encodedKey, entry] of Object.entries(this.#values)) {
|
|
77
|
+
const key = JSON.parse(encodedKey);
|
|
78
|
+
if (prefix != null) {
|
|
79
|
+
if (key.length < prefix.length) continue;
|
|
80
|
+
if (!prefix.every((p, i) => key[i] === p)) continue;
|
|
81
|
+
}
|
|
82
|
+
const [value, expiration] = entry;
|
|
83
|
+
if (expiration != null && now.until(expiration).sign < 0) {
|
|
84
|
+
delete this.#values[encodedKey];
|
|
85
|
+
continue;
|
|
86
|
+
}
|
|
87
|
+
yield {
|
|
88
|
+
key,
|
|
89
|
+
value
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
}
|
|
71
93
|
};
|
|
72
94
|
|
|
73
95
|
//#endregion
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
|
|
2
|
+
import { Temporal } from "@js-temporal/polyfill";
|
|
3
|
+
import { URLPattern } from "urlpattern-polyfill";
|
|
4
|
+
|
|
5
|
+
import { doubleKnock, validateCryptoKey } from "./http-BizGfAHd.js";
|
|
6
|
+
import { getLogger } from "@logtape/logtape";
|
|
7
|
+
import { curry } from "es-toolkit";
|
|
8
|
+
import { UrlError, createActivityPubRequest, getDocumentLoader, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";
|
|
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, d] of rules) {
|
|
107
|
+
const duration = d instanceof Temporal.Duration ? d : Temporal.Duration.from(d);
|
|
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
|
+
export { getAuthenticatedDocumentLoader, kvCache };
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
|
|
2
|
+
import { Temporal } from "@js-temporal/polyfill";
|
|
3
|
+
import { URLPattern } from "urlpattern-polyfill";
|
|
4
|
+
globalThis.addEventListener = () => {};
|
|
5
|
+
|
|
6
|
+
import { getLogger } from "@logtape/logtape";
|
|
7
|
+
import { preloadedContexts } from "@fedify/vocab-runtime";
|
|
8
|
+
|
|
9
|
+
//#region src/utils/kv-cache.ts
|
|
10
|
+
const logger = getLogger([
|
|
11
|
+
"fedify",
|
|
12
|
+
"utils",
|
|
13
|
+
"kv-cache"
|
|
14
|
+
]);
|
|
15
|
+
/**
|
|
16
|
+
* A mock implementation of a key–value store for testing purposes.
|
|
17
|
+
*/
|
|
18
|
+
var MockKvStore = class {
|
|
19
|
+
#values = {};
|
|
20
|
+
get(key) {
|
|
21
|
+
return Promise.resolve(this.#values[JSON.stringify(key)]);
|
|
22
|
+
}
|
|
23
|
+
set(key, value, _options) {
|
|
24
|
+
this.#values[JSON.stringify(key)] = value;
|
|
25
|
+
return Promise.resolve();
|
|
26
|
+
}
|
|
27
|
+
async delete(_) {}
|
|
28
|
+
cas(..._) {
|
|
29
|
+
return Promise.resolve(false);
|
|
30
|
+
}
|
|
31
|
+
async *list(prefix) {
|
|
32
|
+
for (const [encodedKey, value] of Object.entries(this.#values)) {
|
|
33
|
+
const key = JSON.parse(encodedKey);
|
|
34
|
+
if (prefix != null) {
|
|
35
|
+
if (key.length < prefix.length) continue;
|
|
36
|
+
if (!prefix.every((p, i) => key[i] === p)) continue;
|
|
37
|
+
}
|
|
38
|
+
yield {
|
|
39
|
+
key,
|
|
40
|
+
value
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
};
|
|
45
|
+
/**
|
|
46
|
+
* Decorates a {@link DocumentLoader} with a cache backed by a {@link Deno.Kv}.
|
|
47
|
+
* @param parameters The parameters for the cache.
|
|
48
|
+
* @returns The decorated document loader which is cache-enabled.
|
|
49
|
+
*/
|
|
50
|
+
function kvCache({ loader, kv, prefix, rules }) {
|
|
51
|
+
const keyPrefix = prefix ?? ["_fedify", "remoteDocument"];
|
|
52
|
+
rules ??= [[new URLPattern({}), Temporal.Duration.from({ minutes: 5 })]];
|
|
53
|
+
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()));
|
|
54
|
+
return async (url, options) => {
|
|
55
|
+
if (url in preloadedContexts) {
|
|
56
|
+
logger.debug("Using preloaded context: {url}.", { url });
|
|
57
|
+
return {
|
|
58
|
+
contextUrl: null,
|
|
59
|
+
document: preloadedContexts[url],
|
|
60
|
+
documentUrl: url
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
const match = matchRule(url, rules);
|
|
64
|
+
if (match == null) return await loader(url, options);
|
|
65
|
+
const key = [...keyPrefix, url];
|
|
66
|
+
let cache = void 0;
|
|
67
|
+
try {
|
|
68
|
+
cache = await kv.get(key);
|
|
69
|
+
} catch (error) {
|
|
70
|
+
if (error instanceof Error) logger.warn("Failed to get the document of {url} from the KV cache: {error}", {
|
|
71
|
+
url,
|
|
72
|
+
error
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
if (cache == null) {
|
|
76
|
+
const remoteDoc = await loader(url, options);
|
|
77
|
+
try {
|
|
78
|
+
await kv.set(key, remoteDoc, { ttl: match });
|
|
79
|
+
} catch (error) {
|
|
80
|
+
logger.warn("Failed to save the document of {url} to the KV cache: {error}", {
|
|
81
|
+
url,
|
|
82
|
+
error
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
return remoteDoc;
|
|
86
|
+
}
|
|
87
|
+
return cache;
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
function matchRule(url, rules) {
|
|
91
|
+
for (const [pattern, d] of rules) {
|
|
92
|
+
const duration = d instanceof Temporal.Duration ? d : Temporal.Duration.from(d);
|
|
93
|
+
if (typeof pattern === "string") {
|
|
94
|
+
if (url === pattern) return duration;
|
|
95
|
+
continue;
|
|
96
|
+
}
|
|
97
|
+
if (pattern instanceof URL) {
|
|
98
|
+
if (pattern.href == url) return duration;
|
|
99
|
+
continue;
|
|
100
|
+
}
|
|
101
|
+
if (pattern.test(url)) return duration;
|
|
102
|
+
}
|
|
103
|
+
return null;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
//#endregion
|
|
107
|
+
export { MockKvStore, kvCache };
|
|
@@ -0,0 +1,134 @@
|
|
|
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-DbACqYyq.cjs');
|
|
7
|
+
const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
|
|
8
|
+
const es_toolkit = require_chunk.__toESM(require("es-toolkit"));
|
|
9
|
+
const __fedify_vocab_runtime = require_chunk.__toESM(require("@fedify/vocab-runtime"));
|
|
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, d] of rules) {
|
|
108
|
+
const duration = d instanceof Temporal.Duration ? d : Temporal.Duration.from(d);
|
|
109
|
+
if (typeof pattern === "string") {
|
|
110
|
+
if (url === pattern) return duration;
|
|
111
|
+
continue;
|
|
112
|
+
}
|
|
113
|
+
if (pattern instanceof URL) {
|
|
114
|
+
if (pattern.href == url) return duration;
|
|
115
|
+
continue;
|
|
116
|
+
}
|
|
117
|
+
if (pattern.test(url)) return duration;
|
|
118
|
+
}
|
|
119
|
+
return null;
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
//#endregion
|
|
123
|
+
Object.defineProperty(exports, 'getAuthenticatedDocumentLoader', {
|
|
124
|
+
enumerable: true,
|
|
125
|
+
get: function () {
|
|
126
|
+
return getAuthenticatedDocumentLoader;
|
|
127
|
+
}
|
|
128
|
+
});
|
|
129
|
+
Object.defineProperty(exports, 'kvCache', {
|
|
130
|
+
enumerable: true,
|
|
131
|
+
get: function () {
|
|
132
|
+
return kvCache;
|
|
133
|
+
}
|
|
134
|
+
});
|
|
@@ -3,9 +3,11 @@
|
|
|
3
3
|
import { URLPattern } from "urlpattern-polyfill";
|
|
4
4
|
globalThis.addEventListener = () => {};
|
|
5
5
|
|
|
6
|
-
import {
|
|
7
|
-
import { fetchKey, validateCryptoKey } from "./key-
|
|
6
|
+
import { deno_default } from "./deno-CQV858ip.js";
|
|
7
|
+
import { fetchKey, validateCryptoKey } from "./key-C27c_yHR.js";
|
|
8
8
|
import { getLogger } from "@logtape/logtape";
|
|
9
|
+
import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
|
|
10
|
+
import { getDocumentLoader } from "@fedify/vocab-runtime";
|
|
9
11
|
import { SpanStatusCode, trace } from "@opentelemetry/api";
|
|
10
12
|
import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
|
|
11
13
|
import { encodeHex } from "byte-encodings/hex";
|
|
@@ -182,7 +184,7 @@ async function verifySignature(jsonLd, options = {}) {
|
|
|
182
184
|
const encoder = new TextEncoder();
|
|
183
185
|
const message = sigOptsHash + docHash;
|
|
184
186
|
const messageBytes = encoder.encode(message);
|
|
185
|
-
const verified = await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key.publicKey, signature, messageBytes);
|
|
187
|
+
const verified = await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key.publicKey, signature.slice(), messageBytes);
|
|
186
188
|
if (verified) return key;
|
|
187
189
|
if (cached) {
|
|
188
190
|
logger.debug("Failed to verify with the cached key {keyId}; signature {signatureValue} is invalid. Retrying with the freshly fetched key...", {
|
|
@@ -197,7 +199,7 @@ async function verifySignature(jsonLd, options = {}) {
|
|
|
197
199
|
}
|
|
198
200
|
});
|
|
199
201
|
if (key$1 == null) return null;
|
|
200
|
-
const verified$1 = await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key$1.publicKey, signature, messageBytes);
|
|
202
|
+
const verified$1 = await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key$1.publicKey, signature.slice(), messageBytes);
|
|
201
203
|
return verified$1 ? key$1 : null;
|
|
202
204
|
}
|
|
203
205
|
logger.debug("Failed to verify with the fetched key {keyId}; signature {signatureValue} is invalid. Check if the key is correct or if the signed message is correct. The message to sign is:\n{message}", {
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
|
|
2
|
+
const { Temporal } = require("@js-temporal/polyfill");
|
|
3
|
+
const { URLPattern } = require("urlpattern-polyfill");
|
|
4
|
+
|
|
5
|
+
require('./transformers-BjBg6Lag.cjs');
|
|
6
|
+
require('./http-DbACqYyq.cjs');
|
|
7
|
+
const require_middleware = require('./middleware-CAJR7KGo.cjs');
|
|
8
|
+
require('./proof-Bx2JqJ-D.cjs');
|
|
9
|
+
require('./types-Q-qkJXBV.cjs');
|
|
10
|
+
require('./kv-cache-rPOPQdj9.cjs');
|
|
11
|
+
|
|
12
|
+
exports.FederationImpl = require_middleware.FederationImpl;
|