@fedify/webfinger 2.5.0-dev.2619 → 2.5.0-dev.2687

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/deno.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fedify/webfinger",
3
- "version": "2.5.0-dev.2619+88aa7efd",
3
+ "version": "2.5.0-dev.2687+924da5ce",
4
4
  "license": "MIT",
5
5
  "exports": {
6
6
  ".": "./src/mod.ts"
@@ -26,7 +26,7 @@
26
26
  ]
27
27
  },
28
28
  "tasks": {
29
- "check": "deno fmt --check && deno lint && deno check src/*.ts",
29
+ "check": "deno check src/*.ts",
30
30
  "test": "deno test"
31
31
  }
32
32
  }
@@ -1237,7 +1237,7 @@ var esm_default = new class FetchMock {
1237
1237
  //#endregion
1238
1238
  //#region deno.json
1239
1239
  var name = "@fedify/webfinger";
1240
- var version = "2.5.0-dev.2619+88aa7efd";
1240
+ var version = "2.5.0-dev.2687+924da5ce";
1241
1241
  //#endregion
1242
1242
  //#region src/body.ts
1243
1243
  /** Decoded JSON body limit: 16 MiB. @internal */
@@ -1236,7 +1236,7 @@ var esm_default = new class FetchMock {
1236
1236
  //#endregion
1237
1237
  //#region deno.json
1238
1238
  var name = "@fedify/webfinger";
1239
- var version = "2.5.0-dev.2619+88aa7efd";
1239
+ var version = "2.5.0-dev.2687+924da5ce";
1240
1240
  //#endregion
1241
1241
  //#region src/body.ts
1242
1242
  /** Decoded JSON body limit: 16 MiB. @internal */
package/dist/mod.cjs CHANGED
@@ -5,7 +5,7 @@ let _fedify_vocab_runtime_internal = require("@fedify/vocab-runtime/internal");
5
5
  let _logtape_logtape = require("@logtape/logtape");
6
6
  //#region deno.json
7
7
  var name = "@fedify/webfinger";
8
- var version = "2.5.0-dev.2619+88aa7efd";
8
+ var version = "2.5.0-dev.2687+924da5ce";
9
9
  //#endregion
10
10
  //#region src/body.ts
11
11
  /** Decoded JSON body limit: 16 MiB. @internal */
package/dist/mod.js CHANGED
@@ -4,7 +4,7 @@ import { openDirectFetch, openPublicFetch } from "@fedify/vocab-runtime/internal
4
4
  import { getLogger } from "@logtape/logtape";
5
5
  //#region deno.json
6
6
  var name = "@fedify/webfinger";
7
- var version = "2.5.0-dev.2619+88aa7efd";
7
+ var version = "2.5.0-dev.2687+924da5ce";
8
8
  //#endregion
9
9
  //#region src/body.ts
10
10
  /** Decoded JSON body limit: 16 MiB. @internal */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fedify/webfinger",
3
- "version": "2.5.0-dev.2619+88aa7efd",
3
+ "version": "2.5.0-dev.2687+924da5ce",
4
4
  "homepage": "https://fedify.dev/",
5
5
  "repository": {
6
6
  "type": "git",
@@ -54,10 +54,10 @@
54
54
  "@fedify/fixture": "2.0.0"
55
55
  },
56
56
  "dependencies": {
57
- "@logtape/logtape": "^2.2.0",
57
+ "@logtape/logtape": "2.4.2",
58
58
  "@opentelemetry/api": "~1.9.1",
59
59
  "es-toolkit": "1.46.1",
60
- "@fedify/vocab-runtime": "2.5.0-dev.2619+88aa7efd"
60
+ "@fedify/vocab-runtime": "2.5.0-dev.2687+924da5ce"
61
61
  },
62
62
  "scripts": {
63
63
  "build:self": "tsdown",
package/src/body.ts CHANGED
@@ -56,22 +56,28 @@ export async function readBoundedText(
56
56
  const encoding = message.headers.get("Content-Encoding");
57
57
  if (
58
58
  (encoding == null || encoding.toLowerCase() === "identity") &&
59
- length != null && /^\d+$/.test(length) && Number(length) > maxBytes
60
- ) tooLarge();
59
+ length != null &&
60
+ /^\d+$/.test(length) &&
61
+ Number(length) > maxBytes
62
+ )
63
+ tooLarge();
61
64
  if (reader == null) return "";
62
65
  let size = 0;
63
- const bounded = new ReadableStream<BufferSource>({
64
- async pull(controller) {
65
- const { done, value } = await reader.read();
66
- if (done) {
67
- controller.close();
68
- return;
69
- }
70
- size += value.byteLength;
71
- if (size > maxBytes) tooLarge();
72
- controller.enqueue(value);
66
+ const bounded = new ReadableStream<BufferSource>(
67
+ {
68
+ async pull(controller) {
69
+ const { done, value } = await reader.read();
70
+ if (done) {
71
+ controller.close();
72
+ return;
73
+ }
74
+ size += value.byteLength;
75
+ if (size > maxBytes) tooLarge();
76
+ controller.enqueue(value);
77
+ },
73
78
  },
74
- }, { highWaterMark: 0 });
79
+ { highWaterMark: 0 },
80
+ );
75
81
  const textReader = bounded.pipeThrough(new TextDecoderStream()).getReader();
76
82
  try {
77
83
  const chunks: string[] = [];
@@ -89,17 +89,17 @@ export async function lookupWebFingerInternal(
89
89
  }
90
90
  let url = new URL(`${protocol}//${server}/.well-known/webfinger`);
91
91
  url.searchParams.set("resource", resource.href);
92
- const openHop = deps.openHop ??
92
+ const openHop =
93
+ deps.openHop ??
93
94
  ((hopUrl: string) =>
94
95
  options.allowPrivateAddress === true
95
96
  ? openDirectFetch(hopUrl)
96
97
  : openPublicFetch(hopUrl, { signal: options.signal }));
97
98
  let redirected = 0;
98
99
  while (true) {
99
- logger.debug(
100
- "Fetching WebFinger resource descriptor from {url}...",
101
- { url: url.href },
102
- );
100
+ logger.debug("Fetching WebFinger resource descriptor from {url}...", {
101
+ url: url.href,
102
+ });
103
103
  const remoteHost = url.host;
104
104
  const session = await openSession(url, openHop, options.signal);
105
105
  if (session == null) {
@@ -184,18 +184,17 @@ async function openSession(
184
184
  error: e,
185
185
  });
186
186
  } else {
187
- logger.error(
188
- "Invalid URL for WebFinger resource descriptor: {error}",
189
- { error: e },
190
- );
187
+ logger.error("Invalid URL for WebFinger resource descriptor: {error}", {
188
+ error: e,
189
+ });
191
190
  }
192
191
  return null;
193
192
  }
194
193
  if (signal?.aborted) {
195
- logger.debug(
196
- "Failed to fetch WebFinger resource descriptor: {error}",
197
- { url: url.href, error: e },
198
- );
194
+ logger.debug("Failed to fetch WebFinger resource descriptor: {error}", {
195
+ url: url.href,
196
+ error: e,
197
+ });
199
198
  return null;
200
199
  }
201
200
  throw e;
@@ -216,18 +215,19 @@ async function fetchHop(
216
215
  response = await session.fetch(url, {
217
216
  headers: {
218
217
  Accept: "application/jrd+json",
219
- "User-Agent": typeof options.userAgent === "string"
220
- ? options.userAgent
221
- : getUserAgent(options.userAgent),
218
+ "User-Agent":
219
+ typeof options.userAgent === "string"
220
+ ? options.userAgent
221
+ : getUserAgent(options.userAgent),
222
222
  },
223
223
  redirect: "manual",
224
224
  signal: options.signal,
225
225
  });
226
226
  } catch (error) {
227
- logger.debug(
228
- "Failed to fetch WebFinger resource descriptor: {error}",
229
- { url: url.href, error },
230
- );
227
+ logger.debug("Failed to fetch WebFinger resource descriptor: {error}", {
228
+ url: url.href,
229
+ error,
230
+ });
231
231
  return {
232
232
  outcome: {
233
233
  resource: null,
@@ -237,7 +237,8 @@ async function fetchHop(
237
237
  };
238
238
  }
239
239
  if (
240
- response.status >= 300 && response.status < 400 &&
240
+ response.status >= 300 &&
241
+ response.status < 400 &&
241
242
  response.headers.has("Location")
242
243
  ) {
243
244
  cancelBody(response, url);
@@ -259,9 +260,10 @@ async function fetchHop(
259
260
  return {
260
261
  outcome: {
261
262
  resource: null,
262
- result: response.status === 404 || response.status === 410
263
- ? "not_found"
264
- : "error",
263
+ result:
264
+ response.status === 404 || response.status === 410
265
+ ? "not_found"
266
+ : "error",
265
267
  statusCode: response.status,
266
268
  remoteHost: url.host,
267
269
  },
@@ -273,7 +275,9 @@ async function fetchHop(
273
275
  );
274
276
  // A JSON primitive, null, or array is not a resource descriptor.
275
277
  if (
276
- typeof parsed !== "object" || parsed === null || Array.isArray(parsed)
278
+ typeof parsed !== "object" ||
279
+ parsed === null ||
280
+ Array.isArray(parsed)
277
281
  ) {
278
282
  return {
279
283
  outcome: {
@@ -330,9 +334,9 @@ async function fetchHop(
330
334
  */
331
335
  function cancelBody(response: Response, url: URL): void {
332
336
  response.body?.cancel().catch((error) => {
333
- logger.debug(
334
- "Failed to cancel the response body from {url}: {error}",
335
- { url: url.href, error },
336
- );
337
+ logger.debug("Failed to cancel the response body from {url}: {error}", {
338
+ url: url.href,
339
+ error,
340
+ });
337
341
  });
338
342
  }