@helia/verified-fetch 2.6.13 → 2.6.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helia/verified-fetch",
-  "version": "2.6.13",
+  "version": "2.6.15",
   "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",
@@ -22,6 +22,22 @@
   ],
   "type": "module",
   "types": "./dist/src/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "*": [
+        "*",
+        "dist/*",
+        "dist/src/*",
+        "dist/src/*/index"
+      ],
+      "src/*": [
+        "*",
+        "dist/*",
+        "dist/src/*",
+        "dist/src/*/index"
+      ]
+    }
+  },
   "files": [
     "src",
     "dist",
@@ -127,7 +143,15 @@
       "@semantic-release/changelog",
       "@semantic-release/npm",
       "@semantic-release/github",
-      "@semantic-release/git"
+      [
+        "@semantic-release/git",
+        {
+          "assets": [
+            "CHANGELOG.md",
+            "package.json"
+          ]
+        }
+      ]
     ]
   },
   "scripts": {
@@ -147,16 +171,16 @@
     "release": "aegir release"
   },
   "dependencies": {
-    "@helia/block-brokers": "^4.1.0",
-    "@helia/car": "^4.0.4",
-    "@helia/delegated-routing-v1-http-api-client": "^4.2.3",
-    "@helia/interface": "^5.2.1",
-    "@helia/ipns": "^8.2.0",
-    "@helia/routers": "^3.0.1",
-    "@helia/unixfs": "^5.0.0",
-    "@ipld/dag-cbor": "^9.2.2",
-    "@ipld/dag-json": "^10.2.3",
-    "@ipld/dag-pb": "^4.1.3",
+    "@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.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",
@@ -165,42 +189,42 @@
     "@libp2p/websockets": "^9.2.10",
     "@multiformats/dns": "^1.0.6",
     "cborg": "^4.2.10",
-    "file-type": "^20.4.1",
+    "file-type": "^20.5.0",
     "hashlru": "^2.3.0",
-    "helia": "^5.3.0",
+    "helia": "^5.4.1",
     "interface-blockstore": "^5.3.1",
     "interface-datastore": "^8.3.1",
     "ipfs-unixfs-exporter": "^13.6.2",
     "ipns": "^10.0.2",
-    "it-map": "^3.1.2",
+    "it-map": "^3.1.3",
     "it-pipe": "^3.0.1",
     "it-tar": "^6.0.5",
-    "it-to-browser-readablestream": "^2.0.10",
+    "it-to-browser-readablestream": "^2.0.11",
     "libp2p": "^2.8.5",
     "lru-cache": "^11.1.0",
-    "multiformats": "^13.3.2",
+    "multiformats": "^13.3.3",
     "progress-events": "^1.0.1",
     "uint8arrays": "^5.1.0"
   },
   "devDependencies": {
-    "@helia/dag-cbor": "^4.0.3",
-    "@helia/dag-json": "^4.0.3",
-    "@helia/http": "^2.0.5",
-    "@helia/json": "^4.0.3",
-    "@ipld/car": "^5.4.0",
+    "@helia/dag-cbor": "^4.0.5",
+    "@helia/dag-json": "^4.0.5",
+    "@helia/http": "^2.1.1",
+    "@helia/json": "^4.0.5",
+    "@ipld/car": "^5.4.1",
     "@libp2p/crypto": "^5.1.1",
     "@types/sinon": "^17.0.4",
-    "aegir": "^45.2.0",
+    "aegir": "^46.0.1",
     "blockstore-core": "^5.0.2",
-    "browser-readablestream-to-it": "^2.0.8",
+    "browser-readablestream-to-it": "^2.0.9",
     "datastore-core": "^10.0.2",
-    "helia": "^5.3.0",
+    "helia": "^5.4.1",
     "ipfs-unixfs-importer": "^15.3.2",
-    "it-all": "^3.0.7",
-    "it-drain": "^3.0.8",
-    "it-last": "^3.0.7",
-    "it-to-buffer": "^4.0.8",
-    "magic-bytes.js": "^1.11.0",
+    "it-all": "^3.0.8",
+    "it-drain": "^3.0.9",
+    "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"

package/src/index.ts

@@ -821,20 +821,22 @@
 
 import { bitswap, trustlessGateway } from '@helia/block-brokers'
 import { createDelegatedRoutingV1HttpApiClient } from '@helia/delegated-routing-v1-http-api-client'
-import { type ResolveDNSLinkProgressEvents } from '@helia/ipns'
 import { httpGatewayRouting, libp2pRouting } from '@helia/routers'
-import { type Libp2p, type ServiceMap } from '@libp2p/interface'
 import { dns } from '@multiformats/dns'
-import { createHelia, type HeliaInit } from 'helia'
-import { createLibp2p, type Libp2pOptions } from 'libp2p'
-import { type ContentTypeParser } from './types.js'
+import { createHelia } from 'helia'
+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 { GetBlockProgressEvents, Helia, Routing } from '@helia/interface'
+import type { ResolveDNSLinkProgressEvents } from '@helia/ipns'
+import type { Libp2p, ServiceMap } from '@libp2p/interface'
 import type { DNSResolvers, DNS } from '@multiformats/dns'
 import type { DNSResolver } from '@multiformats/dns/resolvers'
+import type { HeliaInit } from 'helia'
 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'
 /**

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

@@ -37,7 +37,11 @@ export class CarPlugin extends BasePlugin {
     context.query.download = true
     context.query.filename = getFilename(context)
     const blockstore = getBlockstore(cid, context.resource, options?.session ?? true, options)
-    const c = car({ blockstore, getCodec: helia.getCodec })
+    const c = car({
+      blockstore,
+      getCodec: helia.getCodec,
+      logger: helia.logger
+    })
     const stream = toBrowserReadableStream(c.stream(pathDetails?.terminalElement.cid ?? cid, options))
     context.byteRangeContext.setBody(stream)
 

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

@@ -52,7 +52,7 @@ export class DagPbPlugin extends BasePlugin {
   }
 
   async handle (context: PluginContext & Required<Pick<PluginContext, 'byteRangeContext' | 'pathDetails'>>): Promise<Response | null> {
-    const { cid, options, withServerTiming = false, pathDetails } = context
+    const { cid, options, withServerTiming = false, pathDetails, query } = context
     const { handleServerTiming, contentTypeParser, helia, getBlockstore } = this.pluginOptions
     const log = this.log
     let resource = context.resource
@@ -155,7 +155,7 @@ export class DagPbPlugin extends BasePlugin {
         redirected
       })
 
-      await handleServerTiming('set-content-type', '', async () => setContentType({ bytes: firstChunk, path, response, contentTypeParser, log }), withServerTiming)
+      await handleServerTiming('set-content-type', '', async () => setContentType({ filename: query.filename, bytes: firstChunk, path, response, contentTypeParser, log }), withServerTiming)
 
       setIpfsRoots(response, ipfsRoots)
 

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

@@ -86,7 +86,7 @@ export class RawPlugin extends BasePlugin {
     // if the user has specified an `Accept` header that corresponds to a raw
     // type, honour that header, so for example they don't request
     // `application/vnd.ipld.raw` but get `application/octet-stream`
-    await setContentType({ bytes: result, path, response, defaultContentType: getOverridenRawContentType({ headers: options?.headers, accept }), contentTypeParser, log })
+    await setContentType({ filename: query.filename, bytes: result, path, response, defaultContentType: getOverridenRawContentType({ headers: options?.headers, accept }), contentTypeParser, log })
 
     return response
   }

package/src/utils/get-stream-from-async-iterable.ts

@@ -1,7 +1,8 @@
-import { AbortError, type ComponentLogger } from '@libp2p/interface'
+import { AbortError } from '@libp2p/interface'
 import { CustomProgressEvent } from 'progress-events'
 import { NoContentError } from '../errors.js'
 import type { VerifiedFetchInit } from '../index.js'
+import type { ComponentLogger } from '@libp2p/interface'
 
 /**
  * Converts an async iterator of Uint8Array bytes to a stream and returns the first chunk of bytes

package/src/utils/get-tar-stream.ts

@@ -1,10 +1,12 @@
 import { NotUnixFSError } from '@helia/unixfs/errors'
-import { exporter, recursive, type UnixFSEntry } from 'ipfs-unixfs-exporter'
+import { exporter, recursive } from 'ipfs-unixfs-exporter'
 import map from 'it-map'
 import { pipe } from 'it-pipe'
-import { pack, type TarEntryHeader, type TarImportCandidate } from 'it-tar'
+import { pack } from 'it-tar'
 import type { AbortOptions } from '@libp2p/interface'
 import type { Blockstore } from 'interface-blockstore'
+import type { UnixFSEntry } from 'ipfs-unixfs-exporter'
+import type { TarEntryHeader, TarImportCandidate } from 'it-tar'
 
 const EXPORTABLE = ['file', 'raw', 'directory']
 

package/src/utils/handle-redirects.ts

@@ -1,8 +1,8 @@
-import { type AbortOptions, type ComponentLogger } from '@libp2p/interface'
 import { SubdomainNotSupportedError } from '../errors.js'
-import { type VerifiedFetchInit, type Resource } from '../index.js'
 import { matchURLString } from './parse-url-string.js'
 import { movedPermanentlyResponse } from './responses.js'
+import type { VerifiedFetchInit, Resource } from '../index.js'
+import type { AbortOptions, ComponentLogger } from '@libp2p/interface'
 import type { CID } from 'multiformats/cid'
 
 interface GetRedirectResponse {

package/src/utils/libp2p-defaults.browser.ts

@@ -1,7 +1,8 @@
 import { webRTCDirect } from '@libp2p/webrtc'
 import { webSockets } from '@libp2p/websockets'
-import { libp2pDefaults, type DefaultLibp2pServices } from 'helia'
+import { libp2pDefaults } from 'helia'
 import type { ServiceFactoryMap } from './libp2p-types'
+import type { DefaultLibp2pServices } from 'helia'
 import type { Libp2pOptions } from 'libp2p'
 
 type ServiceMap = Pick<DefaultLibp2pServices, 'dcutr' | 'identify' | 'keychain' | 'ping'>

package/src/utils/libp2p-defaults.ts

@@ -1,8 +1,9 @@
 import { kadDHT } from '@libp2p/kad-dht'
-import { libp2pDefaults, type DefaultLibp2pServices } from 'helia'
+import { libp2pDefaults } from 'helia'
 import { ipnsSelector } from 'ipns/selector'
 import { ipnsValidator } from 'ipns/validator'
 import type { ServiceFactoryMap } from './libp2p-types'
+import type { DefaultLibp2pServices } from 'helia'
 import type { Libp2pOptions } from 'libp2p'
 
 type ServiceMap = Pick<DefaultLibp2pServices, 'autoNAT' | 'dcutr' | 'dht' | 'identify' | 'keychain' | 'ping' | 'upnp'>

package/src/utils/parse-url-string.ts

@@ -1,7 +1,8 @@
 import { CID } from 'multiformats/cid'
 import { getPeerIdFromString } from './get-peer-id-from-string.js'
-import { serverTiming, type ServerTimingResult } from './server-timing.js'
+import { serverTiming } from './server-timing.js'
 import { TLRU } from './tlru.js'
+import type { ServerTimingResult } from './server-timing.js'
 import type { RequestFormatShorthand } from '../types.js'
 import type { DNSLinkResolveResult, IPNS, IPNSResolveResult, IPNSRoutingEvents, ResolveDNSLinkProgressEvents, ResolveProgressEvents, ResolveResult } from '@helia/ipns'
 import type { AbortOptions, ComponentLogger, PeerId } from '@libp2p/interface'

package/src/utils/set-content-type.ts

@@ -1,7 +1,7 @@
-import { type Logger } from '@libp2p/interface'
-import { type ContentTypeParser } from '../types.js'
 import { defaultMimeType } from './content-type-parser.js'
 import { isPromise } from './type-guards.js'
+import type { ContentTypeParser } from '../types.js'
+import type { Logger } from '@libp2p/interface'
 
 export interface SetContentTypeOptions {
   bytes: Uint8Array
@@ -10,15 +10,27 @@ export interface SetContentTypeOptions {
   defaultContentType?: string
   contentTypeParser: ContentTypeParser | undefined
   log: Logger
+
+  /**
+   * This should be set to the `filename` query parameter for the given request.
+   *
+   * @see https://specs.ipfs.tech/http-gateways/path-gateway/#filename-request-query-parameter
+   */
+  filename?: string
 }
 
-export async function setContentType ({ bytes, path, response, contentTypeParser, log, defaultContentType = 'application/octet-stream' }: SetContentTypeOptions): Promise<void> {
+export async function setContentType ({ bytes, path, response, contentTypeParser, log, defaultContentType = 'application/octet-stream', filename: filenameParam }: SetContentTypeOptions): Promise<void> {
   let contentType: string | undefined
 
   if (contentTypeParser != null) {
     try {
-      let fileName = path.split('/').pop()?.trim()
-      fileName = fileName === '' ? undefined : fileName
+      let fileName
+      if (filenameParam == null) {
+        fileName = path.split('/').pop()?.trim()
+        fileName = (fileName === '' || fileName?.split('.').length === 1) ? undefined : fileName
+      } else {
+        fileName = filenameParam
+      }
       const parsed = contentTypeParser(bytes, fileName)
 
       if (isPromise(parsed)) {

package/src/utils/walk-path.ts

@@ -1,9 +1,10 @@
 import { DoesNotExistError } from '@helia/unixfs/errors'
-import { type Logger } from '@libp2p/interface'
-import { type Blockstore } from 'interface-blockstore'
-import { walkPath as exporterWalk, type ExporterOptions, type ReadableStorage, type ObjectNode, type UnixFSEntry } from 'ipfs-unixfs-exporter'
+import { walkPath as exporterWalk } from 'ipfs-unixfs-exporter'
 import { badGatewayResponse, notFoundResponse } from './responses.js'
 import type { PluginContext } from '../plugins/types.js'
+import type { Logger } from '@libp2p/interface'
+import type { Blockstore } from 'interface-blockstore'
+import type { ExporterOptions, ReadableStorage, ObjectNode, UnixFSEntry } from 'ipfs-unixfs-exporter'
 import type { CID } from 'multiformats/cid'
 
 export interface PathWalkerOptions extends ExporterOptions {

package/src/verified-fetch.ts

@@ -1,8 +1,6 @@
-import { ipns as heliaIpns, type IPNS } from '@helia/ipns'
-import { type AbortOptions, type Logger } from '@libp2p/interface'
+import { ipns as heliaIpns } from '@helia/ipns'
 import { prefixLogger } from '@libp2p/logger'
 import { LRUCache } from 'lru-cache'
-import { type CID } from 'multiformats/cid'
 import { CustomProgressEvent } from 'progress-events'
 import { ByteRangeContextPlugin } from './plugins/plugin-handle-byte-range-context.js'
 import { CarPlugin } from './plugins/plugin-handle-car.js'
@@ -19,7 +17,6 @@ import { getETag } from './utils/get-e-tag.js'
 import { getResolvedAcceptHeader } from './utils/get-resolved-accept-header.js'
 import { getRedirectResponse } from './utils/handle-redirects.js'
 import { parseResource } from './utils/parse-resource.js'
-import { type ParsedUrlStringResults } from './utils/parse-url-string.js'
 import { resourceToSessionCacheKey } from './utils/resource-to-cache-key.js'
 import { setCacheControlHeader } from './utils/response-headers.js'
 import { badRequestResponse, notAcceptableResponse, notSupportedResponse, badGatewayResponse } from './utils/responses.js'
@@ -27,8 +24,12 @@ import { selectOutputType } from './utils/select-output-type.js'
 import { serverTiming } from './utils/server-timing.js'
 import type { CIDDetail, ContentTypeParser, CreateVerifiedFetchOptions, Resource, ResourceDetail, VerifiedFetchInit as VerifiedFetchOptions } from './index.js'
 import type { VerifiedFetchPlugin, PluginContext, PluginOptions } from './plugins/types.js'
+import type { ParsedUrlStringResults } from './utils/parse-url-string.js'
 import type { Helia, SessionBlockstore } from '@helia/interface'
+import type { IPNS } from '@helia/ipns'
+import type { AbortOptions, Logger } from '@libp2p/interface'
 import type { Blockstore } from 'interface-blockstore'
+import type { CID } from 'multiformats/cid'
 
 const SESSION_CACHE_MAX_SIZE = 100
 const SESSION_CACHE_TTL_MS = 60 * 1000

package/LICENSE

@@ -1,4 +0,0 @@
-This project is dual licensed under MIT and Apache-2.0.
-
-MIT: https://www.opensource.org/licenses/mit
-Apache-2.0: https://www.apache.org/licenses/license-2.0