@helia/verified-fetch 5.1.1 → 6.1.0

package/src/utils/responses.ts

@@ -1,8 +1,9 @@
 import itToBrowserReadableStream from 'it-to-browser-readablestream'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
+import { errorToObject } from './error-to-object.ts'
 import { rangeToOffsetAndLength } from './get-offset-and-length.ts'
 import { getContentRangeHeader } from './response-headers.ts'
-import type { SupportedBodyTypes, ContentType } from '../index.js'
+import type { SupportedBodyTypes, ContentType, Resource } from '../index.js'
 import type { Range, RangeHeader } from './get-range-header.ts'
 
 function setField (response: Response, name: string, value: string | boolean): void {
@@ -20,7 +21,7 @@ function setType (response: Response, value: 'basic' | 'cors' | 'error' | 'opaqu
   }
 }
 
-function setUrl (response: Response, value: string | URL): void {
+function setUrl (response: Response, value: Resource): void {
   value = value.toString()
   const fragmentStart = value.indexOf('#')
 
@@ -41,7 +42,7 @@ export interface ResponseOptions extends ResponseInit {
   redirected?: boolean
 }
 
-export function okResponse (url: string, body?: SupportedBodyTypes, init?: ResponseOptions): Response {
+export function okResponse (url: Resource, body?: SupportedBodyTypes, init?: ResponseOptions): Response {
   const response = new Response(body, {
     ...(init ?? {}),
     status: 200,
@@ -58,13 +59,17 @@ export function okResponse (url: string, body?: SupportedBodyTypes, init?: Respo
   return response
 }
 
-export function internalServerErrorResponse (url: string, body?: SupportedBodyTypes, init?: ResponseInit): Response {
-  const response = new Response(body, {
+export function internalServerErrorResponse (url: Resource, err: Error, init?: ResponseInit): Response {
+  const response = new Response(JSON.stringify({
+    error: errorToObject(err)
+  }), {
     ...(init ?? {}),
     status: 500,
     statusText: 'Internal Server Error'
   })
   response.headers.set('X-Content-Type-Options', 'nosniff') // see https://specs.ipfs.tech/http-gateways/path-gateway/#x-content-type-options-response-header
+  response.headers.set('content-type', 'application/json')
+  response.headers.set('x-error-message', btoa(err.message))
 
   setType(response, 'basic')
   setUrl(response, url)
@@ -75,7 +80,7 @@ export function internalServerErrorResponse (url: string, body?: SupportedBodyTy
 /**
  * A 504 Gateway Timeout for when a request made to an upstream server timed out
  */
-export function gatewayTimeoutResponse (url: string, body?: SupportedBodyTypes, init?: ResponseInit): Response {
+export function gatewayTimeoutResponse (url: Resource, body?: SupportedBodyTypes, init?: ResponseInit): Response {
   const response = new Response(body, {
     ...(init ?? {}),
     status: 504,
@@ -92,7 +97,7 @@ export function gatewayTimeoutResponse (url: string, body?: SupportedBodyTypes,
  * A 502 Bad Gateway is for when an invalid response was received from an
  * upstream server.
  */
-export function badGatewayResponse (url: string, body?: SupportedBodyTypes, init?: ResponseInit): Response {
+export function badGatewayResponse (url: Resource, body?: SupportedBodyTypes, init?: ResponseInit): Response {
   const response = new Response(body, {
     ...(init ?? {}),
     status: 502,
@@ -105,7 +110,7 @@ export function badGatewayResponse (url: string, body?: SupportedBodyTypes, init
   return response
 }
 
-export function notImplementedResponse (url: string, body?: SupportedBodyTypes, init?: ResponseInit): Response {
+export function notImplementedResponse (url: Resource, body?: SupportedBodyTypes, init?: ResponseInit): Response {
   const response = new Response(body, {
     ...(init ?? {}),
     status: 501,
@@ -119,7 +124,7 @@ export function notImplementedResponse (url: string, body?: SupportedBodyTypes,
   return response
 }
 
-export function notAcceptableResponse (url: string | URL, requested: Array<Pick<ContentType, 'mediaType'>>, acceptable: Array<Pick<ContentType, 'mediaType'>>, init?: ResponseInit): Response {
+export function notAcceptableResponse (url: Resource, requested: Array<Pick<ContentType, 'mediaType'>>, acceptable: Array<Pick<ContentType, 'mediaType'>>, init?: ResponseInit): Response {
   const headers = new Headers(init?.headers)
   headers.set('content-type', 'application/json')
 
@@ -139,7 +144,7 @@ export function notAcceptableResponse (url: string | URL, requested: Array<Pick<
   return response
 }
 
-export function notFoundResponse (url: string, body?: SupportedBodyTypes, init?: ResponseInit): Response {
+export function notFoundResponse (url: Resource, body?: SupportedBodyTypes, init?: ResponseInit): Response {
   const response = new Response(body, {
     ...(init ?? {}),
     status: 404,
@@ -156,7 +161,7 @@ function isArrayOfErrors (body: unknown | Error | Error[]): body is Error[] {
   return Array.isArray(body) && body.every(e => e instanceof Error)
 }
 
-export function badRequestResponse (url: string, errors: Error | Error[], init?: ResponseInit): Response {
+export function badRequestResponse (url: Resource, errors: Error | Error[], init?: ResponseInit): Response {
   // stacktrace of the single error, or the stacktrace of the last error in the array
   let stack: string | undefined
   let convertedErrors: Array<{ message: string, stack: string }> | undefined
@@ -190,7 +195,7 @@ export function badRequestResponse (url: string, errors: Error | Error[], init?:
   return response
 }
 
-export function movedPermanentlyResponse (url: string, location: string, init?: ResponseInit): Response {
+export function movedPermanentlyResponse (url: Resource, location: string, init?: ResponseInit): Response {
   const response = new Response(null, {
     ...(init ?? {}),
     status: 301,
@@ -207,7 +212,7 @@ export function movedPermanentlyResponse (url: string, location: string, init?:
   return response
 }
 
-export function notModifiedResponse (url: string, headers: Headers, init?: ResponseInit): Response {
+export function notModifiedResponse (url: Resource, headers: Headers, init?: ResponseInit): Response {
   const response = new Response(null, {
     ...(init ?? {}),
     status: 304,
@@ -248,7 +253,7 @@ export interface PartialContent {
   (offset: number, length: number): AsyncGenerator<Uint8Array>
 }
 
-export function partialContentResponse (url: string, getSlice: PartialContent, range: RangeHeader, documentSize: number | bigint, init?: ResponseOptions): Response {
+export function partialContentResponse (url: Resource, getSlice: PartialContent, range: RangeHeader, documentSize: number | bigint, init?: ResponseOptions): Response {
   let response: Response
 
   if (range.ranges.length === 1) {
@@ -269,7 +274,7 @@ export function partialContentResponse (url: string, getSlice: PartialContent, r
   return response
 }
 
-function singleRangeResponse (url: string, getSlice: PartialContent, range: Range, documentSize: number | bigint, init?: ResponseOptions): Response {
+function singleRangeResponse (url: Resource, getSlice: PartialContent, range: Range, documentSize: number | bigint, init?: ResponseOptions): Response {
   try {
     // create headers object with any initial headers from init
     const headers = new Headers(init?.headers)
@@ -293,14 +298,14 @@ function singleRangeResponse (url: string, getSlice: PartialContent, range: Rang
       return notSatisfiableResponse(url, documentSize, init)
     }
 
-    return internalServerErrorResponse(url, '', init)
+    return internalServerErrorResponse(url, err, init)
   }
 }
 
 /**
  * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/Range_requests
  */
-function multiRangeResponse (url: string, getSlice: PartialContent, range: RangeHeader, documentSize: number | bigint, init?: ResponseOptions): Response {
+function multiRangeResponse (url: Resource, getSlice: PartialContent, range: RangeHeader, documentSize: number | bigint, init?: ResponseOptions): Response {
   // create headers object with any initial headers from init
   const headers = new Headers(init?.headers)
 
@@ -375,7 +380,7 @@ function multiRangeResponse (url: string, getSlice: PartialContent, range: Range
  * - The range is invalid
  * - The range is not supported for the given type
  */
-export function notSatisfiableResponse (url: string, documentSize?: number | bigint | string, init?: ResponseInit): Response {
+export function notSatisfiableResponse (url: Resource, documentSize?: number | bigint | string, init?: ResponseInit): Response {
   const headers = new Headers(init?.headers)
 
   if (documentSize != null) {
@@ -402,7 +407,7 @@ export function notSatisfiableResponse (url: string, documentSize?: number | big
  *
  * @see https://specs.ipfs.tech/http-gateways/path-gateway/#412-precondition-failed
  */
-export function preconditionFailedResponse (url: string, init?: ResponseInit): Response {
+export function preconditionFailedResponse (url: Resource, init?: ResponseInit): Response {
   const headers = new Headers(init?.headers)
 
   const response = new Response('Precondition Failed', {

package/src/verified-fetch.ts

@@ -1,6 +1,6 @@
 import { dnsLink } from '@helia/dnslink'
 import { ipnsResolver } from '@helia/ipns'
-import { AbortError } from '@libp2p/interface'
+import { isPeerId, isPublicKey } from '@libp2p/interface'
 import { CID } from 'multiformats/cid'
 import { CustomProgressEvent } from 'progress-events'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
@@ -8,6 +8,7 @@ import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { CarPlugin } from './plugins/plugin-handle-car.js'
 import { IpldPlugin } from './plugins/plugin-handle-ipld.js'
 import { IpnsRecordPlugin } from './plugins/plugin-handle-ipns-record.js'
+import { RawPlugin } from './plugins/plugin-handle-raw.ts'
 import { TarPlugin } from './plugins/plugin-handle-tar.js'
 import { UnixFSPlugin } from './plugins/plugin-handle-unixfs.js'
 import { URLResolver } from './url-resolver.ts'
@@ -17,11 +18,11 @@ import { errorToObject } from './utils/error-to-object.ts'
 import { errorToResponse } from './utils/error-to-response.ts'
 import { getETag, ifNoneMatches } from './utils/get-e-tag.js'
 import { getRangeHeader } from './utils/get-range-header.ts'
-import { parseURLString } from './utils/parse-url-string.ts'
+import { stringToIpfsUrl } from './utils/parse-resource.ts'
 import { setCacheControlHeader } from './utils/response-headers.js'
-import { badRequestResponse, internalServerErrorResponse, notAcceptableResponse, notImplementedResponse, notModifiedResponse } from './utils/responses.js'
+import { notAcceptableResponse, notImplementedResponse, notModifiedResponse } from './utils/responses.js'
 import { ServerTiming } from './utils/server-timing.js'
-import type { AcceptHeader, CIDDetail, ContentTypeParser, CreateVerifiedFetchOptions, ResolveURLResult, Resource, ResourceDetail, VerifiedFetchInit as VerifiedFetchOptions, VerifiedFetchPlugin, PluginContext, PluginOptions } from './index.js'
+import type { AcceptHeader, CIDDetail, ContentTypeParser, CreateVerifiedFetchOptions, Resource, ResourceDetail, VerifiedFetchInit as VerifiedFetchOptions, VerifiedFetchPlugin, PluginContext, PluginOptions } from './index.js'
 import type { DNSLink } from '@helia/dnslink'
 import type { Helia } from '@helia/interface'
 import type { IPNSResolver } from '@helia/ipns'
@@ -108,7 +109,8 @@ export class VerifiedFetch {
       new IpldPlugin(pluginOptions),
       new CarPlugin(pluginOptions),
       new TarPlugin(pluginOptions),
-      new IpnsRecordPlugin(pluginOptions)
+      new IpnsRecordPlugin(pluginOptions),
+      new RawPlugin(pluginOptions)
     ]
 
     const customPlugins = init.plugins?.map((pluginFactory) => pluginFactory(pluginOptions)) ?? []
@@ -138,127 +140,120 @@ export class VerifiedFetch {
   async fetch (resource: Resource, opts?: VerifiedFetchOptions): Promise<Response> {
     this.log('fetch %s %s', opts?.method ?? 'GET', resource)
 
-    if (opts?.method === 'OPTIONS') {
-      return this.handleFinalResponse(new Response(null, {
-        status: 200
-      }))
-    }
-
-    const options = convertOptions(opts)
-    const headers = new Headers(options?.headers)
-    const serverTiming = new ServerTiming()
+    try {
+      if (opts?.method === 'OPTIONS') {
+        return this.handleFinalResponse(new Response(null, {
+          status: 200
+        }))
+      }
 
-    options?.onProgress?.(new CustomProgressEvent<ResourceDetail>('verified-fetch:request:start', { resource }))
+      const options = convertOptions(opts)
+      const headers = new Headers(options?.headers)
+      const serverTiming = new ServerTiming()
 
-    const range = getRangeHeader(resource.toString(), headers)
+      if (options != null) {
+        options.offline ??= headers.get('cache-control') === 'only-if-cached'
+      }
 
-    if (range instanceof Response) {
-      // invalid range request
-      return this.handleFinalResponse(range)
-    }
+      options?.onProgress?.(new CustomProgressEvent<ResourceDetail>('verified-fetch:request:start', { resource }))
 
-    let url: URL
+      const range = getRangeHeader(resource, headers)
 
-    try {
-      url = parseURLString(typeof resource === 'string' ? resource : `ipfs://${resource}`)
-    } catch (err: any) {
-      return this.handleFinalResponse(badRequestResponse(resource.toString(), err))
-    }
+      if (range instanceof Response) {
+        // invalid range request
+        return this.handleFinalResponse(range)
+      }
 
-    if (url.protocol === 'ipfs:' && url.pathname === '') {
-      // if we don't need to resolve an IPNS names or traverse a DAG, we can
-      // check the if-none-match header and maybe return a 304 without needing
-      // to load any blocks
-      if (ifNoneMatches(`"${url.hostname}"`, headers)) {
-        return notModifiedResponse(resource.toString(), new Headers({
-          etag: `"${url.hostname}"`,
-          'cache-control': 'public, max-age=29030400, immutable'
-        }))
+      const url = this.parseResource(resource)
+
+      if (url.protocol === 'ipfs:' && url.pathname === '') {
+        // if we don't need to resolve an IPNS names or traverse a DAG, we can
+        // check the if-none-match header and maybe return a 304 without needing
+        // to load any blocks
+        if (ifNoneMatches(`"${url.hostname}"`, headers)) {
+          return notModifiedResponse(resource, new Headers({
+            etag: `"${url.hostname}"`,
+            'cache-control': 'public, max-age=29030400, immutable'
+          }))
+        }
       }
-    }
 
-    const requestedMimeTypes = getRequestedMimeTypes(url, headers.get('accept'))
+      const requestedMimeTypes = getRequestedMimeTypes(url, headers.get('accept'))
 
-    let parsedResult: ResolveURLResult
+      // if a raw IPNS record has been requested, don't try to load the block
+      // the record points to or do any recursive IPNS resolving
+      if (isIPNSRecordRequest(headers)) {
+        if (url.protocol !== 'ipns:') {
+          return notAcceptableResponse(url, requestedMimeTypes, [
+            CONTENT_TYPE_IPNS
+          ])
+        }
 
-    // if just an IPNS record has been requested, don't try to load the block
-    // the record points to or do any recursive IPNS resolving
-    if (isIPNSRecordRequest(headers)) {
-      if (url.protocol !== 'ipns:') {
-        return notAcceptableResponse(url, requestedMimeTypes, [
-          CONTENT_TYPE_IPNS
-        ])
-      }
+        // @ts-expect-error ipnsRecordPlugin may not be of type IpnsRecordPlugin
+        const ipnsRecordPlugin: IpnsRecordPlugin | undefined = this.plugins.find(plugin => plugin.id === 'ipns-record-plugin')
 
-      // @ts-expect-error ipnsRecordPlugin may not be of type IpnsRecordPlugin
-      const ipnsRecordPlugin: IpnsRecordPlugin | undefined = this.plugins.find(plugin => plugin.id === 'ipns-record-plugin')
+        if (ipnsRecordPlugin == null) {
+          // IPNS record was requested but no IPNS Record plugin is configured?!
+          return notAcceptableResponse(resource, requestedMimeTypes, [])
+        }
 
-      if (ipnsRecordPlugin == null) {
-        // IPNS record was requested but no IPNS Record plugin is configured?!
-        return notAcceptableResponse(url, requestedMimeTypes, [])
+        return this.handleFinalResponse(await ipnsRecordPlugin.handle({
+          range,
+          url,
+          resource,
+          options
+        }))
       }
 
-      return this.handleFinalResponse(await ipnsRecordPlugin.handle({
-        range,
-        url,
-        resource: resource.toString(),
-        options
+      const resolveResult = await this.urlResolver.resolve(url, serverTiming, {
+        ...options,
+        isRawBlockRequest: isRawBlockRequest(headers)
+      })
+
+      options?.onProgress?.(new CustomProgressEvent<CIDDetail>('verified-fetch:request:resolve', {
+        cid: resolveResult.terminalElement.cid,
+        path: resolveResult.url.pathname
       }))
-    } else {
-      try {
-        parsedResult = await this.urlResolver.resolve(url, serverTiming, {
-          ...options,
-          isRawBlockRequest: isRawBlockRequest(headers),
-          onlyIfCached: headers.get('cache-control') === 'only-if-cached'
-        })
-      } catch (err: any) {
-        options?.signal?.throwIfAborted()
-
-        this.log.error('error parsing resource %s - %e', resource, err)
-        return this.handleFinalResponse(errorToResponse(resource, err))
-      }
-    }
 
-    options?.onProgress?.(new CustomProgressEvent<CIDDetail>('verified-fetch:request:resolve', {
-      cid: parsedResult.terminalElement.cid,
-      path: parsedResult.url.pathname
-    }))
+      const accept = this.getAcceptHeader(resolveResult.url, requestedMimeTypes, resolveResult.terminalElement.cid)
 
-    const accept = this.getAcceptHeader(parsedResult.url, requestedMimeTypes, parsedResult.terminalElement.cid)
+      if (accept instanceof Response) {
+        this.log('allowed media types for requested CID did not contain anything the client can understand')
 
-    if (accept instanceof Response) {
-      this.log('allowed media types for requested CID did not contain anything the client can understand')
+        // invalid accept header
+        return this.handleFinalResponse(accept)
+      }
 
-      // invalid accept header
-      return this.handleFinalResponse(accept)
-    }
+      const context: PluginContext = {
+        ...resolveResult,
+        resource,
+        accept,
+        range,
+        options,
+        onProgress: options?.onProgress,
+        serverTiming,
+        headers,
+        requestedMimeTypes
+      }
 
-    const context: PluginContext = {
-      ...parsedResult,
-      resource: resource.toString(),
-      accept,
-      range,
-      options,
-      onProgress: options?.onProgress,
-      serverTiming,
-      headers,
-      requestedMimeTypes
-    }
+      this.log.trace('finding handler for cid code "0x%s" and response content types %s', resolveResult.terminalElement.cid.code.toString(16), accept.map(header => header.contentType.mediaType).join(', '))
 
-    this.log.trace('finding handler for cid code "0x%s" and response content types %s', parsedResult.terminalElement.cid.code.toString(16), accept.map(header => header.contentType.mediaType).join(', '))
+      const response = await this.runPluginPipeline(context)
 
-    const response = await this.runPluginPipeline(context)
+      options?.onProgress?.(new CustomProgressEvent<CIDDetail>('verified-fetch:request:end', {
+        cid: resolveResult.terminalElement.cid,
+        path: resolveResult.url.pathname
+      }))
 
-    options?.onProgress?.(new CustomProgressEvent<CIDDetail>('verified-fetch:request:end', {
-      cid: parsedResult.terminalElement.cid,
-      path: parsedResult.url.pathname
-    }))
+      if (response == null) {
+        this.log.error('no plugin could handle request for %s', resource)
+      }
 
-    if (response == null) {
-      this.log.error('no plugin could handle request for %s', resource)
+      return this.handleFinalResponse(response, Boolean(options?.withServerTiming) || Boolean(this.withServerTiming), context)
+    } catch (err: any) {
+      this.log.error('error fetching resource %s - %e', resource, err)
+      return this.handleFinalResponse(errorToResponse(resource, err, opts))
     }
-
-    return this.handleFinalResponse(response, Boolean(options?.withServerTiming) || Boolean(this.withServerTiming), context)
   }
 
   /**
@@ -315,6 +310,18 @@ export class VerifiedFetch {
     return acceptable
   }
 
+  private parseResource (resource: Resource): URL {
+    if (isPeerId(resource) || isPublicKey(resource)) {
+      resource = `/ipns/${resource}`
+    }
+
+    if (CID.asCID(resource) === resource || resource instanceof CID) {
+      resource = `/ipfs/${resource}`
+    }
+
+    return new URL(stringToIpfsUrl(resource.toString()))
+  }
+
   /**
    * The last place a Response touches in verified-fetch before being returned
    * to the user. This is where we add the Server-Timing header to the response
@@ -345,7 +352,7 @@ export class VerifiedFetch {
       const decodedPath = decodeURI(context?.url.pathname)
       const path = uint8ArrayToString(uint8ArrayFromString(decodedPath), 'ascii')
 
-      response.headers.set('x-ipfs-path', `/${context.url.protocol === 'ipfs:' ? 'ipfs' : 'ipns'}/${context?.url.hostname}${path}`)
+      response.headers.set('x-ipfs-path', `/${context.url.protocol === 'ipfs:' ? 'ipfs' : 'ipns'}/${context?.url.hostname}${path === '/' ? '' : path}`)
     }
 
     // set CORS headers. If hosting your own gateway with verified-fetch behind
@@ -406,35 +413,29 @@ export class VerifiedFetch {
     let pluginHandled = false
 
     for (const plugin of plugins) {
-      try {
-        this.log('invoking plugin: %s', plugin.id)
-        pluginsUsed.add(plugin.id)
+      // try {
+      this.log('invoking plugin: %s', plugin.id)
+      pluginsUsed.add(plugin.id)
 
-        const maybeResponse = await plugin.handle(context)
+      const maybeResponse = await plugin.handle(context)
 
-        this.log('plugin response %s %o', plugin.id, maybeResponse)
+      this.log('plugin response %s %o', plugin.id, maybeResponse)
 
-        if (maybeResponse != null) {
-          // if a plugin returns a final Response, short-circuit
-          finalResponse = maybeResponse
-          pluginHandled = true
-          break
-        }
-      } catch (err: any) {
+      if (maybeResponse != null) {
+        // if a plugin returns a final Response, short-circuit
+        finalResponse = maybeResponse
+        pluginHandled = true
+        break
+      }
+      /* } catch (err: any) {
         if (context.options?.signal?.aborted) {
           throw new AbortError(context.options?.signal?.reason)
         }
 
         this.log.error('error in plugin %s - %e', plugin.id, err)
 
-        return internalServerErrorResponse(context.resource, JSON.stringify({
-          error: errorToObject(err)
-        }), {
-          headers: {
-            'content-type': 'application/json'
-          }
-        })
-      }
+        return internalServerErrorResponse(context.resource, err)
+      } */
 
       if (finalResponse != null) {
         this.log.trace('plugin %s produced final response', plugin.id)

package/dist/src/utils/ipfs-path-to-url.d.ts

@@ -1,16 +0,0 @@
-/**
- * Turns an IPFS or IPNS path into a HTTP URL. Path gateway syntax is used to
- * preserve any case sensitivity
- *
- * - `/ipfs/cid` -> `https://example.org/ipfs/cid`
- * - `/ipns/name` -> `https://example.org/ipns/name`
- */
-export declare function ipfsPathToUrl(path: string): string;
-/**
- * Turns an IPFS or IPNS URL into a HTTP URL. Path gateway syntax is used to
- * preserve and case sensitivity
- *
- * `ipfs://cid` -> `https://example.org/ipfs/cid`
- */
-export declare function ipfsUrlToUrl(url: string): string;
-//# sourceMappingURL=ipfs-path-to-url.d.ts.map

package/dist/src/utils/ipfs-path-to-url.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ipfs-path-to-url.d.ts","sourceRoot":"","sources":["../../../src/utils/ipfs-path-to-url.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CA2BnD;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CASjD"}

package/dist/src/utils/ipfs-path-to-url.js

@@ -1,45 +0,0 @@
-import { InvalidParametersError } from '@libp2p/interface';
-/**
- * Turns an IPFS or IPNS path into a HTTP URL. Path gateway syntax is used to
- * preserve any case sensitivity
- *
- * - `/ipfs/cid` -> `https://example.org/ipfs/cid`
- * - `/ipns/name` -> `https://example.org/ipns/name`
- */
-export function ipfsPathToUrl(path) {
-    if (!path.startsWith('/ipfs/') && !path.startsWith('/ipns/')) {
-        throw new InvalidParametersError(`Path ${path} did not start with /ipfs/ or /ipns/`);
-    }
-    // trim fragment
-    const fragmentIndex = path.indexOf('#');
-    let fragment = '';
-    if (fragmentIndex > -1) {
-        fragment = path.substring(fragmentIndex);
-        path = path.substring(0, fragmentIndex);
-    }
-    // trim query
-    const queryIndex = path.indexOf('?');
-    let query = '';
-    if (queryIndex > -1) {
-        query = path.substring(queryIndex);
-        path = path.substring(0, queryIndex);
-    }
-    const type = path.substring(1, 5);
-    const rest = path.substring(6);
-    return `https://example.org/${type}/${rest}${query}${fragment}`;
-}
-/**
- * Turns an IPFS or IPNS URL into a HTTP URL. Path gateway syntax is used to
- * preserve and case sensitivity
- *
- * `ipfs://cid` -> `https://example.org/ipfs/cid`
- */
-export function ipfsUrlToUrl(url) {
-    if (!url.startsWith('ipfs://') && !url.startsWith('ipns://')) {
-        throw new InvalidParametersError(`URL ${url} did not start with ipfs:// or ipns://`);
-    }
-    const type = url.substring(0, 4);
-    const rest = url.substring(7);
-    return `https://example.org/${type}/${rest}`;
-}
-//# sourceMappingURL=ipfs-path-to-url.js.map

package/dist/src/utils/ipfs-path-to-url.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ipfs-path-to-url.js","sourceRoot":"","sources":["../../../src/utils/ipfs-path-to-url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAAE,IAAY;IACzC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7D,MAAM,IAAI,sBAAsB,CAAC,QAAQ,IAAI,sCAAsC,CAAC,CAAA;IACtF,CAAC;IAED,gBAAgB;IAChB,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IACvC,IAAI,QAAQ,GAAG,EAAE,CAAA;IAEjB,IAAI,aAAa,GAAG,CAAC,CAAC,EAAE,CAAC;QACvB,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAA;QACxC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,aAAa,CAAC,CAAA;IACzC,CAAC;IAED,aAAa;IACb,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IACpC,IAAI,KAAK,GAAG,EAAE,CAAA;IAEd,IAAI,UAAU,GAAG,CAAC,CAAC,EAAE,CAAC;QACpB,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;QAClC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC,CAAA;IACtC,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACjC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;IAE9B,OAAO,uBAAuB,IAAI,IAAI,IAAI,GAAG,KAAK,GAAG,QAAQ,EAAE,CAAA;AACjE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAE,GAAW;IACvC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7D,MAAM,IAAI,sBAAsB,CAAC,OAAO,GAAG,wCAAwC,CAAC,CAAA;IACtF,CAAC;IAED,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAChC,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;IAE7B,OAAO,uBAAuB,IAAI,IAAI,IAAI,EAAE,CAAA;AAC9C,CAAC"}

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

@@ -1,23 +0,0 @@
-export declare const SUBDOMAIN_GATEWAY_REGEX: RegExp;
-export interface ParsedURL {
-    url: URL;
-    protocol: 'ipfs' | 'ipns';
-    cidOrPeerIdOrDnsLink: string;
-    path: string[];
-    query: Record<string, any>;
-    fragment: string;
-}
-/**
- * Accepts the following url strings:
- *
- * - /ipfs/Qmfoo/path
- * - /ipns/Qmfoo/path
- * - ipfs://cid/path
- * - ipns://name/path
- * - http://cid.ipfs.example.com/path
- * - http://name.ipns.example.com/path
- * - http://example.com/ipfs/cid/path
- * - http://example.com/ipns/name/path
- */
-export declare function parseURLString(urlString: string): URL;
-//# sourceMappingURL=parse-url-string.d.ts.map

package/dist/src/utils/parse-url-string.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"parse-url-string.d.ts","sourceRoot":"","sources":["../../../src/utils/parse-url-string.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,uBAAuB,QAAsE,CAAA;AAmB1G,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,QAAQ,EAAE,MAAM,CAAA;CACjB;AA4FD;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAAE,SAAS,EAAE,MAAM,GAAG,GAAG,CAuBtD"}