@helia/verified-fetch 2.6.18 → 3.0.0

package/src/utils/walk-path.ts

@@ -1,4 +1,5 @@
 import { DoesNotExistError } from '@helia/unixfs/errors'
+import { AbortError } from '@libp2p/interface'
 import { walkPath as exporterWalk } from 'ipfs-unixfs-exporter'
 import { badGatewayResponse, notFoundResponse } from './responses.js'
 import type { PluginContext } from '../plugins/types.js'
@@ -53,7 +54,10 @@ export async function handlePathWalking ({ cid, path, resource, options, blockst
   try {
     return await walkPath(blockstore, `${cid.toString()}/${path}`, options)
   } catch (err: any) {
-    options?.signal?.throwIfAborted()
+    if (options?.signal?.aborted) {
+      throw new AbortError(options?.signal?.reason)
+    }
+
     if (['ERR_NO_PROP', 'ERR_NO_TERMINAL_ELEMENT', 'ERR_NOT_FOUND'].includes(err.code)) {
       return notFoundResponse(resource)
     }

package/src/verified-fetch.ts

@@ -1,4 +1,5 @@
 import { ipns as heliaIpns } from '@helia/ipns'
+import { AbortError } from '@libp2p/interface'
 import { prefixLogger } from '@libp2p/logger'
 import { CustomProgressEvent } from 'progress-events'
 import QuickLRU from 'quick-lru'
@@ -106,13 +107,13 @@ export class VerifiedFetch {
 
     if (customPlugins.length > 0) {
       // allow custom plugins to replace default plugins
-      const defaultPluginMap = new Map(defaultPlugins.map(plugin => [plugin.constructor.name, plugin]))
-      const customPluginMap = new Map(customPlugins.map(plugin => [plugin.constructor.name, plugin]))
+      const defaultPluginMap = new Map(defaultPlugins.map(plugin => [plugin.id, plugin]))
+      const customPluginMap = new Map(customPlugins.map(plugin => [plugin.id, plugin]))
 
-      this.plugins = defaultPlugins.map(plugin => customPluginMap.get(plugin.constructor.name) ?? plugin)
+      this.plugins = defaultPlugins.map(plugin => customPluginMap.get(plugin.id) ?? plugin)
 
       // Add any remaining custom plugins that don't replace a default plugin
-      this.plugins.push(...customPlugins.filter(plugin => !defaultPluginMap.has(plugin.constructor.name)))
+      this.plugins.push(...customPlugins.filter(plugin => !defaultPluginMap.has(plugin.id)))
     } else {
       this.plugins = defaultPlugins
     }
@@ -251,7 +252,7 @@ export class VerifiedFetch {
       passCount++
 
       // gather plugins that say they can handle the *current* context, but haven't been used yet
-      const readyPlugins = this.plugins.filter(p => !pluginsUsed.has(p.constructor.name)).filter(p => p.canHandle(context))
+      const readyPlugins = this.plugins.filter(p => !pluginsUsed.has(p.id)).filter(p => p.canHandle(context))
       if (readyPlugins.length === 0) {
         this.log.trace('No plugins can handle the current context.. checking by CID code')
         const plugins = this.plugins.filter(p => p.codes.includes(context.cid.code))
@@ -263,7 +264,7 @@ export class VerifiedFetch {
         }
       }
 
-      this.log.trace('Plugins ready to handle request: ', readyPlugins.map(p => p.constructor.name).join(', '))
+      this.log.trace('Plugins ready to handle request: ', readyPlugins.map(p => p.id).join(', '))
 
       // track if any plugin changed the context or returned a response
       let contextChanged = false
@@ -271,8 +272,8 @@ export class VerifiedFetch {
 
       for (const plugin of readyPlugins) {
         try {
-          this.log.trace('Invoking plugin:', plugin.constructor.name)
-          pluginsUsed.add(plugin.constructor.name)
+          this.log.trace('Invoking plugin:', plugin.id)
+          pluginsUsed.add(plugin.id)
 
           const maybeResponse = await plugin.handle(context)
           if (maybeResponse != null) {
@@ -282,7 +283,9 @@ export class VerifiedFetch {
             break
           }
         } catch (err: any) {
-          context.options?.signal?.throwIfAborted()
+          if (context.options?.signal?.aborted) {
+            throw new AbortError(context.options?.signal?.reason)
+          }
           this.log.error('Error in plugin:', plugin.constructor.name, err)
           // if fatal, short-circuit the pipeline
           if (err.name === 'PluginFatalError') {
@@ -299,7 +302,7 @@ export class VerifiedFetch {
         }
 
         if (finalResponse != null) {
-          this.log.trace('Plugin produced final response:', plugin.constructor.name)
+          this.log.trace('Plugin produced final response:', plugin.id)
           break
         }
       }
@@ -341,7 +344,9 @@ export class VerifiedFetch {
       parsedResult = await this.handleServerTiming('parse-resource', '', async () => parseResource(resource, { ipns: this.ipns, logger: this.helia.logger }, { withServerTiming, ...options }), withServerTiming)
       this.serverTimingHeaders.push(...parsedResult.serverTimings.map(({ header }) => header))
     } catch (err: any) {
-      options?.signal?.throwIfAborted()
+      if (options?.signal?.aborted) {
+        throw new AbortError(options?.signal?.reason)
+      }
       this.log.error('error parsing resource %s', resource, err)
 
       return this.handleFinalResponse(badRequestResponse(resource.toString(), err))