deps: bump aegir from 46.0.5 to 47.0.6 (#236)

dependabot[bot] · achingbrain · web-flow · commit bc3d5574ee6f · 2025-05-21T14:42:40.000+01:00
Bumps [aegir](https://github.com/ipfs/aegir) from 46.0.5 to 47.0.6. - [Release notes](https://github.com/ipfs/aegir/releases) - [Changelog](https://github.com/ipfs/aegir/blob/main/CHANGELOG.md) - [Commits](ipfs/aegir@v46.0.5...v47.0.6) --- updated-dependencies: - dependency-name: aegir dependency-version: 47.0.6 dependency-type: direct:production update-type: version-update:semver-major ... --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: achingbrain <alex@achingbrain.net>
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,11 +3,6 @@ updates:
 - package-ecosystem: npm
   directories:
     - "/"
-    - "/benchmarks/*"
-    - "/docs/*"
-    - "/examples/*"
-    - "/interop/*"
-    - "/packages/*"
   schedule:
     interval: daily
     time: "10:00"
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "docs:no-publish": "aegir docs --publish false"
   },
   "devDependencies": {
-    "aegir": "^46.0.1",
+    "aegir": "^47.0.10",
     "npm-run-all": "^4.1.5"
   },
   "type": "module",
diff --git a/packages/gateway-conformance/README.md b/packages/gateway-conformance/README.md
@@ -86,8 +86,6 @@ errors: `DEBUG="-mocha*,*,*:trace" npm run test`
 $ npm i @helia/verified-fetch-gateway-conformance
 ```
 
-> [Gateway Conformance](https://github.com/ipfs/gateway-conformance) tests for @helia/verified-fetch
-
 # License
 
 Licensed under either of
diff --git a/packages/gateway-conformance/package.json b/packages/gateway-conformance/package.json
@@ -36,13 +36,6 @@
       "import": "./dist/src/index.js"
     }
   },
-  "eslintConfig": {
-    "extends": "ipfs",
-    "parserOptions": {
-      "project": true,
-      "sourceType": "module"
-    }
-  },
   "release": {
     "branches": [
       "main"
@@ -152,12 +145,12 @@
     "@helia/interface": "^5.3.1",
     "@helia/routers": "^3.1.1",
     "@helia/verified-fetch": "^2.0.0",
-    "@libp2p/interface": "^2.9.0",
-    "@libp2p/kad-dht": "^15.0.2",
-    "@libp2p/logger": "^5.1.15",
-    "@libp2p/peer-id": "^5.1.2",
+    "@libp2p/interface": "^2.10.1",
+    "@libp2p/kad-dht": "^15.1.1",
+    "@libp2p/logger": "^5.1.17",
+    "@libp2p/peer-id": "^5.1.4",
     "@multiformats/dns": "^1.0.6",
-    "aegir": "^46.0.1",
+    "aegir": "^47.0.10",
     "blockstore-core": "^5.0.2",
     "datastore-core": "^10.0.2",
     "execa": "^9.5.3",
@@ -167,9 +160,9 @@
     "ipfsd-ctl": "^15.0.2",
     "kubo": "^0.34.1",
     "kubo-rpc-client": "^5.1.0",
-    "multiformats": "^13.3.3",
+    "multiformats": "^13.3.6",
     "uint8arrays": "^5.1.0",
-    "undici": "^7.9.0"
+    "undici": "^7.10.0"
   },
   "browser": {
     "./dist/src/fixtures/create-kubo.js": "./dist/src/fixtures/create-kubo.browser.js",
diff --git a/packages/interop/package.json b/packages/interop/package.json
@@ -35,13 +35,6 @@
       "import": "./dist/src/index.js"
     }
   },
-  "eslintConfig": {
-    "extends": "ipfs",
-    "parserOptions": {
-      "project": true,
-      "sourceType": "module"
-    }
-  },
   "release": {
     "branches": [
       "main"
@@ -153,14 +146,14 @@
   "dependencies": {
     "@helia/delegated-routing-v1-http-api-server": "^4.0.6",
     "@helia/verified-fetch": "^2.0.0",
-    "aegir": "^46.0.1",
+    "aegir": "^47.0.10",
     "execa": "^9.5.3",
     "glob": "^11.0.2",
     "ipfsd-ctl": "^15.0.2",
     "kubo": "^0.34.1",
     "kubo-rpc-client": "^5.1.0",
     "magic-bytes.js": "^1.12.1",
-    "multiformats": "^13.3.3",
+    "multiformats": "^13.3.6",
     "sinon-ts": "^2.0.0",
     "wherearewe": "^2.0.1"
   },
diff --git a/packages/verified-fetch/package.json b/packages/verified-fetch/package.json
@@ -54,13 +54,6 @@
       "import": "./dist/src/plugins/plugins.js"
     }
   },
-  "eslintConfig": {
-    "extends": "ipfs",
-    "parserOptions": {
-      "project": true,
-      "sourceType": "module"
-    }
-  },
   "release": {
     "branches": [
       "main"
@@ -180,17 +173,16 @@
     "@helia/unixfs": "^5.0.2",
     "@ipld/dag-cbor": "^9.2.3",
     "@ipld/dag-json": "^10.2.4",
-    "@ipld/dag-pb": "^4.1.4",
-    "@libp2p/interface": "^2.9.0",
-    "@libp2p/kad-dht": "^15.0.2",
-    "@libp2p/logger": "^5.1.15",
-    "@libp2p/peer-id": "^5.1.2",
-    "@libp2p/webrtc": "^5.2.12",
-    "@libp2p/websockets": "^9.2.10",
+    "@ipld/dag-pb": "^4.1.5",
+    "@libp2p/interface": "^2.10.1",
+    "@libp2p/kad-dht": "^15.1.1",
+    "@libp2p/logger": "^5.1.17",
+    "@libp2p/peer-id": "^5.1.4",
+    "@libp2p/webrtc": "^5.2.14",
+    "@libp2p/websockets": "^9.2.12",
     "@multiformats/dns": "^1.0.6",
-    "cborg": "^4.2.10",
+    "cborg": "^4.2.11",
     "file-type": "^20.5.0",
-    "hashlru": "^2.3.0",
     "helia": "^5.4.1",
     "interface-blockstore": "^5.3.1",
     "interface-datastore": "^8.3.1",
@@ -200,10 +192,10 @@
     "it-pipe": "^3.0.1",
     "it-tar": "^6.0.5",
     "it-to-browser-readablestream": "^2.0.11",
-    "libp2p": "^2.8.5",
-    "lru-cache": "^11.1.0",
-    "multiformats": "^13.3.3",
+    "libp2p": "^2.8.7",
+    "multiformats": "^13.3.6",
     "progress-events": "^1.0.1",
+    "quick-lru": "^7.0.1",
     "uint8arrays": "^5.1.0"
   },
   "devDependencies": {
@@ -212,9 +204,9 @@
     "@helia/http": "^2.1.1",
     "@helia/json": "^4.0.5",
     "@ipld/car": "^5.4.1",
-    "@libp2p/crypto": "^5.1.1",
+    "@libp2p/crypto": "^5.1.3",
     "@types/sinon": "^17.0.4",
-    "aegir": "^46.0.1",
+    "aegir": "^47.0.10",
     "blockstore-core": "^5.0.2",
     "browser-readablestream-to-it": "^2.0.9",
     "datastore-core": "^10.0.2",
diff --git a/packages/verified-fetch/src/index.ts b/packages/verified-fetch/src/index.ts
@@ -591,18 +591,18 @@
  *
  * #### Unsupported response types
  *
- * * Returning IPLD nodes or DAGs as JS objects is not supported, as there is no currently well-defined structure for representing this data in an [HTTP Response](https://developer.mozilla.org/en-US/docs/Web/API/Response). Instead, users should request `aplication/vnd.ipld.car` or use the [`helia`](https://github.com/ipfs/helia) library directly for this use case.
- * * Others? Open an issue or PR!
+ * - Returning IPLD nodes or DAGs as JS objects is not supported, as there is no currently well-defined structure for representing this data in an [HTTP Response](https://developer.mozilla.org/en-US/docs/Web/API/Response). Instead, users should request `aplication/vnd.ipld.car` or use the [`helia`](https://github.com/ipfs/helia) library directly for this use case.
+ * - Others? Open an issue or PR!
  *
  * ### Response headers
  *
  * This library will set the [HTTP Response](https://developer.mozilla.org/en-US/docs/Web/API/Response) headers to the appropriate values for the content type according to the appropriate [IPFS Specifications](https://specs.ipfs.tech/).
  *
  * Some known header specifications:
  *
- * * https://specs.ipfs.tech/http-gateways/path-gateway/#response-headers
- * * https://specs.ipfs.tech/http-gateways/trustless-gateway/#response-headers
- * * https://specs.ipfs.tech/http-gateways/subdomain-gateway/#response-headers
+ * - https://specs.ipfs.tech/http-gateways/path-gateway/#response-headers
+ * - https://specs.ipfs.tech/http-gateways/trustless-gateway/#response-headers
+ * - https://specs.ipfs.tech/http-gateways/subdomain-gateway/#response-headers
  *
  * #### Server Timing headers
  *
diff --git a/packages/verified-fetch/src/types.ts b/packages/verified-fetch/src/types.ts
@@ -1,6 +1,6 @@
 export type RequestFormatShorthand = 'raw' | 'car' | 'tar' | 'ipns-record' | 'dag-json' | 'dag-cbor' | 'json' | 'cbor'
 
-export type SupportedBodyTypes = string | ArrayBuffer | Blob | ReadableStream<Uint8Array> | null
+export type SupportedBodyTypes = string | Uint8Array | ArrayBuffer | Blob | ReadableStream<Uint8Array> | null
 
 /**
  * A ContentTypeParser attempts to return the mime type of a given file. It
diff --git a/packages/verified-fetch/src/utils/dir-index-html.ts b/packages/verified-fetch/src/utils/dir-index-html.ts
@@ -4,8 +4,8 @@ import type { UnixFSEntry } from 'ipfs-unixfs-exporter'
 /**
  * Types taken from:
  *
- * * https://github.com/ipfs/boxo/blob/09b0013e1c3e09468009b02dfc9b2b9041199d5d/gateway/assets/assets.go#L92C1-L96C2
- * * https://github.com/ipfs/boxo/blob/09b0013e1c3e09468009b02dfc9b2b9041199d5d/gateway/assets/assets.go#L114C1-L135C2
+ * - https://github.com/ipfs/boxo/blob/09b0013e1c3e09468009b02dfc9b2b9041199d5d/gateway/assets/assets.go#L92C1-L96C2
+ * - https://github.com/ipfs/boxo/blob/09b0013e1c3e09468009b02dfc9b2b9041199d5d/gateway/assets/assets.go#L114C1-L135C2
  */
 
 interface GlobalData {
diff --git a/packages/verified-fetch/src/utils/libp2p-defaults.browser.ts b/packages/verified-fetch/src/utils/libp2p-defaults.browser.ts
@@ -1,7 +1,7 @@
 import { webRTCDirect } from '@libp2p/webrtc'
 import { webSockets } from '@libp2p/websockets'
 import { libp2pDefaults } from 'helia'
-import type { ServiceFactoryMap } from './libp2p-types'
+import type { ServiceFactoryMap } from './libp2p-types.js'
 import type { DefaultLibp2pServices } from 'helia'
 import type { Libp2pOptions } from 'libp2p'
 
diff --git a/packages/verified-fetch/src/utils/libp2p-defaults.ts b/packages/verified-fetch/src/utils/libp2p-defaults.ts
@@ -2,7 +2,7 @@ import { kadDHT } from '@libp2p/kad-dht'
 import { libp2pDefaults } from 'helia'
 import { ipnsSelector } from 'ipns/selector'
 import { ipnsValidator } from 'ipns/validator'
-import type { ServiceFactoryMap } from './libp2p-types'
+import type { ServiceFactoryMap } from './libp2p-types.js'
 import type { DefaultLibp2pServices } from 'helia'
 import type { Libp2pOptions } from 'libp2p'
 
diff --git a/packages/verified-fetch/src/utils/parse-url-string.ts b/packages/verified-fetch/src/utils/parse-url-string.ts
@@ -65,9 +65,9 @@ interface MatchUrlGroups {
 
 function matchUrlGroupsGuard (groups?: null | { [key in string]: string; } | MatchUrlGroups): groups is MatchUrlGroups {
   const protocol = groups?.protocol
-  if (protocol == null) return false
+  if (protocol == null) { return false }
   const cidOrPeerIdOrDnsLink = groups?.cidOrPeerIdOrDnsLink
-  if (cidOrPeerIdOrDnsLink == null) return false
+  if (cidOrPeerIdOrDnsLink == null) { return false }
   const path = groups?.path
   const queryString = groups?.queryString
 
@@ -132,8 +132,8 @@ function isInlinedDnsLink (label: string): boolean {
 
 /**
  * DNSLink label decoding
- * * Every standalone - is replaced with .
- * * Every remaining -- is replaced with -
+ * - Every standalone - is replaced with .
+ * - Every remaining -- is replaced with -
  *
  * @example en-wikipedia--on--ipfs-org.ipns.example.net -> example.net/ipns/en.wikipedia-on-ipfs.org
  */
@@ -145,8 +145,8 @@ function dnsLinkLabelDecoder (linkLabel: string): string {
  * A function that parses ipfs:// and ipns:// URLs, returning an object with easily recognizable properties.
  *
  * After determining the protocol successfully, we process the cidOrPeerIdOrDnsLink:
- * * If it's ipfs, it parses the CID or throws Error[]
- * * If it's ipns, it attempts to resolve the PeerId and then the DNSLink. If both fail, Error[] is thrown.
+ * - If it's ipfs, it parses the CID or throws Error[]
+ * - If it's ipns, it attempts to resolve the PeerId and then the DNSLink. If both fail, Error[] is thrown.
  *
  * @todo we need to break out each step of this function (cid parsing, ipns resolving, dnslink resolving) into separate functions and then remove the eslint-disable comment
  *
@@ -264,7 +264,7 @@ export async function parseUrlString ({ urlString, ipns, logger, withServerTimin
 
     errors.push(new Error(`Invalid resource. Cannot determine CID from URL "${urlString}".`))
 
-    // eslint-disable-next-line @typescript-eslint/no-throw-literal
+    // eslint-disable-next-line @typescript-eslint/only-throw-error
     throw errors
   }
 
diff --git a/packages/verified-fetch/src/utils/responses.ts b/packages/verified-fetch/src/utils/responses.ts
@@ -1,4 +1,4 @@
-import type { ByteRangeContext } from './byte-range-context'
+import type { ByteRangeContext } from './byte-range-context.js'
 import type { SupportedBodyTypes } from '../types.js'
 import type { Logger } from '@libp2p/interface'
 
@@ -193,9 +193,9 @@ export function okRangeResponse (url: string, body: SupportedBodyTypes, { byteRa
 
 /**
  * We likely need to catch errors handled by upstream helia libraries if range-request throws an error. Some examples:
- * * The range is out of bounds
- * * The range is invalid
- * * The range is not supported for the given type
+ * - The range is out of bounds
+ * - The range is invalid
+ * - The range is not supported for the given type
  */
 export function badRangeResponse (url: string, body?: SupportedBodyTypes, init?: ResponseInit): Response {
   const response = new Response(body, {
diff --git a/packages/verified-fetch/src/utils/tlru.ts b/packages/verified-fetch/src/utils/tlru.ts
@@ -1,35 +1,25 @@
-import hashlru from 'hashlru'
+import QuickLRU from 'quick-lru'
 
 /**
  * Time Aware Least Recent Used Cache
  *
  * @see https://arxiv.org/pdf/1801.00390
  */
 export class TLRU<T> {
-  private readonly lru: ReturnType<typeof hashlru>
+  private readonly lru: QuickLRU<string, T>
 
   constructor (maxSize: number) {
-    this.lru = hashlru(maxSize)
+    this.lru = new QuickLRU({ maxSize })
   }
 
   get (key: string): T | undefined {
-    const value = this.lru.get(key)
-
-    if (value != null) {
-      if (value.expire != null && value.expire < Date.now()) {
-        this.lru.remove(key)
-
-        return undefined
-      }
-
-      return value.value
-    }
-
-    return undefined
+    return this.lru.get(key)
   }
 
   set (key: string, value: T, ttlMs: number): void {
-    this.lru.set(key, { value, expire: Date.now() + ttlMs })
+    this.lru.set(key, value, {
+      maxAge: Date.now() + ttlMs
+    })
   }
 
   has (key: string): boolean {
@@ -43,7 +33,7 @@ export class TLRU<T> {
   }
 
   remove (key: string): void {
-    this.lru.remove(key)
+    this.lru.delete(key)
   }
 
   clear (): void {
diff --git a/packages/verified-fetch/src/verified-fetch.ts b/packages/verified-fetch/src/verified-fetch.ts
@@ -1,7 +1,7 @@
 import { ipns as heliaIpns } from '@helia/ipns'
 import { prefixLogger } from '@libp2p/logger'
-import { LRUCache } from 'lru-cache'
 import { CustomProgressEvent } from 'progress-events'
+import QuickLRU from 'quick-lru'
 import { ByteRangeContextPlugin } from './plugins/plugin-handle-byte-range-context.js'
 import { CarPlugin } from './plugins/plugin-handle-car.js'
 import { DagCborPlugin } from './plugins/plugin-handle-dag-cbor.js'
@@ -62,7 +62,7 @@ export class VerifiedFetch {
   private readonly ipns: IPNS
   private readonly log: Logger
   private readonly contentTypeParser: ContentTypeParser | undefined
-  private readonly blockstoreSessions: LRUCache<string, SessionBlockstore>
+  private readonly blockstoreSessions: QuickLRU<string, SessionBlockstore>
   private serverTimingHeaders: string[] = []
   private readonly withServerTiming: boolean
   private readonly plugins: VerifiedFetchPlugin[] = []
@@ -72,10 +72,10 @@ export class VerifiedFetch {
     this.log = helia.logger.forComponent('helia:verified-fetch')
     this.ipns = ipns ?? heliaIpns(helia)
     this.contentTypeParser = init?.contentTypeParser ?? contentTypeParser
-    this.blockstoreSessions = new LRUCache({
-      max: init?.sessionCacheSize ?? SESSION_CACHE_MAX_SIZE,
-      ttl: init?.sessionTTLms ?? SESSION_CACHE_TTL_MS,
-      dispose: (store) => {
+    this.blockstoreSessions = new QuickLRU({
+      maxSize: init?.sessionCacheSize ?? SESSION_CACHE_MAX_SIZE,
+      maxAge: init?.sessionTTLms ?? SESSION_CACHE_TTL_MS,
+      onEviction: (key, store) => {
         store.close()
       }
     })
diff --git a/packages/verified-fetch/test/fixtures/memory-car.ts b/packages/verified-fetch/test/fixtures/memory-car.ts
@@ -13,7 +13,7 @@ export function memoryCarWriter (root: CID | CID[]): MemoryCar {
 
   Promise.resolve()
     .then(async () => {
-      deferred.resolve(await toBuffer(out))
+      deferred.resolve(toBuffer(out))
     })
     .catch(err => {
       deferred.reject(err)

Original file line number	Diff line number	Diff line change
`@@ -591,18 +591,18 @@`
`591`	`591`	`*`
`592`	`592`	`* #### Unsupported response types`
`593`	`593`	`*`
`594`		- * * Returning IPLD nodes or DAGs as JS objects is not supported, as there is no currently well-defined structure for representing this data in an [HTTP Response](https://developer.mozilla.org/en-US/docs/Web/API/Response). Instead, users should request `aplication/vnd.ipld.car` or use the [`helia`](https://github.com/ipfs/helia) library directly for this use case.
`595`		`- * * Others? Open an issue or PR!`
	`594`	+ * - Returning IPLD nodes or DAGs as JS objects is not supported, as there is no currently well-defined structure for representing this data in an [HTTP Response](https://developer.mozilla.org/en-US/docs/Web/API/Response). Instead, users should request `aplication/vnd.ipld.car` or use the [`helia`](https://github.com/ipfs/helia) library directly for this use case.
	`595`	`+ * - Others? Open an issue or PR!`
`596`	`596`	`*`
`597`	`597`	`* ### Response headers`
`598`	`598`	`*`
`599`	`599`	`* This library will set the [HTTP Response](https://developer.mozilla.org/en-US/docs/Web/API/Response) headers to the appropriate values for the content type according to the appropriate [IPFS Specifications](https://specs.ipfs.tech/).`
`600`	`600`	`*`
`601`	`601`	`* Some known header specifications:`
`602`	`602`	`*`
`603`		`- * * https://specs.ipfs.tech/http-gateways/path-gateway/#response-headers`
`604`		`- * * https://specs.ipfs.tech/http-gateways/trustless-gateway/#response-headers`
`605`		`- * * https://specs.ipfs.tech/http-gateways/subdomain-gateway/#response-headers`
	`603`	`+ * - https://specs.ipfs.tech/http-gateways/path-gateway/#response-headers`
	`604`	`+ * - https://specs.ipfs.tech/http-gateways/trustless-gateway/#response-headers`
	`605`	`+ * - https://specs.ipfs.tech/http-gateways/subdomain-gateway/#response-headers`
`606`	`606`	`*`
`607`	`607`	`* #### Server Timing headers`
`608`	`608`	`*`