@fedify/fedify 2.3.0-dev.1069 → 2.3.0-dev.1099

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 (113) hide show
  1. package/dist/{builder-DQ2zYTeA.mjs → builder-BkRRjxzb.mjs} +4 -4
  2. package/dist/{chunk-nlSIicah.js → chunk-CRNNMoPX.js} +2 -2
  3. package/dist/{chunk-QSgtlS85.mjs → chunk-DNRtMIoB.mjs} +1 -1
  4. package/dist/{client-z-8dc-e1.d.cts → client-CAM_bQXx.d.cts} +1 -0
  5. package/dist/{client-AtlibPOU.d.ts → client-CSddvgWN.d.ts} +1 -2
  6. package/dist/compat/mod.d.cts +2 -1
  7. package/dist/compat/mod.d.ts +2 -3
  8. package/dist/compat/mod.js +3 -3
  9. package/dist/compat/outgoing-jsonld.test.mjs +2 -2
  10. package/dist/compat/public-audience.test.mjs +2 -2
  11. package/dist/compat/transformers.test.mjs +2 -2
  12. package/dist/{context-7Azky82W.mjs → context-BAE7AKLA.mjs} +61 -3
  13. package/dist/{context-DrNqYkPw.d.ts → context-C0C_sRha.d.cts} +6 -7
  14. package/dist/{context-BKLGj9QO.d.cts → context-Dqgt8saU.d.ts} +6 -5
  15. package/dist/{deno-CFXqOz6w.mjs → deno-DBabeupC.mjs} +1 -1
  16. package/dist/{docloader-QNtAtTZF.mjs → docloader-DA5FzJOR.mjs} +3 -3
  17. package/dist/{esm-DhnRLoG9.mjs → esm-sdtqOUPu.mjs} +5 -7
  18. package/dist/{execAsync-eck5rbtb.mjs → execAsync-DCBrgFiV.mjs} +2 -2
  19. package/dist/federation/builder.test.mjs +3 -3
  20. package/dist/federation/handler.test.mjs +86 -4
  21. package/dist/federation/idempotency.test.mjs +3 -3
  22. package/dist/federation/inbox.test.mjs +1 -1
  23. package/dist/federation/keycache.test.mjs +1 -1
  24. package/dist/federation/middleware.test.mjs +387 -20
  25. package/dist/federation/mod.cjs +1 -1
  26. package/dist/federation/mod.d.cts +4 -3
  27. package/dist/federation/mod.d.ts +4 -5
  28. package/dist/federation/mod.js +2 -2
  29. package/dist/federation/mq.test.mjs +1 -1
  30. package/dist/federation/negotiation.test.mjs +1 -1
  31. package/dist/federation/router.test.mjs +1 -1
  32. package/dist/federation/send.test.mjs +133 -139
  33. package/dist/federation/webfinger.test.mjs +3 -3
  34. package/dist/{getMachineId-bsd-DqZ4QRFp.mjs → getMachineId-bsd-etIyxDet.mjs} +3 -3
  35. package/dist/{getMachineId-darwin-DMbbW3m7.mjs → getMachineId-darwin-D23zTf4g.mjs} +3 -3
  36. package/dist/{getMachineId-linux-lyeD2ug3.mjs → getMachineId-linux-ObI47Hql.mjs} +2 -2
  37. package/dist/{getMachineId-unsupported-JuKr57jY.mjs → getMachineId-unsupported-Ddu-PFeh.mjs} +2 -2
  38. package/dist/{getMachineId-win-Dxyf5pJq.mjs → getMachineId-win-Dpap6v5i.mjs} +3 -3
  39. package/dist/{http-QHJGzUe8.mjs → http-5G18W3NP.mjs} +59 -11
  40. package/dist/{http-CrGuipxe.d.cts → http-BDZeS5om.d.ts} +2 -1
  41. package/dist/{http-aQzN9Ayi.d.ts → http-C87EWkO0.d.cts} +2 -3
  42. package/dist/{http-D2EDlTr2.js → http-Dzy5c472.js} +58 -10
  43. package/dist/{http-e1wtIlFo.cjs → http-W2u_KBoQ.cjs} +57 -9
  44. package/dist/{key-CpAxygvh.mjs → key-D9dUsyow.mjs} +2 -2
  45. package/dist/{kv-CbLNp3zQ.d.cts → kv-D6hNiMTK.d.ts} +1 -0
  46. package/dist/{kv-cache-B3GfB70S.cjs → kv-cache-BygrlQ1c.cjs} +2 -2
  47. package/dist/{kv-cache-KLjvIlKt.js → kv-cache-CBSgxEsZ.js} +2 -2
  48. package/dist/{kv-cache-Bmv7tUzz.mjs → kv-cache-CiiNwT6W.mjs} +2 -2
  49. package/dist/{kv-GFYnFoOl.d.ts → kv-gJ8LYbxX.d.cts} +1 -3
  50. package/dist/{ld-Ce_vkKjG.mjs → ld-hbxDLO1k.mjs} +3 -3
  51. package/dist/{middleware-DsGmXfXz.mjs → middleware-BXnhAGF9.mjs} +201 -119
  52. package/dist/{middleware-DOLrvK_b.cjs → middleware-Caj827xW.cjs} +358 -139
  53. package/dist/{middleware-BJMPv7_l.mjs → middleware-DZQsPMZb.mjs} +1 -1
  54. package/dist/{middleware-De241etq.js → middleware-vCF_cKAq.js} +346 -111
  55. package/dist/{mod-CLgIXe9w.d.ts → mod-B0rWmfW5.d.cts} +4 -5
  56. package/dist/{mod-CMEbIaNh.d.cts → mod-BhU_H1I_.d.ts} +4 -3
  57. package/dist/{mod-B8Z8mBLk.d.ts → mod-CLPnQPsv.d.cts} +2 -3
  58. package/dist/{mod-Cr3f-ACa.d.cts → mod-DHO9lk3D.d.ts} +3 -2
  59. package/dist/{mod-CR8soWa9.d.ts → mod-DXY9JF28.d.cts} +3 -4
  60. package/dist/{mod-DClCOv0M.d.cts → mod-Dx3-hqyo.d.ts} +2 -1
  61. package/dist/mod.cjs +4 -4
  62. package/dist/mod.d.cts +9 -8
  63. package/dist/mod.d.ts +9 -10
  64. package/dist/mod.js +9 -9
  65. package/dist/{negotiation-VnHNB0Q5.mjs → negotiation-DDstyBvc.mjs} +29 -0
  66. package/dist/nodeinfo/client.test.mjs +2 -2
  67. package/dist/nodeinfo/handler.test.mjs +2 -2
  68. package/dist/nodeinfo/mod.d.cts +2 -1
  69. package/dist/nodeinfo/mod.d.ts +2 -3
  70. package/dist/nodeinfo/mod.js +3 -3
  71. package/dist/otel/exporter.test.mjs +2 -2
  72. package/dist/otel/mod.d.cts +2 -1
  73. package/dist/otel/mod.d.ts +2 -3
  74. package/dist/otel/mod.js +2 -2
  75. package/dist/{outgoing-jsonld-Bi7n-dEy.mjs → outgoing-jsonld-BgFLCJQ_.mjs} +2 -2
  76. package/dist/{owner-CptqhsOy.d.cts → owner-CnngXDNJ.d.ts} +2 -1
  77. package/dist/{owner-74ARJ5TL.d.ts → owner-DEvZuyOE.d.cts} +2 -3
  78. package/dist/{owner-DmgzyItA.mjs → owner-DwJe0BH9.mjs} +2 -2
  79. package/dist/{proof-BU1TpFYI.cjs → proof-CZCaAURh.cjs} +3 -3
  80. package/dist/{proof-DLDsFYfD.js → proof-DMJJZnKd.js} +2 -2
  81. package/dist/{proof-C3q2IhUr.mjs → proof-erpV_J_n.mjs} +5 -5
  82. package/dist/runtime/mod.d.cts +1 -0
  83. package/dist/runtime/mod.d.ts +1 -2
  84. package/dist/runtime/mod.js +3 -3
  85. package/dist/{send-CTi2iPXp.mjs → send-BOwz4Hw5.mjs} +128 -4
  86. package/dist/sig/http.test.mjs +140 -27
  87. package/dist/sig/key.test.mjs +2 -2
  88. package/dist/sig/ld.test.mjs +3 -3
  89. package/dist/sig/mod.cjs +2 -2
  90. package/dist/sig/mod.d.cts +4 -3
  91. package/dist/sig/mod.d.ts +4 -5
  92. package/dist/sig/mod.js +4 -4
  93. package/dist/sig/owner.test.mjs +2 -2
  94. package/dist/sig/proof.test.mjs +3 -3
  95. package/dist/testing/mod.d.mts +6 -1
  96. package/dist/testing/mod.mjs +1 -2
  97. package/dist/{transformers-ve6e2xcg.js → transformers-BGMIq1cs.js} +2 -2
  98. package/dist/{types-hvL8ElAs.js → types-CAY3OdLq.js} +2 -2
  99. package/dist/utils/docloader.test.mjs +3 -3
  100. package/dist/utils/kv-cache.test.mjs +2 -2
  101. package/dist/utils/mod.cjs +1 -1
  102. package/dist/utils/mod.d.cts +2 -1
  103. package/dist/utils/mod.d.ts +2 -3
  104. package/dist/utils/mod.js +3 -3
  105. package/dist/vocab/cjs.test.mjs +1 -1
  106. package/dist/vocab/mod.d.cts +1 -0
  107. package/dist/vocab/mod.d.ts +1 -2
  108. package/dist/vocab/mod.js +2 -2
  109. package/package.json +15 -15
  110. package/dist/middleware-CibncbiT.cjs +0 -4
  111. package/dist/{client-CIiz1WX7.mjs → client-B_A6mfn3.mjs} +1 -1
  112. package/dist/{public-audience-PVTwU_Ex.mjs → public-audience-N3pyOx2p.mjs} +1 -1
  113. /package/dist/{router-CrMLXoOr.mjs → router-BT_F5748.mjs} +0 -0
@@ -1,13 +1,13 @@
1
1
  import { Temporal } from "@js-temporal/polyfill";
2
2
  import "urlpattern-polyfill";
3
3
  globalThis.addEventListener = () => {};
4
- import { r as createRequestContext } from "../context-7Azky82W.mjs";
4
+ import { r as createRequestContext } from "../context-BAE7AKLA.mjs";
5
5
  import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
6
6
  import "../std__assert-CRDpx_HF.mjs";
7
7
  import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
8
- import { o as createFederation, s as handleWebFinger } from "../middleware-DsGmXfXz.mjs";
9
- import { test } from "@fedify/fixture";
8
+ import { o as createFederation, s as handleWebFinger } from "../middleware-BXnhAGF9.mjs";
10
9
  import { Image, Link, Person, Tombstone } from "@fedify/vocab";
10
+ import { test } from "@fedify/fixture";
11
11
  //#region src/federation/webfinger.test.ts
12
12
  test("handleWebFinger()", async (t) => {
13
13
  const url = new URL("https://example.com/.well-known/webfinger");
@@ -1,9 +1,9 @@
1
1
  import "@js-temporal/polyfill";
2
2
  import "urlpattern-polyfill";
3
3
  globalThis.addEventListener = () => {};
4
- import { n as __require, t as __commonJSMin } from "./chunk-QSgtlS85.mjs";
5
- import { t as require_execAsync } from "./execAsync-eck5rbtb.mjs";
6
- //#region ../../node_modules/.pnpm/@opentelemetry+resources@2.5.0_@opentelemetry+api@1.9.0/node_modules/@opentelemetry/resources/build/src/detectors/platform/node/machine-id/getMachineId-bsd.js
4
+ import { n as __require, t as __commonJSMin } from "./chunk-DNRtMIoB.mjs";
5
+ import { t as require_execAsync } from "./execAsync-DCBrgFiV.mjs";
6
+ //#region ../../node_modules/.pnpm/@opentelemetry+resources@2.7.1_@opentelemetry+api@1.9.1/node_modules/@opentelemetry/resources/build/src/detectors/platform/node/machine-id/getMachineId-bsd.js
7
7
  var require_getMachineId_bsd = /* @__PURE__ */ __commonJSMin(((exports) => {
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
9
  exports.getMachineId = void 0;
@@ -1,9 +1,9 @@
1
1
  import "@js-temporal/polyfill";
2
2
  import "urlpattern-polyfill";
3
3
  globalThis.addEventListener = () => {};
4
- import { n as __require, t as __commonJSMin } from "./chunk-QSgtlS85.mjs";
5
- import { t as require_execAsync } from "./execAsync-eck5rbtb.mjs";
6
- //#region ../../node_modules/.pnpm/@opentelemetry+resources@2.5.0_@opentelemetry+api@1.9.0/node_modules/@opentelemetry/resources/build/src/detectors/platform/node/machine-id/getMachineId-darwin.js
4
+ import { n as __require, t as __commonJSMin } from "./chunk-DNRtMIoB.mjs";
5
+ import { t as require_execAsync } from "./execAsync-DCBrgFiV.mjs";
6
+ //#region ../../node_modules/.pnpm/@opentelemetry+resources@2.7.1_@opentelemetry+api@1.9.1/node_modules/@opentelemetry/resources/build/src/detectors/platform/node/machine-id/getMachineId-darwin.js
7
7
  var require_getMachineId_darwin = /* @__PURE__ */ __commonJSMin(((exports) => {
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
9
  exports.getMachineId = void 0;
@@ -1,8 +1,8 @@
1
1
  import "@js-temporal/polyfill";
2
2
  import "urlpattern-polyfill";
3
3
  globalThis.addEventListener = () => {};
4
- import { n as __require, t as __commonJSMin } from "./chunk-QSgtlS85.mjs";
5
- //#region ../../node_modules/.pnpm/@opentelemetry+resources@2.5.0_@opentelemetry+api@1.9.0/node_modules/@opentelemetry/resources/build/src/detectors/platform/node/machine-id/getMachineId-linux.js
4
+ import { n as __require, t as __commonJSMin } from "./chunk-DNRtMIoB.mjs";
5
+ //#region ../../node_modules/.pnpm/@opentelemetry+resources@2.7.1_@opentelemetry+api@1.9.1/node_modules/@opentelemetry/resources/build/src/detectors/platform/node/machine-id/getMachineId-linux.js
6
6
  var require_getMachineId_linux = /* @__PURE__ */ __commonJSMin(((exports) => {
7
7
  Object.defineProperty(exports, "__esModule", { value: true });
8
8
  exports.getMachineId = void 0;
@@ -1,8 +1,8 @@
1
1
  import "@js-temporal/polyfill";
2
2
  import "urlpattern-polyfill";
3
3
  globalThis.addEventListener = () => {};
4
- import { n as __require, t as __commonJSMin } from "./chunk-QSgtlS85.mjs";
5
- //#region ../../node_modules/.pnpm/@opentelemetry+resources@2.5.0_@opentelemetry+api@1.9.0/node_modules/@opentelemetry/resources/build/src/detectors/platform/node/machine-id/getMachineId-unsupported.js
4
+ import { n as __require, t as __commonJSMin } from "./chunk-DNRtMIoB.mjs";
5
+ //#region ../../node_modules/.pnpm/@opentelemetry+resources@2.7.1_@opentelemetry+api@1.9.1/node_modules/@opentelemetry/resources/build/src/detectors/platform/node/machine-id/getMachineId-unsupported.js
6
6
  var require_getMachineId_unsupported = /* @__PURE__ */ __commonJSMin(((exports) => {
7
7
  Object.defineProperty(exports, "__esModule", { value: true });
8
8
  exports.getMachineId = void 0;
@@ -1,9 +1,9 @@
1
1
  import "@js-temporal/polyfill";
2
2
  import "urlpattern-polyfill";
3
3
  globalThis.addEventListener = () => {};
4
- import { n as __require, t as __commonJSMin } from "./chunk-QSgtlS85.mjs";
5
- import { t as require_execAsync } from "./execAsync-eck5rbtb.mjs";
6
- //#region ../../node_modules/.pnpm/@opentelemetry+resources@2.5.0_@opentelemetry+api@1.9.0/node_modules/@opentelemetry/resources/build/src/detectors/platform/node/machine-id/getMachineId-win.js
4
+ import { n as __require, t as __commonJSMin } from "./chunk-DNRtMIoB.mjs";
5
+ import { t as require_execAsync } from "./execAsync-DCBrgFiV.mjs";
6
+ //#region ../../node_modules/.pnpm/@opentelemetry+resources@2.7.1_@opentelemetry+api@1.9.1/node_modules/@opentelemetry/resources/build/src/detectors/platform/node/machine-id/getMachineId-win.js
7
7
  var require_getMachineId_win = /* @__PURE__ */ __commonJSMin(((exports) => {
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
9
  exports.getMachineId = void 0;
@@ -1,19 +1,20 @@
1
1
  import { Temporal } from "@js-temporal/polyfill";
2
2
  import "urlpattern-polyfill";
3
3
  globalThis.addEventListener = () => {};
4
- import { n as version, t as name } from "./deno-CFXqOz6w.mjs";
4
+ import { n as version, t as name } from "./deno-DBabeupC.mjs";
5
5
  import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CceiKpCy.mjs";
6
- import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-CpAxygvh.mjs";
6
+ import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-D9dUsyow.mjs";
7
+ import { getLogger } from "@logtape/logtape";
7
8
  import { CryptographicKey } from "@fedify/vocab";
8
9
  import { SpanStatusCode, trace } from "@opentelemetry/api";
9
10
  import { FetchError } from "@fedify/vocab-runtime";
10
- import { getLogger } from "@logtape/logtape";
11
11
  import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
12
12
  import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
13
13
  import { encodeHex } from "byte-encodings/hex";
14
14
  import { Item, decodeDict, encodeItem } from "structured-field-values";
15
15
  //#region src/sig/http.ts
16
16
  const DEFAULT_MAX_REDIRECTION = 20;
17
+ const DOUBLE_KNOCK_TRANSPORT_RETRY_DELAY_MS = 100;
17
18
  /**
18
19
  * Signs a request using the given private key.
19
20
  * @param request The request to sign.
@@ -842,6 +843,59 @@ function createRedirectRequest(request, location, body) {
842
843
  cache: request.cache
843
844
  });
844
845
  }
846
+ async function fetchDoubleKnockRequest(request, signedRequest, signal) {
847
+ const maxAttempts = request.method === "GET" || request.method === "HEAD" ? 2 : 1;
848
+ for (let attempt = 1;; attempt++) try {
849
+ return await fetch(signedRequest, {
850
+ redirect: "manual",
851
+ signal
852
+ });
853
+ } catch (error) {
854
+ const abortedSignal = getAbortedSignal(signal, request.signal, signedRequest.signal);
855
+ if (abortedSignal != null) throw getAbortReason(abortedSignal);
856
+ if (isAbortError(error)) throw error;
857
+ if (attempt >= maxAttempts) throw createFetchError(request.url, error);
858
+ await sleep(DOUBLE_KNOCK_TRANSPORT_RETRY_DELAY_MS, signal, request.signal, signedRequest.signal);
859
+ }
860
+ }
861
+ function createFetchError(url, cause) {
862
+ const error = new FetchError(url, cause instanceof Error ? cause.message : String(cause));
863
+ error.cause = cause;
864
+ return error;
865
+ }
866
+ function isAbortError(error) {
867
+ return error instanceof Error && error.name === "AbortError";
868
+ }
869
+ async function sleep(ms, ...signals) {
870
+ const abortSignals = signals.filter((signal) => signal != null);
871
+ const abortedSignal = getAbortedSignal(...abortSignals);
872
+ if (abortedSignal != null) throw getAbortReason(abortedSignal);
873
+ if (abortSignals.length < 1) {
874
+ await new Promise((resolve) => setTimeout(resolve, ms));
875
+ return;
876
+ }
877
+ await new Promise((resolve, reject) => {
878
+ const removeAbortListeners = () => {
879
+ for (const signal of abortSignals) signal.removeEventListener("abort", handleAbort);
880
+ };
881
+ const timeout = setTimeout(() => {
882
+ removeAbortListeners();
883
+ resolve();
884
+ }, ms);
885
+ function handleAbort(event) {
886
+ clearTimeout(timeout);
887
+ removeAbortListeners();
888
+ reject(getAbortReason(event.currentTarget));
889
+ }
890
+ for (const signal of abortSignals) signal.addEventListener("abort", handleAbort, { once: true });
891
+ });
892
+ }
893
+ function getAbortedSignal(...signals) {
894
+ return signals.find((signal) => signal?.aborted);
895
+ }
896
+ function getAbortReason(signal) {
897
+ return signal.reason ?? new DOMException("The operation was aborted.", "AbortError");
898
+ }
845
899
  /**
846
900
  * Performs a double-knock request to the given URL. For the details of
847
901
  * double-knocking, see
@@ -868,10 +922,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
868
922
  body
869
923
  });
870
924
  log?.(signedRequest);
871
- let response = await fetch(signedRequest, {
872
- redirect: "manual",
873
- signal
874
- });
925
+ let response = await fetchDoubleKnockRequest(request, signedRequest, signal);
875
926
  if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
876
927
  if (redirected >= maximumRedirection) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
877
928
  const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
@@ -946,10 +997,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
946
997
  body
947
998
  });
948
999
  log?.(signedRequest);
949
- response = await fetch(signedRequest, {
950
- redirect: "manual",
951
- signal
952
- });
1000
+ response = await fetchDoubleKnockRequest(request, signedRequest, signal);
953
1001
  if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
954
1002
  if (redirected >= maximumRedirection) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
955
1003
  const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
@@ -1,6 +1,7 @@
1
+ /// <reference lib="esnext.temporal" />
1
2
  import { CryptographicKey, Multikey } from "@fedify/vocab";
2
- import { DocumentLoader } from "@fedify/vocab-runtime";
3
3
  import { TracerProvider } from "@opentelemetry/api";
4
+ import { DocumentLoader } from "@fedify/vocab-runtime";
4
5
 
5
6
  //#region src/sig/key.d.ts
6
7
  /**
@@ -1,8 +1,7 @@
1
- import { Temporal } from "@js-temporal/polyfill";
2
- import { URLPattern } from "urlpattern-polyfill";
1
+ /// <reference lib="esnext.temporal" />
3
2
  import { CryptographicKey, Multikey } from "@fedify/vocab";
4
- import { TracerProvider } from "@opentelemetry/api";
5
3
  import { DocumentLoader } from "@fedify/vocab-runtime";
4
+ import { TracerProvider } from "@opentelemetry/api";
6
5
 
7
6
  //#region src/sig/key.d.ts
8
7
  /**
@@ -1,5 +1,5 @@
1
1
  import { Temporal } from "@js-temporal/polyfill";
2
- import "urlpattern-polyfill";
2
+ import { URLPattern } from "urlpattern-polyfill";
3
3
  import { getLogger } from "@logtape/logtape";
4
4
  import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
5
5
  import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
@@ -10,7 +10,7 @@ import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } fro
10
10
  import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
11
11
  //#region deno.json
12
12
  var name = "@fedify/fedify";
13
- var version = "2.3.0-dev.1069+81e910ce";
13
+ var version = "2.3.0-dev.1099+fafcfa78";
14
14
  //#endregion
15
15
  //#region src/sig/accept.ts
16
16
  /**
@@ -496,6 +496,7 @@ async function fetchKeyInternal(keyId, cls, options = {}) {
496
496
  //#endregion
497
497
  //#region src/sig/http.ts
498
498
  const DEFAULT_MAX_REDIRECTION = 20;
499
+ const DOUBLE_KNOCK_TRANSPORT_RETRY_DELAY_MS = 100;
499
500
  /**
500
501
  * Signs a request using the given private key.
501
502
  * @param request The request to sign.
@@ -1324,6 +1325,59 @@ function createRedirectRequest(request, location, body) {
1324
1325
  cache: request.cache
1325
1326
  });
1326
1327
  }
1328
+ async function fetchDoubleKnockRequest(request, signedRequest, signal) {
1329
+ const maxAttempts = request.method === "GET" || request.method === "HEAD" ? 2 : 1;
1330
+ for (let attempt = 1;; attempt++) try {
1331
+ return await fetch(signedRequest, {
1332
+ redirect: "manual",
1333
+ signal
1334
+ });
1335
+ } catch (error) {
1336
+ const abortedSignal = getAbortedSignal(signal, request.signal, signedRequest.signal);
1337
+ if (abortedSignal != null) throw getAbortReason(abortedSignal);
1338
+ if (isAbortError(error)) throw error;
1339
+ if (attempt >= maxAttempts) throw createFetchError(request.url, error);
1340
+ await sleep(DOUBLE_KNOCK_TRANSPORT_RETRY_DELAY_MS, signal, request.signal, signedRequest.signal);
1341
+ }
1342
+ }
1343
+ function createFetchError(url, cause) {
1344
+ const error = new FetchError(url, cause instanceof Error ? cause.message : String(cause));
1345
+ error.cause = cause;
1346
+ return error;
1347
+ }
1348
+ function isAbortError(error) {
1349
+ return error instanceof Error && error.name === "AbortError";
1350
+ }
1351
+ async function sleep(ms, ...signals) {
1352
+ const abortSignals = signals.filter((signal) => signal != null);
1353
+ const abortedSignal = getAbortedSignal(...abortSignals);
1354
+ if (abortedSignal != null) throw getAbortReason(abortedSignal);
1355
+ if (abortSignals.length < 1) {
1356
+ await new Promise((resolve) => setTimeout(resolve, ms));
1357
+ return;
1358
+ }
1359
+ await new Promise((resolve, reject) => {
1360
+ const removeAbortListeners = () => {
1361
+ for (const signal of abortSignals) signal.removeEventListener("abort", handleAbort);
1362
+ };
1363
+ const timeout = setTimeout(() => {
1364
+ removeAbortListeners();
1365
+ resolve();
1366
+ }, ms);
1367
+ function handleAbort(event) {
1368
+ clearTimeout(timeout);
1369
+ removeAbortListeners();
1370
+ reject(getAbortReason(event.currentTarget));
1371
+ }
1372
+ for (const signal of abortSignals) signal.addEventListener("abort", handleAbort, { once: true });
1373
+ });
1374
+ }
1375
+ function getAbortedSignal(...signals) {
1376
+ return signals.find((signal) => signal?.aborted);
1377
+ }
1378
+ function getAbortReason(signal) {
1379
+ return signal.reason ?? new DOMException("The operation was aborted.", "AbortError");
1380
+ }
1327
1381
  /**
1328
1382
  * Performs a double-knock request to the given URL. For the details of
1329
1383
  * double-knocking, see
@@ -1350,10 +1404,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
1350
1404
  body
1351
1405
  });
1352
1406
  log?.(signedRequest);
1353
- let response = await fetch(signedRequest, {
1354
- redirect: "manual",
1355
- signal
1356
- });
1407
+ let response = await fetchDoubleKnockRequest(request, signedRequest, signal);
1357
1408
  if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
1358
1409
  if (redirected >= maximumRedirection) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
1359
1410
  const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
@@ -1428,10 +1479,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
1428
1479
  body
1429
1480
  });
1430
1481
  log?.(signedRequest);
1431
- response = await fetch(signedRequest, {
1432
- redirect: "manual",
1433
- signal
1434
- });
1482
+ response = await fetchDoubleKnockRequest(request, signedRequest, signal);
1435
1483
  if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
1436
1484
  if (redirected >= maximumRedirection) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
1437
1485
  const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
@@ -11,7 +11,7 @@ let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conve
11
11
  let byte_encodings_base64 = require("byte-encodings/base64");
12
12
  //#region deno.json
13
13
  var name = "@fedify/fedify";
14
- var version = "2.3.0-dev.1069+81e910ce";
14
+ var version = "2.3.0-dev.1099+fafcfa78";
15
15
  //#endregion
16
16
  //#region src/sig/accept.ts
17
17
  /**
@@ -497,6 +497,7 @@ async function fetchKeyInternal(keyId, cls, options = {}) {
497
497
  //#endregion
498
498
  //#region src/sig/http.ts
499
499
  const DEFAULT_MAX_REDIRECTION = 20;
500
+ const DOUBLE_KNOCK_TRANSPORT_RETRY_DELAY_MS = 100;
500
501
  /**
501
502
  * Signs a request using the given private key.
502
503
  * @param request The request to sign.
@@ -1325,6 +1326,59 @@ function createRedirectRequest(request, location, body) {
1325
1326
  cache: request.cache
1326
1327
  });
1327
1328
  }
1329
+ async function fetchDoubleKnockRequest(request, signedRequest, signal) {
1330
+ const maxAttempts = request.method === "GET" || request.method === "HEAD" ? 2 : 1;
1331
+ for (let attempt = 1;; attempt++) try {
1332
+ return await fetch(signedRequest, {
1333
+ redirect: "manual",
1334
+ signal
1335
+ });
1336
+ } catch (error) {
1337
+ const abortedSignal = getAbortedSignal(signal, request.signal, signedRequest.signal);
1338
+ if (abortedSignal != null) throw getAbortReason(abortedSignal);
1339
+ if (isAbortError(error)) throw error;
1340
+ if (attempt >= maxAttempts) throw createFetchError(request.url, error);
1341
+ await sleep(DOUBLE_KNOCK_TRANSPORT_RETRY_DELAY_MS, signal, request.signal, signedRequest.signal);
1342
+ }
1343
+ }
1344
+ function createFetchError(url, cause) {
1345
+ const error = new _fedify_vocab_runtime.FetchError(url, cause instanceof Error ? cause.message : String(cause));
1346
+ error.cause = cause;
1347
+ return error;
1348
+ }
1349
+ function isAbortError(error) {
1350
+ return error instanceof Error && error.name === "AbortError";
1351
+ }
1352
+ async function sleep(ms, ...signals) {
1353
+ const abortSignals = signals.filter((signal) => signal != null);
1354
+ const abortedSignal = getAbortedSignal(...abortSignals);
1355
+ if (abortedSignal != null) throw getAbortReason(abortedSignal);
1356
+ if (abortSignals.length < 1) {
1357
+ await new Promise((resolve) => setTimeout(resolve, ms));
1358
+ return;
1359
+ }
1360
+ await new Promise((resolve, reject) => {
1361
+ const removeAbortListeners = () => {
1362
+ for (const signal of abortSignals) signal.removeEventListener("abort", handleAbort);
1363
+ };
1364
+ const timeout = setTimeout(() => {
1365
+ removeAbortListeners();
1366
+ resolve();
1367
+ }, ms);
1368
+ function handleAbort(event) {
1369
+ clearTimeout(timeout);
1370
+ removeAbortListeners();
1371
+ reject(getAbortReason(event.currentTarget));
1372
+ }
1373
+ for (const signal of abortSignals) signal.addEventListener("abort", handleAbort, { once: true });
1374
+ });
1375
+ }
1376
+ function getAbortedSignal(...signals) {
1377
+ return signals.find((signal) => signal?.aborted);
1378
+ }
1379
+ function getAbortReason(signal) {
1380
+ return signal.reason ?? new DOMException("The operation was aborted.", "AbortError");
1381
+ }
1328
1382
  /**
1329
1383
  * Performs a double-knock request to the given URL. For the details of
1330
1384
  * double-knocking, see
@@ -1351,10 +1405,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
1351
1405
  body
1352
1406
  });
1353
1407
  log?.(signedRequest);
1354
- let response = await fetch(signedRequest, {
1355
- redirect: "manual",
1356
- signal
1357
- });
1408
+ let response = await fetchDoubleKnockRequest(request, signedRequest, signal);
1358
1409
  if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
1359
1410
  if (redirected >= maximumRedirection) throw new _fedify_vocab_runtime.FetchError(request.url, `Too many redirections (${redirected + 1})`);
1360
1411
  const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
@@ -1429,10 +1480,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
1429
1480
  body
1430
1481
  });
1431
1482
  log?.(signedRequest);
1432
- response = await fetch(signedRequest, {
1433
- redirect: "manual",
1434
- signal
1435
- });
1483
+ response = await fetchDoubleKnockRequest(request, signedRequest, signal);
1436
1484
  if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
1437
1485
  if (redirected >= maximumRedirection) throw new _fedify_vocab_runtime.FetchError(request.url, `Too many redirections (${redirected + 1})`);
1438
1486
  const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
@@ -1,11 +1,11 @@
1
1
  import "@js-temporal/polyfill";
2
2
  import "urlpattern-polyfill";
3
3
  globalThis.addEventListener = () => {};
4
- import { n as version, t as name } from "./deno-CFXqOz6w.mjs";
4
+ import { n as version, t as name } from "./deno-DBabeupC.mjs";
5
+ import { getLogger } from "@logtape/logtape";
5
6
  import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
6
7
  import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
7
8
  import { FetchError, getDocumentLoader } from "@fedify/vocab-runtime";
8
- import { getLogger } from "@logtape/logtape";
9
9
  //#region src/sig/key.ts
10
10
  /**
11
11
  * Checks if the given key is valid and supported. No-op if the key is valid,
@@ -1,3 +1,4 @@
1
+ /// <reference lib="esnext.temporal" />
1
2
  //#region src/federation/kv.d.ts
2
3
  /**
3
4
  * A key for a key–value store. An array of one or more strings.
@@ -1,7 +1,7 @@
1
1
  const { Temporal } = require("@js-temporal/polyfill");
2
2
  const { URLPattern } = require("urlpattern-polyfill");
3
3
  require("./chunk-DDcVe30Y.cjs");
4
- const require_http = require("./http-e1wtIlFo.cjs");
4
+ const require_http = require("./http-W2u_KBoQ.cjs");
5
5
  let _logtape_logtape = require("@logtape/logtape");
6
6
  let es_toolkit = require("es-toolkit");
7
7
  let _fedify_vocab_runtime = require("@fedify/vocab-runtime");
@@ -98,7 +98,7 @@ function kvCache({ loader, kv, prefix, rules }) {
98
98
  }
99
99
  function matchRule(url, rules) {
100
100
  for (const [pattern, d] of rules) {
101
- const duration = d instanceof Temporal.Duration ? d : Temporal.Duration.from(d);
101
+ const duration = Temporal.Duration.from(d);
102
102
  if (typeof pattern === "string") {
103
103
  if (url === pattern) return duration;
104
104
  continue;
@@ -1,6 +1,6 @@
1
1
  import { Temporal } from "@js-temporal/polyfill";
2
2
  import { URLPattern } from "urlpattern-polyfill";
3
- import { d as validateCryptoKey, t as doubleKnock } from "./http-D2EDlTr2.js";
3
+ import { d as validateCryptoKey, t as doubleKnock } from "./http-Dzy5c472.js";
4
4
  import { getLogger } from "@logtape/logtape";
5
5
  import { curry } from "es-toolkit";
6
6
  import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";
@@ -97,7 +97,7 @@ function kvCache({ loader, kv, prefix, rules }) {
97
97
  }
98
98
  function matchRule(url, rules) {
99
99
  for (const [pattern, d] of rules) {
100
- const duration = d instanceof Temporal.Duration ? d : Temporal.Duration.from(d);
100
+ const duration = Temporal.Duration.from(d);
101
101
  if (typeof pattern === "string") {
102
102
  if (url === pattern) return duration;
103
103
  continue;
@@ -1,8 +1,8 @@
1
1
  import { Temporal } from "@js-temporal/polyfill";
2
2
  import { URLPattern } from "urlpattern-polyfill";
3
3
  globalThis.addEventListener = () => {};
4
- import { preloadedContexts } from "@fedify/vocab-runtime";
5
4
  import { getLogger } from "@logtape/logtape";
5
+ import { preloadedContexts } from "@fedify/vocab-runtime";
6
6
  //#region src/utils/kv-cache.ts
7
7
  const logger = getLogger([
8
8
  "fedify",
@@ -86,7 +86,7 @@ function kvCache({ loader, kv, prefix, rules }) {
86
86
  }
87
87
  function matchRule(url, rules) {
88
88
  for (const [pattern, d] of rules) {
89
- const duration = d instanceof Temporal.Duration ? d : Temporal.Duration.from(d);
89
+ const duration = Temporal.Duration.from(d);
90
90
  if (typeof pattern === "string") {
91
91
  if (url === pattern) return duration;
92
92
  continue;
@@ -1,6 +1,4 @@
1
- import { Temporal } from "@js-temporal/polyfill";
2
- import { URLPattern } from "urlpattern-polyfill";
3
-
1
+ /// <reference lib="esnext.temporal" />
4
2
  //#region src/federation/kv.d.ts
5
3
  /**
6
4
  * A key for a key–value store. An array of one or more strings.
@@ -1,12 +1,12 @@
1
1
  import "@js-temporal/polyfill";
2
2
  import "urlpattern-polyfill";
3
3
  globalThis.addEventListener = () => {};
4
- import { n as version, t as name } from "./deno-CFXqOz6w.mjs";
5
- import { n as fetchKey, o as validateCryptoKey } from "./key-CpAxygvh.mjs";
4
+ import { n as version, t as name } from "./deno-DBabeupC.mjs";
5
+ import { n as fetchKey, o as validateCryptoKey } from "./key-D9dUsyow.mjs";
6
+ import { getLogger } from "@logtape/logtape";
6
7
  import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
7
8
  import { SpanStatusCode, trace } from "@opentelemetry/api";
8
9
  import { getDocumentLoader } from "@fedify/vocab-runtime";
9
- import { getLogger } from "@logtape/logtape";
10
10
  import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
11
11
  import { encodeHex } from "byte-encodings/hex";
12
12
  import jsonld from "@fedify/vocab-runtime/jsonld";