@helia/verified-fetch 0.0.0-f243de2 → 0.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helia/verified-fetch",
-  "version": "0.0.0-f243de2",
+  "version": "0.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/tree/main/packages/verified-fetch#readme",
@@ -11,10 +11,6 @@
   "bugs": {
     "url": "https://github.com/ipfs/helia/issues"
   },
-  "publishConfig": {
-    "access": "public",
-    "provenance": true
-  },
   "keywords": [
     "IPFS",
     "fetch",
@@ -141,15 +137,15 @@
     "release": "aegir release"
   },
   "dependencies": {
-    "@helia/block-brokers": "2.0.1-f243de2",
-    "@helia/dag-cbor": "3.0.0-f243de2",
-    "@helia/dag-json": "3.0.0-f243de2",
-    "@helia/http": "1.0.1-f243de2",
-    "@helia/interface": "4.0.0-f243de2",
-    "@helia/ipns": "6.0.0-f243de2",
-    "@helia/json": "3.0.0-f243de2",
-    "@helia/routers": "1.0.0-f243de2",
-    "@helia/unixfs": "3.0.0-f243de2",
+    "@helia/block-brokers": "^2.0.1",
+    "@helia/dag-cbor": "^3.0.0",
+    "@helia/dag-json": "^3.0.0",
+    "@helia/http": "^1.0.1",
+    "@helia/interface": "^4.0.0",
+    "@helia/ipns": "^6.0.0",
+    "@helia/json": "^3.0.0",
+    "@helia/routers": "^1.0.0",
+    "@helia/unixfs": "^3.0.0",
     "@ipld/dag-cbor": "^9.1.0",
     "@ipld/dag-json": "^10.1.7",
     "@ipld/dag-pb": "^4.0.8",
@@ -167,10 +163,9 @@
     "@types/mime-types": "^2.1.4",
     "@types/sinon": "^17.0.2",
     "aegir": "^42.1.0",
-    "helia": "4.0.1-f243de2",
+    "helia": "^4.0.1",
     "interface-blockstore": "^5.2.9",
     "sinon": "^17.0.1",
     "sinon-ts": "^2.0.0"
-  },
-  "sideEffects": false
+  }
 }

package/src/index.ts

@@ -219,7 +219,7 @@ import { trustlessGateway } from '@helia/block-brokers'
 import { createHeliaHTTP } from '@helia/http'
 import { delegatedHTTPRouting } from '@helia/routers'
 import { VerifiedFetch as VerifiedFetchClass } from './verified-fetch.js'
-import type { Helia } from '@helia/interface'
+import type { Helia, Routing } from '@helia/interface'
 import type { IPNSRoutingEvents, ResolveDnsLinkProgressEvents, ResolveProgressEvents } from '@helia/ipns'
 import type { GetEvents } from '@helia/unixfs'
 import type { CID } from 'multiformats/cid'
@@ -280,13 +280,20 @@ export interface VerifiedFetchInit extends RequestInit, ProgressOptions<BubbledP
  */
 export async function createVerifiedFetch (init: Helia | CreateVerifiedFetchWithOptions): Promise<VerifiedFetch> {
   if (!isHelia(init)) {
+    const config = init
+    let routers: undefined | Array<Partial<Routing>>
+
+    if (config.routers != null) {
+      routers = config.routers.map((routerUrl) => delegatedHTTPRouting(routerUrl))
+    }
+
     init = await createHeliaHTTP({
       blockBrokers: [
         trustlessGateway({
-          gateways: init.gateways
+          gateways: config.gateways
         })
       ],
-      routers: init.routers?.map((routerUrl) => delegatedHTTPRouting(routerUrl))
+      routers
     })
   }
 

package/src/utils/get-stream-and-content-type.ts

@@ -10,6 +10,7 @@ export async function getStreamAndContentType (iterator: AsyncIterable<Uint8Arra
   const log = logger.forComponent('helia:verified-fetch:get-stream-and-content-type')
   const reader = iterator[Symbol.asyncIterator]()
   const { value, done } = await reader.next()
+  options?.onProgress?.(new CustomProgressEvent<void>('verified-fetch:request:progress:chunk'))
 
   if (done === true) {
     log.error('No content found for path', path)
@@ -20,7 +21,6 @@ export async function getStreamAndContentType (iterator: AsyncIterable<Uint8Arra
   const stream = new ReadableStream({
     async start (controller) {
       // the initial value is already available
-      options?.onProgress?.(new CustomProgressEvent<void>('verified-fetch:request:progress:chunk'))
       controller.enqueue(value)
     },
     async pull (controller) {

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

@@ -31,6 +31,7 @@ const URL_REGEX = /^(?<protocol>ip[fn]s):\/\/(?<cidOrPeerIdOrDnsLink>[^/$?]+)\/?
  * After determining the protocol successfully, we process the cidOrPeerIdOrDnsLink:
  * * If it's ipfs, it parses the CID or throws an Aggregate error
  * * If it's ipns, it attempts to resolve the PeerId and then the DNSLink. If both fail, an Aggregate error is thrown.
+ *
  */
 export async function parseUrlString ({ urlString, ipns, logger }: ParseUrlStringInput, options?: ParseUrlStringOptions): Promise<ParsedUrlStringResults> {
   const log = logger.forComponent('helia:verified-fetch:parse-url-string')

package/src/utils/walk-path.ts

@@ -1,11 +1,10 @@
 import { walkPath as exporterWalk, type ExporterOptions, type ReadableStorage, type UnixFSEntry } from 'ipfs-unixfs-exporter'
-import type { CID } from 'multiformats/cid'
 
 export interface PathWalkerOptions extends ExporterOptions {
 
 }
 export interface PathWalkerResponse {
-  ipfsRoots: CID[]
+  ipfsRoots: string[]
   terminalElement: UnixFSEntry
 
 }
@@ -15,11 +14,13 @@ export interface PathWalkerFn {
 }
 
 export async function walkPath (blockstore: ReadableStorage, path: string, options?: PathWalkerOptions): Promise<PathWalkerResponse> {
-  const ipfsRoots: CID[] = []
+  const entries: UnixFSEntry[] = []
+  const ipfsRoots: string[] = []
   let terminalElement: UnixFSEntry | undefined
 
   for await (const entry of exporterWalk(path, blockstore, options)) {
-    ipfsRoots.push(entry.cid)
+    entries.push(entry)
+    ipfsRoots.push(entry.cid.toString())
     terminalElement = entry
   }
 

package/src/verified-fetch.ts

@@ -274,11 +274,11 @@ export class VerifiedFetch {
     }
 
     let terminalElement: UnixFSEntry | undefined
-    let ipfsRoots: CID[] | undefined
+    let ipfsRoots: string | undefined
 
     try {
       const pathDetails = await this.pathWalker(this.helia.blockstore, `${cid.toString()}/${path}`, options)
-      ipfsRoots = pathDetails.ipfsRoots
+      ipfsRoots = pathDetails.ipfsRoots.join(',')
       terminalElement = pathDetails.terminalElement
     } catch (err) {
       this.log.error('Error walking path %s', path, err)
@@ -300,7 +300,7 @@ export class VerifiedFetch {
     response.headers.set('X-Ipfs-Path', resource.toString()) // https://specs.ipfs.tech/http-gateways/path-gateway/#x-ipfs-path-response-header
 
     if (ipfsRoots != null) {
-      response.headers.set('X-Ipfs-Roots', ipfsRoots.map(cid => cid.toV1().toString()).join(',')) // https://specs.ipfs.tech/http-gateways/path-gateway/#x-ipfs-roots-response-header
+      response.headers.set('X-Ipfs-Roots', ipfsRoots) // https://specs.ipfs.tech/http-gateways/path-gateway/#x-ipfs-roots-response-header
     }
     // response.headers.set('Content-Disposition', `TODO`) // https://specs.ipfs.tech/http-gateways/path-gateway/#content-disposition-response-header