@helia/verified-fetch 3.2.3 → 4.0.0

package/dist/typedoc-urls.json

@@ -11,23 +11,34 @@
   "CIDDetailError": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.CIDDetailError.html",
   ".:CIDDetailError": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.CIDDetailError.html",
   "ContentTypeParser": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.ContentTypeParser.html",
+  ".:ContentTypeParser": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.ContentTypeParser.html",
   "CreateVerifiedFetchInit": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.CreateVerifiedFetchInit.html",
   ".:CreateVerifiedFetchInit": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.CreateVerifiedFetchInit.html",
   "CreateVerifiedFetchOptions": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.CreateVerifiedFetchOptions.html",
   ".:CreateVerifiedFetchOptions": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.CreateVerifiedFetchOptions.html",
   "PluginContext": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.PluginContext.html",
   "PluginOptions": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.PluginOptions.html",
+  "ResolveURLOptions": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.ResolveURLOptions.html",
+  ".:ResolveURLOptions": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.ResolveURLOptions.html",
+  "ResolveURLResult": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.ResolveURLResult.html",
+  ".:ResolveURLResult": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.ResolveURLResult.html",
   "ResourceDetail": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.ResourceDetail.html",
   ".:ResourceDetail": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.ResourceDetail.html",
+  "UrlQuery": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.UrlQuery.html",
+  ".:UrlQuery": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.UrlQuery.html",
+  "URLResolver": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.URLResolver.html",
+  ".:URLResolver": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.URLResolver.html",
   "VerifiedFetch": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.VerifiedFetch.html",
   ".:VerifiedFetch": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.VerifiedFetch.html",
   "VerifiedFetchInit": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.VerifiedFetchInit.html",
   ".:VerifiedFetchInit": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.VerifiedFetchInit.html",
   "VerifiedFetchPluginFactory": "https://ipfs.github.io/helia-verified-fetch/interfaces/index.VerifiedFetchPluginFactory.html",
-  "BubbledProgressEvents": "https://ipfs.github.io/helia-verified-fetch/types/index.BubbledProgressEvents.html",
-  ".:BubbledProgressEvents": "https://ipfs.github.io/helia-verified-fetch/types/index.BubbledProgressEvents.html",
+  "RequestFormatShorthand": "https://ipfs.github.io/helia-verified-fetch/types/index.RequestFormatShorthand.html",
+  ".:RequestFormatShorthand": "https://ipfs.github.io/helia-verified-fetch/types/index.RequestFormatShorthand.html",
   "Resource": "https://ipfs.github.io/helia-verified-fetch/types/index.Resource.html",
   ".:Resource": "https://ipfs.github.io/helia-verified-fetch/types/index.Resource.html",
+  "SupportedBodyTypes": "https://ipfs.github.io/helia-verified-fetch/types/index.SupportedBodyTypes.html",
+  ".:SupportedBodyTypes": "https://ipfs.github.io/helia-verified-fetch/types/index.SupportedBodyTypes.html",
   "VerifiedFetchProgressEvents": "https://ipfs.github.io/helia-verified-fetch/types/index.VerifiedFetchProgressEvents.html",
   ".:VerifiedFetchProgressEvents": "https://ipfs.github.io/helia-verified-fetch/types/index.VerifiedFetchProgressEvents.html",
   "dagCborHtmlPreviewPluginFactory": "https://ipfs.github.io/helia-verified-fetch/variables/index.dagCborHtmlPreviewPluginFactory.html",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helia/verified-fetch",
-  "version": "3.2.3",
+  "version": "4.0.0",
   "description": "A fetch-like API for obtaining verified & trustless IPFS content on the web",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/ipfs/helia-verified-fetch/tree/main/packages/verified-fetch#readme",
@@ -164,61 +164,60 @@
     "release": "aegir release"
   },
   "dependencies": {
-    "@helia/block-brokers": "^4.2.1",
-    "@helia/car": "^4.1.1",
-    "@helia/delegated-routing-v1-http-api-client": "^4.2.5",
-    "@helia/interface": "^5.3.1",
-    "@helia/ipns": "^8.2.2",
-    "@helia/routers": "^3.1.1",
-    "@helia/unixfs": "^5.1.0",
-    "@ipld/car": "^5.4.2",
+    "@helia/block-brokers": "^5.0.4",
+    "@helia/car": "^5.2.0",
+    "@helia/delegated-routing-v1-http-api-client": "^5.0.0",
+    "@helia/dnslink": "^1.0.1",
+    "@helia/interface": "^6.0.0",
+    "@helia/ipns": "^9.0.0",
+    "@helia/routers": "^4.0.0",
+    "@helia/unixfs": "^6.0.0",
     "@ipld/dag-cbor": "^9.2.3",
     "@ipld/dag-json": "^10.2.4",
     "@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",
+    "@libp2p/interface": "^3.0.0",
+    "@libp2p/kad-dht": "^16.0.0",
+    "@libp2p/logger": "^6.0.0",
+    "@libp2p/peer-id": "^6.0.0",
+    "@libp2p/utils": "^7.0.5",
+    "@libp2p/webrtc": "^6.0.0",
+    "@libp2p/websockets": "^10.0.0",
     "@multiformats/dns": "^1.0.6",
     "cborg": "^4.2.11",
-    "file-type": "^20.5.0",
-    "helia": "^5.4.1",
-    "interface-blockstore": "^5.3.1",
-    "interface-datastore": "^8.3.1",
-    "ipfs-unixfs-exporter": "^13.7.2",
-    "ipns": "^10.0.2",
+    "file-type": "^21.0.0",
+    "helia": "^6.0.5",
+    "interface-blockstore": "^6.0.1",
+    "ipfs-unixfs-exporter": "^14.0.1",
+    "ipns": "^10.1.3",
     "it-map": "^3.1.3",
     "it-pipe": "^3.0.1",
     "it-tar": "^6.0.5",
     "it-to-browser-readablestream": "^2.0.11",
-    "libp2p": "^2.8.7",
+    "it-to-buffer": "^4.0.9",
+    "libp2p": "^3.0.0",
     "multiformats": "^13.3.6",
     "progress-events": "^1.0.1",
-    "quick-lru": "^7.0.1",
-    "uint8arrays": "^5.1.0"
+    "quick-lru": "^7.0.1"
   },
   "devDependencies": {
-    "@helia/dag-cbor": "^4.0.5",
-    "@helia/dag-json": "^4.0.5",
-    "@helia/http": "^2.1.1",
-    "@helia/json": "^4.0.5",
+    "@helia/dag-cbor": "^5.0.0",
+    "@helia/dag-json": "^5.0.0",
+    "@helia/http": "^3.0.5",
+    "@helia/json": "^5.0.0",
+    "@ipld/car": "^5.4.2",
     "@libp2p/crypto": "^5.1.3",
     "@types/sinon": "^17.0.4",
-    "aegir": "^47.0.21",
-    "blockstore-core": "^5.0.2",
+    "aegir": "^47.0.24",
     "browser-readablestream-to-it": "^2.0.9",
-    "datastore-core": "^10.0.2",
-    "helia": "^5.4.1",
-    "ipfs-unixfs-importer": "^15.4.0",
+    "ipfs-unixfs-importer": "^16.0.1",
     "it-all": "^3.0.8",
     "it-last": "^3.0.8",
-    "it-to-buffer": "^4.0.9",
     "magic-bytes.js": "^1.12.1",
     "p-defer": "^4.0.1",
-    "sinon": "^20.0.0",
-    "sinon-ts": "^2.0.0"
+    "race-signal": "^2.0.0",
+    "sinon": "^21.0.0",
+    "sinon-ts": "^2.0.0",
+    "uint8arrays": "^5.1.0"
   },
   "browser": {
     "./dist/src/utils/libp2p-defaults.js": "./dist/src/utils/libp2p-defaults.browser.js"

package/src/constants.ts

@@ -0,0 +1 @@
+export const CODEC_IDENTITY = 0x00

package/src/index.ts

@@ -745,12 +745,12 @@
  *      canHandle(context: PluginContext): boolean {
  *        // Only handle requests if the Accept header matches your custom type
  *        // Or check context for pathDetails, custom values, etc...
- *        return context.accept === 'application/vnd.my-custom-type'
+ *        return context.accept?.mimeType === 'application/vnd.my-custom-type'
  *      }
  *
  *      async handle(context: PluginContext): Promise<Response | null> {
  *        // Perform any partial processing here, e.g., modify the context:
- *        context.customProcessed = true;
+ *        context.customProcessed = true
  *
  *        // If you are ready to finalize the response:
  *        return new Response('Hello, world!', {
@@ -758,7 +758,7 @@
  *          headers: {
  *            'Content-Type': 'text/plain'
  *          }
- *        });
+ *        })
  *
  *        // Or, if further processing is needed by another plugin, simply return null.
  *      }
@@ -812,13 +812,13 @@
  *     details: {
  *       someKey: 'Additional details here'
  *     }
- *   });
+ *   })
  * }
  *
  * if (recoverable === false) {
  *   throw new PluginFatalError('MY_CUSTOM_FATAL', 'A critical error occurred', {
  *     response: new Response('Something happened', { status: 500 })  // Required: supply your own error response
- *   });
+ *   })
  * }
  *
  *   // Otherwise, continue processing...
@@ -857,10 +857,10 @@ import { createLibp2p } from 'libp2p'
 import { getLibp2pConfig } from './utils/libp2p-defaults.js'
 import { VerifiedFetch as VerifiedFetchClass } from './verified-fetch.js'
 import type { VerifiedFetchPluginFactory } from './plugins/types.js'
-import type { ContentTypeParser } from './types.js'
+import type { DNSLink, ResolveProgressEvents as ResolveDNSLinkProgressEvents } from '@helia/dnslink'
 import type { GetBlockProgressEvents, Helia, Routing } from '@helia/interface'
-import type { ResolveDNSLinkProgressEvents } from '@helia/ipns'
-import type { Libp2p, ServiceMap } from '@libp2p/interface'
+import type { IPNSResolver } from '@helia/ipns'
+import type { AbortOptions, Libp2p, ServiceMap } from '@libp2p/interface'
 import type { DNSResolvers, DNS } from '@multiformats/dns'
 import type { DNSResolver } from '@multiformats/dns/resolvers'
 import type { HeliaInit } from 'helia'
@@ -868,6 +868,25 @@ import type { ExporterProgressEvents } from 'ipfs-unixfs-exporter'
 import type { Libp2pOptions } from 'libp2p'
 import type { CID } from 'multiformats/cid'
 import type { ProgressEvent, ProgressOptions } from 'progress-events'
+
+export type RequestFormatShorthand = 'raw' | 'car' | 'tar' | 'ipns-record' | 'dag-json' | 'dag-cbor' | 'json' | 'cbor'
+
+export type SupportedBodyTypes = string | Uint8Array | ArrayBuffer | Blob | ReadableStream<Uint8Array> | null
+
+/**
+ * A ContentTypeParser attempts to return the mime type of a given file. It
+ * receives the first chunk of the file data and the file name, if it is
+ * available.  The function can be sync or async and if it returns/resolves to
+ * `undefined`, `application/octet-stream` will be used.
+ */
+export interface ContentTypeParser {
+  /**
+   * Attempt to determine a mime type, either via of the passed bytes or the
+   * filename if it is available.
+   */
+  (bytes: Uint8Array, fileName?: string): Promise<string | undefined> | string | undefined
+}
+
 /**
  * The types for the first argument of the `verifiedFetch` function.
  */
@@ -879,7 +898,7 @@ export interface ResourceDetail {
 
 export interface CIDDetail {
   cid: CID
-  path: string
+  path?: string
 }
 
 export interface CIDDetailError extends CIDDetail {
@@ -995,24 +1014,32 @@ export interface CreateVerifiedFetchOptions {
    * If you want to replace one of the default plugins, you can do so by passing a plugin with the same name.
    */
   plugins?: VerifiedFetchPluginFactory[]
-}
 
-export type { ContentTypeParser } from './types.js'
+  /**
+   * Used to resolve IPNS names
+   */
+  ipnsResolver?: IPNSResolver
 
-export type BubbledProgressEvents =
-  // unixfs-exporter
-  ExporterProgressEvents |
-  // helia blockstore
-  GetBlockProgressEvents |
-  // ipns
-  ResolveDNSLinkProgressEvents
+  /**
+   * Used to resolve DNSLink entries to IPNS names or CIDs
+   */
+  dnsLink?: DNSLink
+
+  /**
+   * Used to turn URLs into CIDs/paths
+   */
+  urlResolver?: URLResolver
+}
 
 export type VerifiedFetchProgressEvents =
   ProgressEvent<'verified-fetch:request:start', CIDDetail> |
   ProgressEvent<'verified-fetch:request:info', string> |
-  ProgressEvent<'verified-fetch:request:progress:chunk', CIDDetail> |
+  ProgressEvent<'verified-fetch:request:progress:chunk'> |
   ProgressEvent<'verified-fetch:request:end', CIDDetail> |
-  ProgressEvent<'verified-fetch:request:error', CIDDetailError>
+  ProgressEvent<'verified-fetch:request:error', CIDDetailError> |
+  ExporterProgressEvents |
+  GetBlockProgressEvents |
+  ResolveDNSLinkProgressEvents
 
 /**
  * Options for the `fetch` function returned by `createVerifiedFetch`.
@@ -1021,7 +1048,7 @@ export type VerifiedFetchProgressEvents =
  * passed to `fetch` in browsers, plus an `onProgress` option to listen for
  * progress events.
  */
-export interface VerifiedFetchInit extends RequestInit, ProgressOptions<BubbledProgressEvents | VerifiedFetchProgressEvents> {
+export interface VerifiedFetchInit extends RequestInit, ProgressOptions<VerifiedFetchProgressEvents> {
   /**
    * If true, try to create a blockstore session - this can reduce overall
    * network traffic by first querying for a set of peers that have the data we
@@ -1072,6 +1099,30 @@ export interface VerifiedFetchInit extends RequestInit, ProgressOptions<BubbledP
   withServerTiming?: boolean
 }
 
+export interface ResolveURLOptions extends ProgressOptions<VerifiedFetchProgressEvents>, AbortOptions {
+
+}
+
+export interface UrlQuery extends Record<string, string | unknown> {
+  format?: RequestFormatShorthand
+  download?: boolean
+  filename?: string
+  'dag-scope'?: string
+}
+
+export interface ResolveURLResult {
+  cid: CID
+  protocol: string
+  ttl: number
+  path: string
+  query: UrlQuery
+  ipfsPath: string
+}
+
+export interface URLResolver {
+  resolve (resource: Resource, options?: ResolveURLOptions): Promise<ResolveURLResult>
+}
+
 /**
  * Create and return a Helia node
  */
@@ -1116,7 +1167,7 @@ export async function createVerifiedFetch (init?: Helia | CreateVerifiedFetchIni
     init.logger.forComponent('helia:verified-fetch').trace('created verified-fetch with libp2p config: %j', libp2pConfig)
   }
 
-  const verifiedFetchInstance = new VerifiedFetchClass({ helia: init }, options)
+  const verifiedFetchInstance = new VerifiedFetchClass(init, options)
   async function verifiedFetch (resource: Resource, options?: VerifiedFetchInit): Promise<Response> {
     return verifiedFetchInstance.fetch(resource, options)
   }

package/src/plugins/plugin-handle-car.ts

@@ -1,11 +1,12 @@
 import { BlockExporter, car, CIDPath, SubgraphExporter, UnixFSExporter } from '@helia/car'
-import { CarWriter } from '@ipld/car'
 import { code as dagPbCode } from '@ipld/dag-pb'
+import { createScalableCuckooFilter } from '@libp2p/utils'
 import toBrowserReadableStream from 'it-to-browser-readablestream'
+import { getOffsetAndLength } from '../utils/get-offset-and-length.ts'
 import { okRangeResponse } from '../utils/responses.js'
 import { BasePlugin } from './plugin-base.js'
 import type { PluginContext } from './types.js'
-import type { ExportCarOptions } from '@helia/car'
+import type { ExportCarOptions, UnixFSExporterOptions } from '@helia/car'
 
 function getFilename ({ cid, ipfsPath, query }: Pick<PluginContext, 'query' | 'cid' | 'ipfsPath'>): string {
   if (query.filename != null) {
@@ -13,7 +14,10 @@ function getFilename ({ cid, ipfsPath, query }: Pick<PluginContext, 'query' | 'c
   }
 
   // convert context.ipfsPath to a filename. replace all / with _, replace prefix protocol with empty string
-  const filename = ipfsPath.replace(/\/ipfs\//, '').replace(/\/ipns\//, '').replace(/\//g, '_')
+  const filename = ipfsPath
+    .replace(/\/ipfs\//, '')
+    .replace(/\/ipns\//, '')
+    .replace(/\//g, '_')
 
   return `${filename}.car`
 }
@@ -22,9 +26,16 @@ function getFilename ({ cid, ipfsPath, query }: Pick<PluginContext, 'query' | 'c
 type DagScope = 'all' | 'entity' | 'block'
 function getDagScope ({ query }: Pick<PluginContext, 'query'>): DagScope | null {
   const dagScope = query['dag-scope']
+
   if (dagScope === 'all' || dagScope === 'entity' || dagScope === 'block') {
     return dagScope
   }
+
+  // entity-bytes implies entity scope
+  if (query['entity-bytes']) {
+    return 'entity'
+  }
+
   return 'all'
 }
 
@@ -37,21 +48,28 @@ export class CarPlugin extends BasePlugin {
 
   canHandle (context: PluginContext): boolean {
     this.log('checking if we can handle %c with accept %s', context.cid, context.accept)
+
     if (context.byteRangeContext == null) {
       return false
     }
+
     if (context.pathDetails == null) {
       return false
     }
 
-    return context.accept?.startsWith('application/vnd.ipld.car') === true || context.query.format === 'car' // application/vnd.ipld.car
+    return context.accept?.mimeType.startsWith('application/vnd.ipld.car') === true || context.query.format === 'car' // application/vnd.ipld.car
   }
 
   async handle (context: PluginContext & Required<Pick<PluginContext, 'byteRangeContext'>>): Promise<Response> {
-    const { options, pathDetails, cid } = context
+    const { options, pathDetails, cid, query, accept } = context
+
+    const order = accept?.options.order === 'dfs' ? 'dfs' : 'unk'
+    const duplicates = accept?.options.dups !== 'n'
+
     if (pathDetails == null) {
       throw new Error('attempted to handle request for car with no path details')
     }
+
     const { getBlockstore, helia } = this.pluginOptions
     context.reqFormat = 'car'
     context.query.download = true
@@ -63,46 +81,52 @@ export class CarPlugin extends BasePlugin {
       getCodec: helia.getCodec,
       logger: helia.logger
     })
-    const ipfsRootsWithoutDagRoot = pathDetails.ipfsRoots.filter(pathCid => !pathCid.equals(cid))
+
     const carExportOptions: ExportCarOptions = {
-      ...options
+      ...options,
+      includeTraversalBlocks: true
     }
-    if (ipfsRootsWithoutDagRoot.length > 0) {
-      carExportOptions.traversal = new CIDPath(ipfsRootsWithoutDagRoot)
+
+    if (!duplicates) {
+      carExportOptions.blockFilter = createScalableCuckooFilter(1024)
     }
+
+    if (pathDetails.ipfsRoots.length > 1) {
+      carExportOptions.traversal = new CIDPath(pathDetails.ipfsRoots)
+    }
+
     const dagScope = getDagScope(context)
-    // root should be the terminal element if it exists, otherwise the root cid.. because of this, we can't use the @helia/car stream() method.
-    const root = pathDetails.terminalElement.cid ?? cid
+    const target = pathDetails.terminalElement.cid ?? cid
+
     if (dagScope === 'block') {
       carExportOptions.exporter = new BlockExporter()
     } else if (dagScope === 'entity') {
-      // if its unixFS, we need to enumerate a directory, or get all blocks for the entity, otherwise, use blockExporter
-      if (root.code === dagPbCode) {
-        carExportOptions.exporter = new UnixFSExporter()
+      // if its unixFS, we need to enumerate a directory, or get all/some blocks
+      // for the entity, otherwise, use blockExporter
+      if (target.code === dagPbCode) {
+        const options: UnixFSExporterOptions = {
+          listingOnly: true
+        }
+
+        const slice = getOffsetAndLength(pathDetails.terminalElement, query['entity-bytes']?.toString())
+        options.offset = slice.offset
+        options.length = slice.length
+
+        carExportOptions.exporter = new UnixFSExporter(options)
       } else {
         carExportOptions.exporter = new BlockExporter()
       }
     } else {
       carExportOptions.exporter = new SubgraphExporter()
     }
-    const { writer, out } = CarWriter.create(root)
-    const iter = async function * (): AsyncIterable<Uint8Array> {
-      for await (const buf of out) {
-        yield buf
-      }
-    }
 
-    // the root passed to export should be the root CID of the DAG, not the terminal element.
-    c.export(cid, writer, carExportOptions)
-      .catch((err) => {
-        this.log.error('error exporting car - %e', err)
-      })
-    // export will close the writer when it's done, no finally needed.
+    context.byteRangeContext.setBody(toBrowserReadableStream(c.export(target, carExportOptions)))
 
-    context.byteRangeContext.setBody(toBrowserReadableStream(iter()))
-
-    const response = okRangeResponse(context.resource, context.byteRangeContext.getBody('application/vnd.ipld.car; version=1'), { byteRangeContext: context.byteRangeContext, log: this.log })
-    response.headers.set('content-type', context.byteRangeContext.getContentType() ?? 'application/vnd.ipld.car; version=1')
+    const response = okRangeResponse(context.resource, context.byteRangeContext.getBody('application/vnd.ipld.car; version=1'), {
+      byteRangeContext: context.byteRangeContext,
+      log: this.log
+    })
+    response.headers.set('content-type', context.byteRangeContext.getContentType() ?? `application/vnd.ipld.car; version=1; order=${order}; dups=${duplicates ? 'y' : 'n'}`)
 
     return response
   }

package/src/plugins/plugin-handle-dag-cbor-html-preview.ts

@@ -62,7 +62,7 @@ export class DagCborHtmlPreviewPlugin extends BasePlugin {
       return false
     }
 
-    if (accept == null || !accept.includes('text/html')) {
+    if (accept == null || !accept?.mimeType.includes('text/html')) {
       return false
     }
 
@@ -97,7 +97,7 @@ export class DagCborHtmlPreviewPlugin extends BasePlugin {
     })
   }
 
-  getHtml ({ path, obj, cid }: { path: string, obj: Record<string, any>, cid: CID }): string {
+  getHtml ({ path, obj, cid }: { path?: string, obj: Record<string, any>, cid: CID }): string {
     const style = `
       :root {
         --sans-serif: "Plex", system-ui, -apple-system, Segoe UI, Roboto, Ubuntu, Cantarell, Noto Sans, sans-serif;

package/src/plugins/plugin-handle-dag-cbor.ts

@@ -30,7 +30,7 @@ export class DagCborPlugin extends BasePlugin {
       return false
     }
 
-    if (accept != null && accept.includes('text/html') && plugins.includes('dag-cbor-plugin-html-preview')) {
+    if (accept != null && accept.mimeType === 'text/html' && plugins.includes('dag-cbor-plugin-html-preview')) {
       // let the dag-cbor-html-preview plugin handle it
       return false
     }
@@ -47,10 +47,10 @@ export class DagCborPlugin extends BasePlugin {
 
     let body: string | Uint8Array
 
-    if (accept === 'application/octet-stream' || accept === 'application/vnd.ipld.dag-cbor' || accept === 'application/cbor') {
+    if (accept?.mimeType === 'application/octet-stream' || accept?.mimeType === 'application/vnd.ipld.dag-cbor' || accept?.mimeType === 'application/cbor') {
       // skip decoding
       body = block
-    } else if (accept === 'application/vnd.ipld.dag-json') {
+    } else if (accept?.mimeType === 'application/vnd.ipld.dag-json') {
       try {
         // if vnd.ipld.dag-json has been specified, convert to the format - note
         // that this supports more data types than regular JSON, the content-type
@@ -65,7 +65,7 @@ export class DagCborPlugin extends BasePlugin {
       try {
         body = dagCborToSafeJSON(block)
       } catch (err) {
-        if (accept === 'application/json') {
+        if (accept?.mimeType === 'application/json') {
           this.log('could not decode DAG-CBOR as JSON-safe, but the client sent "Accept: application/json"', err)
 
           return notAcceptableResponse(resource)
@@ -78,7 +78,7 @@ export class DagCborPlugin extends BasePlugin {
 
     context.byteRangeContext.setBody(body)
 
-    const responseContentType = accept ?? (body instanceof Uint8Array ? 'application/octet-stream' : 'application/json')
+    const responseContentType = accept?.mimeType ?? (body instanceof Uint8Array ? 'application/octet-stream' : 'application/json')
     const response = okRangeResponse(resource, context.byteRangeContext.getBody(responseContentType), { byteRangeContext: context.byteRangeContext, log: this.log })
 
     response.headers.set('content-type', context.byteRangeContext.getContentType() ?? responseContentType)

package/src/plugins/plugin-handle-dag-pb.ts

@@ -55,8 +55,8 @@ export class DagPbPlugin extends BasePlugin {
   }
 
   async handle (context: PluginContext & Required<Pick<PluginContext, 'byteRangeContext' | 'pathDetails'>>): Promise<Response | null> {
-    const { cid, options, withServerTiming = false, pathDetails, query } = context
-    const { handleServerTiming, contentTypeParser, helia, getBlockstore } = this.pluginOptions
+    const { cid, options, pathDetails, query } = context
+    const { contentTypeParser, helia, getBlockstore } = this.pluginOptions
     const log = this.log
     let resource = context.resource
     let path = context.path
@@ -93,10 +93,10 @@ export class DagPbPlugin extends BasePlugin {
       try {
         log.trace('found directory at %c/%s, looking for index.html', cid, path)
 
-        const entry = await handleServerTiming('exporter-dir', '', async () => exporter(`/ipfs/${dirCid}/${rootFilePath}`, helia.blockstore, {
+        const entry = await context.serverTiming.time('exporter-dir', '', exporter(`/ipfs/${dirCid}/${rootFilePath}`, helia.blockstore, {
           signal: options?.signal,
           onProgress: options?.onProgress
-        }), withServerTiming)
+        }))
 
         log.trace('found root file at %c/%s with cid %c', dirCid, rootFilePath, entry.cid)
         path = rootFilePath
@@ -136,10 +136,10 @@ export class DagPbPlugin extends BasePlugin {
     }
 
     try {
-      const entry = await handleServerTiming('exporter-file', '', async () => exporter(resolvedCID, helia.blockstore, {
+      const entry = await context.serverTiming.time('exporter-file', '', exporter(resolvedCID, helia.blockstore, {
         signal: options?.signal,
         onProgress: options?.onProgress
-      }), withServerTiming)
+      }))
 
       let firstChunk: Uint8Array
       let contentType: string
@@ -152,13 +152,13 @@ export class DagPbPlugin extends BasePlugin {
         })
         log('got async iterator for %c/%s', cid, path)
 
-        const streamAndFirstChunk = await handleServerTiming('stream-and-chunk', '', async () => getStreamFromAsyncIterable(asyncIter, path ?? '', this.pluginOptions.logger, {
+        const streamAndFirstChunk = await context.serverTiming.time('stream-and-chunk', '', getStreamFromAsyncIterable(asyncIter, path ?? '', this.pluginOptions.logger, {
           onProgress: options?.onProgress,
           signal: options?.signal
-        }), withServerTiming)
+        }))
         const stream = streamAndFirstChunk.stream
         firstChunk = streamAndFirstChunk.firstChunk
-        contentType = await handleServerTiming('get-content-type', '', async () => getContentType({ filename: query.filename, bytes: firstChunk, path, contentTypeParser, log }), withServerTiming)
+        contentType = await context.serverTiming.time('get-content-type', '', getContentType({ filename: query.filename, bytes: firstChunk, path, contentTypeParser, log }))
 
         byteRangeContext.setBody(stream)
       }
@@ -186,8 +186,8 @@ export class DagPbPlugin extends BasePlugin {
   }
 
   private async handleRangeRequest (context: PluginContext & Required<Pick<PluginContext, 'byteRangeContext' | 'pathDetails'>>, entry: UnixFSEntry): Promise<string> {
-    const { path, byteRangeContext, options, withServerTiming = false } = context
-    const { handleServerTiming, contentTypeParser } = this.pluginOptions
+    const { path, byteRangeContext, options } = context
+    const { contentTypeParser } = this.pluginOptions
     const log = this.log
 
     // get the first chunk in order to determine the content type
@@ -203,7 +203,7 @@ export class DagPbPlugin extends BasePlugin {
       onProgress: options?.onProgress,
       signal: options?.signal
     })
-    const contentType = await handleServerTiming('get-content-type', '', async () => getContentType({ bytes: firstChunk, path, contentTypeParser, log }), withServerTiming)
+    const contentType = await context.serverTiming.time('get-content-type', '', getContentType({ bytes: firstChunk, path, contentTypeParser, log }))
 
     byteRangeContext?.setBody((range): AsyncGenerator<Uint8Array, void, unknown> => {
       if (options?.signal?.aborted) {

package/src/plugins/plugin-handle-dag-walk.ts

@@ -1,5 +1,6 @@
 import { code as dagCborCode } from '@ipld/dag-cbor'
 import { code as dagPbCode } from '@ipld/dag-pb'
+import { CODEC_IDENTITY } from '../constants.ts'
 import { handlePathWalking } from '../utils/walk-path.js'
 import { BasePlugin } from './plugin-base.js'
 import type { PluginContext } from './types.js'
@@ -23,16 +24,16 @@ export class DagWalkPlugin extends BasePlugin {
       return false
     }
 
-    return (cid.code === dagPbCode || cid.code === dagCborCode)
+    return (cid.code === dagPbCode || cid.code === dagCborCode || cid.multihash.code === CODEC_IDENTITY)
   }
 
   async handle (context: PluginContext): Promise<Response | null> {
-    const { cid, resource, options, withServerTiming = false } = context
-    const { getBlockstore, handleServerTiming } = this.pluginOptions
+    const { cid, resource, options } = context
+    const { getBlockstore } = this.pluginOptions
     const blockstore = getBlockstore(cid, resource, options?.session ?? true, options)
 
     // TODO: migrate handlePathWalking into this plugin
-    const pathDetails = await handleServerTiming('path-walking', '', async () => handlePathWalking({ ...context, blockstore, log: this.log }), withServerTiming)
+    const pathDetails = await context.serverTiming.time('path-walking', '', handlePathWalking({ ...context, blockstore, log: this.log }))
 
     if (pathDetails instanceof Response) {
       this.log.trace('path walking failed')