@helia/verified-fetch 5.1.0 → 6.0.0

package/dist/src/utils/parse-url-string.js

@@ -1,120 +0,0 @@
-import { InvalidParametersError } from '@libp2p/interface';
-import { peerIdFromCID, peerIdFromString } from '@libp2p/peer-id';
-import { CID } from 'multiformats/cid';
-import { decodeDNSLinkLabel, isInlinedDnsLink } from "./dnslink-label.js";
-import { ipfsPathToUrl, ipfsUrlToUrl } from "./ipfs-path-to-url.js";
-export const SUBDOMAIN_GATEWAY_REGEX = /^(?<cidOrPeerIdOrDnsLink>[^/?]+)\.(?<protocol>ip[fn]s)\.([^/?]+)$/;
-const CODEC_LIBP2P_KEY = 0x72;
-function matchSubdomainGroupsGuard(groups) {
-    const protocol = groups?.protocol;
-    if (protocol !== 'ipfs' && protocol !== 'ipns') {
-        return false;
-    }
-    const cidOrPeerIdOrDnsLink = groups?.cidOrPeerIdOrDnsLink;
-    if (cidOrPeerIdOrDnsLink == null) {
-        return false;
-    }
-    return true;
-}
-/**
- * If the caller has passed a case-sensitive identifier (like a base58btc
- * encoded CID or PeerId) in a case-insensitive location (like a subdomain),
- * be nice and return the original identifier from the passed string
- */
-function findOriginalCidOrPeer(needle, haystack) {
-    const start = haystack.toLowerCase().indexOf(needle);
-    if (start === -1) {
-        return needle;
-    }
-    return haystack.substring(start, start + needle.length);
-}
-function stringToUrl(urlString) {
-    if (urlString instanceof URL) {
-        return urlString;
-    }
-    // turn IPFS/IPNS path into gateway URL string
-    if (urlString.startsWith('/ipfs/') || urlString.startsWith('/ipns/')) {
-        urlString = ipfsPathToUrl(urlString);
-    }
-    // turn IPFS/IPNS URL into gateway URL string
-    if (urlString.startsWith('ipfs://') || urlString.startsWith('ipns://')) {
-        urlString = ipfsUrlToUrl(urlString);
-    }
-    if (urlString.startsWith('http://') || urlString.startsWith('https://')) {
-        return new URL(urlString);
-    }
-    throw new InvalidParametersError(`Invalid URL: ${urlString}`);
-}
-function toURL(urlString) {
-    // validate url
-    const url = stringToUrl(urlString);
-    // test for subdomain gateway URL
-    const subdomainMatch = url.hostname.match(SUBDOMAIN_GATEWAY_REGEX);
-    if (matchSubdomainGroupsGuard(subdomainMatch?.groups)) {
-        const groups = subdomainMatch.groups;
-        if (groups.protocol === 'ipns' && isInlinedDnsLink(groups.cidOrPeerIdOrDnsLink)) {
-            // decode inline dnslink domain if present
-            groups.cidOrPeerIdOrDnsLink = decodeDNSLinkLabel(groups.cidOrPeerIdOrDnsLink);
-        }
-        const cidOrPeerIdOrDnsLink = findOriginalCidOrPeer(groups.cidOrPeerIdOrDnsLink, urlString);
-        // parse url as not http(s):// - this is necessary because URL makes
-        // `.pathname` default to `/` for http URLs, even if no trailing slash was
-        // present in the string URL and we need to be able to round-trip the user's
-        // input while also maintaining a sane canonical URL for the resource. Phew.
-        const wat = new URL(`not-${urlString}`);
-        return new URL(`${groups.protocol}://${cidOrPeerIdOrDnsLink}${wat.pathname}${url.search}${url.hash}`);
-    }
-    // test for IPFS path gateway URL
-    if (url.pathname.startsWith('/ipfs/')) {
-        const parts = url.pathname.substring(6).split('/');
-        const cid = parts.shift();
-        if (cid == null) {
-            throw new InvalidParametersError(`Path gateway URL ${urlString} had no CID`);
-        }
-        return new URL(`ipfs://${cid}${url.pathname.replace(`/ipfs/${cid}`, '')}${url.search}${url.hash}`);
-    }
-    // test for IPNS path gateway URL
-    if (url.pathname.startsWith('/ipns/')) {
-        const parts = url.pathname.substring(6).split('/');
-        const name = parts.shift();
-        if (name == null) {
-            throw new InvalidParametersError(`Path gateway URL ${urlString} had no name`);
-        }
-        return new URL(`ipns://${name}${url.pathname.replace(`/ipns/${name}`, '')}${url.search}${url.hash}`);
-    }
-    throw new TypeError(`Invalid URL: ${urlString}, please use ipfs://, ipns://, or gateway URLs only`);
-}
-/**
- * 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 function parseURLString(urlString) {
-    // validate url
-    const url = toURL(urlString);
-    // treat IPNS keys that do not parse as PeerIds as DNSLink
-    if (url.protocol === 'ipns:') {
-        try {
-            peerIdFromString(url.hostname);
-        }
-        catch {
-            url.protocol = 'dnslink:';
-        }
-    }
-    if (url.protocol === 'ipfs:') {
-        const cid = CID.parse(url.hostname);
-        // special case - peer id encoded as a CID
-        if (cid.code === CODEC_LIBP2P_KEY) {
-            return new URL(`ipns://${peerIdFromCID(cid)}${url.pathname}${url.search}${url.hash}`);
-        }
-    }
-    return url;
-}
-//# sourceMappingURL=parse-url-string.js.map

package/dist/src/utils/parse-url-string.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"parse-url-string.js","sourceRoot":"","sources":["../../../src/utils/parse-url-string.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/resource-to-cache-key.d.ts

@@ -1,15 +0,0 @@
-import { CID } from 'multiformats/cid';
-/**
- * Takes a resource and returns a session cache key as an IPFS or IPNS path with
- * any trailing segments removed.
- *
- * E.g.
- *
- * - Qmfoo -> /ipfs/Qmfoo
- * - https://Qmfoo.ipfs.gateway.org -> ipfs://Qmfoo
- * - https://gateway.org/ipfs/Qmfoo -> ipfs://Qmfoo
- * - https://gateway.org/ipfs/Qmfoo/bar.txt -> ipfs://Qmfoo
- * - etc
- */
-export declare function resourceToSessionCacheKey(url: string | CID): string;
-//# sourceMappingURL=resource-to-cache-key.d.ts.map

package/dist/src/utils/resource-to-cache-key.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"resource-to-cache-key.d.ts","sourceRoot":"","sources":["../../../src/utils/resource-to-cache-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAGtC;;;;;;;;;;;GAWG;AACH,wBAAgB,yBAAyB,CAAE,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,MAAM,CAcpE"}

package/dist/src/utils/resource-to-cache-key.js

@@ -1,27 +0,0 @@
-import { CID } from 'multiformats/cid';
-import { parseURLString } from './parse-url-string.js';
-/**
- * Takes a resource and returns a session cache key as an IPFS or IPNS path with
- * any trailing segments removed.
- *
- * E.g.
- *
- * - Qmfoo -> /ipfs/Qmfoo
- * - https://Qmfoo.ipfs.gateway.org -> ipfs://Qmfoo
- * - https://gateway.org/ipfs/Qmfoo -> ipfs://Qmfoo
- * - https://gateway.org/ipfs/Qmfoo/bar.txt -> ipfs://Qmfoo
- * - etc
- */
-export function resourceToSessionCacheKey(url) {
-    const cid = CID.asCID(url);
-    if (cid != null) {
-        return `ipfs://${cid}`;
-    }
-    try {
-        return `ipfs://${CID.parse(url.toString())}`;
-    }
-    catch { }
-    const { protocol, host } = parseURLString(url.toString());
-    return `${protocol}//${host}`;
-}
-//# sourceMappingURL=resource-to-cache-key.js.map

package/dist/src/utils/resource-to-cache-key.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"resource-to-cache-key.js","sourceRoot":"","sources":["../../../src/utils/resource-to-cache-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,yBAAyB,CAAE,GAAiB;IAC1D,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAE1B,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAChB,OAAO,UAAU,GAAG,EAAE,CAAA;IACxB,CAAC;IAED,IAAI,CAAC;QACH,OAAO,UAAU,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAA;IAC9C,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IAEV,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;IAEzD,OAAO,GAAG,QAAQ,KAAK,IAAI,EAAE,CAAA;AAC/B,CAAC"}

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

@@ -1,54 +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: string): string {
-  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: string): string {
-  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}`
-}

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

@@ -1,165 +0,0 @@
-import { InvalidParametersError } from '@libp2p/interface'
-import { peerIdFromCID, peerIdFromString } from '@libp2p/peer-id'
-import { CID } from 'multiformats/cid'
-import { decodeDNSLinkLabel, isInlinedDnsLink } from './dnslink-label.ts'
-import { ipfsPathToUrl, ipfsUrlToUrl } from './ipfs-path-to-url.ts'
-
-interface SubdomainMatchGroups {
-  protocol: 'ipfs' | 'ipns'
-  cidOrPeerIdOrDnsLink: string
-}
-
-export const SUBDOMAIN_GATEWAY_REGEX = /^(?<cidOrPeerIdOrDnsLink>[^/?]+)\.(?<protocol>ip[fn]s)\.([^/?]+)$/
-const CODEC_LIBP2P_KEY = 0x72
-
-function matchSubdomainGroupsGuard (groups?: null | { [key in string]: string; } | SubdomainMatchGroups): groups is SubdomainMatchGroups {
-  const protocol = groups?.protocol
-
-  if (protocol !== 'ipfs' && protocol !== 'ipns') {
-    return false
-  }
-
-  const cidOrPeerIdOrDnsLink = groups?.cidOrPeerIdOrDnsLink
-
-  if (cidOrPeerIdOrDnsLink == null) {
-    return false
-  }
-
-  return true
-}
-
-export interface ParsedURL {
-  url: URL,
-  protocol: 'ipfs' | 'ipns'
-  cidOrPeerIdOrDnsLink: string
-  path: string[]
-  query: Record<string, any>
-  fragment: string
-}
-
-/**
- * If the caller has passed a case-sensitive identifier (like a base58btc
- * encoded CID or PeerId) in a case-insensitive location (like a subdomain),
- * be nice and return the original identifier from the passed string
- */
-function findOriginalCidOrPeer (needle: string, haystack: string): string {
-  const start = haystack.toLowerCase().indexOf(needle)
-
-  if (start === -1) {
-    return needle
-  }
-
-  return haystack.substring(start, start + needle.length)
-}
-
-function stringToUrl (urlString: string | URL): URL {
-  if (urlString instanceof URL) {
-    return urlString
-  }
-
-  // turn IPFS/IPNS path into gateway URL string
-  if (urlString.startsWith('/ipfs/') || urlString.startsWith('/ipns/')) {
-    urlString = ipfsPathToUrl(urlString)
-  }
-
-  // turn IPFS/IPNS URL into gateway URL string
-  if (urlString.startsWith('ipfs://') || urlString.startsWith('ipns://')) {
-    urlString = ipfsUrlToUrl(urlString)
-  }
-
-  if (urlString.startsWith('http://') || urlString.startsWith('https://')) {
-    return new URL(urlString)
-  }
-
-  throw new InvalidParametersError(`Invalid URL: ${urlString}`)
-}
-
-function toURL (urlString: string): URL {
-  // validate url
-  const url = stringToUrl(urlString)
-
-  // test for subdomain gateway URL
-  const subdomainMatch = url.hostname.match(SUBDOMAIN_GATEWAY_REGEX)
-
-  if (matchSubdomainGroupsGuard(subdomainMatch?.groups)) {
-    const groups = subdomainMatch.groups
-
-    if (groups.protocol === 'ipns' && isInlinedDnsLink(groups.cidOrPeerIdOrDnsLink)) {
-      // decode inline dnslink domain if present
-      groups.cidOrPeerIdOrDnsLink = decodeDNSLinkLabel(groups.cidOrPeerIdOrDnsLink)
-    }
-
-    const cidOrPeerIdOrDnsLink = findOriginalCidOrPeer(groups.cidOrPeerIdOrDnsLink, urlString)
-
-    // parse url as not http(s):// - this is necessary because URL makes
-    // `.pathname` default to `/` for http URLs, even if no trailing slash was
-    // present in the string URL and we need to be able to round-trip the user's
-    // input while also maintaining a sane canonical URL for the resource. Phew.
-    const wat = new URL(`not-${urlString}`)
-
-    return new URL(`${groups.protocol}://${cidOrPeerIdOrDnsLink}${wat.pathname}${url.search}${url.hash}`)
-  }
-
-  // test for IPFS path gateway URL
-  if (url.pathname.startsWith('/ipfs/')) {
-    const parts = url.pathname.substring(6).split('/')
-    const cid = parts.shift()
-
-    if (cid == null) {
-      throw new InvalidParametersError(`Path gateway URL ${urlString} had no CID`)
-    }
-
-    return new URL(`ipfs://${cid}${url.pathname.replace(`/ipfs/${cid}`, '')}${url.search}${url.hash}`)
-  }
-
-  // test for IPNS path gateway URL
-  if (url.pathname.startsWith('/ipns/')) {
-    const parts = url.pathname.substring(6).split('/')
-    const name = parts.shift()
-
-    if (name == null) {
-      throw new InvalidParametersError(`Path gateway URL ${urlString} had no name`)
-    }
-
-    return new URL(`ipns://${name}${url.pathname.replace(`/ipns/${name}`, '')}${url.search}${url.hash}`)
-  }
-
-  throw new TypeError(`Invalid URL: ${urlString}, please use ipfs://, ipns://, or gateway URLs only`)
-}
-
-/**
- * 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 function parseURLString (urlString: string): URL {
-  // validate url
-  const url = toURL(urlString)
-
-  // treat IPNS keys that do not parse as PeerIds as DNSLink
-  if (url.protocol === 'ipns:') {
-    try {
-      peerIdFromString(url.hostname)
-    } catch {
-      url.protocol = 'dnslink:'
-    }
-  }
-
-  if (url.protocol === 'ipfs:') {
-    const cid = CID.parse(url.hostname)
-
-    // special case - peer id encoded as a CID
-    if (cid.code === CODEC_LIBP2P_KEY) {
-      return new URL(`ipns://${peerIdFromCID(cid)}${url.pathname}${url.search}${url.hash}`)
-    }
-  }
-
-  return url
-}

package/src/utils/resource-to-cache-key.ts

@@ -1,30 +0,0 @@
-import { CID } from 'multiformats/cid'
-import { parseURLString } from './parse-url-string.js'
-
-/**
- * Takes a resource and returns a session cache key as an IPFS or IPNS path with
- * any trailing segments removed.
- *
- * E.g.
- *
- * - Qmfoo -> /ipfs/Qmfoo
- * - https://Qmfoo.ipfs.gateway.org -> ipfs://Qmfoo
- * - https://gateway.org/ipfs/Qmfoo -> ipfs://Qmfoo
- * - https://gateway.org/ipfs/Qmfoo/bar.txt -> ipfs://Qmfoo
- * - etc
- */
-export function resourceToSessionCacheKey (url: string | CID): string {
-  const cid = CID.asCID(url)
-
-  if (cid != null) {
-    return `ipfs://${cid}`
-  }
-
-  try {
-    return `ipfs://${CID.parse(url.toString())}`
-  } catch {}
-
-  const { protocol, host } = parseURLString(url.toString())
-
-  return `${protocol}//${host}`
-}